summaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)Author
2009-11-26Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: arch/arm/plat-mxc/Makefile
2009-11-26Merge branch 'quilt/tty'Stephen Rothwell
2009-11-26Merge branch 'quilt/driver-core'Stephen Rothwell
2009-11-26Merge remote branch 'sysctl/master'Stephen Rothwell
Conflicts: net/ipv6/addrconf.c
2009-11-26Merge remote branch 'asm-generic/next'Stephen Rothwell
2009-11-26Merge commit 'refs/next/20091125/workqueues'Stephen Rothwell
2009-11-26Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/powerpc/platforms/pseries/hvCall.S arch/x86/kvm/svm.c kernel/softlockup.c
2009-11-26Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/kgdb.c kernel/irq/chip.c scripts/recordmcount.pl
2009-11-26Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'limits/writable_limits'Stephen Rothwell
2009-11-26Merge remote branch 'spi/next-spi'Stephen Rothwell
2009-11-26Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2009-11-26Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2009-11-26Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2009-11-26Merge remote branch 'catalin/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'drbd/for-jens'Stephen Rothwell
2009-11-26Merge remote branch 'fsnotify/for-next'Stephen Rothwell
Conflicts: arch/x86/ia32/ia32entry.S arch/x86/include/asm/unistd_32.h arch/x86/include/asm/unistd_64.h arch/x86/kernel/syscall_table_32.S fs/afs/write.c fs/cifs/dir.c fs/ubifs/file.c include/asm-generic/fcntl.h net/socket.c
2009-11-26Merge remote branch 'suspend/linux-next'Stephen Rothwell
2009-11-26Merge remote branch 'trivial/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'osd/linux-next'Stephen Rothwell
2009-11-26Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2009-11-26Merge remote branch 'security-testing/next'Stephen Rothwell
Conflicts: Documentation/dontdiff
2009-11-26Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile
2009-11-26Merge remote branch 'drm/drm-next'Stephen Rothwell
2009-11-26Merge remote branch 'mfd/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'md/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'slab/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2009-11-26Merge remote branch 'battery/master'Stephen Rothwell
2009-11-26Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/wireless/ray_cs.c drivers/pcmcia/Makefile
2009-11-26Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-11-26Merge remote branch 'block/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'input/next'Stephen Rothwell
2009-11-26Merge remote branch 'tmio-mmc/linux-next'Stephen Rothwell
2009-11-26Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/arm/kernel/vmlinux.lds.S
2009-11-26Merge remote branch 'cpufreq/next'Stephen Rothwell
Conflicts: include/acpi/processor.h
2009-11-26Merge remote branch 'sound/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'crypto/master'Stephen Rothwell
2009-11-26Merge remote branch 'mtd/master'Stephen Rothwell
2009-11-26Merge remote branch 'wireless/master'Stephen Rothwell
2009-11-26Merge remote branch 'net/master'Stephen Rothwell
Conflicts: drivers/ieee802154/fakehard.c drivers/net/e1000e/ich8lan.c drivers/net/e1000e/phy.c drivers/net/netxen/netxen_nic_init.c drivers/net/wireless/ath/ath9k/main.c net/wireless/wext.c
2009-11-26Merge remote branch 'scsi/master'Stephen Rothwell
2009-11-26Merge remote branch 'kvm/linux-next'Stephen Rothwell
2009-11-26Merge remote branch 'ieee1394/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'acpi/test'Stephen Rothwell
Conflicts: drivers/pci/hotplug/acpiphp_glue.c
2009-11-26Merge remote branch 'infiniband/for-next'Stephen Rothwell
2009-11-26Merge remote branch 'libata/NEXT'Stephen Rothwell
2009-11-26Merge remote branch 'kbuild/master'Stephen Rothwell
2009-11-26Merge remote branch 'v4l-dvb/master'Stephen Rothwell
Conflicts: drivers/media/common/tuners/tda18271-fe.c
2009-11-26Merge branch 'quilt/i2c'Stephen Rothwell