Greg Kroah-Hartman f7a0d426f3 Merge 3.3-rc7 into usb-next ...

This resolves the conflict with drivers/usb/host/ehci-fsl.h that
happened with changes in Linus's and this branch at the same time.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2012-03-12 09:13:31 -07:00

..

include/mach

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

am200epd.c

…

am300epd.c

…

balloon3.c

Driver specific changes

2012-01-09 14:39:22 -08:00

capc7117.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

clock-pxa2xx.c

…

clock-pxa3xx.c

…

clock.c

…

clock.h

…

cm-x2xx-pci.c

…

cm-x2xx-pci.h

…

cm-x2xx.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

cm-x255.c

…

cm-x270.c

…

cm-x300.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

colibri-evalboard.c

…

colibri-pxa3xx.c

…

colibri-pxa270-income.c

…

colibri-pxa270.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

colibri-pxa300.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

colibri-pxa320.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

corgi_pm.c

…

corgi.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

cpufreq-pxa2xx.c

…

cpufreq-pxa3xx.c

…

csb701.c

…

csb726.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

devices.c

Revert "RTC: sa1100: support sa1100, pxa and mmp soc families"

2012-01-19 17:19:18 +00:00

devices.h

…

em-x270.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

eseries.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

eseries.h

…

ezx.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

generic.c

…

generic.h

ARM: pxa: remove duplicated registeration on pxa-gpio

2012-03-06 14:40:59 +08:00

gumstix.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

h5000.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

himalaya.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

hx4700.c

pxa/hx4700: add platform device and I2C info for AK4641 codec

2012-02-17 11:21:31 +08:00

icontrol.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

idp.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

irq.c

…

Kconfig

…

leds-idp.c

…

leds-lubbock.c

…

leds-mainstone.c

…

leds.c

…

leds.h

…

littleton.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

lpd270.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

lubbock.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

magician.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

mainstone.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

Makefile

…

Makefile.boot

…

mfp-pxa2xx.c

ARM: pxa: fix invalid mfp pin issue

2012-03-06 14:57:16 +08:00

mfp-pxa3xx.c

…

mioa701_bootresume.S

…

mioa701.c

Driver specific changes

2012-01-09 14:39:22 -08:00

mp900.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

mxm8x10.c

…

palm27x.c

…

palmld.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmt5.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmtc.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmte2.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmtreo.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmtx.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

palmz72.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

pcm027.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

pcm990-baseboard.c

…

pm.c

…

poodle.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

pxa2xx.c

…

pxa3xx-ulpi.c

usb: otg: Convert all users to pass struct usb_otg for OTG functions

2012-02-27 15:41:52 +02:00

pxa3xx.c

ARM: pxa: remove duplicated registeration on pxa-gpio

2012-03-06 14:40:59 +08:00

pxa25x.c

ARM: pxa: remove duplicated registeration on pxa-gpio

2012-03-06 14:40:59 +08:00

pxa27x.c

ARM: pxa: remove duplicated registeration on pxa-gpio

2012-03-06 14:40:59 +08:00

pxa95x.c

ARM: pxa: remove duplicated registeration on pxa-gpio

2012-03-06 14:40:59 +08:00

pxa300.c

Revert "ARM: pxa: add dummy clock for sa1100-rtc"

2012-01-19 11:59:07 +00:00

pxa320.c

Revert "ARM: pxa: add dummy clock for sa1100-rtc"

2012-01-19 11:59:07 +00:00

pxa930.c

…

raumfeld.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

reset.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

saar.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

saarb.c

arch/arm/mach-pxa/: included linux/gpio.h twice

2012-02-16 23:26:19 +08:00

sharpsl_pm.c

ARM: pxa: fix mixed declarations and code in sharpsl_pm

2012-02-16 10:29:07 +08:00

sleep.S

…

smemc.c

…

spitz_pm.c

ARM: pxa: fix wrong parsing gpio event on spitz

2012-02-16 10:28:53 +08:00

spitz.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

standby.S

…

stargate2.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

tavorevb3.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

tavorevb.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

time.c

…

tosa-bt.c

…

tosa.c

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

2012-01-12 08:00:30 -08:00

trizeps4.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

viper.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

vpac270.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

xcep.c

ARM: restart: pxa: use new restart hook

2012-01-05 12:57:17 +00:00

z2.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

zeus.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

zylonite_pxa300.c

…

zylonite_pxa320.c

…

zylonite.c

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00