OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
linux/arch/arm/mach-sa1100
History
Linus Torvalds 008d23e485 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: (43 commits)
  Documentation/trace/events.txt: Remove obsolete sched_signal_send.
  writeback: fix global_dirty_limits comment runtime -> real-time
  ppc: fix comment typo singal -> signal
  drivers: fix comment typo diable -> disable.
  m68k: fix comment typo diable -> disable.
  wireless: comment typo fix diable -> disable.
  media: comment typo fix diable -> disable.
  remove doc for obsolete dynamic-printk kernel-parameter
  remove extraneous 'is' from Documentation/iostats.txt
  Fix spelling milisec -> ms in snd_ps3 module parameter description
  Fix spelling mistakes in comments
  Revert conflicting V4L changes
  i7core_edac: fix typos in comments
  mm/rmap.c: fix comment
  sound, ca0106: Fix assignment to 'channel'.
  hrtimer: fix a typo in comment
  init/Kconfig: fix typo
  anon_inodes: fix wrong function name in comment
  fix comment typos concerning "consistent"
  poll: fix a typo in comment
  ...

Fix up trivial conflicts in:
 - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)
 - fs/ext4/ext4.h

Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
 		2011-01-13 10:05:56 -08:00
..
include/mach ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
Kconfig ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
Makefile ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
Makefile.boot Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
assabet.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
badge4.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
cerf.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
clock.c [ARM] sa1100: match clock by dev_name(dev) 2008-11-27 12:38:24 +00:00
collie.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
cpu-sa1100.c ARM: 6450/1: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1100.c. 2010-11-10 13:33:41 +00:00
cpu-sa1110.c ARM: 6451/1: sa1100: Fix checkpatch.pl issues in arch/arm/mach-sa1100/cpu-sa1110.c. 2010-12-21 14:53:39 +00:00
dma.c tree-wide: fix assorted typos all over the place 2009-12-04 15:39:55 +01:00
generic.c Merge branch 'clksrc' into devel 2011-01-05 18:09:03 +00:00
generic.h ARM: Remove DISCONTIGMEM support 2010-07-16 10:57:35 +01:00
gpio.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
h3xxx.c ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request 2009-12-06 16:52:58 +00:00
h3100.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
h3600.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
hackkit.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
irq.c [ARM] 5298/1: Drop desc_handle_irq() 2008-10-09 15:00:36 +01:00
jornada720.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
jornada720_ssp.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
lart.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
leds-assabet.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-badge4.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-cerf.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-hackkit.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-lart.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds-simpad.c [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00
leds.c ARM: arch/arm/mach-sa1100/leds.c: Checkpatch cleanup 2010-05-24 20:40:11 +01:00
leds.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nanoengine.c ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
neponset.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
pci-nanoengine.c ARM: 6459/2: sa1100: Add nanoEngine PCI support. 2010-12-21 14:53:46 +00:00
pleb.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
shannon.c arm: remove machine_desc.io_pg_offst and .phys_io 2010-10-20 00:27:46 -04:00
simpad.c ARM: 6606/1: sa1100: Fix platform device registration 2011-01-03 22:57:10 +00:00
sleep.S [ARM] 5336/1: Formatting/Whitespace cleanups in mach-sa1100 2008-12-01 17:22:45 +00:00
ssp.c [ARM] Convert asm/io.h to linux/io.h 2008-09-06 12:10:45 +01:00
time.c ARM: sa1100: convert sched_clock() to use new infrastructure 2010-12-22 22:44:46 +00:00