Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-14 16:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
794b175fc0
linux/arch/arm/mach-davinci
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 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-10-12 12:39:17 +09:00
aemif.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
asp.h ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 2012-08-27 11:12:09 -07:00
board-da830-evm.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-da850-evm.c Merge branch 'samsung_platform_data' into staging/for_v3.7 2012-10-05 22:32:05 -03:00
board-dm355-evm.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-dm355-leopard.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-dm365-evm.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-dm644x-evm.c Merge branch 'samsung_platform_data' into staging/for_v3.7 2012-10-05 22:32:05 -03:00
board-dm646x-evm.c ARM: davinci: board-dm646x-evm.c: Remove unecessary semicolon 2012-10-26 13:59:01 +05:30
board-mityomapl138.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-neuros-osd2.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-omapl138-hawk.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
board-sffsdr.c ARM: davinci: move platform_data definitions 2012-09-14 11:16:54 +02:00
board-tnetv107x-evm.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
cdce949.c arm: fix implicit module.h users by adding it to arch/arm as required. 2011-10-31 19:30:50 -04:00
clock.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
clock.h ARM: davinci: add support for multiple power domains 2011-12-03 00:35:52 +05:30
common.c ARM: davinci: remove obsoleted init_consistent_dma_size() 2012-11-13 10:13:20 +01:00
cp_intc.c ARM: davinci: cp_intc: Add OF support for TI interrupt controller 2012-07-05 14:12:35 +05:30
cpufreq.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
cpuidle.c ARM: davinci: Fix for cpuidle consolidation changes 2012-03-22 01:19:44 -04:00
da830.c sections: fix section conflicts in arch/arm/ 2012-10-06 03:04:38 +09:00
da850.c Merge branch 'staging/for_v3.7' into v4l_for_linus 2012-10-11 15:07:19 -03:00
davinci.h Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
devices-da8xx.c ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 2012-08-27 11:12:09 -07:00
devices-tnetv107x.c ARM: davinci: Explicitly set channel controllers' default queues 2011-09-17 15:54:08 +05:30
devices.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
dm355.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
dm365.c Sound updates for 3.7-rc1 2012-10-09 07:07:14 +09:00
dm644x.c ARM: davinci: dm644x: fix out range signal for ED 2012-11-19 13:07:39 +05:30
dm646x.c ASoC/ARM: Davinci: McASP: split asp header into platform and audio specific 2012-08-27 11:12:09 -07:00
dma.c arm-soc: driver specific updates 2012-05-26 12:22:27 -07:00
irq.c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-19 22:10:05 -07:00
Kconfig ARM: config: sort select statements alphanumerically 2012-10-13 17:11:28 +01:00
Makefile ARM: davinci: add runtime PM support for clock management 2012-07-01 17:26:26 +05:30
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mux.c Davinci: pinmux - use ioremap() 2010-05-13 10:05:29 -07:00
mux.h Davinci: eliminate pinmux offset verbosity 2010-05-06 15:02:09 -07:00
pm_domain.c ARM: davinci: add runtime PM support for clock management 2012-07-01 17:26:26 +05:30
pm.c ARM: davinci: use machine specific hook for late init 2012-05-05 14:20:01 +08:00
psc.c ARM: davinci: psc: fix incorrect offsets 2011-12-05 16:47:15 +05:30
serial.c Davinci: serial - conditional reset via pwremu 2010-05-06 15:02:10 -07:00
sleep.S Merge branch 'depends/rmk/memory_h' into next/fixes 2011-10-31 23:11:53 +01:00
sram.c DaVinci: remove unneeded #include's 2009-11-25 10:21:31 -08:00
time.c ARM: davinci: convert to common sched_clock() implementation 2012-02-03 11:34:25 +00:00
tnetv107x.c ARM: 7190/1: restart: davinci: use new restart hook 2012-01-05 12:57:09 +00:00
usb.c ARM: davinci: usb: remove CONFIG_USB_MUSB_HOST etc 2012-10-24 16:37:17 +05:30