Add linux-next specific files for 20090409next-20090409

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

5 files changed, 1603 insertions, 0 deletions

diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..a9bb9a935337
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,134 @@
+Name		SHA1
+----		----
+origin		7b85a88ca7760d6d5f34bdaa793c71d921a3e853
+arm-current	3d6fdf7563d0a67c6973cf421f7405524ed8bdaf
+m68k-current	4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213
+powerpc-merge	15f7176eb1cccec0a332541285ee752b935c1c85
+sparc-current	018ef96969098487ea3fdabd904d775a4cd93975
+scsi-rc-fixes	ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+net-current	2a3abf6d17b6026a59e5cf7452d70ec1ad6a69fa
+sound-current	577c9c456f0e1371cbade38eaf91ae8e8a308555
+pci-current	8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6
+wireless-current	8a5117d80fe93de5df5b56480054f7df1fd20755
+kbuild-current	577c9c456f0e1371cbade38eaf91ae8e8a308555
+driver-core.current	8863a287af68f2c4143364cb50c888c418f71c15
+usb.current	e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+cpufreq-current	1e46cfa480d33da098c2c8fc1501651d620ef5a2
+input-current	ba28f22e7cf16cb310bb491cbb3f7d0d5d1f5c5d
+md-current	303a0e11d0ee136ad8f53f747f3c377daece763b
+audit-current	def57543418a5f47debae28a0a9dea2effc11692
+crypto-current	0d44dc59b2b434b29aafeae581d06f81efac7c83
+dwmw2		244dc4e54b73567fae7f8fd9ba56584be9375442
+arm		9759d22c8348343b0da4e25d6150c41712686c14
+avr32		7ebcfcf19723254ebe90cdf8718436b9955a9a01
+blackfin	d6879c585b7f8c2f3eb2f7e7beac806af4e9755c
+cris		276e79ee6b3ff670dc9c041178da4b61af456a27
+ia64		8851d3712a73649e1ae0d4620e7690c8db8742df
+m68k		4b2873ba0bda7dc747cde8b6c7dc6c0b01ea6213
+m68knommu	577c9c456f0e1371cbade38eaf91ae8e8a308555
+mips		d3a47e82b6bc3724dd60f3ee4e84fe4479104382
+parisc		b609308e1415efebdf79ebd553f4dd47b0ff2722
+powerpc		15f7176eb1cccec0a332541285ee752b935c1c85
+4xx		3239572d8f3091fef59eb82f3d6ee2b5ccac150d
+galak		5287bb0a2d24ca54749b7868866c78b47fb6dc21
+pxa		126ee52ad3fd0c20c9418f68f3bc88a0f646aa17
+s390		99f6a570eedc885675b6aa36b7acdbdcc3a7f55b
+sh		b35346fd25f3c8c0b6afeb778f8c4f41c5703c84
+sparc		577c9c456f0e1371cbade38eaf91ae8e8a308555
+x86		0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+xtensa		8903709b054a8dafe4e8c6d9a6444034d7aba36f
+tip-core	52a3e839a3f2b6327ad59083298732816e3e7c60
+cpus4096	c7b16712f76b93eaefb4eb71b7af2a64203b5176
+tracing		0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+genirq		b6c02a408e57289faffd381d79996d148ae9b894
+safe-poison-pointers	8ed8819917312f1a117337c0280ad55721fd3894
+sched		5c37875321fe4e0fb3fd14068afb33ef7c770f54
+stackprotector	705bb9dc72b2464a7e421ee45d5e4a3f206d5c75
+timers		cf96c1fe8639bda48d3c685e63d37a323a5f6021
+pci		8e2c4f2844c0e8dcdfe312e5f2204854ca8532c6
+device-mapper	71de6593abb12f4380a1aa8b467b882e058b3166
+hid		0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c
+i2c		8997f97b01f0f8417518ed34d907b436ee24f4ef
+jdelvare-hwmon	7c4ede9113d1abe415af0f214a7aa97657c7ef61
+kernel-doc	612392307cb09e49051225092cbbd7049bd8db93
+v4l-dvb		f48e429947186427c12fc4dd959b787e0ab48c3d
+quota		2fa7d11f2b3bcde8391eb55e1cdc7f22c3df5267
+jfs		9c83633ad38138855181af6936e8ac570ef7e2cb
+kbuild		32fb6c17566ec66de87324a834c7776f40e35e78
+ide		1af090986cbdc9f66a2451c0c15bfee16c960bb6
+libata		914e9f1bd18124a1bf7fa4b886541ecd09805f49
+nfs		4770822f16154559c8168c1b7171c9941a7c4d89
+xfs		8de2bf937a6bea8f0f775fd5399ba20c1a0c3d77
+infiniband	07306c0b98a9a0399bff1b91229b4c3b55912189
+acpi		6268dca8407d968f83b7f77fc1040b79740f0b69
+nfsd		b4ddd412d6ad6552cfc198723fc0b0ff7524ab89
+ieee1394	32a0f488ce5e8a9a148491f15edc508ab5e8265b
+ubi		577c9c456f0e1371cbade38eaf91ae8e8a308555
+kvm		e3dbe3f408a46a045012f1882e9f62b27b8a616c
+dlm		a29936f55560a439638a0ecbb683efed3548b3bc
+scsi		015640edb1f346e0b2eda703587c4cd1c310ec1d
+ocfs2		035a571120ddbe4f92b91bbe46f3eff05b6e43eb
+ext4		0f2ddca66d70c8ccba7486cf2d79c6b60e777abd
+async_tx	8c6db1bbf80123839ec87bdd6cb364aea384623d
+udf		146bca72c7e6ba52de82a63b1fce7934dc103dbc
+net		577c9c456f0e1371cbade38eaf91ae8e8a308555
+wireless	7c757eb9f804782fb39d0ae2c1a88ffb9309138e
+mtd		e0724bf6e4a1f2e678d2b2aab01cae22e17862f0
+crypto		7738f47ee60fd1a6d5e2aea61e86a0a5ab00bfd7
+vfs		ced117c73edc917e96dea7cca98c91383f0792f7
+sound		577c9c456f0e1371cbade38eaf91ae8e8a308555
+cpufreq		1e46cfa480d33da098c2c8fc1501651d620ef5a2
+v9fs		b9b8e1c85b1d98534a562f601acda8132bfff439
+rr		f548e749c9e32cf9d1397bc4019d221e21893e96
+cifs		8a5b718070cf4a7126c5378e62fa0e307754bbe7
+mmc		32ab83a56fdf42f543b86c349143c2a86ead9707
+gfs2		07c34a571786ce89923d98e52faf99cce4508a49
+input		59cc1dd97ca9ac0363ef2f770901fbd86e2b970a
+bkl-removal	4a6a4499693a419a20559c41e33a7bd70bf20a6f
+ubifs		577c9c456f0e1371cbade38eaf91ae8e8a308555
+lsm		ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block		2ff3d51a26d6a9144c8eabd648eb783bf629a25d
+embedded	4744b43431e8613f920c5cba88346756f53c5165
+firmware	0ce49d6da993adf8b17b7f3ed9805ade14a6a6f3
+pcmcia		b1769450da0eeae2d95aae5496acbdf4c6ba89b2
+battery		5bf2b994bfe11bfe86231050897b2d881ca544d9
+leds		ac15e95090c2588ada4904c8c4ae8edd347acdf0
+backlight	e0724bf6e4a1f2e678d2b2aab01cae22e17862f0
+kgdb		4cc984538631d1f47c61f7e556e2031e0d31a1ae
+slab		5c0cceb3705cff925e7c48b5afbaadabc13a225c
+uclinux		6e86841d05f371b5b9b86ce76c02aaee83352298
+md		c8f517c444e4f9f55b5b5ca202b8404691a35805
+mfd		fa15ce8ad59e9653d50b8596596cb02d3566d4aa
+hdlc		4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm		f23c20c83d523e5f8cda1f8f7ed52fe6afffbe29
+voltage		41bf4474d6c2fbfeffb061b3db5b55524461457b
+security-testing	7ba5779533819fc061b4afafcb4a609d55f37057
+lblnet		0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b
+ttydev		c946e60ed7a79f85f3e8dc57e75f0ab59b099db5
+agp		b854b2ab959e8175d75e01cf8ed452ed2624d0c8
+generic-ipi	ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+oprofile	5f062da729d7d5edcce94dd3e87d7ccbea7cea78
+fastboot	ee568b25ee9e160b32d1aef73d8b2ee9c05d34db
+sparseirq	15c1ac564462a00eee1d3ba49366cc6610b56275
+iommu		84be58d4601c86306cd939ebf58a9b90989883a4
+uwb		a3c1239eb59c0a907f8be5587d42e950f44543f8
+watchdog	43c1103a89524c7490c7e9a5e13cce6d14237b12
+bdev		feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu	31d3568dfeb1dfb2735f119efe5ece7c6d40969c
+cputime		c742b31c03f37c5c499178f09f57381aa6c70131
+osd		0d8fe329a80714e0f729ae48cba8d64cbe5701cb
+fatfs		5a6bb10393eb9a1985e97af12f0cb2906bcbf1af
+fuse		fc280c9692031ee41545d6bea00bbb7c7dec97a9
+jc_docs		7ead643f665c618d4bbd9efb68595fa41b2eb93b
+nommu		9a100a4464917b5ffff3a8ce1c2758088fd9bb32
+trivial		bd41358ad6f8d295feea2cb66d36d794b0d97591
+audit		def57543418a5f47debae28a0a9dea2effc11692
+squashfs	363911d027d1de1c6df79eb3f487f5476b9619f4
+omap		833bb3046b6cb320e775ea2160ddca87d53260d5
+aoe		1de9e8e70f5acc441550ca75433563d91b269bbe
+kmemleak	2c2e98331488a1811355842855968cb65078e633
+suspend		8efb8c76fcdccf5050c0ea059dac392789baaff2
+driver-core	e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+usb		e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+staging		30738f47ba1f96aede26b8d125d8ad8351a23647
+scsi-post-merge	238c6d54830c624f34ac9cf123ac04aebfca5013
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..17633ec0f027
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,136 @@
+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
+arm-current	git	ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master
+m68k-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus
+powerpc-merge	git	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge
+sparc-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master
+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
+sound-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus
+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-linus
+audit-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus
+crypto-current	git	git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master
+dwmw2		git	git://git.infradead.org/users/dwmw2/random-2.6.git#master
+arm		git	ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel
+avr32		git	git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch
+blackfin	git	git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6.git#for-linus
+cris		git	git://www.jni.nu/cris.git#for-next
+ia64		git	git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test
+m68k		git	git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next
+m68knommu	git	git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next
+mips		git	git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next
+parisc		git	git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#master
+powerpc		git	git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next
+4xx		git	git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next
+galak		git	git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next
+pxa		git	git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next
+s390		git	git://git390.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
+sparc		git	git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master
+x86		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-x86-next
+xtensa		git	git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master
+tip-core	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-core-next
+cpus4096	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-cpus4096-next
+tracing		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-tracing-next
+genirq		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-genirq-next
+safe-poison-pointers	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-safe-poison-pointers-next
+sched		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sched-next
+stackprotector	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-stackprotector-next
+timers		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-timers-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#for-next
+i2c		quilt	http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
+jdelvare-hwmon	quilt	http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/
+kernel-doc	quilt	http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/
+v4l-dvb		git	git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master
+quota		git	git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next
+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/xfs/xfs#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/lenb/linux-acpi-2.6.git#test
+nfsd		git	git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+ieee1394	git	git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next
+ubi		git	git://git.infradead.org/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
+ocfs2		git	git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git#linux-next
+ext4		git	git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.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
+wireless	git	git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master
+mtd		git	git://git.infradead.org/mtd-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
+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
+bkl-removal	git	git://git.lwn.net/linux-2.6.git#bkl-removal
+ubifs		git	git://git.infradead.org/ubifs-2.6.git#linux-next
+lsm		git	git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next
+block		git	git://git.kernel.dk/linux-2.6-block.git#for-next
+embedded	git	git://git.infradead.org/embedded-2.6.git#master
+firmware	git	git://git.infradead.org/users/dwmw2/firmware-2.6.git#master
+pcmcia		git	git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master
+battery		git	git://git.infradead.org/battery-2.6.git#master
+leds		git	git://git.o-hand.com/linux-rpurdie-leds#for-mm
+backlight	git	git://git.o-hand.com/linux-rpurdie-backlight#for-mm
+kgdb		git	git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next
+slab		git	git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next
+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
+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#for-next
+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
+generic-ipi	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-generic-ipi-next
+oprofile	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-oprofile-next
+fastboot	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-fastboot-next
+sparseirq	git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-sparseirq-next
+iommu		git	git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-iommu-next
+uwb		git	git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream
+watchdog	git	git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master
+bdev		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master
+dwmw2-iommu	git	git://git.infradead.org/iommu-2.6.git#master
+cputime		git	git://git390.marist.edu/pub/scm/linux-2.6.git#cputime
+osd		git	git://git.open-osd.org/linux-open-osd.git#linux-next
+fatfs		git	git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master
+fuse		git	git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next
+jc_docs		git	git://git.lwn.net/linux-2.6.git#docs-next
+nommu		git	git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master
+trivial		git	git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next
+audit		git	git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next
+squashfs	git	git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master
+omap		git	git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next
+aoe		quilt	http://support.coraid.com/support/linux/for-next/patches/
+kmemleak	git	git://linux-arm.org/linux-2.6.git#kmemleak
+suspend		git	git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next
+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/
+staging		quilt	http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-staging/
+scsi-post-merge	git	git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master
diff --git a/Next/merge.log b/Next/merge.log
new file mode 100644
index 000000000000..2081e10ebbfe
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,1227 @@
+$ git checkout master
+Already on "master"
+$ git reset --hard stable
+HEAD is now at 577c9c4 Linux 2.6.30-rc1
+Merging origin/master
+$ git merge origin/master
+Updating 577c9c4..7b85a88
+Fast forward
+ MAINTAINERS                                |    8 +-
+ arch/arm/configs/magician_defconfig        |    6 +-
+ arch/arm/include/asm/sizes.h               |    1 +
+ arch/arm/mach-at91/include/mach/board.h    |    2 +-
+ arch/arm/mach-omap1/clock.c                |   21 +-
+ arch/arm/mach-pxa/Kconfig                  |    9 +
+ arch/arm/mach-pxa/Makefile                 |    1 +
+ arch/arm/mach-pxa/cm-x2xx.c                |    2 +-
+ arch/arm/mach-pxa/colibri-pxa300.c         |   11 +-
+ arch/arm/mach-pxa/colibri-pxa320.c         |   10 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c         |   35 +
+ arch/arm/mach-pxa/csb701.c                 |    5 +
+ arch/arm/mach-pxa/e740.c                   |    2 +
+ arch/arm/mach-pxa/e750.c                   |    2 +
+ arch/arm/mach-pxa/e800.c                   |    2 +
+ arch/arm/mach-pxa/em-x270.c                |   86 +++-
+ arch/arm/mach-pxa/include/mach/colibri.h   |    7 +
+ arch/arm/mach-pxa/include/mach/magician.h  |    4 +-
+ arch/arm/mach-pxa/include/mach/palmld.h    |    1 +
+ arch/arm/mach-pxa/include/mach/palmt5.h    |    1 +
+ arch/arm/mach-pxa/include/mach/palmte2.h   |   68 ++
+ arch/arm/mach-pxa/include/mach/palmtx.h    |    2 +
+ arch/arm/mach-pxa/magician.c               |   84 ++--
+ arch/arm/mach-pxa/mioa701.c                |    6 +-
+ arch/arm/mach-pxa/palmld.c                 |   36 +-
+ arch/arm/mach-pxa/palmt5.c                 |   35 +-
+ arch/arm/mach-pxa/palmte2.c                |  466 ++++++++++++++
+ arch/arm/mach-pxa/palmtx.c                 |   35 +-
+ arch/arm/mach-pxa/tosa.c                   |    2 +
+ arch/arm/mm/mmu.c                          |   11 +
+ arch/x86/include/asm/cpufeature.h          |    1 +
+ arch/x86/kernel/apic/apic.c                |    6 +
+ arch/x86/kernel/cpu/addon_cpuid_features.c |    1 +
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c |   55 +-
+ arch/x86/kernel/cpu/cpufreq/longhaul.c     |    1 -
+ drivers/acpi/acpica/hwvalid.c              |    1 -
+ drivers/acpi/battery.c                     |    2 +-
+ drivers/acpi/proc.c                        |   13 +-
+ drivers/acpi/processor_idle.c              |    3 +
+ drivers/acpi/scan.c                        |   31 +-
+ drivers/acpi/sleep.h                       |    3 +
+ drivers/acpi/thermal.c                     |   68 ++-
+ drivers/acpi/video.c                       |   30 +-
+ drivers/acpi/wakeup.c                      |   30 +-
+ drivers/mmc/core/mmc.c                     |    2 +-
+ drivers/mmc/core/sd.c                      |   21 +-
+ drivers/mmc/host/imxmmc.c                  |   19 +-
+ drivers/mmc/host/mmc_spi.c                 |  188 ++++--
+ drivers/mmc/host/omap_hsmmc.c              |    7 +-
+ drivers/mmc/host/sdhci-pci.c               |    2 +-
+ drivers/mmc/host/sdhci.c                   |    2 +-
+ drivers/mmc/host/wbsd.c                    |    2 +-
+ drivers/platform/x86/fujitsu-laptop.c      |   60 +--
+ drivers/platform/x86/panasonic-laptop.c    |   28 +-
+ drivers/platform/x86/sony-laptop.c         |   30 +-
+ drivers/platform/x86/wmi.c                 |   15 +-
+ drivers/serial/max3100.c                   |  927 ++++++++++++++++++++++++++++
+ drivers/usb/host/ohci-at91.c               |    4 +-
+ fs/befs/super.c                            |    1 +
+ fs/proc/task_nommu.c                       |    2 +-
+ include/acpi/acpi_bus.h                    |    1 -
+ include/linux/serial_max3100.h             |   52 ++
+ kernel/ptrace.c                            |   16 +-
+ 63 files changed, 2147 insertions(+), 438 deletions(-)
+ create mode 100644 arch/arm/mach-pxa/include/mach/palmte2.h
+ create mode 100644 arch/arm/mach-pxa/palmte2.c
+ create mode 100644 drivers/serial/max3100.c
+ create mode 100644 include/linux/serial_max3100.h
+Merging arm-current/master
+$ git merge arm-current/master
+Already up-to-date.
+Merging m68k-current/for-linus
+$ git merge m68k-current/for-linus
+Already up-to-date.
+Merging powerpc-merge/merge
+$ git merge powerpc-merge/merge
+Already up-to-date.
+Merging sparc-current/master
+$ git merge sparc-current/master
+Merge made by recursive.
+ arch/sparc/include/asm/unistd.h  |    4 +++-
+ arch/sparc/kernel/of_device_64.c |    3 +--
+ arch/sparc/kernel/pci_fire.c     |    4 ++--
+ arch/sparc/kernel/pci_psycho.c   |    8 ++++----
+ arch/sparc/kernel/pci_sabre.c    |    8 ++++----
+ arch/sparc/kernel/pci_sun4v.c    |   14 +++++++-------
+ arch/sparc/kernel/power.c        |    2 +-
+ arch/sparc/kernel/systbls_32.S   |    2 +-
+ arch/sparc/kernel/systbls_64.S   |    4 ++--
+ arch/sparc/mm/init_64.c          |    8 ++++----
+ drivers/serial/sunsu.c           |    2 +-
+ sound/sparc/cs4231.c             |   28 ++++++++++++++--------------
+ 12 files changed, 44 insertions(+), 43 deletions(-)
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Already up-to-date.
+Merging net-current/master
+$ git merge net-current/master
+Merge made by recursive.
+ drivers/net/Kconfig                         |   23 +
+ drivers/net/Makefile                        |    1 +
+ drivers/net/bnx2.c                          |   26 +-
+ drivers/net/eql.c                           |    2 +
+ drivers/net/fec.c                           |    1 +
+ drivers/net/igb/igb_main.c                  |  159 +-
+ drivers/net/igbvf/Makefile                  |   38 +
+ drivers/net/igbvf/defines.h                 |  125 ++
+ drivers/net/igbvf/ethtool.c                 |  540 +++++
+ drivers/net/igbvf/igbvf.h                   |  335 +++
+ drivers/net/igbvf/mbx.c                     |  350 ++++
+ drivers/net/igbvf/mbx.h                     |   75 +
+ drivers/net/igbvf/netdev.c                  | 2919 +++++++++++++++++++++++++++
+ drivers/net/igbvf/regs.h                    |  108 +
+ drivers/net/igbvf/vf.c                      |  398 ++++
+ drivers/net/igbvf/vf.h                      |  265 +++
+ drivers/net/mv643xx_eth.c                   |    4 +-
+ drivers/net/niu.c                           |    3 +-
+ drivers/net/r6040.c                         |    1 +
+ drivers/net/smsc911x.c                      |    2 +-
+ include/net/netfilter/nf_conntrack_expect.h |    5 +-
+ net/ipv6/netfilter/ip6_tables.c             |    2 +
+ net/netfilter/Kconfig                       |    2 +-
+ net/netfilter/nf_conntrack_expect.c         |   30 +-
+ 24 files changed, 5266 insertions(+), 148 deletions(-)
+ create mode 100644 drivers/net/igbvf/Makefile
+ create mode 100644 drivers/net/igbvf/defines.h
+ create mode 100644 drivers/net/igbvf/ethtool.c
+ create mode 100644 drivers/net/igbvf/igbvf.h
+ create mode 100644 drivers/net/igbvf/mbx.c
+ create mode 100644 drivers/net/igbvf/mbx.h
+ create mode 100644 drivers/net/igbvf/netdev.c
+ create mode 100644 drivers/net/igbvf/regs.h
+ create mode 100644 drivers/net/igbvf/vf.c
+ create mode 100644 drivers/net/igbvf/vf.h
+Merging sound-current/for-linus
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus
+$ git merge pci-current/for-linus
+Already up-to-date.
+Merging wireless-current/master
+$ git merge wireless-current/master
+Already up-to-date.
+Merging kbuild-current/master
+$ git merge kbuild-current/master
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Merge made by recursive.
+ drivers/base/base.h  |    2 +-
+ fs/sysfs/file.c      |   12 +++++++++++-
+ lib/kobject_uevent.c |    2 +-
+ 3 files changed, 13 insertions(+), 3 deletions(-)
+Merging quilt/usb.current
+$ git merge quilt/usb.current
+Merge made by recursive.
+ drivers/usb/class/cdc-wdm.c        |    2 +-
+ drivers/usb/gadget/u_ether.c       |    8 +-
+ drivers/usb/musb/cppi_dma.c        |   23 +--
+ drivers/usb/musb/musb_core.c       |   12 +-
+ drivers/usb/musb/musb_gadget.c     |   33 ++-
+ drivers/usb/musb/musb_host.c       |  406 ++++++++++++++++++++----------------
+ drivers/usb/musb/musbhsdma.c       |   66 ++++---
+ drivers/usb/serial/ftdi_sio.c      |    1 +
+ drivers/usb/serial/ftdi_sio.h      |    7 +
+ drivers/usb/serial/option.c        |    5 +
+ drivers/usb/serial/qcserial.c      |   21 ++
+ drivers/usb/storage/unusual_devs.h |   14 +-
+ 12 files changed, 339 insertions(+), 259 deletions(-)
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Merge made by recursive.
+ arch/x86/kernel/cpu/cpufreq/p4-clockmod.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Merge made by recursive.
+ Documentation/input/rotary-encoder.txt       |  101 +++
+ arch/mips/include/asm/mach-rc32434/gpio.h    |    3 +
+ arch/mips/rb532/devices.c                    |   19 +-
+ drivers/input/input.c                        |   13 +-
+ drivers/input/keyboard/atkbd.c               |  135 ++---
+ drivers/input/keyboard/bf54x-keys.c          |    4 +-
+ drivers/input/keyboard/hilkbd.c              |  140 +++--
+ drivers/input/misc/Kconfig                   |   23 +
+ drivers/input/misc/Makefile                  |   28 +-
+ drivers/input/misc/ati_remote2.c             |  277 ++++++++-
+ drivers/input/misc/rb532_button.c            |  120 ++++
+ drivers/input/misc/rotary_encoder.c          |  221 +++++++
+ drivers/input/mouse/Kconfig                  |   11 +
+ drivers/input/mouse/Makefile                 |    9 +-
+ drivers/input/mouse/hgpk.c                   |    2 +-
+ drivers/input/mouse/maplemouse.c             |  147 +++++
+ drivers/input/mouse/pc110pad.c               |    5 +-
+ drivers/input/serio/i8042-x86ia64io.h        |    8 +
+ drivers/input/touchscreen/Kconfig            |   58 ++
+ drivers/input/touchscreen/Makefile           |    3 +
+ drivers/input/touchscreen/ad7877.c           |  844 ++++++++++++++++++++++++++
+ drivers/input/touchscreen/ad7879.c           |  782 ++++++++++++++++++++++++
+ drivers/input/touchscreen/mainstone-wm97xx.c |    3 +-
+ drivers/input/touchscreen/ucb1400_ts.c       |    5 +-
+ drivers/input/touchscreen/wm97xx-core.c      |   13 +-
+ drivers/input/touchscreen/zylonite-wm97xx.c  |  240 ++++++++
+ include/linux/rotary_encoder.h               |   13 +
+ include/linux/spi/ad7879.h                   |   35 ++
+ 28 files changed, 3062 insertions(+), 200 deletions(-)
+ create mode 100644 Documentation/input/rotary-encoder.txt
+ create mode 100644 drivers/input/misc/rb532_button.c
+ create mode 100644 drivers/input/misc/rotary_encoder.c
+ create mode 100644 drivers/input/mouse/maplemouse.c
+ create mode 100644 drivers/input/touchscreen/ad7877.c
+ create mode 100644 drivers/input/touchscreen/ad7879.c
+ create mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c
+ create mode 100644 include/linux/rotary_encoder.h
+ create mode 100644 include/linux/spi/ad7879.h
+Merging md-current/for-linus
+$ git merge md-current/for-linus
+Already up-to-date.
+Merging audit-current/for-linus
+$ git merge audit-current/for-linus
+Already up-to-date.
+Merging crypto-current/master
+$ git merge crypto-current/master
+Already up-to-date.
+Merging dwmw2/master
+$ git merge dwmw2/master
+Already up-to-date.
+Merging arm/devel
+$ git merge arm/devel
+Already up-to-date.
+Merging avr32/avr32-arch
+$ git merge avr32/avr32-arch
+Merge made by recursive.
+ arch/avr32/boards/merisc/setup.c |    7 ++++---
+ drivers/mmc/host/atmel-mci.c     |   12 +++++++++---
+ include/linux/atmel-mci.h        |    2 ++
+ 3 files changed, 15 insertions(+), 6 deletions(-)
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging cris/for-next
+$ git merge cris/for-next
+Already up-to-date.
+Merging ia64/test
+$ git merge ia64/test
+Merge made by recursive.
+ arch/ia64/include/asm/unistd.h |    4 +++-
+ arch/ia64/kernel/entry.S       |    2 ++
+ 2 files changed, 5 insertions(+), 1 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Already up-to-date.
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Already up-to-date.
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Already up-to-date.
+Merging parisc/master
+$ git merge parisc/master
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Already up-to-date.
+Merging 4xx/next
+$ git merge 4xx/next
+Merge made by recursive.
+ arch/powerpc/configs/40x/acadia_defconfig      |    2 +-
+ arch/powerpc/configs/40x/ep405_defconfig       |    2 +-
+ arch/powerpc/configs/40x/kilauea_defconfig     |    2 +-
+ arch/powerpc/configs/40x/makalu_defconfig      |    2 +-
+ arch/powerpc/configs/40x/virtex_defconfig      |    2 +-
+ arch/powerpc/configs/44x/arches_defconfig      |    2 +-
+ arch/powerpc/configs/44x/bamboo_defconfig      |    2 +-
+ arch/powerpc/configs/44x/canyonlands_defconfig |    6 +++---
+ arch/powerpc/configs/44x/ebony_defconfig       |    2 +-
+ arch/powerpc/configs/44x/katmai_defconfig      |    2 +-
+ arch/powerpc/configs/44x/rainier_defconfig     |    2 +-
+ arch/powerpc/configs/44x/redwood_defconfig     |    2 +-
+ arch/powerpc/configs/44x/sam440ep_defconfig    |    2 +-
+ arch/powerpc/configs/44x/sequoia_defconfig     |    2 +-
+ arch/powerpc/configs/44x/taishan_defconfig     |    2 +-
+ arch/powerpc/configs/44x/virtex5_defconfig     |    2 +-
+ 16 files changed, 18 insertions(+), 18 deletions(-)
+Merging galak/next
+$ git merge galak/next
+Merge made by recursive.
+ arch/powerpc/boot/dts/tqm8540.dts           |    4 +-
+ arch/powerpc/boot/dts/tqm8541.dts           |    4 +-
+ arch/powerpc/boot/dts/tqm8548-bigflash.dts  |    8 +-
+ arch/powerpc/boot/dts/tqm8548.dts           |    8 +-
+ arch/powerpc/boot/dts/tqm8555.dts           |    4 +-
+ arch/powerpc/boot/dts/tqm8560.dts           |    4 +-
+ arch/powerpc/configs/85xx/tqm8548_defconfig |  164 ++++++++-------------------
+ arch/powerpc/include/asm/mmu.h              |    6 +
+ arch/powerpc/include/asm/ppc-opcode.h       |   13 ++-
+ arch/powerpc/kernel/cputable.c              |    2 +-
+ arch/powerpc/mm/tlb_nohash.c                |    1 -
+ arch/powerpc/mm/tlb_nohash_low.S            |   14 ++-
+ arch/powerpc/oprofile/op_model_fsl_emb.c    |   14 ---
+ 13 files changed, 95 insertions(+), 151 deletions(-)
+Merging pxa/for-next
+$ git merge pxa/for-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ arch/arm/mach-pxa/corgi.c  |   55 +++++++++-----------------------------
+ arch/arm/mach-pxa/poodle.c |   18 +++----------
+ arch/arm/mach-pxa/spitz.c  |   63 +++++++++----------------------------------
+ 3 files changed, 30 insertions(+), 106 deletions(-)
+Merging s390/features
+$ git merge s390/features
+Already up-to-date.
+Merging sh/master
+$ git merge sh/master
+Merge made by recursive.
+ arch/sh/boards/board-urquell.c      |   27 +++++++++++++++++++++++++++
+ arch/sh/drivers/pci/ops-sh7785lcr.c |    5 +++++
+ arch/sh/drivers/pci/pci-sh7780.h    |    2 ++
+ arch/sh/include/asm/topology.h      |    7 +++++--
+ arch/sh/include/asm/unistd_32.h     |    4 +++-
+ arch/sh/include/asm/unistd_64.h     |    4 +++-
+ arch/sh/kernel/syscalls_32.S        |    2 ++
+ arch/sh/kernel/syscalls_64.S        |    2 ++
+ drivers/sh/intc.c                   |   35 +++++++++++++++++++++++++++++++----
+ 9 files changed, 80 insertions(+), 8 deletions(-)
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging x86/auto-x86-next
+$ git merge x86/auto-x86-next
+Already up-to-date.
+Merging xtensa/master
+$ git merge xtensa/master
+Already up-to-date.
+Merging tip-core/auto-core-next
+$ git merge tip-core/auto-core-next
+Merge made by recursive.
+ include/linux/futex.h       |    8 +
+ include/linux/thread_info.h |    3 +-
+ init/Kconfig                |    2 +-
+ kernel/futex.c              | 1209 +++++++++++++++++++++++++++++++++----------
+ kernel/rtmutex.c            |  240 +++++++--
+ kernel/rtmutex_common.h     |    8 +
+ 6 files changed, 1133 insertions(+), 337 deletions(-)
+Merging cpus4096/auto-cpus4096-next
+$ git merge cpus4096/auto-cpus4096-next
+Auto-merging arch/parisc/kernel/irq.c
+Merge made by recursive.
+Merging tracing/auto-tracing-next
+$ git merge tracing/auto-tracing-next
+Already up-to-date.
+Merging genirq/auto-genirq-next
+$ git merge genirq/auto-genirq-next
+Already uptodate!
+Merge made by recursive.
+Merging safe-poison-pointers/auto-safe-poison-pointers-next
+$ git merge safe-poison-pointers/auto-safe-poison-pointers-next
+Auto-merging arch/x86/Kconfig
+Auto-merging include/linux/poison.h
+Merge made by recursive.
+ arch/x86/Kconfig       |    5 +++++
+ include/linux/poison.h |   16 ++++++++++++++--
+ 2 files changed, 19 insertions(+), 2 deletions(-)
+Merging sched/auto-sched-next
+$ git merge sched/auto-sched-next
+Already uptodate!
+Merge made by recursive.
+Merging stackprotector/auto-stackprotector-next
+$ git merge stackprotector/auto-stackprotector-next
+Already up-to-date.
+Merging timers/auto-timers-next
+$ git merge timers/auto-timers-next
+Already uptodate!
+Merge made by recursive.
+Merging pci/linux-next
+$ git merge pci/linux-next
+Already up-to-date.
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Merge made by recursive.
+ drivers/md/dm-ioctl.c         |   21 +++++
+ drivers/md/dm-kcopyd.c        |   23 +++--
+ drivers/md/dm-linear.c        |    1 -
+ drivers/md/dm-table.c         |   59 ++++++++----
+ drivers/md/dm.c               |  199 +++++++++++++++++++++++++++++------------
+ drivers/md/dm.h               |    1 -
+ include/linux/device-mapper.h |    1 -
+ 7 files changed, 218 insertions(+), 87 deletions(-)
+Merging hid/for-next
+$ git merge hid/for-next
+Already up-to-date.
+Merging quilt/i2c
+$ git merge quilt/i2c
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt |    9 +++++++++
+ drivers/i2c/algos/i2c-algo-pca.c           |    2 +-
+ drivers/i2c/busses/Kconfig                 |    6 ++++--
+ include/linux/i2c.h                        |    2 +-
+ 4 files changed, 15 insertions(+), 4 deletions(-)
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Merge made by recursive.
+ Documentation/hwmon/ibmaem |    2 +-
+ drivers/hwmon/Kconfig      |    2 +-
+ drivers/hwmon/ibmaem.c     |    1 +
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Already up-to-date.
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Resolved 'drivers/media/video/cx231xx/cx231xx-audio.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging drivers/media/video/bt8xx/bttv-driver.c
+Auto-merging drivers/media/video/cx231xx/cx231xx-audio.c
+CONFLICT (add/add): Merge conflict in drivers/media/video/cx231xx/cx231xx-audio.c
+Auto-merging drivers/media/video/cx88/cx88-core.c
+Auto-merging drivers/media/video/cx88/cx88-video.c
+Auto-merging drivers/media/video/cx88/cx88.h
+Auto-merging drivers/media/video/saa7134/saa7134-core.c
+Auto-merging include/linux/i2c-id.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 99b31c3] Merge commit 'v4l-dvb/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/media/dvb/siano/smssdio.c       |  356 +++++++++++++++++++++++++++++++
+ drivers/media/video/cx88/Makefile       |    2 +-
+ drivers/media/video/cx88/cx88-core.c    |   26 ++-
+ drivers/media/video/cx88/cx88-dsp.c     |  299 ++++++++++++++++++++++++++
+ drivers/media/video/cx88/cx88-tvaudio.c |  115 ++++++++---
+ drivers/media/video/cx88/cx88.h         |   10 +
+ include/linux/mmc/sdio_ids.h            |    8 +
+ linux/drivers/media/dvb/siano/smssdio.c |  354 ++++++++++++++++++++++++++++++
+ 8 files changed, 1136 insertions(+), 34 deletions(-)
+ create mode 100644 drivers/media/dvb/siano/smssdio.c
+ create mode 100644 drivers/media/video/cx88/cx88-dsp.c
+ create mode 100644 linux/drivers/media/dvb/siano/smssdio.c
+Merging quota/for_next
+$ git merge quota/for_next
+Resolved 'fs/ext4/ext4.h' using previous resolution.
+Resolved 'fs/ext4/inode.c' using previous resolution.
+Resolved 'fs/quota/dquot.c' using previous resolution.
+Resolved 'fs/reiserfs/namei.c' using previous resolution.
+Resolved 'fs/reiserfs/stree.c' using previous resolution.
+Resolved 'fs/udf/balloc.c' using previous resolution.
+Renaming fs/dquot.c->fs/quota/dquot.c
+Auto-merging fs/quota/dquot.c
+CONFLICT (content): merge conflict in fs/quota/dquot.c
+Renaming fs/quota.c->fs/quota/quota.c
+Auto-merging fs/quota/quota.c
+Renaming fs/quota_tree.c->fs/quota/quota_tree.c
+Auto-merging fs/quota/quota_tree.c
+Renaming fs/quota_v1.c->fs/quota/quota_v1.c
+Auto-merging fs/quota/quota_v1.c
+Renaming fs/quota_v2.c->fs/quota/quota_v2.c
+Auto-merging fs/quota/quota_v2.c
+Auto-merging fs/Kconfig
+Auto-merging fs/Makefile
+Auto-merging fs/ext2/super.c
+Auto-merging fs/ext3/inode.c
+Auto-merging fs/ext3/namei.c
+Auto-merging fs/ext3/super.c
+Auto-merging fs/ext4/balloc.c
+Auto-merging fs/ext4/ext4.h
+CONFLICT (content): Merge conflict in fs/ext4/ext4.h
+Auto-merging fs/ext4/ialloc.c
+Auto-merging fs/ext4/inode.c
+CONFLICT (content): Merge conflict in fs/ext4/inode.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/ext4/namei.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/inode.c
+Auto-merging fs/jfs/acl.c
+Auto-merging fs/jfs/jfs_extent.c
+Auto-merging fs/jfs/jfs_xtree.c
+Auto-merging fs/jfs/namei.c
+Auto-merging fs/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/ocfs2/quota_global.c
+Auto-merging fs/open.c
+Auto-merging fs/ramfs/file-nommu.c
+Auto-merging fs/reiserfs/bitmap.c
+Auto-merging fs/reiserfs/inode.c
+Auto-merging fs/reiserfs/namei.c
+CONFLICT (content): Merge conflict in fs/reiserfs/namei.c
+Auto-merging fs/reiserfs/stree.c
+CONFLICT (content): Merge conflict in fs/reiserfs/stree.c
+Auto-merging fs/reiserfs/super.c
+Auto-merging fs/super.c
+Auto-merging fs/sync.c
+Auto-merging fs/udf/balloc.c
+CONFLICT (content): Merge conflict in fs/udf/balloc.c
+Auto-merging fs/udf/ialloc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4e87671] Merge commit 'quota/for_next'
+$ git diff -M --stat --summary HEAD^..
+Merging jfs/next
+$ git merge jfs/next
+Merge made by recursive.
+ fs/jfs/super.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+Merging kbuild/master
+$ git merge kbuild/master
+Already up-to-date.
+Merging quilt/ide
+$ git merge quilt/ide
+Merge made by recursive.
+ drivers/ide/at91_ide.c      |   91 +-------------
+ drivers/ide/falconide.c     |   13 ++-
+ drivers/ide/ide-acpi.c      |    5 +-
+ drivers/ide/ide-atapi.c     |   38 +++----
+ drivers/ide/ide-cd.c        |  288 +++++++++++++++++++++----------------------
+ drivers/ide/ide-disk.c      |  123 ++++++++++++++----
+ drivers/ide/ide-disk_proc.c |    6 +-
+ drivers/ide/ide-dma-sff.c   |    9 +-
+ drivers/ide/ide-h8300.c     |  101 +---------------
+ drivers/ide/ide-io-std.c    |   75 +++---------
+ drivers/ide/ide-io.c        |   13 +-
+ drivers/ide/ide-ioctls.c    |   14 ++-
+ drivers/ide/ide-iops.c      |   20 ++--
+ drivers/ide/ide-lib.c       |   28 +++--
+ drivers/ide/ide-park.c      |    3 +-
+ drivers/ide/ide-pm.c        |    3 +-
+ drivers/ide/ide-probe.c     |   18 +--
+ drivers/ide/ide-proc.c      |    4 +-
+ drivers/ide/ide-taskfile.c  |   97 +++++++++-----
+ drivers/ide/ide.c           |    6 +
+ drivers/ide/ns87415.c       |   34 ++----
+ drivers/ide/q40ide.c        |   14 ++-
+ drivers/ide/scc_pata.c      |   71 +++--------
+ drivers/ide/tx4938ide.c     |   89 +-------------
+ drivers/ide/tx4939ide.c     |  110 ++---------------
+ include/linux/ide.h         |  151 +++++++++--------------
+ 26 files changed, 514 insertions(+), 910 deletions(-)
+Merging libata/NEXT
+$ git merge libata/NEXT
+Merge made by recursive.
+ drivers/ata/ahci.c        |   17 +++++++--------
+ drivers/ata/libata-core.c |   11 ++++++++++
+ drivers/ata/libata-eh.c   |    6 +++-
+ drivers/ata/libata-scsi.c |   46 ++++++++++++++++++++++++++++++++++----------
+ drivers/ata/libata-sff.c  |   20 ++++++++++++------
+ drivers/ata/sata_sil.c    |   13 ++++++++++++
+ include/linux/ata.h       |   19 ++++++++++++++++++
+ include/linux/libata.h    |    1 +
+ 8 files changed, 104 insertions(+), 29 deletions(-)
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/super.c
+Merge made by recursive.
+ fs/nfs/Kconfig               |    9 +
+ fs/nfs/client.c              |  124 ++++-
+ fs/nfs/direct.c              |    9 +
+ fs/nfs/internal.h            |   62 +++
+ fs/nfs/nfs4_fs.h             |   37 ++-
+ fs/nfs/nfs4proc.c            | 1229 ++++++++++++++++++++++++++++++++++++++++--
+ fs/nfs/nfs4renewd.c          |    6 +-
+ fs/nfs/nfs4state.c           |  130 ++++-
+ fs/nfs/nfs4xdr.c             | 1078 ++++++++++++++++++++++++++++++++-----
+ fs/nfs/read.c                |   33 +-
+ fs/nfs/super.c               |   12 +
+ fs/nfs/unlink.c              |   20 +-
+ fs/nfs/write.c               |   31 +-
+ include/linux/nfs4.h         |   18 +
+ include/linux/nfs_fs_sb.h    |   67 +++-
+ include/linux/nfs_xdr.h      |  174 ++++++
+ include/linux/nfsd/state.h   |    1 -
+ include/linux/sunrpc/clnt.h  |    1 +
+ include/linux/sunrpc/sched.h |    1 +
+ net/sunrpc/clnt.c            |   13 +
+ net/sunrpc/sched.c           |    2 +-
+ 21 files changed, 2838 insertions(+), 219 deletions(-)
+Merging xfs/master
+$ git merge xfs/master
+Merge made by recursive.
+ fs/xfs/linux-2.6/xfs_aops.c    |   38 +++++++++++---------
+ fs/xfs/linux-2.6/xfs_aops.h    |    1 +
+ fs/xfs/linux-2.6/xfs_buf.c     |    9 +++++
+ fs/xfs/linux-2.6/xfs_fs_subr.c |   14 ++++----
+ fs/xfs/linux-2.6/xfs_lrw.c     |   18 +++++++++-
+ fs/xfs/linux-2.6/xfs_sync.c    |   78 +++++++++++++++++-----------------------
+ fs/xfs/linux-2.6/xfs_sync.h    |    9 +++--
+ fs/xfs/xfs_iget.c              |   23 +++++++-----
+ fs/xfs/xfs_iomap.c             |   61 ++++++++-----------------------
+ fs/xfs/xfs_iomap.h             |    3 +-
+ fs/xfs/xfs_log.c               |   78 +++++++++++++++++++++++++---------------
+ fs/xfs/xfs_mount.h             |    2 +-
+ fs/xfs/xfs_vnodeops.c          |    7 ++++
+ 13 files changed, 180 insertions(+), 161 deletions(-)
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Merge made by recursive.
+ Documentation/infiniband/ipoib.txt        |   45 ++++
+ drivers/infiniband/core/cma.c             |   45 +++-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c    |   10 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.h    |    6 +
+ drivers/infiniband/hw/cxgb3/iwch.c        |   11 +-
+ drivers/infiniband/hw/cxgb3/iwch.h        |    5 +
+ drivers/infiniband/hw/cxgb3/iwch_cm.c     |  116 ++++++---
+ drivers/infiniband/hw/cxgb3/iwch_cm.h     |    3 +-
+ drivers/infiniband/hw/cxgb3/iwch_qp.c     |    4 +-
+ drivers/infiniband/hw/mlx4/main.c         |    3 +-
+ drivers/infiniband/hw/nes/nes.h           |    4 +-
+ drivers/infiniband/hw/nes/nes_cm.c        |   22 +-
+ drivers/infiniband/hw/nes/nes_cm.h        |    1 -
+ drivers/infiniband/hw/nes/nes_hw.c        |  389 ++++++++++++++---------------
+ drivers/infiniband/hw/nes/nes_hw.h        |    2 +
+ drivers/infiniband/hw/nes/nes_nic.c       |   52 +++--
+ drivers/infiniband/ulp/ipoib/ipoib_vlan.c |   25 ++-
+ drivers/net/mlx4/port.c                   |    5 +-
+ 18 files changed, 442 insertions(+), 306 deletions(-)
+Merging acpi/test
+$ git merge acpi/test
+Merge made by recursive.
+ arch/x86/kernel/reboot.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Merge made by recursive.
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+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-merging arch/ia64/kvm/kvm-ia64.c
+Auto-merging arch/ia64/kvm/vcpu.c
+Auto-merging arch/ia64/kvm/vtlb.c
+Auto-merging arch/x86/kernel/kvm.c
+Merge made by recursive.
+ arch/ia64/include/asm/kvm_host.h |    5 +-
+ arch/ia64/include/asm/pgtable.h  |    2 +
+ arch/ia64/kvm/kvm-ia64.c         |  159 +++++++---
+ arch/ia64/kvm/kvm_fw.c           |   28 ++-
+ arch/ia64/kvm/lapic.h            |    6 +-
+ arch/ia64/kvm/optvfault.S        |   30 ++
+ arch/ia64/kvm/process.c          |    5 +
+ arch/ia64/kvm/vcpu.c             |   20 +-
+ arch/ia64/kvm/vmm.c              |   12 +-
+ arch/ia64/kvm/vmm_ivt.S          |   18 +-
+ arch/ia64/kvm/vtlb.c             |    3 +-
+ arch/powerpc/kvm/powerpc.c       |    6 +
+ arch/s390/kvm/interrupt.c        |    6 +
+ arch/x86/include/asm/kvm.h       |    1 +
+ arch/x86/include/asm/kvm_host.h  |    7 +-
+ arch/x86/include/asm/svm.h       |    1 +
+ arch/x86/kernel/kvm.c            |    4 +
+ arch/x86/kvm/Makefile            |    2 +-
+ arch/x86/kvm/i8254.c             |   95 +++---
+ arch/x86/kvm/i8254.h             |   12 +-
+ arch/x86/kvm/kvm_timer.h         |   18 +
+ arch/x86/kvm/lapic.c             |  251 +++++----------
+ arch/x86/kvm/lapic.h             |   12 +-
+ arch/x86/kvm/mmu.c               |   86 +++++-
+ arch/x86/kvm/mmu.h               |    5 +
+ arch/x86/kvm/paging_tmpl.h       |   10 +-
+ arch/x86/kvm/svm.c               |   68 ++---
+ arch/x86/kvm/timer.c             |   46 +++
+ arch/x86/kvm/vmx.c               |  349 ++++++++++++---------
+ arch/x86/kvm/x86.c               |  136 ++++++--
+ arch/x86/kvm/x86.h               |   18 +
+ arch/x86/kvm/x86_emulate.c       |    1 -
+ include/linux/kvm.h              |   40 +++-
+ include/linux/kvm_host.h         |   20 +-
+ include/linux/kvm_types.h        |   27 ++
+ virt/kvm/ioapic.c                |  153 ++--------
+ virt/kvm/ioapic.h                |   27 +--
+ virt/kvm/irq_comm.c              |  109 ++++---
+ virt/kvm/kvm_main.c              |  642 +++++++++++++++++++++++++++-----------
+ 39 files changed, 1529 insertions(+), 911 deletions(-)
+ create mode 100644 arch/x86/kvm/kvm_timer.h
+ create mode 100644 arch/x86/kvm/timer.c
+Merging dlm/next
+$ git merge dlm/next
+Merge made by recursive.
+ fs/dlm/lockspace.c  |   17 ++++++++---------
+ include/linux/dlm.h |    4 ++--
+ 2 files changed, 10 insertions(+), 11 deletions(-)
+Merging scsi/master
+$ git merge scsi/master
+Already up-to-date.
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Merge made by recursive.
+ fs/ocfs2/dir.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Merge made by recursive.
+ fs/ext4/extents.c |    2 +-
+ fs/ext4/inode.c   |    8 ++++----
+ fs/ext4/super.c   |    9 +++++++++
+ 3 files changed, 14 insertions(+), 5 deletions(-)
+Merging async_tx/next
+$ git merge async_tx/next
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging net/master
+$ git merge net/master
+Already up-to-date.
+Merging wireless/master
+$ git merge wireless/master
+Already up-to-date.
+Merging mtd/master
+$ git merge mtd/master
+Already up-to-date.
+Merging crypto/master
+$ git merge crypto/master
+Auto-merging drivers/char/hw_random/omap-rng.c
+Merge made by recursive.
+ arch/x86/crypto/Makefile           |    2 +
+ arch/x86/crypto/aesni-intel_glue.c |  267 ++++++++++++++-
+ arch/x86/crypto/fpu.c              |  166 +++++++++
+ crypto/Kconfig                     |   10 +
+ crypto/api.c                       |    5 +-
+ crypto/cryptd.c                    |   14 +-
+ crypto/pcompress.c                 |    1 +
+ crypto/tcrypt.c                    |   16 +-
+ crypto/testmgr.c                   |    6 +-
+ drivers/char/hw_random/omap-rng.c  |    2 +-
+ drivers/crypto/talitos.c           |  713 ++++++++++++++++++++++++++----------
+ 11 files changed, 987 insertions(+), 215 deletions(-)
+ create mode 100644 arch/x86/crypto/fpu.c
+Merging vfs/for-next
+$ git merge vfs/for-next
+Already up-to-date.
+Merging sound/for-next
+$ git merge sound/for-next
+Already up-to-date.
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Resolved 'net/9p/protocol.c' using previous resolution.
+Auto-merging net/9p/protocol.c
+CONFLICT (content): Merge conflict in net/9p/protocol.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 540bc7a] Merge commit 'v9fs/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/rr
+$ git merge quilt/rr
+Resolved 'kernel/extable.c' using previous resolution.
+Resolved 'kernel/module.c' using previous resolution.
+Resolved 'kernel/params.c' using previous resolution.
+Auto-merging drivers/mtd/nand/nand_base.c
+Auto-merging drivers/video/uvesafb.c
+Auto-merging include/linux/compiler.h
+Auto-merging include/linux/cpu.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/moduleparam.h
+Auto-merging include/linux/string.h
+Auto-merging init/main.c
+Auto-merging kernel/extable.c
+CONFLICT (content): Merge conflict in kernel/extable.c
+Auto-merging kernel/module.c
+CONFLICT (content): Merge conflict in kernel/module.c
+Auto-merging kernel/params.c
+CONFLICT (content): Merge conflict in kernel/params.c
+Auto-merging kernel/workqueue.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 567c24f] Merge branch 'quilt/rr'
+$ git diff -M --stat --summary HEAD^..
+ drivers/video/aty/aty128fb.c   |    2 +-
+ drivers/video/cyber2000fb.c    |    9 +++----
+ drivers/video/uvesafb.c        |   10 +++-----
+ include/asm-frv/gdb-stub.h     |    1 -
+ include/asm-mn10300/gdb-stub.h |    1 -
+ include/linux/compiler.h       |    5 ++++
+ include/linux/cpu.h            |    5 ----
+ include/linux/moduleparam.h    |   40 +++++++++++++++++++++++++---------
+ init/main.c                    |    1 -
+ kernel/cpu.c                   |   11 ++-------
+ kernel/kthread.c               |   26 ++++++++++------------
+ kernel/module.c                |    3 ++
+ kernel/params.c                |   46 +++++++++++++++++++++++++++-------------
+ kernel/workqueue.c             |   36 ++++++++++++++++--------------
+ 14 files changed, 111 insertions(+), 85 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Auto-merging fs/cifs/dir.c
+Auto-merging fs/cifs/inode.c
+Merge made by recursive.
+ fs/cifs/CHANGES       |    3 +-
+ fs/cifs/cifs_spnego.c |    2 +-
+ fs/cifs/cifsfs.c      |   48 +------------
+ fs/cifs/cifsglob.h    |    1 +
+ fs/cifs/cifspdu.h     |    8 +-
+ fs/cifs/cifssmb.c     |    6 +-
+ fs/cifs/connect.c     |  194 +++++++++++++++++++++++++++++++++++--------------
+ fs/cifs/dir.c         |    6 +-
+ fs/cifs/dns_resolve.c |    2 +-
+ fs/cifs/file.c        |   64 +++++++++++++----
+ fs/cifs/inode.c       |   74 ++++++++++---------
+ fs/cifs/readdir.c     |    6 +-
+ 12 files changed, 249 insertions(+), 165 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     |   10 +++++-----
+ fs/gfs2/inode.c     |    8 ++++----
+ fs/gfs2/inode.h     |   14 ++++++++------
+ fs/gfs2/log.c       |    6 +++---
+ fs/gfs2/lops.c      |   14 ++++++++------
+ fs/gfs2/meta_io.c   |   38 +++++++++++++++++++++++++++-----------
+ fs/gfs2/ops_file.c  |    8 ++++----
+ fs/gfs2/ops_inode.c |    1 +
+ fs/gfs2/quota.c     |    2 +-
+ 9 files changed, 61 insertions(+), 40 deletions(-)
+Merging input/next
+$ git merge input/next
+Already up-to-date.
+Merging bkl-removal/bkl-removal
+$ git merge bkl-removal/bkl-removal
+Already up-to-date.
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Removing drivers/md/dm-bio-list.h
+Auto-merging drivers/md/dm.c
+Merge made by recursive.
+ Documentation/block/biodoc.txt |   19 +---
+ block/as-iosched.c             |  116 ++++++++++----------
+ block/blk-sysfs.c              |    4 +-
+ block/blk.h                    |    4 +-
+ block/cfq-iosched.c            |  234 +++++++++++++++++++++++++++++++++-------
+ block/elevator.c               |    8 +-
+ drivers/md/dm-bio-list.h       |  117 --------------------
+ drivers/md/dm-delay.c          |    2 -
+ drivers/md/dm-mpath.c          |    1 -
+ drivers/md/dm-raid1.c          |    1 -
+ drivers/md/dm-region-hash.c    |    1 -
+ drivers/md/dm-snap.c           |    1 -
+ drivers/md/dm.c                |    1 -
+ drivers/md/raid1.c             |    1 -
+ drivers/md/raid10.c            |    1 -
+ fs/buffer.c                    |   11 ++-
+ include/linux/bio.h            |  109 +++++++++++++++++++
+ include/linux/fs.h             |   19 +---
+ include/linux/rwtypes.h        |   77 +++++++++++++
+ 19 files changed, 461 insertions(+), 266 deletions(-)
+ delete mode 100644 drivers/md/dm-bio-list.h
+ create mode 100644 include/linux/rwtypes.h
+$ git revert 93fe0305df9344f57edfa0444f8764b34ea74f9b
+Finished one revert.
+[master 44623a9] Revert "Document and move the various READ/WRITE types"
+ 2 files changed, 18 insertions(+), 78 deletions(-)
+ delete mode 100644 include/linux/rwtypes.h
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Resolved 'firmware/WHENCE' using previous resolution.
+Removing drivers/media/dvb/ttpci/fdump.c
+Auto-merging drivers/scsi/qla1280.c
+Auto-merging firmware/Makefile
+Auto-merging firmware/WHENCE
+CONFLICT (content): Merge conflict in firmware/WHENCE
+Removing firmware/slicoss/gbdownload.sys.ihex
+Removing firmware/slicoss/gbrcvucode.sys.ihex
+Removing firmware/slicoss/oasisdbgdownload.sys.ihex
+Removing firmware/slicoss/oasisdownload.sys.ihex
+Removing firmware/slicoss/oasisrcvucode.sys.ihex
+Removing firmware/sxg/saharadbgdownloadB.sys.ihex
+Removing firmware/sxg/saharadownloadB.sys.ihex
+Removing sound/isa/wavefront/yss225.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 41dead9] 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/scsi/qla1280.c                     |    4 +-
+ firmware/.gitignore                        |    1 +
+ firmware/Makefile                          |   30 +-
+ firmware/README.AddingFirmware             |   34 +
+ firmware/WHENCE                            |   93 +-
+ firmware/av7110/Boot.S                     |  109 +
+ firmware/av7110/bootcode.bin.ihex          |   15 +
+ {scripts => firmware}/ihex2fw.c            |    0
+ firmware/slicoss/gbdownload.sys.ihex       | 6148 ----------------------------
+ firmware/slicoss/gbrcvucode.sys.ihex       |  162 -
+ firmware/slicoss/oasisdbgdownload.sys.ihex | 5124 -----------------------
+ firmware/slicoss/oasisdownload.sys.ihex    | 5124 -----------------------
+ firmware/slicoss/oasisrcvucode.sys.ihex    |  162 -
+ firmware/sxg/saharadbgdownloadB.sys.ihex   | 3937 ------------------
+ firmware/sxg/saharadownloadB.sys.ihex      | 3385 ---------------
+ firmware/yamaha/yss225_registers.bin.ihex  |  998 +++++
+ scripts/.gitignore                         |    1 -
+ scripts/Makefile                           |    3 +-
+ sound/isa/Kconfig                          |   10 -
+ sound/isa/wavefront/wavefront_fx.c         |   16 -
+ sound/isa/wavefront/yss225.c               | 2739 -------------
+ 27 files changed, 1239 insertions(+), 26986 deletions(-)
+ delete mode 100644 drivers/media/dvb/ttpci/fdump.c
+ create mode 100644 firmware/README.AddingFirmware
+ create mode 100644 firmware/av7110/Boot.S
+ create mode 100644 firmware/av7110/bootcode.bin.ihex
+ rename {scripts => firmware}/ihex2fw.c (100%)
+ delete mode 100644 firmware/slicoss/gbdownload.sys.ihex
+ delete mode 100644 firmware/slicoss/gbrcvucode.sys.ihex
+ delete mode 100644 firmware/slicoss/oasisdbgdownload.sys.ihex
+ delete mode 100644 firmware/slicoss/oasisdownload.sys.ihex
+ delete mode 100644 firmware/slicoss/oasisrcvucode.sys.ihex
+ delete mode 100644 firmware/sxg/saharadbgdownloadB.sys.ihex
+ delete mode 100644 firmware/sxg/saharadownloadB.sys.ihex
+ create mode 100644 firmware/yamaha/yss225_registers.bin.ihex
+ delete mode 100644 sound/isa/wavefront/yss225.c
+Merging pcmcia/master
+$ git merge pcmcia/master
+Already up-to-date.
+Merging battery/master
+$ git merge battery/master
+Merge made by recursive.
+ drivers/power/pcf50633-charger.c  |   88 +++++++++++++++++++++++++++++-------
+ drivers/power/pda_power.c         |   89 ++++++++++++++++++++++++++++++++-----
+ include/linux/mfd/pcf50633/core.h |    2 +
+ include/linux/mfd/pcf50633/mbc.h  |    1 -
+ include/linux/pda_power.h         |    2 +
+ 5 files changed, 152 insertions(+), 30 deletions(-)
+Merging leds/for-mm
+$ git merge leds/for-mm
+Merge made by recursive.
+ drivers/leds/leds-gpio.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Auto-merging arch/x86/kernel/kgdb.c
+Merge made by recursive.
+ Documentation/DocBook/kgdb.tmpl |    2 +-
+ arch/x86/kernel/kgdb.c          |    3 +-
+ include/linux/kgdb.h            |   50 +++++++++++++++++++++++++++++++++-----
+ kernel/kgdb.c                   |    6 ++--
+ 4 files changed, 49 insertions(+), 12 deletions(-)
+Merging slab/for-next
+$ git merge slab/for-next
+Auto-merging include/linux/rcupdate.h
+Auto-merging init/Kconfig
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/Makefile
+Merge made by recursive.
+ Documentation/vm/slqbinfo.c | 1054 +++++++++++++
+ include/linux/rcu_types.h   |   18 +
+ include/linux/rcupdate.h    |   11 +-
+ include/linux/slab.h        |   10 +-
+ include/linux/slqb_def.h    |  296 ++++
+ init/Kconfig                |    9 +-
+ lib/Kconfig.debug           |   20 +
+ mm/Makefile                 |    1 +
+ mm/slqb.c                   | 3622 +++++++++++++++++++++++++++++++++++++++++++
+ 9 files changed, 5027 insertions(+), 14 deletions(-)
+ create mode 100644 Documentation/vm/slqbinfo.c
+ create mode 100644 include/linux/rcu_types.h
+ create mode 100644 include/linux/slqb_def.h
+ create mode 100644 mm/slqb.c
+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 mfd/for-next
+$ git merge mfd/for-next
+Already up-to-date.
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Already up-to-date.
+Merging voltage/for-next
+$ git merge voltage/for-next
+Merge made by recursive.
+ include/linux/regulator/driver.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+Merging security-testing/next
+$ git merge security-testing/next
+Auto-merging Documentation/sysctl/kernel.txt
+Auto-merging kernel/module.c
+Auto-merging kernel/sysctl.c
+Merge made by recursive.
+ Documentation/sysctl/kernel.txt     |   11 +++++++++++
+ kernel/module.c                     |    7 +++++--
+ kernel/sysctl.c                     |   12 ++++++++++++
+ security/commoncap.c                |   32 ++++++++++++++++++++++++++++++++
+ security/selinux/avc.c              |    2 +-
+ security/selinux/include/security.h |    4 +++-
+ security/selinux/selinuxfs.c        |    4 ++--
+ security/selinux/ss/services.c      |   30 +++++-------------------------
+ 8 files changed, 71 insertions(+), 31 deletions(-)
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging quilt/ttydev
+$ git merge quilt/ttydev
+Resolved 'drivers/serial/8250_pci.c' using previous resolution.
+Resolved 'fs/devpts/inode.c' using previous resolution.
+Auto-merging arch/x86/kernel/kprobes.c
+Auto-merging drivers/char/cyclades.c
+Auto-merging drivers/pci/quirks.c
+Auto-merging drivers/serial/8250_pci.c
+CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c
+Auto-merging drivers/serial/Kconfig
+Auto-merging drivers/serial/bfin_5xx.c
+Auto-merging drivers/serial/cpm_uart/cpm_uart_core.c
+Auto-merging drivers/serial/jsm/jsm_tty.c
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging fs/devpts/inode.c
+CONFLICT (content): Merge conflict in fs/devpts/inode.c
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/serial_core.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 390de5f] Merge branch 'quilt/ttydev'
+$ git diff -M --stat --summary HEAD^..
+ drivers/serial/Kconfig    |    2 +-
+ drivers/serial/bfin_5xx.c |    7 ++++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+Merging agp/agp-next
+$ git merge agp/agp-next
+Already up-to-date.
+Merging generic-ipi/auto-generic-ipi-next
+$ git merge generic-ipi/auto-generic-ipi-next
+Already up-to-date.
+Merging oprofile/auto-oprofile-next
+$ git merge oprofile/auto-oprofile-next
+Already uptodate!
+Merge made by recursive.
+Merging fastboot/auto-fastboot-next
+$ git merge fastboot/auto-fastboot-next
+Already up-to-date.
+Merging sparseirq/auto-sparseirq-next
+$ git merge sparseirq/auto-sparseirq-next
+Already uptodate!
+Merge made by recursive.
+Merging iommu/auto-iommu-next
+$ git merge iommu/auto-iommu-next
+Already up-to-date.
+Merging uwb/for-upstream
+$ git merge uwb/for-upstream
+Already up-to-date.
+Merging watchdog/master
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Kconfig
+Merge made by recursive.
+ drivers/watchdog/Kconfig          |    2 -
+ drivers/watchdog/Makefile         |    2 -
+ drivers/watchdog/at91rm9200_wdt.c |    6 +-
+ drivers/watchdog/i6300esb.c       |  155 ++++++++++++++++++-------------------
+ drivers/watchdog/ks8695_wdt.c     |    6 +-
+ drivers/watchdog/omap_wdt.c       |    6 +-
+ drivers/watchdog/orion5x_wdt.c    |   57 ++++++++++----
+ 7 files changed, 128 insertions(+), 106 deletions(-)
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Auto-merging drivers/pci/intel-iommu.c
+Merge made by recursive.
+ drivers/pci/intel-iommu.c |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Already up-to-date.
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Already up-to-date.
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Merge made by recursive.
+ Documentation/SubmittingPatches |    9 ++++++++-
+ 1 files changed, 8 insertions(+), 1 deletions(-)
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Merge made by recursive.
+ fs/compat.c          |    2 +-
+ fs/ext2/ext2.h       |    2 +-
+ fs/inode.c           |    2 +-
+ sound/usb/usbmixer.c |    2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging squashfs/master
+$ git merge squashfs/master
+Already up-to-date.
+Merging omap/for-next
+$ git merge omap/for-next
+Already up-to-date.
+Merging quilt/aoe
+$ git merge quilt/aoe
+Already up-to-date.
+Merging kmemleak/kmemleak
+$ git merge kmemleak/kmemleak
+Resolved 'Documentation/kernel-parameters.txt' using previous resolution.
+Resolved 'MAINTAINERS' using previous resolution.
+Resolved 'init/main.c' using previous resolution.
+Resolved 'lib/Kconfig.debug' using previous resolution.
+Resolved 'mm/slob.c' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging fs/block_dev.c
+Auto-merging include/linux/slab.h
+Auto-merging init/main.c
+CONFLICT (content): Merge conflict in init/main.c
+Auto-merging kernel/module.c
+Auto-merging lib/Kconfig.debug
+CONFLICT (content): Merge conflict in lib/Kconfig.debug
+Auto-merging mm/Makefile
+Auto-merging mm/page_alloc.c
+Auto-merging mm/slab.c
+Auto-merging mm/slob.c
+CONFLICT (content): Merge conflict in mm/slob.c
+Auto-merging mm/slub.c
+Auto-merging mm/vmalloc.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master b494198] Merge commit 'kmemleak/kmemleak'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt |    4 +
+ Documentation/kmemleak.txt          |  142 ++++
+ MAINTAINERS                         |    6 +
+ arch/arm/kernel/vmlinux.lds.S       |    2 +
+ arch/x86/kernel/vmlinux_32.lds.S    |    1 +
+ arch/x86/kernel/vmlinux_64.lds.S    |    1 +
+ drivers/char/vt.c                   |    7 +
+ fs/block_dev.c                      |    6 +
+ include/linux/kmemleak.h            |   96 +++
+ include/linux/percpu.h              |    5 +
+ include/linux/slab.h                |    2 +
+ init/main.c                         |    4 +-
+ kernel/module.c                     |   56 ++
+ lib/Kconfig.debug                   |   33 +
+ mm/Makefile                         |    2 +
+ mm/kmemleak-test.c                  |  111 +++
+ mm/kmemleak.c                       | 1498 +++++++++++++++++++++++++++++++++++
+ mm/page_alloc.c                     |   11 +
+ mm/slab.c                           |   32 +-
+ mm/slob.c                           |    7 +
+ mm/slub.c                           |    5 +-
+ mm/vmalloc.c                        |   30 +-
+ 22 files changed, 2054 insertions(+), 7 deletions(-)
+ create mode 100644 Documentation/kmemleak.txt
+ create mode 100644 include/linux/kmemleak.h
+ create mode 100644 mm/kmemleak-test.c
+ create mode 100644 mm/kmemleak.c
+Merging suspend/linux-next
+$ git merge suspend/linux-next
+Already up-to-date.
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Already up-to-date.
+Merging quilt/usb
+$ git merge quilt/usb
+Already up-to-date.
+Merging quilt/staging
+$ git merge quilt/staging
+Auto-merging drivers/staging/slicoss/slicoss.c
+Auto-merging drivers/staging/sxg/sxg.c
+Merge made by recursive.
+ drivers/staging/android/binder.c           |  201 +++++++++++++++++++++-------
+ drivers/staging/at76_usb/at76_usb.c        |   20 ++-
+ drivers/staging/epl/VirtualEthernetLinux.c |   17 ++-
+ drivers/staging/et131x/et131x_netdev.c     |   23 ++--
+ drivers/staging/line6/audio.c              |    9 +-
+ drivers/staging/otus/usbdrv.c              |   47 ++++---
+ drivers/staging/rt2860/rt_main_dev.c       |   25 ++--
+ drivers/staging/rt2870/rt2870.h            |    1 +
+ drivers/staging/rt2870/rt_main_dev.c       |   28 ++--
+ drivers/staging/rt3070/rt_main_dev.c       |   29 ++--
+ drivers/staging/slicoss/slicoss.c          |   25 +++--
+ drivers/staging/stlc45xx/Kconfig           |    2 +-
+ drivers/staging/sxg/sxg.c                  |   27 +++--
+ drivers/staging/uc2322/aten2011.c          |   28 +----
+ drivers/staging/wlan-ng/p80211netdev.c     |   20 ++-
+ 15 files changed, 323 insertions(+), 179 deletions(-)
+Merging scsi-post-merge/master
+$ git merge scsi-post-merge/master
+Already up-to-date.
+Applying: sparc64: update for restart_block size change
+$ git revert 51dcdfec6a274afc1c6fce180d582add9ff512c0
+Finished one revert.
+[master cbfae14] Revert "parport: Use the PCI IRQ if offered"
+ 4 files changed, 31 insertions(+), 60 deletions(-)
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 000000000000..e59a2316a51a
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,105 @@
+Unchanged quilt series driver-core.current
+Importing usb.current based on quilt/driver-core.current
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard 8863a287af68f2c4143364cb50c888c418f71c15
+HEAD is now at 8863a28 driver core: allow non-root users to listen to uevents
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current
+usb-gadget-fix-ethernet-link-reports-to-ethtool.patch
+usb-ftdi_sio-add-vendor-project-id-for-jeti-specbos-1201-spectrometer.patch
+usb-option-add-ids-for-d-link-dwm-652-3.5g-modem.patch
+usb-qcserial-add-extra-device-ids.patch
+usb-fix-oops-in-cdc-wdm-in-case-of-malformed-descriptors.patch
+usb-musb_host-minor-enqueue-locking-fix.patch
+usb-usb-storage-augment-unusual_devs-entry-for-simple-tech-datafab.patch
+usb-musb_host-fix-ep0-fifo-flushing.patch
+usb-musb-bugfixes-for-multi-packet-txdma-support.patch
+usb-musb-sanitize-clearing-txcsr-dma-bits.patch
+usb-musb-fix-isochronous-txdma.patch
+usb-musb-fix-possible-panic-while-resuming.patch
+revert-usb-usb-serial-ch341-support-for-dtr-rts-cts.patch
+usb-usb-serial-ch341-support-for-dtr-rts-cts.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/usb.current
+From ../quilt-tmp
+ + 776416f...e8f409d master     -> quilt/usb.current  (forced update)
+Unchanged quilt series device-mapper
+Importing i2c based on 2.6.30-rc1
+$ cd ../quilt-tmp
+$ git reset --hard 577c9c456f0e1371cbade38eaf91ae8e8a308555
+HEAD is now at 577c9c4 Linux 2.6.30-rc1
+$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c
+i2c-algo-pca-fix-uninitialized-state.patch
+i2c-voodoo3-deprecate.patch
+i2c-fix-sparse-warnings-for-I2C_BOARD_INFO.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/i2c
+From ../quilt-tmp
+ + 6b9daf2...8997f97 master     -> quilt/i2c  (forced update)
+Importing jdelvare-hwmon based on 2.6.30-rc1
+$ cd ../quilt-tmp
+$ git reset --hard 577c9c456f0e1371cbade38eaf91ae8e8a308555
+HEAD is now at 577c9c4 Linux 2.6.30-rc1
+$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon
+hwmon-ibmaem-automatically-load-on-hc10-blade.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon
+From ../quilt-tmp
+ + 5bd654e...7c4ede9 master     -> quilt/jdelvare-hwmon  (forced update)
+Unchanged quilt series kernel-doc
+Unchanged quilt series ide
+Unchanged quilt series rr
+Unchanged quilt series ttydev
+Unchanged quilt series aoe
+Unchanged quilt series driver-core
+Unchanged quilt series usb
+Unchanged quilt series staging
+Unchanged quilt series driver-core.current
+Unchanged quilt series usb.current
+Unchanged quilt series device-mapper
+Unchanged quilt series i2c
+Unchanged quilt series jdelvare-hwmon
+Unchanged quilt series kernel-doc
+Unchanged quilt series ide
+Unchanged quilt series rr
+Unchanged quilt series ttydev
+Unchanged quilt series aoe
+Importing driver-core based on quilt/usb.current
+	quilt series is empty
+$ git update-ref refs/heads/quilt/driver-core e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+Importing usb based on quilt/driver-core
+	quilt series is empty
+$ git update-ref refs/heads/quilt/usb e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+Importing staging based on quilt/usb
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard e8f409db48e79fadf4c8a2a4bef33764dcc756d5
+HEAD is now at e8f409d USB: usb-serial ch341: support for DTR/RTS/CTS
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging
+staging-at76-convert-to-netdev_ops.patch
+staging-epl-convert-to-netdev_ops.patch
+staging-et131x-convert-to-netdev_ops.patch
+staging-otus-convert-to-netdev_ops.patch
+staging-rt2860-convert-to-netdev_ops.patch
+staging-rt2870-convert-to-netdev_ops.patch
+staging-rt3070-convert-to-netdev_ops.patch
+staging-slicoss-convert-to-netdev_ops.patch
+staging-sxg-convert-to-netdev_ops.patch
+staging-wlan-ng-convert-to-netdev_ops.patch
+staging-line6-convert-to-snd_card_create.patch
+staging-rt2870-add-id-for-sitecom-wl-315.patch
+staging-aten2011-clean-up-some-tty-bits.patch
+staging-binder-remove-vm_exec-check.patch
+staging-binder-don-t-create-two-proc-entries-with-the-same-name-if-the-driver-is-opened-twice-in-one-process.patch
+staging-binder-mmap-fixes.patch
+staging-binder-add-more-offset-validation.patch
+staging-binder-keep-a-reference-to-the-files_struct-while-the-driver-is-mmapped.patch
+staging-binder-cast-to-uintptr_t-instead-of-size_t-when-aligning-pointers.patch
+staging-binder-prevent-the-wrong-thread-from-adding-a-transaction-to-the-stack.patch
+staging-binder-defer-flush-and-release-operations-to-avoid-deadlocks.patch
+staging-stlc45xx-should-depend-on-generic_hardirqs.patch
+revert-staging-slicoss-use-gfp_kernel-where-possible.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/staging
+From ../quilt-tmp
+ + 5ce618b...30738f4 master     -> quilt/staging  (forced update)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 000000000000..1de034844f11
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20090409