- Update to 2.6.37-rc5.
authorJeff Mahoney <jeffm@suse.com>
Tue, 7 Dec 2010 15:14:14 +0000 (10:14 -0500)
committerJeff Mahoney <jeffm@suse.com>
Tue, 7 Dec 2010 15:14:14 +0000 (10:14 -0500)
suse-commit: ca102d9578b1b1da24780ff43a0e135f75727a45

18 files changed:
1  2 
Documentation/filesystems/vfs.txt
Makefile
arch/x86/xen/enlighten.c
drivers/gpu/drm/i915/i915_gem.c
drivers/hid/hid-core.c
drivers/macintosh/Kconfig
drivers/serial/8250.c
drivers/tty/tty_io.c
drivers/watchdog/Kconfig
fs/nfs/dir.c
fs/proc/base.c
include/linux/gfp.h
include/xen/interface/physdev.h
mm/page_alloc.c
mm/slub.c
mm/vmalloc.c
mm/vmstat.c
net/mac80211/Kconfig

Simple merge
diff --cc Makefile
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/nfs/dir.c
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/slub.c
Simple merge
diff --cc mm/vmalloc.c
Simple merge
diff --cc mm/vmstat.c
Simple merge
Simple merge