diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-11 16:30:46 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-11 16:30:46 +1000 |
| commit | 299be36648adc14e4627173d00c18b11d08e5ecd (patch) | |
| tree | 152ab00cfdd095b62eb582f5e0189213b31b8156 | |
| parent | efc8b82b89e697b54707da0b855d066b2b99fe79 (diff) | |
Add linux-next specific files for 20080811next-20080811
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 112 | ||||
| -rw-r--r-- | Next/merge.log | 5582 | ||||
| -rw-r--r-- | Next/quilt-import.log | 252 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5947 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a4c310f3aa35 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,112 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#merge +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-usb.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-2.6.26 +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-driver-core/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-usb/ +tip-core git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-core-next +cpus4096 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-cpus4096-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-ftrace-next +genirq git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-genirq-next +safe-poison-pointers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-safe-poison-pointers-next +sched git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-sched-next +stackprotector git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-stackprotector-next +timers git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-timers-next +x86 git git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git#auto-x86-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#mm +i2c quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://khali.linux-fr.org/devel/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#stable +s390 git git://git390.osdl.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +ide quilt http://kernel.org/pub/linux/kernel/people/bart/pata-2.6/patches/ +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +xfs git git://oss.sgi.com:8090/xfs/xfs-2.6.git#master +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-acpi-2.6.git#test +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/~dedekind/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#master +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +tests git git://git.kernel.org/pub/scm/linux/kernel/git/sam/test.git#master +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next +m68k quilt http://www.kernel.org/pub/linux/kernel/people/geert/linux-m68k-patches-2.6/ +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#powerpc-next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#powerpc-next +mtd git git://git.infradead.org/mtd-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +semaphore git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore +semaphore-removal git git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc.git#semaphore-removal +bkl-removal git git://git.lwn.net/linux-2.6.git#bkl-removal +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/juhl/trivial-2.6.git#next +ubifs git git://git.infradead.org/~dedekind/ubifs-2.6.git#linux-next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +cris git git://www.jni.nu/cris.git#for-next +kmemcheck git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-kmemcheck-next +generic-ipi git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +mfd git git://git.o-hand.com/linux-mfd#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#reg-for-linus +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +ttydev quilt http://www.linux.org.uk/~alan/ttydev/ +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +creds git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6#next-creds diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e5a9599e2bad --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5582 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 685d87f Revert "pcm_native.c: remove unused label" +Merging origin/master +$ git merge origin/master +Updating 685d87f..796aade +Fast forward + Documentation/DocBook/z8530book.tmpl | 38 +- + Documentation/arm/IXP4xx | 2 +- + Documentation/arm/Interrupts | 2 +- + Documentation/arm/README | 4 +- + Documentation/arm/Samsung-S3C24XX/GPIO.txt | 8 +- + Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 +- + Documentation/arm/Samsung-S3C24XX/USB-Host.txt | 2 +- + Documentation/cciss.txt | 21 +- + Documentation/hwmon/dme1737 | 53 +- + Documentation/hwmon/it87 | 13 +- + Documentation/hwmon/w83627hf | 4 - + Documentation/hwmon/w83791d | 6 +- + Documentation/spi/pxa2xx | 4 +- + Documentation/spi/spi-summary | 4 +- + Documentation/video4linux/gspca.txt | 1 + + MAINTAINERS | 16 +- + Makefile | 8 +- + arch/arm/Makefile | 54 +- + arch/arm/boot/compressed/head-xscale.S | 1 - + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/misc.c | 2 +- + arch/arm/common/locomo.c | 2 +- + arch/arm/common/sa1111.c | 2 +- + arch/arm/common/sharpsl_pm.c | 11 +- + arch/arm/common/time-acorn.c | 2 +- + arch/arm/common/uengine.c | 3 +- + arch/arm/include/asm/dma.h | 2 +- + arch/arm/include/asm/floppy.h | 2 +- + arch/arm/include/asm/gpio.h | 2 +- + arch/arm/include/asm/hardware.h | 18 - + arch/arm/include/asm/hardware/dec21285.h | 2 +- + arch/arm/include/asm/hardware/iop3xx-adma.h | 2 +- + arch/arm/include/asm/hardware/iop3xx-gpio.h | 2 +- + arch/arm/include/asm/hardware/sa1111.h | 2 +- + arch/arm/include/asm/hw_irq.h | 20 +- + arch/arm/include/asm/io.h | 2 +- + arch/arm/include/asm/irq.h | 2 +- + arch/arm/include/asm/mach/irq.h | 20 - + arch/arm/include/asm/mc146818rtc.h | 2 +- + arch/arm/include/asm/memory.h | 2 +- + arch/arm/include/asm/mmzone.h | 2 +- + arch/arm/include/asm/mtd-xip.h | 4 +- + arch/arm/include/asm/pci.h | 2 +- + arch/arm/include/asm/pgtable.h | 2 +- + arch/arm/include/asm/smp.h | 2 +- + arch/arm/include/asm/timex.h | 2 +- + arch/arm/include/asm/vga.h | 2 +- + arch/arm/kernel/crunch-bits.S | 2 +- + arch/arm/kernel/crunch.c | 2 +- + arch/arm/kernel/debug.S | 2 +- + arch/arm/kernel/ecard.c | 2 +- + arch/arm/kernel/entry-armv.S | 2 +- + arch/arm/kernel/entry-common.S | 2 +- + arch/arm/kernel/head-nommu.S | 1 - + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/process.c | 2 +- + arch/arm/kernel/smp.c | 4 +- + arch/arm/lib/ecard.S | 2 +- + arch/arm/lib/io-readsw-armv3.S | 2 +- + arch/arm/lib/io-writesw-armv3.S | 2 +- + arch/arm/mach-aaec2000/aaed2000.c | 4 +- + arch/arm/mach-aaec2000/core.c | 2 +- + .../arm/mach-aaec2000/include/mach}/aaec2000.h | 2 +- + .../arm/mach-aaec2000/include/mach}/aaed2000.h | 2 +- + .../arm/mach-aaec2000/include/mach}/debug-macro.S | 2 +- + .../arm/mach-aaec2000/include/mach}/dma.h | 2 +- + .../arm/mach-aaec2000/include/mach}/entry-macro.S | 4 +- + .../arm/mach-aaec2000/include/mach}/hardware.h | 4 +- + .../arm/mach-aaec2000/include/mach}/io.h | 4 +- + .../arm/mach-aaec2000/include/mach}/irqs.h | 2 +- + .../arm/mach-aaec2000/include/mach}/memory.h | 2 +- + .../arm/mach-aaec2000/include/mach}/system.h | 2 +- + .../arm/mach-aaec2000/include/mach}/timex.h | 2 +- + .../arm/mach-aaec2000/include/mach}/uncompress.h | 2 +- + .../arm/mach-aaec2000/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-at91/at91cap9.c | 8 +- + arch/arm/mach-at91/at91cap9_devices.c | 10 +- + arch/arm/mach-at91/at91rm9200.c | 6 +- + arch/arm/mach-at91/at91rm9200_devices.c | 8 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam9260.c | 10 +- + arch/arm/mach-at91/at91sam9260_devices.c | 12 +- + arch/arm/mach-at91/at91sam9261.c | 8 +- + arch/arm/mach-at91/at91sam9261_devices.c | 10 +- + arch/arm/mach-at91/at91sam9263.c | 8 +- + arch/arm/mach-at91/at91sam9263_devices.c | 10 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-at91/at91sam9rl.c | 10 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 10 +- + arch/arm/mach-at91/at91x40.c | 6 +- + arch/arm/mach-at91/at91x40_time.c | 4 +- + arch/arm/mach-at91/board-1arm.c | 6 +- + arch/arm/mach-at91/board-cam60.c | 6 +- + arch/arm/mach-at91/board-cap9adk.c | 10 +- + arch/arm/mach-at91/board-carmeva.c | 6 +- + arch/arm/mach-at91/board-csb337.c | 6 +- + arch/arm/mach-at91/board-csb637.c | 6 +- + arch/arm/mach-at91/board-dk.c | 8 +- + arch/arm/mach-at91/board-eb01.c | 4 +- + arch/arm/mach-at91/board-eb9200.c | 6 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +- + arch/arm/mach-at91/board-ek.c | 8 +- + arch/arm/mach-at91/board-kafa.c | 6 +- + arch/arm/mach-at91/board-kb9202.c | 8 +- + arch/arm/mach-at91/board-picotux200.c | 8 +- + arch/arm/mach-at91/board-qil-a9260.c | 8 +- + arch/arm/mach-at91/board-sam9-l9260.c | 6 +- + arch/arm/mach-at91/board-sam9260ek.c | 6 +- + arch/arm/mach-at91/board-sam9261ek.c | 8 +- + arch/arm/mach-at91/board-sam9263ek.c | 8 +- + arch/arm/mach-at91/board-sam9g20ek.c | 6 +- + arch/arm/mach-at91/board-sam9rlek.c | 8 +- + arch/arm/mach-at91/board-usb-a9260.c | 8 +- + arch/arm/mach-at91/board-usb-a9263.c | 8 +- + arch/arm/mach-at91/board-yl-9200.c | 8 +- + arch/arm/mach-at91/clock.c | 7 +- + arch/arm/mach-at91/gpio.c | 6 +- + .../arm/mach-at91/include/mach}/at91_adc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_aic.h | 2 +- + .../arm/mach-at91/include/mach}/at91_dbgu.h | 2 +- + .../arm/mach-at91/include/mach}/at91_mci.h | 2 +- + .../arm/mach-at91/include/mach}/at91_pio.h | 2 +- + .../arm/mach-at91/include/mach}/at91_pit.h | 2 +- + .../arm/mach-at91/include/mach}/at91_pmc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_rstc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_rtc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_rtt.h | 2 +- + .../arm/mach-at91/include/mach}/at91_shdwc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_spi.h | 2 +- + .../arm/mach-at91/include/mach}/at91_ssc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_st.h | 2 +- + .../arm/mach-at91/include/mach}/at91_tc.h | 2 +- + .../arm/mach-at91/include/mach}/at91_twi.h | 2 +- + .../arm/mach-at91/include/mach}/at91_wdt.h | 2 +- + .../arm/mach-at91/include/mach}/at91cap9.h | 2 +- + .../arm/mach-at91/include/mach}/at91cap9_ddrsdr.h | 2 +- + .../arm/mach-at91/include/mach}/at91cap9_matrix.h | 2 +- + .../arm/mach-at91/include/mach}/at91rm9200.h | 2 +- + .../arm/mach-at91/include/mach}/at91rm9200_emac.h | 2 +- + .../arm/mach-at91/include/mach}/at91rm9200_mc.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9260.h | 2 +- + .../mach-at91/include/mach}/at91sam9260_matrix.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9261.h | 2 +- + .../mach-at91/include/mach}/at91sam9261_matrix.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9263.h | 2 +- + .../mach-at91/include/mach}/at91sam9263_matrix.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9_sdramc.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9_smc.h | 2 +- + .../arm/mach-at91/include/mach}/at91sam9rl.h | 2 +- + .../mach-at91/include/mach}/at91sam9rl_matrix.h | 2 +- + .../arm/mach-at91/include/mach}/at91x40.h | 2 +- + .../arm/mach-at91/include/mach}/board.h | 2 +- + .../arm/mach-at91/include/mach}/cpu.h | 6 +- + .../arm/mach-at91/include/mach}/debug-macro.S | 6 +- + .../arm/mach-at91/include/mach}/dma.h | 2 +- + .../arm/mach-at91/include/mach}/entry-macro.S | 6 +- + .../arm/mach-at91/include/mach}/gpio.h | 2 +- + .../arm/mach-at91/include/mach}/hardware.h | 16 +- + .../arm/mach-at91/include/mach}/io.h | 2 +- + .../arm/mach-at91/include/mach}/irqs.h | 4 +- + .../arm/mach-at91/include/mach}/memory.h | 4 +- + .../arm/mach-at91/include/mach}/system.h | 8 +- + .../arm/mach-at91/include/mach}/timex.h | 4 +- + .../arm/mach-at91/include/mach}/uncompress.h | 2 +- + .../arm/mach-at91/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-at91/irq.c | 3 +- + arch/arm/mach-at91/leds.c | 5 +- + arch/arm/mach-at91/pm.c | 17 +- + arch/arm/mach-clps711x/autcpu12.c | 4 +- + arch/arm/mach-clps711x/cdb89712.c | 2 +- + arch/arm/mach-clps711x/ceiva.c | 2 +- + arch/arm/mach-clps711x/edb7211-mm.c | 2 +- + arch/arm/mach-clps711x/fortunet.c | 2 +- + .../arm/mach-clps711x/include/mach}/autcpu12.h | 0 + .../arm/mach-clps711x/include/mach}/debug-macro.S | 2 +- + .../arm/mach-clps711x/include/mach}/dma.h | 2 +- + .../arm/mach-clps711x/include/mach}/entry-macro.S | 4 +- + .../arm/mach-clps711x/include/mach}/hardware.h | 2 +- + .../arm/mach-clps711x/include/mach}/io.h | 4 +- + .../arm/mach-clps711x/include/mach}/irqs.h | 2 +- + .../arm/mach-clps711x/include/mach}/memory.h | 2 +- + .../arm/mach-clps711x/include/mach}/syspld.h | 2 +- + .../arm/mach-clps711x/include/mach}/system.h | 4 +- + .../arm/mach-clps711x/include/mach}/time.h | 2 +- + .../arm/mach-clps711x/include/mach}/timex.h | 2 +- + .../arm/mach-clps711x/include/mach}/uncompress.h | 6 +- + .../arm/mach-clps711x/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-clps711x/irq.c | 2 +- + arch/arm/mach-clps711x/mm.c | 2 +- + arch/arm/mach-clps711x/p720t-leds.c | 2 +- + arch/arm/mach-clps711x/p720t.c | 4 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-clps7500/core.c | 2 +- + .../arm/mach-clps7500/include/mach}/acornfb.h | 0 + .../arm/mach-clps7500/include/mach}/debug-macro.S | 2 +- + .../arm/mach-clps7500/include/mach}/dma.h | 2 +- + .../arm/mach-clps7500/include/mach}/entry-macro.S | 2 +- + .../arm/mach-clps7500/include/mach}/hardware.h | 4 +- + .../arm/mach-clps7500/include/mach}/io.h | 6 +- + .../arm/mach-clps7500/include/mach}/irq.h | 2 +- + .../arm/mach-clps7500/include/mach}/irqs.h | 2 +- + .../arm/mach-clps7500/include/mach}/memory.h | 2 +- + .../arm/mach-clps7500/include/mach}/system.h | 2 +- + .../arm/mach-clps7500/include/mach}/timex.h | 2 +- + .../arm/mach-clps7500/include/mach}/uncompress.h | 2 +- + .../arm/mach-clps7500/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-davinci/board-evm.c | 4 +- + arch/arm/mach-davinci/clock.c | 4 +- + arch/arm/mach-davinci/gpio.c | 6 +- + .../arm/mach-davinci/include/mach}/clock.h | 2 +- + .../arm/mach-davinci/include/mach}/common.h | 0 + .../arm/mach-davinci/include/mach}/debug-macro.S | 0 + .../arm/mach-davinci/include/mach}/dma.h | 0 + .../arm/mach-davinci/include/mach}/entry-macro.S | 4 +- + .../arm/mach-davinci/include/mach}/gpio.h | 2 +- + .../arm/mach-davinci/include/mach}/hardware.h | 0 + .../arm/mach-davinci/include/mach}/i2c.h | 0 + .../arm/mach-davinci/include/mach}/io.h | 0 + .../arm/mach-davinci/include/mach}/irqs.h | 0 + .../arm/mach-davinci/include/mach}/memory.h | 0 + .../arm/mach-davinci/include/mach}/mux.h | 0 + .../arm/mach-davinci/include/mach}/psc.h | 0 + .../arm/mach-davinci/include/mach}/serial.h | 2 +- + .../arm/mach-davinci/include/mach}/system.h | 2 +- + .../arm/mach-davinci/include/mach}/timex.h | 0 + .../arm/mach-davinci/include/mach}/uncompress.h | 2 +- + .../arm/mach-davinci/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-davinci/io.c | 2 +- + arch/arm/mach-davinci/irq.c | 2 +- + arch/arm/mach-davinci/mux.c | 4 +- + arch/arm/mach-davinci/psc.c | 6 +- + arch/arm/mach-davinci/serial.c | 6 +- + arch/arm/mach-davinci/time.c | 4 +- + arch/arm/mach-ebsa110/core.c | 2 +- + .../arm/mach-ebsa110/include/mach}/debug-macro.S | 2 +- + .../arm/mach-ebsa110/include/mach}/dma.h | 2 +- + .../arm/mach-ebsa110/include/mach}/entry-macro.S | 2 +- + .../arm/mach-ebsa110/include/mach}/hardware.h | 2 +- + .../arm/mach-ebsa110/include/mach}/io.h | 2 +- + .../arm/mach-ebsa110/include/mach}/irqs.h | 2 +- + .../arm/mach-ebsa110/include/mach}/memory.h | 2 +- + .../arm/mach-ebsa110/include/mach}/system.h | 2 +- + .../arm/mach-ebsa110/include/mach}/timex.h | 2 +- + .../arm/mach-ebsa110/include/mach}/uncompress.h | 2 +- + .../arm/mach-ebsa110/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ebsa110/io.c | 2 +- + arch/arm/mach-ebsa110/leds.c | 2 +- + arch/arm/mach-ep93xx/adssphere.c | 2 +- + arch/arm/mach-ep93xx/clock.c | 2 +- + arch/arm/mach-ep93xx/core.c | 4 +- + arch/arm/mach-ep93xx/edb9302.c | 2 +- + arch/arm/mach-ep93xx/edb9302a.c | 2 +- + arch/arm/mach-ep93xx/edb9307.c | 2 +- + arch/arm/mach-ep93xx/edb9312.c | 2 +- + arch/arm/mach-ep93xx/edb9315.c | 2 +- + arch/arm/mach-ep93xx/edb9315a.c | 2 +- + arch/arm/mach-ep93xx/gesbc9312.c | 2 +- + arch/arm/mach-ep93xx/gpio.c | 2 +- + .../arm/mach-ep93xx/include/mach}/debug-macro.S | 4 +- + arch/arm/mach-ep93xx/include/mach/dma.h | 3 + + .../arm/mach-ep93xx/include/mach}/entry-macro.S | 4 +- + .../arm/mach-ep93xx/include/mach}/ep93xx-regs.h | 2 +- + arch/arm/mach-ep93xx/include/mach/gesbc9312.h | 3 + + .../arm/mach-ep93xx/include/mach}/gpio.h | 2 +- + .../arm/mach-ep93xx/include/mach}/hardware.h | 6 +- + .../arm/mach-ep93xx/include/mach}/io.h | 2 +- + .../arm/mach-ep93xx/include/mach}/irqs.h | 2 +- + .../arm/mach-ep93xx/include/mach}/memory.h | 2 +- + .../arm/mach-ep93xx/include/mach}/platform.h | 2 +- + .../arm/mach-ep93xx/include/mach}/system.h | 4 +- + arch/arm/mach-ep93xx/include/mach/timex.h | 5 + + .../arm/mach-ep93xx/include/mach}/ts72xx.h | 2 +- + .../arm/mach-ep93xx/include/mach}/uncompress.h | 4 +- + arch/arm/mach-ep93xx/include/mach/vmalloc.h | 5 + + arch/arm/mach-ep93xx/micro9.c | 2 +- + arch/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- + .../mach-footbridge/include/mach}/debug-macro.S | 2 +- + .../arm/mach-footbridge/include/mach}/dma.h | 2 +- + .../mach-footbridge/include/mach}/entry-macro.S | 6 +- + .../arm/mach-footbridge/include/mach}/hardware.h | 4 +- + .../arm/mach-footbridge/include/mach}/io.h | 4 +- + .../arm/mach-footbridge/include/mach}/irqs.h | 2 +- + .../arm/mach-footbridge/include/mach}/memory.h | 2 +- + .../arm/mach-footbridge/include/mach}/system.h | 4 +- + .../arm/mach-footbridge/include/mach}/timex.h | 2 +- + .../arm/mach-footbridge/include/mach}/uncompress.h | 2 +- + .../arm/mach-footbridge/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-footbridge/isa-irq.c | 2 +- + arch/arm/mach-footbridge/netwinder-leds.c | 2 +- + arch/arm/mach-footbridge/time.c | 4 +- + arch/arm/mach-h720x/common.c | 4 +- + arch/arm/mach-h720x/cpu-h7201.c | 4 +- + arch/arm/mach-h720x/cpu-h7202.c | 4 +- + arch/arm/mach-h720x/h7201-eval.c | 2 +- + arch/arm/mach-h720x/h7202-eval.c | 2 +- + .../arm/mach-h720x/include/mach}/boards.h | 2 +- + .../arm/mach-h720x/include/mach}/debug-macro.S | 2 +- + .../arm/mach-h720x/include/mach}/dma.h | 2 +- + .../arm/mach-h720x/include/mach}/entry-macro.S | 2 +- + .../arm/mach-h720x/include/mach}/h7201-regs.h | 2 +- + .../arm/mach-h720x/include/mach}/h7202-regs.h | 2 +- + .../arm/mach-h720x/include/mach}/hardware.h | 2 +- + .../arm/mach-h720x/include/mach}/io.h | 6 +- + .../arm/mach-h720x/include/mach}/irqs.h | 2 +- + .../arm/mach-h720x/include/mach}/memory.h | 2 +- + .../arm/mach-h720x/include/mach}/system.h | 6 +- + .../arm/mach-h720x/include/mach}/timex.h | 2 +- + .../arm/mach-h720x/include/mach}/uncompress.h | 4 +- + .../arm/mach-h720x/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-imx/clock.c | 2 +- + arch/arm/mach-imx/cpufreq.c | 2 +- + arch/arm/mach-imx/dma.c | 4 +- + arch/arm/mach-imx/generic.c | 10 +- + .../arm/mach-imx/include/mach}/debug-macro.S | 2 +- + .../arm/mach-imx/include/mach}/dma.h | 0 + .../arm/mach-imx/include/mach}/entry-macro.S | 4 +- + .../arm/mach-imx/include/mach}/gpio.h | 2 +- + .../arm/mach-imx/include/mach}/hardware.h | 2 +- + .../arm/mach-imx/include/mach}/imx-dma.h | 0 + .../arm/mach-imx/include/mach}/imx-regs.h | 0 + .../arm/mach-imx/include/mach}/imx-uart.h | 0 + .../arm/mach-imx/include/mach}/imxfb.h | 0 + .../arm/mach-imx/include/mach}/io.h | 4 +- + .../arm/mach-imx/include/mach}/irqs.h | 4 +- + .../arm/mach-imx/include/mach}/memory.h | 2 +- + .../arm/mach-imx/include/mach}/mmc.h | 0 + .../arm/mach-imx/include/mach}/mx1ads.h | 2 +- + .../arm/mach-imx/include/mach}/spi_imx.h | 4 +- + .../arm/mach-imx/include/mach}/system.h | 2 +- + .../arm/mach-imx/include/mach}/timex.h | 0 + .../arm/mach-imx/include/mach}/uncompress.h | 2 +- + .../arm/mach-imx/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-imx/irq.c | 2 +- + arch/arm/mach-imx/leds-mx1ads.c | 2 +- + arch/arm/mach-imx/mx1ads.c | 6 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-integrator/core.c | 4 +- + arch/arm/mach-integrator/cpu.c | 2 +- + arch/arm/mach-integrator/impd1.c | 4 +- + .../arm/mach-integrator/include/mach}/bits.h | 0 + .../arm/mach-integrator/include/mach}/cm.h | 0 + .../mach-integrator/include/mach}/debug-macro.S | 2 +- + .../arm/mach-integrator/include/mach}/dma.h | 2 +- + .../mach-integrator/include/mach}/entry-macro.S | 6 +- + .../arm/mach-integrator/include/mach}/hardware.h | 4 +- + .../arm/mach-integrator/include/mach}/impd1.h | 0 + .../arm/mach-integrator/include/mach}/io.h | 2 +- + .../arm/mach-integrator/include/mach}/irqs.h | 2 +- + .../arm/mach-integrator/include/mach}/lm.h | 0 + .../arm/mach-integrator/include/mach}/memory.h | 2 +- + .../arm/mach-integrator/include/mach}/platform.h | 0 + .../arm/mach-integrator/include/mach}/system.h | 4 +- + .../arm/mach-integrator/include/mach}/timex.h | 2 +- + .../arm/mach-integrator/include/mach}/uncompress.h | 2 +- + .../arm/mach-integrator/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 4 +- + arch/arm/mach-integrator/integrator_cp.c | 6 +- + arch/arm/mach-integrator/leds.c | 4 +- + arch/arm/mach-integrator/lm.c | 2 +- + arch/arm/mach-integrator/pci_v3.c | 2 +- + .../arm/mach-iop13xx/include/mach}/adma.h | 2 +- + .../arm/mach-iop13xx/include/mach}/debug-macro.S | 2 +- + .../arm/mach-iop13xx/include/mach}/dma.h | 0 + .../arm/mach-iop13xx/include/mach}/entry-macro.S | 0 + .../arm/mach-iop13xx/include/mach}/hardware.h | 0 + .../arm/mach-iop13xx/include/mach}/io.h | 0 + .../arm/mach-iop13xx/include/mach}/iop13xx.h | 0 + .../arm/mach-iop13xx/include/mach}/iq81340.h | 0 + .../arm/mach-iop13xx/include/mach}/irqs.h | 0 + .../arm/mach-iop13xx/include/mach}/memory.h | 2 +- + .../arm/mach-iop13xx/include/mach}/msi.h | 0 + .../arm/mach-iop13xx/include/mach}/pci.h | 2 +- + .../arm/mach-iop13xx/include/mach}/system.h | 4 +- + .../arm/mach-iop13xx/include/mach}/time.h | 0 + .../arm/mach-iop13xx/include/mach}/timex.h | 2 +- + .../arm/mach-iop13xx/include/mach}/uncompress.h | 2 +- + .../arm/mach-iop13xx/include/mach}/vmalloc.h | 0 + arch/arm/mach-iop13xx/io.c | 2 +- + arch/arm/mach-iop13xx/iq81340mc.c | 6 +- + arch/arm/mach-iop13xx/iq81340sc.c | 6 +- + arch/arm/mach-iop13xx/irq.c | 7 +- + arch/arm/mach-iop13xx/pci.c | 4 +- + arch/arm/mach-iop13xx/setup.c | 2 +- + arch/arm/mach-iop32x/em7210.c | 4 +- + arch/arm/mach-iop32x/glantank.c | 4 +- + .../arm/mach-iop32x/include/mach}/adma.h | 0 + .../arm/mach-iop32x/include/mach}/debug-macro.S | 2 +- + .../arm/mach-iop32x/include/mach}/dma.h | 2 +- + .../arm/mach-iop32x/include/mach}/entry-macro.S | 4 +- + .../arm/mach-iop32x/include/mach}/glantank.h | 2 +- + .../arm/mach-iop32x/include/mach}/gpio.h | 0 + .../arm/mach-iop32x/include/mach}/hardware.h | 2 +- + .../arm/mach-iop32x/include/mach}/io.h | 4 +- + .../arm/mach-iop32x/include/mach}/iop32x.h | 2 +- + .../arm/mach-iop32x/include/mach}/iq31244.h | 2 +- + .../arm/mach-iop32x/include/mach}/iq80321.h | 2 +- + .../arm/mach-iop32x/include/mach}/irqs.h | 2 +- + .../arm/mach-iop32x/include/mach}/memory.h | 4 +- + .../arm/mach-iop32x/include/mach}/n2100.h | 2 +- + .../arm/mach-iop32x/include/mach}/system.h | 2 +- + .../arm/mach-iop32x/include/mach}/time.h | 0 + .../arm/mach-iop32x/include/mach}/timex.h | 4 +- + .../arm/mach-iop32x/include/mach}/uncompress.h | 4 +- + arch/arm/mach-iop32x/include/mach/vmalloc.h | 5 + + arch/arm/mach-iop32x/iq31244.c | 4 +- + arch/arm/mach-iop32x/iq80321.c | 4 +- + arch/arm/mach-iop32x/irq.c | 2 +- + arch/arm/mach-iop32x/n2100.c | 4 +- + .../arm/mach-iop33x/include/mach}/adma.h | 0 + .../arm/mach-iop33x/include/mach}/debug-macro.S | 2 +- + .../arm/mach-iop33x/include/mach}/dma.h | 2 +- + .../arm/mach-iop33x/include/mach}/entry-macro.S | 4 +- + .../arm/mach-iop33x/include/mach}/gpio.h | 0 + .../arm/mach-iop33x/include/mach}/hardware.h | 2 +- + .../arm/mach-iop33x/include/mach}/io.h | 4 +- + .../arm/mach-iop33x/include/mach}/iop33x.h | 2 +- + .../arm/mach-iop33x/include/mach}/iq80331.h | 2 +- + .../arm/mach-iop33x/include/mach}/iq80332.h | 2 +- + .../arm/mach-iop33x/include/mach}/irqs.h | 2 +- + .../arm/mach-iop33x/include/mach}/memory.h | 4 +- + .../arm/mach-iop33x/include/mach}/system.h | 2 +- + .../arm/mach-iop33x/include/mach}/time.h | 0 + .../arm/mach-iop33x/include/mach}/timex.h | 4 +- + .../arm/mach-iop33x/include/mach}/uncompress.h | 4 +- + arch/arm/mach-iop33x/include/mach/vmalloc.h | 5 + + arch/arm/mach-iop33x/iq80331.c | 4 +- + arch/arm/mach-iop33x/iq80332.c | 4 +- + arch/arm/mach-iop33x/irq.c | 2 +- + arch/arm/mach-iop33x/uart.c | 3 +- + arch/arm/mach-ixp2000/core.c | 4 +- + arch/arm/mach-ixp2000/enp2611.c | 2 +- + .../arm/mach-ixp2000/include/mach}/debug-macro.S | 2 +- + .../arm/mach-ixp2000/include/mach}/dma.h | 2 +- + .../arm/mach-ixp2000/include/mach}/enp2611.h | 2 +- + .../arm/mach-ixp2000/include/mach}/entry-macro.S | 4 +- + .../arm/mach-ixp2000/include/mach}/gpio.h | 2 +- + .../arm/mach-ixp2000/include/mach}/hardware.h | 2 +- + .../arm/mach-ixp2000/include/mach}/io.h | 4 +- + .../arm/mach-ixp2000/include/mach}/irqs.h | 2 +- + .../arm/mach-ixp2000/include/mach}/ixdp2x00.h | 2 +- + .../arm/mach-ixp2000/include/mach}/ixdp2x01.h | 2 +- + .../arm/mach-ixp2000/include/mach}/ixp2000-regs.h | 2 +- + .../arm/mach-ixp2000/include/mach}/memory.h | 4 +- + .../arm/mach-ixp2000/include/mach}/platform.h | 2 +- + .../arm/mach-ixp2000/include/mach}/system.h | 4 +- + .../arm/mach-ixp2000/include/mach}/timex.h | 2 +- + .../arm/mach-ixp2000/include/mach}/uncompress.h | 2 +- + .../arm/mach-ixp2000/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ixp2000/ixdp2400.c | 2 +- + arch/arm/mach-ixp2000/ixdp2800.c | 2 +- + arch/arm/mach-ixp2000/ixdp2x00.c | 4 +- + arch/arm/mach-ixp2000/ixdp2x01.c | 2 +- + arch/arm/mach-ixp2000/pci.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 3 +- + arch/arm/mach-ixp23xx/espresso.c | 2 +- + .../arm/mach-ixp23xx/include/mach}/debug-macro.S | 4 +- + arch/arm/mach-ixp23xx/include/mach/dma.h | 3 + + .../arm/mach-ixp23xx/include/mach}/entry-macro.S | 2 +- + .../arm/mach-ixp23xx/include/mach}/hardware.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/io.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/irqs.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/ixdp2351.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/ixp23xx.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/memory.h | 5 +- + .../arm/mach-ixp23xx/include/mach}/platform.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/system.h | 4 +- + arch/arm/mach-ixp23xx/include/mach/time.h | 3 + + .../arm/mach-ixp23xx/include/mach}/timex.h | 2 +- + .../arm/mach-ixp23xx/include/mach}/uncompress.h | 4 +- + .../arm/mach-ixp23xx/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ixp23xx/ixdp2351.c | 2 +- + arch/arm/mach-ixp23xx/pci.c | 3 +- + arch/arm/mach-ixp23xx/roadrunner.c | 2 +- + arch/arm/mach-ixp4xx/avila-pci.c | 2 +- + arch/arm/mach-ixp4xx/avila-setup.c | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 4 +- + arch/arm/mach-ixp4xx/coyote-pci.c | 2 +- + arch/arm/mach-ixp4xx/coyote-setup.c | 2 +- + arch/arm/mach-ixp4xx/gateway7001-pci.c | 2 +- + arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 +- + arch/arm/mach-ixp4xx/gtwx5715-pci.c | 4 +- + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 4 +- + .../arm/mach-ixp4xx/include/mach}/avila.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/coyote.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/cpu.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/debug-macro.S | 2 +- + .../arm/mach-ixp4xx/include/mach}/dma.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/dsmg600.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/entry-macro.S | 4 +- + .../arm/mach-ixp4xx/include/mach}/fsg.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/gpio.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/gtwx5715.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/hardware.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/io.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/irqs.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/ixdp425.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/ixp4xx-regs.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/memory.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/nas100d.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/npe.h | 0 + .../arm/mach-ixp4xx/include/mach}/nslu2.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/platform.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/prpmc1100.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/qmgr.h | 0 + .../arm/mach-ixp4xx/include/mach}/system.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/timex.h | 4 +- + .../arm/mach-ixp4xx/include/mach}/udc.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/uncompress.h | 2 +- + .../arm/mach-ixp4xx/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +- + arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 +- + arch/arm/mach-ixp4xx/ixp4xx_npe.c | 2 +- + arch/arm/mach-ixp4xx/ixp4xx_qmgr.c | 2 +- + arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 +- + arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +- + arch/arm/mach-kirkwood/addr-map.c | 2 +- + arch/arm/mach-kirkwood/common.c | 2 +- + arch/arm/mach-kirkwood/db88f6281-bp-setup.c | 2 +- + .../arm/mach-kirkwood/include/mach}/debug-macro.S | 4 +- + .../arm/mach-kirkwood/include/mach}/dma.h | 0 + .../arm/mach-kirkwood/include/mach}/entry-macro.S | 4 +- + .../arm/mach-kirkwood/include/mach}/hardware.h | 2 +- + .../arm/mach-kirkwood/include/mach}/io.h | 2 +- + .../arm/mach-kirkwood/include/mach}/irqs.h | 2 +- + .../arm/mach-kirkwood/include/mach}/kirkwood.h | 2 +- + .../arm/mach-kirkwood/include/mach}/memory.h | 2 +- + .../arm/mach-kirkwood/include/mach}/system.h | 6 +- + .../arm/mach-kirkwood/include/mach}/timex.h | 2 +- + .../arm/mach-kirkwood/include/mach}/uncompress.h | 4 +- + arch/arm/mach-kirkwood/include/mach/vmalloc.h | 5 + + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 2 +- + arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- + arch/arm/mach-ks8695/board-micrel.c | 2 +- + arch/arm/mach-ks8695/cpu.c | 6 +- + arch/arm/mach-ks8695/devices.c | 6 +- + arch/arm/mach-ks8695/gpio.c | 6 +- + .../arm/mach-ks8695/include/mach}/debug-macro.S | 6 +- + .../arm/mach-ks8695/include/mach}/devices.h | 2 +- + .../arm/mach-ks8695/include/mach}/dma.h | 2 +- + .../arm/mach-ks8695/include/mach}/entry-macro.S | 6 +- + .../arm/mach-ks8695/include/mach}/gpio.h | 2 +- + .../arm/mach-ks8695/include/mach}/hardware.h | 2 +- + .../arm/mach-ks8695/include/mach}/io.h | 2 +- + .../arm/mach-ks8695/include/mach}/irqs.h | 2 +- + .../arm/mach-ks8695/include/mach}/memory.h | 4 +- + .../arm/mach-ks8695/include/mach}/regs-gpio.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-hpna.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-irq.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-lan.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-mem.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-misc.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-pci.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-switch.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-sys.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-timer.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-uart.h | 2 +- + .../arm/mach-ks8695/include/mach}/regs-wan.h | 2 +- + .../arm/mach-ks8695/include/mach}/system.h | 4 +- + .../arm/mach-ks8695/include/mach}/timex.h | 2 +- + .../arm/mach-ks8695/include/mach}/uncompress.h | 4 +- + .../arm/mach-ks8695/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ks8695/irq.c | 6 +- + arch/arm/mach-ks8695/leds.c | 5 +- + arch/arm/mach-ks8695/pci.c | 6 +- + arch/arm/mach-ks8695/time.c | 4 +- + arch/arm/mach-l7200/core.c | 2 +- + .../arm/mach-l7200/include/mach}/aux_reg.h | 4 +- + .../arm/mach-l7200/include/mach}/debug-macro.S | 2 +- + .../arm/mach-l7200/include/mach}/dma.h | 2 +- + .../arm/mach-l7200/include/mach}/entry-macro.S | 4 +- + .../arm/mach-l7200/include/mach}/gp_timers.h | 4 +- + .../arm/mach-l7200/include/mach}/gpio.h | 2 +- + .../arm/mach-l7200/include/mach}/hardware.h | 2 +- + .../arm/mach-l7200/include/mach}/io.h | 6 +- + .../arm/mach-l7200/include/mach}/irqs.h | 2 +- + .../arm/mach-l7200/include/mach}/memory.h | 2 +- + .../arm/mach-l7200/include/mach}/pmpcon.h | 2 +- + .../arm/mach-l7200/include/mach}/pmu.h | 2 +- + .../arm/mach-l7200/include/mach}/serial.h | 2 +- + .../arm/mach-l7200/include/mach}/serial_l7200.h | 4 +- + .../arm/mach-l7200/include/mach}/sib.h | 2 +- + .../arm/mach-l7200/include/mach}/sys-clock.h | 2 +- + .../arm/mach-l7200/include/mach}/system.h | 4 +- + .../arm/mach-l7200/include/mach}/time.h | 4 +- + .../arm/mach-l7200/include/mach}/timex.h | 2 +- + .../arm/mach-l7200/include/mach}/uncompress.h | 4 +- + .../arm/mach-l7200/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-lh7a40x/arch-kev7a400.c | 2 +- + arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 2 +- + arch/arm/mach-lh7a40x/clcd.c | 3 +- + arch/arm/mach-lh7a40x/clocks.c | 4 +- + .../arm/mach-lh7a40x/include/mach}/clocks.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/constants.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/debug-macro.S | 2 +- + .../arm/mach-lh7a40x/include/mach}/dma.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/entry-macro.S | 6 +- + .../arm/mach-lh7a40x/include/mach}/hardware.h | 4 +- + .../arm/mach-lh7a40x/include/mach}/io.h | 4 +- + .../arm/mach-lh7a40x/include/mach}/irqs.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/memory.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/registers.h | 4 +- + .../arm/mach-lh7a40x/include/mach}/ssp.h | 0 + .../arm/mach-lh7a40x/include/mach}/system.h | 2 +- + .../arm/mach-lh7a40x/include/mach}/timex.h | 4 +- + .../arm/mach-lh7a40x/include/mach}/uncompress.h | 4 +- + .../arm/mach-lh7a40x/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-lh7a40x/irq-lh7a400.c | 4 +- + arch/arm/mach-lh7a40x/irq-lh7a404.c | 4 +- + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 4 +- + arch/arm/mach-lh7a40x/ssp-cpld.c | 4 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-loki/addr-map.c | 2 +- + arch/arm/mach-loki/common.c | 2 +- + .../arm/mach-loki/include/mach}/debug-macro.S | 4 +- + .../arm/mach-loki/include/mach}/dma.h | 0 + .../arm/mach-loki/include/mach}/entry-macro.S | 4 +- + .../arm/mach-loki/include/mach}/hardware.h | 2 +- + .../arm/mach-loki/include/mach}/io.h | 2 +- + .../arm/mach-loki/include/mach}/irqs.h | 2 +- + .../arm/mach-loki/include/mach}/loki.h | 2 +- + .../arm/mach-loki/include/mach}/memory.h | 2 +- + .../arm/mach-loki/include/mach}/system.h | 6 +- + .../arm/mach-loki/include/mach}/timex.h | 2 +- + .../arm/mach-loki/include/mach}/uncompress.h | 4 +- + arch/arm/mach-loki/include/mach/vmalloc.h | 5 + + arch/arm/mach-loki/lb88rc8480-setup.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 6 +- + arch/arm/mach-msm/common.c | 4 +- + arch/arm/mach-msm/dma.c | 2 +- + arch/arm/mach-msm/idle.S | 2 +- + .../arm/mach-msm/include/mach}/board.h | 2 +- + .../arm/mach-msm/include/mach}/debug-macro.S | 6 +- + .../arm/mach-msm/include/mach}/dma.h | 4 +- + .../arm/mach-msm/include/mach}/entry-macro.S | 4 +- + .../arm/mach-msm/include/mach}/hardware.h | 2 +- + .../arm/mach-msm/include/mach}/io.h | 2 +- + .../arm/mach-msm/include/mach}/irqs.h | 2 +- + .../arm/mach-msm/include/mach}/memory.h | 2 +- + .../arm/mach-msm/include/mach}/msm_iomap.h | 2 +- + .../arm/mach-msm/include/mach}/system.h | 4 +- + .../arm/mach-msm/include/mach}/timex.h | 2 +- + .../arm/mach-msm/include/mach}/uncompress.h | 2 +- + .../arm/mach-msm/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-msm/io.c | 6 +- + arch/arm/mach-msm/irq.c | 4 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-mv78xx0/common.c | 2 +- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 2 +- + .../arm/mach-mv78xx0/include/mach}/debug-macro.S | 4 +- + .../arm/mach-mv78xx0/include/mach}/dma.h | 0 + .../arm/mach-mv78xx0/include/mach}/entry-macro.S | 4 +- + .../arm/mach-mv78xx0/include/mach}/hardware.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/io.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/irqs.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/memory.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/mv78xx0.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/system.h | 6 +- + .../arm/mach-mv78xx0/include/mach}/timex.h | 2 +- + .../arm/mach-mv78xx0/include/mach}/uncompress.h | 4 +- + arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 5 + + arch/arm/mach-mv78xx0/irq.c | 2 +- + arch/arm/mach-mx2/clock_imx27.c | 5 +- + arch/arm/mach-mx2/cpu_imx27.c | 2 +- + arch/arm/mach-mx2/crm_regs.h | 2 +- + arch/arm/mach-mx2/devices.c | 2 +- + arch/arm/mach-mx2/generic.c | 2 +- + arch/arm/mach-mx2/mx27ads.c | 12 +- + arch/arm/mach-mx2/pcm038.c | 10 +- + arch/arm/mach-mx2/pcm970-baseboard.c | 3 +- + arch/arm/mach-mx2/serial.c | 4 +- + arch/arm/mach-mx2/system.c | 2 +- + arch/arm/mach-mx3/clock.c | 2 +- + arch/arm/mach-mx3/devices.c | 4 +- + arch/arm/mach-mx3/iomux.c | 6 +- + arch/arm/mach-mx3/mm.c | 4 +- + arch/arm/mach-mx3/mx31ads.c | 6 +- + arch/arm/mach-mx3/mx31lite.c | 6 +- + arch/arm/mach-mx3/pcm037.c | 10 +- + arch/arm/mach-netx/fb.c | 4 +- + arch/arm/mach-netx/generic.c | 4 +- + .../arm/mach-netx/include/mach}/debug-macro.S | 2 +- + .../arm/mach-netx/include/mach}/dma.h | 2 +- + .../arm/mach-netx/include/mach}/entry-macro.S | 4 +- + .../arm/mach-netx/include/mach}/eth.h | 2 +- + .../arm/mach-netx/include/mach}/hardware.h | 2 +- + .../arm/mach-netx/include/mach}/io.h | 2 +- + .../arm/mach-netx/include/mach}/irqs.h | 2 +- + .../arm/mach-netx/include/mach}/memory.h | 2 +- + .../arm/mach-netx/include/mach}/netx-regs.h | 2 +- + .../arm/mach-netx/include/mach}/param.h | 2 +- + .../arm/mach-netx/include/mach}/pfifo.h | 2 +- + .../arm/mach-netx/include/mach}/system.h | 4 +- + .../arm/mach-netx/include/mach}/timex.h | 2 +- + .../arm/mach-netx/include/mach}/uncompress.h | 2 +- + .../arm/mach-netx/include/mach}/vmalloc.h | 2 +- + .../arm/mach-netx/include/mach}/xc.h | 2 +- + arch/arm/mach-netx/nxdb500.c | 6 +- + arch/arm/mach-netx/nxdkn.c | 6 +- + arch/arm/mach-netx/nxeb500hmi.c | 6 +- + arch/arm/mach-netx/pfifo.c | 6 +- + arch/arm/mach-netx/time.c | 4 +- + arch/arm/mach-netx/xc.c | 6 +- + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 12 +- + arch/arm/mach-ns9xxx/gpio-ns9360.c | 4 +- + arch/arm/mach-ns9xxx/gpio.c | 6 +- + .../arm/mach-ns9xxx/include/mach}/board.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/debug-macro.S | 6 +- + .../arm/mach-ns9xxx/include/mach}/dma.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/entry-macro.S | 6 +- + .../arm/mach-ns9xxx/include/mach}/gpio.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/hardware.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/io.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/irqs.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/memory.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/module.h | 2 +- + .../mach-ns9xxx/include/mach}/processor-ns9360.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/processor.h | 4 +- + .../arm/mach-ns9xxx/include/mach}/regs-bbu.h | 4 +- + .../include/mach}/regs-board-a9m9750dev.h | 4 +- + .../arm/mach-ns9xxx/include/mach}/regs-mem.h | 4 +- + .../mach-ns9xxx/include/mach}/regs-sys-common.h | 4 +- + .../mach-ns9xxx/include/mach}/regs-sys-ns9360.h | 4 +- + .../arm/mach-ns9xxx/include/mach}/system.h | 6 +- + .../arm/mach-ns9xxx/include/mach}/timex.h | 4 +- + .../arm/mach-ns9xxx/include/mach}/uncompress.h | 2 +- + .../arm/mach-ns9xxx/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-ns9xxx/irq.c | 7 +- + arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 2 +- + arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 2 +- + arch/arm/mach-ns9xxx/plat-serial8250.c | 4 +- + arch/arm/mach-ns9xxx/processor-ns9360.c | 4 +- + arch/arm/mach-ns9xxx/time-ns9360.c | 8 +- + arch/arm/mach-omap1/board-ams-delta.c | 16 +- + arch/arm/mach-omap1/board-fsample.c | 20 +- + arch/arm/mach-omap1/board-generic.c | 12 +- + arch/arm/mach-omap1/board-h2-mmc.c | 4 +- + arch/arm/mach-omap1/board-h2.c | 22 +- + arch/arm/mach-omap1/board-h3-mmc.c | 4 +- + arch/arm/mach-omap1/board-h3.c | 26 +- + arch/arm/mach-omap1/board-innovator.c | 20 +- + arch/arm/mach-omap1/board-nokia770.c | 22 +- + arch/arm/mach-omap1/board-osk.c | 16 +- + arch/arm/mach-omap1/board-palmte.c | 24 +- + arch/arm/mach-omap1/board-palmtt.c | 26 +- + arch/arm/mach-omap1/board-palmz71.c | 24 +- + arch/arm/mach-omap1/board-perseus2.c | 18 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 6 +- + arch/arm/mach-omap1/board-sx1.c | 22 +- + arch/arm/mach-omap1/board-voiceblue.c | 12 +- + arch/arm/mach-omap1/clock.c | 8 +- + arch/arm/mach-omap1/devices.c | 11 +- + arch/arm/mach-omap1/fpga.c | 6 +- + arch/arm/mach-omap1/io.c | 4 +- + arch/arm/mach-omap1/irq.c | 6 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 6 +- + arch/arm/mach-omap1/leds-innovator.c | 2 +- + arch/arm/mach-omap1/leds-osk.c | 4 +- + arch/arm/mach-omap1/leds.c | 4 +- + arch/arm/mach-omap1/mailbox.c | 4 +- + arch/arm/mach-omap1/mcbsp.c | 10 +- + arch/arm/mach-omap1/mux.c | 2 +- + arch/arm/mach-omap1/pm.c | 19 +- + arch/arm/mach-omap1/serial.c | 10 +- + arch/arm/mach-omap1/sleep.S | 4 +- + arch/arm/mach-omap1/sram.S | 4 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 4 +- + arch/arm/mach-omap2/board-2430sdp.c | 12 +- + arch/arm/mach-omap2/board-apollon.c | 18 +- + arch/arm/mach-omap2/board-generic.c | 12 +- + arch/arm/mach-omap2/board-h4.c | 26 +- + arch/arm/mach-omap2/clock.c | 6 +- + arch/arm/mach-omap2/clock.h | 2 +- + arch/arm/mach-omap2/clock24xx.c | 4 +- + arch/arm/mach-omap2/clock34xx.c | 4 +- + arch/arm/mach-omap2/clock34xx.h | 2 +- + arch/arm/mach-omap2/control.c | 4 +- + arch/arm/mach-omap2/devices.c | 12 +- + arch/arm/mach-omap2/gpmc.c | 2 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/io.c | 4 +- + arch/arm/mach-omap2/irq.c | 2 +- + arch/arm/mach-omap2/mailbox.c | 4 +- + arch/arm/mach-omap2/mcbsp.c | 8 +- + arch/arm/mach-omap2/memory.c | 6 +- + arch/arm/mach-omap2/mux.c | 4 +- + arch/arm/mach-omap2/pm.c | 9 +- + arch/arm/mach-omap2/prcm.c | 4 +- + arch/arm/mach-omap2/sdrc.h | 2 +- + arch/arm/mach-omap2/serial.c | 4 +- + arch/arm/mach-omap2/sleep.S | 4 +- + arch/arm/mach-omap2/sram242x.S | 4 +- + arch/arm/mach-omap2/sram243x.S | 4 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-omap2/usb-tusb6010.c | 6 +- + arch/arm/mach-orion5x/addr-map.c | 2 +- + arch/arm/mach-orion5x/common.c | 4 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- + arch/arm/mach-orion5x/dns323-setup.c | 2 +- + arch/arm/mach-orion5x/gpio.c | 2 +- + .../arm/mach-orion5x/include/mach}/debug-macro.S | 4 +- + .../arm/mach-orion5x/include/mach}/dma.h | 0 + .../arm/mach-orion5x/include/mach}/entry-macro.S | 4 +- + .../arm/mach-orion5x/include/mach}/gpio.h | 2 +- + .../arm/mach-orion5x/include/mach}/hardware.h | 2 +- + .../arm/mach-orion5x/include/mach}/io.h | 2 +- + .../arm/mach-orion5x/include/mach}/irqs.h | 2 +- + .../arm/mach-orion5x/include/mach}/memory.h | 2 +- + .../arm/mach-orion5x/include/mach}/orion5x.h | 2 +- + .../arm/mach-orion5x/include/mach}/system.h | 6 +- + .../arm/mach-orion5x/include/mach}/timex.h | 2 +- + .../arm/mach-orion5x/include/mach}/uncompress.h | 4 +- + arch/arm/mach-orion5x/include/mach/vmalloc.h | 5 + + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +- + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-orion5x/mss2-setup.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 2 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 2 +- + arch/arm/mach-orion5x/ts409-setup.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 2 +- + arch/arm/mach-pnx4008/clock.c | 4 +- + arch/arm/mach-pnx4008/core.c | 8 +- + arch/arm/mach-pnx4008/dma.c | 4 +- + arch/arm/mach-pnx4008/gpio.c | 4 +- + arch/arm/mach-pnx4008/i2c.c | 4 +- + .../arm/mach-pnx4008/include/mach}/clock.h | 2 +- + .../arm/mach-pnx4008/include/mach}/debug-macro.S | 2 +- + .../arm/mach-pnx4008/include/mach}/dma.h | 2 +- + .../arm/mach-pnx4008/include/mach}/entry-macro.S | 2 +- + .../arm/mach-pnx4008/include/mach}/gpio.h | 2 +- + .../arm/mach-pnx4008/include/mach}/hardware.h | 4 +- + .../arm/mach-pnx4008/include/mach}/i2c.h | 3 - + .../arm/mach-pnx4008/include/mach}/io.h | 2 +- + .../arm/mach-pnx4008/include/mach}/irq.h | 2 +- + .../arm/mach-pnx4008/include/mach}/irqs.h | 2 +- + .../arm/mach-pnx4008/include/mach}/memory.h | 2 +- + .../arm/mach-pnx4008/include/mach}/param.h | 2 +- + .../arm/mach-pnx4008/include/mach}/platform.h | 2 +- + .../arm/mach-pnx4008/include/mach}/pm.h | 2 +- + .../arm/mach-pnx4008/include/mach}/system.h | 6 +- + .../arm/mach-pnx4008/include/mach}/timex.h | 4 +- + .../arm/mach-pnx4008/include/mach}/uncompress.h | 2 +- + .../arm/mach-pnx4008/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-pnx4008/irq.c | 5 +- + arch/arm/mach-pnx4008/pm.c | 5 +- + arch/arm/mach-pnx4008/serial.c | 8 +- + arch/arm/mach-pnx4008/sleep.S | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/akita-ioexp.c | 2 +- + arch/arm/mach-pxa/clock.c | 6 +- + arch/arm/mach-pxa/cm-x270-pci.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 16 +- + arch/arm/mach-pxa/colibri.c | 8 +- + arch/arm/mach-pxa/corgi.c | 18 +- + arch/arm/mach-pxa/corgi_lcd.c | 12 +- + arch/arm/mach-pxa/corgi_pm.c | 12 +- + arch/arm/mach-pxa/corgi_ssp.c | 10 +- + arch/arm/mach-pxa/cpu-pxa.c | 6 +- + arch/arm/mach-pxa/devices.c | 26 +- + arch/arm/mach-pxa/dma.c | 4 +- + arch/arm/mach-pxa/e400_lcd.c | 4 +- + arch/arm/mach-pxa/em-x270.c | 16 +- + arch/arm/mach-pxa/eseries.c | 2 +- + arch/arm/mach-pxa/eseries_udc.c | 8 +- + arch/arm/mach-pxa/ezx.c | 12 +- + arch/arm/mach-pxa/generic.c | 14 +- + arch/arm/mach-pxa/generic.h | 8 + + arch/arm/mach-pxa/gpio.c | 6 +- + arch/arm/mach-pxa/gumstix.c | 14 +- + arch/arm/mach-pxa/idp.c | 14 +- + .../arm/mach-pxa/include/mach}/akita.h | 0 + .../arm/mach-pxa/include/mach}/audio.h | 0 + .../arm/mach-pxa/include/mach}/bitfield.h | 0 + .../arm/mach-pxa/include/mach}/camera.h | 0 + .../arm/mach-pxa/include/mach}/colibri.h | 0 + .../arm/mach-pxa/include/mach}/corgi.h | 0 + .../arm/mach-pxa/include/mach}/debug-macro.S | 2 +- + .../arm/mach-pxa/include/mach}/dma.h | 2 +- + .../arm/mach-pxa/include/mach}/entry-macro.S | 6 +- + .../arm/mach-pxa/include/mach}/eseries-gpio.h | 0 + .../arm/mach-pxa/include/mach}/eseries-irq.h | 0 + .../arm/mach-pxa/include/mach}/gpio.h | 6 +- + .../arm/mach-pxa/include/mach}/gumstix.h | 2 +- + .../arm/mach-pxa/include/mach}/hardware.h | 7 +- + .../arm/mach-pxa/include/mach}/i2c.h | 0 + .../arm/mach-pxa/include/mach}/idp.h | 2 +- + .../arm/mach-pxa/include/mach}/io.h | 4 +- + .../arm/mach-pxa/include/mach}/irda.h | 0 + .../arm/mach-pxa/include/mach}/irqs.h | 2 +- + .../arm/mach-pxa/include/mach}/littleton.h | 0 + .../arm/mach-pxa/include/mach}/lpd270.h | 2 +- + .../arm/mach-pxa/include/mach}/lubbock.h | 2 +- + .../arm/mach-pxa/include/mach}/magician.h | 2 +- + .../arm/mach-pxa/include/mach}/mainstone.h | 2 +- + .../arm/mach-pxa/include/mach}/memory.h | 2 +- + .../arm/mach-pxa/include/mach}/mfp-pxa25x.h | 4 +- + .../arm/mach-pxa/include/mach}/mfp-pxa27x.h | 4 +- + .../arm/mach-pxa/include/mach}/mfp-pxa2xx.h | 2 +- + .../arm/mach-pxa/include/mach}/mfp-pxa300.h | 6 +- + .../arm/mach-pxa/include/mach}/mfp-pxa320.h | 6 +- + .../arm/mach-pxa/include/mach}/mfp-pxa3xx.h | 0 + .../arm/mach-pxa/include/mach}/mfp-pxa930.h | 6 +- + .../arm/mach-pxa/include/mach}/mfp.h | 2 +- + .../arm/mach-pxa/include/mach}/mmc.h | 0 + .../arm/mach-pxa/include/mach}/mtd-xip.h | 2 +- + .../arm/mach-pxa/include/mach}/ohci.h | 0 + .../arm/mach-pxa/include/mach}/palmtx.h | 0 + .../arm/mach-pxa/include/mach}/pcm027.h | 2 +- + .../arm/mach-pxa/include/mach}/pcm990_baseboard.h | 4 +- + .../arm/mach-pxa/include/mach}/pm.h | 0 + .../arm/mach-pxa/include/mach}/poodle.h | 4 +- + .../arm/mach-pxa/include/mach}/pxa-regs.h | 6 +- + .../arm/mach-pxa/include/mach}/pxa25x-udc.h | 0 + .../arm/mach-pxa/include/mach}/pxa27x-udc.h | 0 + .../arm/mach-pxa/include/mach}/pxa27x_keypad.h | 0 + .../arm/mach-pxa/include/mach}/pxa2xx-gpio.h | 0 + .../arm/mach-pxa/include/mach}/pxa2xx-regs.h | 2 +- + .../arm/mach-pxa/include/mach}/pxa2xx_spi.h | 0 + .../arm/mach-pxa/include/mach}/pxa3xx-regs.h | 2 +- + .../arm/mach-pxa/include/mach}/pxa3xx_nand.h | 0 + .../arm/mach-pxa/include/mach}/pxafb.h | 4 +- + .../arm/mach-pxa/include/mach}/regs-lcd.h | 2 +- + .../arm/mach-pxa/include/mach}/regs-ssp.h | 0 + arch/arm/mach-pxa/include/mach/reset.h | 18 + + .../arm/mach-pxa/include/mach}/sharpsl.h | 0 + .../arm/mach-pxa/include/mach}/spitz.h | 0 + .../arm/mach-pxa/include/mach}/ssp.h | 0 + .../arm/mach-pxa/include/mach}/system.h | 2 +- + .../arm/mach-pxa/include/mach}/timex.h | 2 +- + .../arm/mach-pxa/include/mach}/tosa.h | 0 + .../arm/mach-pxa/include/mach}/tosa_bt.h | 0 + .../arm/mach-pxa/include/mach}/trizeps4.h | 0 + .../arm/mach-pxa/include/mach}/udc.h | 2 +- + .../arm/mach-pxa/include/mach}/uncompress.h | 4 +- + .../arm/mach-pxa/include/mach}/vmalloc.h | 2 +- + .../arm/mach-pxa/include/mach}/zylonite.h | 0 + arch/arm/mach-pxa/irq.c | 4 +- + arch/arm/mach-pxa/leds-idp.c | 6 +- + arch/arm/mach-pxa/leds-lubbock.c | 6 +- + arch/arm/mach-pxa/leds-mainstone.c | 6 +- + arch/arm/mach-pxa/leds-trizeps4.c | 8 +- + arch/arm/mach-pxa/littleton.c | 18 +- + arch/arm/mach-pxa/lpd270.c | 20 +- + arch/arm/mach-pxa/lubbock.c | 24 +- + arch/arm/mach-pxa/magician.c | 20 +- + arch/arm/mach-pxa/mainstone.c | 24 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 8 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 8 +- + arch/arm/mach-pxa/palmtx.c | 18 +- + arch/arm/mach-pxa/pcm027.c | 12 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 18 +- + arch/arm/mach-pxa/pm.c | 8 +- + arch/arm/mach-pxa/poodle.c | 22 +- + arch/arm/mach-pxa/pwm.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 18 +- + arch/arm/mach-pxa/pxa27x.c | 22 +- + arch/arm/mach-pxa/pxa2xx.c | 15 +- + arch/arm/mach-pxa/pxa300.c | 6 +- + arch/arm/mach-pxa/pxa320.c | 8 +- + arch/arm/mach-pxa/pxa3xx.c | 22 +- + arch/arm/mach-pxa/pxa930.c | 4 +- + arch/arm/mach-pxa/reset.c | 10 +- + arch/arm/mach-pxa/saar.c | 6 +- + arch/arm/mach-pxa/sharpsl_pm.c | 10 +- + arch/arm/mach-pxa/sleep.S | 6 +- + arch/arm/mach-pxa/spitz.c | 27 +- + arch/arm/mach-pxa/spitz_pm.c | 12 +- + arch/arm/mach-pxa/ssp.c | 8 +- + arch/arm/mach-pxa/standby.S | 6 +- + arch/arm/mach-pxa/tavorevb.c | 6 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-pxa/tosa-bt.c | 2 +- + arch/arm/mach-pxa/tosa.c | 17 +- + arch/arm/mach-pxa/trizeps4.c | 20 +- + arch/arm/mach-pxa/zylonite.c | 16 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 6 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 6 +- + arch/arm/mach-realview/core.c | 2 +- + .../arm/mach-realview/include/mach}/board-eb.h | 4 +- + .../arm/mach-realview/include/mach}/board-pb1176.h | 4 +- + .../arm/mach-realview/include/mach}/board-pb11mp.h | 4 +- + .../arm/mach-realview/include/mach}/debug-macro.S | 2 +- + .../arm/mach-realview/include/mach}/dma.h | 2 +- + .../arm/mach-realview/include/mach}/entry-macro.S | 4 +- + .../arm/mach-realview/include/mach}/hardware.h | 2 +- + .../arm/mach-realview/include/mach}/io.h | 2 +- + .../arm/mach-realview/include/mach}/irqs.h | 8 +- + .../arm/mach-realview/include/mach}/memory.h | 2 +- + .../arm/mach-realview/include/mach}/platform.h | 2 +- + .../arm/mach-realview/include/mach}/scu.h | 0 + .../arm/mach-realview/include/mach}/smp.h | 0 + .../arm/mach-realview/include/mach}/system.h | 6 +- + .../arm/mach-realview/include/mach}/timex.h | 2 +- + .../arm/mach-realview/include/mach}/uncompress.h | 10 +- + .../arm/mach-realview/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-realview/localtimer.c | 2 +- + arch/arm/mach-realview/platsmp.c | 8 +- + arch/arm/mach-realview/realview_eb.c | 6 +- + arch/arm/mach-realview/realview_pb1176.c | 6 +- + arch/arm/mach-realview/realview_pb11mp.c | 6 +- + arch/arm/mach-rpc/dma.c | 2 +- + .../arm/mach-rpc/include/mach}/acornfb.h | 2 +- + .../arm/mach-rpc/include/mach}/debug-macro.S | 2 +- + .../arm/mach-rpc/include/mach}/dma.h | 2 +- + .../arm/mach-rpc/include/mach}/entry-macro.S | 2 +- + .../arm/mach-rpc/include/mach}/hardware.h | 4 +- + .../arm/mach-rpc/include/mach}/io.h | 4 +- + .../arm/mach-rpc/include/mach}/irqs.h | 2 +- + .../arm/mach-rpc/include/mach}/memory.h | 2 +- + .../arm/mach-rpc/include/mach}/system.h | 4 +- + .../arm/mach-rpc/include/mach}/timex.h | 2 +- + .../arm/mach-rpc/include/mach}/uncompress.h | 4 +- + .../arm/mach-rpc/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-rpc/riscpc.c | 2 +- + arch/arm/mach-s3c2400/gpio.c | 4 +- + .../arm/mach-s3c2400/include/mach}/map.h | 2 +- + .../arm/mach-s3c2400/include/mach}/memory.h | 4 +- + arch/arm/mach-s3c2410/bast-ide.c | 6 +- + arch/arm/mach-s3c2410/bast-irq.c | 8 +- + arch/arm/mach-s3c2410/clock.c | 6 +- + arch/arm/mach-s3c2410/dma.c | 10 +- + arch/arm/mach-s3c2410/gpio.c | 4 +- + arch/arm/mach-s3c2410/h1940-bluetooth.c | 6 +- + .../arm/mach-s3c2410/include/mach}/anubis-cpld.h | 2 +- + .../arm/mach-s3c2410/include/mach}/anubis-irq.h | 2 +- + .../arm/mach-s3c2410/include/mach}/anubis-map.h | 2 +- + .../arm/mach-s3c2410/include/mach}/audio.h | 2 +- + .../arm/mach-s3c2410/include/mach}/bast-cpld.h | 2 +- + .../arm/mach-s3c2410/include/mach}/bast-irq.h | 2 +- + .../arm/mach-s3c2410/include/mach}/bast-map.h | 2 +- + .../arm/mach-s3c2410/include/mach}/bast-pmu.h | 2 +- + .../arm/mach-s3c2410/include/mach}/debug-macro.S | 6 +- + .../arm/mach-s3c2410/include/mach}/dma.h | 4 +- + .../arm/mach-s3c2410/include/mach}/entry-macro.S | 4 +- + .../arm/mach-s3c2410/include/mach}/fb.h | 4 +- + .../arm/mach-s3c2410/include/mach}/gpio.h | 2 +- + .../arm/mach-s3c2410/include/mach}/h1940-latch.h | 2 +- + .../arm/mach-s3c2410/include/mach}/h1940.h | 2 +- + .../arm/mach-s3c2410/include/mach}/hardware.h | 8 +- + .../arm/mach-s3c2410/include/mach}/idle.h | 2 +- + .../arm/mach-s3c2410/include/mach}/io.h | 6 +- + .../arm/mach-s3c2410/include/mach}/irqs.h | 2 +- + .../arm/mach-s3c2410/include/mach}/leds-gpio.h | 2 +- + .../arm/mach-s3c2410/include/mach}/map.h | 2 +- + .../arm/mach-s3c2410/include/mach}/memory.h | 4 +- + .../arm/mach-s3c2410/include/mach}/osiris-cpld.h | 2 +- + .../arm/mach-s3c2410/include/mach}/osiris-map.h | 2 +- + .../arm/mach-s3c2410/include/mach}/otom-map.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-clock.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-dsc.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-gpio.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-gpioj.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-irq.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-lcd.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-mem.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-power.h | 2 +- + .../mach-s3c2410/include/mach}/regs-s3c2412-mem.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-s3c2412.h | 2 +- + .../include/mach}/regs-s3c2443-clock.h | 2 +- + .../arm/mach-s3c2410/include/mach}/regs-sdi.h | 2 +- + .../arm/mach-s3c2410/include/mach}/reset.h | 2 +- + .../arm/mach-s3c2410/include/mach}/spi-gpio.h | 2 +- + .../arm/mach-s3c2410/include/mach}/spi.h | 2 +- + .../arm/mach-s3c2410/include/mach}/system-reset.h | 6 +- + .../arm/mach-s3c2410/include/mach}/system.h | 14 +- + .../arm/mach-s3c2410/include/mach}/timex.h | 2 +- + .../arm/mach-s3c2410/include/mach}/uncompress.h | 6 +- + .../arm/mach-s3c2410/include/mach}/usb-control.h | 4 +- + .../arm/mach-s3c2410/include/mach}/vmalloc.h | 4 +- + .../arm/mach-s3c2410/include/mach}/vr1000-cpld.h | 2 +- + .../arm/mach-s3c2410/include/mach}/vr1000-irq.h | 2 +- + .../arm/mach-s3c2410/include/mach}/vr1000-map.h | 4 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 8 +- + arch/arm/mach-s3c2410/mach-bast.c | 16 +- + arch/arm/mach-s3c2410/mach-h1940.c | 14 +- + arch/arm/mach-s3c2410/mach-n30.c | 10 +- + arch/arm/mach-s3c2410/mach-otom.c | 6 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 12 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 14 +- + arch/arm/mach-s3c2410/nor-simtec.c | 6 +- + arch/arm/mach-s3c2410/pm-h1940.S | 6 +- + arch/arm/mach-s3c2410/pm.c | 6 +- + arch/arm/mach-s3c2410/s3c2410.c | 4 +- + arch/arm/mach-s3c2410/sleep.S | 10 +- + arch/arm/mach-s3c2410/usb-simtec.c | 10 +- + arch/arm/mach-s3c2412/clock.c | 6 +- + arch/arm/mach-s3c2412/dma.c | 10 +- + arch/arm/mach-s3c2412/gpio.c | 4 +- + arch/arm/mach-s3c2412/irq.c | 8 +- + arch/arm/mach-s3c2412/mach-jive.c | 12 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 10 +- + arch/arm/mach-s3c2412/mach-vstms.c | 10 +- + arch/arm/mach-s3c2412/pm.c | 10 +- + arch/arm/mach-s3c2412/s3c2412.c | 18 +- + arch/arm/mach-s3c2412/sleep.S | 6 +- + arch/arm/mach-s3c2440/clock.c | 4 +- + arch/arm/mach-s3c2440/dma.c | 10 +- + arch/arm/mach-s3c2440/dsc.c | 6 +- + arch/arm/mach-s3c2440/irq.c | 6 +- + arch/arm/mach-s3c2440/mach-anubis.c | 14 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 4 +- + arch/arm/mach-s3c2440/mach-osiris.c | 12 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 10 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 10 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + arch/arm/mach-s3c2442/clock.c | 4 +- + arch/arm/mach-s3c2443/clock.c | 4 +- + arch/arm/mach-s3c2443/dma.c | 10 +- + arch/arm/mach-s3c2443/irq.c | 6 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 10 +- + arch/arm/mach-s3c2443/s3c2443.c | 6 +- + arch/arm/mach-sa1100/Makefile | 3 - + arch/arm/mach-sa1100/assabet.c | 6 +- + arch/arm/mach-sa1100/badge4.c | 6 +- + arch/arm/mach-sa1100/cerf.c | 6 +- + arch/arm/mach-sa1100/clock.c | 2 +- + arch/arm/mach-sa1100/collie.c | 6 +- + arch/arm/mach-sa1100/collie_pm.c | 5 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 2 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 2 +- + arch/arm/mach-sa1100/dma.c | 4 +- + arch/arm/mach-sa1100/generic.c | 5 +- + arch/arm/mach-sa1100/gpio.c | 2 +- + arch/arm/mach-sa1100/h3600.c | 10 +- + arch/arm/mach-sa1100/hackkit.c | 2 +- + .../arm/mach-sa1100/include/mach}/SA-1100.h | 0 + .../arm/mach-sa1100/include/mach}/SA-1101.h | 2 +- + .../arm/mach-sa1100/include/mach}/SA-1111.h | 0 + .../arm/mach-sa1100/include/mach}/assabet.h | 2 +- + .../arm/mach-sa1100/include/mach}/badge4.h | 4 +- + .../arm/mach-sa1100/include/mach}/bitfield.h | 0 + .../arm/mach-sa1100/include/mach}/cerf.h | 2 +- + .../arm/mach-sa1100/include/mach}/collie.h | 2 +- + .../arm/mach-sa1100/include/mach}/debug-macro.S | 6 +- + .../arm/mach-sa1100/include/mach}/dma.h | 2 +- + .../arm/mach-sa1100/include/mach}/entry-macro.S | 2 +- + .../arm/mach-sa1100/include/mach}/gpio.h | 4 +- + .../arm/mach-sa1100/include/mach}/h3600.h | 0 + .../arm/mach-sa1100/include/mach}/h3600_gpio.h | 0 + .../arm/mach-sa1100/include/mach}/hardware.h | 2 +- + .../arm/mach-sa1100/include/mach}/ide.h | 4 +- + .../arm/mach-sa1100/include/mach}/io.h | 2 +- + .../arm/mach-sa1100/include/mach}/irqs.h | 2 +- + .../arm/mach-sa1100/include/mach}/jornada720.h | 2 +- + .../arm/mach-sa1100/include/mach}/lart.h | 0 + .../arm/mach-sa1100/include/mach}/mcp.h | 2 +- + .../arm/mach-sa1100/include/mach}/memory.h | 2 +- + .../arm/mach-sa1100/include/mach}/mtd-xip.h | 0 + .../arm/mach-sa1100/include/mach}/neponset.h | 2 +- + arch/arm/mach-sa1100/include/mach/reset.h | 18 + + .../arm/mach-sa1100/include/mach}/shannon.h | 0 + .../arm/mach-sa1100/include/mach}/simpad.h | 2 +- + .../arm/mach-sa1100/include/mach}/system.h | 4 +- + .../arm/mach-sa1100/include/mach}/timex.h | 2 +- + .../arm/mach-sa1100/include/mach}/uncompress.h | 2 +- + arch/arm/mach-sa1100/include/mach/vmalloc.h | 4 + + arch/arm/mach-sa1100/irq.c | 2 +- + arch/arm/mach-sa1100/jornada720.c | 2 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 4 +- + arch/arm/mach-sa1100/lart.c | 4 +- + arch/arm/mach-sa1100/leds-assabet.c | 4 +- + arch/arm/mach-sa1100/leds-badge4.c | 2 +- + arch/arm/mach-sa1100/leds-cerf.c | 2 +- + arch/arm/mach-sa1100/leds-hackkit.c | 2 +- + arch/arm/mach-sa1100/leds-lart.c | 2 +- + arch/arm/mach-sa1100/leds-simpad.c | 4 +- + arch/arm/mach-sa1100/neponset.c | 6 +- + arch/arm/mach-sa1100/pleb.c | 4 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-sa1100/shannon.c | 6 +- + arch/arm/mach-sa1100/simpad.c | 6 +- + arch/arm/mach-sa1100/sleep.S | 2 +- + arch/arm/mach-sa1100/ssp.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + .../arm/mach-shark/include/mach}/debug-macro.S | 2 +- + .../arm/mach-shark/include/mach}/dma.h | 2 +- + .../arm/mach-shark/include/mach}/entry-macro.S | 2 +- + .../arm/mach-shark/include/mach}/hardware.h | 4 +- + .../arm/mach-shark/include/mach}/io.h | 6 +- + .../arm/mach-shark/include/mach}/irqs.h | 2 +- + .../arm/mach-shark/include/mach}/memory.h | 4 +- + .../arm/mach-shark/include/mach}/system.h | 2 +- + .../arm/mach-shark/include/mach}/timex.h | 2 +- + .../arm/mach-shark/include/mach}/uncompress.h | 4 +- + .../arm/mach-shark/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-shark/irq.c | 2 +- + arch/arm/mach-shark/leds.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + .../arm/mach-versatile/include/mach}/debug-macro.S | 2 +- + .../arm/mach-versatile/include/mach}/dma.h | 2 +- + .../arm/mach-versatile/include/mach}/entry-macro.S | 4 +- + .../arm/mach-versatile/include/mach}/hardware.h | 4 +- + .../arm/mach-versatile/include/mach}/io.h | 2 +- + .../arm/mach-versatile/include/mach}/irqs.h | 4 +- + .../arm/mach-versatile/include/mach}/memory.h | 2 +- + .../arm/mach-versatile/include/mach}/platform.h | 2 +- + .../arm/mach-versatile/include/mach}/system.h | 6 +- + .../arm/mach-versatile/include/mach}/timex.h | 2 +- + .../arm/mach-versatile/include/mach}/uncompress.h | 2 +- + .../arm/mach-versatile/include/mach}/vmalloc.h | 2 +- + arch/arm/mach-versatile/pci.c | 2 +- + arch/arm/mach-versatile/versatile_ab.c | 2 +- + arch/arm/mach-versatile/versatile_pb.c | 2 +- + arch/arm/mm/cache-v3.S | 2 +- + arch/arm/mm/cache-v4.S | 2 +- + arch/arm/mm/cache-v4wt.S | 2 +- + arch/arm/mm/proc-sa110.S | 2 +- + arch/arm/mm/proc-sa1100.S | 2 +- + arch/arm/mm/proc-xsc3.S | 2 +- + arch/arm/oprofile/op_model_mpcore.c | 2 +- + arch/arm/plat-iop/adma.c | 2 +- + arch/arm/plat-iop/i2c.c | 3 +- + arch/arm/plat-iop/io.c | 2 +- + arch/arm/plat-iop/pci.c | 3 +- + arch/arm/plat-iop/time.c | 4 +- + arch/arm/plat-mxc/clock.c | 2 +- + arch/arm/plat-mxc/gpio.c | 2 +- + .../arm/plat-mxc/include/mach}/board-mx27ads.h | 0 + .../arm/plat-mxc/include/mach}/board-mx31ads.h | 0 + .../arm/plat-mxc/include/mach}/board-mx31lite.h | 0 + .../arm/plat-mxc/include/mach}/board-pcm037.h | 0 + .../arm/plat-mxc/include/mach}/board-pcm038.h | 0 + .../arm/plat-mxc/include/mach}/clock.h | 0 + .../arm/plat-mxc/include/mach}/common.h | 0 + .../arm/plat-mxc/include/mach}/debug-macro.S | 14 +- + .../arm/plat-mxc/include/mach}/dma.h | 0 + .../arm/plat-mxc/include/mach}/entry-macro.S | 0 + .../arm/plat-mxc/include/mach}/gpio.h | 2 +- + .../arm/plat-mxc/include/mach}/hardware.h | 6 +- + .../arm/plat-mxc/include/mach}/iim.h | 0 + .../arm/plat-mxc/include/mach}/imx-uart.h | 0 + .../arm/plat-mxc/include/mach}/io.h | 0 + .../arm/plat-mxc/include/mach}/iomux-mx1-mx2.h | 0 + .../arm/plat-mxc/include/mach}/iomux-mx3.h | 0 + .../arm/plat-mxc/include/mach}/irqs.h | 2 +- + .../arm/plat-mxc/include/mach}/memory.h | 2 +- + .../arm/plat-mxc/include/mach}/mx27.h | 0 + .../arm/plat-mxc/include/mach}/mx31.h | 0 + .../arm/plat-mxc/include/mach}/mxc.h | 0 + .../arm/plat-mxc/include/mach}/mxc_timer.h | 2 +- + .../arm/plat-mxc/include/mach}/system.h | 0 + .../arm/plat-mxc/include/mach}/timex.h | 2 +- + .../arm/plat-mxc/include/mach}/uncompress.h | 4 +- + .../arm/plat-mxc/include/mach}/vmalloc.h | 0 + arch/arm/plat-mxc/iomux-mx1-mx2.c | 4 +- + arch/arm/plat-mxc/irq.c | 2 +- + arch/arm/plat-mxc/time.c | 6 +- + arch/arm/plat-omap/clock.c | 2 +- + arch/arm/plat-omap/common.c | 14 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/debug-devices.c | 6 +- + arch/arm/plat-omap/debug-leds.c | 6 +- + arch/arm/plat-omap/devices.c | 14 +- + arch/arm/plat-omap/dma.c | 4 +- + arch/arm/plat-omap/dmtimer.c | 6 +- + arch/arm/plat-omap/fb.c | 9 +- + arch/arm/plat-omap/gpio.c | 6 +- + arch/arm/plat-omap/i2c.c | 3 +- + .../arm/plat-omap/include/mach}/aic23.h | 2 +- + .../arm/plat-omap/include/mach}/blizzard.h | 0 + .../arm/plat-omap/include/mach}/board-2430sdp.h | 2 +- + .../arm/plat-omap/include/mach}/board-ams-delta.h | 2 +- + .../arm/plat-omap/include/mach}/board-apollon.h | 2 +- + .../arm/plat-omap/include/mach}/board-fsample.h | 4 +- + .../arm/plat-omap/include/mach}/board-h2.h | 2 +- + .../arm/plat-omap/include/mach}/board-h3.h | 2 +- + .../arm/plat-omap/include/mach}/board-h4.h | 2 +- + .../arm/plat-omap/include/mach}/board-innovator.h | 2 +- + .../arm/plat-omap/include/mach}/board-nokia.h | 2 +- + .../arm/plat-omap/include/mach}/board-osk.h | 2 +- + .../arm/plat-omap/include/mach}/board-palmte.h | 2 +- + .../arm/plat-omap/include/mach}/board-palmtt.h | 2 +- + .../arm/plat-omap/include/mach}/board-palmz71.h | 2 +- + .../arm/plat-omap/include/mach}/board-perseus2.h | 4 +- + .../arm/plat-omap/include/mach}/board-sx1.h | 0 + .../arm/plat-omap/include/mach}/board-voiceblue.h | 0 + .../arm/plat-omap/include/mach}/board.h | 8 +- + .../arm/plat-omap/include/mach}/clock.h | 2 +- + .../arm/plat-omap/include/mach}/common.h | 2 +- + .../arm/plat-omap/include/mach}/control.h | 4 +- + .../arm/plat-omap/include/mach}/cpu.h | 2 +- + .../arm/plat-omap/include/mach}/debug-macro.S | 2 +- + .../arm/plat-omap/include/mach}/dma.h | 2 +- + .../arm/plat-omap/include/mach}/dmtimer.h | 2 +- + .../arm/plat-omap/include/mach}/dsp_common.h | 0 + .../arm/plat-omap/include/mach}/eac.h | 6 +- + .../arm/plat-omap/include/mach}/entry-macro.S | 10 +- + .../arm/plat-omap/include/mach}/fpga.h | 2 +- + .../arm/plat-omap/include/mach}/gpio-switch.h | 0 + .../arm/plat-omap/include/mach}/gpio.h | 4 +- + .../arm/plat-omap/include/mach}/gpioexpander.h | 2 +- + .../arm/plat-omap/include/mach}/gpmc.h | 0 + .../arm/plat-omap/include/mach}/hardware.h | 6 +- + .../arm/plat-omap/include/mach}/hwa742.h | 0 + .../arm/plat-omap/include/mach}/io.h | 6 +- + .../arm/plat-omap/include/mach}/irda.h | 2 +- + .../arm/plat-omap/include/mach}/irqs.h | 4 +- + .../arm/plat-omap/include/mach}/keypad.h | 2 +- + .../arm/plat-omap/include/mach}/lcd_mipid.h | 0 + .../arm/plat-omap/include/mach}/led.h | 2 +- + .../arm/plat-omap/include/mach}/mailbox.h | 0 + .../arm/plat-omap/include/mach}/mcbsp.h | 6 +- + .../arm/plat-omap/include/mach}/mcspi.h | 0 + .../arm/plat-omap/include/mach}/memory.h | 4 +- + .../arm/plat-omap/include/mach}/menelaus.h | 2 +- + .../arm/plat-omap/include/mach}/mmc.h | 2 +- + .../arm/plat-omap/include/mach}/mtd-xip.h | 2 +- + .../arm/plat-omap/include/mach}/mux.h | 2 +- + .../arm/plat-omap/include/mach}/nand.h | 2 +- + .../arm/plat-omap/include/mach}/omap-alsa.h | 6 +- + .../arm/plat-omap/include/mach}/omap1510.h | 2 +- + .../arm/plat-omap/include/mach}/omap16xx.h | 2 +- + .../arm/plat-omap/include/mach}/omap24xx.h | 2 +- + .../arm/plat-omap/include/mach}/omap34xx.h | 2 +- + .../arm/plat-omap/include/mach}/omap730.h | 2 +- + .../arm/plat-omap/include/mach}/omapfb.h | 4 +- + .../arm/plat-omap/include/mach}/onenand.h | 2 +- + .../arm/plat-omap/include/mach}/param.h | 2 +- + .../arm/plat-omap/include/mach}/pm.h | 2 +- + .../arm/plat-omap/include/mach}/prcm.h | 2 +- + .../arm/plat-omap/include/mach}/sdrc.h | 2 +- + .../arm/plat-omap/include/mach}/serial.h | 2 +- + .../arm/plat-omap/include/mach}/sram.h | 2 +- + .../arm/plat-omap/include/mach}/system.h | 4 +- + .../arm/plat-omap/include/mach}/tc.h | 2 +- + .../arm/plat-omap/include/mach}/timex.h | 2 +- + .../arm/plat-omap/include/mach}/uncompress.h | 6 +- + .../arm/plat-omap/include/mach}/usb.h | 2 +- + .../arm/plat-omap/include/mach}/vmalloc.h | 2 +- + arch/arm/plat-omap/mailbox.c | 2 +- + arch/arm/plat-omap/mcbsp.c | 4 +- + arch/arm/plat-omap/mux.c | 2 +- + arch/arm/plat-omap/ocpi.c | 2 +- + arch/arm/plat-omap/sram.c | 6 +- + arch/arm/plat-omap/usb.c | 10 +- + arch/arm/plat-orion/time.c | 2 +- + arch/arm/plat-s3c24xx/clock.c | 6 +- + arch/arm/plat-s3c24xx/common-smdk.c | 6 +- + arch/arm/plat-s3c24xx/cpu.c | 6 +- + arch/arm/plat-s3c24xx/devs.c | 4 +- + arch/arm/plat-s3c24xx/dma.c | 4 +- + arch/arm/plat-s3c24xx/gpio.c | 4 +- + arch/arm/plat-s3c24xx/gpiolib.c | 4 +- + arch/arm/plat-s3c24xx/irq.c | 6 +- + arch/arm/plat-s3c24xx/pm-simtec.c | 8 +- + arch/arm/plat-s3c24xx/pm.c | 10 +- + arch/arm/plat-s3c24xx/pwm-clock.c | 6 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- + arch/arm/plat-s3c24xx/s3c244x-irq.c | 6 +- + arch/arm/plat-s3c24xx/s3c244x.c | 10 +- + arch/arm/plat-s3c24xx/sleep.S | 10 +- + arch/arm/plat-s3c24xx/time.c | 4 +- + arch/arm/tools/Makefile | 1 + + arch/avr32/Makefile | 7 +- + arch/avr32/boards/atngw100/flash.c | 2 +- + arch/avr32/boards/atngw100/setup.c | 8 +- + arch/avr32/boards/atstk1000/atstk1002.c | 10 +- + arch/avr32/boards/atstk1000/atstk1003.c | 8 +- + arch/avr32/boards/atstk1000/atstk1004.c | 8 +- + arch/avr32/boards/atstk1000/flash.c | 2 +- + arch/avr32/boards/atstk1000/setup.c | 6 +- + .../asm-avr32 => arch/avr32/include/asm}/Kbuild | 0 + .../asm-avr32 => arch/avr32/include/asm}/a.out.h | 0 + .../avr32/include/asm}/addrspace.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/asm.h | 0 + .../avr32/include/asm}/atmel-mci.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/atomic.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/auxvec.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/bitops.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/bug.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/bugs.h | 0 + .../avr32/include/asm}/byteorder.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/cache.h | 0 + .../avr32/include/asm}/cachectl.h | 0 + .../avr32/include/asm}/cacheflush.h | 0 + .../avr32/include/asm}/checksum.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/cputime.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/current.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/delay.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/device.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/div64.h | 0 + .../avr32/include/asm}/dma-mapping.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/dma.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/elf.h | 0 + .../avr32/include/asm}/emergency-restart.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/errno.h | 0 + {include/asm-avr32 => arch/avr32/include/asm}/fb.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/fcntl.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/futex.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/gpio.h | 2 +- + .../asm-avr32 => arch/avr32/include/asm}/hardirq.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/hw_irq.h | 0 + {include/asm-avr32 => arch/avr32/include/asm}/io.h | 2 +- + .../asm-avr32 => arch/avr32/include/asm}/ioctl.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/ioctls.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/ipcbuf.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/irq.h | 2 +- + .../avr32/include/asm}/irq_regs.h | 0 + .../avr32/include/asm}/irqflags.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/kdebug.h | 0 + .../avr32/include/asm}/kmap_types.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/kprobes.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/linkage.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/local.h | 0 + .../avr32/include/asm}/mach/serial_at91.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/mman.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/mmu.h | 0 + .../avr32/include/asm}/mmu_context.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/module.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/msgbuf.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/mutex.h | 0 + .../avr32/include/asm}/numnodes.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/ocd.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/page.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/param.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/pci.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/percpu.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/pgalloc.h | 0 + .../avr32/include/asm}/pgtable-2level.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/pgtable.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/poll.h | 0 + .../avr32/include/asm}/posix_types.h | 0 + .../avr32/include/asm}/processor.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/ptrace.h | 0 + .../avr32/include/asm}/resource.h | 0 + .../avr32/include/asm}/scatterlist.h | 0 + .../avr32/include/asm}/sections.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/sembuf.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/serial.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/setup.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/shmbuf.h | 0 + .../avr32/include/asm}/shmparam.h | 0 + .../avr32/include/asm}/sigcontext.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/siginfo.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/signal.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/socket.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/sockios.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/stat.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/statfs.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/string.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/sysreg.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/system.h | 0 + .../avr32/include/asm}/termbits.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/termios.h | 0 + .../avr32/include/asm}/thread_info.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/timex.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/tlb.h | 0 + .../avr32/include/asm}/tlbflush.h | 0 + .../avr32/include/asm}/topology.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/traps.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/types.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/uaccess.h | 0 + .../avr32/include/asm}/ucontext.h | 0 + .../avr32/include/asm}/unaligned.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/unistd.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/user.h | 0 + .../asm-avr32 => arch/avr32/include/asm}/xor.h | 0 + arch/avr32/kernel/process.c | 2 +- + arch/avr32/kernel/setup.c | 4 +- + arch/avr32/kernel/time.c | 2 +- + arch/avr32/mach-at32ap/at32ap700x.c | 8 +- + arch/avr32/mach-at32ap/hsmc.c | 2 +- + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 49 + + arch/avr32/mach-at32ap/include/mach/board.h | 121 + + arch/avr32/mach-at32ap/include/mach/cpu.h | 35 + + arch/avr32/mach-at32ap/include/mach/gpio.h | 45 + + arch/avr32/mach-at32ap/include/mach/init.h | 18 + + arch/avr32/mach-at32ap/include/mach/io.h | 39 + + arch/avr32/mach-at32ap/include/mach/irq.h | 14 + + arch/avr32/mach-at32ap/include/mach/pm.h | 51 + + arch/avr32/mach-at32ap/include/mach/portmux.h | 29 + + arch/avr32/mach-at32ap/include/mach/smc.h | 113 + + arch/avr32/mach-at32ap/include/mach/sram.h | 30 + + arch/avr32/mach-at32ap/pio.c | 2 +- + arch/avr32/mach-at32ap/pm-at32ap700x.S | 2 +- + arch/avr32/mach-at32ap/pm.c | 4 +- + .../m68knommu/include/asm}/Kbuild | 0 + .../m68knommu/include/asm}/MC68328.h | 0 + .../m68knommu/include/asm}/MC68332.h | 0 + .../m68knommu/include/asm}/MC68EZ328.h | 0 + .../m68knommu/include/asm}/MC68VZ328.h | 0 + .../m68knommu/include/asm}/a.out.h | 0 + .../m68knommu/include/asm}/anchor.h | 0 + .../m68knommu/include/asm}/atomic.h | 0 + .../m68knommu/include/asm}/auxvec.h | 0 + .../m68knommu/include/asm}/bitops.h | 0 + .../m68knommu/include/asm}/bootinfo.h | 0 + .../m68knommu/include/asm}/bootstd.h | 0 + .../m68knommu/include/asm}/bug.h | 0 + .../m68knommu/include/asm}/bugs.h | 0 + .../m68knommu/include/asm}/byteorder.h | 0 + .../m68knommu/include/asm}/cache.h | 0 + .../m68knommu/include/asm}/cachectl.h | 0 + .../m68knommu/include/asm}/cacheflush.h | 0 + .../m68knommu/include/asm}/checksum.h | 0 + .../m68knommu/include/asm}/coldfire.h | 0 + .../m68knommu/include/asm}/commproc.h | 0 + .../m68knommu/include/asm}/cputime.h | 0 + .../m68knommu/include/asm}/current.h | 0 + .../m68knommu/include/asm}/dbg.h | 0 + .../m68knommu/include/asm}/delay.h | 0 + .../m68knommu/include/asm}/device.h | 0 + .../m68knommu/include/asm}/div64.h | 0 + .../m68knommu/include/asm}/dma-mapping.h | 0 + .../m68knommu/include/asm}/dma.h | 0 + .../m68knommu/include/asm}/elf.h | 0 + .../m68knommu/include/asm}/elia.h | 0 + .../m68knommu/include/asm}/emergency-restart.h | 0 + .../m68knommu/include/asm}/entry.h | 0 + .../m68knommu/include/asm}/errno.h | 0 + .../m68knommu/include/asm}/fb.h | 0 + .../m68knommu/include/asm}/fcntl.h | 0 + .../m68knommu/include/asm}/flat.h | 0 + .../m68knommu/include/asm}/fpu.h | 0 + .../m68knommu/include/asm}/futex.h | 0 + .../m68knommu/include/asm}/hardirq.h | 0 + .../m68knommu/include/asm}/hw_irq.h | 0 + .../m68knommu/include/asm}/hwtest.h | 0 + .../m68knommu/include/asm}/io.h | 0 + .../m68knommu/include/asm}/ioctl.h | 0 + .../m68knommu/include/asm}/ioctls.h | 0 + .../m68knommu/include/asm}/ipcbuf.h | 0 + .../m68knommu/include/asm}/irq.h | 0 + .../m68knommu/include/asm}/irq_regs.h | 0 + .../m68knommu/include/asm}/kdebug.h | 0 + .../m68knommu/include/asm}/kmap_types.h | 0 + .../m68knommu/include/asm}/linkage.h | 0 + .../m68knommu/include/asm}/local.h | 0 + .../m68knommu/include/asm}/m5206sim.h | 0 + .../m68knommu/include/asm}/m520xsim.h | 0 + .../m68knommu/include/asm}/m523xsim.h | 0 + .../m68knommu/include/asm}/m5249sim.h | 0 + .../m68knommu/include/asm}/m5272sim.h | 0 + .../m68knommu/include/asm}/m527xsim.h | 0 + .../m68knommu/include/asm}/m528xsim.h | 0 + .../m68knommu/include/asm}/m5307sim.h | 0 + .../m68knommu/include/asm}/m532xsim.h | 0 + .../m68knommu/include/asm}/m5407sim.h | 0 + .../m68knommu/include/asm}/m68360.h | 0 + .../m68knommu/include/asm}/m68360_enet.h | 0 + .../m68knommu/include/asm}/m68360_pram.h | 0 + .../m68knommu/include/asm}/m68360_quicc.h | 0 + .../m68knommu/include/asm}/m68360_regs.h | 0 + .../m68knommu/include/asm}/machdep.h | 0 + .../m68knommu/include/asm}/math-emu.h | 0 + .../m68knommu/include/asm}/mc146818rtc.h | 0 + .../m68knommu/include/asm}/mcfcache.h | 0 + .../m68knommu/include/asm}/mcfdma.h | 0 + .../m68knommu/include/asm}/mcfmbus.h | 0 + .../m68knommu/include/asm}/mcfne.h | 0 + .../m68knommu/include/asm}/mcfpci.h | 0 + .../m68knommu/include/asm}/mcfpit.h | 0 + .../m68knommu/include/asm}/mcfsim.h | 0 + .../m68knommu/include/asm}/mcfsmc.h | 0 + .../m68knommu/include/asm}/mcftimer.h | 0 + .../m68knommu/include/asm}/mcfuart.h | 0 + .../m68knommu/include/asm}/mcfwdebug.h | 0 + .../m68knommu/include/asm}/md.h | 0 + .../m68knommu/include/asm}/mman.h | 0 + .../m68knommu/include/asm}/mmu.h | 0 + .../m68knommu/include/asm}/mmu_context.h | 0 + .../m68knommu/include/asm}/module.h | 0 + .../m68knommu/include/asm}/movs.h | 0 + .../m68knommu/include/asm}/msgbuf.h | 0 + .../m68knommu/include/asm}/mutex.h | 0 + .../m68knommu/include/asm}/nettel.h | 0 + .../m68knommu/include/asm}/openprom.h | 0 + .../m68knommu/include/asm}/oplib.h | 0 + .../m68knommu/include/asm}/page.h | 0 + .../m68knommu/include/asm}/page_offset.h | 0 + .../m68knommu/include/asm}/param.h | 0 + .../m68knommu/include/asm}/pci.h | 0 + .../m68knommu/include/asm}/percpu.h | 0 + .../m68knommu/include/asm}/pgalloc.h | 0 + .../m68knommu/include/asm}/pgtable.h | 0 + .../m68knommu/include/asm}/poll.h | 0 + .../m68knommu/include/asm}/posix_types.h | 0 + .../m68knommu/include/asm}/processor.h | 0 + .../m68knommu/include/asm}/ptrace.h | 0 + .../m68knommu/include/asm}/quicc_simple.h | 0 + .../m68knommu/include/asm}/resource.h | 0 + .../m68knommu/include/asm}/rtc.h | 0 + .../m68knommu/include/asm}/scatterlist.h | 0 + .../m68knommu/include/asm}/sections.h | 0 + .../m68knommu/include/asm}/segment.h | 0 + .../m68knommu/include/asm}/sembuf.h | 0 + .../m68knommu/include/asm}/setup.h | 0 + .../m68knommu/include/asm}/shm.h | 0 + .../m68knommu/include/asm}/shmbuf.h | 0 + .../m68knommu/include/asm}/shmparam.h | 0 + .../m68knommu/include/asm}/sigcontext.h | 0 + .../m68knommu/include/asm}/siginfo.h | 0 + .../m68knommu/include/asm}/signal.h | 0 + .../m68knommu/include/asm}/smp.h | 0 + .../m68knommu/include/asm}/socket.h | 0 + .../m68knommu/include/asm}/sockios.h | 0 + .../m68knommu/include/asm}/spinlock.h | 0 + .../m68knommu/include/asm}/stat.h | 0 + .../m68knommu/include/asm}/statfs.h | 0 + .../m68knommu/include/asm}/string.h | 0 + .../m68knommu/include/asm}/system.h | 0 + .../m68knommu/include/asm}/termbits.h | 0 + .../m68knommu/include/asm}/termios.h | 0 + .../m68knommu/include/asm}/thread_info.h | 0 + .../m68knommu/include/asm}/timex.h | 0 + .../m68knommu/include/asm}/tlb.h | 0 + .../m68knommu/include/asm}/tlbflush.h | 0 + .../m68knommu/include/asm}/topology.h | 0 + .../m68knommu/include/asm}/traps.h | 0 + .../m68knommu/include/asm}/types.h | 0 + .../m68knommu/include/asm}/uaccess.h | 0 + .../m68knommu/include/asm}/ucontext.h | 0 + .../m68knommu/include/asm}/unaligned.h | 0 + .../m68knommu/include/asm}/unistd.h | 0 + .../m68knommu/include/asm}/user.h | 0 + arch/powerpc/.gitignore | 1 - + arch/powerpc/platforms/iseries/Kconfig | 11 +- + arch/sh/include/asm/sh_eth.h | 11 + + arch/sparc/include/asm/ebus_32.h | 2 +- + arch/sparc/include/asm/ebus_64.h | 3 +- + arch/sparc/include/asm/of_platform.h | 3 - + arch/sparc/include/asm/parport.h | 3 +- + arch/sparc/include/asm/sbus_32.h | 2 +- + arch/sparc/include/asm/sbus_64.h | 2 +- + arch/sparc/kernel/ioport.c | 2 +- + arch/sparc/kernel/time.c | 2 +- + arch/sparc64/kernel/auxio.c | 2 +- + arch/sparc64/kernel/ebus.c | 2 +- + arch/sparc64/kernel/pci_common.c | 2 +- + arch/sparc64/kernel/pci_psycho.c | 2 +- + arch/sparc64/kernel/pci_sabre.c | 2 +- + arch/sparc64/kernel/pci_schizo.c | 2 +- + arch/sparc64/kernel/power.c | 2 +- + arch/sparc64/kernel/prom.c | 2 +- + arch/sparc64/kernel/stacktrace.c | 6 +- + arch/sparc64/kernel/sys_sparc32.c | 176 - + arch/sparc64/kernel/systbls.S | 20 +- + arch/sparc64/kernel/time.c | 2 +- + arch/x86/kernel/cpu/cpufreq/Kconfig | 4 +- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 112 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 3 +- + drivers/ata/pata_at32.c | 4 +- + drivers/block/cciss.c | 748 +- + drivers/block/cciss.h | 2 + + drivers/block/cciss_scsi.c | 195 +- + drivers/block/xen-blkfront.c | 4 +- + drivers/bluetooth/bcm203x.c | 9 +- + drivers/bluetooth/bfusb.c | 10 +- + drivers/bluetooth/bpa10x.c | 10 +- + drivers/bluetooth/btusb.c | 163 +- + drivers/bluetooth/hci_usb.c | 8 +- + drivers/char/Kconfig | 2 +- + drivers/char/Makefile | 1 - + drivers/char/ds1620.c | 2 +- + drivers/char/hw_random/ixp4xx-rng.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 4 - + drivers/char/synclink.c | 4 - + drivers/char/synclink_gt.c | 5 - + drivers/char/synclinkmp.c | 4 - + drivers/char/viocons.c | 1167 --- + drivers/cpufreq/cpufreq_conservative.c | 20 +- + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/dma/ioat_dma.c | 2 +- + drivers/dma/iop-adma.c | 2 +- + drivers/hwmon/Kconfig | 16 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ad7414.c | 268 + + drivers/hwmon/dme1737.c | 292 +- + drivers/hwmon/f71882fg.c | 6 - + drivers/hwmon/hwmon-vid.c | 144 +- + drivers/hwmon/it87.c | 45 +- + drivers/hwmon/thmc50.c | 28 +- + drivers/hwmon/w83627hf.c | 101 +- + drivers/hwmon/w83791d.c | 24 +- + drivers/i2c/busses/i2c-acorn.c | 2 +- + drivers/i2c/busses/i2c-at91.c | 6 +- + drivers/i2c/busses/i2c-davinci.c | 5 +- + drivers/i2c/busses/i2c-ixp2000.c | 4 +- + drivers/i2c/busses/i2c-pnx.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-s3c2410.c | 4 +- + drivers/i2c/chips/isp1301_omap.c | 4 +- + drivers/i2c/chips/menelaus.c | 5 +- + drivers/ide/arm/ide_arm.c | 3 +- + drivers/infiniband/core/cma.c | 37 +- + drivers/infiniband/core/mad_rmpp.c | 2 +- + drivers/infiniband/core/ucma.c | 14 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 28 +- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 7 + + drivers/infiniband/hw/cxgb3/iwch_qp.c | 25 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 5 +- + drivers/infiniband/hw/ipath/ipath_iba7220.c | 7 +- + drivers/infiniband/hw/ipath/ipath_intr.c | 12 +- + drivers/infiniband/hw/ipath/ipath_verbs.c | 6 +- + drivers/infiniband/hw/mlx4/cq.c | 33 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + drivers/input/keyboard/aaed2000_kbd.c | 4 +- + drivers/input/keyboard/corgikbd.c | 8 +- + drivers/input/keyboard/jornada720_kbd.c | 4 +- + drivers/input/keyboard/omap-keypad.c | 11 +- + drivers/input/keyboard/pxa27x_keypad.c | 5 +- + drivers/input/keyboard/spitzkbd.c | 8 +- + drivers/input/keyboard/tosakbd.c | 4 +- + drivers/input/misc/ixp4xx-beeper.c | 2 +- + drivers/input/mouse/rpcmouse.c | 2 +- + drivers/input/serio/i8042-sparcio.h | 19 +- + drivers/input/serio/rpckbd.c | 2 +- + drivers/input/touchscreen/corgi_ts.c | 8 +- + drivers/input/touchscreen/h3600_ts_input.c | 4 +- + drivers/input/touchscreen/jornada720_ts.c | 4 +- + drivers/input/touchscreen/mainstone-wm97xx.c | 2 +- + drivers/leds/leds-ams-delta.c | 2 +- + drivers/leds/leds-cm-x270.c | 4 +- + drivers/leds/leds-corgi.c | 7 +- + drivers/leds/leds-fsg.c | 2 +- + drivers/leds/leds-h1940.c | 6 +- + drivers/leds/leds-locomo.c | 2 +- + drivers/leds/leds-s3c24xx.c | 6 +- + drivers/leds/leds-spitz.c | 6 +- + drivers/media/dvb/dvb-usb/cxusb.c | 7 +- + drivers/media/dvb/frontends/Kconfig | 3 +- + drivers/media/video/Kconfig | 2 +- + drivers/media/video/arv.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 1 + + drivers/media/video/gspca/conex.c | 4 +- + drivers/media/video/gspca/etoms.c | 137 +- + drivers/media/video/gspca/gspca.c | 12 +- + drivers/media/video/gspca/gspca.h | 5 +- + drivers/media/video/gspca/ov519.c | 476 +- + drivers/media/video/gspca/pac7311.c | 54 +- + drivers/media/video/gspca/sonixb.c | 2 +- + drivers/media/video/gspca/sonixj.c | 287 +- + drivers/media/video/gspca/spca505.c | 12 +- + drivers/media/video/gspca/spca506.c | 12 +- + drivers/media/video/gspca/spca508.c | 18 +- + drivers/media/video/gspca/spca561.c | 42 +- + drivers/media/video/gspca/vc032x.c | 4 +- + drivers/media/video/gspca/zc3xx.c | 6 +- + drivers/media/video/pxa_camera.c | 62 +- + drivers/media/video/sh_mobile_ceu_camera.c | 2 +- + drivers/media/video/soc_camera.c | 26 + + drivers/media/video/soc_camera_platform.c | 2 +- + drivers/media/video/uvc/uvc_ctrl.c | 33 +- + drivers/media/video/uvc/uvc_driver.c | 26 +- + drivers/media/video/uvc/uvc_video.c | 33 +- + drivers/media/video/v4l2-dev.c | 4 +- + drivers/media/video/vino.c | 1 + + drivers/mfd/mcp-sa11x0.c | 6 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mfd/ucb1x00-ts.c | 2 +- + drivers/mmc/host/at91_mci.c | 6 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/imxmmc.c | 4 +- + drivers/mmc/host/omap.c | 13 +- + drivers/mmc/host/pxamci.c | 4 +- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/mtd/maps/autcpu12-nvram.c | 4 +- + drivers/mtd/maps/cdb89712.c | 2 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/h720x-flash.c | 2 +- + drivers/mtd/maps/integrator-flash.c | 2 +- + drivers/mtd/maps/ipaq-flash.c | 4 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/omap_nor.c | 4 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/mtd/nand/ams-delta.c | 6 +- + drivers/mtd/nand/atmel_nand.c | 4 +- + drivers/mtd/nand/autcpu12.c | 4 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/mtd/nand/edb7312.c | 2 +- + drivers/mtd/nand/h1910.c | 6 +- + drivers/mtd/nand/orion_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 4 +- + drivers/mtd/nand/sharpsl.c | 2 +- + drivers/mtd/nand/ts7250.c | 2 +- + drivers/net/3c523.c | 4 +- + drivers/net/3c527.c | 9 +- + drivers/net/3c59x.c | 14 +- + drivers/net/8390.c | 13 +- + drivers/net/8390p.c | 19 +- + drivers/net/Kconfig | 5 +- + drivers/net/arm/am79c961a.c | 2 +- + drivers/net/arm/at91_ether.c | 6 +- + drivers/net/arm/ep93xx_eth.c | 4 +- + drivers/net/arm/ixp4xx_eth.c | 4 +- + drivers/net/atlx/atl1.c | 19 +- + drivers/net/atp.c | 9 +- + drivers/net/bnx2x_main.c | 2 +- + drivers/net/bonding/bond_3ad.c | 1 + + drivers/net/bonding/bond_main.c | 398 +- + drivers/net/bonding/bond_sysfs.c | 3 - + drivers/net/cs89x0.c | 2 +- + drivers/net/de620.c | 7 - + drivers/net/dm9000.c | 5 + + drivers/net/e1000e/e1000.h | 31 +- + drivers/net/e1000e/ethtool.c | 44 +- + drivers/net/e1000e/netdev.c | 246 +- + drivers/net/e1000e/param.c | 31 +- + drivers/net/eepro.c | 8 - + drivers/net/eth16i.c | 1 - + drivers/net/forcedeth.c | 110 +- + drivers/net/fs_enet/mac-fcc.c | 2 +- + drivers/net/gianfar.c | 4 - + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/igb/e1000_82575.c | 72 +- + drivers/net/igb/e1000_82575.h | 1 - + drivers/net/igb/e1000_defines.h | 1 + + drivers/net/igb/e1000_hw.h | 1 - + drivers/net/igb/e1000_mac.c | 84 +- + drivers/net/igb/e1000_mac.h | 5 +- + drivers/net/igb/e1000_regs.h | 3 - + drivers/net/igb/igb_main.c | 30 +- + drivers/net/irda/ep7211-sir.c | 2 +- + drivers/net/irda/pxaficp_ir.c | 4 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/ixp2000/ixp2400-msf.c | 4 +- + drivers/net/ixp2000/ixpdev.c | 1 - + drivers/net/lp486e.c | 2 - + drivers/net/macb.c | 4 +- + drivers/net/meth.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 1 + + drivers/net/myri10ge/myri10ge_mcp.h | 52 +- + drivers/net/myri10ge/myri10ge_mcp_gen_header.h | 2 +- + drivers/net/netx-eth.c | 11 +- + drivers/net/netxen/netxen_nic.h | 41 +- + drivers/net/netxen/netxen_nic_ctx.c | 9 +- + drivers/net/netxen/netxen_nic_ethtool.c | 35 +- + drivers/net/netxen/netxen_nic_hdr.h | 10 + + drivers/net/netxen/netxen_nic_hw.c | 103 +- + drivers/net/netxen/netxen_nic_hw.h | 13 +- + drivers/net/netxen/netxen_nic_init.c | 5 + + drivers/net/netxen/netxen_nic_main.c | 99 +- + drivers/net/netxen/netxen_nic_niu.c | 16 +- + drivers/net/netxen/netxen_nic_phan_reg.h | 4 +- + drivers/net/ni5010.c | 1 - + drivers/net/ni52.c | 2 +- + drivers/net/qla3xxx.c | 23 +- + drivers/net/qla3xxx.h | 105 - + drivers/net/sh_eth.c | 69 +- + drivers/net/sh_eth.h | 22 +- + drivers/net/sky2.c | 103 +- + drivers/net/sky2.h | 2 - + drivers/net/smc911x.h | 2 +- + drivers/net/smc91x.h | 6 +- + drivers/net/sun3_82586.c | 7 +- + drivers/net/usb/pegasus.c | 21 + + drivers/net/via-velocity.c | 301 +- + drivers/net/via-velocity.h | 50 +- + drivers/net/wan/Kconfig | 15 +- + drivers/net/wan/Makefile | 11 +- + drivers/net/wan/cosa.c | 293 +- + drivers/net/wan/dscc4.c | 1 - + drivers/net/wan/farsync.c | 5 +- + drivers/net/wan/farsync.h | 6 - + drivers/net/wan/hdlc.c | 25 +- + drivers/net/wan/hdlc_cisco.c | 29 +- + drivers/net/wan/hdlc_fr.c | 19 +- + drivers/net/wan/hdlc_ppp.c | 15 +- + drivers/net/wan/hdlc_raw.c | 15 +- + drivers/net/wan/hdlc_raw_eth.c | 17 +- + drivers/net/wan/hdlc_x25.c | 17 +- + drivers/net/wan/hostess_sv11.c | 382 +- + drivers/net/wan/lmc/lmc.h | 11 +- + drivers/net/wan/lmc/lmc_debug.c | 7 +- + drivers/net/wan/lmc/lmc_debug.h | 6 +- + drivers/net/wan/lmc/lmc_ioctl.h | 2 +- + drivers/net/wan/lmc/lmc_main.c | 672 +- + drivers/net/wan/lmc/lmc_media.c | 66 +- + drivers/net/wan/lmc/lmc_proto.c | 146 +- + drivers/net/wan/lmc/lmc_proto.h | 14 +- + drivers/net/wan/lmc/lmc_var.h | 360 +- + drivers/net/wan/pc300.h | 228 +- + drivers/net/wan/pc300_drv.c | 146 +- + drivers/net/wan/sealevel.c | 361 +- + drivers/net/wan/syncppp.c | 9 - + drivers/net/wan/z85230.c | 193 +- + drivers/net/wan/z85230.h | 10 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 1 + + drivers/net/wireless/ath5k/base.c | 2 - + drivers/net/wireless/ath9k/Kconfig | 8 + + drivers/net/wireless/ath9k/Makefile | 11 + + drivers/net/wireless/ath9k/ath9k.h | 1021 +++ + drivers/net/wireless/ath9k/beacon.c | 979 +++ + drivers/net/wireless/ath9k/core.c | 1923 +++++ + drivers/net/wireless/ath9k/core.h | 1072 +++ + drivers/net/wireless/ath9k/hw.c | 8571 ++++++++++++++++++++ + drivers/net/wireless/ath9k/hw.h | 969 +++ + drivers/net/wireless/ath9k/initvals.h | 3146 +++++++ + drivers/net/wireless/ath9k/main.c | 1470 ++++ + drivers/net/wireless/ath9k/phy.c | 436 + + drivers/net/wireless/ath9k/phy.h | 543 ++ + drivers/net/wireless/ath9k/rc.c | 2126 +++++ + drivers/net/wireless/ath9k/rc.h | 316 + + drivers/net/wireless/ath9k/recv.c | 1318 +++ + drivers/net/wireless/ath9k/reg.h | 1385 ++++ + drivers/net/wireless/ath9k/regd.c | 1026 +++ + drivers/net/wireless/ath9k/regd.h | 412 + + drivers/net/wireless/ath9k/regd_common.h | 1915 +++++ + drivers/net/wireless/ath9k/xmit.c | 2871 +++++++ + drivers/net/wireless/iwlwifi/iwl-agn.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 40 +- + drivers/net/wireless/orinoco.c | 7 - + drivers/net/wireless/p54/p54.h | 1 + + drivers/net/wireless/p54/p54common.c | 18 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 54 +- + drivers/net/wireless/wavelan.c | 3 - + drivers/net/wireless/wavelan_cs.c | 6 - + drivers/net/xen-netfront.c | 2 +- + drivers/pcmcia/at91_cf.c | 6 +- + drivers/pcmcia/omap_cf.c | 6 +- + drivers/pcmcia/pxa2xx_base.c | 6 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 2 +- + drivers/pcmcia/pxa2xx_lubbock.c | 6 +- + drivers/pcmcia/pxa2xx_mainstone.c | 6 +- + drivers/pcmcia/pxa2xx_palmtx.c | 4 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- + drivers/pcmcia/sa1100_assabet.c | 4 +- + drivers/pcmcia/sa1100_badge4.c | 4 +- + drivers/pcmcia/sa1100_cerf.c | 4 +- + drivers/pcmcia/sa1100_h3600.c | 4 +- + drivers/pcmcia/sa1100_jornada720.c | 2 +- + drivers/pcmcia/sa1100_neponset.c | 4 +- + drivers/pcmcia/sa1100_shannon.c | 4 +- + drivers/pcmcia/sa1100_simpad.c | 4 +- + drivers/pcmcia/sa1111_generic.c | 2 +- + drivers/pcmcia/sa11xx_base.c | 2 +- + drivers/pcmcia/soc_common.c | 4 +- + drivers/power/palmtx_battery.c | 2 +- + drivers/power/tosa_battery.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 2 +- + drivers/rtc/rtc-at91sam9.c | 4 +- + drivers/rtc/rtc-ep93xx.c | 2 +- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-sa1100.c | 4 +- + drivers/scsi/arm/acornscsi-io.S | 2 +- + drivers/serial/21285.c | 2 +- + drivers/serial/atmel_serial.c | 6 +- + drivers/serial/clps711x.c | 2 +- + drivers/serial/imx.c | 4 +- + drivers/serial/netx-serial.c | 4 +- + drivers/serial/pxa.c | 4 +- + drivers/serial/s3c2400.c | 4 +- + drivers/serial/s3c2410.c | 4 +- + drivers/serial/s3c2412.c | 4 +- + drivers/serial/s3c2440.c | 4 +- + drivers/serial/sa1100.c | 2 +- + drivers/serial/samsung.c | 4 +- + drivers/serial/serial_ks8695.c | 4 +- + drivers/spi/atmel_spi.c | 6 +- + drivers/spi/omap2_mcspi.c | 4 +- + drivers/spi/omap_uwire.c | 6 +- + drivers/spi/pxa2xx_spi.c | 11 +- + drivers/spi/spi_imx.c | 7 +- + drivers/spi/spi_s3c24xx.c | 6 +- + drivers/spi/spi_s3c24xx_gpio.c | 6 +- + drivers/usb/gadget/at91_udc.c | 9 +- + drivers/usb/gadget/atmel_usba_udc.c | 4 +- + drivers/usb/gadget/lh7a40x_udc.h | 2 +- + drivers/usb/gadget/omap_udc.c | 4 +- + drivers/usb/gadget/pxa25x_udc.c | 2 +- + drivers/usb/gadget/pxa25x_udc.h | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 6 +- + drivers/usb/gadget/s3c2410_udc.c | 9 +- + drivers/usb/host/ehci-q.c | 2 +- + drivers/usb/host/ohci-at91.c | 7 +- + drivers/usb/host/ohci-ep93xx.c | 3 +- + drivers/usb/host/ohci-lh7a404.c | 2 +- + drivers/usb/host/ohci-omap.c | 12 +- + drivers/usb/host/ohci-pnx4008.c | 9 +- + drivers/usb/host/ohci-pxa27x.c | 9 +- + drivers/usb/host/ohci-s3c2410.c | 4 +- + drivers/usb/host/ohci-sa1111.c | 6 +- + drivers/video/acornfb.c | 4 +- + drivers/video/am200epd.c | 2 +- + drivers/video/atmel_lcdfb.c | 6 +- + drivers/video/backlight/omap1_bl.c | 6 +- + drivers/video/clps711xfb.c | 4 +- + drivers/video/cyber2000fb.c | 2 +- + drivers/video/epson1355fb.c | 2 +- + drivers/video/imxfb.c | 4 +- + drivers/video/omap/blizzard.c | 6 +- + drivers/video/omap/dispc.c | 6 +- + drivers/video/omap/hwa742.c | 6 +- + drivers/video/omap/lcd_h3.c | 4 +- + drivers/video/omap/lcd_h4.c | 2 +- + drivers/video/omap/lcd_inn1510.c | 4 +- + drivers/video/omap/lcd_inn1610.c | 4 +- + drivers/video/omap/lcd_osk.c | 6 +- + drivers/video/omap/lcd_palmte.c | 4 +- + drivers/video/omap/lcd_palmtt.c | 4 +- + drivers/video/omap/lcd_palmz71.c | 2 +- + drivers/video/omap/lcd_sx1.c | 8 +- + drivers/video/omap/lcdc.c | 4 +- + drivers/video/omap/omapfb_main.c | 5 +- + drivers/video/omap/rfbi.c | 2 +- + drivers/video/omap/sossi.c | 4 +- + drivers/video/pnx4008/dum.h | 2 +- + drivers/video/pnx4008/sdum.c | 2 +- + drivers/video/pxafb.c | 10 +- + drivers/video/s3c2410fb.c | 6 +- + drivers/video/sa1100fb.c | 6 +- + drivers/watchdog/Kconfig | 16 +- + drivers/watchdog/Makefile | 4 +- + drivers/watchdog/acquirewdt.c | 130 +- + drivers/watchdog/advantechwdt.c | 162 +- + drivers/watchdog/alim1535_wdt.c | 189 +- + drivers/watchdog/alim7101_wdt.c | 228 +- + drivers/watchdog/ar7_wdt.c | 8 +- + drivers/watchdog/at32ap700x_wdt.c | 43 +- + drivers/watchdog/at91rm9200_wdt.c | 111 +- + drivers/watchdog/bfin_wdt.c | 147 +- + drivers/watchdog/booke_wdt.c | 44 +- + drivers/watchdog/cpu5wdt.c | 144 +- + drivers/watchdog/davinci_wdt.c | 22 +- + drivers/watchdog/ep93xx_wdt.c | 30 +- + drivers/watchdog/eurotechwdt.c | 95 +- + drivers/watchdog/geodewdt.c | 96 +- + drivers/watchdog/hpwdt.c | 6 +- + drivers/watchdog/i6300esb.c | 366 +- + drivers/watchdog/iTCO_vendor.h | 15 + + drivers/watchdog/iTCO_vendor_support.c | 62 +- + drivers/watchdog/iTCO_wdt.c | 310 +- + drivers/watchdog/ib700wdt.c | 123 +- + drivers/watchdog/ibmasr.c | 151 +- + drivers/watchdog/indydog.c | 114 +- + drivers/watchdog/iop_wdt.c | 64 +- + drivers/watchdog/it8712f_wdt.c | 6 +- + drivers/watchdog/ixp2000_wdt.c | 63 +- + drivers/watchdog/ixp4xx_wdt.c | 69 +- + drivers/watchdog/ks8695_wdt.c | 122 +- + drivers/watchdog/machzwd.c | 108 +- + drivers/watchdog/mixcomwd.c | 133 +- + drivers/watchdog/mpc5200_wdt.c | 24 +- + drivers/watchdog/mpc83xx_wdt.c | 230 - + drivers/watchdog/mpc8xx_wdt.c | 37 +- + drivers/watchdog/mpc8xxx_wdt.c | 316 + + drivers/watchdog/mpcore_wdt.c | 73 +- + drivers/watchdog/mtx-1_wdt.c | 111 +- + drivers/watchdog/mv64x60_wdt.c | 21 +- + drivers/watchdog/omap_wdt.c | 45 +- + drivers/watchdog/pc87413_wdt.c | 249 +- + drivers/watchdog/pcwd.c | 191 +- + drivers/watchdog/pcwd_pci.c | 161 +- + drivers/watchdog/pcwd_usb.c | 168 +- + drivers/watchdog/pnx4008_wdt.c | 31 +- + drivers/watchdog/rm9k_wdt.c | 34 +- + drivers/watchdog/s3c2410_wdt.c | 17 +- + drivers/watchdog/sa1100_wdt.c | 50 +- + drivers/watchdog/sb_wdog.c | 92 +- + drivers/watchdog/sbc60xxwdt.c | 223 +- + drivers/watchdog/sbc7240_wdt.c | 70 +- + drivers/watchdog/sbc8360.c | 46 +- + drivers/watchdog/sbc_epx_c3.c | 22 +- + drivers/watchdog/sc1200wdt.c | 39 +- + drivers/watchdog/sc520_wdt.c | 162 +- + drivers/watchdog/scx200_wdt.c | 65 +- + drivers/watchdog/shwdt.c | 139 +- + drivers/watchdog/smsc37b787_wdt.c | 448 +- + drivers/watchdog/softdog.c | 87 +- + drivers/watchdog/txx9wdt.c | 37 +- + drivers/watchdog/w83627hf_wdt.c | 190 +- + drivers/watchdog/w83697hf_wdt.c | 189 +- + drivers/watchdog/w83877f_wdt.c | 199 +- + drivers/watchdog/w83977f_wdt.c | 239 +- + drivers/watchdog/wafer5823wdt.c | 132 +- + drivers/watchdog/wd501p.h | 2 +- + drivers/watchdog/wdrtas.c | 105 +- + drivers/watchdog/wdt.c | 4 +- + drivers/watchdog/wdt285.c | 33 +- + drivers/watchdog/wdt977.c | 162 +- + drivers/watchdog/wdt_pci.c | 8 +- + fs/bio.c | 9 +- + fs/cifs/CHANGES | 8 + + fs/cifs/asn1.c | 258 +- + fs/cifs/cifs_debug.c | 53 +- + fs/cifs/cifs_spnego.c | 18 +- + fs/cifs/cifsfs.c | 71 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifspdu.h | 2 +- + fs/cifs/cifsproto.h | 24 +- + fs/cifs/cifssmb.c | 46 +- + fs/cifs/connect.c | 173 +- + fs/cifs/dir.c | 67 +- + fs/cifs/file.c | 19 +- + fs/cifs/inode.c | 419 +- + fs/cifs/transport.c | 1 + + fs/nfsd/nfs4proc.c | 5 +- + include/asm-arm/arch-ep93xx/dma.h | 3 - + include/asm-arm/arch-ep93xx/gesbc9312.h | 3 - + include/asm-arm/arch-ep93xx/timex.h | 5 - + include/asm-arm/arch-ep93xx/vmalloc.h | 5 - + include/asm-arm/arch-iop32x/vmalloc.h | 5 - + include/asm-arm/arch-iop33x/vmalloc.h | 5 - + include/asm-arm/arch-ixp23xx/dma.h | 3 - + include/asm-arm/arch-ixp23xx/time.h | 3 - + include/asm-arm/arch-kirkwood/vmalloc.h | 5 - + include/asm-arm/arch-loki/vmalloc.h | 5 - + include/asm-arm/arch-mv78xx0/vmalloc.h | 5 - + include/asm-arm/arch-orion5x/vmalloc.h | 5 - + include/asm-arm/arch-sa1100/vmalloc.h | 4 - + include/asm-arm/plat-s3c/iic.h | 2 +- + include/asm-arm/plat-s3c/nand.h | 2 +- + include/asm-arm/plat-s3c/regs-ac97.h | 2 +- + include/asm-arm/plat-s3c/regs-adc.h | 2 +- + include/asm-arm/plat-s3c/regs-iic.h | 2 +- + include/asm-arm/plat-s3c/regs-nand.h | 2 +- + include/asm-arm/plat-s3c/regs-rtc.h | 2 +- + include/asm-arm/plat-s3c/regs-serial.h | 2 +- + include/asm-arm/plat-s3c/regs-timer.h | 2 +- + include/asm-arm/plat-s3c/regs-watchdog.h | 2 +- + include/asm-arm/plat-s3c24xx/regs-iis.h | 2 +- + include/asm-arm/plat-s3c24xx/regs-spi.h | 2 +- + include/asm-arm/plat-s3c24xx/regs-udc.h | 2 +- + include/asm-arm/plat-s3c24xx/udc.h | 2 +- + include/linux/dm9000.h | 1 + + include/linux/ethtool.h | 17 +- + include/linux/i2c-pnx.h | 4 +- + include/linux/list.h | 87 +- + include/linux/mlx4/cq.h | 36 +- + include/linux/ptrace.h | 2 +- + include/linux/tracehook.h | 2 +- + include/media/soc_camera.h | 5 + + include/net/request_sock.h | 2 +- + include/net/syncppp.h | 2 - + include/rdma/rdma_cm.h | 8 +- + init/Kconfig | 9 +- + net/bluetooth/bnep/core.c | 15 +- + net/core/dev.c | 35 +- + net/core/pktgen.c | 37 +- + net/dccp/dccp.h | 3 +- + net/dccp/minisocks.c | 3 +- + net/ipv4/esp4.c | 2 +- + net/ipv4/route.c | 12 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/tcp_minisocks.c | 140 +- + net/ipv4/xfrm4_mode_beet.c | 6 +- + net/ipv6/esp6.c | 4 + + net/ipv6/route.c | 2 +- + net/ipv6/tcp_ipv6.c | 8 +- + net/ipv6/xfrm6_mode_beet.c | 27 +- + net/mac80211/main.c | 8 +- + net/mac80211/mesh.h | 5 +- + net/mac80211/mesh_hwmp.c | 19 +- + net/mac80211/mesh_pathtbl.c | 11 +- + net/mac80211/rx.c | 116 +- + net/mac80211/tx.c | 45 +- + net/netfilter/nf_conntrack_core.c | 6 +- + net/netfilter/nf_conntrack_standalone.c | 28 +- + net/sched/act_api.c | 5 +- + net/sched/sch_api.c | 10 +- + net/wanrouter/wanmain.c | 27 - + scripts/patch-kernel | 3 +- + sound/arm/pxa2xx-ac97.c | 8 +- + sound/arm/pxa2xx-pcm.c | 4 +- + sound/arm/sa11xx-uda1341.c | 4 +- + sound/oss/vidc.c | 2 +- + sound/oss/vidc_fill.S | 2 +- + sound/oss/waveartist.c | 2 +- + sound/soc/at32/playpaq_wm8510.c | 4 +- + sound/soc/at91/at91-pcm.c | 4 +- + sound/soc/at91/at91-pcm.h | 2 +- + sound/soc/at91/at91-ssc.c | 6 +- + sound/soc/at91/eti_b1_wm8731.c | 4 +- + sound/soc/davinci/davinci-evm.c | 3 +- + sound/soc/fsl/fsl_dma.c | 235 +- + sound/soc/omap/n810.c | 4 +- + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-pcm.c | 2 +- + sound/soc/pxa/corgi.c | 8 +- + sound/soc/pxa/e800_wm9712.c | 6 +- + sound/soc/pxa/em-x270.c | 6 +- + sound/soc/pxa/poodle.c | 8 +- + sound/soc/pxa/pxa2xx-ac97.c | 8 +- + sound/soc/pxa/pxa2xx-i2s.c | 8 +- + sound/soc/pxa/pxa2xx-pcm.c | 6 +- + sound/soc/pxa/spitz.c | 8 +- + sound/soc/pxa/tosa.c | 8 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 11 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 8 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 10 +- + sound/soc/s3c24xx/s3c24xx-i2s.c | 10 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 6 +- + 2200 files changed, 45037 insertions(+), 13974 deletions(-) + delete mode 100644 arch/arm/include/asm/hardware.h + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/aaec2000.h (99%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/aaed2000.h (96%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/debug-macro.S (93%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/dma.h (84%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/entry-macro.S (91%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/hardware.h (93%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/io.h (83%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/memory.h (93%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/system.h (90%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/timex.h (89%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/uncompress.h (94%) + rename {include/asm-arm/arch-aaec2000 => arch/arm/mach-aaec2000/include/mach}/vmalloc.h (88%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_adc.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_aic.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_dbgu.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_mci.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_pio.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_pit.h (95%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_pmc.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_rstc.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_rtc.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_rtt.h (96%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_shdwc.h (96%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_spi.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_ssc.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_st.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_tc.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_twi.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91_wdt.h (96%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91cap9.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91cap9_ddrsdr.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91cap9_matrix.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91rm9200.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91rm9200_emac.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91rm9200_mc.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9260.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9260_matrix.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9261.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9261_matrix.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9263.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9263_matrix.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9_sdramc.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9_smc.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9rl.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91sam9rl_matrix.h (98%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/at91x40.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/board.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/cpu.h (96%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/debug-macro.S (90%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/entry-macro.S (90%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/gpio.h (99%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/hardware.h (89%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/io.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/irqs.h (95%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/memory.h (94%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/system.h (91%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/timex.h (96%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/uncompress.h (97%) + rename {include/asm-arm/arch-at91 => arch/arm/mach-at91/include/mach}/vmalloc.h (95%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/autcpu12.h (100%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/debug-macro.S (94%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/entry-macro.S (94%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/hardware.h (99%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/io.h (94%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/irqs.h (96%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/memory.h (98%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/syspld.h (98%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/system.h (93%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/time.h (96%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/uncompress.h (93%) + rename {include/asm-arm/arch-clps711x => arch/arm/mach-clps711x/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/acornfb.h (100%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/debug-macro.S (90%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/dma.h (90%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/hardware.h (95%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/io.h (98%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/irq.h (93%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/irqs.h (96%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/memory.h (94%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/system.h (87%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/timex.h (79%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/uncompress.h (93%) + rename {include/asm-arm/arch-cl7500 => arch/arm/mach-clps7500/include/mach}/vmalloc.h (55%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/clock.h (92%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/common.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/debug-macro.S (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/gpio.h (99%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/hardware.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/i2c.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/io.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/irqs.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/memory.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/mux.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/psc.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/serial.h (95%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/system.h (95%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/timex.h (100%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-davinci => arch/arm/mach-davinci/include/mach}/vmalloc.h (95%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/debug-macro.S (90%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/dma.h (85%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/hardware.h (97%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/io.h (98%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/irqs.h (91%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/memory.h (94%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/system.h (95%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/timex.h (90%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/uncompress.h (94%) + rename {include/asm-arm/arch-ebsa110 => arch/arm/mach-ebsa110/include/mach}/vmalloc.h (85%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/debug-macro.S (87%) + create mode 100644 arch/arm/mach-ep93xx/include/mach/dma.h + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/ep93xx-regs.h (98%) + create mode 100644 arch/arm/mach-ep93xx/include/mach/gesbc9312.h + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/gpio.h (99%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/hardware.h (54%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/io.h (72%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/memory.h (81%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/platform.h (85%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/system.h (85%) + create mode 100644 arch/arm/mach-ep93xx/include/mach/timex.h + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/ts72xx.h (98%) + rename {include/asm-arm/arch-ep93xx => arch/arm/mach-ep93xx/include/mach}/uncompress.h (95%) + create mode 100644 arch/arm/mach-ep93xx/include/mach/vmalloc.h + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/debug-macro.S (95%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/dma.h (91%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/entry-macro.S (95%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/hardware.h (97%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/io.h (91%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/system.h (95%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/timex.h (90%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/uncompress.h (93%) + rename {include/asm-arm/arch-ebsa285 => arch/arm/mach-footbridge/include/mach}/vmalloc.h (82%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/boards.h (96%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/debug-macro.S (95%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/dma.h (92%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/entry-macro.S (97%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/h7201-regs.h (97%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/h7202-regs.h (98%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/hardware.h (99%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/io.h (74%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/memory.h (93%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/system.h (83%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/timex.h (88%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/uncompress.h (87%) + rename {include/asm-arm/arch-h720x => arch/arm/mach-h720x/include/mach}/vmalloc.h (73%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/debug-macro.S (94%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/entry-macro.S (91%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/gpio.h (98%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/hardware.h (98%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/imx-dma.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/imx-regs.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/imx-uart.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/imxfb.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/io.h (92%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/mmc.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/mx1ads.h (96%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/spi_imx.h (95%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/system.h (95%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/timex.h (100%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/uncompress.h (97%) + rename {include/asm-arm/arch-imx => arch/arm/mach-imx/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/bits.h (100%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/cm.h (100%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/debug-macro.S (91%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/entry-macro.S (90%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/hardware.h (94%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/impd1.h (100%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/io.h (96%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/lm.h (100%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/platform.h (100%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/system.h (93%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-integrator => arch/arm/mach-integrator/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/adma.h (99%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/entry-macro.S (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/hardware.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/io.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/iop13xx.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/iq81340.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/irqs.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/memory.h (98%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/msi.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/pci.h (98%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/system.h (87%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/time.h (100%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/timex.h (57%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/uncompress.h (93%) + rename {include/asm-arm/arch-iop13xx => arch/arm/mach-iop13xx/include/mach}/vmalloc.h (100%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/adma.h (100%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/debug-macro.S (91%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/dma.h (84%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/glantank.h (75%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/gpio.h (100%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/hardware.h (94%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/io.h (90%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/iop32x.h (95%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/iq31244.h (89%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/iq80321.h (89%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/irqs.h (96%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/memory.h (87%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/n2100.h (89%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/system.h (93%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/time.h (100%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/timex.h (56%) + rename {include/asm-arm/arch-iop32x => arch/arm/mach-iop32x/include/mach}/uncompress.h (90%) + create mode 100644 arch/arm/mach-iop32x/include/mach/vmalloc.h + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/adma.h (100%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/dma.h (84%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/gpio.h (100%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/hardware.h (94%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/io.h (90%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/iop33x.h (96%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/iq80331.h (87%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/iq80332.h (87%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/memory.h (87%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/system.h (90%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/time.h (100%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/timex.h (56%) + rename {include/asm-arm/arch-iop33x => arch/arm/mach-iop33x/include/mach}/uncompress.h (89%) + create mode 100644 arch/arm/mach-iop33x/include/mach/vmalloc.h + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/dma.h (84%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/enp2611.h (96%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/entry-macro.S (94%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/gpio.h (96%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/hardware.h (95%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/io.h (98%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/ixdp2x00.h (98%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/ixdp2x01.h (97%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/ixp2000-regs.h (99%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/memory.h (91%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/platform.h (98%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/system.h (94%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/timex.h (78%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-ixp2000 => arch/arm/mach-ixp2000/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/debug-macro.S (88%) + create mode 100644 arch/arm/mach-ixp23xx/include/mach/dma.h + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/hardware.h (93%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/io.h (96%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/ixdp2351.h (98%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/ixp23xx.h (99%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/memory.h (92%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/platform.h (96%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/system.h (90%) + create mode 100644 arch/arm/mach-ixp23xx/include/mach/time.h + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/timex.h (65%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/uncompress.h (89%) + rename {include/asm-arm/arch-ixp23xx => arch/arm/mach-ixp23xx/include/mach}/vmalloc.h (79%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/avila.h (87%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/coyote.h (87%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/cpu.h (96%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/debug-macro.S (93%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/dma.h (86%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/dsmg600.h (93%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/fsg.h (90%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/gpio.h (96%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/gtwx5715.h (96%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/hardware.h (93%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/io.h (99%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/ixdp425.h (87%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/ixp4xx-regs.h (99%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/memory.h (95%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/nas100d.h (90%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/npe.h (100%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/nslu2.h (90%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/platform.h (97%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/prpmc1100.h (86%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/qmgr.h (100%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/system.h (91%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/timex.h (82%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/udc.h (72%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-ixp4xx => arch/arm/mach-ixp4xx/include/mach}/vmalloc.h (50%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/debug-macro.S (84%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/hardware.h (90%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/io.h (92%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/kirkwood.h (98%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/memory.h (80%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-kirkwood/include/mach}/system.h (84%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-kirkwood/include/mach}/timex.h (85%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-kirkwood/include/mach}/uncompress.h (91%) + create mode 100644 arch/arm/mach-kirkwood/include/mach/vmalloc.h + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/debug-macro.S (89%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/devices.h (94%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/entry-macro.S (91%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/gpio.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/hardware.h (95%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/io.h (90%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/memory.h (94%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-gpio.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-hpna.h (91%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-irq.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-lan.h (98%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-mem.h (98%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-misc.h (98%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-pci.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-switch.h (97%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-sys.h (95%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-timer.h (95%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-uart.h (98%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/regs-wan.h (98%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/system.h (92%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/timex.h (90%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/uncompress.h (90%) + rename {include/asm-arm/arch-ks8695 => arch/arm/mach-ks8695/include/mach}/vmalloc.h (90%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/aux_reg.h (88%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/debug-macro.S (95%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/dma.h (91%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/entry-macro.S (91%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/gp_timers.h (92%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/gpio.h (98%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/hardware.h (97%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/io.h (75%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/memory.h (93%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/pmpcon.h (96%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/pmu.h (99%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/serial.h (95%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/serial_l7200.h (97%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/sib.h (99%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/sys-clock.h (97%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/system.h (87%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/time.h (96%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/timex.h (91%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/uncompress.h (91%) + rename {include/asm-arm/arch-l7200 => arch/arm/mach-l7200/include/mach}/vmalloc.h (56%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/clocks.h (90%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/constants.h (98%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/debug-macro.S (95%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/dma.h (98%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/entry-macro.S (97%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/hardware.h (93%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/io.h (87%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/memory.h (97%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/registers.h (99%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/ssp.h (100%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/system.h (88%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/timex.h (82%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/uncompress.h (91%) + rename {include/asm-arm/arch-lh7a40x => arch/arm/mach-lh7a40x/include/mach}/vmalloc.h (86%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/debug-macro.S (85%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/entry-macro.S (90%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/hardware.h (86%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/io.h (92%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/loki.h (98%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/memory.h (81%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/system.h (85%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/timex.h (86%) + rename {include/asm-arm/arch-loki => arch/arm/mach-loki/include/mach}/uncompress.h (91%) + create mode 100644 arch/arm/mach-loki/include/mach/vmalloc.h + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/board.h (95%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/debug-macro.S (89%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/dma.h (98%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/hardware.h (92%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/io.h (95%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/memory.h (94%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/msm_iomap.h (98%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/system.h (89%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/timex.h (93%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/uncompress.h (93%) + rename {include/asm-arm/arch-msm => arch/arm/mach-msm/include/mach}/vmalloc.h (93%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/debug-macro.S (84%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/hardware.h (90%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/io.h (92%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/memory.h (80%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/mv78xx0.h (98%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-mv78xx0/include/mach}/system.h (84%) + rename {include/asm-arm/arch-mv78xx0 => arch/arm/mach-mv78xx0/include/mach}/timex.h (83%) + rename {include/asm-arm/arch-kirkwood => arch/arm/mach-mv78xx0/include/mach}/uncompress.h (91%) + create mode 100644 arch/arm/mach-mv78xx0/include/mach/vmalloc.h + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/debug-macro.S (94%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/entry-macro.S (93%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/eth.h (95%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/hardware.h (96%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/io.h (95%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/netx-regs.h (99%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/param.h (94%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/pfifo.h (96%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/system.h (93%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/uncompress.h (97%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-netx => arch/arm/mach-netx/include/mach}/xc.h (96%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/board.h (95%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/debug-macro.S (80%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/dma.h (89%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/entry-macro.S (83%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/gpio.h (95%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/hardware.h (97%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/io.h (92%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/irqs.h (98%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/memory.h (93%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/module.h (96%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/processor-ns9360.h (93%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/processor.h (92%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/regs-bbu.h (95%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/regs-board-a9m9750dev.h (89%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/regs-mem.h (98%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/regs-sys-common.h (90%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/regs-sys-ns9360.h (98%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/system.h (84%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/timex.h (77%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/uncompress.h (98%) + rename {include/asm-arm/arch-ns9xxx => arch/arm/mach-ns9xxx/include/mach}/vmalloc.h (89%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/debug-macro.S (85%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/entry-macro.S (90%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/gpio.h (94%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/hardware.h (90%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/io.h (97%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/irqs.h (97%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/memory.h (83%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/orion5x.h (99%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/system.h (83%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/timex.h (87%) + rename {include/asm-arm/arch-orion5x => arch/arm/mach-orion5x/include/mach}/uncompress.h (91%) + create mode 100644 arch/arm/mach-orion5x/include/mach/vmalloc.h + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/clock.h (97%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/debug-macro.S (91%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/dma.h (98%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/entry-macro.S (98%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/gpio.h (99%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/hardware.h (93%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/i2c.h (97%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/io.h (91%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/irq.h (97%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/memory.h (92%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/param.h (94%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/platform.h (98%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/pm.h (95%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/system.h (90%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/timex.h (96%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/uncompress.h (95%) + rename {include/asm-arm/arch-pnx4008 => arch/arm/mach-pnx4008/include/mach}/vmalloc.h (93%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/akita.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/audio.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/bitfield.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/camera.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/colibri.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/corgi.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/dma.h (96%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/eseries-gpio.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/eseries-irq.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/gpio.h (94%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/gumstix.h (98%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/hardware.h (97%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/i2c.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/idp.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/io.h (84%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/irda.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/littleton.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/lpd270.h (96%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/lubbock.h (96%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/magician.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mainstone.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/memory.h (97%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa25x.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa27x.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa2xx.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa300.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa320.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa3xx.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp-pxa930.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mfp.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mmc.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/mtd-xip.h (97%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/ohci.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/palmtx.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pcm027.h (98%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pcm990_baseboard.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pm.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/poodle.h (96%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa-regs.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa25x-udc.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa27x-udc.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa27x_keypad.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa2xx-gpio.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa2xx-regs.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa2xx_spi.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa3xx-regs.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxa3xx_nand.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/pxafb.h (98%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/regs-lcd.h (99%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/regs-ssp.h (100%) + create mode 100644 arch/arm/mach-pxa/include/mach/reset.h + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/sharpsl.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/spitz.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/ssp.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/system.h (91%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/timex.h (93%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/tosa.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/tosa_bt.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/trizeps4.h (100%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/udc.h (73%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/uncompress.h (91%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/vmalloc.h (87%) + rename {include/asm-arm/arch-pxa => arch/arm/mach-pxa/include/mach}/zylonite.h (100%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/board-eb.h (99%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/board-pb1176.h (98%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/board-pb11mp.h (99%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/debug-macro.S (91%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/entry-macro.S (96%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/hardware.h (95%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/io.h (95%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/irqs.h (87%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/platform.h (99%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/scu.h (100%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/smp.h (100%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/system.h (92%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/uncompress.h (90%) + rename {include/asm-arm/arch-realview => arch/arm/mach-realview/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/acornfb.h (98%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/hardware.h (96%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/io.h (99%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/irqs.h (95%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/memory.h (95%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/system.h (86%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/timex.h (89%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/uncompress.h (98%) + rename {include/asm-arm/arch-rpc => arch/arm/mach-rpc/include/mach}/vmalloc.h (86%) + rename {include/asm-arm/arch-s3c2400 => arch/arm/mach-s3c2400/include/mach}/map.h (98%) + rename {include/asm-arm/arch-s3c2400 => arch/arm/mach-s3c2400/include/mach}/memory.h (84%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/anubis-cpld.h (92%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/anubis-irq.h (91%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/anubis-map.h (95%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/audio.h (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/bast-cpld.h (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/bast-irq.h (94%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/bast-map.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/bast-pmu.h (95%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/debug-macro.S (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/dma.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/entry-macro.S (95%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/fb.h (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/gpio.h (91%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/h1940-latch.h (97%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/h1940.h (91%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/hardware.h (94%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/idle.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/io.h (98%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/leds-gpio.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/map.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/memory.h (81%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/osiris-cpld.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/osiris-map.h (95%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/otom-map.h (94%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-clock.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-dsc.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-gpio.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-gpioj.h (98%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-irq.h (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-lcd.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-mem.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-power.h (96%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-s3c2412-mem.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-s3c2412.h (92%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-s3c2443-clock.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/regs-sdi.h (99%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/reset.h (92%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/spi-gpio.h (92%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/spi.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/system-reset.h (92%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/system.h (84%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/timex.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/uncompress.h (91%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/usb-control.h (87%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/vmalloc.h (82%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/vr1000-cpld.h (90%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/vr1000-irq.h (93%) + rename {include/asm-arm/arch-s3c2410 => arch/arm/mach-s3c2410/include/mach}/vr1000-map.h (97%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/SA-1100.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/SA-1101.h (99%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/SA-1111.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/assabet.h (98%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/badge4.h (96%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/bitfield.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/cerf.h (94%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/collie.h (98%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/debug-macro.S (90%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/dma.h (98%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/entry-macro.S (95%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/gpio.h (95%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/h3600.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/h3600_gpio.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/hardware.h (96%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/ide.h (96%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/io.h (92%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/jornada720.h (93%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/lart.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/mcp.h (90%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/memory.h (97%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/mtd-xip.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/neponset.h (98%) + create mode 100644 arch/arm/mach-sa1100/include/mach/reset.h + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/shannon.h (100%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/simpad.h (98%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/system.h (80%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/timex.h (75%) + rename {include/asm-arm/arch-sa1100 => arch/arm/mach-sa1100/include/mach}/uncompress.h (95%) + create mode 100644 arch/arm/mach-sa1100/include/mach/vmalloc.h + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/debug-macro.S (92%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/dma.h (88%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/entry-macro.S (95%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/hardware.h (89%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/io.h (91%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/irqs.h (81%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/memory.h (90%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/system.h (89%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/timex.h (60%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/uncompress.h (85%) + rename {include/asm-arm/arch-shark => arch/arm/mach-shark/include/mach}/vmalloc.h (56%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/debug-macro.S (91%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/dma.h (94%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/hardware.h (95%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/io.h (95%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/platform.h (99%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/system.h (92%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-versatile => arch/arm/mach-versatile/include/mach}/vmalloc.h (94%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/board-mx27ads.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/board-mx31ads.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/board-mx31lite.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/board-pcm037.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/board-pcm038.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/clock.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/common.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/debug-macro.S (77%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/dma.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/entry-macro.S (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/gpio.h (98%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/hardware.h (92%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/iim.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/imx-uart.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/io.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/iomux-mx1-mx2.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/iomux-mx3.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/irqs.h (93%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/mx27.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/mx31.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/mxc.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/mxc_timer.h (99%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/system.h (100%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/timex.h (94%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/uncompress.h (96%) + rename {include/asm-arm/arch-mxc => arch/arm/plat-mxc/include/mach}/vmalloc.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/aic23.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/blizzard.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-2430sdp.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-ams-delta.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-apollon.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-fsample.h (94%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-h2.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-h3.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-h4.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-innovator.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-nokia.h (94%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-osk.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-palmte.h (94%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-palmtt.h (92%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-palmz71.h (93%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-perseus2.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-sx1.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board-voiceblue.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/board.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/clock.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/common.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/control.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/cpu.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/debug-macro.S (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/dma.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/dmtimer.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/dsp_common.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/eac.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/entry-macro.S (92%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/fpga.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/gpio-switch.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/gpio.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/gpioexpander.h (94%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/gpmc.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/hardware.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/hwa742.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/io.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/irda.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/irqs.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/keypad.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/lcd_mipid.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/led.h (92%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mailbox.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mcbsp.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mcspi.h (100%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/memory.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/menelaus.h (96%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mmc.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mtd-xip.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/mux.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/nand.h (93%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap-alsa.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap1510.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap16xx.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap24xx.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap34xx.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omap730.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/omapfb.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/onenand.h (91%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/param.h (66%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/pm.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/prcm.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/sdrc.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/serial.h (95%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/sram.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/system.h (91%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/tc.h (98%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/timex.h (97%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/uncompress.h (92%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/usb.h (99%) + rename {include/asm-arm/arch-omap => arch/arm/plat-omap/include/mach}/vmalloc.h (94%) + rename {include/asm-avr32 => arch/avr32/include/asm}/Kbuild (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/a.out.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/addrspace.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/asm.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/atmel-mci.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/atomic.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/auxvec.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/bitops.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/bug.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/bugs.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/byteorder.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/cache.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/cachectl.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/cacheflush.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/checksum.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/cputime.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/current.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/delay.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/device.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/div64.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/dma-mapping.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/dma.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/elf.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/emergency-restart.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/errno.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/fb.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/fcntl.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/futex.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/gpio.h (76%) + rename {include/asm-avr32 => arch/avr32/include/asm}/hardirq.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/hw_irq.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/io.h (99%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ioctl.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ioctls.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ipcbuf.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/irq.h (94%) + rename {include/asm-avr32 => arch/avr32/include/asm}/irq_regs.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/irqflags.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/kdebug.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/kmap_types.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/kprobes.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/linkage.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/local.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/mach/serial_at91.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/mman.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/mmu.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/mmu_context.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/module.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/msgbuf.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/mutex.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/numnodes.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ocd.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/page.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/param.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/pci.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/percpu.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/pgalloc.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/pgtable-2level.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/pgtable.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/poll.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/posix_types.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/processor.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ptrace.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/resource.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/scatterlist.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/sections.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/sembuf.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/serial.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/setup.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/shmbuf.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/shmparam.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/sigcontext.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/siginfo.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/signal.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/socket.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/sockios.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/stat.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/statfs.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/string.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/sysreg.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/system.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/termbits.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/termios.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/thread_info.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/timex.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/tlb.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/tlbflush.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/topology.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/traps.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/types.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/uaccess.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/ucontext.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/unaligned.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/unistd.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/user.h (100%) + rename {include/asm-avr32 => arch/avr32/include/asm}/xor.h (100%) + create mode 100644 arch/avr32/mach-at32ap/include/mach/at32ap700x.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/board.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/cpu.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/gpio.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/init.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/io.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/irq.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/pm.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/portmux.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/smc.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/sram.h + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/Kbuild (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/MC68328.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/MC68332.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/MC68EZ328.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/MC68VZ328.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/a.out.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/anchor.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/atomic.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/auxvec.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/bitops.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/bootinfo.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/bootstd.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/bug.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/bugs.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/byteorder.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/cache.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/cachectl.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/cacheflush.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/checksum.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/coldfire.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/commproc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/cputime.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/current.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/dbg.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/delay.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/device.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/div64.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/dma-mapping.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/dma.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/elf.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/elia.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/emergency-restart.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/entry.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/errno.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/fb.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/fcntl.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/flat.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/fpu.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/futex.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/hardirq.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/hw_irq.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/hwtest.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/io.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/ioctl.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/ioctls.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/ipcbuf.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/irq.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/irq_regs.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/kdebug.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/kmap_types.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/linkage.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/local.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m5206sim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m520xsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m523xsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m5249sim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m5272sim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m527xsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m528xsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m5307sim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m532xsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m5407sim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m68360.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m68360_enet.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m68360_pram.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m68360_quicc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/m68360_regs.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/machdep.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/math-emu.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mc146818rtc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfcache.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfdma.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfmbus.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfne.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfpci.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfpit.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfsim.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfsmc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcftimer.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfuart.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mcfwdebug.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/md.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mman.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mmu.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mmu_context.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/module.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/movs.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/msgbuf.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/mutex.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/nettel.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/openprom.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/oplib.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/page.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/page_offset.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/param.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/pci.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/percpu.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/pgalloc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/pgtable.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/poll.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/posix_types.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/processor.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/ptrace.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/quicc_simple.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/resource.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/rtc.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/scatterlist.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/sections.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/segment.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/sembuf.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/setup.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/shm.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/shmbuf.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/shmparam.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/sigcontext.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/siginfo.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/signal.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/smp.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/socket.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/sockios.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/spinlock.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/stat.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/statfs.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/string.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/system.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/termbits.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/termios.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/thread_info.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/timex.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/tlb.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/tlbflush.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/topology.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/traps.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/types.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/uaccess.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/ucontext.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/unaligned.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/unistd.h (100%) + rename {include/asm-m68knommu => arch/m68knommu/include/asm}/user.h (100%) + delete mode 100644 arch/powerpc/.gitignore + create mode 100644 arch/sh/include/asm/sh_eth.h + delete mode 100644 drivers/char/viocons.c + create mode 100644 drivers/hwmon/ad7414.c + create mode 100644 drivers/net/wireless/ath9k/Kconfig + create mode 100644 drivers/net/wireless/ath9k/Makefile + create mode 100644 drivers/net/wireless/ath9k/ath9k.h + create mode 100644 drivers/net/wireless/ath9k/beacon.c + create mode 100644 drivers/net/wireless/ath9k/core.c + create mode 100644 drivers/net/wireless/ath9k/core.h + create mode 100644 drivers/net/wireless/ath9k/hw.c + create mode 100644 drivers/net/wireless/ath9k/hw.h + create mode 100644 drivers/net/wireless/ath9k/initvals.h + create mode 100644 drivers/net/wireless/ath9k/main.c + create mode 100644 drivers/net/wireless/ath9k/phy.c + create mode 100644 drivers/net/wireless/ath9k/phy.h + create mode 100644 drivers/net/wireless/ath9k/rc.c + create mode 100644 drivers/net/wireless/ath9k/rc.h + create mode 100644 drivers/net/wireless/ath9k/recv.c + create mode 100644 drivers/net/wireless/ath9k/reg.h + create mode 100644 drivers/net/wireless/ath9k/regd.c + create mode 100644 drivers/net/wireless/ath9k/regd.h + create mode 100644 drivers/net/wireless/ath9k/regd_common.h + create mode 100644 drivers/net/wireless/ath9k/xmit.c + create mode 100644 drivers/watchdog/iTCO_vendor.h + delete mode 100644 drivers/watchdog/mpc83xx_wdt.c + create mode 100644 drivers/watchdog/mpc8xxx_wdt.c + delete mode 100644 include/asm-arm/arch-ep93xx/dma.h + delete mode 100644 include/asm-arm/arch-ep93xx/gesbc9312.h + delete mode 100644 include/asm-arm/arch-ep93xx/timex.h + delete mode 100644 include/asm-arm/arch-ep93xx/vmalloc.h + delete mode 100644 include/asm-arm/arch-iop32x/vmalloc.h + delete mode 100644 include/asm-arm/arch-iop33x/vmalloc.h + delete mode 100644 include/asm-arm/arch-ixp23xx/dma.h + delete mode 100644 include/asm-arm/arch-ixp23xx/time.h + delete mode 100644 include/asm-arm/arch-kirkwood/vmalloc.h + delete mode 100644 include/asm-arm/arch-loki/vmalloc.h + delete mode 100644 include/asm-arm/arch-mv78xx0/vmalloc.h + delete mode 100644 include/asm-arm/arch-orion5x/vmalloc.h + delete mode 100644 include/asm-arm/arch-sa1100/vmalloc.h +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + include/scsi/scsi_device.h | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + net/sched/sch_api.c | 36 +++++++++++++++++++++++------------- + 1 files changed, 23 insertions(+), 13 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + Documentation/arm/Samsung-S3C24XX/GPIO.txt | 15 ++ + Documentation/arm/Samsung-S3C24XX/Overview.txt | 35 +++- + arch/arm/common/dmabounce.c | 56 +++--- + arch/arm/configs/orion5x_defconfig | 13 +- + arch/arm/include/asm/dma-mapping.h | 86 ++++++-- + arch/arm/include/asm/memory.h | 22 +-- + arch/arm/kernel/setup.c | 13 + + arch/arm/mach-footbridge/cats-pci.c | 3 + + arch/arm/mach-kirkwood/common.c | 247 +++++++++++++++++++- + arch/arm/mach-kirkwood/common.h | 3 + + arch/arm/mach-kirkwood/include/mach/kirkwood.h | 9 + + arch/arm/mach-kirkwood/irq.c | 2 +- + arch/arm/mach-kirkwood/pcie.c | 2 +- + arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 23 ++ + arch/arm/mach-kirkwood/rd88f6281-setup.c | 2 +- + arch/arm/mach-loki/common.c | 4 +- + arch/arm/mach-loki/irq.c | 2 +- + arch/arm/mach-mv78xx0/common.c | 8 +- + arch/arm/mach-mv78xx0/irq.c | 2 +- + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-orion5x/common.c | 115 +++++++++- + arch/arm/mach-orion5x/common.h | 1 + + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- + arch/arm/mach-orion5x/include/mach/orion5x.h | 5 + + arch/arm/mach-orion5x/irq.c | 2 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 3 +- + arch/arm/mach-orion5x/mss2-setup.c | 1 + + arch/arm/mach-orion5x/mv2120-setup.c | 1 + + arch/arm/mach-orion5x/pci.c | 2 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 1 + + arch/arm/mach-orion5x/ts209-setup.c | 5 +- + arch/arm/mach-orion5x/ts409-setup.c | 48 ++++ + arch/arm/mach-orion5x/ts78xx-setup.c | 1 + + arch/arm/mach-s3c2410/mach-bast.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- + arch/arm/mach-s3c2412/mach-jive.c | 3 - + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 2 +- + arch/arm/mm/cache-feroceon-l2.c | 2 +- + arch/arm/mm/mmu.c | 50 ++++ + arch/arm/plat-omap/include/mach/memory.h | 15 +- + .../plat-orion/include/plat}/cache-feroceon-l2.h | 2 +- + .../arm/plat-orion/include/plat}/ehci-orion.h | 6 +- + .../arm/plat-orion/include/plat}/irq.h | 6 +- + .../arm/plat-orion/include/plat}/mv_xor.h | 6 +- + .../arm/plat-orion/include/plat}/orion_nand.h | 6 +- + .../arm/plat-orion/include/plat}/pcie.h | 6 +- + .../arm/plat-orion/include/plat}/time.h | 6 +- + arch/arm/plat-orion/irq.c | 2 +- + arch/arm/plat-orion/pcie.c | 2 +- + arch/arm/plat-s3c24xx/cpu.c | 4 +- + drivers/dma/mv_xor.c | 2 +- + drivers/mtd/nand/orion_nand.c | 2 +- + drivers/serial/Kconfig | 1 + + drivers/usb/host/ehci-orion.c | 2 +- + drivers/watchdog/at91rm9200_wdt.c | 4 +- + drivers/watchdog/ixp4xx_wdt.c | 2 +- + drivers/watchdog/s3c2410_wdt.c | 2 - + drivers/watchdog/wdt285.c | 2 +- + include/asm-arm/plat-s3c24xx/s3c2410.h | 4 +- + 60 files changed, 745 insertions(+), 136 deletions(-) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/cache-feroceon-l2.h (84%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/ehci-orion.h (71%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/irq.h (76%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/mv_xor.h (82%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/orion_nand.h (79%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/pcie.h (91%) + rename {include/asm-arm/plat-orion => arch/arm/plat-orion/include/plat}/time.h (75%) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/msi.c | 5 +-- + drivers/pci/pci.c | 3 +- + drivers/pci/probe.c | 54 +++++++++++++++++++++++++++++++++-------------- + drivers/pci/quirks.c | 7 +++++- + include/linux/pci.h | 11 ++++++--- + include/linux/pci_ids.h | 2 - + kernel/dma-coherent.c | 10 ++++---- + 7 files changed, 60 insertions(+), 32 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Auto-merged drivers/net/wan/cosa.c +Merge made by recursive. + Documentation/ja_JP/SubmitChecklist | 111 ++++++++++++++++++++++++++ + Documentation/kobject.txt | 4 + + arch/mips/kernel/rtlx.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/msr.c | 4 +- + block/bsg.c | 3 +- + drivers/base/class.c | 11 +++ + drivers/base/core.c | 36 ++++++--- + drivers/base/driver.c | 3 - + drivers/base/power/main.c | 19 +--- + drivers/base/power/power.h | 9 ++- + drivers/block/aoe/aoechr.c | 6 +- + drivers/block/paride/pg.c | 5 +- + drivers/block/paride/pt.c | 10 +-- + drivers/block/pktcdvd.c | 5 +- + drivers/char/bsr.c | 5 +- + drivers/char/dsp56k.c | 4 +- + drivers/char/ip2/ip2main.c | 12 ++-- + drivers/char/ipmi/ipmi_devintf.c | 2 +- + drivers/char/istallion.c | 5 +- + drivers/char/lp.c | 4 +- + drivers/char/mem.c | 6 +- + drivers/char/misc.c | 4 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 3 +- + drivers/char/ppdev.c | 5 +- + drivers/char/raw.c | 7 +- + drivers/char/snsc.c | 4 +- + drivers/char/stallion.c | 4 +- + drivers/char/tty_io.c | 12 +-- + drivers/char/vc_screen.c | 12 ++-- + drivers/char/viotape.c | 8 +- + drivers/char/vt.c | 14 ++-- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 3 +- + drivers/dca/dca-sysfs.c | 8 +- + drivers/hid/hidraw.c | 5 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/i2c/i2c-dev.c | 6 +- + drivers/ide/ide-probe.c | 4 +- + drivers/ide/ide-tape.c | 11 +-- + drivers/ieee1394/dv1394.c | 8 +- + drivers/ieee1394/raw1394.c | 8 +- + drivers/ieee1394/video1394.c | 5 +- + drivers/infiniband/core/cm.c | 6 +- + drivers/infiniband/core/user_mad.c | 12 ++-- + drivers/infiniband/core/uverbs_main.c | 9 +-- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/isdn/capi/capi.c | 3 +- + drivers/leds/led-class.c | 4 +- + drivers/macintosh/adb.c | 3 +- + drivers/media/dvb/dvb-core/dvbdev.c | 2 +- + drivers/misc/phantom.c | 6 +- + drivers/mtd/mtdchar.c | 10 +-- + drivers/net/ppp_generic.c | 4 +- + drivers/net/wan/cosa.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 6 +- + drivers/power/power_supply_core.c | 4 +- + drivers/s390/char/raw3270.c | 14 ++-- + drivers/s390/char/tape_class.c | 6 +- + drivers/s390/char/vmlogrdr.c | 8 +- + drivers/s390/char/vmur.c | 5 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/dpt_i2o.c | 2 +- + drivers/scsi/osst.c | 3 +- + drivers/scsi/sg.c | 10 +-- + drivers/scsi/st.c | 11 +-- + drivers/spi/spidev.c | 7 +- + drivers/uio/uio.c | 6 +- + drivers/usb/core/devio.c | 6 +- + drivers/usb/core/file.c | 6 +- + drivers/usb/core/hcd.c | 5 +- + drivers/usb/gadget/printer.c | 4 +- + drivers/usb/misc/phidgetkit.c | 5 +- + drivers/usb/misc/phidgetmotorcontrol.c | 5 +- + drivers/usb/misc/phidgetservo.c | 5 +- + drivers/usb/mon/mon_bin.c | 6 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/display/display-sysfs.c | 9 +-- + drivers/video/fbmem.c | 5 +- + fs/coda/psdev.c | 5 +- + include/linux/device.h | 6 +- + include/linux/sysfs.h | 4 +- + lib/kobject.c | 21 ++---- + sound/core/init.c | 6 +- + sound/core/sound.c | 5 +- + sound/oss/soundcard.c | 15 ++-- + sound/sound_core.c | 5 +- + 88 files changed, 385 insertions(+), 307 deletions(-) + create mode 100644 Documentation/ja_JP/SubmitChecklist +Merging quilt/usb.current +$ git merge quilt/usb.current +Removed Documentation/usb/auerswald.txt +Auto-merged MAINTAINERS +Auto-merged arch/arm/mach-omap2/usb-tusb6010.c +Auto-merged drivers/i2c/chips/isp1301_omap.c +Auto-merged drivers/usb/gadget/omap_udc.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/omap_udc.c +Auto-merged drivers/usb/host/ohci-omap.c +Removed drivers/usb/misc/auerswald.c +Resolved 'drivers/usb/gadget/omap_udc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 1e21ca3: Merge branch 'quilt/usb.current' +$ git diff -M --stat --summary HEAD^.. + Documentation/devices.txt | 3 - + Documentation/ioctl-number.txt | 1 - + Documentation/usb/auerswald.txt | 30 - + Documentation/usb/power-management.txt | 7 +- + MAINTAINERS | 12 +- + arch/arm/mach-omap2/usb-tusb6010.c | 1 - + drivers/Makefile | 1 + + drivers/block/ub.c | 3 - + drivers/i2c/chips/isp1301_omap.c | 2 +- + drivers/usb/Kconfig | 6 +- + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/class/cdc-acm.c | 86 +- + drivers/usb/class/cdc-acm.h | 3 +- + drivers/usb/class/usblp.c | 18 +- + drivers/usb/core/driver.c | 5 +- + drivers/usb/core/message.c | 2 +- + drivers/usb/core/urb.c | 95 ++- + drivers/usb/gadget/Kconfig | 10 + + drivers/usb/gadget/dummy_hcd.c | 5 +- + drivers/usb/gadget/f_acm.c | 196 +++- + drivers/usb/gadget/f_ecm.c | 2 - + drivers/usb/gadget/f_rndis.c | 2 - + drivers/usb/gadget/f_serial.c | 2 - + drivers/usb/gadget/f_subset.c | 2 - + drivers/usb/gadget/gadget_chips.h | 6 + + drivers/usb/gadget/omap_udc.c | 5 +- + drivers/usb/gadget/u_serial.c | 290 +++-- + drivers/usb/gadget/u_serial.h | 12 +- + drivers/usb/host/isp1760-hcd.c | 53 +- + drivers/usb/host/isp1760-hcd.h | 5 + + drivers/usb/host/ohci-hcd.c | 23 +- + drivers/usb/host/ohci-hub.c | 11 +- + drivers/usb/host/ohci-omap.c | 3 +- + drivers/usb/host/ohci-pci.c | 132 ++ + drivers/usb/host/ohci-q.c | 6 + + drivers/usb/host/ohci.h | 11 + + drivers/usb/host/r8a66597-hcd.c | 49 +- + drivers/usb/misc/Kconfig | 10 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/auerswald.c | 2152 ------------------------------ + drivers/usb/musb/Kconfig | 176 +++ + drivers/usb/musb/Makefile | 86 ++ + drivers/usb/musb/cppi_dma.c | 1540 ++++++++++++++++++++++ + drivers/usb/musb/cppi_dma.h | 133 ++ + drivers/usb/musb/davinci.c | 462 +++++++ + drivers/usb/musb/davinci.h | 100 ++ + drivers/usb/musb/musb_core.c | 2261 ++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_core.h | 507 +++++++ + drivers/usb/musb/musb_debug.h | 66 + + drivers/usb/musb/musb_dma.h | 172 +++ + drivers/usb/musb/musb_gadget.c | 2031 ++++++++++++++++++++++++++++ + drivers/usb/musb/musb_gadget.h | 108 ++ + drivers/usb/musb/musb_gadget_ep0.c | 981 ++++++++++++++ + drivers/usb/musb/musb_host.c | 2170 ++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_host.h | 110 ++ + drivers/usb/musb/musb_io.h | 115 ++ + drivers/usb/musb/musb_procfs.c | 830 ++++++++++++ + drivers/usb/musb/musb_regs.h | 300 +++++ + drivers/usb/musb/musb_virthub.c | 425 ++++++ + drivers/usb/musb/musbhsdma.c | 433 ++++++ + drivers/usb/musb/omap2430.c | 324 +++++ + drivers/usb/musb/omap2430.h | 56 + + drivers/usb/musb/tusb6010.c | 1151 ++++++++++++++++ + drivers/usb/musb/tusb6010.h | 233 ++++ + drivers/usb/musb/tusb6010_omap.c | 719 ++++++++++ + drivers/usb/serial/Kconfig | 7 +- + drivers/usb/serial/ftdi_sio.c | 6 + + drivers/usb/serial/ftdi_sio.h | 7 + + drivers/usb/serial/option.c | 37 + + drivers/usb/serial/pl2303.c | 1 - + drivers/usb/serial/pl2303.h | 4 - + drivers/usb/serial/sierra.c | 168 ++-- + drivers/usb/serial/usb-serial.c | 7 +- + drivers/usb/storage/Kconfig | 12 + + drivers/usb/storage/Makefile | 1 + + drivers/usb/storage/sierra_ms.c | 207 +++ + drivers/usb/storage/sierra_ms.h | 4 + + drivers/usb/storage/transport.c | 17 +- + drivers/usb/storage/unusual_devs.h | 40 +- + drivers/usb/storage/usb.c | 3 + + include/linux/usb.h | 6 + + include/linux/usb/musb.h | 98 ++ + include/linux/usb/serial.h | 3 +- + 83 files changed, 16825 insertions(+), 2557 deletions(-) + delete mode 100644 Documentation/usb/auerswald.txt + delete mode 100644 drivers/usb/misc/auerswald.c + create mode 100644 drivers/usb/musb/Kconfig + create mode 100644 drivers/usb/musb/Makefile + create mode 100644 drivers/usb/musb/cppi_dma.c + create mode 100644 drivers/usb/musb/cppi_dma.h + create mode 100644 drivers/usb/musb/davinci.c + create mode 100644 drivers/usb/musb/davinci.h + create mode 100644 drivers/usb/musb/musb_core.c + create mode 100644 drivers/usb/musb/musb_core.h + create mode 100644 drivers/usb/musb/musb_debug.h + create mode 100644 drivers/usb/musb/musb_dma.h + create mode 100644 drivers/usb/musb/musb_gadget.c + create mode 100644 drivers/usb/musb/musb_gadget.h + create mode 100644 drivers/usb/musb/musb_gadget_ep0.c + create mode 100644 drivers/usb/musb/musb_host.c + create mode 100644 drivers/usb/musb/musb_host.h + create mode 100644 drivers/usb/musb/musb_io.h + create mode 100644 drivers/usb/musb/musb_procfs.c + create mode 100644 drivers/usb/musb/musb_regs.h + create mode 100644 drivers/usb/musb/musb_virthub.c + create mode 100644 drivers/usb/musb/musbhsdma.c + create mode 100644 drivers/usb/musb/omap2430.c + create mode 100644 drivers/usb/musb/omap2430.h + create mode 100644 drivers/usb/musb/tusb6010.c + create mode 100644 drivers/usb/musb/tusb6010.h + create mode 100644 drivers/usb/musb/tusb6010_omap.c + create mode 100644 drivers/usb/storage/sierra_ms.c + create mode 100644 drivers/usb/storage/sierra_ms.h + create mode 100644 include/linux/usb/musb.h +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/hid/usbhid/hid-quirks.c | 12 +- + drivers/input/evdev.c | 63 ++- + drivers/input/joystick/xpad.c | 1 + + drivers/input/keyboard/gpio_keys.c | 3 +- + drivers/input/mouse/Kconfig | 23 ++ + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/bcm5974.c | 681 +++++++++++++++++++++++++++++++++ + drivers/input/serio/i8042-x86ia64io.h | 7 + + drivers/input/touchscreen/Kconfig | 21 +- + 9 files changed, 773 insertions(+), 39 deletions(-) + create mode 100644 drivers/input/mouse/bcm5974.c +Merging md-current/for-2.6.26 +$ git merge md-current/for-2.6.26 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Merge made by recursive. + arch/x86/kernel/traps_32.c | 1 + + arch/x86/kernel/traps_64.c | 1 + + drivers/base/core.c | 1 + + drivers/base/platform.c | 2 +- + drivers/net/phy/phy_device.c | 8 +------ + fs/sysfs/dir.c | 1 + + fs/sysfs/file.c | 44 ++++++++++++++++++++++++++----------- + fs/sysfs/mount.c | 17 +++++++++++++- + fs/sysfs/sysfs.h | 7 ++++- + include/linux/init.h | 1 + + include/linux/sysfs.h | 31 ++++++++++++++++++++++++- + init/main.c | 9 +++++++ + lib/kobject.c | 50 ++++++++++++++++++++++++++++++++++++++++++ + 13 files changed, 147 insertions(+), 26 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/net/usb/hso.c | 53 +++++---- + drivers/usb/core/Kconfig | 15 ++- + drivers/usb/core/Makefile | 4 - + drivers/usb/core/config.c | 6 +- + drivers/usb/core/devio.c | 2 +- + drivers/usb/core/driver.c | 25 +++-- + drivers/usb/core/hcd-pci.c | 24 ++-- + drivers/usb/core/hcd.c | 34 +++--- + drivers/usb/core/hub.c | 160 ++++++++++++------------ + drivers/usb/core/message.c | 18 ++-- + drivers/usb/core/quirks.c | 2 +- + drivers/usb/core/urb.c | 3 +- + drivers/usb/core/usb.c | 12 ++- + drivers/usb/core/usb.h | 22 ++++ + drivers/usb/misc/Kconfig | 10 ++ + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 301 ++++++++++++++++++++++++++++++++++++++++++++ + 17 files changed, 526 insertions(+), 166 deletions(-) + create mode 100644 drivers/usb/misc/gotemp.c +Merging tip-core/auto-core-next +$ git merge tip-core/auto-core-next +Auto-merged include/asm-generic/vmlinux.lds.h +CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h +Auto-merged include/asm-x86/percpu.h +Auto-merged include/linux/percpu.h +Auto-merged kernel/module.c +Auto-merged mm/filemap.c +Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 3fc20c9: Merge commit 'tip-core/auto-core-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/vmlinux_32.lds.S | 1 + + include/asm-generic/percpu.h | 11 ++++- + include/asm-generic/sections.h | 10 ++++ + include/asm-generic/vmlinux.lds.h | 17 ++++++++ + include/asm-x86/percpu.h | 83 ++++++++++++++++++++++++++++++++++-- + include/linux/percpu.h | 24 ++++++++++- + kernel/lockdep.c | 4 +- + kernel/module.c | 7 ++- + mm/filemap.c | 15 ++++--- + 10 files changed, 154 insertions(+), 20 deletions(-) +Merging cpus4096/auto-cpus4096-next +$ git merge cpus4096/auto-cpus4096-next +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged net/sunrpc/svc.c +CONFLICT (content): Merge conflict in net/sunrpc/svc.c +Resolved 'net/sunrpc/svc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit b5d03da: Merge commit 'cpus4096/auto-cpus4096-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/sfc/efx.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging ftrace/auto-ftrace-next +$ git merge ftrace/auto-ftrace-next +Already uptodate! +Merge made by recursive. +Merging genirq/auto-genirq-next +$ git merge genirq/auto-genirq-next +Merge made by recursive. + kernel/irq/spurious.c | 146 ++++++++++++++++++++++++++++++------------------ + 1 files changed, 91 insertions(+), 55 deletions(-) +Merging safe-poison-pointers/auto-safe-poison-pointers-next +$ git merge safe-poison-pointers/auto-safe-poison-pointers-next +Auto-merged arch/x86/Kconfig +Merge made by recursive. + arch/x86/Kconfig | 5 +++++ + include/linux/poison.h | 10 ++++++++-- + 2 files changed, 13 insertions(+), 2 deletions(-) +Merging sched/auto-sched-next +$ git merge sched/auto-sched-next +Auto-merged include/asm-x86/thread_info.h +Auto-merged kernel/rcuclassic.c +Merge made by recursive. + include/linux/rcuclassic.h | 28 +++++--- + kernel/rcuclassic.c | 177 ++++++++++++++++++++++++++------------------ + 2 files changed, 122 insertions(+), 83 deletions(-) +Merging stackprotector/auto-stackprotector-next +$ git merge stackprotector/auto-stackprotector-next +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/Makefile +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/process_64.c +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/panic.c +Auto-merged kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 23 ++++++++++------------- + arch/x86/Kconfig.debug | 1 + + arch/x86/Makefile | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/process_64.c | 13 ++++++++++++- + arch/x86/mm/fault.c | 7 +++++++ + include/asm-x86/pda.h | 3 +-- + include/asm-x86/stackprotector.h | 38 ++++++++++++++++++++++++++++++++++++++ + include/asm-x86/system.h | 6 +++++- + include/linux/magic.h | 1 + + include/linux/sched.h | 16 ++++++++++++++-- + include/linux/stackprotector.h | 16 ++++++++++++++++ + init/main.c | 7 +++++++ + kernel/exit.c | 5 +---- + kernel/fork.c | 5 +++++ + kernel/panic.c | 12 +++++++++++- + kernel/sched.c | 7 +------ + 17 files changed, 132 insertions(+), 31 deletions(-) + create mode 100644 include/asm-x86/stackprotector.h + create mode 100644 include/linux/stackprotector.h +Merging timers/auto-timers-next +$ git merge timers/auto-timers-next +Auto-merged drivers/char/hpet.c +Merge made by recursive. + drivers/char/hpet.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/hpet.h | 3 +- + 2 files changed, 65 insertions(+), 1 deletions(-) +Merging x86/auto-x86-next +$ git merge x86/auto-x86-next +Auto-merged Documentation/kernel-parameters.txt +Auto-merged arch/x86/Kconfig +Auto-merged arch/x86/kernel/Makefile +Auto-merged arch/x86/kernel/genapic_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/genapic_64.c +Auto-merged arch/x86/kernel/genapic_flat_64.c +Auto-merged arch/x86/kernel/genx2apic_uv_x.c +Auto-merged arch/x86/kernel/io_apic_64.c +Auto-merged arch/x86/kernel/paravirt.c +Auto-merged arch/x86/kernel/setup.c +Auto-merged arch/x86/kernel/smpboot.c +Auto-merged arch/x86/lguest/boot.c +Auto-merged arch/x86/xen/enlighten.c +Auto-merged drivers/pci/dmar.c +CONFLICT (content): Merge conflict in drivers/pci/dmar.c +Auto-merged include/asm-x86/ipi.h +Auto-merged include/asm-x86/paravirt.h +Auto-merged kernel/irq/manage.c +Resolved 'arch/x86/kernel/genapic_64.c' using previous resolution. +Resolved 'drivers/pci/dmar.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit 965d8c1: Merge commit 'x86/auto-x86-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 6 + + arch/x86/Kconfig | 8 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/apic_32.c | 41 ++- + arch/x86/kernel/apic_64.c | 237 ++++++++++- + arch/x86/kernel/cpu/common_64.c | 2 + + arch/x86/kernel/cpu/feature_names.c | 2 +- + arch/x86/kernel/genapic_64.c | 84 ++--- + arch/x86/kernel/genapic_flat_64.c | 62 +++- + arch/x86/kernel/genx2apic_cluster.c | 164 +++++++ + arch/x86/kernel/genx2apic_phys.c | 161 +++++++ + arch/x86/kernel/genx2apic_uv_x.c | 66 +++- + arch/x86/kernel/i8259.c | 24 + + arch/x86/kernel/io_apic_32.c | 5 +- + arch/x86/kernel/io_apic_64.c | 608 +++++++++++++++++++++++++-- + arch/x86/kernel/mpparse.c | 2 + + arch/x86/kernel/paravirt.c | 2 - + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/smpboot.c | 38 +- + arch/x86/kernel/vmi_32.c | 4 +- + arch/x86/lguest/boot.c | 38 ++- + arch/x86/mach-generic/bigsmp.c | 5 +- + arch/x86/mach-generic/es7000.c | 3 +- + arch/x86/mach-generic/numaq.c | 4 +- + arch/x86/mach-generic/summit.c | 5 +- + arch/x86/xen/enlighten.c | 45 ++- + drivers/pci/Makefile | 2 + + drivers/pci/dma_remapping.h | 157 +++++++ + drivers/pci/dmar.c | 397 +++++++++++++++++- + drivers/pci/intel-iommu.c | 164 ++------ + drivers/pci/intel-iommu.h | 233 +++++------ + drivers/pci/intr_remapping.c | 471 +++++++++++++++++++++ + drivers/pci/intr_remapping.h | 8 + + include/asm-x86/apic.h | 65 +++- + include/asm-x86/apicdef.h | 3 + + include/asm-x86/cpufeature.h | 2 + + include/asm-x86/genapic_64.h | 8 + + include/asm-x86/hw_irq.h | 2 + + include/asm-x86/i8259.h | 3 + + include/asm-x86/io_apic.h | 20 + + include/asm-x86/ipi.h | 16 +- + include/asm-x86/irq_remapping.h | 8 + + include/asm-x86/mach-default/mach_apic.h | 4 +- + include/asm-x86/mach-default/mach_apicdef.h | 6 +- + include/asm-x86/mach-es7000/mach_apic.h | 2 +- + include/asm-x86/msidef.h | 4 + + include/asm-x86/paravirt.h | 19 - + include/asm-x86/smp.h | 17 +- + include/linux/dmar.h | 127 +++++-- + include/linux/irq.h | 1 + + kernel/irq/manage.c | 9 +- + 52 files changed, 2854 insertions(+), 518 deletions(-) + create mode 100644 arch/x86/kernel/genx2apic_cluster.c + create mode 100644 arch/x86/kernel/genx2apic_phys.c + create mode 100644 drivers/pci/dma_remapping.h + create mode 100644 drivers/pci/intr_remapping.c + create mode 100644 drivers/pci/intr_remapping.h + create mode 100644 include/asm-x86/irq_remapping.h +$ git am -3 ../patches/0001-x86-export-is_uv_system.patch +Applying x86: export is_uv_system +$ git reset HEAD^ +arch/x86/kernel/genx2apic_uv_x.c: needs update +$ git commit -v -a --amend +Created commit 15f965b: Merge commit 'x86/auto-x86-next' +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + drivers/md/dm-exception-store.c | 29 +++++++++++++++++++---------- + drivers/md/dm-mpath.c | 35 +++++++++++++++++++---------------- + drivers/md/dm-mpath.h | 2 -- + drivers/md/dm-raid1.c | 4 +++- + 4 files changed, 41 insertions(+), 29 deletions(-) +Merging hid/mm +$ git merge hid/mm +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merged drivers/i2c/chips/isp1301_omap.c +Auto-merged drivers/i2c/i2c-dev.c +Merge made by recursive. + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 + + drivers/hwmon/dme1737.c | 320 ++++++++++----------- + drivers/hwmon/lm75.c | 114 ++------ + drivers/i2c/Kconfig | 14 + + drivers/i2c/algos/Kconfig | 11 +- + drivers/i2c/busses/Kconfig | 12 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-amd756-s4882.c | 9 +- + drivers/i2c/busses/i2c-highlander.c | 498 ++++++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-nforce2-s4985.c | 5 +- + drivers/i2c/busses/i2c-pca-isa.c | 20 +- + drivers/i2c/chips/at24.c | 8 +- + drivers/i2c/chips/isp1301_omap.c | 141 ++++------ + drivers/i2c/i2c-core.c | 11 +- + drivers/i2c/i2c-dev.c | 4 +- + 16 files changed, 817 insertions(+), 366 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-highlander.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merged Documentation/00-INDEX +Auto-merged arch/x86/Kconfig +Merge made by recursive. + Documentation/00-INDEX | 6 ------ + Documentation/early-userspace/00-INDEX | 8 ++++++++ + Documentation/{ => early-userspace}/initrd.txt | 6 +++--- + Documentation/timers/00-INDEX | 10 ++++++++++ + Documentation/{ => timers}/hpet.txt | 0 + Documentation/x86/00-INDEX | 4 ++++ + Documentation/{ => x86}/mtrr.txt | 4 ++-- + arch/x86/Kconfig | 2 +- + 8 files changed, 28 insertions(+), 12 deletions(-) + create mode 100644 Documentation/early-userspace/00-INDEX + rename Documentation/{ => early-userspace}/initrd.txt (99%) + create mode 100644 Documentation/timers/00-INDEX + rename Documentation/{ => timers}/hpet.txt (100%) + create mode 100644 Documentation/x86/00-INDEX + rename Documentation/{ => x86}/mtrr.txt (99%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Removed arch/avr32/mach-at32ap/hmatrix.h +Removed include/asm-avr32/arch-at32ap/at32ap700x.h +Removed include/asm-avr32/arch-at32ap/board.h +Removed include/asm-avr32/arch-at32ap/cpu.h +Removed include/asm-avr32/arch-at32ap/gpio.h +Removed include/asm-avr32/arch-at32ap/init.h +Removed include/asm-avr32/arch-at32ap/io.h +Removed include/asm-avr32/arch-at32ap/irq.h +Removed include/asm-avr32/arch-at32ap/pm.h +Removed include/asm-avr32/arch-at32ap/portmux.h +Removed include/asm-avr32/arch-at32ap/smc.h +Removed include/asm-avr32/arch-at32ap/sram.h +Merge made by recursive. + arch/avr32/Makefile | 14 - + arch/avr32/boards/atngw100/setup.c | 2 +- + arch/avr32/boards/atstk1000/atstk1002.c | 2 +- + arch/avr32/configs/atngw100_defconfig | 106 ++- + arch/avr32/configs/atstk1002_defconfig | 153 ++- + arch/avr32/configs/atstk1003_defconfig | 140 ++- + arch/avr32/configs/atstk1004_defconfig | 46 +- + arch/avr32/configs/atstk1006_defconfig | 1304 ++++++++++++++++++++++ + arch/avr32/mach-at32ap/Makefile | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 26 +- + arch/avr32/mach-at32ap/clock.c | 2 + + arch/avr32/mach-at32ap/hmatrix.c | 88 ++ + arch/avr32/mach-at32ap/hmatrix.h | 182 --- + arch/avr32/mach-at32ap/include/mach/at32ap700x.h | 37 + + arch/avr32/mach-at32ap/include/mach/chip.h | 19 + + arch/avr32/mach-at32ap/include/mach/hmatrix.h | 55 + + arch/avr32/mach-at32ap/pm.c | 4 +- + arch/avr32/mach-at32ap/pm.h | 12 +- + include/asm-avr32/arch-at32ap/at32ap700x.h | 49 - + include/asm-avr32/arch-at32ap/board.h | 121 -- + include/asm-avr32/arch-at32ap/cpu.h | 35 - + include/asm-avr32/arch-at32ap/gpio.h | 45 - + include/asm-avr32/arch-at32ap/init.h | 18 - + include/asm-avr32/arch-at32ap/io.h | 39 - + include/asm-avr32/arch-at32ap/irq.h | 14 - + include/asm-avr32/arch-at32ap/pm.h | 51 - + include/asm-avr32/arch-at32ap/portmux.h | 29 - + include/asm-avr32/arch-at32ap/smc.h | 113 -- + include/asm-avr32/arch-at32ap/sram.h | 30 - + 29 files changed, 1807 insertions(+), 930 deletions(-) + create mode 100644 arch/avr32/configs/atstk1006_defconfig + create mode 100644 arch/avr32/mach-at32ap/hmatrix.c + delete mode 100644 arch/avr32/mach-at32ap/hmatrix.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/chip.h + create mode 100644 arch/avr32/mach-at32ap/include/mach/hmatrix.h + delete mode 100644 include/asm-avr32/arch-at32ap/at32ap700x.h + delete mode 100644 include/asm-avr32/arch-at32ap/board.h + delete mode 100644 include/asm-avr32/arch-at32ap/cpu.h + delete mode 100644 include/asm-avr32/arch-at32ap/gpio.h + delete mode 100644 include/asm-avr32/arch-at32ap/init.h + delete mode 100644 include/asm-avr32/arch-at32ap/io.h + delete mode 100644 include/asm-avr32/arch-at32ap/irq.h + delete mode 100644 include/asm-avr32/arch-at32ap/pm.h + delete mode 100644 include/asm-avr32/arch-at32ap/portmux.h + delete mode 100644 include/asm-avr32/arch-at32ap/smc.h + delete mode 100644 include/asm-avr32/arch-at32ap/sram.h +Merging v4l-dvb/stable +$ git merge v4l-dvb/stable +Merge made by recursive. + Documentation/video4linux/CARDLIST.au0828 | 1 + + Documentation/video4linux/CARDLIST.bttv | 1 + + Documentation/video4linux/CARDLIST.tuner | 1 + + drivers/media/common/ir-keymaps.c | 55 +++++++++- + drivers/media/common/tuners/tuner-simple.c | 2 + + drivers/media/common/tuners/tuner-types.c | 22 ++++ + drivers/media/dvb/frontends/au8522.c | 45 +++++++- + drivers/media/dvb/frontends/au8522.h | 9 ++ + drivers/media/dvb/frontends/drx397xD.c | 34 +++--- + drivers/media/dvb/frontends/drx397xD.h | 2 +- + drivers/media/radio/dsbr100.c | 3 + + drivers/media/radio/radio-si470x.c | 2 + + drivers/media/video/Kconfig | 121 ++++++++++---------- + drivers/media/video/au0828/Kconfig | 1 + + drivers/media/video/au0828/au0828-cards.c | 7 + + drivers/media/video/au0828/au0828-cards.h | 1 + + drivers/media/video/au0828/au0828-dvb.c | 23 ++++ + drivers/media/video/bt8xx/bttv-cards.c | 27 ++++- + drivers/media/video/bt8xx/bttv-driver.c | 25 ++++- + drivers/media/video/bt8xx/bttv-input.c | 62 ++++++++++- + drivers/media/video/bt8xx/bttv.h | 2 +- + drivers/media/video/cafe_ccic.c | 6 +- + drivers/media/video/cx23885/cx23885-417.c | 10 ++- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx23885/cx23885-video.c | 10 ++- + drivers/media/video/cx88/cx88-blackbird.c | 8 +- + drivers/media/video/cx88/cx88-video.c | 10 ++- + drivers/media/video/em28xx/em28xx-video.c | 7 +- + drivers/media/video/ivtv/ivtv-fileops.c | 2 +- + drivers/media/video/ivtv/ivtv-fileops.h | 5 - + drivers/media/video/meye.c | 7 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 + + drivers/media/video/s2255drv.c | 6 + + drivers/media/video/saa5246a.c | 8 +- + drivers/media/video/saa5249.c | 8 +- + drivers/media/video/saa7134/saa7134-empress.c | 3 + + drivers/media/video/saa7134/saa7134-input.c | 140 ++++++++++++++++++++++- + drivers/media/video/saa7134/saa7134-video.c | 8 +- + drivers/media/video/se401.c | 6 +- + drivers/media/video/stk-webcam.c | 6 +- + drivers/media/video/stradis.c | 6 +- + drivers/media/video/stv680.c | 2 + + drivers/media/video/usbvideo/vicam.c | 6 + + drivers/media/video/usbvision/usbvision-video.c | 2 + + drivers/media/video/v4l2-dev.c | 3 - + drivers/media/video/vino.c | 1 - + drivers/media/video/vivi.c | 7 +- + drivers/media/video/zoran_driver.c | 3 + + drivers/media/video/zr364xx.c | 8 +- + include/media/ir-common.h | 6 + + include/media/saa7146.h | 2 +- + include/media/tuner.h | 1 + + 52 files changed, 617 insertions(+), 134 deletions(-) +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/qdio.h | 8 +++- + drivers/s390/block/dasd_eer.c | 3 +- + drivers/s390/char/tape_char.c | 2 +- + drivers/s390/char/tape_std.c | 2 +- + drivers/s390/cio/blacklist.c | 11 +++-- + drivers/s390/cio/device.c | 96 +++++++++++++++++++++++++++------------- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/device_fsm.c | 7 +++ + drivers/s390/cio/qdio.h | 3 + + drivers/s390/cio/qdio_main.c | 24 ++++++++-- + 10 files changed, 113 insertions(+), 44 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/boards/mach-x3proto/setup.c | 10 ++- + arch/sh/include/asm/bitops-llsc.h | 144 ++++++++++++++++++++++++++++++ + arch/sh/include/asm/bitops.h | 2 + + arch/sh/include/asm/cmpxchg-llsc.h | 71 +++++++++++++++ + arch/sh/include/asm/system.h | 2 + + arch/sh/include/cpu-sh3/cpu/cacheflush.h | 10 ++ + arch/sh/kernel/sh_ksyms_32.c | 4 +- + arch/sh/mm/Kconfig | 2 + + 8 files changed, 243 insertions(+), 2 deletions(-) + create mode 100644 arch/sh/include/asm/bitops-llsc.h + create mode 100644 arch/sh/include/asm/cmpxchg-llsc.h +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Already up-to-date. +Merging quilt/ide +$ git merge quilt/ide +Auto-merged drivers/ide/ide-probe.c +Auto-merged drivers/ide/ide-tape.c +Merge made by recursive. + arch/powerpc/include/asm/ide.h | 43 +----- + drivers/ata/libata-scsi.c | 2 +- + drivers/block/hd.c | 9 +- + drivers/ide/Kconfig | 23 --- + drivers/ide/Makefile | 4 +- + drivers/ide/arm/icside.c | 5 +- + drivers/ide/arm/palm_bk3710.c | 8 +- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-atapi.c | 81 ++++++++-- + drivers/ide/ide-cd.c | 72 ++++----- + drivers/ide/ide-disk.c | 336 +++++++++++++++------------------------- + drivers/ide/ide-dma.c | 52 ++++--- + drivers/ide/ide-floppy.c | 299 +++++++++++++++-------------------- + drivers/ide/ide-generic.c | 55 ++++++- + drivers/ide/ide-io.c | 77 ++++------ + drivers/ide/ide-ioctls.c | 289 ++++++++++++++++++++++++++++++++++ + drivers/ide/ide-iops.c | 225 ++++++++------------------- + drivers/ide/ide-lib.c | 73 +++++----- + drivers/ide/ide-probe.c | 252 ++++++++++++++---------------- + drivers/ide/ide-proc.c | 300 +++++++++++------------------------ + drivers/ide/ide-tape.c | 251 +++++++++--------------------- + drivers/ide/ide-taskfile.c | 156 ++++--------------- + drivers/ide/ide-timings.c | 22 ++-- + drivers/ide/ide.c | 167 +++------------------ + drivers/ide/legacy/ali14xx.c | 1 - + drivers/ide/legacy/buddha.c | 1 - + drivers/ide/legacy/dtc2278.c | 1 - + drivers/ide/legacy/falconide.c | 1 - + drivers/ide/legacy/gayle.c | 1 - + drivers/ide/legacy/ht6560b.c | 1 - + drivers/ide/legacy/ide-cs.c | 1 - + drivers/ide/legacy/macide.c | 1 - + drivers/ide/legacy/q40ide.c | 2 - + drivers/ide/legacy/qd65xx.c | 23 ++-- + drivers/ide/legacy/umc8672.c | 1 - + drivers/ide/pci/aec62xx.c | 9 +- + drivers/ide/pci/alim15x3.c | 11 +- + drivers/ide/pci/amd74xx.c | 10 +- + drivers/ide/pci/atiixp.c | 5 +- + drivers/ide/pci/cmd640.c | 43 +++--- + drivers/ide/pci/cmd64x.c | 7 +- + drivers/ide/pci/cs5520.c | 5 +- + drivers/ide/pci/cs5530.c | 21 ++- + drivers/ide/pci/cs5535.c | 16 ++- + drivers/ide/pci/cy82c693.c | 8 +- + drivers/ide/pci/delkin_cb.c | 1 - + drivers/ide/pci/generic.c | 5 +- + drivers/ide/pci/hpt34x.c | 7 +- + drivers/ide/pci/hpt366.c | 81 ++++++---- + drivers/ide/pci/it8213.c | 5 +- + drivers/ide/pci/it821x.c | 62 ++++---- + drivers/ide/pci/jmicron.c | 5 +- + drivers/ide/pci/ns87415.c | 11 +- + drivers/ide/pci/opti621.c | 9 +- + drivers/ide/pci/pdc202xx_new.c | 19 ++- + drivers/ide/pci/pdc202xx_old.c | 13 +- + drivers/ide/pci/piix.c | 7 +- + drivers/ide/pci/rz1000.c | 1 - + drivers/ide/pci/sc1200.c | 15 +- + drivers/ide/pci/scc_pata.c | 7 +- + drivers/ide/pci/serverworks.c | 11 +- + drivers/ide/pci/sgiioc4.c | 1 - + drivers/ide/pci/siimage.c | 21 ++- + drivers/ide/pci/sis5513.c | 9 +- + drivers/ide/pci/sl82c105.c | 9 +- + drivers/ide/pci/slc90e66.c | 5 +- + drivers/ide/pci/tc86c001.c | 2 +- + drivers/ide/pci/triflex.c | 5 +- + drivers/ide/pci/trm290.c | 1 - + drivers/ide/pci/via82cxxx.c | 14 +- + drivers/ide/ppc/pmac.c | 6 +- + drivers/ide/setup-pci.c | 33 ++++ + drivers/scsi/ide-scsi.c | 74 ++++++---- + include/linux/ata.h | 265 ++++++++++++++++++++++++++------ + include/linux/ide.h | 202 ++++++++++++++----------- + 75 files changed, 1924 insertions(+), 1958 deletions(-) + create mode 100644 drivers/ide/ide-ioctls.c +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_aops.c | 3 +- + fs/xfs/linux-2.6/xfs_buf.c | 8 +-- + fs/xfs/linux-2.6/xfs_export.c | 10 +- + fs/xfs/linux-2.6/xfs_fs_subr.c | 6 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 4 +- + fs/xfs/linux-2.6/xfs_iops.c | 119 ++++++++++++++++++++++--- + fs/xfs/linux-2.6/xfs_iops.h | 12 +-- + fs/xfs/linux-2.6/xfs_linux.h | 2 +- + fs/xfs/linux-2.6/xfs_lrw.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 193 ++++++++++++---------------------------- + fs/xfs/linux-2.6/xfs_super.h | 3 - + fs/xfs/linux-2.6/xfs_vnode.c | 20 +---- + fs/xfs/linux-2.6/xfs_vnode.h | 67 +++++--------- + fs/xfs/quota/xfs_dquot.c | 2 +- + fs/xfs/quota/xfs_qm_syscalls.c | 4 +- + fs/xfs/xfs_acl.c | 52 +++++------ + fs/xfs/xfs_acl.h | 14 ++-- + fs/xfs/xfs_arch.h | 68 -------------- + fs/xfs/xfs_attr.c | 110 ++++++++++++++--------- + fs/xfs/xfs_attr.h | 1 + + fs/xfs/xfs_attr_leaf.c | 75 ++-------------- + fs/xfs/xfs_attr_leaf.h | 2 - + fs/xfs/xfs_bit.c | 103 --------------------- + fs/xfs/xfs_bit.h | 34 ++++++- + fs/xfs/xfs_bmap.c | 8 +- + fs/xfs/xfs_btree.c | 105 ++++++++-------------- + fs/xfs/xfs_btree.h | 8 +-- + fs/xfs/xfs_dfrag.c | 33 ++----- + fs/xfs/xfs_error.c | 5 +- + fs/xfs/xfs_error.h | 12 +-- + fs/xfs/xfs_ialloc_btree.c | 30 +++--- + fs/xfs/xfs_iget.c | 16 +++- + fs/xfs/xfs_inode.c | 30 +++---- + fs/xfs/xfs_inode.h | 18 +++- + fs/xfs/xfs_itable.c | 4 +- + fs/xfs/xfs_mount.c | 9 +-- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_rtalloc.c | 19 ++--- + fs/xfs/xfs_trans.c | 75 ++++++++++++++-- + fs/xfs/xfs_trans.h | 12 +--- + fs/xfs/xfs_trans_buf.c | 12 ++-- + fs/xfs/xfs_trans_item.c | 66 +++++++------- + fs/xfs/xfs_utils.c | 4 +- + fs/xfs/xfs_utils.h | 3 - + fs/xfs/xfs_vfsops.c | 13 ++-- + fs/xfs/xfs_vnodeops.c | 189 +++++++++++---------------------------- + 46 files changed, 634 insertions(+), 952 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merged Documentation/kernel-parameters.txt +Auto-merged MAINTAINERS +Merge made by recursive. + Documentation/kernel-parameters.txt | 107 ++++-- + MAINTAINERS | 9 +- + drivers/acpi/Kconfig | 11 + + drivers/acpi/Makefile | 6 + + drivers/acpi/events/evgpe.c | 2 - + drivers/acpi/glue.c | 40 ++ + drivers/acpi/pcc_acpi.c | 779 +++++++++++++++++++++++++++++++++++ + drivers/acpi/pci_link.c | 12 +- + drivers/acpi/scan.c | 32 +-- + drivers/acpi/video.c | 35 +- + drivers/acpi/video_detect.c | 268 ++++++++++++ + drivers/misc/acer-wmi.c | 6 + + drivers/misc/asus-laptop.c | 10 +- + drivers/misc/compal-laptop.c | 12 +- + drivers/misc/eeepc-laptop.c | 12 +- + drivers/misc/fujitsu-laptop.c | 26 +- + drivers/misc/msi-laptop.c | 16 +- + drivers/misc/sony-laptop.c | 6 +- + drivers/misc/thinkpad_acpi.c | 29 +- + include/acpi/acpi_bus.h | 2 + + include/linux/acpi.h | 52 ++- + 21 files changed, 1345 insertions(+), 127 deletions(-) + create mode 100644 drivers/acpi/pcc_acpi.c + create mode 100644 drivers/acpi/video_detect.c +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merged MAINTAINERS +Auto-merged net/sunrpc/svc.c +Merge made by recursive. + MAINTAINERS | 4 ++-- + fs/lockd/svc.c | 2 +- + fs/lockd/svc4proc.c | 4 ++-- + fs/lockd/svcproc.c | 4 ++-- + fs/nfs/callback.c | 3 ++- + fs/nfsd/export.c | 6 +++--- + fs/nfsd/nfssvc.c | 1 + + include/linux/sunrpc/svc.h | 9 +++++---- + net/sunrpc/svc.c | 11 ++++++----- + net/sunrpc/svc_xprt.c | 39 +++++++++++++++++++++++++++++++++------ + 10 files changed, 57 insertions(+), 26 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merged drivers/firewire/fw-sbp2.c +Merge made by recursive. + drivers/firewire/fw-card.c | 56 +++++++++--------------------------- + drivers/firewire/fw-device.c | 37 ++++-------------------- + drivers/firewire/fw-sbp2.c | 46 ++++++++---------------------- + drivers/firewire/fw-transaction.c | 48 +++++++++++++++++++++++++++++-- + drivers/firewire/fw-transaction.h | 9 ++++-- + drivers/ieee1394/csr1212.c | 2 +- + drivers/ieee1394/eth1394.c | 2 +- + 7 files changed, 84 insertions(+), 116 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Merge made by recursive. + arch/powerpc/include/asm/kvm_host.h | 14 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/kernel/asm-offsets.c | 4 +- + arch/powerpc/kvm/44x_tlb.c | 49 +++- + arch/powerpc/kvm/Kconfig | 11 + + arch/powerpc/kvm/Makefile | 6 +- + arch/powerpc/kvm/booke_guest.c | 17 ++ + arch/powerpc/kvm/booke_interrupts.S | 79 +++-- + arch/powerpc/kvm/emulate.c | 8 +- + arch/powerpc/kvm/powerpc.c | 99 +++++++- + arch/x86/kernel/kvmclock.c | 30 ++ + arch/x86/kernel/pvclock.c | 12 + + arch/x86/kvm/i8254.c | 70 +++--- + arch/x86/kvm/i8254.h | 7 +- + arch/x86/kvm/i8259.c | 30 ++- + arch/x86/kvm/irq.c | 36 +++- + arch/x86/kvm/irq.h | 10 +- + arch/x86/kvm/kvm_cache_regs.h | 32 ++ + arch/x86/kvm/lapic.c | 11 +- + arch/x86/kvm/mmu.c | 20 +- + arch/x86/kvm/svm.c | 138 ++++------ + arch/x86/kvm/vmx.c | 428 +++++++++++++++-------------- + arch/x86/kvm/vmx.h | 4 +- + arch/x86/kvm/x86.c | 530 ++++++++++++++++++++++++++--------- + arch/x86/kvm/x86.h | 22 ++ + arch/x86/kvm/x86_emulate.c | 19 +- + arch/x86/xen/time.c | 11 +- + include/asm-x86/kvm.h | 22 -- + include/asm-x86/kvm_host.h | 67 +++-- + include/asm-x86/pvclock.h | 1 + + include/linux/kvm.h | 67 ++++- + include/linux/kvm_host.h | 19 ++ + virt/kvm/ioapic.c | 20 +- + virt/kvm/ioapic.h | 3 +- + virt/kvm/kvm_main.c | 22 +- + virt/kvm/kvm_trace.c | 30 +- + 36 files changed, 1322 insertions(+), 638 deletions(-) + create mode 100644 arch/x86/kvm/kvm_cache_regs.h + create mode 100644 arch/x86/kvm/x86.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/config.c | 203 +++++++++++++++++++++++++++++-------------------------- + fs/dlm/user.c | 10 ++- + 2 files changed, 114 insertions(+), 99 deletions(-) +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging tests/master +$ git merge tests/master +Auto-merged Makefile +Auto-merged drivers/misc/Makefile +Auto-merged kernel/Makefile +Merge made by recursive. + Makefile | 1 + + drivers/misc/Makefile | 1 - + kernel/Makefile | 4 - + lib/Kconfig.debug | 93 +-------------------- + lib/Makefile | 1 - + tests/Kconfig | 101 +++++++++++++++++++++++ + tests/Makefile | 10 ++ + {kernel => tests}/backtracetest.c | 0 + {drivers/misc => tests}/lkdtm.c | 0 + {lib => tests}/locking-selftest-hardirq.h | 0 + {lib => tests}/locking-selftest-mutex.h | 0 + {lib => tests}/locking-selftest-rlock-hardirq.h | 0 + {lib => tests}/locking-selftest-rlock-softirq.h | 0 + {lib => tests}/locking-selftest-rlock.h | 0 + {lib => tests}/locking-selftest-rsem.h | 0 + {lib => tests}/locking-selftest-softirq.h | 0 + {lib => tests}/locking-selftest-spin-hardirq.h | 0 + {lib => tests}/locking-selftest-spin-softirq.h | 0 + {lib => tests}/locking-selftest-spin.h | 0 + {lib => tests}/locking-selftest-wlock-hardirq.h | 0 + {lib => tests}/locking-selftest-wlock-softirq.h | 0 + {lib => tests}/locking-selftest-wlock.h | 0 + {lib => tests}/locking-selftest-wsem.h | 0 + {lib => tests}/locking-selftest.c | 0 + {kernel => tests}/rcutorture.c | 0 + {kernel => tests}/rtmutex-tester.c | 2 +- + {kernel => tests}/test_kprobes.c | 0 + 27 files changed, 115 insertions(+), 98 deletions(-) + create mode 100644 tests/Kconfig + create mode 100644 tests/Makefile + rename {kernel => tests}/backtracetest.c (100%) + rename {drivers/misc => tests}/lkdtm.c (100%) + rename {lib => tests}/locking-selftest-hardirq.h (100%) + rename {lib => tests}/locking-selftest-mutex.h (100%) + rename {lib => tests}/locking-selftest-rlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-rlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-rlock.h (100%) + rename {lib => tests}/locking-selftest-rsem.h (100%) + rename {lib => tests}/locking-selftest-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin-hardirq.h (100%) + rename {lib => tests}/locking-selftest-spin-softirq.h (100%) + rename {lib => tests}/locking-selftest-spin.h (100%) + rename {lib => tests}/locking-selftest-wlock-hardirq.h (100%) + rename {lib => tests}/locking-selftest-wlock-softirq.h (100%) + rename {lib => tests}/locking-selftest-wlock.h (100%) + rename {lib => tests}/locking-selftest-wsem.h (100%) + rename {lib => tests}/locking-selftest.c (100%) + rename {kernel => tests}/rcutorture.c (100%) + rename {kernel => tests}/rtmutex-tester.c (99%) + rename {kernel => tests}/test_kprobes.c (100%) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + fs/ocfs2/cluster/netdebug.c | 26 ++++++++++---------- + fs/ocfs2/cluster/tcp.c | 44 ++++++++++++++++++++++++++++----- + fs/ocfs2/cluster/tcp_internal.h | 32 ------------------------ + fs/ocfs2/dir.c | 7 ++++- + fs/ocfs2/file.c | 51 +++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/file.h | 2 + + fs/ocfs2/inode.c | 15 ++++++++++- + fs/ocfs2/locks.c | 15 +++++++++++ + fs/ocfs2/locks.h | 1 + + fs/ocfs2/stack_user.c | 33 +++++++++++++++++++++++++ + fs/ocfs2/stackglue.c | 20 +++++++++++++++ + fs/ocfs2/stackglue.h | 19 ++++++++++++++ + 12 files changed, 210 insertions(+), 55 deletions(-) +Merging quilt/m68k +$ git merge quilt/m68k +Merge made by recursive. + arch/m68k/atari/time.c | 35 +++++++++++++++++---------------- + arch/m68k/bvme6000/config.c | 15 +------------- + arch/m68k/bvme6000/rtc.c | 30 ++++++++++++++-------------- + arch/m68k/kernel/entry.S | 6 +++++ + arch/m68k/kernel/traps.c | 9 ++----- + arch/m68k/mvme16x/rtc.c | 26 ++++++++++++------------ + arch/m68k/q40/config.c | 12 +---------- + arch/m68k/sun3x/time.c | 28 +++++++++++++------------- + arch/m68knommu/include/asm/unistd.h | 8 ++++++- + arch/m68knommu/kernel/syscalltable.S | 6 +++++ + include/asm-m68k/unistd.h | 8 ++++++- + 11 files changed, 91 insertions(+), 92 deletions(-) +Merging powerpc/powerpc-next +$ git merge powerpc/powerpc-next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already uptodate! +Merge made by recursive. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging galak/powerpc-next +$ git merge galak/powerpc-next +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Removed drivers/mtd/maps/ebony.c +Removed drivers/mtd/maps/ocotea.c +Removed drivers/mtd/maps/omap-toto-flash.c +Removed drivers/mtd/maps/walnut.c +Auto-merged drivers/mtd/mtdchar.c +Removed drivers/mtd/nand/toto.c +Merge made by recursive. + drivers/mtd/Kconfig | 5 + + drivers/mtd/chips/Kconfig | 3 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 54 +++++++--- + drivers/mtd/chips/cfi_probe.c | 58 ++-------- + drivers/mtd/chips/cfi_util.c | 66 ++++++++++- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 21 ++++ + drivers/mtd/devices/mtd_dataflash.c | 214 +++++++++++++++++++++++++++++++++-- + drivers/mtd/maps/Kconfig | 31 ----- + drivers/mtd/maps/Makefile | 4 - + drivers/mtd/maps/ebony.c | 163 -------------------------- + drivers/mtd/maps/ocotea.c | 154 ------------------------- + drivers/mtd/maps/omap-toto-flash.c | 133 ---------------------- + drivers/mtd/maps/walnut.c | 122 -------------------- + drivers/mtd/mtdchar.c | 4 +- + drivers/mtd/nand/Kconfig | 6 - + drivers/mtd/nand/Makefile | 1 - + drivers/mtd/nand/toto.c | 206 --------------------------------- + drivers/mtd/onenand/Kconfig | 1 + + drivers/mtd/ssfdc.c | 3 +- + include/linux/mtd/cfi.h | 9 ++- + include/linux/mtd/flashchip.h | 4 + + include/linux/mtd/onenand_regs.h | 2 + + 23 files changed, 360 insertions(+), 906 deletions(-) + delete mode 100644 drivers/mtd/maps/ebony.c + delete mode 100644 drivers/mtd/maps/ocotea.c + delete mode 100644 drivers/mtd/maps/omap-toto-flash.c + delete mode 100644 drivers/mtd/maps/walnut.c + delete mode 100644 drivers/mtd/nand/toto.c +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merged include/asm-x86/cpufeature.h +CONFLICT (content): Merge conflict in include/asm-x86/cpufeature.h +Resolved 'include/asm-x86/cpufeature.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit a7c69f1: Merge commit 'crypto/master' +$ git diff -M --stat --summary HEAD^.. + arch/x86/crypto/Makefile | 2 + + arch/x86/crypto/crc32c-intel.c | 197 + + crypto/Kconfig | 101 +- + crypto/Makefile | 2 + + crypto/algapi.c | 147 +- + crypto/{cryptomgr.c => algboss.c} | 86 +- + crypto/api.c | 95 +- + crypto/digest.c | 2 +- + crypto/internal.h | 14 +- + crypto/proc.c | 42 +- + crypto/tcrypt.c | 1337 +----- + crypto/tcrypt.h | 8709 +------------------------------------ + crypto/testmgr.c | 1744 ++++++++ + crypto/testmgr.h | 8738 +++++++++++++++++++++++++++++++++++++ + drivers/crypto/talitos.c | 54 +- + include/asm-x86/cpufeature.h | 2 + + include/crypto/hash.h | 18 + + include/linux/crypto.h | 10 + + 18 files changed, 11292 insertions(+), 10008 deletions(-) + create mode 100644 arch/x86/crypto/crc32c-intel.c + rename crypto/{cryptomgr.c => algboss.c} (70%) + create mode 100644 crypto/testmgr.c + create mode 100644 crypto/testmgr.h +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Removed include/sound/cs4231.h +Auto-merged sound/core/sound.c +Removed sound/isa/cs423x/cs4231_lib.c +Auto-merged sound/soc/pxa/pxa2xx-pcm.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 10 +- + include/sound/ad1848.h | 218 --- + include/sound/asound.h | 3 +- + include/sound/asoundef.h | 89 +- + include/sound/core.h | 1 + + include/sound/cs4231.h | 175 -- + include/sound/jack.h | 75 + + include/sound/minors.h | 2 + + include/sound/pcm.h | 9 +- + include/sound/snd_wavefront.h | 1 - + include/sound/soc-of-simple.h | 25 + + include/sound/soc.h | 74 +- + include/sound/wss.h | 235 +++ + sound/core/Kconfig | 6 + + sound/core/Makefile | 1 + + sound/core/jack.c | 163 ++ + sound/core/pcm.c | 50 +- + sound/core/sound.c | 2 - + sound/isa/Kconfig | 42 +- + sound/isa/Makefile | 2 +- + sound/isa/ad1848/Makefile | 2 - + sound/isa/ad1848/ad1848.c | 17 +- + sound/isa/ad1848/ad1848_lib.c | 1267 ------------- + sound/isa/azt2320.c | 29 +- + sound/isa/cmi8330.c | 106 +- + sound/isa/cs423x/Makefile | 2 - + sound/isa/cs423x/cs4231.c | 18 +- + sound/isa/cs423x/cs4231_lib.c | 1945 ------------------- + sound/isa/cs423x/cs4236.c | 51 +- + sound/isa/cs423x/cs4236_lib.c | 346 ++-- + sound/isa/gus/gusmax.c | 50 +- + sound/isa/gus/interwave.c | 67 +- + sound/isa/opl3sa2.c | 36 +- + sound/isa/opti9xx/miro.c | 25 +- + sound/isa/opti9xx/opti92x-ad1848.c | 70 +- + sound/isa/sc6000.c | 18 +- + sound/isa/sgalaxy.c | 43 +- + sound/isa/sscape.c | 63 +- + sound/isa/wavefront/wavefront.c | 62 +- + sound/isa/wss/Makefile | 10 + + sound/isa/wss/wss_lib.c | 2320 +++++++++++++++++++++++ + sound/pci/Kconfig | 10 +- + sound/pci/ac97/ac97_codec.c | 20 +- + sound/pci/ac97/ac97_patch.c | 8 + + sound/pci/au88x0/au88x0_core.c | 2 +- + sound/pci/hda/Makefile | 1 + + sound/pci/hda/hda_beep.c | 134 ++ + sound/pci/hda/hda_beep.h | 44 + + sound/pci/hda/hda_codec.h | 5 + + sound/pci/hda/patch_realtek.c | 48 + + sound/pci/hda/patch_sigmatel.c | 346 ++++- + sound/pci/ice1712/phase.c | 12 + + sound/pci/ice1712/phase.h | 4 +- + sound/pci/oxygen/virtuoso.c | 73 +- + sound/soc/codecs/Kconfig | 38 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ad1980.c | 309 +++ + sound/soc/codecs/ad1980.h | 23 + + sound/soc/codecs/cs4270.c | 71 +- + sound/soc/codecs/tlv320aic26.c | 520 +++++ + sound/soc/codecs/tlv320aic26.h | 96 + + sound/soc/codecs/wm8580.c | 1055 ++++++++++ + sound/soc/codecs/wm8580.h | 42 + + sound/soc/codecs/wm8900.c | 1542 +++++++++++++++ + sound/soc/codecs/wm8900.h | 64 + + sound/soc/fsl/Kconfig | 10 + + sound/soc/fsl/Makefile | 5 + + sound/soc/fsl/mpc5200_psc_i2s.c | 884 +++++++++ + sound/soc/fsl/mpc8610_hpcd.c | 26 +- + sound/soc/fsl/soc-of-simple.c | 171 ++ + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/soc-core.c | 132 +- + sound/soc/soc-dapm.c | 66 +- + sound/usb/Kconfig | 11 + + sound/usb/Makefile | 1 + + sound/usb/usbaudio.h | 1 + + sound/usb/usbmidi.c | 39 + + sound/usb/usbmixer.c | 9 +- + sound/usb/usbquirks.h | 31 +- + sound/usb/usx2y/Makefile | 2 + + sound/usb/usx2y/us122l.c | 692 +++++++ + sound/usb/usx2y/us122l.h | 27 + + sound/usb/usx2y/usb_stream.c | 761 ++++++++ + sound/usb/usx2y/usb_stream.h | 112 ++ + 84 files changed, 10832 insertions(+), 4357 deletions(-) + delete mode 100644 include/sound/cs4231.h + create mode 100644 include/sound/jack.h + create mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wss.h + create mode 100644 sound/core/jack.c + delete mode 100644 sound/isa/cs423x/cs4231_lib.c + create mode 100644 sound/isa/wss/Makefile + create mode 100644 sound/isa/wss/wss_lib.c + create mode 100644 sound/pci/hda/hda_beep.c + create mode 100644 sound/pci/hda/hda_beep.h + create mode 100644 sound/soc/codecs/ad1980.c + create mode 100644 sound/soc/codecs/ad1980.h + create mode 100644 sound/soc/codecs/tlv320aic26.c + create mode 100644 sound/soc/codecs/tlv320aic26.h + create mode 100644 sound/soc/codecs/wm8580.c + create mode 100644 sound/soc/codecs/wm8580.h + create mode 100644 sound/soc/codecs/wm8900.c + create mode 100644 sound/soc/codecs/wm8900.h + create mode 100644 sound/soc/fsl/mpc5200_psc_i2s.c + create mode 100644 sound/soc/fsl/soc-of-simple.c + create mode 100644 sound/usb/usx2y/us122l.c + create mode 100644 sound/usb/usx2y/us122l.h + create mode 100644 sound/usb/usx2y/usb_stream.c + create mode 100644 sound/usb/usx2y/usb_stream.h +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. + arch/arm/include/asm/cacheflush.h | 90 ------------------------- + arch/arm/include/asm/cachetype.h | 96 +++++++++++++++++++++++++++ + arch/arm/include/asm/cputype.h | 64 ++++++++++++++++++ + arch/arm/include/asm/mmu_context.h | 1 + + arch/arm/include/asm/system.h | 58 ---------------- + arch/arm/kernel/setup.c | 46 +++++++------ + arch/arm/mach-iop32x/iq31244.c | 4 +- + arch/arm/mach-ixp4xx/common-pci.c | 7 +- + arch/arm/mach-ixp4xx/include/mach/cpu.h | 9 ++- + arch/arm/mach-omap2/id.c | 1 + + arch/arm/mach-pxa/include/mach/hardware.h | 2 + + arch/arm/mach-sa1100/cpu-sa1100.c | 4 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 1 + + arch/arm/mach-sa1100/include/mach/SA-1100.h | 8 +-- + arch/arm/mm/copypage-v6.c | 1 + + arch/arm/mm/fault-armv.c | 1 + + arch/arm/mm/flush.c | 1 + + arch/arm/mm/ioremap.c | 1 + + arch/arm/mm/mmap.c | 5 +- + arch/arm/mm/mmu.c | 1 + + arch/arm/oprofile/op_model_xscale.c | 2 +- + drivers/watchdog/ixp4xx_wdt.c | 4 +- + 22 files changed, 215 insertions(+), 192 deletions(-) + create mode 100644 arch/arm/include/asm/cachetype.h + create mode 100644 arch/arm/include/asm/cputype.h +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c +Auto-merged drivers/cpufreq/cpufreq_conservative.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 13 ++- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 ++++---- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 ++++---- + drivers/cpufreq/cpufreq.c | 30 ++++-- + drivers/cpufreq/cpufreq_conservative.c | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 140 ++++++++++++++++++++-------- + include/linux/cpufreq.h | 7 +- + include/linux/tick.h | 2 +- + kernel/time/tick-sched.c | 11 ++- + 9 files changed, 186 insertions(+), 101 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged arch/x86/Kconfig +Auto-merged include/linux/init.h +Auto-merged init/main.c +Auto-merged kernel/module.c +Merge made by recursive. + Documentation/lguest/lguest.c | 23 +---------------------- + arch/powerpc/Kconfig | 3 --- + arch/x86/Kconfig | 1 - + arch/x86/mm/Makefile | 3 +-- + drivers/lguest/page_tables.c | 25 +++++++++---------------- + include/linux/compiler-gcc.h | 18 ++++++++++++++++++ + include/linux/compiler-intel.h | 2 ++ + include/linux/init.h | 1 + + include/linux/kernel.h | 35 +++++++++++++++++++++++++++++++++++ + include/linux/kthread.h | 28 +++++++++++++++++++++++++--- + include/linux/mm.h | 20 -------------------- + include/linux/stop_machine.h | 13 ++++++++----- + init/main.c | 6 ++++-- + kernel/kthread.c | 29 +++++------------------------ + kernel/module.c | 2 +- + kernel/stop_machine.c | 5 ++--- + mm/Kconfig | 3 --- + mm/util.c | 15 +++++++++++++++ + 18 files changed, 127 insertions(+), 105 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 11 +- + fs/gfs2/incore.h | 7 +- + fs/gfs2/mount.c | 7 + + fs/gfs2/ops_fstype.c | 566 ++++++++++++++++++++++++++++++++++---------------- + fs/gfs2/ops_super.c | 57 +++++- + fs/gfs2/super.c | 340 ------------------------------ + fs/gfs2/super.h | 6 - + 7 files changed, 454 insertions(+), 540 deletions(-) +Merging input/next +$ git merge input/next +Auto-merged drivers/input/keyboard/gpio_keys.c +Merge made by recursive. + drivers/input/gameport/gameport.c | 88 +++- + drivers/input/joystick/a3d.c | 3 +- + drivers/input/joystick/adi.c | 3 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/joystick/cobra.c | 3 +- + drivers/input/joystick/gf2k.c | 3 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 3 +- + drivers/input/joystick/interact.c | 3 +- + drivers/input/joystick/joydump.c | 3 +- + drivers/input/joystick/sidewinder.c | 3 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/keyboard/atkbd.c | 20 +- + drivers/input/keyboard/gpio_keys.c | 42 +- + drivers/input/misc/Kconfig | 13 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 263 +++++++++-- + drivers/input/misc/cm109.c | 884 +++++++++++++++++++++++++++++++++++ + drivers/input/misc/wistron_btns.c | 19 + + drivers/input/mouse/appletouch.c | 299 +++++++++--- + drivers/input/mouse/logips2pp.c | 4 +- + drivers/input/mouse/psmouse-base.c | 12 +- + drivers/input/mouse/trackpoint.c | 8 +- + drivers/input/tablet/aiptek.c | 53 ++- + drivers/input/touchscreen/ads7846.c | 6 +- + include/linux/gameport.h | 7 +- + include/linux/input.h | 15 +- + include/linux/mod_devicetable.h | 2 +- + 29 files changed, 1534 insertions(+), 239 deletions(-) + create mode 100644 drivers/input/misc/cm109.c +Merging semaphore/semaphore +$ git merge semaphore/semaphore +Already up-to-date. +Merging semaphore-removal/semaphore-removal +$ git merge semaphore-removal/semaphore-removal +Auto-merged arch/arm/mach-lh7a40x/clocks.c +Auto-merged drivers/net/bonding/bond_main.c +Auto-merged drivers/net/bonding/bond_sysfs.c +Auto-merged drivers/net/ps3_gelic_wireless.c +Auto-merged drivers/scsi/qla2xxx/qla_def.h +Auto-merged sound/soc/s3c24xx/s3c2443-ac97.c +Merge made by recursive. + arch/arm/mach-lh7a40x/clocks.c | 15 ++++++++------- + drivers/net/bonding/bond_main.c | 21 +++++++++++---------- + drivers/net/bonding/bond_sysfs.c | 15 ++++++++------- + drivers/net/ppp_async.c | 8 ++++---- + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/pci/hotplug/ibmphp_hpc.c | 30 ++++++++++++++---------------- + drivers/scsi/qla2xxx/qla_def.h | 1 - + include/net/bluetooth/hci_core.h | 7 ++++--- + net/9p/trans_virtio.c | 21 +++++++++++---------- + net/bluetooth/hci_core.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 11 ++++++----- + 12 files changed, 69 insertions(+), 64 deletions(-) +Merging bkl-removal/bkl-removal +$ git merge bkl-removal/bkl-removal +Auto-merged drivers/infiniband/core/ucma.c +Merge made by recursive. +Merging trivial/next +$ git merge trivial/next +Auto-merged Documentation/edac.txt +CONFLICT (content): Merge conflict in Documentation/edac.txt +Auto-merged arch/mips/kernel/vpe.c +Auto-merged drivers/base/sys.c +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/net/spider_net.c +Auto-merged drivers/serial/mpc52xx_uart.c +Auto-merged drivers/usb/serial/ftdi_sio.c +Auto-merged fs/ntfs/aops.c +Auto-merged include/linux/securebits.h +CONFLICT (content): Merge conflict in include/linux/securebits.h +Auto-merged mm/migrate.c +Auto-merged mm/slub.c +Auto-merged net/wireless/wext.c +Resolved 'Documentation/edac.txt' using previous resolution. +Resolved 'include/linux/securebits.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit bc97f2f: Merge commit 'trivial/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/hfs.txt | 2 +- + Documentation/ja_JP/SubmittingPatches | 4 ++-- + Documentation/zh_CN/SubmittingPatches | 4 ++-- + arch/mips/kernel/vpe.c | 2 +- + arch/sh/lib64/c-checksum.c | 4 ++-- + drivers/base/sys.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/ibmasm/event.c | 2 +- + drivers/net/spider_net.c | 2 +- + drivers/serial/mpc52xx_uart.c | 4 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + fs/jffs2/fs.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/proc/nommu.c | 2 +- + mm/migrate.c | 2 +- + mm/slub.c | 4 ++-- + net/wireless/wext.c | 2 +- + 19 files changed, 24 insertions(+), 24 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Merge made by recursive. + Documentation/filesystems/ubifs.txt | 2 +- + fs/ubifs/budget.c | 33 +++++++++-- + fs/ubifs/commit.c | 3 +- + fs/ubifs/debug.c | 27 +++++---- + fs/ubifs/dir.c | 20 +++---- + fs/ubifs/file.c | 8 ++- + fs/ubifs/find.c | 9 ++- + fs/ubifs/io.c | 14 +++++ + fs/ubifs/journal.c | 108 ++++++++++++++++++++++++++--------- + fs/ubifs/log.c | 4 +- + fs/ubifs/misc.h | 16 +----- + fs/ubifs/orphan.c | 4 +- + fs/ubifs/super.c | 102 ++++++++++++++++++++++++++------- + fs/ubifs/tnc_commit.c | 37 ++++++------ + fs/ubifs/ubifs-media.h | 4 +- + fs/ubifs/ubifs.h | 27 +++++++-- + fs/ubifs/xattr.c | 4 +- + 17 files changed, 290 insertions(+), 132 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Auto-merged drivers/media/dvb/ttpci/Kconfig +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Kconfig +Auto-merged drivers/media/dvb/ttpci/Makefile +CONFLICT (content): Merge conflict in drivers/media/dvb/ttpci/Makefile +Auto-merged drivers/media/dvb/ttpci/av7110.c +Auto-merged drivers/media/dvb/ttpci/av7110_hw.h +Removed drivers/media/dvb/ttpci/fdump.c +Auto-merged drivers/net/acenic.c +Auto-merged drivers/net/acenic.h +Removed drivers/net/acenic_firmware.h +Auto-merged drivers/net/e100.c +Auto-merged drivers/net/starfire.c +Removed drivers/net/starfire_firmware.h +Removed drivers/net/starfire_firmware.pl +Auto-merged drivers/net/tg3.c +Auto-merged drivers/net/tg3.h +Auto-merged drivers/scsi/advansys.c +Removed drivers/scsi/ql1040_fw.h +Removed drivers/scsi/ql12160_fw.h +Removed drivers/scsi/ql1280_fw.h +Auto-merged drivers/scsi/qla1280.c +Removed drivers/scsi/qlogicpti_asm.c +Resolved 'drivers/media/dvb/ttpci/Kconfig' using previous resolution. +Resolved 'drivers/media/dvb/ttpci/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit e0b3e7a: Merge commit 'firmware/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/dvb/ttpci/Kconfig | 23 +- + drivers/media/dvb/ttpci/Makefile | 9 - + drivers/media/dvb/ttpci/av7110.c | 16 - + drivers/media/dvb/ttpci/av7110_hw.c | 35 +- + drivers/media/dvb/ttpci/av7110_hw.h | 3 +- + drivers/media/dvb/ttpci/fdump.c | 44 - + drivers/net/acenic.c | 117 +- + drivers/net/acenic.h | 4 + + drivers/net/acenic_firmware.h | 9456 --------------------------------- + drivers/net/e100.c | 283 +- + drivers/net/starfire.c | 51 +- + drivers/net/starfire_firmware.h | 346 -- + drivers/net/starfire_firmware.pl | 31 - + drivers/net/tg3.c | 789 +--- + drivers/net/tg3.h | 4 + + drivers/scsi/advansys.c | 1731 +------ + drivers/scsi/ql1040_fw.h | 2130 -------- + drivers/scsi/ql12160_fw.h | 1811 ------- + drivers/scsi/ql1280_fw.h | 2048 ------- + drivers/scsi/qla1280.c | 114 +- + drivers/scsi/qla1280.h | 6 + + drivers/scsi/qlogicpti.c | 63 +- + drivers/scsi/qlogicpti_asm.c | 1160 ---- + firmware/Makefile | 19 + + firmware/WHENCE | 109 + + firmware/acenic/tg1.bin.ihex | 4573 ++++++++++++++++ + firmware/acenic/tg2.bin.ihex | 4844 +++++++++++++++++ + firmware/adaptec/starfire_rx.bin.ihex | 53 + + firmware/adaptec/starfire_tx.bin.ihex | 53 + + firmware/advansys/3550.bin.ihex | 317 ++ + firmware/advansys/38C0800.bin.ihex | 336 ++ + firmware/advansys/38C1600.bin.ihex | 398 ++ + firmware/advansys/mcode.bin.ihex | 147 + + firmware/av7110/Boot.S | 109 + + firmware/av7110/bootcode.bin.ihex | 15 + + firmware/e100/d101m_ucode.bin.ihex | 38 + + firmware/e100/d101s_ucode.bin.ihex | 38 + + firmware/e100/d102e_ucode.bin.ihex | 38 + + firmware/qlogic/1040.bin.ihex | 2111 ++++++++ + firmware/qlogic/12160.bin.ihex | 1771 ++++++ + firmware/qlogic/1280.bin.ihex | 2008 +++++++ + firmware/qlogic/isp1000.bin.ihex | 1158 ++++ + firmware/tigon/tg3.bin.ihex | 175 + + firmware/tigon/tg3_tso.bin.ihex | 446 ++ + firmware/tigon/tg3_tso5.bin.ihex | 252 + + 45 files changed, 19549 insertions(+), 19733 deletions(-) + delete mode 100644 drivers/media/dvb/ttpci/fdump.c + delete mode 100644 drivers/net/acenic_firmware.h + delete mode 100644 drivers/net/starfire_firmware.h + delete mode 100644 drivers/net/starfire_firmware.pl + delete mode 100644 drivers/scsi/ql1040_fw.h + delete mode 100644 drivers/scsi/ql12160_fw.h + delete mode 100644 drivers/scsi/ql1280_fw.h + delete mode 100644 drivers/scsi/qlogicpti_asm.c + create mode 100644 firmware/acenic/tg1.bin.ihex + create mode 100644 firmware/acenic/tg2.bin.ihex + create mode 100644 firmware/adaptec/starfire_rx.bin.ihex + create mode 100644 firmware/adaptec/starfire_tx.bin.ihex + create mode 100644 firmware/advansys/3550.bin.ihex + create mode 100644 firmware/advansys/38C0800.bin.ihex + create mode 100644 firmware/advansys/38C1600.bin.ihex + create mode 100644 firmware/advansys/mcode.bin.ihex + create mode 100644 firmware/av7110/Boot.S + create mode 100644 firmware/av7110/bootcode.bin.ihex + create mode 100644 firmware/e100/d101m_ucode.bin.ihex + create mode 100644 firmware/e100/d101s_ucode.bin.ihex + create mode 100644 firmware/e100/d102e_ucode.bin.ihex + create mode 100644 firmware/qlogic/1040.bin.ihex + create mode 100644 firmware/qlogic/12160.bin.ihex + create mode 100644 firmware/qlogic/1280.bin.ihex + create mode 100644 firmware/qlogic/isp1000.bin.ihex + create mode 100644 firmware/tigon/tg3.bin.ihex + create mode 100644 firmware/tigon/tg3_tso.bin.ihex + create mode 100644 firmware/tigon/tg3_tso5.bin.ihex +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merged drivers/char/pcmcia/cm4000_cs.c +Auto-merged drivers/char/pcmcia/cm4040_cs.c +Auto-merged drivers/ide/legacy/ide-cs.c +Auto-merged drivers/net/wireless/wavelan_cs.c +Auto-merged drivers/pcmcia/soc_common.c +Merge made by recursive. + Documentation/pcmcia/driver-changes.txt | 6 + + drivers/ata/pata_pcmcia.c | 168 ++++++-------- + drivers/bluetooth/bluecard_cs.c | 8 +- + drivers/bluetooth/bt3c_cs.c | 123 ++++------ + drivers/bluetooth/btuart_cs.c | 124 ++++------ + drivers/bluetooth/dtl1_cs.c | 67 ++----- + drivers/char/pcmcia/cm4000_cs.c | 73 ++---- + drivers/char/pcmcia/cm4040_cs.c | 79 +++---- + drivers/char/pcmcia/ipwireless/main.c | 46 ++--- + drivers/ide/legacy/ide-cs.c | 155 ++++++------- + drivers/isdn/hardware/avm/avm_cs.c | 85 +++----- + drivers/isdn/hisax/avma1_cs.c | 81 ++----- + drivers/isdn/hisax/elsa_cs.c | 77 ++----- + drivers/isdn/hisax/sedlbauer_cs.c | 197 ++++++++--------- + drivers/isdn/hisax/teles_cs.c | 77 ++----- + drivers/mtd/maps/pcmciamtd.c | 26 +-- + drivers/net/pcmcia/3c574_cs.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 6 +- + drivers/net/pcmcia/axnet_cs.c | 77 +++---- + drivers/net/pcmcia/com20020_cs.c | 8 +- + drivers/net/pcmcia/fmvj18x_cs.c | 18 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 +- + drivers/net/pcmcia/pcnet_cs.c | 85 ++++---- + drivers/net/pcmcia/smc91c92_cs.c | 138 +++++------- + drivers/net/pcmcia/xirc2ps_cs.c | 75 ++++--- + drivers/net/wireless/airo_cs.c | 222 +++++++++--------- + drivers/net/wireless/atmel_cs.c | 119 +++++------ + drivers/net/wireless/b43/pcmcia.c | 14 +- + drivers/net/wireless/hostap/hostap_cs.c | 235 +++++++++----------- + drivers/net/wireless/netwave_cs.c | 4 +- + drivers/net/wireless/orinoco_cs.c | 163 ++++++-------- + drivers/net/wireless/ray_cs.c | 4 +- + drivers/net/wireless/spectrum_cs.c | 162 ++++++-------- + drivers/net/wireless/wavelan_cs.c | 16 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + drivers/parport/parport_cs.c | 70 +++---- + drivers/pcmcia/Makefile | 4 - + drivers/pcmcia/cardbus.c | 2 +- + drivers/pcmcia/cistpl.c | 240 +++++++++++---------- + drivers/pcmcia/cs.c | 72 +++--- + drivers/pcmcia/cs_internal.h | 11 +- + drivers/pcmcia/ds.c | 236 ++++++++----------- + drivers/pcmcia/ds_internal.h | 2 +- + drivers/pcmcia/m32r_cfc.c | 2 +- + drivers/pcmcia/m32r_pcc.c | 2 +- + drivers/pcmcia/o2micro.h | 6 +- + drivers/pcmcia/pcmcia_ioctl.c | 114 ++++++++-- + drivers/pcmcia/pcmcia_resource.c | 374 +++++++++++++++++-------------- + drivers/pcmcia/rsrc_nonstatic.c | 67 +++--- + drivers/pcmcia/soc_common.c | 2 +- + drivers/pcmcia/socket_sysfs.c | 13 +- + drivers/pcmcia/tcic.c | 2 +- + drivers/pcmcia/ti113x.h | 70 +++--- + drivers/pcmcia/yenta_socket.c | 77 ++++--- + drivers/scsi/pcmcia/aha152x_stub.c | 58 +++--- + drivers/scsi/pcmcia/fdomain_stub.c | 37 ++-- + drivers/scsi/pcmcia/nsp_cs.c | 180 ++++++++-------- + drivers/scsi/pcmcia/qlogic_stub.c | 47 ++--- + drivers/scsi/pcmcia/sym53c500_cs.c | 46 ++-- + drivers/serial/serial_cs.c | 300 +++++++++++-------------- + drivers/ssb/pcmcia.c | 22 +- + drivers/telephony/ixj_pcmcia.c | 72 +++---- + drivers/usb/host/sl811_cs.c | 130 +++++------- + include/pcmcia/cistpl.h | 18 +- + include/pcmcia/cs.h | 55 ----- + include/pcmcia/ds.h | 43 ++++- + include/pcmcia/ss.h | 4 +- + 67 files changed, 2338 insertions(+), 2790 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + drivers/serial/serial_txx9.c | 113 ++++++++++++++++++++++++++++++++++-------- + 1 files changed, 92 insertions(+), 21 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merged mm/slub.c +Merge made by recursive. + include/linux/slub_def.h | 1 + + mm/slab.c | 1 - + mm/slob.c | 1 - + mm/slub.c | 27 +++++++++++++++++++-------- + 4 files changed, 20 insertions(+), 10 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/coldfire/entry.S | 15 ++------------- + 1 files changed, 2 insertions(+), 13 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Merge made by recursive. + drivers/md/md.c | 29 +++++++++++++++++++++++++++-- + drivers/md/raid10.c | 9 +++++---- + drivers/md/raid5.c | 32 ++++++++++++++++++++++++-------- + 3 files changed, 56 insertions(+), 14 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v10/boot/rescue/Makefile | 2 +- + .../arch-v10/boot/rescue/{rescue.ld => rescue.lds} | 0 + arch/cris/arch-v32/boot/compressed/Makefile | 2 +- + .../compressed/{decompress.ld => decompress.lds} | 0 + arch/cris/arch-v32/boot/rescue/Makefile | 2 +- + .../arch-v32/boot/rescue/{rescue.ld => rescue.lds} | 0 + 8 files changed, 4 insertions(+), 4 deletions(-) + rename arch/cris/arch-v10/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v10/boot/rescue/{rescue.ld => rescue.lds} (100%) + rename arch/cris/arch-v32/boot/compressed/{decompress.ld => decompress.lds} (100%) + rename arch/cris/arch-v32/boot/rescue/{rescue.ld => rescue.lds} (100%) +Merging kmemcheck/auto-kmemcheck-next +$ git merge kmemcheck/auto-kmemcheck-next +Auto-merged MAINTAINERS +Auto-merged arch/x86/Kconfig.debug +Auto-merged arch/x86/kernel/process_64.c +Auto-merged arch/x86/kernel/traps_32.c +Auto-merged arch/x86/kernel/traps_64.c +Auto-merged arch/x86/mm/Makefile +Auto-merged arch/x86/mm/fault.c +Auto-merged include/linux/interrupt.h +Auto-merged include/linux/mm_types.h +Auto-merged init/main.c +Auto-merged kernel/fork.c +Auto-merged kernel/sysctl.c +Auto-merged mm/Makefile +Auto-merged mm/slab.c +Auto-merged mm/slub.c +Merge made by recursive. + Documentation/kmemcheck.txt | 135 ++++++++++ + MAINTAINERS | 8 + + arch/x86/Kconfig.debug | 109 +++++++++ + arch/x86/kernel/process.c | 2 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/stacktrace.c | 7 + + arch/x86/kernel/traps_32.c | 11 +- + arch/x86/kernel/traps_64.c | 11 +- + arch/x86/mm/Makefile | 2 + + arch/x86/mm/fault.c | 18 ++- + arch/x86/mm/kmemcheck/Makefile | 3 + + arch/x86/mm/kmemcheck/error.c | 216 ++++++++++++++++ + arch/x86/mm/kmemcheck/error.h | 15 ++ + arch/x86/mm/kmemcheck/kmemcheck.c | 485 +++++++++++++++++++++++++++++++++++++ + arch/x86/mm/kmemcheck/opcode.c | 72 ++++++ + arch/x86/mm/kmemcheck/opcode.h | 9 + + arch/x86/mm/kmemcheck/pte.c | 22 ++ + arch/x86/mm/kmemcheck/pte.h | 10 + + arch/x86/mm/kmemcheck/shadow.c | 178 ++++++++++++++ + arch/x86/mm/kmemcheck/shadow.h | 16 ++ + arch/x86/mm/kmemcheck/smp.c | 80 ++++++ + arch/x86/mm/kmemcheck/smp.h | 23 ++ + arch/x86/mm/kmemcheck/string.c | 95 +++++++ + include/asm-x86/kdebug.h | 3 +- + include/asm-x86/kmemcheck.h | 36 +++ + include/asm-x86/pgtable.h | 4 +- + include/asm-x86/pgtable_32.h | 6 + + include/asm-x86/pgtable_64.h | 6 + + include/asm-x86/string_32.h | 8 + + include/asm-x86/string_64.h | 1 + + include/linux/gfp.h | 3 +- + include/linux/interrupt.h | 14 + + include/linux/kmemcheck.h | 70 ++++++ + include/linux/mm_types.h | 4 + + include/linux/slab.h | 7 + + include/linux/slab_def.h | 81 ++++++ + include/linux/stacktrace.h | 3 + + init/main.c | 4 + + kernel/fork.c | 16 +- + kernel/softirq.c | 11 + + kernel/sysctl.c | 26 ++- + mm/Makefile | 2 +- + mm/kmemcheck.c | 97 ++++++++ + mm/slab.c | 101 ++------- + mm/slub.c | 20 ++- + 46 files changed, 1948 insertions(+), 118 deletions(-) + create mode 100644 Documentation/kmemcheck.txt + create mode 100644 arch/x86/mm/kmemcheck/Makefile + create mode 100644 arch/x86/mm/kmemcheck/error.c + create mode 100644 arch/x86/mm/kmemcheck/error.h + create mode 100644 arch/x86/mm/kmemcheck/kmemcheck.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.c + create mode 100644 arch/x86/mm/kmemcheck/opcode.h + create mode 100644 arch/x86/mm/kmemcheck/pte.c + create mode 100644 arch/x86/mm/kmemcheck/pte.h + create mode 100644 arch/x86/mm/kmemcheck/shadow.c + create mode 100644 arch/x86/mm/kmemcheck/shadow.h + create mode 100644 arch/x86/mm/kmemcheck/smp.c + create mode 100644 arch/x86/mm/kmemcheck/smp.h + create mode 100644 arch/x86/mm/kmemcheck/string.c + create mode 100644 include/asm-x86/kmemcheck.h + create mode 100644 include/linux/kmemcheck.h + create mode 100644 mm/kmemcheck.c +Merging generic-ipi/auto-generic-ipi-next +$ git merge generic-ipi/auto-generic-ipi-next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merged drivers/mtd/nand/Kconfig +Auto-merged drivers/mtd/nand/Makefile +Merge made by recursive. + drivers/mfd/Kconfig | 21 ++ + drivers/mfd/Makefile | 2 + + drivers/mfd/mfd-core.c | 15 +- + drivers/mfd/sm501.c | 6 +- + drivers/mfd/t7l66xb.c | 419 +++++++++++++++++++++++++ + drivers/mfd/tc6387xb.c | 181 +++++++++++ + drivers/mfd/tc6393xb.c | 159 ++++++---- + drivers/mmc/host/Kconfig | 6 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/tmio_mmc.c | 691 ++++++++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/tmio_mmc.h | 194 ++++++++++++ + drivers/mtd/nand/Kconfig | 7 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/tmio_nand.c | 556 +++++++++++++++++++++++++++++++++ + include/linux/mfd/t7l66xb.h | 36 +++ + include/linux/mfd/tc6387xb.h | 23 ++ + include/linux/mfd/tc6393xb.h | 9 +- + include/linux/mfd/tmio.h | 19 +- + 18 files changed, 2263 insertions(+), 83 deletions(-) + create mode 100644 drivers/mfd/t7l66xb.c + create mode 100644 drivers/mfd/tc6387xb.c + create mode 100644 drivers/mmc/host/tmio_mmc.c + create mode 100644 drivers/mmc/host/tmio_mmc.h + create mode 100644 drivers/mtd/nand/tmio_nand.c + create mode 100644 include/linux/mfd/t7l66xb.h + create mode 100644 include/linux/mfd/tc6387xb.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Merge made by recursive. + drivers/net/wan/c101.c | 6 +- + drivers/net/wan/{hd6457x.c => hd64570.c} | 254 +++--------- + drivers/net/wan/hd64572.c | 641 ++++++++++++++++++++++++++++++ + drivers/net/wan/n2.c | 9 +- + drivers/net/wan/pc300too.c | 73 +--- + drivers/net/wan/pci200syn.c | 77 ++--- + 6 files changed, 750 insertions(+), 310 deletions(-) + rename drivers/net/wan/{hd6457x.c => hd64570.c} (78%) + create mode 100644 drivers/net/wan/hd64572.c +Merging drm/drm-next +$ git merge drm/drm-next +Merge made by recursive. + drivers/gpu/drm/drm_irq.c | 20 +- + drivers/gpu/drm/i915/i915_dma.c | 167 +++-- + drivers/gpu/drm/i915/i915_drv.c | 54 +- + drivers/gpu/drm/i915/i915_drv.h | 843 +---------------------- + drivers/gpu/drm/i915/i915_irq.c | 176 ++++-- + drivers/gpu/drm/i915/i915_reg.h | 1405 +++++++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/sis/sis_mm.c | 10 +- + include/drm/drm.h | 17 - + 8 files changed, 1698 insertions(+), 994 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_reg.h +Merging voltage/reg-for-linus +$ git merge voltage/reg-for-linus +Already up-to-date. +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/selinux/hooks.c | 45 ++++++++++-------- + security/selinux/ss/avtab.c | 6 +-- + security/selinux/ss/conditional.c | 2 +- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/mls.c | 14 +++--- + security/selinux/ss/policydb.c | 20 ++++---- + security/smack/smack.h | 1 + + security/smack/smack_access.c | 10 ++++- + security/smack/smackfs.c | 92 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 149 insertions(+), 43 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Auto-merged drivers/char/Makefile +Auto-merged drivers/char/tty_io.c +CONFLICT (delete/modify): drivers/char/viocons.c deleted in HEAD and modified in quilt/ttydev. Version quilt/ttydev of drivers/char/viocons.c left in tree. +Auto-merged drivers/char/vt.c +Auto-merged drivers/serial/Kconfig +Removed drivers/serial/mcfserial.c +Removed drivers/serial/mcfserial.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm drivers/char/viocons.c +rm 'drivers/char/viocons.c' +rm 'drivers/char/viocons.c' +$ git commit -v -a +Created commit 71e15d7: Merge branch 'quilt/ttydev' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/blackfin/kernel/bfin_dma_5xx.c | 13 +- + arch/um/drivers/line.c | 7 + + drivers/char/Makefile | 2 +- + drivers/char/epca.c | 5 +- + drivers/char/tty_buffer.c | 511 ++++++ + drivers/char/tty_io.c | 716 ++------ + drivers/char/tty_port.c | 55 + + drivers/char/vt.c | 84 +- + drivers/char/vt_ioctl.c | 9 +- + drivers/serial/68328serial.c | 11 +- + drivers/serial/8250.c | 73 +- + drivers/serial/Kconfig | 16 +- + drivers/serial/Makefile | 1 - + drivers/serial/bfin_5xx.c | 123 +- + drivers/serial/mcfserial.c | 1965 --------------------- + drivers/serial/mcfserial.h | 74 - + fs/dquot.c | 6 +- + include/asm-blackfin/mach-bf527/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf533/bfin_serial_5xx.h | 4 +- + include/asm-blackfin/mach-bf537/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf548/bfin_serial_5xx.h | 6 +- + include/asm-blackfin/mach-bf561/bfin_serial_5xx.h | 4 +- + include/linux/tty.h | 23 + + include/linux/tty_driver.h | 14 + + include/linux/vt_kern.h | 1 - + kernel/printk.c | 16 - + 27 files changed, 990 insertions(+), 2769 deletions(-) + create mode 100644 drivers/char/tty_buffer.c + create mode 100644 drivers/char/tty_port.c + delete mode 100644 drivers/serial/mcfserial.c + delete mode 100644 drivers/serial/mcfserial.h +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. + drivers/char/agp/agp.h | 3 + + drivers/char/agp/ali-agp.c | 10 ++-- + drivers/char/agp/amd-k7-agp.c | 10 ++-- + drivers/char/agp/amd64-agp.c | 51 ++++++++++++++--------- + drivers/char/agp/ati-agp.c | 7 +-- + drivers/char/agp/backend.c | 28 ++++++++----- + drivers/char/agp/generic.c | 41 +++++++++++++++---- + drivers/char/agp/intel-agp.c | 83 ++++++++++++++++++++++----------------- + drivers/char/agp/isoch.c | 37 +++++++++-------- + drivers/char/agp/sis-agp.c | 15 +++---- + drivers/char/agp/sworks-agp.c | 25 ++++++------ + drivers/char/agp/uninorth-agp.c | 32 +++++++------- + include/linux/agp_backend.h | 5 ++ + 13 files changed, 204 insertions(+), 143 deletions(-) +Merging creds/next-creds +$ git merge creds/next-creds +Auto-merged arch/mips/kernel/vpe.c +Auto-merged arch/x86/mm/fault.c +Auto-merged drivers/usb/core/devio.c +Auto-merged fs/dquot.c +Auto-merged fs/jffs2/fs.c +Auto-merged fs/ubifs/budget.c +Auto-merged fs/ubifs/dir.c +Auto-merged fs/xfs/linux-2.6/xfs_ioctl.c +Auto-merged fs/xfs/linux-2.6/xfs_linux.h +Auto-merged fs/xfs/xfs_acl.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_acl.c +Auto-merged fs/xfs/xfs_inode.c +Auto-merged fs/xfs/xfs_inode.h +Auto-merged fs/xfs/xfs_vnodeops.c +Removed include/linux/key-ui.h +Auto-merged include/linux/sched.h +Auto-merged init/main.c +Auto-merged kernel/Makefile +Auto-merged kernel/exit.c +Auto-merged kernel/fork.c +Auto-merged kernel/sched.c +Auto-merged kernel/sysctl.c +Auto-merged lib/Makefile +Auto-merged mm/migrate.c +Resolved 'fs/xfs/xfs_acl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit d130f7d: Merge commit 'creds/next-creds' +$ git diff -M --stat --summary HEAD^.. + Documentation/credentials.txt | 563 +++++++++++++ + arch/alpha/kernel/asm-offsets.c | 11 +- + arch/alpha/kernel/entry.S | 10 +- + arch/ia64/kernel/mca_drv.c | 2 +- + arch/ia64/kernel/perfmon.c | 23 +- + arch/ia64/kernel/signal.c | 4 +- + arch/mips/kernel/kspd.c | 4 +- + arch/mips/kernel/mips-mt-fpaff.c | 5 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/mm/fault.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 9 +- + arch/s390/hypfs/inode.c | 4 +- + arch/s390/kernel/compat_linux.c | 28 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/mm/fault.c | 2 +- + drivers/block/loop.c | 6 +- + drivers/char/tty_audit.c | 6 +- + drivers/connector/cn_proc.c | 16 +- + drivers/gpu/drm/drm_fops.c | 2 +- + drivers/isdn/capi/capifs.c | 4 +- + drivers/isdn/hysdn/hysdn_procconf.c | 6 +- + drivers/media/video/cpia.c | 2 +- + drivers/net/tun.c | 8 +- + drivers/net/wan/sbni.c | 9 +- + drivers/usb/core/devio.c | 10 +- + drivers/usb/core/inode.c | 4 +- + fs/9p/fid.c | 2 +- + fs/9p/vfs_inode.c | 4 +- + fs/9p/vfs_super.c | 4 +- + fs/affs/inode.c | 4 +- + fs/affs/super.c | 4 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 4 +- + fs/autofs/inode.c | 4 +- + fs/autofs4/inode.c | 4 +- + fs/autofs4/waitq.c | 4 +- + fs/bfs/dir.c | 4 +- + fs/binfmt_aout.c | 2 +- + fs/binfmt_elf.c | 20 +- + fs/binfmt_elf_fdpic.c | 19 +- + fs/binfmt_flat.c | 2 +- + fs/binfmt_som.c | 2 +- + fs/cifs/cifs_fs_sb.h | 2 +- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 12 +- + fs/cifs/inode.c | 8 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/misc.c | 4 +- + fs/coda/cache.c | 6 +- + fs/coda/file.c | 3 +- + fs/coda/upcall.c | 2 +- + fs/compat.c | 20 +- + fs/devpts/inode.c | 4 +- + fs/dquot.c | 4 +- + fs/ecryptfs/ecryptfs_kernel.h | 3 +- + fs/ecryptfs/kthread.c | 9 +- + fs/ecryptfs/main.c | 3 +- + fs/ecryptfs/messaging.c | 18 +- + fs/ecryptfs/miscdev.c | 20 +- + fs/exec.c | 158 ++-- + fs/exportfs/expfs.c | 4 +- + fs/ext2/balloc.c | 2 +- + fs/ext2/ialloc.c | 4 +- + fs/ext3/balloc.c | 2 +- + fs/ext3/ialloc.c | 4 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/ialloc.c | 4 +- + fs/fat/file.c | 2 +- + fs/fat/inode.c | 4 +- + fs/fcntl.c | 18 +- + fs/file_table.c | 10 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 25 +- + fs/gfs2/inode.c | 10 +- + fs/hfs/inode.c | 4 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/inode.c | 4 +- + fs/hfsplus/options.c | 4 +- + fs/hpfs/namei.c | 24 +- + fs/hpfs/super.c | 4 +- + fs/hppfs/hppfs.c | 6 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inotify_user.c | 2 +- + fs/internal.h | 6 + + fs/ioprio.c | 18 +- + fs/jffs2/fs.c | 4 +- + fs/jfs/jfs_inode.c | 4 +- + fs/locks.c | 2 +- + fs/minix/bitmap.c | 4 +- + fs/namei.c | 10 +- + fs/namespace.c | 2 +- + fs/ncpfs/ioctl.c | 91 +- + fs/nfsctl.c | 4 +- + fs/nfsd/auth.c | 95 ++- + fs/nfsd/nfs4recover.c | 71 +- + fs/nfsd/nfsfh.c | 11 +- + fs/nfsd/vfs.c | 9 +- + fs/ocfs2/dlm/dlmfs.c | 8 +- + fs/ocfs2/namei.c | 4 +- + fs/omfs/inode.c | 8 +- + fs/open.c | 59 +- + fs/pipe.c | 4 +- + fs/posix_acl.c | 4 +- + fs/proc/array.c | 32 +- + fs/proc/base.c | 32 +- + fs/quota.c | 4 +- + fs/ramfs/inode.c | 4 +- + fs/reiserfs/namei.c | 4 +- + fs/smbfs/dir.c | 3 +- + fs/smbfs/inode.c | 2 +- + fs/smbfs/proc.c | 2 +- + fs/sysv/ialloc.c | 4 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/dir.c | 4 +- + fs/udf/ialloc.c | 4 +- + fs/udf/namei.c | 2 +- + fs/ufs/ialloc.c | 4 +- + fs/xfs/linux-2.6/xfs_cred.h | 6 +- + fs/xfs/linux-2.6/xfs_globals.h | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 5 +- + fs/xfs/linux-2.6/xfs_linux.h | 4 +- + fs/xfs/xfs_acl.c | 6 +- + fs/xfs/xfs_inode.c | 4 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_vnodeops.c | 8 +- + fs/xfs/xfs_vnodeops.h | 10 +- + include/keys/keyring-type.h | 31 + + include/linux/binfmts.h | 16 +- + include/linux/capability.h | 15 +- + include/linux/cred.h | 334 ++++++++ + include/linux/fs.h | 8 +- + include/linux/init_task.h | 13 +- + include/linux/key-ui.h | 66 -- + include/linux/key.h | 32 +- + include/linux/keyctl.h | 4 +- + include/linux/sched.h | 65 +-- + include/linux/securebits.h | 2 +- + include/linux/security.h | 365 ++++----- + include/net/scm.h | 4 +- + init/main.c | 1 + + ipc/mqueue.c | 19 +- + ipc/shm.c | 9 +- + ipc/util.c | 18 +- + kernel/Makefile | 2 +- + kernel/acct.c | 7 +- + kernel/auditsc.c | 57 +- + kernel/capability.c | 289 +------ + kernel/cgroup.c | 17 +- + kernel/cred-internals.h | 26 + + kernel/cred.c | 591 +++++++++++++ + kernel/exit.c | 23 +- + kernel/fork.c | 45 +- + kernel/futex.c | 20 +- + kernel/futex_compat.c | 7 +- + kernel/kmod.c | 30 +- + kernel/ptrace.c | 34 +- + kernel/sched.c | 26 +- + kernel/signal.c | 60 +- + kernel/sys.c | 579 +++++++------ + kernel/sysctl.c | 2 +- + kernel/timer.c | 8 +- + kernel/trace/trace.c | 2 +- + kernel/tsacct.c | 6 +- + kernel/uid16.c | 31 +- + kernel/user.c | 37 +- + kernel/user_namespace.c | 14 +- + kernel/workqueue.c | 8 +- + lib/Makefile | 2 +- + lib/is_single_threaded.c | 45 + + mm/mempolicy.c | 9 +- + mm/migrate.c | 9 +- + mm/oom_kill.c | 12 +- + mm/shmem.c | 8 +- + net/9p/client.c | 2 +- + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 2 +- + net/core/dev.c | 8 +- + net/core/scm.c | 10 +- + net/ipv4/netfilter/ipt_LOG.c | 4 +- + net/ipv6/ip6_flowlabel.c | 2 +- + net/ipv6/netfilter/ip6t_LOG.c | 4 +- + net/netfilter/nfnetlink_log.c | 5 +- + net/netfilter/xt_owner.c | 16 +- + net/netrom/af_netrom.c | 4 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-key.c | 6 +- + net/sched/cls_flow.c | 4 +- + net/socket.c | 4 +- + net/sunrpc/auth.c | 14 +- + net/unix/af_unix.c | 11 +- + security/capability.c | 59 +- + security/commoncap.c | 697 ++++++++++------ + security/keys/internal.h | 47 +- + security/keys/key.c | 25 +- + security/keys/keyctl.c | 210 +++-- + security/keys/keyring.c | 15 +- + security/keys/permission.c | 29 +- + security/keys/proc.c | 8 +- + security/keys/process_keys.c | 468 +++++------ + security/keys/request_key.c | 133 ++-- + security/keys/request_key_auth.c | 46 +- + security/root_plug.c | 16 +- + security/security.c | 106 ++-- + security/selinux/exports.c | 8 +- + security/selinux/hooks.c | 1169 ++++++++++++++------------ + security/selinux/include/av_perm_to_string.h | 2 + + security/selinux/include/av_permissions.h | 2 + + security/selinux/include/class_to_string.h | 5 + + security/selinux/include/flask.h | 1 + + security/selinux/include/objsec.h | 11 - + security/selinux/selinuxfs.c | 13 +- + security/selinux/xfrm.c | 6 +- + security/smack/smack_access.c | 4 +- + security/smack/smack_lsm.c | 218 ++++-- + security/smack/smackfs.c | 6 +- + 217 files changed, 5167 insertions(+), 3103 deletions(-) + create mode 100644 Documentation/credentials.txt + create mode 100644 include/keys/keyring-type.h + create mode 100644 include/linux/cred.h + delete mode 100644 include/linux/key-ui.h + create mode 100644 kernel/cred-internals.h + create mode 100644 kernel/cred.c + create mode 100644 lib/is_single_threaded.c +$ git am -3 ../patches/Add_cuImage.mpc866ads_to_the_bootwrapper_as_a_cuboot-8xx_target +Applying Add cuImage.mpc866ads to the bootwrapper as a cuboot-8xx target +$ git am -3 ../patches/xen_fixup_balloon_sysfs_issues +Applying xen-balloon: fix up sysfs issues +Applying ath9k: work around gcc ICE again diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..dd1043000195 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,252 @@ +Importing driver-core.current based on 2.6.27-rc2 +$ git checkout quilt/driver-core.current +Switched to branch "quilt/driver-core.current" +$ git reset --hard 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 +HEAD is now at 0967d61 Linux 2.6.27-rc2 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +device-create-block-convert-device_create_drvdata-to-device_create.patch +device-create-char-convert-device_create_drvdata-to-device_create.patch +device-create-ieee1394-convert-device_create_drvdata-to-device_create.patch +.dotest/patch:35: space before tab in indent. + MKDEV(IEEE1394_MAJOR, +warning: 1 line adds whitespace errors. +device-create-infiniband-convert-device_create_drvdata-to-device_create.patch +device-create-misc-convert-device_create_drvdata-to-device_create.patch +device-create-net-convert-device_create_drvdata-to-device_create.patch +device-create-s390-convert-device_create_drvdata-to-device_create.patch +device-create-scsi-convert-device_create_drvdata-to-device_create.patch +device-create-sound-convert-device_create_drvdata-to-device_create.patch +device-create-usb-convert-device_create_drvdata-to-device_create.patch +device-create-video-convert-device_create_drvdata-to-device_create.patch +device-create-ide-convert-device_create_drvdata-to-device_create.patch +device-create-remove-device_create_drvdata.patch +kobject-replace-all-occurrences-of-with-instead-of-only-the-first-one.patch +japanese-translation-of-documentation-submitchecklist.patch +drivers-base-driver.c-remove-unused-to_dev-macro.patch +dev_printk-constify-the-dev-argument.patch +driver-model-anti-oopsing-medicine.patch +pm-don-t-skip-device-pm-init-when-config_pm_sleep-isn-t-set-and-config_pm-is-set.patch +driver-core-add-init_name-to-struct-device.patch +pm-remove-warn_on-from-device_pm_add.patch +kobject-fix-kobject_rename-and-config_sysfs.patch +Importing usb.current based on quilt/driver-core.current +$ git checkout quilt/usb.current +Switched to branch "quilt/usb.current" +$ git reset --hard 934ab0fc56e9d408190313e88a14d0db68560f87 +HEAD is now at 934ab0f kobject: Fix kobject_rename and !CONFIG_SYSFS +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-auerswald-remove-driver.patch +usb-add-musb-and-tusb-support.patch +usb-musb-fix-hanging-when-rmmod-gadget-driver.patch +usb-musb-pass-configuration-specifics-via-pdata.patch +usb-fix-usb-boot-crash-ecm_do_notify-list_add-corruption.-prev-next-should-be-next.patch +usb-ftdi_sio-add-usb-product-id-for-elv-hs485.patch +usb-ftdi_sio-add-support-for-luminance-stellaris-evaluation-development-kits.patch +usb-add-missing-kerneldoc-line-for-needs_binding.patch +usb-core-driver-fix-warning.patch +usb-ohci-fix-system-hang-caused-by-earlier-patch.patch +drivers-usb-class-usblp.c-adjust-error-handling-code.patch +usb-kill-urbs-permanently.patch +usb-extend-poisoning-to-anchors.patch +usb-usb-storage-quirk-around-v1.11-firmware-on-nikon-d4.patch +usb-gadget-protect-gadget_chips.h-from-been-included-twice.patch +usb-serial-don-t-release-unregistered-minors.patch +usb-fix-interface-unregistration-logic.patch +usb-storage-automatically-recognize-bad-residues.patch +usb-move-usb-mon-up-to-misc-options-in-kconfig.patch +usb-storage-unusual_devs-entries-for-iriver-t10-and-datafab-cf-sm-reader.patch +ub-remove-sg_stat.patch +usb-pl2023-remove-usb-id-handled-by-ch341.patch +usb-serial-sierra-clean-up.patch +usb-serial-sierra-dynamic-interface-detection.patch +usb-serial-sierra-tru-install-feature-update.patch +usb-storage-sierra-tru-install-feature-update.patch +usb-usb-storage-motorola-phone-razr-v3xx-us_fl_fix_capacity-patch.patch +usb-cxacru-fix-printk-format-flag-in-error-message.patch +usb-update-to-documentation.patch +usb-ohci-make-distrust_firmware-a-quirk.patch +usb-hook-start_hnp-into-ohci-struct.patch +usb-serial-gadget-rx-path-data-loss-fixes.patch +usb-return-error-code-instead-of-0-in-the-enqueue-function.patch +usb-isp1760-improve-pre-fetch-timing.patch +usb-isp1760-don-t-be-noisy-about-short-packets.patch +usb-ftdi_sio-add-support-for-phi-fisco-data-cable.patch +usb-bandrich-bandluxe-c150-c250-hspa-data-card-driver.patch +usb-cdc-acm.c-fix-compile-warnings.patch +usb-storage-unusual_devs-entry-for-nokia-5300.patch +usb-fix-compiler-warning-fix.patch +usb-isp1301-fix-compilation.patch +usb-sh-r8a66597-hcd-fix-disconnect-regression.patch +usb-gadget-remove-needless-struct-members.patch +usb-gadget-issue-notifications-from-acm-function.patch +usb-cdc-acm-bugfix-release.patch +usb-cdc-acm-stop-dropping-tx-buffers.patch +usb-cdc-acm-drain-writes-on-close.patch +usb-omap_udc-fix-compilation-with-debug-enabled.patch +usb-quirk-pll-power-down-mode.patch +usb-add-vendor-product-id-of-zte-mf628-to-option.patch +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 7708eba9f0cff55c0d0d781cd8877710adaa342d +HEAD is now at 7708eba USB: Add vendor/product id of ZTE MF628 to option +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +driver-core-make-struct-platform_pm_ops-static.patch +sysfs-support-sysfs_notify-from-atomic-context-with-new-sysfs_notify_dirent.patch +net-convert-the-phy_device-file-to-use-bus_find_device_by_name.patch +put_device-might_sleep.patch +warn-when-statically-allocated-kobjects-are-used.patch +sysfs-crash-debugging.patch +Importing usb based on quilt/driver-core +$ git checkout quilt/usb +Switched to branch "quilt/usb" +$ git reset --hard 6f84a264318a03fc8a6b180ec2aa972fc5fc0bed +HEAD is now at 6f84a26 sysfs: crash debugging +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +hso-fix-oops-in-read-write-callbacks.patch +hso-fix-refcounting-on-the-ttyhsx-devices.patch +usb-hso-make-tty_operations-const.patch +usb-hso-minor-fixes-due-to-code-review.patch +usb-add-config_usb_debug_messages-and-usb_dbg.patch +usb-convert-the-usb-core-code-to-use-usb_dbg.patch +usb-remove-config_usb_debug.patch +usb-gotemp.patch +Unchanged quilt series device-mapper +Importing i2c based on 2.6.27-rc2-git4 +$ git checkout quilt/i2c +Switched to branch "quilt/i2c" +$ git reset --hard 796aadeb1b2db9b5d463946766c5bbfd7717158c +HEAD is now at 796aade Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-multiplexed-buses-fix.patch +i2c-fix-NULL-pointer-dereference-in-i2c_new_probed_device.patch +i2c-let-user-select-algos.patch +i2c-check-for-busy-address.patch +i2c-correct-some-size_t-printk-formats.patch +hwmon-lm75-drop-legacy-driver.patch +hwmon-dme1737-convert-to-new-style-part-1.patch +hwmon-dme1737-convert-to-new-style-part-2.patch +i2c-isp1301_omap-convert-to-new-style-part-1.patch +i2c-isp1301_omap-convert-to-new-style-part-2.patch +i2c-pca-isa-dont-grab-arbitrary-resources.patch +i2c-renesas-highlander-fpga-smbus-support.patch +Importing jdelvare-hwmon based on 2.6.27-rc2-git2 + quilt series is empty +$ git update-ref refs/heads/quilt/jdelvare-hwmon aeee90dfa01844168cd7f8051d0a0f969c573067 +Unchanged quilt series kernel-doc +Importing ide based on 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 +$ git checkout quilt/ide +Switched to branch "quilt/ide" +$ git reset --hard 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 +HEAD is now at 0967d61 Linux 2.6.27-rc2 +$ git quiltimport --author Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> --patches ../quilt/ide +drivers-ide-pci-use-__devexit_p.patch +cleanup-powerpc-include-asm-ide-h.patch +ata-add-missing-ata_id_-defines-take-2.patch +ide-remove-superfluous-check-from-ide_disk_special.patch +ide-cleanup-ide_disk_init_mult_count.patch +ide-cleanup-ide_fix_driveid.patch +ide-make-drive-id-an-union-take-2.patch +Context reduced to (2/2) to apply fragment at 447 +ide-remove-drive-driveid.patch +ide-use-ata_id_current_chs_valid.patch +ide-disk-use-ata_id_wcache_enabled.patch +ide-disk-use-ata_id_hpa_enabled.patch +ata-add-missing-ata_cmd_-defines.patch +libata-win_-to-ata_cmd_.patch +ide-win_-to-ata_cmd_.patch +hd-win_-to-ata_cmd_.patch +ata-add-missing-ata_-defines.patch +ide-use-ata_-defines-instead-of-_stat-and-_err-ones.patch +ide-remove-no-longer-needed-ide_drive_t-fields.patch +ide-re-code-ide_fixstring-loop-to-be-less-evil.patch +ide-cd-use-the-new-object_is_in_stack-helper.patch +ide-fix-exabytenest-handling-in-probe_for_drive.patch +ide-enhance-ide_busy_sleep.patch +ide-remove-no-longer-needed-bug_on-s-from-init_irq.patch +ide-remove-ide_chipset_-macros.patch +ide-remove-unused-_ide_c-and-_ide_disk-defines.patch +ide-remove-needless-drive-present-checks-from-device-drivers.patch +ide-check-drive-present-in-ide_get_paired_drive.patch +ide-remove-config_idedisk_multi_mode.patch +ide-include-linux-hdreg-h-only-when-needed.patch +ide-call-ide_proc_register_driver-later.patch +ide-preparations-for-proc-ide-hd_-settings-rework.patch +ide-proc-ide-hd_-settings-rework.patch +ide-remove-sector_words-define.patch +cmd640-add-__set_prefetch_mode.patch +ide-remove-read-only-atapi_overlap-field-from-ide_drive_t.patch +ide-remove-supports_dsc_overlap-field-from-ide_driver_t.patch +ide-factor-out-hdio_-_nice-ioctl-handling-to-ide_-_nice_ioctl.patch +ide-ide_dev_has_iordy-to-ata_id_has_iordy.patch +ide-ide_dev_is_sata-to-ata_id_is_sata.patch +ide-idedisk_supports_lba48-to-ata_id_lba48_enabled.patch +ide-check-only-for-cache-flush-command-support-in-ide_id_has_flush_cache.patch +ide-ide_id_has_flush_cache-to-ata_id_flush_enabled.patch +ide-ide_id_has_flush_cache_ext-to-ata_id_flush_ext_enabled.patch +ide-use-ata_id_is_cfa.patch +ide-ide_id_to_hd_driveid-to-ata_id_to_hd_driveid.patch +ide-lba_capacity_is_ok-to-ata_id_is_lba_capacity_ok.patch +hpt366-add-hpt3xx_disable_fast_irq-helper.patch +ide-add-proper-pci-pm-support.patch +ide-remove-bus_state-field-from-ide_hwif_t.patch +ide-add-ide_setting_ioctl-helper.patch +ide-cleanup-generic_ide_ioctl.patch +ide-move-ioctls-handling-to-ide-ioctls-c.patch +ide-add-ide_check_atapi_device-helper.patch +ide-floppy-remove-needless-parens.patch +ide-floppy-add-ide_floppy_format_ioctl-helper.patch +ide-tape-remove-idetape_init_rq.patch +ide-floppy-use-scatterlists-for-pio-transfers.patch +ide-generic-handle-probing-of-legacy-io-ports-v5.patch +ide-floppy-tape-remove-request-stack.patch +ide-floppy-tape-remove-packet-command-stack.patch +ide-floppy-remove-mode_sense_-defines.patch +Importing m68k based on 796aadeb1b2db9b5d463946766c5bbfd7717158c +$ git checkout quilt/m68k +Switched to branch "quilt/m68k" +$ git reset --hard 796aadeb1b2db9b5d463946766c5bbfd7717158c +HEAD is now at 796aade Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq +$ git quiltimport --author Geert Uytterhoeven <geert@linux-m68k.org> --patches ../quilt/m68k +m68k-wire-up-new-system-calls.diff +m68k-use-bcd2bin-bin2bcd.diff +m68k-use-percent-pS-infrastructure.diff +Unchanged quilt series rr +Importing ttydev based on 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 +$ git checkout quilt/ttydev +Switched to branch "quilt/ttydev" +$ git reset --hard 0967d61ea0d8e8a7826bd8949cd93dd1e829ac55 +HEAD is now at 0967d61 Linux 2.6.27-rc2 +$ git quiltimport --author Alan Cox <alan@lxorguk.ukuu.org.uk> --patches ../quilt/ttydev +mcfserial-goes-byebye +epca-port-init +ser-nr-irq +.dotest/patch:101: trailing whitespace. + +.dotest/patch:137: trailing whitespace. + +.dotest/patch:143: trailing whitespace. + +.dotest/patch:146: trailing whitespace. + +warning: 4 lines add whitespace errors. +blackfin-use-initdata +blackfin-suspend-all +blackfin-whitespace-trim +blackfin-common-vars +blackfin-remove-useless-stop +blackfin-fix-stop-bug +blackfin-fix-ircp-bug +blackfin-fix-uart-map +viotty-remove-spurious-call +viotty-tioclinux +tty-move-tioclinux +tty-fixup-uml +tty-remove-resize-special +tty-split-buffering +tty-split-port +tty-fix-pty-termios-race +tty-kref +tty-kref-modcount +tty-kref-get-current-tty +tty-move-write diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8aa8e0d97fa7 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080811 |