Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-11 22:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
1a8edf40e7
linux/arch/arm/mach-pxa
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 Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
am200epd.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
am300epd.c broadsheetfb: add multiple panel type support 2010-03-12 15:52:32 -08:00
balloon3.c ARM: pxa: Add Balloon3 NAND ready check 2010-12-20 23:14:09 +08:00
capc7117.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
clock-pxa2xx.c ARM: pxa: introduce pxa3xx_clock_sysclass for clock suspend/resume 2010-12-18 21:02:03 +08:00
clock-pxa3xx.c ARM: pxa: add clock for static memory controller 2010-12-20 23:07:43 +08:00
clock.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock.h Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
cm-x2xx-pci.c ARM: Remove 'node' argument form arch_adjust_zones() 2010-07-16 10:57:36 +01:00
cm-x2xx-pci.h [ARM] 5280/1: pxa: prepare cm-x2xx.c and cm-x2xx-pci.[ch] for addition of CM-X255 2008-10-07 12:05:05 +01:00
cm-x2xx.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
cm-x255.c arm/pxa2xx: reorgazine SSP and SPI header files 2010-12-01 12:18:33 +01:00
cm-x270.c arm/pxa2xx: reorgazine SSP and SPI header files 2010-12-01 12:18:33 +01:00
cm-x300.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
colibri-evalboard.c ARM: pxa: Rename Colibri evalboard 2010-12-20 23:07:42 +08:00
colibri-pxa3xx.c ARM: pxa: Push Colibri evalboard MFP into module files 2010-12-20 23:07:40 +08:00
colibri-pxa270-income.c ARM: pxa: Push Colibri evalboard MFP into module files 2010-12-20 23:07:40 +08:00
colibri-pxa270.c ARM: pxa: Rename Colibri evalboard 2010-12-20 23:07:42 +08:00
colibri-pxa300.c ARM: pxa/colibri: setup pins for USB host port 3 2010-12-20 23:07:50 +08:00
colibri-pxa320.c ARM: pxa: Colibri PXA320 PCMCIA driver 2010-12-20 23:07:44 +08:00
corgi_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
corgi.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
cpufreq-pxa2xx.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
cpufreq-pxa3xx.c ARM: pxa: reduce the scope of get_clk_frequency_khz() 2010-10-09 17:07:30 +08:00
csb701.c [ARM] pxa/csb701: do not register devices on non-csb726 boads 2009-04-04 10:26:35 +08:00
csb726.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
devices.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
devices.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 2010-10-25 08:32:05 -07:00
em-x270.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
eseries.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
eseries.h [ARM] pxa: Add multi-io support for e-series 2008-12-15 03:29:34 +00:00
ezx.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
generic.c ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
generic.h ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
gumstix.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
h5000.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
himalaya.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
hx4700.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
icontrol.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
idp.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
irq.c ARM: pxa: sanitize IRQ registers access based on offset 2010-12-18 21:02:17 +08:00
Kconfig Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
leds-idp.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds-lubbock.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds-mainstone.c [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage 2009-03-09 21:22:36 +08:00
leds.c
leds.h
littleton.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
lpd270.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
lubbock.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
magician.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
mainstone.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
Makefile ARM: pxa: Rename Colibri evalboard 2010-12-20 23:07:42 +08:00
Makefile.boot
mfp-pxa2xx.c [ARM] pxa: allow MFP_LPM_INPUT to be explicitly specified 2010-05-11 17:25:00 +02:00
mfp-pxa3xx.c [ARM] pxa: move common MFP handling code into plat-pxa 2009-03-23 10:11:34 +08:00
mioa701_bootresume.S [ARM] pxa/MioA701: fix memory corruption. 2008-11-22 20:57:21 +08:00
mioa701.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
mp900.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
mxm8x10.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
palm27x.c ARM: pxa: Use PIO for PI2C communication on Palm27x 2010-09-25 09:47:02 +08:00
palmld.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmt5.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmtc.c ARM: pxa: Add gpio-leds and vibrator support to PalmTC 2010-12-20 23:07:46 +08:00
palmte2.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmtreo.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmtx.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmz72.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
pcm027.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
pcm990-baseboard.c [media] soc_camera: Don't use module names to load I2C modules 2010-10-22 21:53:52 -02:00
pm.c suspend: constify platform_suspend_ops 2010-11-16 14:14:02 +01:00
poodle.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
pxa2xx.c [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
pxa3xx-ulpi.c ARM: pxa: fix pxa3xx-u2d crash when ULPI not used 2010-10-08 16:21:18 +08:00
pxa3xx.c ARM: pxa: add clock for static memory controller 2010-12-20 23:07:43 +08:00
pxa25x.c ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume 2010-12-16 14:31:20 +08:00
pxa27x.c ARM: pxa: introduce pxa2xx_clock_sysclass for clock suspend/resume 2010-12-16 14:31:20 +08:00
pxa95x.c ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
pxa300.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa320.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa930.c ARM: pxa: support pxa95x 2010-12-18 21:02:14 +08:00
raumfeld.c ARM: pxa/raumfeld: enable PXA3XX_GCU driver 2010-12-16 14:31:18 +08:00
reset.c [ARM] pxa: allow gpio_reset drive high during normal work 2009-05-18 21:52:09 +08:00
saar.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
saarb.c ARM: pxa: support saarb platform 2010-12-18 21:02:15 +08:00
sharpsl_pm.c Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-01-13 10:05:56 -08:00
sleep.S Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
smemc.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
spitz_pm.c [ARM] pxa: removed mostly unused and confusing two sharpsl.h 2010-08-05 14:32:38 +08:00
spitz.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
standby.S [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
stargate2.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
tavorevb3.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
tavorevb.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
time.c ARM: pxa: convert sched_clock() to use new infrastructure 2010-12-22 22:44:45 +00:00
tosa-bt.c rfkill: rewrite 2009-06-03 14:06:13 -04:00
tosa.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
trizeps4.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
viper.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
vpac270.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
xcep.c ARM: pxa: Access SMEMC via virtual addresses 2010-12-16 14:31:16 +08:00
z2.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
zeus.c Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 2011-01-07 17:08:46 -08:00
zylonite_pxa300.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00
zylonite_pxa320.c [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot 2009-12-29 14:11:34 +08:00
zylonite.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00