Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...
commit53c7d2b7706526bf262ac10eb52d602d1520458a
authorGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 05:44:55 +0000 (3 22:44 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 4 Aug 2006 05:44:55 +0000 (3 22:44 -0700)
tree8dd9f936ccbcb5479f27edaf7c903fe9826932f2
parentefe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48
parent8bcb2839b74d605f5549962a6e69dc07768e95b6
Merge branch 'for-linus' of git://git./linux/kernel/git/shaggy/jfs-2.6