summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'timer/cleanup' into late/mvebu2Arnd Bergmann2013-02-2850-113/+108
|\
| * ARM: delete struct sys_timerStephen Warren2012-12-2450-76/+71
| * ARM: pxa: convert timer suspend/resume to clock_event_deviceStephen Warren2012-12-241-38/+38
* | Merge remote-tracking branch 'asoc/fix/pxa' into tmpMark Brown2013-01-102-2/+5
|\ \
| * | ALSA: pxa27x: fix ac97 warm resetMike Dunn2013-01-082-2/+5
| |/
* | ARM: drivers: remove __dev* attributes.Greg Kroah-Hartman2013-01-034-6/+6
|/
* Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git...Linus Torvalds2012-12-131-0/+6
|\
| * Merge remote-tracking branch 'linus/master' into staging/for_v3.8Mauro Carvalho Chehab2012-11-282-7/+9
| |\
| * | [media] mt9v022: set y_skip_top field to zero as defaultAnatolij Gustschin2012-11-221-0/+6
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-12-1212-637/+6
|\ \ \
| * \ \ Merge tag 'v3.7-rc7' into next/cleanupOlof Johansson2012-11-252-7/+9
| |\ \ \ | | | |/ | | |/|
| * | | ARM: pxa: remove pxa95x supportHaojian Zhuang2012-11-1511-625/+5
| * | | ARM: pxa: use module_platform_driver macroSrinivas Kandagatla2012-11-061-12/+1
| | |/ | |/|
* | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-12-121-0/+6
|\ \ \
| * | | ARM: pxa: add dummy SA1100 rtc clock in pxa25xAndrea Adami2012-11-231-0/+1
| * | | ARM: pxa: fix pxa25x gpio wakeup settingAndrea Adami2012-11-211-0/+5
| | |/ | |/|
| | |
| \ \
*-. \ \ Merge branches 'cache-l2x0', 'fixes', 'hdrs', 'misc', 'mmci', 'vic' and 'warn...Russell King2012-12-113-8/+10
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| | * ARM: move udc_pxa2xx.h to linux/platform_dataRussell King2012-11-161-1/+1
| |/ |/|
| * ARM: pxa/spitz_pm: Fix hang when resuming from STRMarko Katic2012-10-281-6/+2
| * ARM: pxa: hx4700: Fix backlight PWM device numberPaul Parsons2012-10-281-1/+7
|/
* ARM: config: sort select statements alphanumericallyRussell King2012-10-131-60/+60
* Merge branch 'late/fixes' into fixesOlof Johansson2012-10-074-50/+4
|\
| * ARM: pxa: work around duplicate definition of GPIO24_SSP1_SFRMArnd Bergmann2012-10-041-0/+1
| * ARM: pxa: remove sharpsl_fatal_check functionArnd Bergmann2012-10-041-48/+0
| * ARM: pxa: define palmte2_pxa_keys conditionallyArnd Bergmann2012-10-041-0/+2
| * ARM: pxa: Wunused-result warning in viper board fileArnd Bergmann2012-10-041-2/+1
* | Merge branch 'for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wqLinus Torvalds2012-10-021-2/+2
|\ \
| * | workqueue: deprecate flush[_delayed]_work_sync()Tejun Heo2012-08-201-2/+2
* | | Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/ar...Linus Torvalds2012-10-0165-605/+199
|\ \ \
| * \ \ Merge branch 'multiplatform/platform-data' into next/multiplatformOlof Johansson2012-09-2264-592/+167
| |\ \ \
| | * | | ARM: pxa: move platform_data definitionsArnd Bergmann2012-09-1464-592/+167
| | | |/ | | |/|
| * | | Merge tag 'multi-platform-for-3.7' of git://sources.calxeda.com/kernel/linux ...Olof Johansson2012-09-202-13/+32
| |\ \ \
| | * | | ARM: pxa: use gpio_to_irq for sharppm_slRob Herring2012-09-141-13/+17
| | * | | net: pxaficp_ir: add irq resourcesRob Herring2012-09-141-0/+15
| | |/ /
| * | | Merge branch 'next/dt' into next/multiplatformOlof Johansson2012-09-207-26/+215
| |\ \ \
* | \ \ \ Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-019-411/+270
|\ \ \ \ \
| * \ \ \ \ Merge tag 'tegra-for-3.7-drivers-i2c' of git://git.kernel.org/pub/scm/linux/k...Olof Johansson2012-09-161-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | Merge branch 'for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/c...Arnd Bergmann2012-08-139-411/+270
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | ARM: mach-pxa: retire custom LED codeBryan Wu2012-08-019-411/+270
* | | | | | Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-017-26/+215
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'soc-core' of git://git.kernel.org/pub/scm/linux/kernel/git/horm...Olof Johansson2012-09-051-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| * | | | | ARM: pxa: fix build issue while CONFIG_OF is disabledHaojian Zhuang2012-08-201-0/+2
| * | | | | ARM: pxa: append the definition of CKENCHaojian Zhuang2012-08-201-0/+1
| * | | | | ARM: pxa: support CKENC in clk_enableChao Xie2012-08-161-2/+6
| * | | | | ARM: pxa3xx: add generic DT machine codeDaniel Mack2012-08-163-0/+78
| * | | | | ARM: pxa3xx: skip default device initialization when booting via DTDaniel Mack2012-08-161-1/+3
| * | | | | ARM: pxa: add devicetree code for irq handlingDaniel Mack2012-08-162-23/+125
| | |/ / / | |/| | |
* | | | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-10-011-2/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ARM: pmu: remove arm_pmu_type enumerationSudeep KarkadaNagesha2012-08-231-2/+1
| | |/ / | |/| |
* | | | hwmon: (sht15) move header to linux/platform_data/Vivien Didelot2012-09-231-1/+1
|/ / /
OpenPOWER on IntegriCloud