summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'testing/bcmring' into next/cleanupsArnd Bergmann2012-08-1341-671/+366
|\
| * ARM: bcmring: use proper MMIO accessorsArnd Bergmann2012-05-0218-304/+306
| * ARM: bcmring: remove include/csp/ subdirArnd Bergmann2012-05-0229-346/+41
| * ARM: bcmring: move cfg_global header to mach/Arnd Bergmann2012-05-0210-21/+19
* | Merge branch 'cleanup/io-pci' into next/cleanupsArnd Bergmann2012-08-1356-910/+414
|\ \
| * | ARM: iop3xx: use fixed PCI i/o mappingRob Herring2012-07-266-72/+10
| * | ARM: mv78xx0: use fixed pci i/o mappingRob Herring2012-07-266-119/+45
| * | ARM: iop13xx: use fixed PCI i/o mappingRob Herring2012-07-265-82/+16
| * | iop13xx: use more regular PCI I/O space handlingArnd Bergmann2012-07-264-45/+12
| * | ARM: orion5x: use fixed PCI i/o mappingRob Herring2012-07-265-82/+27
| * | ARM: kirkwood: use fixed PCI i/o mappingRob Herring2012-07-265-71/+16
| * | ARM: dove: use fixed PCI i/o mappingRob Herring2012-07-265-64/+17
| * | ARM: footbridge: use fixed PCI i/o mappingRob Herring2012-07-265-31/+14
| * | ARM: shark: use fixed PCI i/o mappingRob Herring2012-07-266-41/+11
| * | ARM: integrator: remove trailing whitespace on pci_v3.cRob Herring2012-07-261-23/+23
| * | ARM: integrator: use fixed PCI i/o mappingRob Herring2012-07-265-44/+7
| * | ARM: tegra: use fixed PCI i/o mappingRob Herring2012-07-264-120/+25
| * | ARM: versatile: use fixed PCI i/o mappingRob Herring2012-07-265-52/+4
| * | ARM: move PCI i/o resource setup into common codeRob Herring2012-07-262-5/+39
| * | ARM: Add fixed PCI i/o mappingRob Herring2012-07-257-11/+99
| * | i2c: iop3xx: use standard gpiolib functionsRob Herring2012-07-251-4/+5
| * | i2c: iop3xx: clean-up trailing whitespaceRob Herring2012-07-251-56/+56
* | | 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