linux/arch
Linus Torvalds dd58ecba48 Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (35 commits)
  ARM: msm: platsmp: determine number of CPU cores at boot time
  ARM: Tegra: Seaboard: Fix I2C bus numbering for ADT7461
  ARM: Tegra: Trimslice: Tri-state DAP3 pinmux
  ARM: orion5x: fixup 5181 MPP mask check
  ARM: mxs-dma: include <linux/dmaengine.h>
  ARM: i.MX53: consistently use MX53_UART_PAD_CTRL for uart txd/rxd/rts/cts
  ARM: i.MX53: UARTn_CTS pin should not change RTS input select
  ARM: i.MX53: UARTn_TXD pin should not change RXD input select
  ARM: mx25: Fix typo on CAN1_RX pad setting
  iomux-mx53: add missing 'IOMUX_CONFIG_SION' for some I2C pad definitions
  ARM: NUC93X: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: LPC32XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: CNS3XXX: add UL suffix to VMALLOC_END to ensure it is properly typed
  ARM: i.MX53: Fix IOMUX type o's
  ARM i.MX dma: Fix burstsize settings
  mach-mx5: fix the I2C clock parents
  ARM: mxs/tx28: according to the TX28's datasheet D4-D7 are not used for MMC0
  ARM i.MX23/28: platform-mxsfb: Add missing include of linux/dma-mapping.h
  ARM: mx53: Fix some interrupts marked as reserved.
  MXC: iomux-v3: correct NO_PAD_CTRL definition
  ...

Fix up trivial conflict in arch/arm/mach-imx/mach-mx31_3ds.c
2011-07-25 11:53:35 -07:00
..
alpha modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
arm Merge branch 'next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc 2011-07-25 11:53:35 -07:00
avr32 Merge branch 'for-upstream' of git://openrisc.net/jonas/linux 2011-07-24 09:55:18 -07:00
blackfin modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
cris modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
frv modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
h8300 modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
ia64 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 2011-07-24 09:54:54 -07:00
m32r Merge branch 'for-upstream' of git://openrisc.net/jonas/linux 2011-07-24 09:55:18 -07:00
m68k modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
microblaze modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
mips modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
mn10300 modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
openrisc OpenRISC: Miscellaneous 2011-07-22 18:46:41 +02:00
parisc modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
powerpc Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus 2011-07-24 09:54:54 -07:00
s390 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2011-07-24 09:55:45 -07:00
score modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
sh Merge branch 'for-upstream' of git://openrisc.net/jonas/linux 2011-07-24 09:55:18 -07:00
sparc modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
tile modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
um Merge branches 'x86-urgent-for-linus', 'core-debug-for-linus', 'irq-core-for-linus' and 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2011-07-23 10:33:08 -07:00
unicore32 modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
x86 Merge branch 'for-upstream' of git://openrisc.net/jonas/linux 2011-07-24 09:55:18 -07:00
xtensa modules: make arch's use default loader hooks 2011-07-24 22:06:04 +09:30
.gitignore
Kconfig mm, powerpc: move the RCU page-table freeing into generic code 2011-05-25 08:39:16 -07:00