korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 22:14:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
f4b96f5e4f
linux/arch
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
..
alpha mm/ALPHA: clean up unused VALID_PAGE() 2013-07-03 16:07:39 -07:00
arc Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
arm Omap fixes and minor defconfig updates that would be good to 2013-07-12 10:59:39 -07:00
arm64 mm/microblaze: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:36 -07:00
avr32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
blackfin sound updates for 3.11 2013-07-03 19:52:22 -07:00
c6x Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
cris Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
frv Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
h8300 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
hexagon mm/hexagon: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:36 -07:00
ia64 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
m32r mm/m32r: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:38 -07:00
m68k Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
metag mm/metag: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:38 -07:00
microblaze mm/microblaze: clean up unused VALID_PAGE() 2013-07-03 16:07:40 -07:00
mips Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
mn10300 mm/mn10300: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:37 -07:00
openrisc Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
parisc mm/PARISC: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:39 -07:00
powerpc Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
s390 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
score Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
sh mm/SH: prepare for killing free_all_bootmem_node() 2013-07-03 16:07:39 -07:00
sparc Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
tile mm/tile: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:37 -07:00
um mm/um: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:37 -07:00
unicore32 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
x86 Merge branch 'akpm' (updates from Andrew Morton) 2013-07-03 17:12:13 -07:00
xtensa mm/xtensa: prepare for removing num_physpages and simplify mem_init() 2013-07-03 16:07:38 -07:00
.gitignore
Kconfig mm: soft-dirty bits for user memory changes tracking 2013-07-03 16:07:26 -07:00