summaryrefslogtreecommitdiffstats
path: root/drivers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-10-021-0/+1
|\
| * cgroup: net_cls: Move sock_update_classid() declaration to cls_cgroup.hDaniel Wagner2012-09-141-0/+1
* | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-0293-212/+157
|\ \
| * | workqueue: deprecate __cancel_delayed_work()Tejun Heo2012-08-213-3/+3
| * | workqueue: use mod_delayed_work() instead of __cancel + queueTejun Heo2012-08-214-19/+8
| * | workqueue: make deferrable delayed_work initializer names consistentTejun Heo2012-08-2111-21/+21
| * | workqueue: deprecate system_nrt[_freezable]_wqTejun Heo2012-08-204-12/+12
| * | workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-2060-81/+81
| * | workqueue: use mod_delayed_work() instead of cancel + queueTejun Heo2012-08-1311-73/+29
* | | drivers: bus: omap_l3: fixup merge conflict resolutionOlof Johansson2012-10-011-1/+0
* | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-0189-106/+113
|\ \ \
| * \ \ Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-2286-93/+94
| |\ \ \
| | * | | ARM: spear: move platform_data definitionsArnd Bergmann2012-09-191-1/+1
| | * | | ARM: samsung: move platform_data definitionsArnd Bergmann2012-09-1913-13/+13
| | * | | ARM: orion: move platform_data definitionsArnd Bergmann2012-09-196-6/+6
| | * | | ARM: nomadik: move platform_data definitionsArnd Bergmann2012-09-145-5/+5
| | * | | ARM: w90x900: move platform_data definitionsArnd Bergmann2012-09-145-5/+5
| | * | | ARM: vt8500: move platform_data definitionsArnd Bergmann2012-09-142-2/+2
| | * | | ARM: tegra: move sdhci platform_data definitionArnd Bergmann2012-09-141-1/+1
| | * | | ARM: sa1100: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| | * | | ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-1412-13/+13
| | * | | ARM: netx: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| | * | | ARM: msm: move platform_data definitionsArnd Bergmann2012-09-149-9/+9
| | * | | ARM: imx: move platform_data definitionsArnd Bergmann2012-09-1416-20/+20
| | * | | ARM: ep93xx: move platform_data definitionsArnd Bergmann2012-09-145-6/+6
| | * | | ARM: davinci: move platform_data definitionsArnd Bergmann2012-09-148-9/+9
| | * | | ARM: at91: move platform_data definitionsArnd Bergmann2012-09-141-1/+1
| | | |/ | | |/|
| * | | Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux ...Olof Johansson2012-09-204-13/+19
| |\ \ \
| | * | | ARM: shmobile: move custom gpio functions to sh-gpio.hRob Herring2012-09-141-0/+1
| | * | | net: pxaficp_ir: add irq resourcesRob Herring2012-09-141-11/+17
| | * | | usb: pxa27x_udc: remove IRQ_USB defineRob Herring2012-09-141-1/+1
| | * | | staging: ste_rmi4: remove gpio.h includeRob Herring2012-09-141-1/+0
| * | | | Merge branch 'next/soc' into next/multiplatformOlof Johansson2012-09-209-0/+450
| |\ \ \ \
| * \ \ \ \ Merge branch 'next/dt' into next/multiplatformOlof Johansson2012-09-2032-264/+3427
| |\ \ \ \ \
* | \ \ \ \ \ Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-0122-112/+3420
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'samsung/pinctrl' into next/driversOlof Johansson2012-09-213-12/+32
| |\ \ \ \ \ \ \
| | * | | | | | | pinctrl: exynos: Fix wakeup IRQ domain registration checkTomasz Figa2012-09-211-1/+1
| | * | | | | | | pinctrl: samsung: Uninline samsung_pinctrl_get_soc_dataTomasz Figa2012-09-211-1/+1
| | * | | | | | | pinctrl: exynos: Correct the detection of wakeup-eint nodeTomasz Figa2012-09-211-5/+9
| | * | | | | | | pinctrl: exynos: Mark exynos_irq_demux_eint as inlineTomasz Figa2012-09-211-1/+1
| | * | | | | | | pinctrl: exynos: Handle only unmasked wakeup interruptsTomasz Figa2012-09-211-2/+5
| | * | | | | | | pinctrl: exynos: Fix typos in gpio/wkup _irq_maskTomasz Figa2012-09-211-2/+2
| | * | | | | | | pinctrl: exynos: Set pin function to EINT in irq_set_type of GPIO EINTaTomasz Figa2012-09-212-0/+13
| * | | | | | | | Merge branch 'next/pinctrl-samsung' of git://git.kernel.org/pub/scm/linux/ker...Olof Johansson2012-09-207-0/+1936
| |\| | | | | | |
| | * | | | | | | gpio: exynos4: skip gpiolib registration if pinctrl driver is usedThomas Abraham2012-09-071-0/+21
| | * | | | | | | pinctrl: add exynos4210 specific extensions for samsung pinctrl driverThomas Abraham2012-09-074-0/+782
| | * | | | | | | pinctrl: add samsung pinctrl and gpiolib driverThomas Abraham2012-09-074-0/+1133
| | | |_|_|/ / / | | |/| | | | |
| * | | | | | | Merge branch 'drivers/ocp2scp' into next/driversOlof Johansson2012-09-201-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | drivers: bus: omap_l3: use resources instead of hardcoded irqsOlof Johansson2012-09-201-2/+2
| * | | | | | | | Merge branch 'drivers/ocp2scp' into next/driversArnd Bergmann2012-09-196-0/+1086
| |\| | | | | | |