]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/stable-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 00:44:17 +0000 (17:44 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 18 Apr 2006 00:44:17 +0000 (17:44 -0700)
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/stable-2.6:
  [PATCH] shmat: stop mprotect from giving write permission to a readonly attachment (CVE-2006-1524)
  [PATCH] cciss: bug fix for crash when running hpacucli
  [PATCH] ext3: Fix missed mutex unlock
  [PATCH] Fix block device symlink name
  [PATCH] isd200: limit to BLK_DEV_IDE


Trivial merge