diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 00:01:22 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-13 00:01:22 -0700 |
| commit | aeced238faea151e353a82fd176557418141e0dc (patch) | |
| tree | 9e72ceb99eda68ae14e27d4af2487b46e02240a6 /series | |
| parent | 41278505416d0546bc2988bcb6c71538c5b3db88 (diff) | |
| parent | 6e9f440490ff7de2f449e4d9fdc9c6658ffc11e7 (diff) | |
| download | patches-aeced238faea151e353a82fd176557418141e0dc.tar.gz | |
Merge branch 'master' of ra.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
0001-kdbus-interprocess-message-router.patch
Diffstat (limited to 'series')
| -rw-r--r-- | series | 147 |
1 files changed, 95 insertions, 52 deletions
@@ -1,54 +1,97 @@ # My specific stuff, at the top to make it easier to work stuff below. -devnode_gid.patch -0001-kdbus-interprocess-message-router.patch -dbus.patch -dev_removal.patch - - -time-don-t-inline-export_symbol-functions.patch -gregkh/gkh-version.patch - -##################################################################### -# Stuff to be merged for 2.6.37 -##################################################################### - -################################# -# Driver core patches for 2.6.37 -################################# - - -################################# -# TTY patches for 2.6.37 -################################# - - -################################# -# USB patches for 2.6.37 -################################# - - -################################# -# Staging patches for 2.6.37 -################################# - - -##################################################################### -# Stuff to be merged after 2.6.37 is out -##################################################################### - -############################################# -# Driver core patches for after 2.6.37 is out -############################################# - -##################################### -# TTY patches for after 2.6.37 is out -##################################### - -################################### -# USB stuff for after 2.6.37 is out -################################### - - -# staging stuff for next is now in the staging-next tree on git.kernel.org - +# driver core attribute cleanup work +sysfs.h-add-__attr_rw-macro.patch +sysfs.h-add-attribute_groups-macro.patch +sysfs.h-add-bin_attr-macro.patch +driver-core-add-device_attr_rw-and-device_attr_ro-macros.patch +sysfs-add-support-for-binary-attributes-in-groups.patch +driver-core-introduce-device_create_groups.patch +driver-core-add-default-groups-to-struct-class.patch + +# dev_groups to struct class work +misc-c2port-use-dev_bin_attrs-instead-of-hand-coding-it.patch +mips-convert-vpe_class-to-use-dev_groups.patch +bsr-convert-bsr_class-to-use-dev_groups.patch +tile-srom-convert-srom_class-to-use-dev_groups.patch +dma-convert-dma_devclass-to-use-dev_groups.patch +devfreq-convert-devfreq_class-to-use-dev_groups.patch +extcon-convert-extcon_class-to-use-dev_groups.patch +hid-roccat-convert-class-code-to-use-dev_groups.patch +isdn-convert-class-code-to-use-dev_groups.patch +leds-convert-class-code-to-use-dev_groups.patch +v4l2-convert-class-code-to-use-dev_groups.patch +c2port-convert-class-code-to-use-dev_groups.patch +enclosure-convert-class-code-to-use-dev_groups.patch +pci-convert-class-code-to-use-dev_groups.patch +x86-wmi-convert-class-code-to-use-dev_groups.patch +pps-convert-class-code-to-use-dev_groups.patch +ptp-convert-class-code-to-use-dev_groups.patch +regulator-convert-class-code-to-use-dev_groups.patch +rtc-convert-class-code-to-use-dev_groups.patch +uio-convert-class-code-to-use-dev_groups.patch +cuse-convert-class-code-to-use-dev_groups.patch +staging-comedi-convert-class-code-to-use-dev_groups.patch +backing-dev-convert-class-code-to-use-dev_groups.patch +scsi-osd-convert-class-code-to-use-dev_groups.patch +scsi-sd-convert-class-code-to-use-dev_groups.patch +scsi-st-convert-class-code-to-use-dev_groups.patch +video-backlight-convert-class-code-to-use-dev_groups.patch +video-backlight-lcd-convert-class-code-to-use-dev_groups.patch +video-output-convert-class-code-to-use-dev_groups.patch +net-core-convert-class-code-to-use-dev_groups.patch +net-ieee802154-convert-class-code-to-use-dev_groups.patch +net-wireless-convert-class-code-to-use-dev_groups.patch +net-rfkill-convert-class-code-to-use-dev_groups.patch + +c2port-convert-class-code-to-use-bin_attrs-in-groups.patch +hid-roccat-convert-class-code-to-use-bin_attrs-in-groups.patch + +driver-core-remove-dev_attrs-from-struct-class.patch +driver-core-remove-dev_bin_attrs-from-struct-class.patch + +# usb DEBUG cleanups +usb-ldusb-remove-custom-dbg_info-macro.patch +usb-legotower-remove-unneeded-tracing-macros.patch +usb-legousbtower-remove-custom-debug-macro.patch +usb-legotower-remove-custom-debug-macro-and-module-parameter.patch +usb-legotower-remove-direct-calls-to-printk.patch +usb-adutux-remove-unneeded-tracing-macros.patch +usb-adutux-remove-custom-debug-macro.patch +usb-adutux-remove-custom-debug-macro-and-module-parameter.patch +usb-adutux-remove-direct-calls-to-printk.patch +usb-misc-remove-config_usb_debug-from-makefile.patch + +usb-usbatm-remove-unused-udsl_assert-macro.patch +usb-usbatm-remove-unneeded-trace-printk-calls.patch +usb-usbatm-don-t-rely-on-config_usb_debug.patch +usb-usbatm-move-the-atm_dbg-call-to-use-dynamic-debug.patch +usb-usbatm-remove-config_usb_debug-dependancy.patch +usb-phy-remove-custom-dbg-macro.patch +usb-phy-remove-config_usb_debug-usage.patch +usb-gadget-fix-up-comment.patch +usb-isp1362-remove-unused-_bug_on-calls.patch +usb-isp1362-remove-unused-_warn_on-calls.patch +usb-isp1362-remove-_dbg-usage.patch +usb-isp1362-remove-config_usb_debug-dependency.patch +usb-isp116x-remove-dependency-on-config_usb_debug.patch +usb-sl811-remove-config_usb_debug-dependency.patch + +usb-remove-unneeded-idr.h-include.patch +usb-sl811-move-debug-files-from-proc-to-debugfs.patch +usb-isp1362-move-debug-files-from-proc-to-debugfs.patch + +0001-Simulate-fake-Fn-key-on-PS-2-keyboards-w-o-one-eg.-C.patch + + +#gregkh/gkh-version.patch + +driver-core-bus_type-add-dev_groups.patch +driver-core-bus_type-add-drv_groups.patch +driver-core-bus_type-add-bus_groups.patch + + +f1.patch +f2.patch +f3.patch +f4.patch |