summaryrefslogtreecommitdiff
path: root/drivers/mfd/ezx-pcap.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-14 10:01:15 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-14 10:01:15 -0800
commitaf853e631db12a97363c8c3b727d153bd2cb346b (patch)
tree28bef0eb1db591539e9a5016b60aa170f51b3442 /drivers/mfd/ezx-pcap.c
parent3f86ce72cffbea488a3b58453bbaf49c93ac90d9 (diff)
parentfc7736688b046f91170591625b38f12a839ba994 (diff)
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: ARM: fix lh7a40x build ARM: fix sa1100 build ARM: fix clps711x, footbridge, integrator, ixp2000, ixp2300 and s3c build bug ARM: VFP: fix vfp thread init bug and document vfp notifier entry conditions ARM: pxa: fix now incorrect reference of skt->irq by using skt->socket.pci_irq [ARM] pxa/zeus: default configuration for Arcom Zeus SBC. [ARM] pxa/zeus: make Viper pcmcia support more generic to support Zeus [ARM] pxa/zeus: basic support for Arcom Zeus SBC [ARM] pxa/em-x270: fix usb hub power up/reset sequence PCMCIA: fix pxa2xx_lubbock modular build error ARM: RealView: Fix typo in the RealView/PBX Kconfig entry ARM: Do not allow the probing of the local timer ARM: Add an earlyprintk debug console
Diffstat (limited to 'drivers/mfd/ezx-pcap.c')
0 files changed, 0 insertions, 0 deletions