leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1756ac3d3c
linux/arch/arm/mach-pxa
History
Linus Torvalds f8965467f3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c
2010-05-20 21:04:44 -07:00
..
include/mach [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02: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 the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
capc7117.c [ARM] pxa: add support for Embedian MXM-8x10 2010-03-02 07:40:51 +08:00
clock.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
clock.h ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
cm-x2xx-pci.c [ARM] pxa: use chip->ack() instead of accessing GEDR directly 2010-03-02 07:40:45 +08:00
cm-x2xx-pci.h
cm-x2xx.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
cm-x255.c [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
cm-x270.c [ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers 2010-03-02 07:40:48 +08:00
cm-x300.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
colibri-pxa3xx.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
colibri-pxa270.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
colibri-pxa300.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
colibri-pxa320.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
corgi_pm.c [ARM] pxa/corgi: cleanup GPIO configurations and low power mode settings 2010-05-11 17:25:00 +02:00
corgi.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
cpufreq-pxa2xx.c [ARM] pxa/cpufreq: fix index assignments for end marker 2009-11-20 14:23:13 -06:00
cpufreq-pxa3xx.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
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: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
devices.c [ARM] pxa: fix no reference of cpu_is_pxa25x() in devices.c 2009-12-16 21:35:52 +08:00
devices.h [ARM] pxa: add device definition for graphics controller 2009-09-10 18:49:27 +08:00
e330.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e350.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e400.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
e740.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
e750.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
e800.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
em-x270.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
eseries.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
eseries.h [ARM] pxa: Add multi-io support for e-series 2008-12-15 03:29:34 +00:00
ezx.c [ARM] pxa/ezx: add leds-lp3944 support for A910 EZX phone 2009-12-01 09:03:03 +08:00
generic.c [ARM] pxa: remove pxa_gpio_mode() and files 2010-05-11 17:25:01 +02:00
generic.h [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
gumstix.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
h5000.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
himalaya.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
hx4700.c [ARM] pxa/hx4700: actually use platform_lcd driver 2009-12-01 09:03:15 +08:00
icontrol.c Add hotplug support to mcp251x driver 2010-03-30 23:51:09 -07:00
idp.c [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
imote2.c [ARM] pxa: remove spi cs gpio direction to avoid clash with driver 2010-03-22 12:03:06 +08:00
irq.c [ARM] pxa: fix irq suspend/resume for pxa25x 2010-01-13 21:01:09 +08:00
Kconfig [ARM] pxa/vpac270: add ide support 2010-05-11 17:25:03 +02: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 [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
lpd270.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
lubbock.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
magician.c [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +08:00
mainstone.c [ARM] pxa: add the missing AC97 pin configurations 2010-03-02 07:40:48 +08:00
Makefile [ARM] pxa: add basic support for Voipac PXA270 SBC 2010-05-11 17:25:02 +02: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: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
mp900.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
mxm8x10.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palmld.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palmt5.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palmtc.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palmte2.c [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms 2010-03-02 07:40:46 +08:00
palmtreo.c [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +08:00
palmtx.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
palmz72.c [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms 2010-03-02 07:40:47 +08:00
pcm027.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
pcm990-baseboard.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
pm.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
poodle.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
pxa2xx.c [ARM] pxa: add gpio_pwdown(_inverted) into pxaficp_ir.c 2009-09-10 18:49:39 +08:00
pxa3xx.c [ARM] pxa: remove unnecessary #include of <mach/ssp.h> 2010-05-11 17:24:58 +02:00
pxa25x.c ARM: Consolidate clks_register() and similar 2010-02-12 17:32:36 +00:00
pxa27x.c Merge branch 'origin' into devel-stable 2010-03-08 20:21:04 +00: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 mfp of pxa935 2009-09-10 18:49:24 +08:00
raumfeld.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02: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: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
sharpsl_pm.c [ARM] pxa: remove pxa_gpio_mode() and files 2010-05-11 17:25:01 +02:00
sharpsl.h [ARM] pxa: remove now un-used corgi_ssp.c and corgi_lcd.c 2010-05-11 17:24:57 +02:00
sleep.S [ARM] pxa: separate definitions from pxa-regs.h and remove it finally 2009-03-09 21:22:40 +08:00
smemc.c [ARM] pxa: avoid polluting the kernel's namespace 2008-11-28 16:04:54 +00:00
spitz_pm.c [ARM] pxa/spitz: use generic GPIO API and remove pxa_gpio_mode() 2010-05-11 17:25:00 +02:00
spitz.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02: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] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
tavorevb.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
time.c arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode 2010-01-22 17:04:52 +01:00
tosa-bt.c rfkill: rewrite 2009-06-03 14:06:13 -04:00
tosa.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
trizeps4.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
viper.c [ARM] pxa/viper: fix timeout usage for I2C 2010-05-06 11:12:11 +08:00
vpac270.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
xcep.c [ARM] pxa: allow platforms to control which uarts are registered 2009-12-01 09:02:55 +08:00
z2.c [ARM] pxa: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00
zeus.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 2010-05-20 21:04:44 -07: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: make it clear by converting MMC 'delay_detect' to millisecond 2010-05-11 17:25:04 +02:00