Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-25 20:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
d3ec4844d4
linux/arch/arm/mach-pxa
History
Linus Torvalds d3ec4844d4 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: (43 commits)
  fs: Merge split strings
  treewide: fix potentially dangerous trailing ';' in #defined values/expressions
  uwb: Fix misspelling of neighbourhood in comment
  net, netfilter: Remove redundant goto in ebt_ulog_packet
  trivial: don't touch files that are removed in the staging tree
  lib/vsprintf: replace link to Draft by final RFC number
  doc: Kconfig: `to be' -> `be'
  doc: Kconfig: Typo: square -> squared
  doc: Konfig: Documentation/power/{pm => apm-acpi}.txt
  drivers/net: static should be at beginning of declaration
  drivers/media: static should be at beginning of declaration
  drivers/i2c: static should be at beginning of declaration
  XTENSA: static should be at beginning of declaration
  SH: static should be at beginning of declaration
  MIPS: static should be at beginning of declaration
  ARM: static should be at beginning of declaration
  rcu: treewide: Do not use rcu_read_lock_held when calling rcu_dereference_check
  Update my e-mail address
  PCIe ASPM: forcedly -> forcibly
  gma500: push through device driver tree
  ...

Fix up trivial conflicts:
 - arch/arm/mach-ep93xx/dma-m2p.c (deleted)
 - drivers/gpio/gpio-ep93xx.c (renamed and context nearby)
 - drivers/net/r8169.c (just context changes)
2011-07-25 13:56:39 -07:00
..
include/mach Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2011-07-25 13:56:39 -07:00
am200epd.c ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path 2011-03-17 18:16:12 +08:00
am300epd.c ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path 2011-03-17 23:06:29 +08:00
balloon3.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02: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: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
clock.c Merge branch 'devel-stable' into devel 2011-01-06 22:33:32 +00:00
clock.h ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x2xx-pci.c ARM: use ARM_DMA_ZONE_SIZE to adjust the zone sizes 2011-05-12 08:36:53 +01:00
cm-x2xx-pci.h
cm-x2xx.c ARM: mach-pxa: move from ARM_DMA_ZONE_SIZE to mdesc->dma_zone_size 2011-07-18 15:30:01 -04:00
cm-x255.c arm/pxa2xx: reorgazine SSP and SPI header files 2010-12-01 12:18:33 +01:00
cm-x270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
cm-x300.c ARM: pxa/cm-x300: minor style cleanup 2011-07-11 14:43:27 +08:00
colibri-evalboard.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa3xx.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
colibri-pxa270-income.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
colibri-pxa300.c ARM: pxa/colibri: use correct SD detect pin 2011-02-09 23:05:03 +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 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00: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: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
devices.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00: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 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
eseries.c ARM: pxa/eseries: switch to using gpio-vbus transceiver 2011-03-16 16:32:48 +08:00
eseries.h
ezx.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
generic.c ARM: Fix build regression on SA11x0, PXA, and H720x targets 2011-01-15 00:14:25 +00:00
generic.h ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
gumstix.c ARM: pxa/gumstix: switch to using gpio-vbus transceiver 2011-03-16 16:32:48 +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 ARM: pxa/hx4700: use gpio arrays for global gpios 2011-07-11 14:43:30 +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: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
irq.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
Kconfig mtd: pxa: convert to mtd_device_register() 2011-05-25 02:20:48 +01: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 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
lpd270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
lubbock.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
magician.c ARM: pxa/magician: use gpio arrays for backlight and global gpios 2011-07-11 14:43:30 +08:00
mainstone.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
Makefile ARM: pxa: Rename Colibri evalboard 2010-12-20 23:07:42 +08:00
Makefile.boot
mfp-pxa2xx.c ARM: pxa: fix PGSR register address calculation 2011-07-06 23:47:40 +08:00
mfp-pxa3xx.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
mioa701_bootresume.S
mioa701.c ARM: pxa/mioa701: use gpio arrays for global and gsm gpios 2011-07-11 14:43:31 +08:00
mp900.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
mxm8x10.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
palm27x.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
palmld.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
palmt5.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmtc.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
palmte2.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
palmtreo.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
palmtx.c ARM: pxa: Introduce pxa{25x,27x,3xx}_map_io() 2010-12-16 14:31:15 +08:00
palmz72.c ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code 2011-06-24 09:54:39 +01: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 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm 2011-03-30 07:50:45 -07:00
pm.c ARM: pm: move cpu_init() call into core code 2011-06-24 08:48:43 +01:00
poodle.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00: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: pm: allow suspend finisher to return error codes 2011-07-02 09:54:01 +01:00
pxa25x.c ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code 2011-06-24 09:54:39 +01:00
pxa27x.c ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code 2011-06-24 09:54:39 +01:00
pxa95x.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02: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: fix device name for codec ak4104 2011-07-11 14:26:33 +08:00
reset.c [ARM] pxa: allow gpio_reset drive high during normal work 2009-05-18 21:52:09 +08:00
saar.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
saarb.c ARM: pxa/saarb: make use of pxa3xx_map_io() 2011-07-11 14:43:24 +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 ARM: pm: pxa: move cpu_suspend into C code 2011-06-24 08:48:45 +01:00
smemc.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
spitz_pm.c gpio: include linux/gpio.h where needed 2011-06-16 08:40:44 -06:00
spitz.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00: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 ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
tavorevb3.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
tavorevb.c ARM: pxa: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00
time.c clocksource: convert ARM 32-bit up counting clocksources 2011-05-23 18:04:51 +01:00
tosa-bt.c ARM: pxa/tosa: drop setting LED trigger name, as it's unsupported now 2011-02-27 21:38:18 +08:00
tosa.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
trizeps4.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
viper.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
vpac270.c ARM / PXA: Use struct syscore_ops for "core" power management 2011-04-24 19:16:09 +02:00
xcep.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00:00
z2.c Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable 2011-03-26 10:03:03 +00:00
zeus.c ARM: pm: hide 1st and 2nd arguments to cpu_suspend from platform code 2011-06-24 09:54:39 +01:00
zylonite_pxa300.c ARM: pxa2xx: reorganize I2C files 2011-03-21 09:09:33 +00: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: clean up set_pxa_fb_info 2011-03-16 16:32:47 +08:00