summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2009-01-26Merge branch 'quilt/staging'Stephen Rothwell
2009-01-26Merge commit 'kmemleak/kmemleak'Stephen Rothwell
Conflicts: include/linux/slab.h init/main.c mm/slab.c mm/slob.c mm/slub.c mm/vmalloc.c
2009-01-26Merge commit 'osd/linux-next'Stephen Rothwell
2009-01-26Merge commit 'proc/proc'Stephen Rothwell
Conflicts: security/selinux/hooks.c
2009-01-26Merge commit 'iommu/auto-iommu-next'Stephen Rothwell
Conflicts: arch/x86/include/asm/dma-mapping.h
2009-01-26Merge commit 'sparseirq/auto-sparseirq-next'Stephen Rothwell
Conflicts: kernel/irq/handle.c
2009-01-26Merge commit 'voltage/for-next'Stephen Rothwell
2009-01-26Merge commit 'kmemcheck/auto-kmemcheck-next'Stephen Rothwell
Conflicts: MAINTAINERS arch/x86/mm/fault.c
2009-01-26Merge commit 'slab/for-next'Stephen Rothwell
Conflicts: include/linux/slub_def.h mm/slob.c mm/slub.c
2009-01-26Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-01-26Merge commit 'leds/for-mm'Stephen Rothwell
2009-01-26Merge commit 'bkl-removal/bkl-removal'Stephen Rothwell
2009-01-26Merge commit 'gfs2/master'Stephen Rothwell
2009-01-26Merge branch 'quilt/rr'Stephen Rothwell
2009-01-26Merge commit 'sound/for-next'Stephen Rothwell
2009-01-26Merge commit 'crypto/master'Stephen Rothwell
2009-01-26Revert "com20020: convert to net_devic_ops"Stephen Rothwell
This reverts commit a1799af4d7deefccdaa9d222a886fa1373dbb49a.
2009-01-26Revert "com20020: Fix allyesconfig build failure."Stephen Rothwell
This reverts commit 0db155de988031f925096a7df1bf9633790a2c18.
2009-01-26Merge commit 'net/master'Stephen Rothwell
2009-01-26Merge commit 'async_tx/next'Stephen Rothwell
2009-01-26Merge commit 'ext4/next'Stephen Rothwell
2009-01-26Merge commit 'scsi/master'Stephen Rothwell
2009-01-26Merge commit 'kvm/master'Stephen Rothwell
2009-01-26Merge commit 'ubi/linux-next'Stephen Rothwell
2009-01-26Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-01-26Merge commit 'acpi/test'Stephen Rothwell
2009-01-26Merge commit 'infiniband/for-next'Stephen Rothwell
2009-01-26Merge commit 'nfs/linux-next'Stephen Rothwell
2009-01-26Merge branch 'quilt/ide'Stephen Rothwell
Conflicts: drivers/ide/ide-acpi.c
2009-01-26Merge commit 'quota/for_next'Stephen Rothwell
2009-01-26Merge commit 'v4l-dvb/master'Stephen Rothwell
2009-01-26Merge branch 'quilt/i2c'Stephen Rothwell
Conflicts: arch/arm/configs/magician_defconfig
2009-01-26Merge commit 'hid/for-next'Stephen Rothwell
2009-01-26Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-01-26Merge commit 'pci/linux-next'Stephen Rothwell
2009-01-26Merge commit 'timers/auto-timers-next'Stephen Rothwell
2009-01-26Merge commit 'sched/auto-sched-next'Stephen Rothwell
2009-01-26Merge commit 'safe-poison-pointers/auto-safe-poison-pointers-next'Stephen Rothwell
2009-01-26Merge commit 'genirq/auto-genirq-next'Stephen Rothwell
2009-01-26Merge commit 'ftrace/auto-ftrace-next'Stephen Rothwell
2009-01-26Merge commit 'tip-core/auto-core-next'Stephen Rothwell
Conflicts: arch/x86/kernel/setup_percpu.c
2009-01-26Revert "driver core: get rid of struct device's bus_id string array"Stephen Rothwell
This reverts commit 73babb2d89a71d2110b65aab658e6309748827c2.
2009-01-26Merge branch 'quilt/usb'Stephen Rothwell
2009-01-26Merge branch 'quilt/driver-core'Stephen Rothwell
2009-01-26Merge commit 'x86/auto-x86-next'Stephen Rothwell
2009-01-26Merge commit 'm68knommu/for-next'Stephen Rothwell
Conflicts: arch/m68knommu/include/asm/Kbuild
2009-01-26Merge branch 'quilt/usb.current'Stephen Rothwell
2009-01-26Merge branch 'quilt/driver-core.current'Stephen Rothwell
2009-01-26Merge commit 'pci-current/for-linus'Stephen Rothwell
2009-01-26Merge commit 'sound-current/for-linus'Stephen Rothwell