linux/arch/arm/mach-pxa
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
am200epd.c
am300epd.c
balloon3.c
capc7117.c
clock.c
clock.h
cm-x2xx-pci.c
cm-x2xx-pci.h
cm-x2xx.c
cm-x255.c
cm-x270.c
cm-x300.c
colibri-pxa3xx.c
colibri-pxa270.c
colibri-pxa300.c
colibri-pxa320.c
corgi_pm.c
corgi.c
cpufreq-pxa2xx.c
cpufreq-pxa3xx.c
csb701.c
csb726.c
devices.c
devices.h
e330.c
e350.c
e400.c
e740.c
e750.c
e800.c
em-x270.c
eseries.c
eseries.h
ezx.c
generic.c
generic.h
gumstix.c
h5000.c
himalaya.c
hx4700.c
icontrol.c
idp.c
imote2.c
irq.c
Kconfig
leds-idp.c
leds-lubbock.c
leds-mainstone.c
leds.c
leds.h
littleton.c
lpd270.c
lubbock.c
magician.c
mainstone.c
Makefile
Makefile.boot
mfp-pxa2xx.c
mfp-pxa3xx.c
mioa701_bootresume.S
mioa701.c
mp900.c
mxm8x10.c
palmld.c
palmt5.c
palmtc.c
palmte2.c
palmtreo.c
palmtx.c
palmz72.c
pcm027.c
pcm990-baseboard.c
pm.c
poodle.c
pxa2xx.c
pxa3xx.c
pxa25x.c
pxa27x.c
pxa300.c
pxa320.c
pxa930.c
raumfeld.c
reset.c
saar.c
sharpsl_pm.c
sharpsl.h
sleep.S
smemc.c
spitz_pm.c
spitz.c
standby.S
stargate2.c
tavorevb.c
time.c
tosa-bt.c
tosa.c
trizeps4.c
viper.c
vpac270.c
xcep.c
z2.c
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
zylonite_pxa320.c
zylonite.c