Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/mach-kirkwood
History
Mark Brown fa2c8f4017 Linux 3.3-rc4 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
 iQEcBAABAgAGBQJPQDoTAAoJEHm+PkMAQRiGMpYH/ibfyIFBrKMD1v/s9oNvp8rS
 c7J7E7mHZOylCHrpIS3lX3ZbOfOe33Ln0Z59f1/TcV4CMMz0NrKYcTC8erj/H/DA
 8DRYegiczWKqiXRgktwaZXkJcwXYdOOL1WQYxuzzbZcwRrNBY2QpH7Zu8Bj+TPAy
 d4fvJHWdlh4sbWVdQmLRbp04UB9J/Z5/uWmSNvVQjLLdRlD+mEBbt7JjiNY6sUVC
 2sJoAs9F3UlHu7VaN+JIhMOGZ3GqOpHGBxN/aWxJ/7GsXdXuAfCrxoPxaAe4xzOa
 HndN5ZDyg02Vy5uDeUzj+HJPW3M8L4Q0nwxAYb3ZnQ5tbpu1Q2cHfIBealomWCQ=
 =R91X
 -----END PGP SIGNATURE-----

Merge tag 'v3.3-rc4' into for-3.4 in order to resolve the conflict
resolved below within the FSI driver and allow the application of the
dmaeengine conversion that depends on this resolution.

Linux 3.3-rc4

Conflicts:
	sound/soc/sh/fsi.c
2012-02-19 18:35:12 -08:00
..
include/mach New feature development 2012-01-09 14:38:51 -08:00
addr-map.c ARM: Orion: mbus_dram_info consolidation 2011-12-13 18:46:55 -05:00
common.c ARM: orion: Fix USB phy for orion5x. 2012-02-09 16:16:35 -08:00
common.h New feature development 2012-01-09 14:38:51 -08:00
cpuidle.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 2011-11-07 10:13:52 -08:00
d2net_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
db88f6281-bp-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
dockstar-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
guruplug-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
irq.c ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h 2011-08-08 14:27:41 +01:00
Kconfig
lacie_v2-common.c
lacie_v2-common.h
Makefile
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
mpp.c ARM: Orion: Get address map from plat-orion instead of via platform_data 2011-12-13 18:46:55 -05:00
mpp.h ARM: orion: Fix Orion5x GPIO regression from MPP cleanup 2012-02-09 16:16:31 -08:00
mv88f6281gtw_ge-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
netspace_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
netxbig_v2-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
openrd-setup.c ASoC: Convert kirkwood-openrd to use snd_soc_register_card() 2012-02-07 19:40:53 +00:00
pcie.c Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci 2012-01-11 18:50:26 -08:00
rd88f6192-nas-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
rd88f6281-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
sheevaplug-setup.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
t5325-setup.c ASoC: Convert kirkwood-t5325 to use snd_soc_register_card() 2012-02-07 19:40:52 +00:00
ts41x-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
ts219-setup.c ARM: restart: kirkwood: use new restart hook 2012-01-05 12:57:14 +00:00
tsx1x-common.c
tsx1x-common.h