summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-07-28Add linux-next specific files for 20100728next-20100728Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-07-28kvm: u64's should be printed with %llxStephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2010-07-28Merge remote branch 'scsi-post-merge/master'Stephen Rothwell
2010-07-28Merge remote branch 'staging-next/staging-next'Stephen Rothwell
Conflicts: drivers/staging/Kconfig drivers/staging/batman-adv/bat_sysfs.c drivers/staging/batman-adv/device.c drivers/staging/batman-adv/hard-interface.c drivers/staging/cx25821/cx25821-audups11.c
2010-07-28Merge branch 'quilt/usb'Stephen Rothwell
2010-07-28Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: include/linux/serial_core.h
2010-07-28Merge branch 'quilt/driver-core'Stephen Rothwell
2010-07-28Merge remote branch 'bkl-ioctl/bkl/ioctl'Stephen Rothwell
2010-07-28Merge remote branch 'bkl-core/bkl/core'Stephen Rothwell
2010-07-28Merge remote branch 'hwpoison/hwpoison'Stephen Rothwell
Conflicts: mm/memory-failure.c
2010-07-28Merge remote branch 'drivers-x86/linux-next'Stephen Rothwell
2010-07-28Merge remote branch 'workqueues/for-next'Stephen Rothwell
Conflicts: fs/cifs/cifsfs.c fs/cifs/cifsglob.h fs/cifs/file.c include/linux/workqueue.h kernel/trace/Kconfig kernel/workqueue.c
2010-07-28Merge remote branch 'percpu/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'oprofile/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'edac-amd/for-next'Stephen Rothwell
2010-07-28Merge commit 'refs/next/20100727/tip'Stephen Rothwell
Conflicts: Makefile drivers/cpufreq/cpufreq.c tools/perf/Makefile
2010-07-28Merge commit 'refs/next/20100727/xen'Stephen Rothwell
Conflicts: arch/x86/kernel/hpet.c
2010-07-28Merge remote branch 'omap_dss2/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'limits/writable_limits'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 include/asm-generic/unistd.h
2010-07-28Merge remote branch 'spi/next-spi'Stephen Rothwell
2010-07-28Merge remote branch 'devicetree/next-devicetree'Stephen Rothwell
Conflicts: arch/microblaze/kernel/Makefile
2010-07-28Merge remote branch 'i7core_edac/linux_next'Stephen Rothwell
Conflicts: MAINTAINERS
2010-07-28Merge remote branch 'alacrity/linux-next'Stephen Rothwell
2010-07-28Merge remote branch 'catalin/for-next'Stephen Rothwell
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/mmu.c
2010-07-28Merge remote branch 'irda/for-next'Stephen Rothwell
Conflicts: drivers/net/irda/irda-usb.c
2010-07-28Merge remote branch 'fsnotify/for-next'Stephen Rothwell
Conflicts: fs/notify/inotify/inotify.c
2010-07-28Merge remote branch 'bluetooth/master'Stephen Rothwell
2010-07-28Merge remote branch 'suspend/linux-next'Stephen Rothwell
Conflicts: drivers/net/wireless/ipw2x00/ipw2100.c
2010-07-28Merge branch 'quilt/aoe'Stephen Rothwell
2010-07-28Merge remote branch 'trivial/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'osd/linux-next'Stephen Rothwell
2010-07-28Merge remote branch 'watchdog/master'Stephen Rothwell
2010-07-28Merge remote branch 'uwb/for-upstream'Stephen Rothwell
2010-07-28Merge remote branch 'agp/agp-next'Stephen Rothwell
2010-07-28Merge remote branch 'security-testing/next'Stephen Rothwell
2010-07-28Merge remote branch 'voltage/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'viafb/viafb-next'Stephen Rothwell
2010-07-28Merge remote branch 'drm/drm-next'Stephen Rothwell
2010-07-28Merge remote branch 'mfd/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'md/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'slab/for-next'Stephen Rothwell
2010-07-28Merge remote branch 'kgdb/kgdb-next'Stephen Rothwell
2010-07-28Merge remote branch 'leds/for-mm'Stephen Rothwell
2010-07-28Merge remote branch 'battery/master'Stephen Rothwell
Conflicts: drivers/power/Kconfig drivers/power/Makefile
2010-07-28Merge remote branch 'pcmcia/master'Stephen Rothwell
2010-07-28Merge branch 'quilt/device-mapper'Stephen Rothwell
Conflicts: drivers/md/dm.c
2010-07-28Merge remote branch 'block/for-next'Stephen Rothwell
Conflicts: drivers/block/virtio_blk.c drivers/scsi/scsi_error.c
2010-07-28Merge remote branch 'input/next'Stephen Rothwell
Conflicts: arch/arm/plat-samsung/include/plat/keypad.h
2010-07-28Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/um/drivers/hostaudio_kern.c
2010-07-28Merge remote branch 'cpufreq/next'Stephen Rothwell