2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-27 14:43:58 +08:00
linux-next/arch/arm/mach-ux500
Linus Torvalds e16b396ce3 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits)
  doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore
  Update cpuset info & webiste for cgroups
  dcdbas: force SMI to happen when expected
  arch/arm/Kconfig: remove one to many l's in the word.
  asm-generic/user.h: Fix spelling in comment
  drm: fix printk typo 'sracth'
  Remove one to many n's in a word
  Documentation/filesystems/romfs.txt: fixing link to genromfs
  drivers:scsi Change printk typo initate -> initiate
  serial, pch uart: Remove duplicate inclusion of linux/pci.h header
  fs/eventpoll.c: fix spelling
  mm: Fix out-of-date comments which refers non-existent functions
  drm: Fix printk typo 'failled'
  coh901318.c: Change initate to initiate.
  mbox-db5500.c Change initate to initiate.
  edac: correct i82975x error-info reported
  edac: correct i82975x mci initialisation
  edac: correct commented info
  fs: update comments to point correct document
  target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c
  ...

Trivial conflict in fs/eventpoll.c (spelling vs addition)
2011-03-18 10:37:40 -07:00
..
include/mach Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-17 19:08:06 -07:00
board-mop500-pins.c mach-ux500: add hrefv60 GPIO pins 2011-03-14 14:05:16 +01:00
board-mop500-regulators.c mach-ux500: add a few AB8500 regulator consumers v3 2011-03-14 14:05:08 +01:00
board-mop500-regulators.h mach-ux500: Updated and connected ab8500 regulator board configuration 2011-01-12 14:33:03 +00:00
board-mop500-sdi.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-stuib.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500-u8500uib.c mach-ux500: add U8500 UIB platform data 2011-03-14 14:05:10 +01:00
board-mop500-uib.c mach-ux500: dynamic UIB (user interface boards) detection 2011-03-14 14:05:10 +01:00
board-mop500.c mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-mop500.h mach-ux500: basic HREFv60 support v2 2011-03-14 14:05:16 +01:00
board-u5500-sdi.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
board-u5500.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
clock.c mach-ux500: update MUSB clock configurations 2011-03-14 14:05:12 +01:00
clock.h ux500: add debugfs support for powerdebug 2010-12-20 13:32:45 +01:00
cpu-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
cpu-db8500.c mach-ux500: add MUSB to db8500 devices 2011-03-14 14:05:12 +01:00
cpu.c ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
cpufreq.c ux500: Add cpufreq support for u8500 2010-12-09 10:06:15 +01:00
devices-common.c plat-nomadik: support varying number of GPIOs per block 2011-03-14 14:05:14 +01:00
devices-common.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db5500.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db8500.c mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices-db8500.h mach-ux500: config Ux500 PL011 PL022 PL180 for DMA 2011-03-14 14:05:14 +01:00
devices.c ux500: rework device registration 2010-12-08 13:14:06 +01:00
dma-db5500.c mach-ux500: add MUSB to db5500 devices 2011-03-14 14:05:12 +01:00
headsmp.S ARM: 6539/1: ux500: remove unnecessary barrier from the secondary startup 2010-12-24 09:50:26 +00:00
hotplug.c ARM: CPU hotplug: remove bug checks in platform_cpu_die() 2010-12-20 15:09:10 +00:00
id.c ux500: dynamic SOC detection 2011-01-10 18:34:53 +01:00
Kconfig ARM: 6776/1: mach-ux500: activate fix for errata 753970 2011-03-09 21:38:03 +00:00
localtimer.c ARM: 5831/1: ARM: U8500 core machine support 2009-11-28 10:22:52 +00:00
Makefile mach-ux500: move MOP500 pins to separate file 2011-03-14 14:05:16 +01:00
Makefile.boot ARM: 5832/1: ARM: U8500 Makefile.boot 2009-11-28 10:22:52 +00:00
mbox-db5500.c mbox-db5500.c Change initate to initiate. 2011-02-17 16:49:54 +01:00
modem-irq-db5500.c ux500: modem_irq is only for 5500 2011-01-10 18:34:53 +01:00
pins-db5500.h ARM: 6371/1: ux500: add DB5500 pins 2010-09-19 12:12:26 +01:00
pins-db8500.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 2010-10-25 07:59:01 -07:00
platsmp.c ux500: remove build-time changing macros 2011-01-10 18:34:52 +01:00
prcmu.c ux500: Add prcmu support for operating points 2010-12-09 10:06:01 +01:00
ste-dma40-db5500.h ARM: 6372/1: ux500: add DB5500 DMA event lines 2010-09-19 12:12:27 +01:00
ste-dma40-db8500.h ARM: 6418/1: ux500: rename DB8500 DMA event line macros 2010-10-04 19:46:07 +01:00
usb.c mach-ux500: add platform data for musb 2011-03-14 14:05:11 +01:00