Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-26 12:52:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
c8a1ceccf3
linux/arch/arm/mach-pxa
History
Olof Johansson 0f9cb211ba Linux 3.7-rc7 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJQss0FAAoJEHm+PkMAQRiG6cEH/An3PYsWBBy27tzoLyVfJKF1
 3m3vR8HS2tnHg6erxms+738jos59vrWXV0Ygnvw0DHbGR0HNb4rkwce/KXu/jgOD
 MRYNYhlhMFJTEUFrSrcwKITrAV3kVPWXxPXgAR6Gzpr6NPKKM9TBzEv0ze56TFYz
 asOxqeBcPSS7aFZlkoNsy1wG4l0Quo5ke8VZIxo9Me5qlqubAoZ6pING4wAGXqeE
 tf81CevSdpe0nqr8/dlYyCvLjrurgpJQczxRCBI3mP6kLWGfUCVzZmcu86PfT9b+
 35zNJwDneIoN+D9bVDHy6mrq9uQdmhWnQuhv1joTPn6RDn1nyBRBd+A5qLxSov4=
 =CPoy
 -----END PGP SIGNATURE-----

Merge tag 'v3.7-rc7' into next/cleanup

Merging in mainline back to next/cleanup since it has collected a few
conflicts between fixes going upstream and some of the cleanup patches.
Git doesn't auto-resolve some of them, and they're mostly noise so let's
take care of it locally.

Conflicts are in:
	arch/arm/mach-omap2/omap_hwmod_44xx_data.c
	arch/arm/plat-omap/i2c.c
	drivers/video/omap2/dss/dss.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-11-25 21:34:34 -08:00
..
include/mach ARM: pxa: remove pxa95x support 2012-11-15 13:50:13 +01:00
am200epd.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
am300epd.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
balloon3.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
capc7117.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
clock-pxa2xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
clock-pxa3xx.c ARM: pxa: support CKENC in clk_enable 2012-08-16 16:15:44 +08:00
clock.c
clock.h ARM: pxa: remove pxa95x support 2012-11-15 13:50:13 +01:00
cm-x2xx-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
cm-x2xx-pci.h
cm-x2xx.c Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
cm-x255.c ARM: 7104/1: plat-pxa: break out GPIO driver specifics 2011-10-01 23:45:34 +01:00
cm-x270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
cm-x300.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-evalboard.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa3xx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa270-income.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa270.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
colibri-pxa300.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
colibri-pxa320.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
corgi_pm.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
corgi.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
csb701.c
csb726.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
devices.c ARM: pxa: remove pxa95x support 2012-11-15 13:50:13 +01:00
devices.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
em-x270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
eseries.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
ezx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
generic.c Disintegrate asm/system.h for ARM 2012-03-28 18:30:01 +01:00
generic.h ARM: pxa: remove duplicated registeration on pxa-gpio 2012-03-06 14:40:59 +08:00
gumstix.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
h5000.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
himalaya.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
hx4700.c ARM: pxa: hx4700: Fix backlight PWM device number 2012-10-28 07:53:23 +08:00
icontrol.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
idp.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
irq.c ARM: pxa: add devicetree code for irq handling 2012-08-16 16:14:50 +08:00
Kconfig ARM: pxa: remove pxa95x support 2012-11-15 13:50:13 +01:00
littleton.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
lpd270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
lubbock.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
magician.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mainstone.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
Makefile ARM: pxa: remove pxa95x support 2012-11-15 13:50:13 +01:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mfp-pxa2xx.c ARM: PXA2xx: MFP: fix potential direction bug 2012-04-27 11:14:06 +08:00
mfp-pxa3xx.c
mioa701_bootresume.S
mioa701.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
mp900.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
mxm8x10.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palm27x.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmld.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmt5.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmtc.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmte2.c Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
palmtreo.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmtx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
palmz72.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pcm027.c ARM: restart: pxa: use new restart hook 2012-01-05 12:57:17 +00:00
pcm990-baseboard.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pm.c
poodle.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa2xx.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa3xx-ulpi.c ARM: pxa: use module_platform_driver macro 2012-11-06 05:59:59 -08:00
pxa3xx.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
pxa25x.c Merge branch 'board' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/boards 2012-03-10 09:15:30 -08:00
pxa27x.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa300.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa320.c ARM: pxa: use common IOMEM definition 2012-03-25 14:36:31 -05:00
pxa930.c
pxa-dt.c ARM: pxa3xx: add generic DT machine code 2012-08-16 16:15:12 +08:00
raumfeld.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
reset.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
saar.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
sharpsl_pm.c Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
sleep.S
smemc.c
spitz_pm.c ARM: pxa/spitz_pm: Fix hang when resuming from STR 2012-10-28 07:53:45 +08:00
spitz.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
standby.S
stargate2.c ARM: soc: multiplatform enablement 2012-10-01 19:11:38 -07:00
tavorevb.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
time.c ARM: sa11x0/pxa: convert OS timer registers to IOMEM 2012-07-09 17:37:35 +01:00
tosa-bt.c
tosa.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
trizeps4.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
viper.c Merge branch 'late/fixes' into fixes 2012-10-07 07:22:32 -07:00
vpac270.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
xcep.c ARM: pxa: remove NR_IRQS 2012-01-25 20:37:49 -06:00
z2.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
zeus.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
zylonite_pxa300.c ARM: pxa: rename IRQ_GPIO to PXA_GPIO_TO_IRQ 2011-11-14 21:07:58 +08:00
zylonite_pxa320.c
zylonite.c ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00