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)
commitde542925fbf179fb4b39bab2c3235b4525f96794
tree11b0f8baf2469c52405ab9be9f82c414c3de64b4
parent5fdfd42e3a69e8a686fcfb6381616464945471e8
parentb78b6af66a5fbaf17d7e6bfc32384df5e34408c8
Merge /pub/scm/linux/kernel/git/gregkh/stable-2.6

* 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