Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 Aug 2005 19:12:30 +0000 (12:12 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 16 Aug 2005 19:12:30 +0000 (12:12 -0700)
commit5153f7e6dba37390902c8fd3edc9a8cc19358ece
tree1f47f0e30fd93a7d867382bc478d501436371e1a
parentca27ea487ea10bd22459dbc367cf263f1e8d5228
parent2d610b80e954045ccfc27558f84e482709e5e5b7
Merge head 'for-linus' of /linux/kernel/git/shaggy/jfs-2.6