summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* x86/kbuild: archscripts depends on scripts_basicJeff Mahoney2012-09-211-1/+1
* firmware: fix directory creation rule matching with make 3.80Mark Asselstine2012-09-211-2/+2
* firmware: fix directory creation rule matching with make 3.82Mark Asselstine2012-08-301-1/+1
* link-vmlinux.sh: Fix stray "echo" in error messageMichal Marek2012-08-101-1/+1
* Linux 3.6-rc1v3.6-rc1Linus Torvalds2012-08-021-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-07-312-22/+36
| * Platform: OLPC: move global variables into priv structAndres Salomon2012-07-311-20/+28
| * Platform: OLPC: move debugfs support from x86 EC driverAndres Salomon2012-07-312-97/+117
| * x86: OLPC: switch over to using new EC driver on x86Andres Salomon2012-07-313-36/+27
| * Platform: OLPC: add a suspended flag to the EC driverAndres Salomon2012-07-311-1/+45
| * Platform: OLPC: turn EC driver into a platform_driverAndres Salomon2012-07-312-0/+54
| * Platform: OLPC: allow EC cmd to be overridden, and create a workqueue to call itAndres Salomon2012-07-312-2/+116
| * drivers: OLPC: update various drivers to include olpc-ec.hAndres Salomon2012-07-319-3/+8
| * Platform: OLPC: add a stub to drivers/platform/ for the OLPC EC driverAndres Salomon2012-07-316-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
| | * | ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsiJamie Lentin2012-07-273-82/+50
| | * | ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindingsJamie Lentin2012-07-273-90/+50
| | * | ARM: Kirkwood: Describe DNS325 temperature sensor in DT.Andrew Lunn2012-07-272-13/+10
| | * | ARM: Kirkwood: Use DT to configure SATA device.Andrew Lunn2012-07-279-20/+24
| | * | ARM: kirkwood: use devicetree for SPI on dreamplugMichael Walle2012-07-272-41/+29
| | * | ARM: kirkwood: Add LS-XHL and LS-CHLv2 supportMichael Walle2012-07-279-0/+291
| | * | ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex NetJosh Coombs2012-07-277-0/+224
| | * | ARM: Kirkwood: Add basic device tree support for QNAP TS219.Andrew Lunn2012-07-279-0/+228
| | * | ATA: sata_mv: Add device tree supportAndrew Lunn2012-07-274-13/+53
| | * | ARM: Orion: DTify the watchdog timer.Andrew Lunn2012-07-274-1/+29
| | * | ARM: Orion: Add arch support needed for I2C via DT.Andrew Lunn2012-07-274-0/+15
| | * | ARM: kirkwood: use devicetree for orion-spiMichael Walle2012-07-272-1/+17
| | * | ARM: Orion: DT support for IRQ and GPIO ControllersAndrew Lunn2012-07-2713-132/+307
| | * | Merge branch 'v3.5-rc7-fixes' into v3.5-rc7-dt-v3Andrew Lunn2012-07-2716-30/+98
| | |\ \
| | * \ \ Merge tag 'spi-3.6' into v3.5-rc7-dt-v3Andrew Lunn2012-07-2713-47/+430
| | |\ \ \
* | | \ \ \ Merge tag 'pm2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-08-023-47/+103
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'for_3.6/pm/coupled-cpuidle' of git://git.kernel.org/pub/scm/lin...Olof Johansson2012-07-273-45/+101
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | ARM: OMAP4: CPUidle: Open broadcast clock-event device.Santosh Shilimkar2012-07-251-0/+13
| | * | | | | ARM: OMAP4: CPUidle: add synchronization for coupled idle statesKevin Hilman2012-07-251-1/+21
| | * | | | | ARM: OMAP4: CPUidle: Use coupled cpuidle states to implement SMP cpuidle.Santosh Shilimkar2012-07-252-46/+67
| | * | | | | ARM: OMAP: timer: allow gp timer clock-event to be used on both cpusSantosh Shilimkar2012-07-251-1/+3
| |/ / / / /
* | | | | | Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2012-08-024-4/+6
|\ \ \ \ \ \
| * | | | | | ARM: mmp: add missing irqs.hHaojian Zhuang2012-08-021-0/+1
| * | | | | | arm: mvebu: fix typo in .dtsi comment for Armada XP SoCsThomas Petazzoni2012-08-021-1/+1
| * | | | | | ARM: PRIMA2: delete redundant codes to restore LATCHED when timer resumesBarry Song2012-08-021-3/+3