aboutsummaryrefslogtreecommitdiff
path: root/arch/cris/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 07:33:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-03 07:33:50 -0800
commit4850f524b2c4c8a4e9f8ef4dd9c7c4afde2f2b2c (patch)
treedeba82fa7cac39dac62d22a36ecc714d05a0f425 /arch/cris/kernel/Makefile
parent3ff1562ea48cddaa5ac1adcb8892227389a4c96c (diff)
parent4818972efb105730f007e5efc05e203a065fc318 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw: GFS2: print glock numbers in hex GFS2: ordered writes are backwards GFS2: Remove old, unused linked list code from quota GFS2: Remove loopy umount code GFS2: Metadata address space clean up
Diffstat (limited to 'arch/cris/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions