Merge branch 'master' of /home/shaggy/git/linus-clean/
authorDave Kleikamp <shaggy@linux.vnet.ibm.com>
Mon, 2 Feb 2009 19:40:55 +0000 (13:40 -0600)
committerDave Kleikamp <shaggy@linux.vnet.ibm.com>
Mon, 2 Feb 2009 19:40:55 +0000 (13:40 -0600)
1  2 
fs/jfs/super.c

diff --cc fs/jfs/super.c
Simple merge