summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'gpio-for-linus' of git://git.secretlab.ca/git/linuxLinus Torvalds2013-02-261-6/+0
|\
| * Merge branch 'linusw/devel' of git://git.kernel.org/pub/scm/linux/kernel/git/...Grant Likely2013-02-051-6/+0
| |\
| | * arm: pxa: tosa: do not use gpiochip_reserve()Alexandre Courbot2013-02-041-6/+0
* | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-212-2/+34
|\ \ \
| * | | ARM: pxa: pxa27x.c: add dummy SA1100 rtc clockAndrea Adami2013-01-231-0/+1
| * | | ARM: palmtreo: replace #if defined with IF_ENABLEDMike Dunn2013-01-231-2/+2
| * | | ARM: palmtreo: add docg4 device initializationMike Dunn2013-01-231-0/+31
| |/ /
* | | Merge tag 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2013-02-2151-118/+104
|\ \ \
| * \ \ Merge tag 'cleanup-decompwdog-3.9' of git://git.linaro.org/people/shawnguo/li...Olof Johansson2013-02-051-5/+0
| |\ \ \
| | * | | ARM: remove unused arch_decomp_wdog()Shawn Guo2013-01-111-5/+0
| | | |/ | | |/|
| * | | Merge branch 'armsoc/fix' of git://github.com/hzhuang1/linux into next/cleanupOlof Johansson2013-01-275-15/+80
| |\ \ \
| * \ \ \ Merge tag 'v3.8-rc5' into next/cleanupOlof Johansson2013-01-272-2/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'clocksource/cleanup' into next/cleanupOlof Johansson2013-01-145-12/+8
| |\ \ \ \
| | * | | | ARM: use clockevents_config_and_register() where possibleShawn Guo2013-01-141-6/+2
| * | | | | 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 tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2013-02-215-15/+80
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | ARM: pxa: Minor naming fixes in spitz.cMarko Katic2013-01-231-2/+2
| * | | | ARM: PXA3xx: program the CSMSADRCFG registerIgor Grinberg2013-01-232-1/+15
| * | | | ARM: palmtreo: fix #ifdefs for leds-gpio deviceMike Dunn2013-01-232-9/+2
| * | | | ARM: palmtreo: fix lcd initilialization on treo680Mike Dunn2013-01-232-3/+61
| | |_|/ | |/| |
* | | | Merge remote-tracking branch 'asoc/topic/pxa' into asoc-nextMark Brown2013-02-111-6/+14
|\ \ \ \ | |/ / / |/| | |
| * | | ALSA: pxa27x: rename pxa27x_assert_ac97reset()Mike Dunn2013-01-081-6/+14
* | | | 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
| |\ \ \
OpenPOWER on IntegriCloud