summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-08-06Add linux-next specific files for 20090806next-20090806Stephen Rothwell
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
2009-08-06Revert "agp: Switch agp_{un,}map_page() to take struct page * argument"Stephen Rothwell
This reverts commit c2980d8c2961113f24863f70d8ad016f55224c81.
2009-08-06Revert "agp: kill phys_to_gart() and gart_to_phys()"Stephen Rothwell
This reverts commit 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0.
2009-08-06Merge branch 'quilt/staging'Stephen Rothwell
Conflicts: drivers/staging/epl/VirtualEthernetLinux.c
2009-08-06Merge branch 'quilt/usb'Stephen Rothwell
Conflicts: drivers/usb/gadget/m66592-udc.c drivers/usb/host/r8a66597-hcd.c
2009-08-06Merge branch 'quilt/tty'Stephen Rothwell
Conflicts: arch/x86/include/asm/termios.h
2009-08-06Merge branch 'quilt/driver-core'Stephen Rothwell
Conflicts: init/main.c
2009-08-06Merge commit 'asm-generic/next'Stephen Rothwell
2009-08-06Merge commit 'sfi/sfi-test'Stephen Rothwell
2009-08-06Merge commit 'percpu/for-next'Stephen Rothwell
Conflicts: arch/sh/kernel/vmlinux.lds.S arch/x86/kernel/cpu/perf_counter.c drivers/cpufreq/cpufreq_ondemand.c
2009-08-06Merge commit 'edac-amd/for-next'Stephen Rothwell
Conflicts: arch/x86/kernel/smpboot.c
2009-08-06Merge commit 'oprofile/for-next'Stephen Rothwell
2009-08-06Merge commit 'tip/auto-latest'Stephen Rothwell
Conflicts: include/linux/rcupdate.h kernel/fork.c
2009-08-06Merge commit 'kmemleak/kmemleak'Stephen Rothwell
2009-08-06Merge commit 'drbd/drbd'Stephen Rothwell
2009-08-06Merge commit 'hwlat/for-linus'Stephen Rothwell
2009-08-06Merge commit 'fsnotify/for-next'Stephen Rothwell
2009-08-06Merge commit 'bluetooth/master'Stephen Rothwell
2009-08-06Merge commit 'suspend/linux-next'Stephen Rothwell
2009-08-06Merge commit 'trivial/for-next'Stephen Rothwell
Conflicts: MAINTAINERS
2009-08-06Merge commit 'jc_docs/docs-next'Stephen Rothwell
2009-08-06Merge commit 'cputime/cputime'Stephen Rothwell
2009-08-06Merge commit 'dwmw2-iommu/master'Stephen Rothwell
2009-08-06Merge commit 'agp/agp-next'Stephen Rothwell
2009-08-06Merge commit 'security-testing/next'Stephen Rothwell
2009-08-06Merge commit 'voltage/for-next'Stephen Rothwell
2009-08-06Merge commit 'drm/drm-next'Stephen Rothwell
Conflicts: drivers/gpu/drm/drm_crtc.c
2009-08-06Merge commit 'mfd/for-next'Stephen Rothwell
Conflicts: drivers/input/misc/Kconfig
2009-08-06Merge commit 'slab/for-next'Stephen Rothwell
2009-08-06Merge commit 'kgdb/kgdb-next'Stephen Rothwell
2009-08-06Merge commit 'battery/master'Stephen Rothwell
2009-08-06Merge commit 'block/for-next'Stephen Rothwell
2009-08-06Merge commit 'input/next'Stephen Rothwell
2009-08-06Revert "cpumask:remove-set_cpus_allowed"Stephen Rothwell
This reverts commit 17e249fb40c814a72f08c1356cb47ec9f87f81a8.
2009-08-06Merge branch 'quilt/rr'Stephen Rothwell
Conflicts: arch/x86/lguest/boot.c drivers/lguest/page_tables.c drivers/virtio/virtio_pci.c
2009-08-06Merge commit 'cpufreq/next'Stephen Rothwell
2009-08-06Merge commit 'sound/for-next'Stephen Rothwell
2009-08-06Merge commit 'crypto/master'Stephen Rothwell
2009-08-06Merge commit 'mtd/master'Stephen Rothwell
2009-08-06Merge commit 'wireless/master'Stephen Rothwell
2009-08-06Merge commit 'net/master'Stephen Rothwell
2009-08-06Merge commit 'udf/for_next'Stephen Rothwell
2009-08-06Merge commit 'scsi/master'Stephen Rothwell
2009-08-06Merge commit 'kvm/master'Stephen Rothwell
2009-08-06Merge commit 'ubi/linux-next'Stephen Rothwell
2009-08-06Merge commit 'ieee1394/for-next'Stephen Rothwell
2009-08-06Merge commit 'acpi/test'Stephen Rothwell
2009-08-06Merge commit 'infiniband/for-next'Stephen Rothwell
2009-08-06Merge commit 'libata/NEXT'Stephen Rothwell
2009-08-06Merge commit 'kbuild/master'Stephen Rothwell