Merge head 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
commitd3e5d29136ce9bf21ce50c0c23a3a11b97a0da7b
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:08:17 +0000 (17 13:08 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 17 Aug 2005 20:08:17 +0000 (17 13:08 -0700)
tree7887d95ec36087946a2c4b4c9ee0850c361fe22f
parentc231c7db30faf93419fc22d680f74d816bea70e2
parentc149ec05dcd09d525e6778e339122827c7cd79b8
Merge head 'release' of /linux/kernel/git/aegl/linux-2.6