diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-05 17:17:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-08-05 17:17:35 +1000 |
| commit | c7ea7a71034a28b2a745a1198578dec9a0bc4759 (patch) | |
| tree | 53b88aced39c58135f1699df932aa99956621f18 | |
| parent | 9c5c7ee9a9b73a5e241d148aac1c3b837c38458f (diff) | |
Add linux-next specific files for 20080805next-20080805
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/Trees | 111 | ||||
| -rw-r--r-- | Next/merge.log | 3901 | ||||
| -rw-r--r-- | Next/quilt-import.log | 52 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4065 insertions, 0 deletions
diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..32781d1dff09 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,111 @@ +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/ +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 +hwmon git git://lm-sensors.org/kernel/mhoffman/hwmon-2.6.git#testing +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://gitkernel.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 diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e0f434693fd5 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3901 @@ +$ git checkout master +Already on "master" +$ git reset --hard stable +HEAD is now at 2b12a4c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating 2b12a4c..8f616cd +Fast forward + MAINTAINERS | 6 + + arch/arm/boot/compressed/Makefile | 3 - + {include/asm-arm => arch/arm/include/asm}/Kbuild | 0 + .../asm-arm => arch/arm/include/asm}/a.out-core.h | 0 + {include/asm-arm => arch/arm/include/asm}/a.out.h | 0 + .../asm-arm => arch/arm/include/asm}/assembler.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/atomic.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/auxvec.h | 0 + {include/asm-arm => arch/arm/include/asm}/bitops.h | 0 + {include/asm-arm => arch/arm/include/asm}/bug.h | 0 + {include/asm-arm => arch/arm/include/asm}/bugs.h | 2 +- + .../asm-arm => arch/arm/include/asm}/byteorder.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/cache.h | 2 +- + .../asm-arm => arch/arm/include/asm}/cacheflush.h | 2 +- + .../asm-arm => arch/arm/include/asm}/checksum.h | 2 +- + .../asm-arm => arch/arm/include/asm}/cnt32_to_63.h | 0 + .../asm-arm => arch/arm/include/asm}/cpu-multi32.h | 2 +- + .../asm-arm => arch/arm/include/asm}/cpu-single.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/cpu.h | 2 +- + .../asm-arm => arch/arm/include/asm}/cputime.h | 0 + .../asm-arm => arch/arm/include/asm}/current.h | 0 + {include/asm-arm => arch/arm/include/asm}/delay.h | 0 + {include/asm-arm => arch/arm/include/asm}/device.h | 0 + {include/asm-arm => arch/arm/include/asm}/div64.h | 0 + .../asm-arm => arch/arm/include/asm}/dma-mapping.h | 0 + {include/asm-arm => arch/arm/include/asm}/dma.h | 0 + {include/asm-arm => arch/arm/include/asm}/domain.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/ecard.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/elf.h | 0 + .../arm/include/asm}/emergency-restart.h | 0 + {include/asm-arm => arch/arm/include/asm}/errno.h | 0 + {include/asm-arm => arch/arm/include/asm}/fb.h | 0 + {include/asm-arm => arch/arm/include/asm}/fcntl.h | 0 + {include/asm-arm => arch/arm/include/asm}/fiq.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/flat.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/floppy.h | 2 +- + .../asm-arm => arch/arm/include/asm}/fpstate.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/ftrace.h | 0 + {include/asm-arm => arch/arm/include/asm}/futex.h | 0 + {include/asm-arm => arch/arm/include/asm}/glue.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/gpio.h | 0 + .../asm-arm => arch/arm/include/asm}/hardirq.h | 0 + .../asm-arm => arch/arm/include/asm}/hardware.h | 2 +- + .../arm/include/asm}/hardware/arm_timer.h | 0 + .../arm/include/asm}/hardware/arm_twd.h | 0 + .../arm/include/asm}/hardware/cache-l2x0.h | 2 +- + .../arm/include/asm}/hardware/clps7111.h | 2 +- + .../arm/include/asm}/hardware/cs89712.h | 2 +- + .../arm/include/asm}/hardware/debug-8250.S | 2 +- + .../arm/include/asm}/hardware/debug-pl01x.S | 2 +- + .../arm/include/asm}/hardware/dec21285.h | 2 +- + .../arm/include/asm}/hardware/entry-macro-iomd.S | 2 +- + .../arm/include/asm}/hardware/ep7211.h | 2 +- + .../arm/include/asm}/hardware/ep7212.h | 2 +- + .../arm/include/asm}/hardware/gic.h | 2 +- + .../arm/include/asm}/hardware/icst307.h | 2 +- + .../arm/include/asm}/hardware/icst525.h | 2 +- + .../arm/include/asm}/hardware/ioc.h | 2 +- + .../arm/include/asm}/hardware/iomd.h | 2 +- + .../arm/include/asm}/hardware/iop3xx-adma.h | 0 + .../arm/include/asm}/hardware/iop3xx-gpio.h | 2 +- + .../arm/include/asm}/hardware/iop3xx.h | 2 +- + .../arm/include/asm}/hardware/iop_adma.h | 0 + .../arm/include/asm}/hardware/it8152.h | 0 + .../arm/include/asm}/hardware/linkup-l1110.h | 0 + .../arm/include/asm}/hardware/locomo.h | 2 +- + .../arm/include/asm}/hardware/memc.h | 2 +- + .../arm/include/asm}/hardware/pci_v3.h | 2 +- + .../arm/include/asm}/hardware/sa1111.h | 2 +- + .../arm/include/asm}/hardware/scoop.h | 0 + .../arm/include/asm}/hardware/sharpsl_pm.h | 0 + .../arm/include/asm}/hardware/ssp.h | 0 + .../arm/include/asm}/hardware/uengine.h | 0 + .../arm/include/asm}/hardware/vic.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/hw_irq.h | 0 + {include/asm-arm => arch/arm/include/asm}/hwcap.h | 0 + {include/asm-arm => arch/arm/include/asm}/ide.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/io.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/ioctl.h | 0 + {include/asm-arm => arch/arm/include/asm}/ioctls.h | 0 + {include/asm-arm => arch/arm/include/asm}/ipcbuf.h | 0 + {include/asm-arm => arch/arm/include/asm}/irq.h | 0 + .../asm-arm => arch/arm/include/asm}/irq_regs.h | 0 + .../asm-arm => arch/arm/include/asm}/irqflags.h | 0 + {include/asm-arm => arch/arm/include/asm}/kdebug.h | 0 + {include/asm-arm => arch/arm/include/asm}/kexec.h | 0 + {include/asm-arm => arch/arm/include/asm}/kgdb.h | 0 + .../asm-arm => arch/arm/include/asm}/kmap_types.h | 0 + .../asm-arm => arch/arm/include/asm}/kprobes.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/leds.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/limits.h | 0 + .../asm-arm => arch/arm/include/asm}/linkage.h | 0 + {include/asm-arm => arch/arm/include/asm}/local.h | 0 + {include/asm-arm => arch/arm/include/asm}/locks.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/arch.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/dma.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/flash.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/irda.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/irq.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/map.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/mmc.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mach/pci.h | 2 +- + .../arm/include/asm}/mach/serial_at91.h | 2 +- + .../arm/include/asm}/mach/serial_sa1100.h | 4 +- + .../arm/include/asm}/mach/sharpsl_param.h | 0 + .../asm-arm => arch/arm/include/asm}/mach/time.h | 2 +- + .../arm/include/asm}/mach/udc_pxa2xx.h | 2 +- + .../asm-arm => arch/arm/include/asm}/mc146818rtc.h | 0 + {include/asm-arm => arch/arm/include/asm}/memory.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/mman.h | 0 + {include/asm-arm => arch/arm/include/asm}/mmu.h | 0 + .../asm-arm => arch/arm/include/asm}/mmu_context.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/mmzone.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/module.h | 0 + {include/asm-arm => arch/arm/include/asm}/msgbuf.h | 0 + .../asm-arm => arch/arm/include/asm}/mtd-xip.h | 0 + {include/asm-arm => arch/arm/include/asm}/mutex.h | 2 +- + .../asm-arm => arch/arm/include/asm}/nwflash.h | 0 + .../asm-arm => arch/arm/include/asm}/page-nommu.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/page.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/param.h | 2 +- + .../asm-arm => arch/arm/include/asm}/parport.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/pci.h | 0 + {include/asm-arm => arch/arm/include/asm}/percpu.h | 0 + .../asm-arm => arch/arm/include/asm}/pgalloc.h | 2 +- + .../arm/include/asm}/pgtable-hwdef.h | 2 +- + .../arm/include/asm}/pgtable-nommu.h | 2 +- + .../asm-arm => arch/arm/include/asm}/pgtable.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/poll.h | 0 + .../asm-arm => arch/arm/include/asm}/posix_types.h | 2 +- + .../asm-arm => arch/arm/include/asm}/proc-fns.h | 2 +- + .../asm-arm => arch/arm/include/asm}/processor.h | 2 +- + .../asm-arm => arch/arm/include/asm}/procinfo.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/ptrace.h | 2 +- + .../asm-arm => arch/arm/include/asm}/resource.h | 0 + .../asm-arm => arch/arm/include/asm}/scatterlist.h | 0 + .../asm-arm => arch/arm/include/asm}/sections.h | 0 + .../asm-arm => arch/arm/include/asm}/segment.h | 0 + {include/asm-arm => arch/arm/include/asm}/sembuf.h | 0 + {include/asm-arm => arch/arm/include/asm}/serial.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/setup.h | 0 + {include/asm-arm => arch/arm/include/asm}/shmbuf.h | 0 + .../asm-arm => arch/arm/include/asm}/shmparam.h | 0 + .../asm-arm => arch/arm/include/asm}/sigcontext.h | 0 + .../asm-arm => arch/arm/include/asm}/siginfo.h | 0 + {include/asm-arm => arch/arm/include/asm}/signal.h | 0 + {include/asm-arm => arch/arm/include/asm}/sizes.h | 0 + {include/asm-arm => arch/arm/include/asm}/smp.h | 4 +- + {include/asm-arm => arch/arm/include/asm}/socket.h | 0 + .../asm-arm => arch/arm/include/asm}/sockios.h | 0 + .../asm-arm => arch/arm/include/asm}/sparsemem.h | 0 + .../asm-arm => arch/arm/include/asm}/spinlock.h | 0 + .../arm/include/asm}/spinlock_types.h | 0 + {include/asm-arm => arch/arm/include/asm}/stat.h | 0 + {include/asm-arm => arch/arm/include/asm}/statfs.h | 0 + {include/asm-arm => arch/arm/include/asm}/string.h | 0 + .../asm-arm => arch/arm/include/asm}/suspend.h | 0 + {include/asm-arm => arch/arm/include/asm}/system.h | 0 + .../asm-arm => arch/arm/include/asm}/termbits.h | 0 + .../asm-arm => arch/arm/include/asm}/termios.h | 0 + {include/asm-arm => arch/arm/include/asm}/therm.h | 2 +- + .../asm-arm => arch/arm/include/asm}/thread_info.h | 4 +- + .../arm/include/asm}/thread_notify.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/timex.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/tlb.h | 2 +- + .../asm-arm => arch/arm/include/asm}/tlbflush.h | 2 +- + .../asm-arm => arch/arm/include/asm}/topology.h | 0 + {include/asm-arm => arch/arm/include/asm}/traps.h | 0 + {include/asm-arm => arch/arm/include/asm}/types.h | 0 + .../asm-arm => arch/arm/include/asm}/uaccess.h | 2 +- + .../asm-arm => arch/arm/include/asm}/ucontext.h | 0 + .../asm-arm => arch/arm/include/asm}/unaligned.h | 0 + {include/asm-arm => arch/arm/include/asm}/unistd.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/user.h | 0 + {include/asm-arm => arch/arm/include/asm}/vfp.h | 2 +- + .../asm-arm => arch/arm/include/asm}/vfpmacros.h | 2 +- + {include/asm-arm => arch/arm/include/asm}/vga.h | 0 + {include/asm-arm => arch/arm/include/asm}/xor.h | 2 +- + arch/arm/kernel/head-common.S | 2 +- + arch/arm/lib/getuser.S | 2 +- + arch/arm/lib/putuser.S | 2 +- + arch/arm/mach-imx/clock.c | 5 + + arch/arm/mach-imx/generic.c | 1 - + arch/arm/mach-imx/mx1ads.c | 4 +- + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 12 +- + arch/arm/mach-ns9xxx/gpio-ns9360.c | 4 +- + arch/arm/mach-ns9xxx/gpio.c | 6 +- + arch/arm/mach-ns9xxx/irq.c | 6 +- + 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 | 6 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 1 - + arch/arm/mm/Kconfig | 10 +- + arch/arm/mm/cache-xsc3l2.c | 182 +++++++++++ + arch/arm/mm/init.c | 32 ++- + arch/arm/mm/ioremap.c | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-xsc3.S | 22 -- + arch/arm/nwfpe/fpa11.h | 2 +- + arch/sparc/include/asm/futex_64.h | 2 +- + arch/sparc/include/asm/irq_64.h | 3 + + arch/sparc/include/asm/of_platform.h | 26 ++- + arch/sparc/include/asm/of_platform_32.h | 24 -- + arch/sparc/include/asm/of_platform_64.h | 25 -- + arch/sparc/include/asm/ptrace_32.h | 20 +- + arch/sparc/include/asm/ptrace_64.h | 39 ++-- + arch/sparc64/kernel/of_device.c | 5 - + arch/sparc64/kernel/process.c | 110 +++----- + arch/sparc64/kernel/signal.c | 6 +- + arch/sparc64/kernel/smp.c | 6 - + arch/sparc64/kernel/sparc64_ksyms.c | 1 - + arch/sparc64/kernel/traps.c | 10 +- + arch/sparc64/mm/ultra.S | 42 +--- + drivers/mtd/maps/ipaq-flash.c | 2 +- + drivers/mtd/mtdsuper.c | 17 +- + drivers/video/console/.gitignore | 2 + + fs/ext4/acl.c | 188 ++++++------ + fs/ext4/balloc.c | 11 +- + fs/ext4/ext4.h | 1 - + fs/ext4/extents.c | 55 ++-- + fs/ext4/ialloc.c | 56 ++-- + fs/ext4/inode.c | 164 +++++++---- + fs/ext4/mballoc.c | 254 +++++++++++++--- + fs/ext4/mballoc.h | 10 +- + fs/ext4/resize.c | 79 +++--- + fs/ext4/super.c | 316 +++++++++++--------- + fs/ext4/xattr.c | 2 +- + fs/fat/file.c | 6 +- + fs/jbd2/commit.c | 24 ++- + fs/jbd2/journal.c | 1 - + include/asm-arm/arch-ns9xxx/debug-macro.S | 2 +- + include/asm-arm/arch-ns9xxx/entry-macro.S | 2 +- + include/asm-arm/arch-ns9xxx/processor.h | 2 +- + include/asm-arm/arch-ns9xxx/system.h | 4 +- + include/asm-arm/arch-omap/board.h | 2 +- + mm/truncate.c | 2 - + scripts/Makefile.fwinst | 4 + + 239 files changed, 1201 insertions(+), 826 deletions(-) + rename {include/asm-arm => arch/arm/include/asm}/Kbuild (100%) + rename {include/asm-arm => arch/arm/include/asm}/a.out-core.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/a.out.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/assembler.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/atomic.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/auxvec.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/bitops.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/bug.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/bugs.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/byteorder.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/cache.h (80%) + rename {include/asm-arm => arch/arm/include/asm}/cacheflush.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/checksum.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/cnt32_to_63.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/cpu-multi32.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/cpu-single.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/cpu.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/cputime.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/current.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/delay.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/device.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/div64.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/dma-mapping.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/dma.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/domain.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/ecard.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/elf.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/emergency-restart.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/errno.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/fb.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/fcntl.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/fiq.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/flat.h (90%) + rename {include/asm-arm => arch/arm/include/asm}/floppy.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/fpstate.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/ftrace.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/futex.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/glue.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/gpio.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardirq.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware.h (90%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/arm_timer.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/arm_twd.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/cache-l2x0.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/clps7111.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/cs89712.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/debug-8250.S (93%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/debug-pl01x.S (93%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/dec21285.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/entry-macro-iomd.S (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/ep7211.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/ep7212.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/gic.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/icst307.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/icst525.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/ioc.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/iomd.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/iop3xx-adma.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/iop3xx-gpio.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/iop3xx.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/iop_adma.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/it8152.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/linkup-l1110.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/locomo.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/memc.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/pci_v3.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/sa1111.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/scoop.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/sharpsl_pm.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/ssp.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/uengine.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hardware/vic.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/hw_irq.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/hwcap.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/ide.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/io.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/ioctl.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/ioctls.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/ipcbuf.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/irq.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/irq_regs.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/irqflags.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/kdebug.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/kexec.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/kgdb.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/kmap_types.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/kprobes.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/leds.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/limits.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/linkage.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/local.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/locks.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/mach/arch.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/mach/dma.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/mach/flash.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/mach/irda.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/mach/irq.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/mach/map.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/mach/mmc.h (88%) + rename {include/asm-arm => arch/arm/include/asm}/mach/pci.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/mach/serial_at91.h (94%) + rename {include/asm-arm => arch/arm/include/asm}/mach/serial_sa1100.h (86%) + rename {include/asm-arm => arch/arm/include/asm}/mach/sharpsl_param.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/mach/time.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/mach/udc_pxa2xx.h (95%) + rename {include/asm-arm => arch/arm/include/asm}/mc146818rtc.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/memory.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/mman.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/mmu.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/mmu_context.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/mmzone.h (94%) + rename {include/asm-arm => arch/arm/include/asm}/module.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/msgbuf.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/mtd-xip.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/mutex.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/nwflash.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/page-nommu.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/page.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/param.h (95%) + rename {include/asm-arm => arch/arm/include/asm}/parport.h (86%) + rename {include/asm-arm => arch/arm/include/asm}/pci.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/percpu.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/pgalloc.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/pgtable-hwdef.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/pgtable-nommu.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/pgtable.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/poll.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/posix_types.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/proc-fns.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/processor.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/procinfo.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/ptrace.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/resource.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/scatterlist.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sections.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/segment.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sembuf.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/serial.h (91%) + rename {include/asm-arm => arch/arm/include/asm}/setup.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/shmbuf.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/shmparam.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sigcontext.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/siginfo.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/signal.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sizes.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/smp.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/socket.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sockios.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/sparsemem.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/spinlock.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/spinlock_types.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/stat.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/statfs.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/string.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/suspend.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/system.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/termbits.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/termios.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/therm.h (88%) + rename {include/asm-arm => arch/arm/include/asm}/thread_info.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/thread_notify.h (96%) + rename {include/asm-arm => arch/arm/include/asm}/timex.h (93%) + rename {include/asm-arm => arch/arm/include/asm}/tlb.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/tlbflush.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/topology.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/traps.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/types.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/uaccess.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/ucontext.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/unaligned.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/unistd.h (99%) + rename {include/asm-arm => arch/arm/include/asm}/user.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/vfp.h (98%) + rename {include/asm-arm => arch/arm/include/asm}/vfpmacros.h (97%) + rename {include/asm-arm => arch/arm/include/asm}/vga.h (100%) + rename {include/asm-arm => arch/arm/include/asm}/xor.h (99%) + create mode 100644 arch/arm/mm/cache-xsc3l2.c + delete mode 100644 arch/sparc/include/asm/of_platform_32.h + delete mode 100644 arch/sparc/include/asm/of_platform_64.h + create mode 100644 drivers/video/console/.gitignore +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Removed include/asm-powerpc/irq.h +Merge made by recursive. + Documentation/powerpc/booting-without-of.txt | 4 +- + Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +- + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/boot/io.h | 2 +- + .../powerpc/include/asm}/8253pit.h | 0 + .../powerpc/include/asm}/8xx_immap.h | 0 + .../powerpc/include/asm}/Kbuild | 0 + .../powerpc/include/asm}/a.out.h | 0 + .../powerpc/include/asm}/abs_addr.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/agp.h | 0 + .../powerpc/include/asm}/asm-compat.h | 0 + .../powerpc/include/asm}/atomic.h | 0 + .../powerpc/include/asm}/auxvec.h | 0 + .../powerpc/include/asm}/backlight.h | 0 + .../powerpc/include/asm}/bitops.h | 0 + .../powerpc/include/asm}/bootx.h | 0 + .../powerpc/include/asm}/btext.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/bug.h | 0 + .../powerpc/include/asm}/bugs.h | 0 + .../powerpc/include/asm}/byteorder.h | 0 + .../powerpc/include/asm}/cache.h | 0 + .../powerpc/include/asm}/cacheflush.h | 0 + .../powerpc/include/asm}/cell-pmu.h | 0 + .../powerpc/include/asm}/cell-regs.h | 0 + .../powerpc/include/asm}/checksum.h | 0 + .../powerpc/include/asm}/clk_interface.h | 0 + .../powerpc/include/asm}/code-patching.h | 0 + .../powerpc/include/asm}/compat.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/cpm.h | 0 + .../powerpc/include/asm}/cpm1.h | 0 + .../powerpc/include/asm}/cpm2.h | 0 + .../powerpc/include/asm}/cputable.h | 0 + .../powerpc/include/asm}/cputhreads.h | 0 + .../powerpc/include/asm}/cputime.h | 0 + .../powerpc/include/asm}/current.h | 0 + .../powerpc/include/asm}/dbdma.h | 0 + .../powerpc/include/asm}/dcr-generic.h | 0 + .../powerpc/include/asm}/dcr-mmio.h | 0 + .../powerpc/include/asm}/dcr-native.h | 0 + .../powerpc/include/asm}/dcr-regs.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/dcr.h | 6 +- + .../powerpc/include/asm}/delay.h | 0 + .../powerpc/include/asm}/device.h | 0 + .../powerpc/include/asm}/div64.h | 0 + .../powerpc/include/asm}/dma-mapping.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/dma.h | 0 + .../powerpc/include/asm}/edac.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/eeh.h | 0 + .../powerpc/include/asm}/eeh_event.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/elf.h | 0 + .../powerpc/include/asm}/emergency-restart.h | 0 + .../powerpc/include/asm}/errno.h | 0 + .../powerpc/include/asm}/exception.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/fb.h | 0 + .../powerpc/include/asm}/fcntl.h | 0 + .../powerpc/include/asm}/feature-fixups.h | 0 + .../powerpc/include/asm}/firmware.h | 0 + .../powerpc/include/asm}/fixmap.h | 0 + .../powerpc/include/asm}/floppy.h | 0 + .../powerpc/include/asm}/fs_pd.h | 0 + .../powerpc/include/asm}/fsl_gtm.h | 0 + .../powerpc/include/asm}/fsl_lbc.h | 0 + .../powerpc/include/asm}/ftrace.h | 0 + .../powerpc/include/asm}/futex.h | 0 + .../powerpc/include/asm}/gpio.h | 0 + .../powerpc/include/asm}/grackle.h | 0 + .../powerpc/include/asm}/hardirq.h | 0 + .../powerpc/include/asm}/heathrow.h | 0 + .../powerpc/include/asm}/highmem.h | 0 + .../powerpc/include/asm}/hugetlb.h | 0 + .../powerpc/include/asm}/hvcall.h | 0 + .../powerpc/include/asm}/hvconsole.h | 0 + .../powerpc/include/asm}/hvcserver.h | 0 + .../powerpc/include/asm}/hw_irq.h | 0 + .../powerpc/include/asm}/hydra.h | 0 + .../powerpc/include/asm}/i8259.h | 5 - + .../powerpc/include/asm}/ibmebus.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/ide.h | 0 + .../powerpc/include/asm}/immap_86xx.h | 0 + .../powerpc/include/asm}/immap_cpm2.h | 0 + .../powerpc/include/asm}/immap_qe.h | 2 - + .../powerpc/include/asm}/io-defs.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/io.h | 0 + .../powerpc/include/asm}/ioctl.h | 0 + .../powerpc/include/asm}/ioctls.h | 0 + .../powerpc/include/asm}/iommu.h | 0 + .../powerpc/include/asm}/ipcbuf.h | 0 + .../powerpc/include/asm}/ipic.h | 9 - + arch/powerpc/include/asm/irq.h | 366 +++++++++++ + .../powerpc/include/asm}/irq_regs.h | 0 + .../powerpc/include/asm}/irqflags.h | 4 +- + .../powerpc/include/asm}/iseries/alpaca.h | 0 + .../powerpc/include/asm}/iseries/hv_call.h | 0 + .../powerpc/include/asm}/iseries/hv_call_event.h | 0 + .../powerpc/include/asm}/iseries/hv_call_sc.h | 0 + .../powerpc/include/asm}/iseries/hv_call_xm.h | 0 + .../powerpc/include/asm}/iseries/hv_lp_config.h | 0 + .../powerpc/include/asm}/iseries/hv_lp_event.h | 0 + .../powerpc/include/asm}/iseries/hv_types.h | 0 + .../powerpc/include/asm}/iseries/iommu.h | 0 + .../powerpc/include/asm}/iseries/it_lp_queue.h | 0 + .../powerpc/include/asm}/iseries/lpar_map.h | 0 + .../powerpc/include/asm}/iseries/mf.h | 0 + .../powerpc/include/asm}/iseries/vio.h | 0 + .../powerpc/include/asm}/kdebug.h | 0 + .../powerpc/include/asm}/kdump.h | 0 + .../powerpc/include/asm}/kexec.h | 0 + .../powerpc/include/asm}/keylargo.h | 0 + .../powerpc/include/asm}/kgdb.h | 2 - + .../powerpc/include/asm}/kmap_types.h | 0 + .../powerpc/include/asm}/kprobes.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/kvm.h | 0 + .../powerpc/include/asm}/kvm_asm.h | 0 + .../powerpc/include/asm}/kvm_host.h | 0 + .../powerpc/include/asm}/kvm_para.h | 0 + .../powerpc/include/asm}/kvm_ppc.h | 0 + .../powerpc/include/asm}/libata-portmap.h | 0 + .../powerpc/include/asm}/linkage.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/lmb.h | 0 + .../powerpc/include/asm}/local.h | 0 + .../powerpc/include/asm}/lppaca.h | 0 + .../powerpc/include/asm}/lv1call.h | 0 + .../powerpc/include/asm}/machdep.h | 0 + .../powerpc/include/asm}/macio.h | 0 + .../powerpc/include/asm}/mc146818rtc.h | 0 + .../powerpc/include/asm}/mediabay.h | 0 + .../powerpc/include/asm}/mman.h | 0 + .../powerpc/include/asm}/mmu-40x.h | 0 + .../powerpc/include/asm}/mmu-44x.h | 0 + .../powerpc/include/asm}/mmu-8xx.h | 0 + .../powerpc/include/asm}/mmu-fsl-booke.h | 0 + .../powerpc/include/asm}/mmu-hash32.h | 0 + .../powerpc/include/asm}/mmu-hash64.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/mmu.h | 0 + .../powerpc/include/asm}/mmu_context.h | 0 + .../powerpc/include/asm}/mmzone.h | 0 + .../powerpc/include/asm}/module.h | 0 + .../powerpc/include/asm}/mpc512x.h | 0 + .../powerpc/include/asm}/mpc52xx.h | 0 + .../powerpc/include/asm}/mpc52xx_psc.h | 0 + .../powerpc/include/asm}/mpc6xx.h | 0 + .../powerpc/include/asm}/mpc8260.h | 0 + .../powerpc/include/asm}/mpc86xx.h | 0 + .../powerpc/include/asm}/mpc8xx.h | 0 + .../powerpc/include/asm}/mpic.h | 0 + .../powerpc/include/asm}/msgbuf.h | 0 + .../powerpc/include/asm}/mutex.h | 0 + .../powerpc/include/asm}/nvram.h | 0 + .../powerpc/include/asm}/of_device.h | 0 + .../powerpc/include/asm}/of_platform.h | 0 + .../powerpc/include/asm}/ohare.h | 0 + .../powerpc/include/asm}/oprofile_impl.h | 0 + .../powerpc/include/asm}/pSeries_reconfig.h | 0 + .../powerpc/include/asm}/paca.h | 2 - + .../powerpc/include/asm}/page.h | 0 + .../powerpc/include/asm}/page_32.h | 0 + .../powerpc/include/asm}/page_64.h | 0 + .../powerpc/include/asm}/param.h | 0 + .../powerpc/include/asm}/parport.h | 0 + .../powerpc/include/asm}/pasemi_dma.h | 0 + .../powerpc/include/asm}/pci-bridge.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/pci.h | 0 + .../powerpc/include/asm}/percpu.h | 0 + .../powerpc/include/asm}/pgalloc-32.h | 0 + .../powerpc/include/asm}/pgalloc-64.h | 0 + .../powerpc/include/asm}/pgalloc.h | 0 + .../powerpc/include/asm}/pgtable-4k.h | 0 + .../powerpc/include/asm}/pgtable-64k.h | 0 + .../powerpc/include/asm}/pgtable-ppc32.h | 0 + .../powerpc/include/asm}/pgtable-ppc64.h | 2 +- + .../powerpc/include/asm}/pgtable.h | 0 + .../powerpc/include/asm}/phyp_dump.h | 0 + .../powerpc/include/asm}/pmac_feature.h | 0 + .../powerpc/include/asm}/pmac_low_i2c.h | 0 + .../powerpc/include/asm}/pmac_pfunc.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/pmc.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/pmi.h | 0 + .../powerpc/include/asm}/poll.h | 0 + .../powerpc/include/asm}/posix_types.h | 0 + .../powerpc/include/asm}/ppc-pci.h | 0 + .../powerpc/include/asm}/ppc4xx.h | 0 + .../powerpc/include/asm}/ppc_asm.h | 0 + .../powerpc/include/asm}/processor.h | 0 + .../powerpc/include/asm}/prom.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/ps3.h | 0 + .../powerpc/include/asm}/ps3av.h | 0 + .../powerpc/include/asm}/ps3fb.h | 0 + .../powerpc/include/asm}/ps3stor.h | 0 + .../powerpc/include/asm}/ptrace.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/qe.h | 0 + .../powerpc/include/asm}/qe_ic.h | 2 - + .../asm-powerpc => arch/powerpc/include/asm}/reg.h | 0 + .../powerpc/include/asm}/reg_8xx.h | 0 + .../powerpc/include/asm}/reg_booke.h | 0 + .../powerpc/include/asm}/reg_fsl_emb.h | 0 + .../powerpc/include/asm}/resource.h | 0 + .../powerpc/include/asm}/rheap.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/rio.h | 0 + .../powerpc/include/asm}/rtas.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/rtc.h | 0 + .../powerpc/include/asm}/rwsem.h | 4 +- + .../powerpc/include/asm}/scatterlist.h | 0 + .../powerpc/include/asm}/seccomp.h | 0 + .../powerpc/include/asm}/sections.h | 0 + .../powerpc/include/asm}/sembuf.h | 0 + .../powerpc/include/asm}/serial.h | 0 + .../powerpc/include/asm}/setjmp.h | 0 + .../powerpc/include/asm}/setup.h | 0 + .../powerpc/include/asm}/shmbuf.h | 0 + .../powerpc/include/asm}/shmparam.h | 0 + .../powerpc/include/asm}/sigcontext.h | 0 + .../powerpc/include/asm}/siginfo.h | 0 + .../powerpc/include/asm}/signal.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/smp.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/smu.h | 0 + .../powerpc/include/asm}/socket.h | 0 + .../powerpc/include/asm}/sockios.h | 0 + .../powerpc/include/asm}/sparsemem.h | 0 + .../powerpc/include/asm}/spinlock.h | 0 + .../powerpc/include/asm}/spinlock_types.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/spu.h | 0 + .../powerpc/include/asm}/spu_csa.h | 0 + .../powerpc/include/asm}/spu_info.h | 0 + .../powerpc/include/asm}/spu_priv1.h | 0 + .../powerpc/include/asm}/sstep.h | 0 + .../powerpc/include/asm}/stat.h | 0 + .../powerpc/include/asm}/statfs.h | 0 + .../powerpc/include/asm}/string.h | 0 + .../powerpc/include/asm}/suspend.h | 0 + .../powerpc/include/asm}/synch.h | 0 + .../powerpc/include/asm}/syscall.h | 0 + .../powerpc/include/asm}/syscalls.h | 0 + .../powerpc/include/asm}/systbl.h | 0 + .../powerpc/include/asm}/system.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/tce.h | 0 + .../powerpc/include/asm}/termbits.h | 0 + .../powerpc/include/asm}/termios.h | 0 + .../powerpc/include/asm}/thread_info.h | 0 + .../powerpc/include/asm}/time.h | 0 + .../powerpc/include/asm}/timex.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/tlb.h | 0 + .../powerpc/include/asm}/tlbflush.h | 0 + .../powerpc/include/asm}/topology.h | 0 + .../powerpc/include/asm}/tsi108.h | 0 + .../powerpc/include/asm}/tsi108_irq.h | 0 + .../powerpc/include/asm}/tsi108_pci.h | 0 + .../powerpc/include/asm}/types.h | 0 + .../powerpc/include/asm}/uaccess.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/ucc.h | 0 + .../powerpc/include/asm}/ucc_fast.h | 2 - + .../powerpc/include/asm}/ucc_slow.h | 0 + .../powerpc/include/asm}/ucontext.h | 0 + .../powerpc/include/asm}/udbg.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/uic.h | 2 - + .../powerpc/include/asm}/unaligned.h | 0 + .../powerpc/include/asm}/uninorth.h | 0 + .../powerpc/include/asm}/unistd.h | 0 + .../powerpc/include/asm}/user.h | 0 + .../powerpc/include/asm}/vdso.h | 0 + .../powerpc/include/asm}/vdso_datapage.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/vga.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/vio.h | 0 + .../powerpc/include/asm}/xilinx_intc.h | 0 + .../powerpc/include/asm}/xmon.h | 0 + .../asm-powerpc => arch/powerpc/include/asm}/xor.h | 0 + arch/powerpc/kernel/Makefile | 14 - + arch/powerpc/kernel/cpu_setup_44x.S | 6 - + arch/powerpc/kernel/irq.c | 25 +- + arch/powerpc/kernel/process.c | 2 - + arch/powerpc/kernel/vdso.c | 2 - + arch/powerpc/lib/Makefile | 2 - + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/ppc_mmu_32.c | 4 +- + arch/powerpc/mm/tlb_64.c | 2 +- + arch/powerpc/platforms/52xx/Makefile | 4 +- + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 2 +- + arch/powerpc/platforms/Makefile | 6 - + arch/powerpc/platforms/powermac/Makefile | 3 +- + arch/powerpc/sysdev/Makefile | 2 - + drivers/char/hvc_console.h | 2 +- + drivers/char/hvcs.c | 2 +- + drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- + include/asm-powerpc/irq.h | 654 -------------------- + 283 files changed, 388 insertions(+), 766 deletions(-) + rename {include/asm-powerpc => arch/powerpc/include/asm}/8253pit.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/8xx_immap.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/Kbuild (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/a.out.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/abs_addr.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/agp.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/asm-compat.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/atomic.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/auxvec.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/backlight.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/bitops.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/bootx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/btext.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/bug.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/bugs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/byteorder.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cache.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cacheflush.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-pmu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cell-regs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/checksum.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/clk_interface.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/code-patching.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/compat.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm1.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cpm2.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cputable.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cputhreads.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/cputime.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/current.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dbdma.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-generic.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-mmio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-native.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr-regs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dcr.h (94%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/delay.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/device.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/div64.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dma-mapping.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/dma.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/edac.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/eeh_event.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/elf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/emergency-restart.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/errno.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/exception.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fcntl.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/feature-fixups.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/firmware.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fixmap.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/floppy.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fs_pd.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_gtm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/fsl_lbc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ftrace.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/futex.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/gpio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/grackle.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hardirq.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/heathrow.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/highmem.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hugetlb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcall.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hvconsole.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hvcserver.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hw_irq.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/hydra.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/i8259.h (71%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ibmebus.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ide.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_86xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_cpm2.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/immap_qe.h (99%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/io-defs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/io.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctl.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ioctls.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iommu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ipcbuf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ipic.h (93%) + create mode 100644 arch/powerpc/include/asm/irq.h + rename {include/asm-powerpc => arch/powerpc/include/asm}/irq_regs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/irqflags.h (93%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/alpaca.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_event.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_sc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_call_xm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_config.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_lp_event.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/hv_types.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/iommu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/it_lp_queue.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/lpar_map.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/mf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/iseries/vio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kdebug.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kdump.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kexec.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/keylargo.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kgdb.h (98%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kmap_types.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kprobes.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_asm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_host.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_para.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/kvm_ppc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/libata-portmap.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/linkage.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/lmb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/local.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/lppaca.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/lv1call.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/machdep.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/macio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mc146818rtc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mediabay.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mman.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-40x.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-44x.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-8xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-fsl-booke.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash32.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu-hash64.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmu_context.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mmzone.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/module.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc512x.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc52xx_psc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc6xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8260.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc86xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpc8xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mpic.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/msgbuf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/mutex.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/nvram.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/of_device.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/of_platform.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ohare.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/oprofile_impl.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pSeries_reconfig.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/paca.h (99%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/page.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/page_32.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/page_64.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/param.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/parport.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pasemi_dma.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pci-bridge.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pci.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/percpu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-32.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc-64.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgalloc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-4k.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-64k.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc32.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable-ppc64.h (99%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pgtable.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/phyp_dump.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_feature.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_low_i2c.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pmac_pfunc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pmc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/pmi.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/poll.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/posix_types.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc-pci.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc4xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ppc_asm.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/processor.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/prom.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3av.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3fb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ps3stor.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ptrace.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/qe.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/qe_ic.h (99%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/reg.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_8xx.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_booke.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/reg_fsl_emb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/resource.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/rheap.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/rio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/rtas.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/rtc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/rwsem.h (96%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/scatterlist.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/seccomp.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sections.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sembuf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/serial.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/setjmp.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/setup.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/shmbuf.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/shmparam.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sigcontext.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/siginfo.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/signal.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/smp.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/smu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/socket.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sockios.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sparsemem.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spinlock_types.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spu.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_csa.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_info.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/spu_priv1.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/sstep.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/stat.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/statfs.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/string.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/suspend.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/synch.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/syscall.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/syscalls.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/systbl.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/system.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tce.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/termbits.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/termios.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/thread_info.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/time.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/timex.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tlb.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tlbflush.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/topology.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_irq.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/tsi108_pci.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/types.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/uaccess.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_fast.h (99%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ucc_slow.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/ucontext.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/udbg.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/uic.h (95%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/unaligned.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/uninorth.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/unistd.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/user.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/vdso_datapage.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/vga.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/vio.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/xilinx_intc.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/xmon.h (100%) + rename {include/asm-powerpc => arch/powerpc/include/asm}/xor.h (100%) + delete mode 100644 include/asm-powerpc/irq.h +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + block/scsi_ioctl.c | 2 +- + drivers/scsi/hptiop.c | 7 +++++++ + drivers/scsi/scsi_transport_spi.c | 8 +++++--- + drivers/scsi/ses.c | 18 ++++++++++++++---- + 4 files changed, 27 insertions(+), 8 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/ath5k/ath5k.h | 8 +- + drivers/net/wireless/ath5k/base.c | 1 + + drivers/net/wireless/ath5k/debug.c | 2 +- + drivers/net/wireless/ath5k/debug.h | 1 - + drivers/net/wireless/ath5k/hw.c | 239 +++++--- + drivers/net/wireless/ath5k/initvals.c | 4 +- + drivers/net/wireless/ath5k/phy.c | 185 +++++- + drivers/net/wireless/ath5k/reg.h | 934 +++++++++++++++++++++------- + drivers/net/wireless/ipw2200.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 8 +- + drivers/net/wireless/libertas/main.c | 15 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 1 + + drivers/net/wireless/rt2x00/rt2500usb.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00.h | 6 + + drivers/net/wireless/rt2x00/rt2x00config.c | 4 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 17 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 1 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 5 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 5 + + drivers/net/wireless/rtl8187.h | 4 + + drivers/net/wireless/rtl8187_dev.c | 17 +- + include/net/sch_generic.h | 12 + + net/core/dev.c | 8 +- + net/core/neighbour.c | 13 +- + net/ipv4/sysctl_net_ipv4.c | 1 + + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/tx.c | 17 +- + net/mac80211/util.c | 1 + + net/mac80211/wme.c | 6 +- + net/rfkill/rfkill-input.c | 54 ++- + net/rfkill/rfkill.c | 15 +- + net/sched/sch_generic.c | 12 +- + 37 files changed, 1200 insertions(+), 427 deletions(-) +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc64/kernel/signal.c | 1 - + arch/sparc64/kernel/smp.c | 147 ++++++++++++++++++++---------------------- + arch/sparc64/mm/tsb.c | 5 +- + 3 files changed, 74 insertions(+), 79 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/soc/fsl/fsl_dma.c | 235 +++++++++++++++++++++++++---------------------- + 1 files changed, 124 insertions(+), 111 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/mach-pxa/lubbock.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/x86/kernel/pci-gart_64.c | 24 ++++++++++++++---------- + drivers/pci/quirks.c | 5 ++++- + include/linux/pci.h | 10 ++++++---- + kernel/dma-coherent.c | 10 +++++----- + 4 files changed, 29 insertions(+), 20 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 9 + + 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 | 1066 +++ + drivers/net/wireless/ath9k/beacon.c | 977 +++ + drivers/net/wireless/ath9k/core.c | 1961 +++++ + drivers/net/wireless/ath9k/core.h | 1097 +++ + drivers/net/wireless/ath9k/hw.c | 8563 ++++++++++++++++++++ + drivers/net/wireless/ath9k/hw.h | 969 +++ + drivers/net/wireless/ath9k/initvals.h | 3146 +++++++ + drivers/net/wireless/ath9k/main.c | 1533 ++++ + 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 | 1031 +++ + drivers/net/wireless/ath9k/regd.h | 412 + + drivers/net/wireless/ath9k/regd_common.h | 1915 +++++ + drivers/net/wireless/ath9k/xmit.c | 2870 +++++++ + drivers/net/wireless/iwlwifi/Kconfig | 98 +- + drivers/net/wireless/iwlwifi/Makefile | 13 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 33 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 1 + + drivers/net/wireless/iwlwifi/iwl-3945.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 156 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 71 +- + .../iwlwifi/{iwl-4965-rs.c => iwl-agn-rs.c} | 327 +- + .../iwlwifi/{iwl-4965-rs.h => iwl-agn-rs.h} | 23 +- + .../wireless/iwlwifi/{iwl4965-base.c => iwl-agn.c} | 232 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 44 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 69 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 1 + + drivers/net/wireless/iwlwifi/iwl-power.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 33 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 12 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 59 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 1 + + drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 78 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 58 +- + drivers/net/wireless/p54/p54.h | 1 + + drivers/net/wireless/p54/p54common.c | 6 + + drivers/net/wireless/rt2x00/rt2500usb.c | 14 + + include/linux/ieee80211.h | 13 + + include/linux/list.h | 77 +- + include/net/mac80211.h | 13 +- + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/main.c | 5 + + net/mac80211/mlme.c | 39 +- + 62 files changed, 32565 insertions(+), 727 deletions(-) + 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 + rename drivers/net/wireless/iwlwifi/{iwl-4965-rs.c => iwl-agn-rs.c} (89%) + rename drivers/net/wireless/iwlwifi/{iwl-4965-rs.h => iwl-agn-rs.h} (93%) + rename drivers/net/wireless/iwlwifi/{iwl4965-base.c => iwl-agn.c} (96%) +Merging kbuild-current/master +$ git merge kbuild-current/master +Merge made by recursive. + scripts/kconfig/conf.c | 2 +- + scripts/kconfig/confdata.c | 8 ++------ + 2 files changed, 3 insertions(+), 7 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +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/core.c | 7 ++- + drivers/base/driver.c | 3 - + 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 | 5 +- + 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 +- + 85 files changed, 342 insertions(+), 281 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 drivers/Makefile +Removed drivers/usb/misc/auerswald.c +Merge made by recursive. + Documentation/devices.txt | 3 - + Documentation/ioctl-number.txt | 1 - + Documentation/usb/auerswald.txt | 30 - + MAINTAINERS | 12 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/usb/Kconfig | 4 +- + drivers/usb/class/cdc-acm.c | 8 +- + drivers/usb/class/usblp.c | 18 +- + drivers/usb/core/driver.c | 3 +- + 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/gadget_chips.h | 6 + + drivers/usb/host/ohci-hub.c | 7 + + 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 | 2266 ++++++++++++++++++++++++++++++++++++ + drivers/usb/musb/musb_core.h | 517 ++++++++ + drivers/usb/musb/musb_debug.h | 66 ++ + drivers/usb/musb/musb_dma.h | 172 +++ + drivers/usb/musb/musb_gadget.c | 2033 ++++++++++++++++++++++++++++++++ + 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 | 402 +++++++ + drivers/usb/musb/tusb6010_omap.c | 719 ++++++++++++ + drivers/usb/serial/ftdi_sio.c | 5 + + drivers/usb/serial/ftdi_sio.h | 6 + + drivers/usb/serial/usb-serial.c | 7 +- + drivers/usb/storage/transport.c | 17 +- + drivers/usb/storage/unusual_devs.h | 18 +- + include/linux/usb.h | 6 + + include/linux/usb/musb.h | 70 ++ + include/linux/usb/serial.h | 3 +- + 52 files changed, 15939 insertions(+), 2238 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 include/linux/usb/musb.h +$ git am -3 ../patches/0001-usb-two-more-functions-are-needed-when-CONFIG_PM-is.patch +Applying usb: two more functions are needed when CONFIG_PM is not set +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merged MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + arch/x86/kernel/cpu/cpufreq/Kconfig | 4 ++-- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 2 +- + drivers/cpufreq/cpufreq_conservative.c | 20 ++++++++++---------- + 4 files changed, 14 insertions(+), 14 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/joystick/xpad.c | 1 + + drivers/input/keyboard/gpio_keys.c | 3 ++- + drivers/input/touchscreen/Kconfig | 21 +++++++++------------ + 3 files changed, 12 insertions(+), 13 deletions(-) +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 +Merge made by recursive. + firmware/ihex2fw.c | 6 +++--- + include/linux/ihex.h | 2 +- + include/linux/vt_kern.h | 1 + + 3 files changed, 5 insertions(+), 4 deletions(-) +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 | 52 ++++++++++++++++++++++++++++++++++++++++++ + 13 files changed, 149 insertions(+), 26 deletions(-) +$ git am -3 ../patches/kobject_verification_fixup +Applying driver-core: kobject verification fixup +Merging quilt/usb +$ git merge quilt/usb +Merge made by recursive. + drivers/usb/misc/Kconfig | 10 ++ + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/gotemp.c | 301 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 312 insertions(+), 0 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 bb97947: 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 6995016: 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 6c55600: 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 +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merged drivers/md/dm-mpath.c +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 include/linux/i2c-id.h +Merge made by recursive. + arch/arm/mach-omap1/board-h3.c | 4 + + arch/arm/mach-omap2/board-h4.c | 11 +++ + drivers/i2c/chips/isp1301_omap.c | 141 +++++++++++++-------------------- + drivers/video/matrox/i2c-matroxfb.c | 21 +++-- + drivers/video/matrox/matroxfb_maven.c | 97 +++++++++------------- + include/linux/i2c-id.h | 2 - + 6 files changed, 123 insertions(+), 153 deletions(-) +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 +Merge made by recursive. + 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/pm.c | 4 +- + arch/avr32/mach-at32ap/pm.h | 12 +-- + include/asm-avr32/arch-at32ap/at32ap700x.h | 37 ++++++ + include/asm-avr32/arch-at32ap/chip.h | 19 +++ + include/asm-avr32/arch-at32ap/hmatrix.h | 55 +++++++++ + 10 files changed, 212 insertions(+), 214 deletions(-) + create mode 100644 arch/avr32/mach-at32ap/hmatrix.c + delete mode 100644 arch/avr32/mach-at32ap/hmatrix.h + create mode 100644 include/asm-avr32/arch-at32ap/chip.h + create mode 100644 include/asm-avr32/arch-at32ap/hmatrix.h +Merging s390/features +$ git merge s390/features +Merge made by recursive. + {include/asm-s390 => arch/s390/include/asm}/Kbuild | 0 + {include/asm-s390 => arch/s390/include/asm}/airq.h | 0 + .../asm-s390 => arch/s390/include/asm}/appldata.h | 0 + .../asm-s390 => arch/s390/include/asm}/atomic.h | 0 + .../asm-s390 => arch/s390/include/asm}/auxvec.h | 0 + .../asm-s390 => arch/s390/include/asm}/bitops.h | 0 + {include/asm-s390 => arch/s390/include/asm}/bug.h | 0 + {include/asm-s390 => arch/s390/include/asm}/bugs.h | 0 + .../asm-s390 => arch/s390/include/asm}/byteorder.h | 0 + .../asm-s390 => arch/s390/include/asm}/cache.h | 0 + .../s390/include/asm}/cacheflush.h | 0 + .../asm-s390 => arch/s390/include/asm}/ccwdev.h | 0 + .../asm-s390 => arch/s390/include/asm}/ccwgroup.h | 0 + .../asm-s390 => arch/s390/include/asm}/checksum.h | 0 + .../asm-s390 => arch/s390/include/asm}/chpid.h | 0 + {include/asm-s390 => arch/s390/include/asm}/chsc.h | 0 + {include/asm-s390 => arch/s390/include/asm}/cio.h | 0 + {include/asm-s390 => arch/s390/include/asm}/cmb.h | 0 + .../asm-s390 => arch/s390/include/asm}/compat.h | 0 + .../asm-s390 => arch/s390/include/asm}/cpcmd.h | 0 + {include/asm-s390 => arch/s390/include/asm}/cpu.h | 0 + .../asm-s390 => arch/s390/include/asm}/cputime.h | 0 + .../asm-s390 => arch/s390/include/asm}/current.h | 0 + {include/asm-s390 => arch/s390/include/asm}/dasd.h | 0 + .../asm-s390 => arch/s390/include/asm}/debug.h | 0 + .../asm-s390 => arch/s390/include/asm}/delay.h | 0 + .../asm-s390 => arch/s390/include/asm}/device.h | 0 + {include/asm-s390 => arch/s390/include/asm}/diag.h | 0 + .../asm-s390 => arch/s390/include/asm}/div64.h | 0 + {include/asm-s390 => arch/s390/include/asm}/dma.h | 0 + .../asm-s390 => arch/s390/include/asm}/ebcdic.h | 0 + {include/asm-s390 => arch/s390/include/asm}/elf.h | 0 + .../s390/include/asm}/emergency-restart.h | 0 + .../asm-s390 => arch/s390/include/asm}/errno.h | 0 + {include/asm-s390 => arch/s390/include/asm}/etr.h | 0 + .../asm-s390 => arch/s390/include/asm}/extmem.h | 0 + {include/asm-s390 => arch/s390/include/asm}/fb.h | 0 + .../asm-s390 => arch/s390/include/asm}/fcntl.h | 0 + {include/asm-s390 => arch/s390/include/asm}/fcx.h | 0 + .../asm-s390 => arch/s390/include/asm}/futex.h | 0 + .../asm-s390 => arch/s390/include/asm}/hardirq.h | 0 + .../asm-s390 => arch/s390/include/asm}/hugetlb.h | 0 + .../asm-s390 => arch/s390/include/asm}/idals.h | 0 + {include/asm-s390 => arch/s390/include/asm}/io.h | 0 + .../asm-s390 => arch/s390/include/asm}/ioctl.h | 0 + .../asm-s390 => arch/s390/include/asm}/ioctls.h | 0 + .../asm-s390 => arch/s390/include/asm}/ipcbuf.h | 0 + {include/asm-s390 => arch/s390/include/asm}/ipl.h | 0 + {include/asm-s390 => arch/s390/include/asm}/irq.h | 0 + .../asm-s390 => arch/s390/include/asm}/irq_regs.h | 0 + .../asm-s390 => arch/s390/include/asm}/irqflags.h | 0 + {include/asm-s390 => arch/s390/include/asm}/isc.h | 0 + {include/asm-s390 => arch/s390/include/asm}/itcw.h | 0 + .../asm-s390 => arch/s390/include/asm}/kdebug.h | 0 + .../asm-s390 => arch/s390/include/asm}/kexec.h | 0 + .../s390/include/asm}/kmap_types.h | 0 + .../asm-s390 => arch/s390/include/asm}/kprobes.h | 0 + {include/asm-s390 => arch/s390/include/asm}/kvm.h | 0 + .../asm-s390 => arch/s390/include/asm}/kvm_host.h | 0 + .../asm-s390 => arch/s390/include/asm}/kvm_para.h | 0 + .../s390/include/asm}/kvm_virtio.h | 0 + .../asm-s390 => arch/s390/include/asm}/linkage.h | 0 + .../asm-s390 => arch/s390/include/asm}/local.h | 0 + .../asm-s390 => arch/s390/include/asm}/lowcore.h | 0 + .../asm-s390 => arch/s390/include/asm}/mathemu.h | 0 + {include/asm-s390 => arch/s390/include/asm}/mman.h | 0 + {include/asm-s390 => arch/s390/include/asm}/mmu.h | 0 + .../s390/include/asm}/mmu_context.h | 0 + .../asm-s390 => arch/s390/include/asm}/module.h | 0 + .../asm-s390 => arch/s390/include/asm}/monwriter.h | 0 + .../asm-s390 => arch/s390/include/asm}/msgbuf.h | 0 + .../asm-s390 => arch/s390/include/asm}/mutex.h | 0 + {include/asm-s390 => arch/s390/include/asm}/page.h | 0 + .../asm-s390 => arch/s390/include/asm}/param.h | 0 + {include/asm-s390 => arch/s390/include/asm}/pci.h | 0 + .../asm-s390 => arch/s390/include/asm}/percpu.h | 0 + .../asm-s390 => arch/s390/include/asm}/pgalloc.h | 0 + .../asm-s390 => arch/s390/include/asm}/pgtable.h | 0 + {include/asm-s390 => arch/s390/include/asm}/poll.h | 0 + .../s390/include/asm}/posix_types.h | 0 + .../asm-s390 => arch/s390/include/asm}/processor.h | 0 + .../asm-s390 => arch/s390/include/asm}/ptrace.h | 0 + {include/asm-s390 => arch/s390/include/asm}/qdio.h | 0 + {include/asm-s390 => arch/s390/include/asm}/qeth.h | 0 + .../asm-s390 => arch/s390/include/asm}/reset.h | 0 + .../asm-s390 => arch/s390/include/asm}/resource.h | 0 + .../asm-s390 => arch/s390/include/asm}/rwsem.h | 0 + .../asm-s390 => arch/s390/include/asm}/s390_ext.h | 0 + .../asm-s390 => arch/s390/include/asm}/s390_rdev.h | 0 + .../s390/include/asm}/scatterlist.h | 0 + .../asm-s390 => arch/s390/include/asm}/schid.h | 0 + {include/asm-s390 => arch/s390/include/asm}/sclp.h | 0 + .../asm-s390 => arch/s390/include/asm}/sections.h | 0 + .../asm-s390 => arch/s390/include/asm}/segment.h | 0 + .../asm-s390 => arch/s390/include/asm}/sembuf.h | 0 + .../asm-s390 => arch/s390/include/asm}/setup.h | 0 + .../s390/include/asm}/sfp-machine.h | 0 + .../asm-s390 => arch/s390/include/asm}/sfp-util.h | 0 + .../asm-s390 => arch/s390/include/asm}/shmbuf.h | 0 + .../asm-s390 => arch/s390/include/asm}/shmparam.h | 0 + .../s390/include/asm}/sigcontext.h | 0 + .../asm-s390 => arch/s390/include/asm}/siginfo.h | 0 + .../asm-s390 => arch/s390/include/asm}/signal.h | 0 + {include/asm-s390 => arch/s390/include/asm}/sigp.h | 0 + {include/asm-s390 => arch/s390/include/asm}/smp.h | 0 + .../asm-s390 => arch/s390/include/asm}/socket.h | 0 + .../asm-s390 => arch/s390/include/asm}/sockios.h | 0 + .../asm-s390 => arch/s390/include/asm}/sparsemem.h | 0 + .../asm-s390 => arch/s390/include/asm}/spinlock.h | 0 + .../s390/include/asm}/spinlock_types.h | 0 + {include/asm-s390 => arch/s390/include/asm}/stat.h | 0 + .../asm-s390 => arch/s390/include/asm}/statfs.h | 0 + .../asm-s390 => arch/s390/include/asm}/string.h | 0 + .../asm-s390 => arch/s390/include/asm}/suspend.h | 0 + .../asm-s390 => arch/s390/include/asm}/sysinfo.h | 0 + .../asm-s390 => arch/s390/include/asm}/system.h | 0 + .../asm-s390 => arch/s390/include/asm}/tape390.h | 0 + .../asm-s390 => arch/s390/include/asm}/termbits.h | 0 + .../asm-s390 => arch/s390/include/asm}/termios.h | 0 + .../s390/include/asm}/thread_info.h | 0 + .../asm-s390 => arch/s390/include/asm}/timer.h | 0 + .../asm-s390 => arch/s390/include/asm}/timex.h | 0 + {include/asm-s390 => arch/s390/include/asm}/tlb.h | 0 + .../asm-s390 => arch/s390/include/asm}/tlbflush.h | 0 + .../asm-s390 => arch/s390/include/asm}/todclk.h | 0 + .../asm-s390 => arch/s390/include/asm}/topology.h | 0 + .../asm-s390 => arch/s390/include/asm}/types.h | 0 + .../asm-s390 => arch/s390/include/asm}/uaccess.h | 0 + .../asm-s390 => arch/s390/include/asm}/ucontext.h | 0 + .../asm-s390 => arch/s390/include/asm}/unaligned.h | 0 + .../asm-s390 => arch/s390/include/asm}/unistd.h | 0 + {include/asm-s390 => arch/s390/include/asm}/user.h | 0 + {include/asm-s390 => arch/s390/include/asm}/vtoc.h | 0 + {include/asm-s390 => arch/s390/include/asm}/xor.h | 0 + .../asm-s390 => arch/s390/include/asm}/zcrypt.h | 0 + 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 ++ + 139 files changed, 80 insertions(+), 35 deletions(-) + rename {include/asm-s390 => arch/s390/include/asm}/Kbuild (100%) + rename {include/asm-s390 => arch/s390/include/asm}/airq.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/appldata.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/atomic.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/auxvec.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/bitops.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/bug.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/bugs.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/byteorder.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cache.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cacheflush.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ccwdev.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ccwgroup.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/checksum.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/chpid.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/chsc.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cio.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cmb.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/compat.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cpcmd.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cpu.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/cputime.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/current.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/dasd.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/debug.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/delay.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/device.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/diag.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/div64.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/dma.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ebcdic.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/elf.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/emergency-restart.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/errno.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/etr.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/extmem.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/fb.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/fcntl.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/fcx.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/futex.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/hardirq.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/hugetlb.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/idals.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/io.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ioctl.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ioctls.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ipcbuf.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ipl.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/irq.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/irq_regs.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/irqflags.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/isc.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/itcw.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kdebug.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kexec.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kmap_types.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kprobes.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kvm.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kvm_host.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kvm_para.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/kvm_virtio.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/linkage.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/local.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/lowcore.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/mathemu.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/mman.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/mmu.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/mmu_context.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/module.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/monwriter.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/msgbuf.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/mutex.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/page.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/param.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/pci.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/percpu.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/pgalloc.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/pgtable.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/poll.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/posix_types.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/processor.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ptrace.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/qdio.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/qeth.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/reset.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/resource.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/rwsem.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/s390_ext.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/s390_rdev.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/scatterlist.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/schid.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sclp.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sections.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/segment.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sembuf.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/setup.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sfp-machine.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sfp-util.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/shmbuf.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/shmparam.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sigcontext.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/siginfo.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/signal.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sigp.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/smp.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/socket.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sockios.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sparsemem.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/spinlock.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/spinlock_types.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/stat.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/statfs.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/string.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/suspend.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/sysinfo.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/system.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/tape390.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/termbits.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/termios.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/thread_info.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/timer.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/timex.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/tlb.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/tlbflush.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/todclk.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/topology.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/types.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/uaccess.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/ucontext.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/unaligned.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/unistd.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/user.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/vtoc.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/xor.h (100%) + rename {include/asm-s390 => arch/s390/include/asm}/zcrypt.h (100%) +Merging sh/master +$ git merge sh/master +Removed arch/sh/include/asm/a.out.h +Merge made by recursive. + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/sh.tmpl | 105 ++++++++++++++++++ + arch/sh/Kconfig | 27 ++++- + arch/sh/Kconfig.debug | 2 +- + arch/sh/Makefile | 16 ++-- + arch/sh/boards/Makefile | 2 +- + arch/sh/boards/board-ap325rxa.c | 1 - + arch/sh/boards/mach-se/7343/irq.c | 1 - + arch/sh/configs/dreamcast_defconfig | 14 +-- + arch/sh/include/asm/a.out.h | 20 ---- + arch/sh/include/asm/ptrace.h | 9 ++ + arch/sh/include/asm/seccomp.h | 10 ++ + arch/sh/include/asm/thread_info.h | 51 ++++++--- + arch/sh/include/asm/tlb_64.h | 12 +-- + arch/sh/include/cpu-sh2/cpu/cache.h | 6 +- + arch/sh/include/cpu-sh2a/cpu/addrspace.h | 10 ++ + arch/sh/include/cpu-sh2a/cpu/cache.h | 3 + + arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 34 ++++++ + arch/sh/kernel/cpu/sh4/sq.c | 2 +- + arch/sh/kernel/cpu/sh5/entry.S | 19 ++-- + arch/sh/kernel/entry-common.S | 16 +-- + arch/sh/kernel/machine_kexec.c | 8 ++ + arch/sh/kernel/module.c | 7 +- + arch/sh/kernel/ptrace_32.c | 157 ++++++++++----------------- + arch/sh/kernel/ptrace_64.c | 144 +++++++++--------------- + arch/sh/kernel/setup.c | 20 ++++ + arch/sh/kernel/signal_32.c | 22 +++- + arch/sh/kernel/signal_64.c | 166 +++++++++++++++------------- + arch/sh/mm/Kconfig | 1 - + arch/sh/mm/Makefile_32 | 11 +- + arch/sh/mm/cache-sh2.c | 45 ++++++-- + arch/sh/mm/cache-sh2a.c | 129 +++++++++++++++++++++ + arch/sh/mm/tlb-sh5.c | 20 +--- + arch/sh/tools/Makefile | 4 +- + drivers/input/keyboard/maple_keyb.c | 172 +++++++++++++++-------------- + drivers/net/stnic.c | 2 +- + drivers/sh/maple/maple.c | 65 +++++++---- + include/linux/maple.h | 8 +- + mm/nommu.c | 21 ++++ + 39 files changed, 854 insertions(+), 510 deletions(-) + create mode 100644 Documentation/DocBook/sh.tmpl + delete mode 100644 arch/sh/include/asm/a.out.h + create mode 100644 arch/sh/include/asm/seccomp.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/addrspace.h + create mode 100644 arch/sh/include/cpu-sh2a/cpu/cacheflush.h + create mode 100644 arch/sh/mm/cache-sh2a.c +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 +Auto-merged drivers/scsi/hptiop.c +Auto-merged init/main.c +Merge made by recursive. + arch/m68k/mac/baboon.c | 1 - + arch/m68k/mac/via.c | 1 - + arch/mips/emma2rh/markeins/setup.c | 1 - + arch/mips/jazz/setup.c | 2 - + arch/powerpc/include/asm/ide.h | 1 - + arch/sh/boards/mach-systemh/irq.c | 3 +- + arch/xtensa/kernel/xtensa_ksyms.c | 1 - + drivers/ata/libata-scsi.c | 2 +- + drivers/block/hd.c | 9 +- + drivers/cdrom/cdrom.c | 4 - + drivers/ide/Kconfig | 33 ---- + drivers/ide/arm/icside.c | 5 +- + drivers/ide/arm/palm_bk3710.c | 10 +- + drivers/ide/ide-acpi.c | 6 +- + drivers/ide/ide-atapi.c | 34 ++-- + drivers/ide/ide-cd.c | 102 ++++++------ + drivers/ide/ide-disk.c | 280 ++++++++++++++++----------------- + drivers/ide/ide-dma.c | 56 ++++---- + drivers/ide/ide-floppy.c | 72 +++++---- + drivers/ide/ide-io.c | 77 ++++------ + drivers/ide/ide-iops.c | 225 ++++++++------------------- + drivers/ide/ide-lib.c | 73 +++++----- + drivers/ide/ide-probe.c | 240 ++++++++++++++--------------- + drivers/ide/ide-proc.c | 300 +++++++++++------------------------- + drivers/ide/ide-tape.c | 106 ++++++++----- + drivers/ide/ide-taskfile.c | 61 ++++---- + drivers/ide/ide-timings.c | 22 ++-- + drivers/ide/ide.c | 143 ++++++++++++----- + 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 | 3 +- + drivers/ide/pci/alim15x3.c | 7 +- + drivers/ide/pci/amd74xx.c | 2 +- + drivers/ide/pci/atiixp.c | 3 +- + drivers/ide/pci/cmd640.c | 43 +++--- + drivers/ide/pci/cmd64x.c | 3 +- + drivers/ide/pci/cs5520.c | 2 +- + drivers/ide/pci/cs5530.c | 15 +- + drivers/ide/pci/cs5535.c | 6 +- + drivers/ide/pci/delkin_cb.c | 1 - + drivers/ide/pci/generic.c | 1 - + drivers/ide/pci/hpt34x.c | 1 - + drivers/ide/pci/hpt366.c | 15 +- + drivers/ide/pci/it8213.c | 3 +- + drivers/ide/pci/it821x.c | 56 ++++---- + drivers/ide/pci/jmicron.c | 3 +- + drivers/ide/pci/ns87415.c | 7 +- + drivers/ide/pci/opti621.c | 5 +- + drivers/ide/pci/pdc202xx_new.c | 7 +- + drivers/ide/pci/pdc202xx_old.c | 9 +- + drivers/ide/pci/piix.c | 3 +- + drivers/ide/pci/rz1000.c | 1 - + drivers/ide/pci/sc1200.c | 15 +- + drivers/ide/pci/scc_pata.c | 7 +- + drivers/ide/pci/serverworks.c | 13 +- + drivers/ide/pci/sgiioc4.c | 1 - + drivers/ide/pci/siimage.c | 17 +- + drivers/ide/pci/sis5513.c | 3 +- + drivers/ide/pci/sl82c105.c | 3 +- + drivers/ide/pci/slc90e66.c | 3 +- + drivers/ide/pci/tc86c001.c | 2 +- + drivers/ide/pci/triflex.c | 1 - + drivers/ide/pci/trm290.c | 1 - + drivers/ide/pci/via82cxxx.c | 6 +- + drivers/ide/ppc/pmac.c | 6 +- + drivers/macintosh/mediabay.c | 1 - + drivers/scsi/hptiop.c | 1 - + drivers/scsi/ide-scsi.c | 85 ++++++---- + drivers/usb/storage/freecom.c | 2 - + include/linux/ata.h | 194 ++++++++++++++++++------ + include/linux/ide.h | 216 +++++++++++++------------- + init/main.c | 1 - + 81 files changed, 1294 insertions(+), 1384 deletions(-) +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_super.c | 11 ++++- + fs/xfs/xfs_bit.c | 103 ------------------------------------------ + fs/xfs/xfs_bit.h | 34 ++++++++++++-- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_rtalloc.c | 19 +++----- + 5 files changed, 48 insertions(+), 120 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merged drivers/infiniband/hw/ipath/ipath_iba7220.c +Merge made by recursive. + drivers/infiniband/core/cma.c | 37 +++++++++++++-------------- + 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/ulp/ipoib/ipoib_cm.c | 2 +- + include/rdma/rdma_cm.h | 8 +---- + 12 files changed, 66 insertions(+), 91 deletions(-) +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-cdev.c | 29 +++++++++++++------ + 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 +- + 8 files changed, 104 insertions(+), 125 deletions(-) +Merging hwmon/testing +$ git merge hwmon/testing +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/master +$ git merge kvm/master +Auto-merged arch/x86/kvm/mmu.c +Auto-merged arch/x86/kvm/x86.c +Auto-merged include/asm-x86/kvm_host.h +Auto-merged include/linux/kvm.h +CONFLICT (content): Merge conflict in include/linux/kvm.h +Auto-merged include/linux/kvm_host.h +Auto-merged virt/kvm/kvm_main.c +Resolved 'include/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Created commit c8f0262: Merge commit 'kvm/master' +$ git diff -M --stat --summary HEAD^.. + 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 +Already up-to-date. +Merging quilt/m68k +$ git merge quilt/m68k +Already up-to-date. +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 | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 2 +- + drivers/mtd/chips/gen_probe.c | 2 +- + drivers/mtd/devices/Kconfig | 11 ++ + drivers/mtd/devices/mtd_dataflash.c | 206 +++++++++++++++++++++++++++++++++- + 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/onenand_regs.h | 2 + + 19 files changed, 224 insertions(+), 833 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 +Merge made by recursive. + crypto/Kconfig | 81 +- + crypto/Makefile | 2 + + crypto/algapi.c | 144 +- + crypto/{cryptomgr.c => algboss.c} | 86 +- + crypto/api.c | 81 +- + crypto/digest.c | 2 +- + crypto/internal.h | 12 +- + crypto/proc.c | 10 +- + crypto/tcrypt.c | 1337 +----- + crypto/tcrypt.h | 8709 +------------------------------------ + crypto/testmgr.c | 1744 ++++++++ + crypto/testmgr.h | 8738 +++++++++++++++++++++++++++++++++++++ + drivers/crypto/talitos.c | 54 +- + include/linux/crypto.h | 10 + + 14 files changed, 11006 insertions(+), 10004 deletions(-) + rename crypto/{cryptomgr.c => algboss.c} (70%) + create mode 100644 crypto/testmgr.c + create mode 100644 crypto/testmgr.h +$ git am -3 ../patches/0001-crypto-tetsmgr-linking-fix.patch +Applying crypto: tetsmgr linking fix +$ git reset HEAD^ +crypto/Makefile: needs update +$ git commit -v -a --amend +Created commit 6d08fc5: Merge commit 'crypto/master' +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 +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 | 2313 +++++++++++++++++++++++ + sound/pci/Kconfig | 10 +- + sound/pci/ac97/ac97_codec.c | 20 +- + 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 | 34 + + sound/soc/codecs/Makefile | 6 + + 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/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/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/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 ++ + 78 files changed, 9693 insertions(+), 4341 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/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 +Removed arch/arm/include/asm/hardware.h +Auto-merged arch/arm/mach-at91/board-cap9adk.c +Auto-merged arch/arm/mach-at91/board-qil-a9260.c +Auto-merged arch/arm/mach-at91/board-sam9-l9260.c +Auto-merged arch/arm/mach-at91/board-sam9260ek.c +Auto-merged arch/arm/mach-at91/board-sam9261ek.c +Auto-merged arch/arm/mach-at91/board-sam9263ek.c +Auto-merged arch/arm/mach-at91/board-sam9g20ek.c +Auto-merged arch/arm/mach-at91/board-usb-a9260.c +Auto-merged arch/arm/mach-at91/board-usb-a9263.c +Auto-merged arch/arm/mach-omap1/board-h3.c +Auto-merged arch/arm/mach-omap2/board-h4.c +Auto-merged arch/arm/mach-pxa/lubbock.c +Auto-merged drivers/i2c/busses/i2c-s3c2410.c +Auto-merged drivers/spi/spi_s3c24xx.c +Auto-merged sound/soc/pxa/pxa2xx-pcm.c +Merge made by recursive. + arch/arm/Makefile | 35 +++++++++++--------- + arch/arm/boot/compressed/head-xscale.S | 1 - + arch/arm/common/locomo.c | 2 +- + arch/arm/common/sa1111.c | 2 +- + arch/arm/common/sharpsl_pm.c | 3 +- + arch/arm/common/time-acorn.c | 2 +- + arch/arm/common/uengine.c | 1 - + 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/hw_irq.h | 20 +++++++++++- + arch/arm/include/asm/mach/irq.h | 20 ----------- + arch/arm/include/asm/mtd-xip.h | 2 +- + arch/arm/include/asm/pci.h | 2 +- + arch/arm/include/asm/vga.h | 2 +- + arch/arm/kernel/ecard.c | 2 +- + arch/arm/kernel/head-nommu.S | 1 - + 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 | 2 +- + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91x40_time.c | 2 +- + arch/arm/mach-at91/board-1arm.c | 2 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-carmeva.c | 2 +- + arch/arm/mach-at91/board-csb337.c | 2 +- + arch/arm/mach-at91/board-csb637.c | 2 +- + arch/arm/mach-at91/board-dk.c | 2 +- + arch/arm/mach-at91/board-eb01.c | 2 +- + arch/arm/mach-at91/board-eb9200.c | 2 +- + arch/arm/mach-at91/board-ecbat91.c | 2 +- + arch/arm/mach-at91/board-ek.c | 2 +- + arch/arm/mach-at91/board-kafa.c | 2 +- + arch/arm/mach-at91/board-kb9202.c | 2 +- + arch/arm/mach-at91/board-picotux200.c | 2 +- + arch/arm/mach-at91/board-qil-a9260.c | 2 +- + arch/arm/mach-at91/board-sam9-l9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9g20ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-usb-a9260.c | 2 +- + arch/arm/mach-at91/board-usb-a9263.c | 2 +- + arch/arm/mach-at91/board-yl-9200.c | 2 +- + arch/arm/mach-at91/clock.c | 3 +- + arch/arm/mach-at91/gpio.c | 2 +- + arch/arm/mach-at91/irq.c | 3 +- + arch/arm/mach-at91/leds.c | 1 - + arch/arm/mach-at91/pm.c | 1 - + arch/arm/mach-clps711x/autcpu12.c | 2 +- + 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 +- + 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 | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-clps7500/core.c | 2 +- + arch/arm/mach-davinci/board-evm.c | 2 +- + arch/arm/mach-davinci/clock.c | 2 +- + arch/arm/mach-davinci/irq.c | 2 +- + arch/arm/mach-davinci/mux.c | 2 +- + arch/arm/mach-davinci/psc.c | 2 +- + arch/arm/mach-davinci/serial.c | 2 +- + arch/arm/mach-davinci/time.c | 2 +- + arch/arm/mach-ebsa110/core.c | 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 | 2 +- + 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/micro9.c | 2 +- + arch/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-footbridge/ebsa285-leds.c | 2 +- + arch/arm/mach-footbridge/isa-irq.c | 2 +- + arch/arm/mach-footbridge/netwinder-leds.c | 2 +- + arch/arm/mach-footbridge/time.c | 2 +- + arch/arm/mach-h720x/common.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-h720x/h7201-eval.c | 2 +- + arch/arm/mach-h720x/h7202-eval.c | 2 +- + arch/arm/mach-imx/cpufreq.c | 2 +- + arch/arm/mach-imx/dma.c | 2 +- + arch/arm/mach-imx/generic.c | 2 +- + arch/arm/mach-imx/irq.c | 2 +- + arch/arm/mach-imx/leds-mx1ads.c | 2 +- + arch/arm/mach-imx/mx1ads.c | 2 +- + arch/arm/mach-imx/time.c | 2 +- + arch/arm/mach-integrator/core.c | 2 +- + arch/arm/mach-integrator/cpu.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-integrator/integrator_cp.c | 2 +- + arch/arm/mach-integrator/leds.c | 2 +- + arch/arm/mach-integrator/pci_v3.c | 2 +- + arch/arm/mach-iop13xx/io.c | 2 +- + arch/arm/mach-iop13xx/iq81340mc.c | 2 +- + arch/arm/mach-iop13xx/iq81340sc.c | 2 +- + arch/arm/mach-iop13xx/irq.c | 3 +- + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop13xx/setup.c | 2 +- + arch/arm/mach-iop32x/em7210.c | 2 +- + arch/arm/mach-iop32x/glantank.c | 2 +- + arch/arm/mach-iop32x/iq31244.c | 2 +- + arch/arm/mach-iop32x/iq80321.c | 2 +- + arch/arm/mach-iop32x/irq.c | 2 +- + arch/arm/mach-iop32x/n2100.c | 2 +- + arch/arm/mach-iop33x/iq80331.c | 2 +- + arch/arm/mach-iop33x/iq80332.c | 2 +- + arch/arm/mach-iop33x/irq.c | 2 +- + arch/arm/mach-iop33x/uart.c | 3 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp2000/enp2611.c | 2 +- + arch/arm/mach-ixp2000/ixdp2400.c | 2 +- + arch/arm/mach-ixp2000/ixdp2800.c | 2 +- + arch/arm/mach-ixp2000/ixdp2x00.c | 2 +- + 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 +- + 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 | 2 +- + 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 | 2 +- + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 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/wg302v2-pci.c | 2 +- + arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 +- + arch/arm/mach-kirkwood/addr-map.c | 2 +- + arch/arm/mach-ks8695/cpu.c | 2 +- + arch/arm/mach-ks8695/gpio.c | 2 +- + arch/arm/mach-ks8695/irq.c | 2 +- + arch/arm/mach-ks8695/leds.c | 1 - + arch/arm/mach-ks8695/pci.c | 2 +- + arch/arm/mach-l7200/core.c | 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 | 2 +- + arch/arm/mach-lh7a40x/irq-lh7a400.c | 2 +- + arch/arm/mach-lh7a40x/irq-lh7a404.c | 2 +- + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 2 +- + arch/arm/mach-lh7a40x/ssp-cpld.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-loki/addr-map.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-msm/irq.c | 2 +- + arch/arm/mach-mx2/clock_imx27.c | 1 - + arch/arm/mach-mx2/cpu_imx27.c | 2 +- + arch/arm/mach-mx2/devices.c | 2 +- + arch/arm/mach-mx2/generic.c | 2 +- + arch/arm/mach-mx2/mx27ads.c | 2 +- + arch/arm/mach-mx2/pcm038.c | 2 +- + arch/arm/mach-mx2/pcm970-baseboard.c | 3 +- + arch/arm/mach-mx2/serial.c | 2 +- + arch/arm/mach-mx3/devices.c | 2 +- + arch/arm/mach-mx3/iomux.c | 2 +- + arch/arm/mach-mx3/mm.c | 2 +- + arch/arm/mach-mx3/mx31ads.c | 2 +- + arch/arm/mach-mx3/mx31lite.c | 2 +- + arch/arm/mach-mx3/pcm037.c | 2 +- + arch/arm/mach-netx/fb.c | 2 +- + arch/arm/mach-netx/generic.c | 2 +- + arch/arm/mach-netx/nxdb500.c | 2 +- + arch/arm/mach-netx/nxdkn.c | 2 +- + arch/arm/mach-netx/nxeb500hmi.c | 2 +- + arch/arm/mach-netx/pfifo.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-netx/xc.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 1 - + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-generic.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/board-voiceblue.c | 2 +- + arch/arm/mach-omap1/devices.c | 3 +- + arch/arm/mach-omap1/fpga.c | 2 +- + arch/arm/mach-omap1/irq.c | 2 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- + arch/arm/mach-omap1/leds-innovator.c | 2 +- + arch/arm/mach-omap1/leds-osk.c | 2 +- + arch/arm/mach-omap1/pm.c | 1 - + arch/arm/mach-omap1/sram.S | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/board-2430sdp.c | 2 +- + arch/arm/mach-omap2/board-apollon.c | 2 +- + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/board-h4.c | 2 +- + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/irq.c | 2 +- + arch/arm/mach-omap2/pm.c | 1 - + arch/arm/mach-omap2/sram242x.S | 2 +- + arch/arm/mach-omap2/sram243x.S | 2 +- + arch/arm/mach-orion5x/addr-map.c | 2 +- + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-pnx4008/clock.c | 2 +- + arch/arm/mach-pnx4008/core.c | 2 +- + arch/arm/mach-pnx4008/dma.c | 2 +- + arch/arm/mach-pnx4008/irq.c | 3 +- + arch/arm/mach-pnx4008/pm.c | 1 - + arch/arm/mach-pnx4008/serial.c | 2 +- + arch/arm/mach-pnx4008/sleep.S | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/clock.c | 2 +- + arch/arm/mach-pxa/colibri.c | 2 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/corgi_lcd.c | 2 +- + arch/arm/mach-pxa/corgi_pm.c | 2 +- + arch/arm/mach-pxa/corgi_ssp.c | 2 +- + arch/arm/mach-pxa/cpu-pxa.c | 2 +- + arch/arm/mach-pxa/dma.c | 2 +- + arch/arm/mach-pxa/generic.c | 2 +- + arch/arm/mach-pxa/gpio.c | 2 +- + arch/arm/mach-pxa/gumstix.c | 2 +- + arch/arm/mach-pxa/idp.c | 2 +- + arch/arm/mach-pxa/irq.c | 2 +- + arch/arm/mach-pxa/leds-idp.c | 2 +- + arch/arm/mach-pxa/leds-lubbock.c | 2 +- + arch/arm/mach-pxa/leds-mainstone.c | 2 +- + arch/arm/mach-pxa/leds-trizeps4.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/lpd270.c | 2 +- + arch/arm/mach-pxa/lubbock.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 2 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa25x.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa300.c | 2 +- + arch/arm/mach-pxa/pxa320.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/pxa930.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-pxa/sleep.S | 2 +- + arch/arm/mach-pxa/spitz.c | 2 +- + arch/arm/mach-pxa/spitz_pm.c | 2 +- + arch/arm/mach-pxa/ssp.c | 2 +- + arch/arm/mach-pxa/standby.S | 2 +- + arch/arm/mach-pxa/tavorevb.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/zylonite.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-realview/localtimer.c | 2 +- + arch/arm/mach-realview/platsmp.c | 2 +- + arch/arm/mach-realview/realview_eb.c | 2 +- + arch/arm/mach-realview/realview_pb1176.c | 2 +- + arch/arm/mach-realview/realview_pb11mp.c | 2 +- + arch/arm/mach-rpc/dma.c | 2 +- + arch/arm/mach-rpc/riscpc.c | 2 +- + arch/arm/mach-s3c2400/gpio.c | 2 +- + arch/arm/mach-s3c2410/bast-irq.c | 2 +- + arch/arm/mach-s3c2410/clock.c | 2 +- + arch/arm/mach-s3c2410/gpio.c | 2 +- + arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 +- + arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- + arch/arm/mach-s3c2410/mach-bast.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2410/mach-n30.c | 2 +- + arch/arm/mach-s3c2410/mach-otom.c | 2 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- + arch/arm/mach-s3c2410/pm-h1940.S | 2 +- + arch/arm/mach-s3c2410/pm.c | 2 +- + arch/arm/mach-s3c2410/s3c2410.c | 2 +- + arch/arm/mach-s3c2410/sleep.S | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 2 +- + arch/arm/mach-s3c2412/clock.c | 2 +- + arch/arm/mach-s3c2412/gpio.c | 2 +- + arch/arm/mach-s3c2412/irq.c | 2 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 2 +- + arch/arm/mach-s3c2412/mach-vstms.c | 2 +- + arch/arm/mach-s3c2412/pm.c | 2 +- + arch/arm/mach-s3c2412/s3c2412.c | 2 +- + arch/arm/mach-s3c2412/sleep.S | 2 +- + arch/arm/mach-s3c2440/clock.c | 2 +- + arch/arm/mach-s3c2440/dsc.c | 2 +- + arch/arm/mach-s3c2440/irq.c | 2 +- + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- + arch/arm/mach-s3c2440/mach-osiris.c | 2 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + arch/arm/mach-s3c2442/clock.c | 2 +- + arch/arm/mach-s3c2443/clock.c | 2 +- + arch/arm/mach-s3c2443/irq.c | 2 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- + arch/arm/mach-s3c2443/s3c2443.c | 2 +- + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/badge4.c | 2 +- + arch/arm/mach-sa1100/cerf.c | 2 +- + arch/arm/mach-sa1100/clock.c | 2 +- + arch/arm/mach-sa1100/collie.c | 2 +- + arch/arm/mach-sa1100/collie_pm.c | 3 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 2 +- + arch/arm/mach-sa1100/cpu-sa1110.c | 2 +- + arch/arm/mach-sa1100/dma.c | 2 +- + arch/arm/mach-sa1100/generic.c | 2 +- + arch/arm/mach-sa1100/gpio.c | 2 +- + arch/arm/mach-sa1100/h3600.c | 2 +- + arch/arm/mach-sa1100/hackkit.c | 2 +- + arch/arm/mach-sa1100/irq.c | 2 +- + arch/arm/mach-sa1100/jornada720.c | 2 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- + arch/arm/mach-sa1100/lart.c | 2 +- + arch/arm/mach-sa1100/leds-assabet.c | 2 +- + 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 | 2 +- + arch/arm/mach-sa1100/neponset.c | 2 +- + arch/arm/mach-sa1100/pleb.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-sa1100/shannon.c | 2 +- + arch/arm/mach-sa1100/simpad.c | 2 +- + arch/arm/mach-sa1100/sleep.S | 2 +- + arch/arm/mach-sa1100/ssp.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/leds.c | 2 +- + arch/arm/mach-versatile/core.c | 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/i2c.c | 3 +- + arch/arm/plat-iop/io.c | 2 +- + arch/arm/plat-iop/pci.c | 3 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/gpio.c | 2 +- + arch/arm/plat-mxc/iomux-mx1-mx2.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-omap/common.c | 2 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/debug-devices.c | 2 +- + arch/arm/plat-omap/debug-leds.c | 2 +- + arch/arm/plat-omap/devices.c | 2 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-omap/dmtimer.c | 2 +- + arch/arm/plat-omap/fb.c | 3 +- + arch/arm/plat-omap/gpio.c | 2 +- + arch/arm/plat-omap/i2c.c | 1 - + arch/arm/plat-omap/ocpi.c | 2 +- + arch/arm/plat-omap/usb.c | 2 +- + arch/arm/plat-s3c24xx/clock.c | 2 +- + arch/arm/plat-s3c24xx/common-smdk.c | 2 +- + arch/arm/plat-s3c24xx/cpu.c | 2 +- + arch/arm/plat-s3c24xx/devs.c | 2 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + arch/arm/plat-s3c24xx/gpio.c | 2 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + arch/arm/plat-s3c24xx/irq.c | 2 +- + arch/arm/plat-s3c24xx/pm-simtec.c | 2 +- + arch/arm/plat-s3c24xx/pm.c | 2 +- + arch/arm/plat-s3c24xx/pwm-clock.c | 2 +- + arch/arm/plat-s3c24xx/s3c244x-clock.c | 2 +- + arch/arm/plat-s3c24xx/s3c244x-irq.c | 2 +- + arch/arm/plat-s3c24xx/s3c244x.c | 2 +- + arch/arm/plat-s3c24xx/sleep.S | 2 +- + drivers/char/ds1620.c | 2 +- + drivers/char/hw_random/ixp4xx-rng.c | 2 +- + drivers/i2c/busses/i2c-acorn.c | 2 +- + drivers/i2c/busses/i2c-davinci.c | 3 +- + drivers/i2c/busses/i2c-ixp2000.c | 2 +- + drivers/i2c/busses/i2c-pnx.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/chips/menelaus.c | 1 - + drivers/ide/arm/ide_arm.c | 1 - + drivers/input/keyboard/jornada720_kbd.c | 2 +- + drivers/input/keyboard/omap-keypad.c | 3 +- + drivers/input/keyboard/pxa27x_keypad.c | 1 - + drivers/input/misc/ixp4xx-beeper.c | 2 +- + drivers/input/mouse/rpcmouse.c | 2 +- + drivers/input/serio/rpckbd.c | 2 +- + drivers/input/touchscreen/jornada720_ts.c | 2 +- + drivers/leds/leds-corgi.c | 1 - + drivers/leds/leds-h1940.c | 2 +- + drivers/leds/leds-locomo.c | 2 +- + drivers/leds/leds-s3c24xx.c | 2 +- + drivers/mfd/mcp-sa11x0.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mmc/host/omap.c | 1 - + drivers/mtd/maps/autcpu12-nvram.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 | 2 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/maps/pxa2xx-flash.c | 2 +- + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/mtd/nand/sharpsl.c | 2 +- + drivers/net/arm/am79c961a.c | 2 +- + drivers/net/irda/ep7211-sir.c | 2 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/ixp2000/ixp2400-msf.c | 2 +- + drivers/net/ixp2000/ixpdev.c | 1 - + drivers/net/netx-eth.c | 1 - + drivers/pcmcia/at91_cf.c | 2 +- + drivers/pcmcia/omap_cf.c | 2 +- + drivers/pcmcia/pxa2xx_base.c | 2 +- + drivers/pcmcia/pxa2xx_lubbock.c | 2 +- + drivers/pcmcia/pxa2xx_mainstone.c | 2 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- + drivers/pcmcia/sa1100_assabet.c | 2 +- + drivers/pcmcia/sa1100_badge4.c | 2 +- + drivers/pcmcia/sa1100_cerf.c | 2 +- + drivers/pcmcia/sa1100_h3600.c | 2 +- + drivers/pcmcia/sa1100_jornada720.c | 2 +- + drivers/pcmcia/sa1100_neponset.c | 2 +- + drivers/pcmcia/sa1100_shannon.c | 2 +- + drivers/pcmcia/sa1100_simpad.c | 2 +- + drivers/pcmcia/sa1111_generic.c | 2 +- + drivers/pcmcia/sa11xx_base.c | 2 +- + drivers/pcmcia/soc_common.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 2 +- + drivers/rtc/rtc-s3c.c | 2 +- + drivers/rtc/rtc-sa1100.c | 2 +- + drivers/scsi/arm/acornscsi-io.S | 2 +- + drivers/serial/21285.c | 2 +- + drivers/serial/clps711x.c | 2 +- + drivers/serial/imx.c | 2 +- + drivers/serial/netx-serial.c | 2 +- + drivers/serial/pxa.c | 2 +- + drivers/serial/s3c2400.c | 2 +- + drivers/serial/s3c2410.c | 2 +- + drivers/serial/s3c2412.c | 2 +- + drivers/serial/s3c2440.c | 2 +- + drivers/serial/sa1100.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/spi/omap_uwire.c | 2 +- + drivers/spi/pxa2xx_spi.c | 1 - + drivers/spi/spi_imx.c | 1 - + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/spi/spi_s3c24xx_gpio.c | 2 +- + drivers/usb/gadget/at91_udc.c | 3 +- + drivers/usb/gadget/lh7a40x_udc.h | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 2 +- + drivers/usb/gadget/s3c2410_udc.c | 1 - + drivers/usb/host/ohci-at91.c | 3 +- + drivers/usb/host/ohci-ep93xx.c | 3 +- + drivers/usb/host/ohci-lh7a404.c | 2 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/host/ohci-pnx4008.c | 3 +- + drivers/usb/host/ohci-pxa27x.c | 3 +- + drivers/usb/host/ohci-s3c2410.c | 2 +- + drivers/usb/host/ohci-sa1111.c | 2 +- + drivers/video/acornfb.c | 2 +- + drivers/video/clps711xfb.c | 2 +- + drivers/video/imxfb.c | 2 +- + drivers/video/omap/omapfb_main.c | 1 - + drivers/video/pxafb.c | 2 +- + drivers/video/sa1100fb.c | 2 +- + drivers/watchdog/davinci_wdt.c | 2 +- + drivers/watchdog/ep93xx_wdt.c | 2 +- + drivers/watchdog/iop_wdt.c | 2 +- + drivers/watchdog/ixp2000_wdt.c | 2 +- + drivers/watchdog/ixp4xx_wdt.c | 2 +- + drivers/watchdog/omap_wdt.c | 2 +- + drivers/watchdog/pnx4008_wdt.c | 2 +- + drivers/watchdog/sa1100_wdt.c | 2 +- + drivers/watchdog/wdt285.c | 2 +- + include/asm-arm/arch-aaec2000/io.h | 2 +- + include/asm-arm/arch-at91/cpu.h | 2 +- + include/asm-arm/arch-at91/debug-macro.S | 2 +- + include/asm-arm/arch-at91/entry-macro.S | 2 +- + include/asm-arm/arch-at91/memory.h | 2 +- + include/asm-arm/arch-at91/system.h | 2 +- + include/asm-arm/arch-at91/timex.h | 2 +- + include/asm-arm/arch-cl7500/entry-macro.S | 2 +- + include/asm-arm/arch-cl7500/io.h | 2 +- + include/asm-arm/arch-clps711x/entry-macro.S | 2 +- + include/asm-arm/arch-clps711x/io.h | 2 +- + include/asm-arm/arch-clps711x/system.h | 2 +- + include/asm-arm/arch-clps711x/uncompress.h | 2 +- + include/asm-arm/arch-davinci/gpio.h | 2 +- + include/asm-arm/arch-davinci/system.h | 2 +- + include/asm-arm/arch-ebsa285/entry-macro.S | 2 +- + include/asm-arm/arch-ebsa285/io.h | 2 +- + include/asm-arm/arch-ebsa285/system.h | 2 +- + include/asm-arm/arch-ep93xx/hardware.h | 4 ++ + include/asm-arm/arch-ep93xx/system.h | 2 +- + include/asm-arm/arch-h720x/io.h | 2 +- + include/asm-arm/arch-h720x/system.h | 2 +- + include/asm-arm/arch-h720x/uncompress.h | 2 +- + include/asm-arm/arch-imx/entry-macro.S | 2 +- + include/asm-arm/arch-imx/io.h | 2 +- + include/asm-arm/arch-imx/irqs.h | 2 +- + include/asm-arm/arch-integrator/entry-macro.S | 2 +- + include/asm-arm/arch-iop13xx/adma.h | 2 +- + include/asm-arm/arch-iop13xx/timex.h | 2 +- + include/asm-arm/arch-iop13xx/uncompress.h | 2 +- + include/asm-arm/arch-iop32x/io.h | 2 +- + include/asm-arm/arch-iop32x/memory.h | 2 +- + include/asm-arm/arch-iop32x/timex.h | 2 +- + include/asm-arm/arch-iop32x/uncompress.h | 2 +- + include/asm-arm/arch-iop33x/io.h | 2 +- + include/asm-arm/arch-iop33x/memory.h | 2 +- + include/asm-arm/arch-iop33x/timex.h | 2 +- + include/asm-arm/arch-iop33x/uncompress.h | 2 +- + include/asm-arm/arch-ixp2000/io.h | 2 +- + include/asm-arm/arch-ixp2000/system.h | 2 +- + include/asm-arm/arch-ixp23xx/memory.h | 3 +- + include/asm-arm/arch-ixp23xx/system.h | 2 +- + include/asm-arm/arch-ixp4xx/avila.h | 2 +- + include/asm-arm/arch-ixp4xx/coyote.h | 2 +- + include/asm-arm/arch-ixp4xx/dma.h | 2 +- + include/asm-arm/arch-ixp4xx/dsmg600.h | 2 +- + include/asm-arm/arch-ixp4xx/entry-macro.S | 2 +- + include/asm-arm/arch-ixp4xx/fsg.h | 2 +- + include/asm-arm/arch-ixp4xx/gpio.h | 2 +- + include/asm-arm/arch-ixp4xx/gtwx5715.h | 2 +- + include/asm-arm/arch-ixp4xx/io.h | 2 +- + include/asm-arm/arch-ixp4xx/ixdp425.h | 2 +- + include/asm-arm/arch-ixp4xx/nas100d.h | 2 +- + include/asm-arm/arch-ixp4xx/nslu2.h | 2 +- + include/asm-arm/arch-ixp4xx/platform.h | 2 +- + include/asm-arm/arch-ixp4xx/prpmc1100.h | 2 +- + include/asm-arm/arch-ixp4xx/system.h | 2 +- + include/asm-arm/arch-ixp4xx/timex.h | 2 +- + include/asm-arm/arch-ks8695/debug-macro.S | 2 +- + include/asm-arm/arch-ks8695/entry-macro.S | 2 +- + include/asm-arm/arch-ks8695/memory.h | 2 +- + include/asm-arm/arch-l7200/aux_reg.h | 2 +- + include/asm-arm/arch-l7200/entry-macro.S | 2 +- + include/asm-arm/arch-l7200/gp_timers.h | 2 +- + include/asm-arm/arch-l7200/io.h | 2 +- + include/asm-arm/arch-l7200/system.h | 2 +- + include/asm-arm/arch-l7200/uncompress.h | 2 +- + include/asm-arm/arch-lh7a40x/entry-macro.S | 2 +- + include/asm-arm/arch-lh7a40x/io.h | 2 +- + include/asm-arm/arch-msm/debug-macro.S | 2 +- + include/asm-arm/arch-msm/system.h | 2 +- + include/asm-arm/arch-mxc/gpio.h | 2 +- + include/asm-arm/arch-mxc/irqs.h | 2 +- + include/asm-arm/arch-mxc/memory.h | 2 +- + include/asm-arm/arch-mxc/mxc_timer.h | 2 +- + include/asm-arm/arch-mxc/timex.h | 2 +- + include/asm-arm/arch-mxc/uncompress.h | 2 +- + include/asm-arm/arch-netx/entry-macro.S | 2 +- + include/asm-arm/arch-netx/system.h | 2 +- + include/asm-arm/arch-ns9xxx/debug-macro.S | 2 +- + include/asm-arm/arch-ns9xxx/entry-macro.S | 2 +- + include/asm-arm/arch-ns9xxx/regs-bbu.h | 2 +- + .../asm-arm/arch-ns9xxx/regs-board-a9m9750dev.h | 2 +- + include/asm-arm/arch-ns9xxx/regs-mem.h | 2 +- + include/asm-arm/arch-ns9xxx/regs-sys-common.h | 2 +- + include/asm-arm/arch-ns9xxx/regs-sys-ns9360.h | 2 +- + include/asm-arm/arch-omap/entry-macro.S | 2 +- + include/asm-arm/arch-omap/io.h | 2 +- + include/asm-arm/arch-omap/irqs.h | 2 +- + include/asm-arm/arch-omap/mcbsp.h | 2 +- + include/asm-arm/arch-omap/mtd-xip.h | 2 +- + include/asm-arm/arch-omap/system.h | 2 +- + include/asm-arm/arch-pnx4008/system.h | 2 +- + include/asm-arm/arch-pnx4008/timex.h | 2 +- + include/asm-arm/arch-pxa/entry-macro.S | 2 +- + include/asm-arm/arch-pxa/gpio.h | 2 +- + include/asm-arm/arch-pxa/io.h | 2 +- + include/asm-arm/arch-realview/entry-macro.S | 2 +- + include/asm-arm/arch-realview/system.h | 2 +- + include/asm-arm/arch-realview/uncompress.h | 2 +- + include/asm-arm/arch-rpc/entry-macro.S | 2 +- + include/asm-arm/arch-rpc/io.h | 2 +- + include/asm-arm/arch-rpc/system.h | 2 +- + include/asm-arm/arch-rpc/uncompress.h | 2 +- + include/asm-arm/arch-s3c2410/dma.h | 2 +- + include/asm-arm/arch-s3c2410/entry-macro.S | 2 +- + include/asm-arm/arch-s3c2410/hardware.h | 4 -- + include/asm-arm/arch-s3c2410/io.h | 2 +- + include/asm-arm/arch-s3c2410/system-reset.h | 2 +- + include/asm-arm/arch-s3c2410/system.h | 2 +- + include/asm-arm/arch-sa1100/badge4.h | 2 +- + include/asm-arm/arch-sa1100/debug-macro.S | 2 +- + include/asm-arm/arch-sa1100/gpio.h | 2 +- + include/asm-arm/arch-sa1100/ide.h | 2 +- + include/asm-arm/arch-sa1100/system.h | 2 +- + include/asm-arm/arch-shark/io.h | 2 +- + include/asm-arm/arch-versatile/entry-macro.S | 2 +- + include/asm-arm/arch-versatile/system.h | 2 +- + sound/arm/pxa2xx-ac97.c | 2 +- + sound/arm/pxa2xx-pcm.c | 2 +- + sound/arm/sa11xx-uda1341.c | 2 +- + sound/oss/vidc.c | 2 +- + sound/oss/vidc_fill.S | 2 +- + sound/oss/waveartist.c | 2 +- + sound/soc/at91/eti_b1_wm8731.c | 2 +- + sound/soc/davinci/davinci-evm.c | 1 - + sound/soc/pxa/pxa2xx-ac97.c | 2 +- + sound/soc/pxa/pxa2xx-i2s.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 3 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 2 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 2 +- + sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 2 +- + 643 files changed, 655 insertions(+), 720 deletions(-) + delete mode 100644 arch/arm/include/asm/hardware.h +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merged arch/x86/kernel/cpu/cpufreq/elanfreq.c +Auto-merged drivers/cpufreq/cpufreq.c +Auto-merged drivers/cpufreq/cpufreq_conservative.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 8 +++-- + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 42 ++++++++++++++-------------- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 41 +++++++++++++-------------- + drivers/cpufreq/cpufreq.c | 24 ++++++++++----- + drivers/cpufreq/cpufreq_conservative.c | 1 + + drivers/cpufreq/cpufreq_ondemand.c | 8 ++++- + 6 files changed, 70 insertions(+), 54 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merged include/linux/init.h +Auto-merged init/main.c +Auto-merged kernel/module.c +Merge made by recursive. + Documentation/lguest/lguest.c | 14 ++++++++++---- + arch/x86/mm/gup.c | 2 ++ + 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/stop_machine.h | 13 ++++++++----- + init/main.c | 6 ++++-- + kernel/kthread.c | 29 +++++------------------------ + kernel/module.c | 2 +- + kernel/stop_machine.c | 5 ++--- + 13 files changed, 122 insertions(+), 58 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/asn1.c | 258 +++++++++++++++++++++++------------------------- + fs/cifs/cifs_spnego.c | 18 ++-- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/connect.c | 15 +-- + fs/cifs/transport.c | 1 + + 5 files changed, 143 insertions(+), 151 deletions(-) +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 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) +Merging input/next +$ git merge input/next +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/misc/ati_remote2.c | 263 ++++++++++++++++++++++++++++++----- + include/linux/gameport.h | 7 +- + include/linux/input.h | 15 ++- + include/linux/mod_devicetable.h | 2 +- + 17 files changed, 326 insertions(+), 86 deletions(-) +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/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 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 223f1fd: 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 e6b2bad: 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/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 | 69 ++++--- + 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, 2339 insertions(+), 2791 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. + mm/slab.c | 1 - + mm/slob.c | 1 - + mm/slub.c | 1 - + 3 files changed, 0 insertions(+), 3 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 +Already up-to-date. +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/fault.c +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 | 12 + + drivers/mfd/Makefile | 2 + + drivers/mfd/mfd-core.c | 15 +- + drivers/mfd/t7l66xb.c | 419 +++++++++++++++++++++++++++++++ + drivers/mfd/tc6387xb.c | 181 ++++++++++++++ + drivers/mfd/tc6393xb.c | 3 - + 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/tmio.h | 19 ++- + 12 files changed, 1263 insertions(+), 11 deletions(-) + create mode 100644 drivers/mfd/t7l66xb.c + create mode 100644 drivers/mfd/tc6387xb.c + 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 +$ git revert 4d6da2de1b09228989efb67a1f9e6d2ced075540 +Auto-merged drivers/mtd/nand/Kconfig +Auto-merged drivers/mtd/nand/Makefile +Removed drivers/mtd/nand/tmio_nand.c +Finished one revert. +Created commit c09d8ee: Revert "mfd: driver for the TMIO NAND controller" + 3 files changed, 0 insertions(+), 564 deletions(-) + delete mode 100644 drivers/mtd/nand/tmio_nand.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Auto-merged drivers/char/pcmcia/synclink_cs.c +Auto-merged drivers/char/synclink.c +Auto-merged drivers/char/synclink_gt.c +Auto-merged drivers/char/synclinkmp.c +Auto-merged drivers/net/wan/cosa.c +Merge made by recursive. + Documentation/DocBook/z8530book.tmpl | 38 +-- + drivers/char/pcmcia/synclink_cs.c | 4 - + drivers/char/synclink.c | 4 - + drivers/char/synclink_gt.c | 5 - + drivers/char/synclinkmp.c | 4 - + drivers/net/wan/Kconfig | 13 +- + drivers/net/wan/Makefile | 11 +- + drivers/net/wan/c101.c | 6 +- + 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/{hd6457x.c => hd64570.c} | 254 +++--------- + drivers/net/wan/hd64572.c | 641 ++++++++++++++++++++++++++++ + 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/n2.c | 9 +- + drivers/net/wan/pc300.h | 228 ++++------ + drivers/net/wan/pc300_drv.c | 146 +++---- + drivers/net/wan/pc300too.c | 73 +--- + drivers/net/wan/pci200syn.c | 77 ++--- + drivers/net/wan/sealevel.c | 361 +++++++---------- + drivers/net/wan/syncppp.c | 9 - + drivers/net/wan/z85230.c | 193 ++++----- + drivers/net/wan/z85230.h | 10 +- + include/net/syncppp.h | 2 - + net/wanrouter/wanmain.c | 27 -- + 42 files changed, 1995 insertions(+), 2228 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/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 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 148 insertions(+), 42 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging quilt/ttydev +$ git merge quilt/ttydev +Already up-to-date. +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(-) +$ git fetch origin master:master_tmp +Merging master_tmp +$ git merge master_tmp +Auto-merged drivers/char/vt.c +Auto-merged drivers/scsi/sg.c +Auto-merged drivers/spi/spi_s3c24xx.c +Auto-merged fs/ntfs/aops.c +Auto-merged kernel/sched.c +Auto-merged mm/filemap.c +Auto-merged mm/migrate.c +Merge made by recursive. + arch/mn10300/kernel/module.c | 4 +- + arch/sparc64/kernel/irq.c | 19 ++- + arch/sparc64/kernel/smp.c | 205 ++++++++++---------- + drivers/char/efirtc.c | 1 - + drivers/char/vt.c | 2 - + drivers/isdn/Makefile | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 37 ++-- + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 6 +- + drivers/isdn/mISDN/socket.c | 4 +- + drivers/scsi/sd.c | 21 +-- + drivers/scsi/sd.h | 6 - + drivers/scsi/sg.c | 2 +- + drivers/serial/bfin_5xx.c | 2 +- + drivers/serial/crisv10.c | 79 ++++---- + drivers/serial/crisv10.h | 3 +- + drivers/spi/atmel_spi.c | 17 ++- + drivers/spi/spi_s3c24xx.c | 25 ++- + drivers/watchdog/ar7_wdt.c | 29 ++-- + drivers/watchdog/it8712f_wdt.c | 77 +++----- + drivers/watchdog/s3c2410_wdt.c | 148 ++++++++------- + drivers/watchdog/sc1200wdt.c | 205 +++++++++++--------- + drivers/watchdog/wdt.c | 176 +++++++++-------- + drivers/watchdog/wdt_pci.c | 301 +++++++++++++++++------------- + fs/afs/write.c | 2 +- + fs/buffer.c | 4 +- + fs/cifs/file.c | 2 +- + fs/jbd/commit.c | 6 +- + fs/jbd2/commit.c | 2 +- + fs/nfs/nfsroot.c | 2 +- + fs/ntfs/aops.c | 2 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/mft.c | 4 +- + fs/reiserfs/inode.c | 2 +- + fs/reiserfs/journal.c | 6 +- + fs/splice.c | 2 +- + fs/ufs/super.c | 2 +- + fs/xfs/linux-2.6/xfs_aops.c | 6 +- + include/asm-m68k/contregs.h | 51 +++++- + include/asm-m68k/fbio.h | 331 +++++++++++++++++++++++++++++++- + include/asm-m68k/idprom.h | 21 ++- + include/linux/buffer_head.h | 8 +- + include/linux/mISDNif.h | 32 +++- + include/linux/page-flags.h | 2 +- + include/linux/pagemap.h | 67 ++++--- + include/linux/parser.h | 2 +- + include/linux/tracehook.h | 5 +- + include/scsi/scsi_device.h | 3 +- + kernel/auditsc.c | 7 + + kernel/sched.c | 22 ++- + mm/filemap.c | 12 +- + mm/memory.c | 18 ++- + mm/migrate.c | 4 +- + mm/mlock.c | 2 - + mm/rmap.c | 2 +- + mm/shmem.c | 4 +- + mm/swap.c | 2 +- + mm/swap_state.c | 8 +- + mm/swapfile.c | 2 +- + mm/truncate.c | 4 +- + mm/vmscan.c | 4 +- + sound/core/seq/oss/seq_oss_synth.c | 3 + + 62 files changed, 1288 insertions(+), 745 deletions(-) +$ 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 revert 03bac96fae0efdb25e2059e5accbe4f3ee6328dd +Auto-merged include/linux/input.h +Finished one revert. +Created commit d8f1869: Revert "Input: expand keycode space" + 2 files changed, 2 insertions(+), 2 deletions(-) +Applying wireless: prevent ath9k from building on PowerPC +$ git revert 3c1cd7bfd29b9dd2f314f711d136abf47331ba23 +Finished one revert. +Created commit f3df396: Revert "list.h: add list_cut_position()" + 1 files changed, 0 insertions(+), 32 deletions(-) +$ git revert bfccd8f16a76232b8b60c68289ef78ddb6836e19 +Auto-merged MAINTAINERS +CONFLICT (delete/modify): drivers/net/wireless/ath9k/Kconfig deleted in bfccd8f... ath9k: Add new Atheros IEEE 802.11n driver and modified in HEAD. Version HEAD of drivers/net/wireless/ath9k/Kconfig left in tree. +Removed drivers/net/wireless/ath9k/Makefile +Removed drivers/net/wireless/ath9k/ath9k.h +Removed drivers/net/wireless/ath9k/beacon.c +Removed drivers/net/wireless/ath9k/core.c +Removed drivers/net/wireless/ath9k/core.h +Removed drivers/net/wireless/ath9k/hw.c +Removed drivers/net/wireless/ath9k/hw.h +Removed drivers/net/wireless/ath9k/initvals.h +Removed drivers/net/wireless/ath9k/main.c +Removed drivers/net/wireless/ath9k/phy.c +Removed drivers/net/wireless/ath9k/phy.h +Removed drivers/net/wireless/ath9k/rc.c +Removed drivers/net/wireless/ath9k/rc.h +Removed drivers/net/wireless/ath9k/recv.c +Removed drivers/net/wireless/ath9k/reg.h +Removed drivers/net/wireless/ath9k/regd.c +Removed drivers/net/wireless/ath9k/regd.h +Removed drivers/net/wireless/ath9k/regd_common.h +Removed drivers/net/wireless/ath9k/xmit.c +Automatic revert failed. After resolving the conflicts, +mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result. +$ git rm drivers/net/wireless/ath9k/Kconfig +rm 'drivers/net/wireless/ath9k/Kconfig' +rm 'drivers/net/wireless/ath9k/Kconfig' +$ GIT_EDITOR=: git commit -v -a +Created commit 9c5c7ee: Revert "ath9k: Add new Atheros IEEE 802.11n driver" + 23 files changed, 0 insertions(+), 31695 deletions(-) + delete mode 100644 drivers/net/wireless/ath9k/Kconfig + delete mode 100644 drivers/net/wireless/ath9k/Makefile + delete mode 100644 drivers/net/wireless/ath9k/ath9k.h + delete mode 100644 drivers/net/wireless/ath9k/beacon.c + delete mode 100644 drivers/net/wireless/ath9k/core.c + delete mode 100644 drivers/net/wireless/ath9k/core.h + delete mode 100644 drivers/net/wireless/ath9k/hw.c + delete mode 100644 drivers/net/wireless/ath9k/hw.h + delete mode 100644 drivers/net/wireless/ath9k/initvals.h + delete mode 100644 drivers/net/wireless/ath9k/main.c + delete mode 100644 drivers/net/wireless/ath9k/phy.c + delete mode 100644 drivers/net/wireless/ath9k/phy.h + delete mode 100644 drivers/net/wireless/ath9k/rc.c + delete mode 100644 drivers/net/wireless/ath9k/rc.h + delete mode 100644 drivers/net/wireless/ath9k/recv.c + delete mode 100644 drivers/net/wireless/ath9k/reg.h + delete mode 100644 drivers/net/wireless/ath9k/regd.c + delete mode 100644 drivers/net/wireless/ath9k/regd.h + delete mode 100644 drivers/net/wireless/ath9k/regd_common.h + delete mode 100644 drivers/net/wireless/ath9k/xmit.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..3f06503db0c7 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,52 @@ +Unchanged quilt series driver-core.current +Unchanged quilt series usb.current +Importing driver-core based on quilt/usb.current +$ git checkout quilt/driver-core +Switched to branch "quilt/driver-core" +$ git reset --hard 2f0389a175ea05ecbfb05cabf4e596e126ec3881 +HEAD is now at 2f0389a usb-storage: unusual_devs entries for iRiver T10 and Datafab CF+SM reader +$ 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 d945934e7bfc005fa294c19b8236641f36b417bc +HEAD is now at d945934 sysfs: crash debugging +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-gotemp.patch +Importing device-mapper based on v2.6.26-5752-g93ded9b +$ git checkout quilt/device-mapper +Switched to branch "quilt/device-mapper" +$ git reset --hard 93ded9b8fd42abe2c3607097963d8de6ad9117eb +HEAD is now at 93ded9b Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-use-more-error-codes.patch +dm-mpath-remove-is_active-from-struct-dm_path.patch +dm-raid1-kcopyd-should-stop-on-error-if-errors-handled.patch +dm-exception-store-introduce-area_location-function.patch +dm-exception-store-use-chunk_t-for_areas.patch +Unchanged quilt series i2c +Unchanged quilt series kernel-doc +Unchanged quilt series ide +Unchanged quilt series m68k +Importing rr based on v2.6.27-rc1-504-g2b12a4c +$ git checkout quilt/rr +Switched to branch "quilt/rr" +$ git reset --hard 2b12a4c524812fb3f6ee590a02e65b95c8c32229 +HEAD is now at 2b12a4c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +lguest:no-mac-for-bridge.patch +misc:export-get_user_pages_fast.patch +lguest:use-get_user_pages_fast.patch +module:extend_initcall_debug_functionality_to_the_loader.patch +stop_machine:remove-unused-variable.patch +misc:cast_if_type.patch +misc:typesafe_cb.patch +misc:kthread-typesafe.patch +misc:stop_machine-typesafe.patch +Unchanged quilt series ttydev diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..da3974d9a27c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20080805 |