summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'drivers/ocp2scp' into next/driversOlof Johansson2012-09-051-1/+1
|\
| * drivers: bus: omap-ocp2scp: Fix compile errorKishon Vijay Abraham I2012-09-051-1/+1
* | Merge branch 'drivers/ocp2scp' into next/driversArnd Bergmann2012-08-227-0/+130
|\|
| * arm/dts: omap4: Add ocp2scp dataKishon Vijay Abraham I2012-08-221-0/+8
| * drivers: bus: add a new driver for omap-ocp2scpKishon Vijay Abraham I2012-08-226-0/+122
* | Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into a...Arnd Bergmann2012-08-1344-494/+384
|\ \
| * | ARM: at91: add atmel-mci support for chips and boards which can use itLudovic Desroches2012-07-0232-439/+375
| * | ARM: at91/defconfig: change the MCI driver to use in defconfigsNicolas Ferre2012-07-029-9/+8
| * | ARM: at91: set i2c_board_info.type to "ds1339" directlyPaul Bolle2012-07-021-2/+1
| * | ARM: at91/defconfig: Remove unaffected config optionRichard Genoud2012-07-025-44/+0
* | | Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/c...Arnd Bergmann2012-08-1397-2983/+1441
|\ \ \ | |_|/ |/| |
| * | ARM: use new LEDS CPU trigger stub to replace old oneBryan Wu2012-08-016-245/+3
| * | ARM: mach-sa1100: retire custom LED codeBryan Wu2012-08-0113-615/+215
| * | ARM: mach-omap1: retire custom LED codeBryan Wu2012-08-0113-687/+165
| * | ARM: mach-pnx4008: remove including old leds event API header fileBryan Wu2012-08-011-1/+0
| * | ARM: plat-samsung: remove including old leds event API header fileBryan Wu2012-08-011-1/+0
| * | ARM: mach-pxa: retire custom LED codeBryan Wu2012-08-019-411/+270
| * | char: nwflash: remove old led event codeBryan Wu2012-08-011-34/+0
| * | ARM: mach-footbridge: retire custom LED codeBryan Wu2012-08-015-294/+179
| * | ARM: mach-ebsa110: retire custom LED codeBryan Wu2012-08-012-34/+51
| * | ARM: mach-clps711x: retire custom LED code of P720T machineBryan Wu2012-08-014-66/+61
| * | ARM: mach-integrator: retire custom LED codeBryan Wu2012-08-013-66/+99
| * | ARM: mach-integrator: move CM_CTRL to header file for accessing by other func...Bryan Wu2012-08-012-2/+2
| * | ARM: mach-orion5x: convert custom LED code to gpio_led and LED CPU triggerBryan Wu2012-08-014-53/+22
| * | ARM: mach-shark: retire custom LED codeBryan Wu2012-08-013-138/+87
| * | ARM: mach-ks8695: remove leds driver, since nobody use itBryan Wu2012-08-014-121/+0
| * | ARM: mach-realview and mach-versatile: retire custom LED codeBryan Wu2012-08-0110-76/+7
| * | ARM: at91: convert old leds drivers to gpio_led and led_trigger driversBryan Wu2012-07-3113-137/+89
| * | led-triggers: create a trigger for CPU activityBryan Wu2012-07-314-0/+190
* | | Linux 3.6-rc1v3.6-rc1Linus Torvalds2012-08-031-2/+2
* | | Merge branch 'for-linus-3.6' of git://dev.laptop.org/users/dilinger/linux-olpcLinus Torvalds2012-08-0213-164/+451
|\ \ \
| * | | x86: OLPC: move s/r-related EC cmds to EC driverAndres Salomon2012-08-012-22/+36
| * | | Platform: OLPC: move global variables into priv structAndres Salomon2012-08-011-20/+28
| * | | Platform: OLPC: move debugfs support from x86 EC driverAndres Salomon2012-08-012-97/+117
| * | | x86: OLPC: switch over to using new EC driver on x86Andres Salomon2012-08-013-36/+27
| * | | Platform: OLPC: add a suspended flag to the EC driverAndres Salomon2012-08-011-1/+45
| * | | Platform: OLPC: turn EC driver into a platform_driverAndres Salomon2012-08-012-0/+54
| * | | Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call itAndres Salomon2012-08-012-2/+116
| * | | drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-08-019-3/+8
| * | | Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-08-016-18/+55
* | | | Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-08-0243-569/+1387
|\ \ \ \
| * \ \ \ Merge branch 'marvell/dt' into late2/dtOlof Johansson2012-07-2965-646/+1915
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | ARM: Kirkwood: Replace mrvl with marvellAndrew Lunn2012-07-276-6/+6
| | * | | ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.Andrew Lunn2012-07-272-84/+50
| | * | | ARM: Kirkwood: Describe Dreamplug LEDs in DT.Andrew Lunn2012-07-272-34/+16
| | * | | ARM: Kirkwood: Describe iConnects LEDs in DT.Andrew Lunn2012-07-272-46/+34
| | * | | ARM: Kirkwood: Describe iConnects temperature sensor in DT.Andrew Lunn2012-07-272-10/+8
| | * | | ARM: Kirkwood: Describe IB62x0 LEDs in DT.Andrew Lunn2012-07-272-36/+17
| | * | | ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.Andrew Lunn2012-07-272-31/+16
| | * | | ARM: Kirkwood: Describe DNS32? gpio-keys in DT.Jamie Lentin2012-07-272-37/+21