kernel-fxtec-pro1x/arch/arm/include/asm/hardware
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
arm_timer.h ARM: Improve documentation in arm_timer.h 2010-04-29 18:04:15 +01:00
cache-l2x0.h ARM: 6094/1: Extend cache-l2x0 to support the 16-way PL310 2010-05-15 15:03:50 +01:00
cache-tauros2.h ARM: Add Tauros2 L2 cache controller support 2009-11-27 15:43:21 -05:00
clps7111.h
coresight.h ARM: 6293/1: coresight: cosmetic fixes 2010-10-04 20:20:44 +01:00
cs89712.h
debug-8250.S
debug-pl01x.S
dec21285.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
entry-macro-iomd.S
ep7211.h
ep7212.h
gic.h [ARM] smp: fix cpumask usage in ARM SMP code 2009-05-17 16:22:46 +01:00
icst.h Update broken web addresses in arch directory. 2010-10-18 11:03:21 +02:00
ioc.h
iomd.h [ARM] clps7500: remove support 2008-11-27 12:38:11 +00:00
iop3xx-adma.h iop-adma: redundant/wrong tests in iop_*_count()? 2010-02-28 22:22:12 -07:00
iop3xx-gpio.h [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
iop3xx.h iop: enable generic time 2009-10-29 11:46:55 -07:00
iop_adma.h Merge branch 'dmaengine' into async-tx-next 2009-09-08 17:55:21 -07:00
it8152.h [ARM] pxa: move board board IRQ definitions out of irqs.h 2010-03-02 07:40:51 +08:00
linkup-l1110.h
locomo.h [ARM] locomo: allow cascaded IRQ base to be specified by platforms 2010-03-02 07:40:50 +08:00
memc.h
pci_v3.h
pl080.h DMAENGINE: correct PL080 register header file 2010-08-14 16:29:55 +01:00
pl330.h ARM: 6132/1: PL330: Add common core driver 2010-05-15 15:03:50 +01:00
sa1111.h [ARM] sa1111: allow cascaded IRQs to be used by platforms 2010-03-02 07:40:51 +08:00
scoop.h [ARM] scoop: Add CPR register bit definitions 2010-08-05 14:32:26 +08:00
sp810.h ARM: 6021/1: ST SPEAr: Added ARM PrimeXsys System Controller SP810 header file 2010-04-14 11:34:38 +01:00
ssp.h
uengine.h
vic.h [ARM] VIC: Add power management device 2009-05-07 11:04:57 +01:00