Merge branch 'master' into export-slabh
authorTejun Heo <tj@kernel.org>
Mon, 5 Apr 2010 02:37:28 +0000 (11:37 +0900)
committerTejun Heo <tj@kernel.org>
Mon, 5 Apr 2010 02:37:28 +0000 (11:37 +0900)
commit336f5899d287f06d8329e208fc14ce50f7ec9698
tree9b762d450d5eb248a6ff8317badb7e223d93ed58
parenta4ab2773205e8b94c18625455f85e3b6bb9d7ad6
parentdb217dece3003df0841bacf9556b5c06aa097dae
Merge branch 'master' into export-slabh
46 files changed:
arch/arm/kernel/kprobes.c
arch/microblaze/kernel/dma.c
arch/microblaze/mm/init.c
arch/sparc/mm/init_64.c
arch/x86/kernel/cpu/perf_event.c
arch/x86/kernel/setup.c
arch/x86/kernel/smpboot.c
arch/x86/mm/init.c
drivers/gpu/drm/drm_edid.c
drivers/gpu/drm/drm_fb_helper.c
drivers/gpu/drm/drm_fops.c
drivers/gpu/drm/nouveau/nouveau_bo.c
drivers/gpu/drm/nouveau/nouveau_state.c
drivers/gpu/drm/radeon/atom.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/r100.c
drivers/gpu/drm/radeon/r300.c
drivers/gpu/drm/radeon/r420.c
drivers/gpu/drm/radeon/r600.c
drivers/gpu/drm/radeon/radeon_device.c
drivers/gpu/drm/radeon/radeon_object.c
drivers/gpu/drm/radeon/rs400.c
drivers/gpu/drm/radeon/rv515.c
drivers/gpu/drm/radeon/rv770.c
drivers/gpu/drm/ttm/ttm_memory.c
drivers/gpu/drm/ttm/ttm_tt.c
drivers/hid/usbhid/hid-quirks.c
drivers/platform/x86/asus-laptop.c
drivers/serial/sunsu.c
drivers/usb/gadget/r8a66597-udc.c
drivers/video/sunxvr500.c
fs/logfs/dev_bdev.c
fs/logfs/dir.c
fs/logfs/journal.c
fs/logfs/readwrite.c
fs/logfs/segment.c
fs/logfs/super.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/reiserfs/super.c
include/drm/drmP.h
kernel/cgroup_freezer.c
kernel/cred.c
kernel/perf_event.c
kernel/sched.c
kernel/trace/ring_buffer.c