]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ad53a9 45c82b5)
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 patch | diff1 | diff2 | blob | history

diff --cc fs/jfs/super.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.