Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Jun 2008 00:10:04 +0000 (17:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 21 Jun 2008 00:10:04 +0000 (17:10 -0700)
commitb732d9680b7a2968823851f1163507ad9c45c8cb
treed4584316d00a021d3d54052676a870c8b2999f23
parenta744e0160ac5804b763449aa34d3991dc21af0be
parente0c6d97c65e0784aade7e97b9411f245a6c543e7
Merge branch 'release' of git://git./linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] SN2: security hole in sn2_ptc_proc_write