davidlt/kernel-ark
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
f4b96f5e4f
kernel-ark/arch/arm/mach-ixp4xx
History
Olof Johansson f4b96f5e4f Omap fixes and minor defconfig updates that would be good to 
get in before -rc1.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJR3RSDAAoJEBvUPslcq6Vz6rAQAK16H8VJB9l8pEzJGDS7/X0j
 8N+j1Zry0Ij0ZHQpzqR71h8Sh72PfdIVFnT6b04cJgBON92dmXqiBNv1pdIHRPlC
 DGyQ0W+vucF38iXRqSa7koxpEM8RRQcS4kJ3wUkvBwWA6s1x+MB/J5qtRkYg6iKI
 GPcBjIdh1pjBSLq37sCLQcSGxKHNH19i47KcN8C6piqiKNxnoDyVZKLAAt0jZNxe
 SrezGdz0keADDf/7/30TAjDBgY1LlWog6M9Ue6D6FO1YwFegWgM7XX3GsZfuhZ4s
 +zssE73UJETauOl7JJ+nsn8GDm2Q6U8zVm1pU9GEezm0pMCTJ2SDhtoxWY5zR/mH
 rYh8ia8IrMlX4mvQbKFhTZH3LWxLlGEJC21sCf5U3KuXv39SJlIjX9Qa/erWpMxd
 9McTyTWL7I6fXuMsuSUjdawvODem3kUXmwANNyMA1/NZ6uAMqK60l+/yLLjJRdFh
 jdFSeZ976ARp52TFqaf47KN3Jc5jJs5NVQ191JaoTxwWmgvaX0mcG8iKO7oaE+1y
 fR096Mt3jobMAbiQUdDnetkNBEiJ8uSJq4Y5IecvshAuPxu71eEB6OCdYQqmUfRo
 Nq8zPGmPKwT8rhCc2B3Paw++uI74f+S0WgsodGsDiBeFHzFztBY4PWKrXfxr9zzY
 01kscgUWM3MJ8xRWtVE+
 =kO4u
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Omap fixes and minor defconfig updates that would be good to
get in before -rc1.

* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ARM: scu: provide inline dummy functions when SCU is not present
  ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
  ARM: OMAP2+: timer: initialize before using oh_name

Signed-off-by: Olof Johansson <olof@lixom.net>

Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.
2013-07-12 10:59:39 -07:00
..
include/mach ARM: ixp4xx: avoid circular header dependency 2013-07-06 02:01:03 +02:00
avila-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
avila-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
common-pci.c IXP4xx: Remove time limit for PCI TRDY to enable use of slow devices. 2012-11-22 03:35:58 +00:00
common.c ARM: 7728/1: mm: Use phys_addr_t properly for ioremap functions 2013-05-23 00:09:44 +01:00
coyote-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
coyote-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
dsmg600-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
dsmg600-setup.c ARM: ixp4xx: avoid circular header dependency 2013-07-06 02:01:03 +02:00
fsg-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
fsg-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gateway7001-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
gateway7001-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
goramo_mlr.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
gtwx5715-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
gtwx5715-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ixdp425-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
ixdp425-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
ixdpg425-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
ixp4xx_npe.c ixp4xx: Declare MODULE_FIRMWARE usage 2012-11-22 03:36:22 +00:00
ixp4xx_qmgr.c IXP4xx: use __iomem for MMIO 2012-11-22 03:36:45 +00:00
Kconfig Finally eradicate CONFIG_HOTPLUG 2013-06-03 14:20:18 -07:00
Makefile ixp4xx: support omicron ixp425 based boards 2011-09-30 22:18:42 +02:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
miccpt-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nas100d-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nas100d-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
nslu2-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
nslu2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00
omixp-setup.c ARM: ixp4xx: avoid circular header dependency 2013-07-06 02:01:03 +02:00
vulcan-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
vulcan-setup.c ARM: w1-gpio: fix erroneous gpio requests 2013-03-12 16:20:45 -07:00
wg302v2-pci.c ARM: PCI: provide a default bus scan implementation 2012-05-13 17:12:17 +01:00
wg302v2-setup.c ARM: delete struct sys_timer 2012-12-24 09:36:38 -07:00