Age | Commit message (Collapse) | Author | |
---|---|---|---|
2010-07-28 | kvm: u64's should be printed with %llx | Stephen Rothwell | |
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> | |||
2010-07-28 | Merge 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-28 | Merge branch 'quilt/usb' | Stephen Rothwell | |
2010-07-28 | Merge branch 'quilt/tty' | Stephen Rothwell | |
Conflicts: include/linux/serial_core.h | |||
2010-07-28 | Merge remote branch 'drivers-x86/linux-next' | Stephen Rothwell | |
2010-07-28 | Merge 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-28 | Merge remote branch 'oprofile/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'edac-amd/for-next' | Stephen Rothwell | |
2010-07-28 | Merge commit 'refs/next/20100727/tip' | Stephen Rothwell | |
Conflicts: Makefile drivers/cpufreq/cpufreq.c tools/perf/Makefile | |||
2010-07-28 | Merge commit 'refs/next/20100727/xen' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/hpet.c | |||
2010-07-28 | Merge remote branch 'omap_dss2/for-next' | Stephen Rothwell | |
2010-07-28 | Merge 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-28 | Merge remote branch 'devicetree/next-devicetree' | Stephen Rothwell | |
Conflicts: arch/microblaze/kernel/Makefile | |||
2010-07-28 | Merge remote branch 'alacrity/linux-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'catalin/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/kernel/entry-armv.S arch/arm/mm/mmu.c | |||
2010-07-28 | Merge remote branch 'fsnotify/for-next' | Stephen Rothwell | |
Conflicts: fs/notify/inotify/inotify.c | |||
2010-07-28 | Merge remote branch 'trivial/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'voltage/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'block/for-next' | Stephen Rothwell | |
Conflicts: drivers/block/virtio_blk.c drivers/scsi/scsi_error.c | |||
2010-07-28 | Merge remote branch 'input/next' | Stephen Rothwell | |
Conflicts: arch/arm/plat-samsung/include/plat/keypad.h | |||
2010-07-28 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: arch/um/drivers/hostaudio_kern.c | |||
2010-07-28 | Merge remote branch 'cpufreq/next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'sound/for-next' | Stephen Rothwell | |
Conflicts: Documentation/kernel-parameters.txt | |||
2010-07-28 | Merge remote branch 'crypto/master' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'net/master' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'async_tx/next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-ux500/devices-db8500.c | |||
2010-07-28 | Merge remote branch 'kvm/linux-next' | Stephen Rothwell | |
Conflicts: arch/x86/kvm/paging_tmpl.h | |||
2010-07-28 | Merge remote branch 'pci/linux-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'vfs/for-next' | Stephen Rothwell | |
Conflicts: fs/nilfs2/super.c fs/xfs/linux-2.6/xfs_aops.c fs/xfs/linux-2.6/xfs_super.c | |||
2010-07-28 | Merge remote branch 'xtensa/master' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'tile/master' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'genesis/master' | Stephen Rothwell | |
Conflicts: arch/arm/configs/ap4evb_defconfig arch/arm/configs/g3evm_defconfig arch/arm/configs/g4evm_defconfig | |||
2010-07-28 | Merge remote branch 'sh/master' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 's390/features' | Stephen Rothwell | |
2010-07-28 | Merge remote branch '52xx-and-virtex/next' | Stephen Rothwell | |
Conflicts: drivers/serial/mpc52xx_uart.c | |||
2010-07-28 | Merge remote branch '4xx/next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'powerpc/next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'mips/mips-for-linux-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'microblaze/next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'm68knommu/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'm68k/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'ia64/test' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'blackfin/for-linus' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'tegra/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/Kconfig | |||
2010-07-28 | Merge remote branch 's5p/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'omap/for-next' | Stephen Rothwell | |
Conflicts: arch/arm/mach-omap2/board-3430sdp.c arch/arm/mach-omap2/board-3630sdp.c arch/arm/mach-omap2/board-am3517evm.c arch/arm/mach-omap2/board-cm-t35.c arch/arm/mach-omap2/board-devkit8000.c arch/arm/mach-omap2/board-igep0020.c arch/arm/mach-omap2/board-ldp.c arch/arm/mach-omap2/board-omap3beagle.c arch/arm/mach-omap2/board-omap3evm.c arch/arm/mach-omap2/board-omap3pandora.c arch/arm/mach-omap2/board-omap3touchbook.c arch/arm/mach-omap2/board-overo.c arch/arm/mach-omap2/board-zoom2.c arch/arm/mach-omap2/board-zoom3.c | |||
2010-07-28 | Merge remote branch 'msm/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'i.MX/for-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'davinci/davinci-next' | Stephen Rothwell | |
2010-07-28 | Merge remote branch 'arm/devel' | Stephen Rothwell | |