summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'v3.3-rc2' into depends/rmk/for-armsocOlof Johansson2012-02-077-28/+0
|\
| * Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"Russell King2012-01-191-20/+0
| * Revert "ARM: pxa: add dummy clock for sa1100-rtc"Russell King2012-01-196-8/+0
* | ARM: big removal of now unused arch_idle()Nicolas Pitre2012-01-201-15/+0
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw...Linus Torvalds2012-01-125-0/+45
|\
| * ASoC: pxa: Convert corgi to use snd_soc_register_card()Axel Lin2012-01-021-0/+9
| * ASoC: pxa: Convert poodle to use snd_soc_register_card()Axel Lin2011-12-301-0/+6
| * ASoC: pxa: Convert e800_wm9712 to use snd_soc_register_card()Axel Lin2011-12-171-0/+6
| * ASoC: pxa: Convert tosa to use snd_soc_register_card()Axel Lin2011-12-171-0/+6
| * ASoC: pxa: Convert imote2 to use snd_soc_register_card()Axel Lin2011-12-171-0/+6
| * ASoC: pxa: Convert e750_wm9705 to use snd_soc_register_card()Axel Lin2011-12-171-0/+6
| * ASoC: pxa: Convert e740_wm9705 to use snd_soc_register_card()Axel Lin2011-12-171-0/+6
* | Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-0973-503/+377
|\ \
| * \ Merge branch 'samsung/driver' into next/driversArnd Bergmann2012-01-0955-95/+101
| |\ \
| * \ \ Merge branch 'drivers/rtc-sa1100' into next/driversArnd Bergmann2011-12-287-0/+26
| |\ \ \
| | * | | ARM: pxa: add dummy clock for sa1100-rtcJett.Zhou2011-12-286-0/+8
| | * | | RTC: sa1100: support sa1100, pxa and mmp soc familiesJett.Zhou2011-12-281-0/+20
| * | | | Merge branch 'drivers/pxa-gpio' into next/driversArnd Bergmann2011-12-082-0/+2
| |\ \ \ \
| | * | | | ARM: pxa: fix build error for GPIO_bit()Haojian Zhuang2011-12-081-0/+1
| | * | | | ARM: pxa: fix the build error because of missing gpio-pxa.hHaojian Zhuang2011-12-081-0/+1
| * | | | | Merge branch 'mxs/saif' into next/driversArnd Bergmann2011-12-067-9/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branches 'drivers/macb-gem' and 'drivers/pxa-gpio' into next/driversArnd Bergmann2011-11-236-14/+20
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| * | | | ARM: pxa: add clk support in gpio driverHaojian Zhuang2011-11-154-0/+6
| * | | | ARM: pxa: change gpio to platform deviceHaojian Zhuang2011-11-1512-148/+47
| * | | | ARM: pxa: use generic gpio operation instead of gpio registerHaojian Zhuang2011-11-142-5/+25
| * | | | ARM: pxa: rename NR_BUILTIN_GPIOHaojian Zhuang2011-11-1411-19/+16
| * | | | ARM: pxa: rename gpio_to_irq and irq_to_gpioHaojian Zhuang2011-11-1430-84/+81
| * | | | ARM: pxa: use chained interrupt for GPIO0 and GPIO1Haojian Zhuang2011-11-143-75/+2
| * | | | ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQHaojian Zhuang2011-11-1434-176/+176
* | | | | Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-socLinus Torvalds2012-01-091-12/+17
|\ \ \ \ \
| * \ \ \ \ Merge branch 'samsung/cleanup' into next/boardsArnd Bergmann2012-01-0953-41/+95
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'pxa/board' into next/boardsArnd Bergmann2011-12-281-12/+17
| |\ \ \ \ \
| | * | | | | mioa701: add newly available DoC G3 chipRobert Jarzmik2011-12-281-12/+17
| | | |_|_|/ | | |/| | |
* | | | | | Merge tag 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2012-01-091-0/+1
|\ \ \ \ \ \
| * | | | | | ARM: pxa: Include linux/export.h in balloon3.cAxel Lin2011-12-281-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-01-081-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Merge branch 'master' into for-nextJiri Kosina2011-11-1381-288/+352
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | ARM: pxa: Fix typo 'CONFIG_BACKLIGHT_PWM__MODULE'Paul Bolle2011-10-311-1/+1
* | | | | | Merge branch 'restart' into for-linusRussell King2012-01-0552-29/+92
|\ \ \ \ \ \
| * | | | | | ARM: restart: remove the now empty arch_reset()Russell King2012-01-051-4/+0
| * | | | | | ARM: restart: pxa: use new restart hookRussell King2012-01-0552-28/+95
| * | | | | | Merge branch 'restart-cleanup' into restartRussell King2012-01-057-9/+9
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEADRussell King2012-01-057-9/+9
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
* | | | | | | | ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtimeMarc Zyngier2011-12-181-12/+3
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-s...Russell King2011-12-051-11/+0
|\ \ \ \ \ \ \
| * | | | | | | ARM: big removal of now unused vmalloc.h filesNicolas Pitre2011-11-261-11/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/will/...Russell King2011-12-057-9/+9
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | ARM: pxa: fix inconsistent CONFIG_USB_PXA27XHaojian Zhuang2011-11-107-9/+9
| |/ / / / /
* | | | | | Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/ke...Russell King2011-11-211-36/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusiveMarc Zyngier2011-11-151-36/+0
| |/ / / /
OpenPOWER on IntegriCloud