Age | Commit message (Collapse) | Author | |
---|---|---|---|
2009-08-06 | Revert "agp: Switch agp_{un,}map_page() to take struct page * argument" | Stephen Rothwell | |
This reverts commit c2980d8c2961113f24863f70d8ad016f55224c81. | |||
2009-08-06 | Revert "agp: kill phys_to_gart() and gart_to_phys()" | Stephen Rothwell | |
This reverts commit 6a12235c7d2d75c7d94b9afcaaecd422ff845ce0. | |||
2009-08-06 | Merge branch 'quilt/staging' | Stephen Rothwell | |
Conflicts: drivers/staging/epl/VirtualEthernetLinux.c | |||
2009-08-06 | Merge branch 'quilt/usb' | Stephen Rothwell | |
Conflicts: drivers/usb/gadget/m66592-udc.c drivers/usb/host/r8a66597-hcd.c | |||
2009-08-06 | Merge branch 'quilt/tty' | Stephen Rothwell | |
Conflicts: arch/x86/include/asm/termios.h | |||
2009-08-06 | Merge branch 'quilt/driver-core' | Stephen Rothwell | |
Conflicts: init/main.c | |||
2009-08-06 | Merge commit 'sfi/sfi-test' | Stephen Rothwell | |
2009-08-06 | Merge 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-06 | Merge commit 'edac-amd/for-next' | Stephen Rothwell | |
Conflicts: arch/x86/kernel/smpboot.c | |||
2009-08-06 | Merge commit 'tip/auto-latest' | Stephen Rothwell | |
Conflicts: include/linux/rcupdate.h kernel/fork.c | |||
2009-08-06 | Merge commit 'drbd/drbd' | Stephen Rothwell | |
2009-08-06 | Merge commit 'hwlat/for-linus' | Stephen Rothwell | |
2009-08-06 | Merge commit 'bluetooth/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'suspend/linux-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'trivial/for-next' | Stephen Rothwell | |
Conflicts: MAINTAINERS | |||
2009-08-06 | Merge commit 'dwmw2-iommu/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'agp/agp-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'voltage/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'drm/drm-next' | Stephen Rothwell | |
Conflicts: drivers/gpu/drm/drm_crtc.c | |||
2009-08-06 | Merge commit 'mfd/for-next' | Stephen Rothwell | |
Conflicts: drivers/input/misc/Kconfig | |||
2009-08-06 | Merge commit 'battery/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'block/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'input/next' | Stephen Rothwell | |
2009-08-06 | Merge branch 'quilt/rr' | Stephen Rothwell | |
Conflicts: arch/x86/lguest/boot.c drivers/lguest/page_tables.c drivers/virtio/virtio_pci.c | |||
2009-08-06 | Merge commit 'cpufreq/next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'crypto/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'mtd/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'wireless/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'net/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'scsi/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 'ubi/linux-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'ieee1394/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'acpi/test' | Stephen Rothwell | |
2009-08-06 | Merge commit 'infiniband/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'libata/NEXT' | Stephen Rothwell | |
2009-08-06 | Merge commit 'v4l-dvb/master' | Stephen Rothwell | |
Conflicts: arch/arm/mach-davinci/board-dm646x-evm.c arch/arm/mach-davinci/dm355.c arch/arm/mach-davinci/dm644x.c arch/arm/mach-davinci/dm646x.c arch/arm/mach-davinci/include/mach/dm355.h arch/arm/mach-davinci/include/mach/dm644x.h | |||
2009-08-06 | Merge branch 'quilt/jdelvare-hwmon' | Stephen Rothwell | |
2009-08-06 | Merge branch 'quilt/i2c' | Stephen Rothwell | |
2009-08-06 | Merge commit 'hid/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'pci/linux-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'sh/master' | Stephen Rothwell | |
2009-08-06 | Merge commit 's390/features' | Stephen Rothwell | |
2009-08-06 | Merge commit 'm68knommu/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'm68k/for-next' | Stephen Rothwell | |
2009-08-06 | Merge commit 'pxa/for-next' | Stephen Rothwell | |
Conflicts: MAINTAINERS | |||
2009-08-06 | Merge commit 'arm/devel' | Stephen Rothwell | |
Conflicts: MAINTAINERS | |||
2009-08-06 | Merge branch 'quilt/usb.current' | Stephen Rothwell | |
2009-08-06 | Merge commit 'arm-current/master' | Stephen Rothwell | |
2009-08-06 | Staging: pata_rdc: remove the driver from the staging tree | Greg Kroah-Hartman | |
Now that a "real" driver is in the libata tree for this hardware, we need to remove the staging driver as it is no longer needed. Cc: Kevin Huang <Kevin.Huang@rdc.com.tw> Cc: Tomy Wang <Tomy.Wang@rdc.com.tw> Cc: Alan Cox <alan@linux.intel.com> Cc: Jeff Garzik <jeff@garzik.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> | |||
2009-08-06 | Staging: remove epl driver | Greg Kroah-Hartman | |
This is no longer maintained upstream, and no one cares about it at all, so delete it. The fact that it is duplicating an existing network driver also is a good reason to remove it, it's causing nothing but trouble right now. Cc: Daniel Krueger <daniel.krueger@systec-electronic.com> Cc: Ronald Sieber <Ronald.Sieber@systec-electronic.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |