72b3729 Revert "Merge branch 'kernel-git' strategy 'theirs'"

Authored and Committed by Kyle McMartin 13 years ago
43 files changed. 3428 lines added. 476 lines removed.
.gitignore
file modified
+2 -2
Makefile
file modified
+2 -8
acpi-ec-add-delay-before-write.patch
file modified
+3 -2
acpi-update-battery-information-on-notification-0x81.patch
file modified
+2 -2
btusb-macbookpro-6-2.patch
file added
+41
btusb-macbookpro-7-1.patch
file added
+42
config-arm
file modified
+0 -7
config-debug
file modified
+1 -5
config-generic
file modified
+9 -98
config-nodebug
file modified
+4 -8
config-powerpc-generic
file modified
+0 -2
config-s390x
file modified
+0 -5
config-sparc64-generic
file modified
+0 -2
config-x86-generic
file modified
+1 -20
config-x86_64-generic
file modified
+0 -18
debug-tty-print-dev-name.patch
file modified
+7 -7
drm-intel-big-hammer.patch
file modified
+8 -13
drm-intel-edp-fixes.patch
file removed
-44
drm-intel-make-lvds-work.patch
file modified
+9 -13
hdpvr-ir-enable.patch
file modified
+3 -12
kernel.spec
file modified
+171 -87
linux-2.6-32bit-mmap-exec-randomization.patch
file modified
+1 -1
linux-2.6-bluetooth-autosuspend.patch
file added
+159
linux-2.6-crash-driver.patch
file modified
+14 -10
linux-2.6-enable-more-pci-autosuspend.patch
file modified
+192 -84
linux-2.6-i386-nx-emulation.patch
file modified
+1 -1
linux-2.6-qcserial-autosuspend.patch
file added
+23
linux-2.6-utrace-ptrace.patch
file modified
+16 -19
linux-2.6-utrace.patch
file modified
+3 -3
linux-2.6-uvc-autosuspend.patch
file added
+22
pci-crs-fixes.patch
file added
+593
runtime_pm_fixups.patch
file modified
+1 -1
sources
file modified
+2 -2
wacom-01-add-fuzz-parameters-to-features.patch
file added
+69
wacom-02-parse-the-bamboo-device-family.patch
file added
+122
wacom-03-collect-device-quirks-into-single-function.patch
file added
+107
wacom-04-add-support-for-the-bamboo-touch-trackpad.patch
file added
+172
wacom-05-add-a-quirk-for-low-resolution-bamboo-devices.patch
file added
+69
wacom-06-request-tablet-data-for-bamboo-pens.patch
file added
+55
wacom-07-move-bamboo-touch-irq-to-its-own-function.patch
file added
+52
wacom-08-add-support-for-bamboo-pen.patch
file added
+130
wacom-09-disable-bamboo-touchpad-when-pen-is-being-used.patch
file added
+31
xhci_hcd-suspend-resume.patch
file added
+1289
    Revert "Merge branch 'kernel-git' strategy 'theirs'"
    
    This reverts commit a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf, reversing
    changes made to ee99a68c51ebd08409e45b63796f3c971c27e3d6.
    
        
file modified
+2 -2
file modified
+2 -8
file modified
+0 -7
file modified
+1 -5
file modified
+9 -98
file modified
+4 -8
file modified
+0 -2
file modified
+0 -5
file modified
+0 -2
file modified
+1 -20
file modified
+0 -18
file modified
+8 -13
file modified
+3 -12
file modified
+171 -87
file modified
+14 -10
file modified
+16 -19
file modified
+3 -3
file added
+593
file modified
+1 -1
file modified
+2 -2