original_kernel/include/asm-arm/hardware
Linus Torvalds e9b62693ae Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial: (24 commits)
  DOC:  A couple corrections and clarifications in USB doc.
  Generate a slightly more informative error msg for bad HZ
  fix typo "is" -> "if" in Makefile
  ext*: spelling fix prefered -> preferred
  DOCUMENTATION:  Use newer DEFINE_SPINLOCK macro in docs.
  KEYS:  Fix the comment to match the file name in rxrpc-type.h.
  RAID: remove trailing space from printk line
  DMA engine: typo fixes
  Remove unused MAX_NODES_SHIFT
  MAINTAINERS: Clarify access to OCFS2 development mailing list.
  V4L: Storage class should be before const qualifier (sn9c102)
  V4L: Storage class should be before const qualifier
  sonypi: Storage class should be before const qualifier
  intel_menlow: Storage class should be before const qualifier
  DVB: Storage class should be before const qualifier
  arm: Storage class should be before const qualifier
  ALSA: Storage class should be before const qualifier
  acpi: Storage class should be before const qualifier
  firmware_sample_driver.c: fix coding style
  MAINTAINERS: Add ati_remote2 driver
  ...

Fixed up trivial conflicts in firmware_sample_driver.c
2008-04-21 16:36:46 -07:00
..
arm_timer.h
arm_twd.h
cache-l2x0.h
clps7111.h
cs89712.h
debug-8250.S
debug-pl01x.S
dec21285.h
entry-macro-iomd.S
ep7211.h
ep7212.h
gic.h
icst307.h
icst525.h
ioc.h
iomd.h
iop3xx-adma.h arm: Storage class should be before const qualifier 2008-04-21 22:26:40 +00:00
iop3xx.h
iop_adma.h
it8152.h
linkup-l1110.h
locomo.h
memc.h
pci_v3.h
sa1111.h
scoop.h
sharpsl_pm.h
ssp.h
uengine.h
vic.h