summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-12-01Add linux-next specific files for 20091201next-20091201Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-12-01slow-work: Fix build bug in the !CONFIG_MODULES caseIngo Molnar
Commit 3bde31a ("SLOW_WORK: Allow a requeueable work item to sleep till the thread is needed") broke the !CONFIG_MODULES build by relying on variables that are only available (and only make sense) with module support enabled. Fix it. Cc: David Howells <dhowells@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-12-01Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/Kconfig drivers/staging/Makefile drivers/staging/comedi/drivers/ni_labpc_cs.c drivers/staging/comedi/drivers/ni_mio_cs.c
2009-12-01Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: arch/arm/plat-mxc/Makefile
2009-12-01Merge branch 'quilt/tty'Stephen Rothwell
2009-12-01Merge branch 'quilt/driver-core'Stephen Rothwell
2009-12-01Merge remote branch 'sysctl/master'Stephen Rothwell
Conflicts: net/ipv6/addrconf.c net/sctp/sysctl.c
2009-12-01Merge remote branch 'asm-generic/next'Stephen Rothwell
2009-12-01Merge remote branch 'workqueues/for-next'Stephen Rothwell
Conflicts: init/Kconfig kernel/sched.c
2009-12-01Merge remote branch 'percpu/for-next'Stephen Rothwell
Conflicts: arch/powerpc/platforms/pseries/hvCall.S arch/x86/kvm/svm.c kernel/softlockup.c mm/slab.c
2009-12-01Merge remote branch 'edac-amd/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'tip/auto-latest'Stephen Rothwell
Conflicts: arch/x86/kernel/kgdb.c kernel/Makefile kernel/irq/chip.c kernel/printk.c scripts/recordmcount.pl
2009-12-01Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'limits/writable_limits'Stephen Rothwell
2009-12-01Merge remote branch 'spi/next-spi'Stephen Rothwell
2009-12-01Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
2009-12-01Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
2009-12-01Merge remote branch 'alacrity/linux-next'Stephen Rothwell
Conflicts: include/linux/Kbuild lib/Kconfig
2009-12-01Merge remote branch 'catalin/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'hwlat/for-linus'Stephen Rothwell
Conflicts: drivers/misc/Makefile
2009-12-01Merge remote branch 'irda/for-next'Stephen Rothwell
2009-12-01Merge 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-12-01Merge remote branch 'suspend/linux-next'Stephen Rothwell
2009-12-01Merge branch 'quilt/aoe'Stephen Rothwell
2009-12-01Merge remote branch 'trivial/for-next'Stephen Rothwell
Conflicts: Documentation/video4linux/gspca.txt
2009-12-01Merge remote branch 'osd/linux-next'Stephen Rothwell
2009-12-01Merge remote branch 'dwmw2-iommu/master'Stephen Rothwell
2009-12-01Merge remote branch 'watchdog/master'Stephen Rothwell
2009-12-01Merge remote branch 'agp/agp-next'Stephen Rothwell
2009-12-01Merge remote branch 'security-testing/next'Stephen Rothwell
Conflicts: Documentation/dontdiff
2009-12-01Merge remote branch 'voltage/for-next'Stephen Rothwell
Conflicts: drivers/mfd/Kconfig drivers/mfd/Makefile
2009-12-01Merge remote branch 'drm/drm-next'Stephen Rothwell
2009-12-01Merge remote branch 'mfd/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'md/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'slab/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2009-12-01Merge remote branch 'backlight/for-mm'Stephen Rothwell
Conflicts: drivers/platform/x86/thinkpad_acpi.c
2009-12-01Merge remote branch 'leds/for-mm'Stephen Rothwell
2009-12-01Merge remote branch 'battery/master'Stephen Rothwell
2009-12-01Merge remote branch 'pcmcia/master'Stephen Rothwell
Conflicts: drivers/mtd/maps/pcmciamtd.c drivers/net/pcmcia/fmvj18x_cs.c drivers/net/pcmcia/nmclan_cs.c drivers/net/wireless/ray_cs.c drivers/pcmcia/Makefile drivers/pcmcia/sa1100_h3600.c
2009-12-01Merge branch 'quilt/device-mapper'Stephen Rothwell
2009-12-01Merge remote branch 'block/for-next'Stephen Rothwell
2009-12-01Merge remote branch 'input/next'Stephen Rothwell
2009-12-01Merge remote branch 'tmio-mmc/linux-next'Stephen Rothwell
2009-12-01wireless: fix for mismergeStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-12-01Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/arm/kernel/vmlinux.lds.S
2009-12-01Merge remote branch 'cpufreq/next'Stephen Rothwell
Conflicts: include/acpi/processor.h
2009-12-01Merge remote branch 'crypto/master'Stephen Rothwell
2009-12-01Merge remote branch 'mtd/master'Stephen Rothwell
Conflicts: drivers/mtd/devices/m25p80.c drivers/mtd/nand/pxa3xx_nand.c
2009-12-01Merge remote branch 'wireless/master'Stephen Rothwell