| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Fri, 6 Aug 2010 12:28:11 -0300
From: Mateo <mateoguzman@...il.com>
To: sfr@...b.auug.org.au
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] Add linux-next specific files for 20100805
From: Stephen Rothwell <sfr@...b.auug.org.au>
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
Next/SHA1s | 171 +
Next/Trees | 173 +
Next/merge.log |10094 +++++++++++++++++++++++++++++++++++++++++++++++++
Next/quilt-import.log | 26 +
localversion-next | 1 +
5 files changed, 10465 insertions(+), 0 deletions(-)
create mode 100644 Next/SHA1s
create mode 100644 Next/Trees
create mode 100644 Next/merge.log
create mode 100644 Next/quilt-import.log
create mode 100644 localversion-next
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..3816666
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,171 @@
+Name SHA1
+---- ----
+origin 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
+fixes 140236b4b1c749c9b795ea3d11558a0eb5a3a080
+arm-current 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
+m68k-current b37fa16e78d6f9790462b3181602a26b5af36260
+powerpc-merge 7ffb65f84bd3852e4906c43b9e84dcc4e4d72d14
+sparc-current 71cd03b0044183843318bfac0b6ce5868a96ef34
+scsi-rc-fixes 8f83d7688026729c9d356d865f65a8996f090048
+net-current c33788b45f754bd5dd8adc520e37fa38ac1849c7
+sound-current 1c5474a65bf15a4cb162dfff86d6d0b5a08a740c
+pci-current a2dccdb2055abeb8a7ce8e45e5f83de9c980a00c
+wireless-current f792af250de54309e4bc9f238db3623ead0a4507
+kbuild-current 58f915a311c1eac464e0e1caca2f85a05b66c930
+driver-core.current 9fe6206f400646a2322096b56c59891d530e8d51
+tty.current 9fe6206f400646a2322096b56c59891d530e8d51
+usb.current 9fe6206f400646a2322096b56c59891d530e8d51
+staging.current 9fe6206f400646a2322096b56c59891d530e8d51
+cpufreq-current c2f4a2c6e08c7635316dfd25ef706e9104384c56
+input-current d01d0756f75e7a5b4b43764ad45b83c4340f11d6
+md-current 3424bf6a772cff606fc4bc24a3639c937afb547f
+audit-current def57543418a5f47debae28a0a9dea2effc11692
+crypto-current 4015d9a865e3bcc42d88bedc8ce1551000bab664
+ide-curent a62f49ab56ad2f59e88bbeb34e7ab41f0d45161d
+dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442
+gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e
+arm 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c
+davinci 28e417c7cecf34c37bd5f4fad0a2ccd18f9efa3e
+i.MX a5e02d3f700f8a97bb71435074e9925a17f492f4
+msm 074f8ddc0359dbd2645dda4097bf4b81bf703250
+omap d21872b3683ff37f73c68993749a6e6aeeaed265
+pxa 19d6c13b56a78b3757e747f469285c2a546d634a
+samsung 67a3e12b05e055c0415c556a315a3d3eb637e29e
+s5p 7f5c6278ee02b18c218f24ab4cc9a5f7ea77af8c
+tegra 2a9ecdc6d9bd83d6a862cec4e34bcbc90a1eb35c
+avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc
+blackfin 785cb847e762e05f294c0af4c2f61400afbf8ff3
+cris 9e365e813ff88adaf4b7540cfe62d4c1a6b44515
+ia64 ec0db7e64bd25c54b64f7241a00e5c159333a4b0
+m68k f3da833da32976a0e8996d745d535ae274bbce68
+m68knommu d5334592b5de33d41403b184d5c233c66ca1de11
+microblaze 2d5973cb5ac5d04662f86e19a06a4c52fa4c4ae3
+mips 99afb1639e61e9025321acfdb1cf021f72dc0cef
+parisc 210501aa570fdaa8b06e56fd1c04f31f2d3f368b
+powerpc 412a4ac5e9cf7fdeb6af562c25547a9b9da7674f
+4xx ff349103964d43c28b7b80bdecf7ace0113b3dda
+52xx-and-virtex 0c2daaafcdec726e89cbccca61d576de8429c537
+galak c4b6a77663f5879de20561144716cfb675815e82
+s390 e22b6c49adea0c0e210f07dca668e183e5dfa07e
+sh 57682827b9a5edb52e33af0be9082b51bffcd5c7
+genesis beccb12f6fbcc73339f127ff1f00638f076c933f
+sparc 67a3e12b05e055c0415c556a315a3d3eb637e29e
+tile 1c689cbcf2c2b7a35cd237abddd9206bb1b6fee1
+xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f
+ceph e7fdb915217126d23ff2aafb2d5fdce21b763df1
+cifs ee655f7a8a7c080a29173e61620304768d1790b9
+configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5
+ecryptfs d36da03ca332b245b105830776484b4b75f7e9bd
+ext3 aa32a796389bedbcf1c7714385b18714a0743810
+ext4 a51dca9cd3bb4ec5a05bfb6feabf024a5c808a37
+fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5
+fuse 2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a
+gfs2 0809f6ec18bbce54c996f5c36f4b9d371075c98b
+jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598
+logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16
+nfs 755e7469e5a1adc760394377c8decf06cea5f929
+nfsd af4718f3f996925f770e540004ec9224243d1682
+nilfs2 89c0fd014d34d409a7b196667c2b9a4813b6c968
+ocfs2 5453258d532e72731b0829e4fefd36dd611a2fff
+omfs 8800a044c71a128633cf3febaf4780531a991334
+squashfs 4690148f77f90ec132b5eb780650ba8769b9ed39
+udf 581b7e9fc00789782cb3bdca58db49f6f0f66608
+v9fs 327aec03ac4c7bbf5e41ff03ac3a84c424589f27
+ubifs c18de72fb3c72fdc5ca883910761af3f14d90d76
+xfs 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264
+vfs f9bc82bcea89ca85cde0cdec808e73ec3eb603a3
+pci 763e9db9994e27a7d2cb3701c8a097a867d0e0b4
+hid 06dc5dd8dddc5d624da51d00dbe8063c80ef05b2
+i2c 060991d74f40695f048517755457ff91ae3db048
+bjdooks-i2c bd588d8800abd6c6c92b85f07cc2c4a5780c7b8f
+jdelvare-hwmon c868eb3ea9b639d1848e8cec945b67e23190c252
+kernel-doc 80f61bb50e59448e128e158dd5e5a3efbfb40edf
+v4l-dvb 73e2d47e79056ba97e7ca2196f2deb56e73d6eda
+kbuild 4630da333a416c71313ea084b3f5ea29fa27d3a6
+kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810
+ide 89590054fb61a577b1b0b1235263bec9c6998578
+libata 752e386c247664152f2cce37915d1f50631d7f42
+infiniband 2c3a8c1d3f7efcafe00c92fc90673cbfdadb9016
+acpi 6ae0a713ff9d0d6027f431fb26ac7441979da269
+idle-test 0394c6676e3fa48587fbe4821390d3264672c530
+ieee1394 e78483c5aeb0d7fbb0e365802145f1045e62957e
+ubi 64d4b4c90a876401e503c3a3260e9d0ed066f271
+kvm 3444d7da1839b851eefedd372978d8a982316c36
+dlm 89d799d008710e048ee14df4f4e5441e9f4d5d50
+swiotlb 167be8c86f822aa20ec7af2e07c1d71cc32233da
+swiotlb-xen fe96eb404e33b59bb39f7050205f7c56c1c7d686
+ibft 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a
+scsi 339f4f4eab80caa6cf0d39fb057ad6ddb84ba91e
+async_tx b9033e682e86f3c6a66763f9b6a3935c5c64e145
+net 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4
+wireless 2411054ae9eb7e7ef488a39912abfc4ebadbe3ad
+mtd e17f47a14b3418711d9fee5c0a77ef0b672f5eaa
+crypto 4015d9a865e3bcc42d88bedc8ce1551000bab664
+sound eaac137866774241b0d89613f4237ce67bddcf0b
+cpufreq 9d1f44ee206a23b975d7d7c6f759efb25e0e61ac
+rr df736f6915a24373481fde09ede0b573348cddbf
+input 173bdd746b128241d3d6d202142820692e7dd530
+lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block f9ccdfe846639f7a4529ccab78468b2207382380
+device-mapper 58e2490783e5a21b866eab05bd42d53d917b9306
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia 127c03cdbad9bd5af5d7f33bd31a1015a90cb77f
+battery 808be4b22f47886d2279852ada3d186fc20909bc
+leds a4b4433c511cf4361bb0afabba69e16632002d32
+backlight 67e67df8da723debf24f7763605776891203e8d5
+kgdb cb6a2d3832bc20ed7cdac733818d9e321b7bc34c
+slab 513901457a256b2cbb35612339c92bb513d15e1a
+uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298
+md 69e51b449d383e97b1b9f890f8378c96e9e17346
+mfd 164ba1810a6d9c8e6c1550730e11d4882bfc8d18
+hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm dc77de12dde95c8da39e4c417eb70c7d445cf84b
+viafb ac3aa5375db246f0af98e519fab478523a6212ed
+voltage 4e249bf64e0621847b23c84e2f4e3cd2dbf5e102
+security-testing d9cf205ef94aa88944a7f2d93059cf2271e51fa0
+lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+agp 7f32e2e05c240201b42b58dec1b4a072e2127792
+uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259
+watchdog 9f43bbd45648abfb3681b03783d63ee1a9792852
+bdev feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu 2d9e667efdfb4e986074d98e7d9a424003c7c43b
+cputime 96830a57de1197519b62af6a4c9ceea556c18c3d
+osd 5002dd18c5940ce63b917d84f2b852c3b96009bb
+jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94
+nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32
+trivial 0ea6e61122196509af82cc4f36cbdaacbefb8227
+audit def57543418a5f47debae28a0a9dea2effc11692
+aoe c3643395dc3b8d47932e2bbc2992532ae88ee522
+suspend 8d4b9d1bfef117862a2889dec4dac227068544c9
+bluetooth adb08edea0119f7a5484a9f6a385fbcecdf85a63
+fsnotify 1968f5eed54ce47bde488fd9a450912e4a2d7138
+irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554
+catalin 23137be2952fed2985ae1a359e71b16193d961b6
+alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08
+i7core_edac f8c6d1e8a05e4a0b7ac15ca578699eb4953c2eb6
+devicetree 7fb8f881c54beb05dd4d2c947dada1c636581d87
+spi b4225885deb569f7afcf1f3a9f069f74cc9db591
+limits f33ebbe9da2c3c24664a0ad4f8fd83f293547e63
+omap_dss2 ec90f1116ad8c5e3c6c0b7ac7c4547e63d4400b6
+xen 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1
+tip 073fe1a72ffd7bd3aec25fb4b6624d93c83444eb
+lost-spurious-irq fa7cd37f808c487f722d7a2ce9c0923a323922df
+edac-amd c4799c7570475352c8c5de82ae938f7a02f206fa
+oprofile 729419f0090601406abe714c5f8872a3bd53ff68
+percpu 099a19d91ca429944743d51bef8fee240e94d8e3
+workqueues 6ee0578b4daaea01c96b172c6aacca43fd9807a6
+sfi e29df91e67428c1a651d18df6ec047fcb30282d3
+asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf
+drivers-x86 5aa06930fbcfcb6b03fcb18b753122b10ac47a87
+hwpoison 2eb51b2cf72edb16005f9aa33f674850bce9b311
+sysctl c656ae95d1c5c8ed5763356263ace2d03087efec
+bkl-core 5f202bd5ca64132cdd7f186656bc0221f257733d
+bkl-procfs 99df95a22f7cfcf85405d4edc07c2d953542f0dd
+bkl-ioctl 29f367bfbf5a8de46cb7320647e44f20d18cff44
+driver-core 60cc62ad579afa0eb5bded82e08dd0617d461d52
+tty 3303e34d304c3ed5bda8bc1439ba3554dcc888ab
+usb c45b6da6e535ae8861730c1be3f22e80182e27bd
+staging-next b12d1995f650e92f26184afd28e6cf40bf64467a
+slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c
+scsi-post-merge 34a65dc1b363875b787d7357f2ca9c11a0ccaf13
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..c72e3e1
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,173 @@
+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
+fixes git -#fixes
+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/mmarek/kbuild-2.6.git#rc-fixes
+driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/
+tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/
+usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/
+staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.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
+ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master
+dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master
+gcl-current git git://git.secretlab.ca/git/linux-2.6#merge
+arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel
+davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next
+i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next
+msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next
+omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next
+pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next
+samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung
+s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next
+tegra git git://android.git.kernel.org/kernel/tegra.git#for-next
+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/vapier/blackfin.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
+microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#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#next
+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
+52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next
+galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#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
+genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git#master
+sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master
+tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master
+xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master
+ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next
+cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master
+configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next
+ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next
+ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next
+ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#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
+gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master
+jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next
+logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master
+nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next
+nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next
+nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next
+ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next
+omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next
+squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master
+udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next
+v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next
+ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next
+xfs git git://oss.sgi.com/xfs/xfs#master
+vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next
+pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next
+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/
+bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-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
+kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next
+kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next
+ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master
+libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT
+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
+idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test
+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#linux-next
+dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next
+swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master
+swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen-2.6.git#master
+ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master
+scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master
+async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#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
+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
+rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/
+input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#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
+device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/
+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.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#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
+viafb git git://git.lwn.net/linux-2.6.git#viafb-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
+agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-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
+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
+aoe quilt http://support.coraid.com/support/linux/for-next/patches/
+suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next
+bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master
+fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next
+irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next
+catalin git git://linux-arm.org/linux-2.6.git#for-next
+alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next
+i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next
+devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree
+spi git git://git.secretlab.ca/git/linux-2.6#next-spi
+limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits
+omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next
+xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest
+lost-spurious-irq git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#lost-spurious-irq
+edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
+oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next
+percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next
+workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next
+sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test
+asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next
+drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next
+hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison
+sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master
+bkl-core git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/core
+bkl-procfs git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/procfs
+bkl-ioctl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/ioctl
+driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/
+tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/
+usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/
+staging-next git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git#staging-next
+slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh
+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 0000000..c59666c
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,10094 @@
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at 3a09b1b Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
+Merging origin/master
+$ git merge origin/master
+Updating 3a09b1b..3cfc2c4
+Fast-forward
+ Documentation/ABI/testing/debugfs-ec | 20 +
+ Documentation/ABI/testing/sysfs-devices-memory | 6 +-
+ Documentation/ABI/testing/sysfs-devices-system-cpu | 2 +-
+ .../ABI/testing/sysfs-driver-hid-roccat-kone | 13 -
+ Documentation/ABI/testing/sysfs-power | 15 +
+ Documentation/Changes | 12 +-
+ Documentation/DocBook/dvb/dvbapi.xml | 19 +-
+ Documentation/DocBook/dvb/frontend.h.xml | 1 +
+ Documentation/DocBook/dvb/frontend.xml | 10 +-
+ Documentation/DocBook/media-entities.tmpl | 1 +
+ Documentation/DocBook/media.tmpl | 8 +-
+ Documentation/DocBook/scsi.tmpl | 2 +-
+ Documentation/DocBook/v4l/compat.xml | 5 +-
+ Documentation/DocBook/v4l/fdl-appendix.xml | 2 +-
+ .../DocBook/v4l/lirc_device_interface.xml | 235 +
+ Documentation/DocBook/v4l/remote_controllers.xml | 2 +
+ Documentation/HOWTO | 6 +-
+ Documentation/PCI/pci.txt | 2 +-
+ Documentation/RCU/RTFP.txt | 2 +-
+ Documentation/SubmittingDrivers | 2 +-
+ Documentation/aoe/aoe.txt | 2 +-
+ Documentation/apparmor.txt | 39 +
+ Documentation/arm/IXP2000 | 2 +-
+ Documentation/arm/IXP4xx | 14 +-
+ Documentation/arm/README | 4 +-
+ Documentation/arm/SA1100/Assabet | 5 +-
+ Documentation/arm/SA1100/Brutus | 2 +-
+ Documentation/arm/SA1100/FreeBird | 2 +-
+ Documentation/arm/SA1100/GraphicsClient | 2 +-
+ Documentation/arm/SA1100/GraphicsMaster | 2 +-
+ Documentation/arm/SA1100/Itsy | 2 +-
+ Documentation/arm/SA1100/PLEB | 2 +-
+ Documentation/arm/SA1100/Victor | 2 +-
+ Documentation/arm/SA1100/nanoEngine | 2 +-
+ Documentation/binfmt_misc.txt | 2 +-
+ Documentation/blockdev/paride.txt | 2 +-
+ Documentation/cdrom/packet-writing.txt | 2 +-
+ Documentation/cgroups/cpusets.txt | 2 +-
+ Documentation/development-process/4.Coding | 2 +-
+ Documentation/device-mapper/dm-crypt.txt | 2 +-
+ Documentation/devices.txt | 9 +-
+ Documentation/dvb/faq.txt | 2 +-
+ Documentation/dvb/get_dvb_firmware | 25 +-
+ Documentation/fb/framebuffer.txt | 2 +-
+ Documentation/feature-removal-schedule.txt | 93 +-
+ Documentation/filesystems/9p.txt | 2 +-
+ Documentation/filesystems/affs.txt | 2 +-
+ Documentation/filesystems/befs.txt | 4 +-
+ Documentation/filesystems/isofs.txt | 2 +-
+ Documentation/filesystems/nfs/nfsroot.txt | 2 +
+ Documentation/filesystems/proc.txt | 4 +-
+ Documentation/filesystems/vfat.txt | 3 +-
+ Documentation/hwmon/adm1026 | 2 +-
+ Documentation/hwmon/g760a | 2 +-
+ Documentation/hwmon/gl518sm | 3 +-
+ Documentation/hwmon/hpfall.c | 2 +-
+ Documentation/hwmon/k8temp | 2 +-
+ Documentation/hwmon/lm85 | 6 +-
+ Documentation/hwmon/smsc47m1 | 11 +-
+ Documentation/hwmon/thmc50 | 2 +-
+ Documentation/hwmon/via686a | 2 +-
+ Documentation/hwmon/w83627hf | 6 +-
+ Documentation/hwmon/w83781d | 2 +-
+ Documentation/hwmon/w83792d | 2 +-
+ Documentation/i2c/busses/i2c-ali1535 | 2 +-
+ Documentation/i2c/busses/i2c-ali1563 | 2 +-
+ Documentation/i2c/busses/i2c-ali15x3 | 2 +-
+ Documentation/i2c/busses/i2c-piix4 | 2 +-
+ Documentation/i2c/busses/i2c-sis630 | 2 +-
+ Documentation/ia64/aliasing.txt | 2 -
+ Documentation/ia64/serial.txt | 2 +-
+ Documentation/infiniband/user_verbs.txt | 2 +-
+ Documentation/input/appletouch.txt | 2 +-
+ Documentation/input/bcm5974.txt | 2 +-
+ Documentation/input/iforce-protocol.txt | 2 +-
+ Documentation/input/multi-touch-protocol.txt | 218 +-
+ Documentation/input/sentelic.txt | 2 +-
+ Documentation/input/xpad.txt | 2 +-
+ Documentation/intel_txt.txt | 12 +-
+ Documentation/ioctl/ioctl-number.txt | 10 +-
+ Documentation/isdn/INTERFACE.CAPI | 8 +-
+ Documentation/isdn/README | 2 +-
+ Documentation/isdn/README.HiSax | 2 +-
+ Documentation/isdn/README.gigaset | 117 +-
+ Documentation/ja_JP/HOWTO | 2 +-
+ Documentation/ja_JP/SubmittingPatches | 6 +-
+ Documentation/kernel-docs.txt | 39 +-
+ Documentation/kernel-parameters.txt | 11 +-
+ Documentation/ko_KR/HOWTO | 8 +-
+ Documentation/kvm/api.txt | 208 +-
+ Documentation/kvm/mmu.txt | 52 +-
+ Documentation/kvm/msr.txt | 153 +
+ Documentation/kvm/review-checklist.txt | 38 +
+ Documentation/laptops/acer-wmi.txt | 2 +-
+ Documentation/laptops/thinkpad-acpi.txt | 71 +-
+ Documentation/ldm.txt | 2 +-
+ Documentation/md.txt | 2 +-
+ Documentation/misc-devices/c2port.txt | 4 +-
+ Documentation/mtd/nand_ecc.txt | 2 +-
+ Documentation/networking/3c509.txt | 2 +-
+ Documentation/networking/README.ipw2100 | 3 +-
+ Documentation/networking/README.ipw2200 | 4 +-
+ Documentation/networking/README.sb1000 | 4 +-
+ Documentation/networking/arcnet.txt | 4 +-
+ Documentation/networking/bonding.txt | 86 +-
+ Documentation/networking/caif/spi_porting.txt | 208 +
+ Documentation/networking/decnet.txt | 2 +-
+ Documentation/networking/fore200e.txt | 2 +-
+ Documentation/networking/ip-sysctl.txt | 2 +-
+ Documentation/networking/ipddp.txt | 5 -
+ Documentation/networking/iphase.txt | 2 +-
+ Documentation/networking/packet_mmap.txt | 30 +-
+ Documentation/networking/pktgen.txt | 5 +
+ Documentation/networking/ray_cs.txt | 4 +-
+ Documentation/networking/s2io.txt | 3 +-
+ Documentation/networking/tlan.txt | 4 +-
+ Documentation/networking/udplite.txt | 13 +-
+ Documentation/networking/wavelan.txt | 3 +-
+ Documentation/padata.txt | 97 +-
+ Documentation/power/apm-acpi.txt | 2 +-
+ Documentation/power/basic-pm-debugging.txt | 3 +-
+ Documentation/power/tricks.txt | 2 +-
+ Documentation/power/video.txt | 12 +-
+ Documentation/powerpc/booting-without-of.txt | 2 +-
+ Documentation/rt-mutex-design.txt | 2 +-
+ Documentation/s390/Debugging390.txt | 2 +-
+ Documentation/scsi/BusLogic.txt | 2 +-
+ Documentation/scsi/ChangeLog.lpfc | 2 +-
+ Documentation/scsi/ChangeLog.megaraid | 2 +-
+ Documentation/scsi/FlashPoint.txt | 4 +-
+ Documentation/scsi/Mylex.txt | 2 +-
+ Documentation/scsi/NinjaSCSI.txt | 2 -
+ Documentation/scsi/aic79xx.txt | 2 +-
+ Documentation/scsi/aic7xxx.txt | 2 +-
+ Documentation/scsi/hpsa.txt | 107 +
+ Documentation/scsi/ibmmca.txt | 2 +-
+ Documentation/scsi/osst.txt | 2 +-
+ Documentation/scsi/ppa.txt | 6 +-
+ Documentation/scsi/scsi-generic.txt | 8 +-
+ Documentation/scsi/scsi.txt | 4 +-
+ Documentation/scsi/scsi_mid_low_api.txt | 2 +-
+ Documentation/serial/moxa-smartio | 2 +-
+ Documentation/sound/alsa/ALSA-Configuration.txt | 2 +-
+ Documentation/sound/alsa/HD-Audio.txt | 2 +-
+ Documentation/sound/alsa/soc/DAI.txt | 2 +-
+ Documentation/sound/alsa/soc/codec.txt | 2 +-
+ Documentation/sound/alsa/soc/platform.txt | 2 +-
+ Documentation/sound/oss/README.OSS | 5 +-
+ Documentation/sparse.txt | 2 +-
+ Documentation/sysctl/vm.txt | 2 +-
+ Documentation/telephony/ixj.txt | 9 +-
+ Documentation/tomoyo.txt | 10 +-
+ Documentation/uml/UserModeLinux-HOWTO.txt | 73 +-
+ Documentation/usb/linux.inf | 2 +-
+ Documentation/usb/mtouchusb.txt | 6 +-
+ Documentation/usb/usb-serial.txt | 4 +-
+ Documentation/video4linux/API.html | 2 +-
+ Documentation/video4linux/CARDLIST.cx23885 | 6 +-
+ Documentation/video4linux/CARDLIST.em28xx | 1 +
+ Documentation/video4linux/CARDLIST.saa7134 | 3 +-
+ Documentation/video4linux/CQcam.txt | 4 +-
+ Documentation/video4linux/README.cpia | 2 +-
+ Documentation/video4linux/README.ivtv | 2 +-
+ Documentation/video4linux/Zoran | 6 +-
+ Documentation/video4linux/bttv/Cards | 6 +-
+ Documentation/video4linux/bttv/MAKEDEV | 2 +-
+ Documentation/video4linux/bttv/Specs | 4 +-
+ .../video4linux/cx88/hauppauge-wintv-cx88-ir.txt | 2 +-
+ Documentation/video4linux/gspca.txt | 8 +
+ .../video4linux/hauppauge-wintv-cx88-ir.txt | 2 +-
+ Documentation/video4linux/ibmcam.txt | 5 +-
+ Documentation/video4linux/se401.txt | 2 +-
+ Documentation/video4linux/w9966.txt | 2 +-
+ Documentation/w1/masters/ds2482 | 4 +-
+ Documentation/w1/masters/mxc-w1 | 3 +-
+ Documentation/w1/masters/omap-hdq | 2 +-
+ Documentation/zh_CN/HOWTO | 8 +-
+ Documentation/zh_CN/SubmittingDrivers | 2 +-
+ Documentation/zh_CN/SubmittingPatches | 6 +-
+ Documentation/zh_CN/sparse.txt | 2 +-
+ MAINTAINERS | 68 +-
+ arch/arm/mach-imx/dma-v1.c | 3 +-
+ arch/arm/mach-msm/acpuclock-arm11.c | 4 +-
+ arch/arm/mach-omap2/dpll3xxx.c | 2 +-
+ arch/arm/mach-omap2/sleep34xx.S | 2 +-
+ arch/arm/mach-sa1100/collie.c | 2 +-
+ arch/arm/mach-u300/core.c | 7 -
+ arch/arm/mach-u300/gpio.c | 2 +-
+ arch/arm/plat-s3c24xx/clock.c | 2 +-
+ arch/arm/plat-samsung/clock.c | 2 +-
+ arch/arm/plat-samsung/include/plat/keypad.h | 43 +
+ arch/arm/plat-spear/padmux.c | 2 +-
+ arch/cris/arch-v32/mm/intmem.c | 13 +-
+ arch/h8300/kernel/timer/itu.c | 2 +-
+ arch/h8300/kernel/timer/timer16.c | 2 +-
+ arch/h8300/kernel/timer/timer8.c | 2 +-
+ arch/ia64/include/asm/kvm_host.h | 1 +
+ arch/ia64/kvm/kvm-ia64.c | 56 +-
+ arch/ia64/sn/kernel/setup.c | 2 +-
+ arch/microblaze/Makefile | 2 +-
+ arch/microblaze/include/asm/system.h | 3 -
+ arch/parisc/kernel/firmware.c | 12 +-
+ arch/powerpc/include/asm/kvm_book3s.h | 10 +-
+ arch/powerpc/include/asm/kvm_fpu.h | 27 +-
+ arch/powerpc/include/asm/kvm_host.h | 18 +-
+ arch/powerpc/include/asm/system.h | 3 -
+ arch/powerpc/kernel/ppc_ksyms.c | 4 -
+ arch/powerpc/kernel/suspend.c | 2 +-
+ arch/powerpc/kvm/44x_tlb.c | 3 +-
+ arch/powerpc/kvm/Makefile | 2 +
+ arch/powerpc/kvm/book3s.c | 79 +-
+ arch/powerpc/kvm/book3s_32_mmu.c | 8 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 134 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 129 +-
+ arch/powerpc/kvm/book3s_mmu_hpte.c | 277 +
+ arch/powerpc/kvm/book3s_paired_singles.c | 94 +-
+ arch/powerpc/kvm/booke.c | 12 +-
+ arch/powerpc/kvm/fpu.S | 18 +
+ arch/powerpc/kvm/powerpc.c | 14 +-
+ arch/powerpc/platforms/ps3/htab.c | 2 +-
+ arch/s390/appldata/appldata_net_sum.c | 3 +-
+ arch/s390/crypto/Makefile | 2 +-
+ arch/s390/crypto/crypto_des.h | 2 +-
+ arch/s390/crypto/des_s390.c | 238 +-
+ arch/s390/include/asm/kvm_host.h | 5 +-
+ arch/s390/include/asm/qdio.h | 6 +
+ arch/s390/kvm/intercept.c | 2 +-
+ arch/s390/kvm/kvm-s390.c | 64 +-
+ arch/s390/kvm/kvm-s390.h | 2 +-
+ arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
+ arch/sh/kernel/clkdev.c | 2 +-
+ arch/sparc/boot/btfixupprep.c | 4 +-
+ arch/um/drivers/net_kern.c | 10 +-
+ arch/x86/include/asm/i387.h | 2 +
+ arch/x86/include/asm/intel_scu_ipc.h | 20 +-
+ arch/x86/include/asm/kvm.h | 22 +
+ arch/x86/include/asm/kvm_emulate.h | 30 +-
+ arch/x86/include/asm/kvm_host.h | 70 +-
+ arch/x86/include/asm/msr-index.h | 2 +
+ arch/x86/include/asm/system.h | 7 +
+ arch/x86/include/asm/vmx.h | 5 +
+ arch/x86/include/asm/xsave.h | 6 +
+ arch/x86/kernel/acpi/sleep.c | 2 +-
+ arch/x86/kernel/apic/apic.c | 2 +-
+ arch/x86/kernel/apm_32.c | 2 +-
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 7 +-
+ arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 11 +-
+ arch/x86/kernel/cpu/cpufreq/longhaul.c | 6 +-
+ arch/x86/kernel/cpu/cpufreq/longhaul.h | 26 +-
+ arch/x86/kernel/cpu/cpufreq/longrun.c | 6 +-
+ arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 7 +-
+ arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 8 +-
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 8 +-
+ arch/x86/kernel/cpu/mcheck/mce.c | 1 +
+ arch/x86/kernel/head32.c | 2 +-
+ arch/x86/kernel/i387.c | 3 +-
+ arch/x86/kernel/process.c | 9 +-
+ arch/x86/kvm/emulate.c | 749 +-
+ arch/x86/kvm/i8254.c | 146 +-
+ arch/x86/kvm/i8254.h | 4 +-
+ arch/x86/kvm/i8259.c | 48 +-
+ arch/x86/kvm/irq.c | 2 +-
+ arch/x86/kvm/irq.h | 4 -
+ arch/x86/kvm/kvm_cache_regs.h | 8 +
+ arch/x86/kvm/lapic.c | 17 +-
+ arch/x86/kvm/mmu.c | 807 +-
+ arch/x86/kvm/mmutrace.h | 2 +-
+ arch/x86/kvm/paging_tmpl.h | 252 +-
+ arch/x86/kvm/svm.c | 138 +-
+ arch/x86/kvm/timer.c | 16 +-
+ arch/x86/kvm/vmx.c | 253 +-
+ arch/x86/kvm/x86.c | 1174 +-
+ arch/x86/kvm/x86.h | 7 -
+ arch/x86/mm/init_64.c | 2 +-
+ arch/x86/power/cpu.c | 2 +-
+ arch/x86/power/hibernate_64.c | 2 +-
+ crypto/Kconfig | 15 +-
+ crypto/Makefile | 4 +-
+ crypto/algboss.c | 4 +
+ crypto/authenc.c | 2 +-
+ crypto/ctr.c | 2 +-
+ crypto/pcrypt.c | 241 +-
+ crypto/testmgr.c | 14 +
+ crypto/{twofish.c => twofish_generic.c} | 1 +
+ crypto/xts.c | 2 +-
+ drivers/acpi/Kconfig | 18 +
+ drivers/acpi/Makefile | 1 +
+ drivers/acpi/ec.c | 107 +-
+ drivers/acpi/ec_sys.c | 160 +
+ drivers/acpi/internal.h | 24 +
+ drivers/atm/Kconfig | 2 +-
+ drivers/atm/adummy.c | 39 +
+ drivers/atm/ambassador.c | 6 +-
+ drivers/atm/eni.c | 6 +-
+ drivers/atm/firestream.c | 6 +-
+ drivers/atm/he.c | 310 +-
+ drivers/atm/he.h | 65 +-
+ drivers/atm/idt77105.c | 11 +-
+ drivers/atm/idt77252.c | 5 +-
+ drivers/atm/nicstar.c | 5196 ++++----
+ drivers/atm/nicstar.h | 602 +-
+ drivers/atm/nicstarmac.c | 364 +-
+ drivers/atm/solos-pci.c | 6 +-
+ drivers/atm/suni.c | 5 +-
+ drivers/atm/zatm.c | 6 +-
+ drivers/base/core.c | 64 +
+ drivers/base/power/Makefile | 2 +-
+ drivers/base/power/main.c | 1 +
+ drivers/base/power/runtime.c | 54 +-
+ drivers/base/power/sysfs.c | 98 +-
+ drivers/base/power/wakeup.c | 247 +
+ drivers/block/cciss.c | 2 +-
+ drivers/block/drbd/drbd_receiver.c | 2 +-
+ drivers/block/nbd.c | 2 +-
+ drivers/bluetooth/Kconfig | 12 +
+ drivers/bluetooth/Makefile | 1 +
+ drivers/bluetooth/bcm203x.c | 3 +-
+ drivers/bluetooth/bpa10x.c | 2 +-
+ drivers/bluetooth/btmrvl_debugfs.c | 2 +-
+ drivers/bluetooth/btmrvl_drv.h | 5 +-
+ drivers/bluetooth/btmrvl_main.c | 5 +-
+ drivers/bluetooth/btmrvl_sdio.c | 111 +-
+ drivers/bluetooth/btusb.c | 13 +-
+ drivers/bluetooth/dtl1_cs.c | 2 +-
+ drivers/bluetooth/hci_ath.c | 235 +
+ drivers/bluetooth/hci_bcsp.c | 4 +-
+ drivers/bluetooth/hci_h4.c | 107 +-
+ drivers/bluetooth/hci_ldisc.c | 20 +-
+ drivers/bluetooth/hci_ll.c | 6 +-
+ drivers/bluetooth/hci_uart.h | 15 +-
+ drivers/char/hw_random/n2-drv.c | 2 +-
+ drivers/char/keyboard.c | 6 +-
+ drivers/char/random.c | 2 +-
+ drivers/char/synclink_gt.c | 2 +-
+ drivers/cpufreq/cpufreq.c | 18 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 33 +-
+ drivers/cpuidle/cpuidle.c | 2 +-
+ drivers/crypto/amcc/crypto4xx_reg_def.h | 2 +-
+ drivers/crypto/geode-aes.c | 2 +-
+ drivers/crypto/hifn_795x.c | 4 -
+ drivers/crypto/mv_cesa.c | 10 +-
+ drivers/crypto/n2_core.c | 417 +-
+ drivers/crypto/omap-sham.c | 1 -
+ drivers/crypto/talitos.c | 77 +-
+ drivers/dma/at_hdmac.c | 2 +-
+ drivers/dma/fsldma.c | 2 +-
+ drivers/edac/Kconfig | 8 -
+ drivers/edac/amd64_edac.c | 213 +-
+ drivers/edac/amd64_edac.h | 48 +-
+ drivers/edac/e752x_edac.c | 4 +-
+ drivers/edac/edac_core.h | 17 +-
+ drivers/edac/edac_mc_sysfs.c | 86 +-
+ drivers/edac/edac_mce_amd.c | 16 +-
+ drivers/edac/i5100_edac.c | 7 +-
+ drivers/firmware/Kconfig | 9 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/iscsi_boot_sysfs.c | 481 +
+ drivers/firmware/iscsi_ibft.c | 726 +-
+ drivers/firmware/iscsi_ibft_find.c | 56 +-
+ drivers/gpu/drm/drm_edid.c | 7 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 4 +-
+ drivers/gpu/drm/i915/intel_tv.c | 2 +-
+ drivers/gpu/drm/savage/savage_bci.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 2 +-
+ drivers/hid/Kconfig | 19 +-
+ drivers/hid/Makefile | 2 +
+ drivers/hid/hid-axff.c | 172 +
+ drivers/hid/hid-core.c | 9 +-
+ drivers/hid/hid-elecom.c | 57 +
+ drivers/hid/hid-ids.h | 92 +-
+ drivers/hid/hid-input.c | 24 +-
+ drivers/hid/hid-magicmouse.c | 96 +-
+ drivers/hid/hid-picolcd.c | 199 +-
+ drivers/hid/hid-roccat-kone.c | 25 +-
+ drivers/hid/hid-roccat-kone.h | 2 -
+ drivers/hid/hid-roccat.c | 9 +-
+ drivers/hid/hid-roccat.h | 2 +-
+ drivers/hid/hid-topseed.c | 5 +
+ drivers/hid/hid-wacom.c | 2 +-
+ drivers/hid/hidraw.c | 2 -
+ drivers/hid/usbhid/hid-quirks.c | 2 +
+ drivers/hid/usbhid/hiddev.c | 54 +-
+ drivers/ide/ide-gd.c | 2 +-
+ drivers/idle/intel_idle.c | 2 +-
+ drivers/infiniband/core/addr.c | 2 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 +-
+ drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 4 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 4 +-
+ drivers/infiniband/hw/ehca/hcp_if.h | 2 +-
+ drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +-
+ drivers/infiniband/hw/nes/nes_cm.c | 2 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 8 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 7 +-
+ drivers/input/evdev.c | 54 +-
+ drivers/input/input.c | 182 +-
+ drivers/input/joydev.c | 7 +-
+ drivers/input/joystick/xpad.c | 108 +-
+ drivers/input/keyboard/Kconfig | 21 +
+ drivers/input/keyboard/Makefile | 2 +
+ drivers/input/keyboard/adp5588-keys.c | 351 +-
+ drivers/input/keyboard/gpio_keys.c | 19 +-
+ drivers/input/keyboard/lm8323.c | 12 +-
+ drivers/input/keyboard/matrix_keypad.c | 108 +-
+ drivers/input/keyboard/mcs_touchkey.c | 239 +
+ drivers/input/keyboard/samsung-keypad.c | 491 +
+ drivers/input/misc/Kconfig | 48 +
+ drivers/input/misc/Makefile | 4 +
+ drivers/input/misc/ad714x.c | 2 +-
+ drivers/input/misc/adxl34x-i2c.c | 163 +
+ drivers/input/misc/adxl34x-spi.c | 145 +
+ drivers/input/misc/adxl34x.c | 915 ++
+ drivers/input/misc/adxl34x.h | 30 +
+ drivers/input/misc/atlas_btns.c | 38 +-
+ drivers/input/misc/pwm-beeper.c | 199 +
+ drivers/input/misc/twl4030-pwrbutton.c | 12 +-
+ drivers/input/misc/wistron_btns.c | 4 +-
+ drivers/input/mouse/bcm5974.c | 23 +-
+ drivers/input/mouse/synaptics.c | 8 +-
+ drivers/input/mousedev.c | 15 +-
+ drivers/input/serio/i8042-ppcio.h | 75 -
+ drivers/input/serio/i8042.c | 65 +-
+ drivers/input/tablet/wacom_wac.c | 44 +
+ drivers/input/tablet/wacom_wac.h | 1 +
+ drivers/input/touchscreen/Kconfig | 67 +-
+ drivers/input/touchscreen/Makefile | 6 +-
+ drivers/input/touchscreen/ad7879-i2c.c | 143 +
+ drivers/input/touchscreen/ad7879-spi.c | 198 +
+ drivers/input/touchscreen/ad7879.c | 625 +-
+ drivers/input/touchscreen/ad7879.h | 30 +
+ drivers/input/touchscreen/ads7846.c | 206 +-
+ drivers/input/touchscreen/cy8ctmg110_ts.c | 363 +
+ drivers/input/touchscreen/mcs5000_ts.c | 6 +-
+ drivers/input/touchscreen/qt602240_ts.c | 1401 ++
+ drivers/input/touchscreen/tps6507x-ts.c | 3 -
+ drivers/input/touchscreen/usbtouchscreen.c | 215 +-
+ drivers/isdn/capi/capi.c | 12 +-
+ drivers/isdn/capi/capidrv.c | 7 +-
+ drivers/isdn/divert/divert_procfs.c | 7 +-
+ drivers/isdn/gigaset/Kconfig | 4 +-
+ drivers/isdn/gigaset/bas-gigaset.c | 69 +-
+ drivers/isdn/gigaset/capi.c | 66 +-
+ drivers/isdn/gigaset/common.c | 2 -
+ drivers/isdn/gigaset/ev-layer.c | 226 +-
+ drivers/isdn/gigaset/gigaset.h | 16 +-
+ drivers/isdn/gigaset/i4l.c | 4 +-
+ drivers/isdn/gigaset/interface.c | 37 +-
+ drivers/isdn/gigaset/ser-gigaset.c | 27 +-
+ drivers/isdn/gigaset/usb-gigaset.c | 29 +-
+ drivers/isdn/hardware/eicon/divamnt.c | 7 +-
+ drivers/isdn/hardware/eicon/divasi.c | 2 -
+ drivers/isdn/hardware/eicon/divasmain.c | 71 +-
+ drivers/isdn/hardware/mISDN/avmfritz.c | 2 +-
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 13 +-
+ drivers/isdn/hardware/mISDN/hfcpci.c | 94 +-
+ drivers/isdn/hardware/mISDN/mISDNinfineon.c | 41 +-
+ drivers/isdn/hardware/mISDN/speedfax.c | 2 +-
+ drivers/isdn/hardware/mISDN/w6692.c | 2 +-
+ drivers/isdn/hisax/callc.c | 2 +-
+ drivers/isdn/hisax/config.c | 84 +-
+ drivers/isdn/hisax/q931.c | 13 +-
+ drivers/isdn/hisax/tei.c | 2 +-
+ drivers/isdn/hysdn/hysdn_procconf.c | 21 +-
+ drivers/isdn/hysdn/hysdn_proclog.c | 51 +-
+ drivers/isdn/i4l/isdn_common.c | 27 +-
+ drivers/isdn/i4l/isdn_net.c | 7 +-
+ drivers/isdn/i4l/isdn_ppp.c | 13 +-
+ drivers/isdn/i4l/isdn_tty.c | 6 -
+ drivers/isdn/mISDN/tei.c | 2 +-
+ drivers/isdn/mISDN/timerdev.c | 7 +-
+ drivers/isdn/pcbit/drv.c | 10 +-
+ drivers/isdn/sc/ioctl.c | 23 +-
+ drivers/media/IR/Kconfig | 35 +
+ drivers/media/IR/Makefile | 3 +
+ drivers/media/IR/imon.c | 11 +-
+ drivers/media/IR/ir-core-priv.h | 54 +
+ drivers/media/IR/ir-jvc-decoder.c | 152 +-
+ drivers/media/IR/ir-keytable.c | 5 +-
+ drivers/media/IR/ir-lirc-codec.c | 278 +
+ drivers/media/IR/ir-nec-decoder.c | 151 +-
+ drivers/media/IR/ir-raw-event.c | 167 +-
+ drivers/media/IR/ir-rc5-decoder.c | 167 +-
+ drivers/media/IR/ir-rc6-decoder.c | 153 +-
+ drivers/media/IR/ir-sony-decoder.c | 155 +-
+ drivers/media/IR/ir-sysfs.c | 251 +-
+ drivers/media/IR/keymaps/Makefile | 4 +
+ drivers/media/IR/keymaps/rc-dib0700-nec.c | 124 +
+ drivers/media/IR/keymaps/rc-dib0700-rc5.c | 235 +
+ drivers/media/IR/keymaps/rc-lirc.c | 41 +
+ drivers/media/IR/keymaps/rc-rc6-mce.c | 105 +
+ drivers/media/IR/lirc_dev.c | 764 ++
+ drivers/media/IR/mceusb.c | 1143 ++
+ drivers/media/common/saa7146_fops.c | 2 +-
+ drivers/media/common/saa7146_vbi.c | 4 +-
+ drivers/media/common/saa7146_video.c | 4 +-
+ drivers/media/common/tuners/tda18271-fe.c | 8 +-
+ drivers/media/common/tuners/tuner-simple.c | 3 -
+ drivers/media/common/tuners/xc5000.c | 59 +-
+ drivers/media/dvb/bt8xx/dst_ca.c | 2 +-
+ drivers/media/dvb/dvb-core/dmxdev.c | 2 +-
+ drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 10 +-
+ drivers/media/dvb/dvb-core/dvb_demux.c | 10 +-
+ drivers/media/dvb/dvb-core/dvb_frontend.c | 10 +-
+ drivers/media/dvb/dvb-usb/a800.c | 12 +-
+ drivers/media/dvb/dvb-usb/af9005-remote.c | 4 +-
+ drivers/media/dvb/dvb-usb/af9005.c | 71 +-
+ drivers/media/dvb/dvb-usb/af9005.h | 2 +-
+ drivers/media/dvb/dvb-usb/af9015.c | 42 +-
+ drivers/media/dvb/dvb-usb/af9015.h | 18 +-
+ drivers/media/dvb/dvb-usb/anysee.c | 28 +-
+ drivers/media/dvb/dvb-usb/az6027.c | 13 +-
+ drivers/media/dvb/dvb-usb/cinergyT2-core.c | 12 +-
+ drivers/media/dvb/dvb-usb/cxusb.c | 128 +-
+ drivers/media/dvb/dvb-usb/dib0700.h | 1 +
+ drivers/media/dvb/dvb-usb/dib0700_core.c | 266 +-
+ drivers/media/dvb/dvb-usb/dib0700_devices.c | 614 +-
+ drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +-
+ drivers/media/dvb/dvb-usb/dibusb-mb.c | 40 +-
+ drivers/media/dvb/dvb-usb/dibusb-mc.c | 10 +-
+ drivers/media/dvb/dvb-usb/dibusb.h | 2 +-
+ drivers/media/dvb/dvb-usb/digitv.c | 20 +-
+ drivers/media/dvb/dvb-usb/dtt200u.c | 42 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 +
+ drivers/media/dvb/dvb-usb/dvb-usb-init.c | 60 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 198 +-
+ drivers/media/dvb/dvb-usb/dvb-usb.h | 92 +-
+ drivers/media/dvb/dvb-usb/dw2102.c | 67 +-
+ drivers/media/dvb/dvb-usb/gp8psk-fe.c | 2 +-
+ drivers/media/dvb/dvb-usb/m920x.c | 44 +-
+ drivers/media/dvb/dvb-usb/nova-t-usb2.c | 14 +-
+ drivers/media/dvb/dvb-usb/opera1.c | 16 +-
+ drivers/media/dvb/dvb-usb/vp702x.c | 14 +-
+ drivers/media/dvb/dvb-usb/vp7045.c | 14 +-
+ drivers/media/dvb/frontends/Kconfig | 1 +
+ drivers/media/dvb/frontends/af9013.c | 52 +-
+ drivers/media/dvb/frontends/af9013.h | 2 +-
+ drivers/media/dvb/frontends/af9013_priv.h | 8 +-
+ drivers/media/dvb/frontends/dib3000mb.c | 9 +-
+ drivers/media/dvb/frontends/dib3000mb_priv.h | 4 -
+ drivers/media/dvb/frontends/dib3000mc.c | 2 +-
+ drivers/media/dvb/frontends/lgdt3305.c | 267 +-
+ drivers/media/dvb/frontends/lgdt3305.h | 10 +-
+ drivers/media/dvb/frontends/lgs8gxx.c | 50 +-
+ drivers/media/dvb/frontends/mb86a16.c | 1 -
+ drivers/media/dvb/frontends/tda10048.c | 43 +-
+ drivers/media/dvb/mantis/Kconfig | 14 +-
+ drivers/media/dvb/mantis/mantis_input.c | 5 +-
+ drivers/media/dvb/siano/sms-cards.c | 2 +
+ drivers/media/dvb/siano/sms-cards.h | 2 +-
+ drivers/media/dvb/siano/smscoreapi.c | 6 +-
+ drivers/media/dvb/siano/smsir.c | 261 +-
+ drivers/media/dvb/siano/smsir.h | 63 +-
+ drivers/media/dvb/siano/smsusb.c | 3 +-
+ drivers/media/radio/si470x/radio-si470x-common.c | 2 +-
+ drivers/media/radio/si4713-i2c.c | 12 +-
+ drivers/media/video/Kconfig | 183 +-
+ drivers/media/video/Makefile | 9 +-
+ drivers/media/video/ak881x.c | 6 +-
+ drivers/media/video/au0828/Makefile | 2 +-
+ drivers/media/video/au0828/au0828-vbi.c | 138 +
+ drivers/media/video/au0828/au0828-video.c | 443 +-
+ drivers/media/video/au0828/au0828.h | 20 +-
+ drivers/media/video/bt8xx/bttv-risc.c | 2 +-
+ drivers/media/video/cpia_usb.c | 3 -
+ drivers/media/video/cx18/cx18-ioctl.c | 2 +-
+ drivers/media/video/cx23885/cx23885-cards.c | 40 +
+ drivers/media/video/cx23885/cx23885-core.c | 11 +-
+ drivers/media/video/cx23885/cx23885-dvb.c | 2 +-
+ drivers/media/video/cx23885/cx23885-input.c | 317 +-
+ drivers/media/video/cx23885/cx23885-ir.c | 2 +-
+ drivers/media/video/cx23885/cx23885.h | 12 +-
+ drivers/media/video/cx88/cx88-alsa.c | 37 +-
+ drivers/media/video/cx88/cx88-cards.c | 9 +-
+ drivers/media/video/cx88/cx88-core.c | 2 +-
+ drivers/media/video/cx88/cx88-i2c.c | 6 +-
+ drivers/media/video/cx88/cx88-input.c | 46 +-
+ drivers/media/video/cx88/cx88.h | 1 +
+ drivers/media/video/dabusb.c | 13 +-
+ drivers/media/video/davinci/Kconfig | 93 +
+ drivers/media/video/em28xx/em28xx-cards.c | 28 +
+ drivers/media/video/em28xx/em28xx-dvb.c | 33 +
+ drivers/media/video/em28xx/em28xx-input.c | 80 +-
+ drivers/media/video/em28xx/em28xx-video.c | 4 +-
+ drivers/media/video/em28xx/em28xx.h | 2 +
+ drivers/media/video/fsl-viu.c | 1632 +++
+ drivers/media/video/gspca/Kconfig | 18 +
+ drivers/media/video/gspca/Makefile | 4 +
+ drivers/media/video/gspca/conex.c | 8 +-
+ drivers/media/video/gspca/cpia1.c | 19 +-
+ drivers/media/video/gspca/gl860/gl860-mi2020.c | 731 +-
+ drivers/media/video/gspca/gl860/gl860-ov9655.c | 4 +-
+ drivers/media/video/gspca/gl860/gl860.c | 42 +-
+ drivers/media/video/gspca/gl860/gl860.h | 13 +-
+ drivers/media/video/gspca/gspca.c | 340 +-
+ drivers/media/video/gspca/gspca.h | 22 +-
+ drivers/media/video/gspca/jeilinj.c | 6 +-
+ drivers/media/video/gspca/m5602/m5602_bridge.h | 1 +
+ drivers/media/video/gspca/m5602/m5602_core.c | 15 +-
+ drivers/media/video/gspca/m5602/m5602_s5k83a.c | 1 -
+ drivers/media/video/gspca/mars.c | 13 +-
+ drivers/media/video/gspca/ov519.c | 28 +-
+ drivers/media/video/gspca/ov534.c | 7 +-
+ drivers/media/video/gspca/pac7302.c | 31 +-
+ drivers/media/video/gspca/pac7311.c | 29 +-
+ drivers/media/video/gspca/sn9c20x.c | 18 +-
+ drivers/media/video/gspca/sonixb.c | 8 +-
+ drivers/media/video/gspca/sonixj.c | 38 +-
+ drivers/media/video/gspca/spca1528.c | 605 +
+ drivers/media/video/gspca/spca500.c | 13 +-
+ drivers/media/video/gspca/sq930x.c | 1402 ++
+ drivers/media/video/gspca/stk014.c | 17 +-
+ drivers/media/video/gspca/stv06xx/stv06xx.h | 1 +
+ drivers/media/video/gspca/sunplus.c | 17 +-
+ drivers/media/video/gspca/t613.c | 408 +-
+ drivers/media/video/gspca/tv8532.c | 227 +-
+ drivers/media/video/gspca/vc032x.c | 228 +-
+ drivers/media/video/gspca/w996Xcf.c | 16 +-
+ drivers/media/video/gspca/zc3xx.c | 92 +-
+ drivers/media/video/hdpvr/hdpvr-core.c | 5 +
+ drivers/media/video/hdpvr/hdpvr-video.c | 4 +-
+ drivers/media/video/ir-kbd-i2c.c | 14 +-
+ drivers/media/video/ivtv/ivtv-driver.c | 14 +
+ drivers/media/video/ivtv/ivtv-driver.h | 4 +
+ drivers/media/video/ivtv/ivtv-fileops.c | 30 +-
+ drivers/media/video/ivtv/ivtv-firmware.c | 122 +
+ drivers/media/video/ivtv/ivtv-firmware.h | 1 +
+ drivers/media/video/ivtv/ivtv-mailbox.c | 8 +
+ drivers/media/video/ivtv/ivtv-mailbox.h | 1 +
+ drivers/media/video/ivtv/ivtv-streams.c | 11 +-
+ drivers/media/video/ivtv/ivtv-version.h | 2 +-
+ drivers/media/video/ivtv/ivtvfb.c | 45 +-
+ drivers/media/video/mem2mem_testdev.c | 4 +-
+ drivers/media/video/mt9m111.c | 16 +-
+ drivers/media/video/mt9t112.c | 12 +-
+ drivers/media/video/omap/omap_vout.c | 8 -
+ drivers/media/video/omap24xxcam.c | 2 +-
+ drivers/media/video/ov511.c | 5995 ---------
+ drivers/media/video/ov511.h | 573 -
+ drivers/media/video/ov772x.c | 8 +-
+ drivers/media/video/ov9640.c | 14 +-
+ drivers/media/video/ovcamchip/Makefile | 4 -
+ drivers/media/video/ovcamchip/ov6x20.c | 414 -
+ drivers/media/video/ovcamchip/ov6x30.c | 373 -
+ drivers/media/video/ovcamchip/ov76be.c | 302 -
+ drivers/media/video/ovcamchip/ov7x10.c | 334 -
+ drivers/media/video/ovcamchip/ov7x20.c | 454 -
+ drivers/media/video/ovcamchip/ovcamchip_core.c | 395 -
+ drivers/media/video/ovcamchip/ovcamchip_priv.h | 101 -
+ drivers/media/video/pvrusb2/pvrusb2-ioread.c | 5 +-
+ drivers/media/video/pxa_camera.c | 10 +-
+ drivers/media/video/rj54n1cb0c.c | 10 +-
+ drivers/media/video/s2255drv.c | 724 +-
+ drivers/media/video/saa7134/saa7134-alsa.c | 14 +-
+ drivers/media/video/saa7134/saa7134-cards.c | 31 +
+ drivers/media/video/saa7134/saa7134-core.c | 2 +-
+ drivers/media/video/saa7134/saa7134-dvb.c | 23 +
+ drivers/media/video/saa7134/saa7134.h | 1 +
+ drivers/media/video/sh_mobile_ceu_camera.c | 149 +-
+ drivers/media/video/sh_mobile_csi2.c | 354 +
+ drivers/media/video/sh_vou.c | 65 +-
+ drivers/media/video/soc_camera.c | 3 +-
+ drivers/media/video/soc_camera_platform.c | 42 +-
+ drivers/media/video/soc_mediabus.c | 8 +-
+ drivers/media/video/stv680.c | 1565 ---
+ drivers/media/video/stv680.h | 227 -
+ drivers/media/video/tlg2300/pd-main.c | 3 +-
+ drivers/media/video/tw9910.c | 8 +-
+ drivers/media/video/usbvideo/Kconfig | 14 -
+ drivers/media/video/usbvideo/Makefile | 1 -
+ drivers/media/video/usbvideo/quickcam_messenger.c | 1126 --
+ drivers/media/video/usbvideo/quickcam_messenger.h | 112 -
+ drivers/media/video/usbvideo/vicam.c | 2 +-
+ drivers/media/video/uvc/uvc_ctrl.c | 105 +-
+ drivers/media/video/uvc/uvc_driver.c | 15 +-
+ drivers/media/video/uvc/uvc_v4l2.c | 103 +-
+ drivers/media/video/uvc/uvcvideo.h | 45 +-
+ drivers/media/video/v4l2-compat-ioctl32.c | 2 +-
+ drivers/media/video/v4l2-dev.c | 6 +-
+ drivers/media/video/videobuf-core.c | 84 +-
+ drivers/media/video/videobuf-dma-contig.c | 6 +-
+ drivers/media/video/videobuf-dma-sg.c | 76 +-
+ drivers/media/video/videobuf-vmalloc.c | 36 +-
+ drivers/media/video/w9968cf.c | 3620 -----
+ drivers/media/video/w9968cf.h | 333 -
+ drivers/media/video/w9968cf_decoder.h | 86 -
+ drivers/media/video/w9968cf_vpp.h | 40 -
+ drivers/media/video/zc0301/Kconfig | 15 -
+ drivers/media/video/zc0301/Makefile | 3 -
+ drivers/media/video/zc0301/zc0301.h | 196 -
+ drivers/media/video/zc0301/zc0301_core.c | 2098 ---
+ drivers/media/video/zc0301/zc0301_pas202bcb.c | 362 -
+ drivers/media/video/zc0301/zc0301_pb0330.c | 188 -
+ drivers/media/video/zc0301/zc0301_sensor.h | 107 -
+ drivers/media/video/zoran/videocodec.c | 5 +-
+ drivers/media/video/zoran/zoran.h | 2 +-
+ drivers/media/video/zoran/zoran_device.c | 2 +-
+ drivers/media/video/zoran/zr36050.c | 2 +-
+ drivers/media/video/zoran/zr36060.c | 2 +-
+ drivers/message/fusion/mptbase.c | 53 +-
+ drivers/message/fusion/mptbase.h | 13 +-
+ drivers/message/fusion/mptctl.c | 38 +-
+ drivers/message/fusion/mptfc.c | 9 +-
+ drivers/message/fusion/mptlan.c | 4 +-
+ drivers/message/fusion/mptsas.c | 278 +-
+ drivers/message/fusion/mptsas.h | 1 +
+ drivers/message/fusion/mptscsih.c | 54 +-
+ drivers/message/fusion/mptspi.c | 9 +-
+ drivers/misc/enclosure.c | 7 +-
+ drivers/mtd/nand/denali.c | 2 +-
+ drivers/net/3c527.c | 4 +-
+ drivers/net/3c527.h | 6 +-
+ drivers/net/3c59x.c | 392 +-
+ drivers/net/8139cp.c | 2 +-
+ drivers/net/8139too.c | 8 +-
+ drivers/net/82596.c | 64 +-
+ drivers/net/Kconfig | 43 +-
+ drivers/net/Makefile | 6 +-
+ drivers/net/Space.c | 6 -
+ drivers/net/ac3200.c | 2 +-
+ drivers/net/appletalk/ipddp.c | 2 +-
+ drivers/net/arcnet/capmode.c | 177 +-
+ drivers/net/arcnet/com20020-isa.c | 4 +-
+ drivers/net/arcnet/com90io.c | 2 +-
+ drivers/net/arm/ixp4xx_eth.c | 14 +-
+ drivers/net/arm/w90p910_ether.c | 3 +
+ drivers/net/at1700.c | 4 +-
+ drivers/net/atl1c/atl1c.h | 9 +-
+ drivers/net/atl1c/atl1c_hw.c | 107 +-
+ drivers/net/atl1c/atl1c_hw.h | 49 +-
+ drivers/net/atl1c/atl1c_main.c | 348 +-
+ drivers/net/atlx/atl1.h | 4 +-
+ drivers/net/au1000_eth.c | 2 +-
+ drivers/net/ax88796.c | 4 +-
+ drivers/net/b44.c | 146 +-
+ drivers/net/bcm63xx_enet.c | 2 +-
+ drivers/net/benet/be.h | 31 +-
+ drivers/net/benet/be_cmds.c | 91 +-
+ drivers/net/benet/be_cmds.h | 48 +-
+ drivers/net/benet/be_ethtool.c | 58 +-
+ drivers/net/benet/be_hw.h | 14 +-
+ drivers/net/benet/be_main.c | 376 +-
+ drivers/net/bfin_mac.c | 123 +-
+ drivers/net/bfin_mac.h | 5 +
+ drivers/net/bnx2.c | 264 +-
+ drivers/net/bnx2.h | 12 +-
+ drivers/net/bnx2x/Makefile | 7 +
+ drivers/net/{ => bnx2x}/bnx2x.h | 235 +-
+ drivers/net/bnx2x/bnx2x_cmn.c | 2252 ++++
+ drivers/net/bnx2x/bnx2x_cmn.h | 652 +
+ drivers/net/{ => bnx2x}/bnx2x_dump.h | 0
+ drivers/net/bnx2x/bnx2x_ethtool.c | 1971 +++
+ drivers/net/{ => bnx2x}/bnx2x_fw_defs.h | 0
+ drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h | 0
+ drivers/net/{ => bnx2x}/bnx2x_hsi.h | 0
+ drivers/net/{ => bnx2x}/bnx2x_init.h | 0
+ drivers/net/{ => bnx2x}/bnx2x_init_ops.h | 0
+ drivers/net/{ => bnx2x}/bnx2x_link.c | 8 +-
+ drivers/net/{ => bnx2x}/bnx2x_link.h | 0
+ drivers/net/bnx2x/bnx2x_main.c | 8040 +++++++++++
+ drivers/net/{ => bnx2x}/bnx2x_reg.h | 0
+ drivers/net/bnx2x/bnx2x_stats.c | 1411 ++
+ drivers/net/bnx2x/bnx2x_stats.h | 239 +
+ drivers/net/bnx2x_main.c |13928 --------------------
+ drivers/net/bonding/bond_alb.c | 37 +-
+ drivers/net/bonding/bond_ipv6.c | 2 +
+ drivers/net/bonding/bond_main.c | 222 +-
+ drivers/net/bonding/bond_sysfs.c | 316 +-
+ drivers/net/bonding/bonding.h | 14 +-
+ drivers/net/caif/Kconfig | 22 +-
+ drivers/net/caif/Makefile | 14 +-
+ drivers/net/caif/caif_serial.c | 12 +-
+ drivers/net/caif/caif_spi.c | 850 ++
+ drivers/net/caif/caif_spi_slave.c | 252 +
+ drivers/net/can/Kconfig | 9 +
+ drivers/net/can/Makefile | 1 +
+ drivers/net/can/flexcan.c | 1030 ++
+ drivers/net/can/mscan/mscan.h | 2 +-
+ drivers/net/can/usb/Kconfig | 6 +
+ drivers/net/can/usb/Makefile | 1 +
+ drivers/net/can/usb/ems_usb.c | 2 +-
+ drivers/net/can/usb/esd_usb2.c | 1132 ++
+ drivers/net/cassini.c | 25 +-
+ drivers/net/cassini.h | 4 -
+ drivers/net/chelsio/common.h | 1 -
+ drivers/net/chelsio/subr.c | 49 +-
+ drivers/net/cnic.c | 373 +-
+ drivers/net/cnic.h | 23 +-
+ drivers/net/cnic_if.h | 4 +-
+ drivers/net/cpmac.c | 13 +-
+ drivers/net/cris/eth_v10.c | 4 -
+ drivers/net/cs89x0.c | 162 +-
+ drivers/net/cs89x0.h | 4 -
+ drivers/net/cxgb3/cxgb3_main.c | 12 +-
+ drivers/net/cxgb3/sge.c | 14 +-
+ drivers/net/cxgb3/t3_hw.c | 16 +-
+ drivers/net/cxgb3/version.h | 4 +-
+ drivers/net/cxgb4/cxgb4.h | 11 +-
+ drivers/net/cxgb4/cxgb4_main.c | 755 +-
+ drivers/net/cxgb4/cxgb4_uld.h | 6 +
+ drivers/net/cxgb4/l2t.c | 7 +
+ drivers/net/cxgb4/sge.c | 67 +-
+ drivers/net/cxgb4/t4_hw.c | 109 +-
+ drivers/net/cxgb4/t4_hw.h | 45 +-
+ drivers/net/cxgb4/t4_msg.h | 16 +-
+ drivers/net/cxgb4/t4_regs.h | 7 +
+ drivers/net/cxgb4/t4fw_api.h | 63 +-
+ drivers/net/cxgb4vf/Makefile | 7 +
+ drivers/net/cxgb4vf/adapter.h | 540 +
+ drivers/net/cxgb4vf/cxgb4vf_main.c | 2888 ++++
+ drivers/net/cxgb4vf/sge.c | 2454 ++++
+ drivers/net/cxgb4vf/t4vf_common.h | 273 +
+ drivers/net/cxgb4vf/t4vf_defs.h | 121 +
+ drivers/net/cxgb4vf/t4vf_hw.c | 1333 ++
+ drivers/net/davinci_emac.c | 200 +-
+ drivers/net/depca.c | 29 +-
+ drivers/net/dm9000.c | 2 +-
+ drivers/net/dnet.c | 9 +-
+ drivers/net/e1000/e1000.h | 22 +-
+ drivers/net/e1000/e1000_ethtool.c | 27 +-
+ drivers/net/e1000/e1000_main.c | 86 +-
+ drivers/net/e1000e/82571.c | 2 +-
+ drivers/net/e1000e/defines.h | 4 +-
+ drivers/net/e1000e/e1000.h | 10 +-
+ drivers/net/e1000e/es2lan.c | 2 +-
+ drivers/net/e1000e/ethtool.c | 144 +-
+ drivers/net/e1000e/hw.h | 17 +-
+ drivers/net/e1000e/ich8lan.c | 456 +-
+ drivers/net/e1000e/lib.c | 2 +-
+ drivers/net/e1000e/netdev.c | 359 +-
+ drivers/net/e1000e/param.c | 2 +-
+ drivers/net/e1000e/phy.c | 5 +-
+ drivers/net/ehea/ehea_main.c | 2 +-
+ drivers/net/ehea/ehea_qmr.h | 2 +-
+ drivers/net/enic/cq_desc.h | 2 +-
+ drivers/net/enic/cq_enet_desc.h | 20 +-
+ drivers/net/enic/enic.h | 21 +-
+ drivers/net/enic/enic_main.c | 517 +-
+ drivers/net/enic/enic_res.c | 53 +-
+ drivers/net/enic/enic_res.h | 33 +-
+ drivers/net/enic/rq_enet_desc.h | 2 +-
+ drivers/net/enic/vnic_cq.c | 4 +-
+ drivers/net/enic/vnic_cq.h | 2 +-
+ drivers/net/enic/vnic_dev.c | 272 +-
+ drivers/net/enic/vnic_dev.h | 21 +-
+ drivers/net/enic/vnic_devcmd.h | 35 +-
+ drivers/net/enic/vnic_enet.h | 4 +-
+ drivers/net/enic/vnic_intr.c | 5 +-
+ drivers/net/enic/vnic_intr.h | 8 +-
+ drivers/net/enic/vnic_nic.h | 2 +-
+ drivers/net/enic/vnic_resource.h | 2 +-
+ drivers/net/enic/vnic_rq.c | 40 +-
+ drivers/net/enic/vnic_rq.h | 16 +-
+ drivers/net/enic/vnic_rss.h | 2 +-
+ drivers/net/enic/vnic_stats.h | 2 +-
+ drivers/net/enic/vnic_vic.c | 8 +-
+ drivers/net/enic/vnic_vic.h | 2 +-
+ drivers/net/enic/vnic_wq.c | 25 +-
+ drivers/net/enic/vnic_wq.h | 16 +-
+ drivers/net/enic/wq_enet_desc.h | 2 +-
+ drivers/net/epic100.c | 47 +-
+ drivers/net/eth16i.c | 4 +-
+ drivers/net/ethoc.c | 160 +-
+ drivers/net/fealnx.c | 68 +-
+ drivers/net/fec.c | 110 +-
+ drivers/net/fec_mpc52xx.c | 40 +-
+ drivers/net/fec_mpc52xx_phy.c | 24 +-
+ drivers/net/forcedeth.c | 62 +-
+ drivers/net/fs_enet/fs_enet-main.c | 3 +-
+ drivers/net/fsl_pq_mdio.h | 2 +-
+ drivers/net/gianfar.c | 154 +-
+ drivers/net/gianfar.h | 13 +
+ drivers/net/greth.c | 1 -
+ drivers/net/hamachi.c | 63 +-
+ drivers/net/hp100.c | 55 +-
+ drivers/net/ibm_newemac/core.c | 2 +-
+ drivers/net/igb/e1000_82575.c | 143 +-
+ drivers/net/igb/e1000_defines.h | 16 +
+ drivers/net/igb/igb_ethtool.c | 8 +-
+ drivers/net/igb/igb_main.c | 43 +-
+ drivers/net/igbvf/netdev.c | 11 +-
+ drivers/net/ioc3-eth.c | 49 +-
+ drivers/net/irda/donauboe.h | 2 +-
+ drivers/net/irda/irda-usb.h | 2 +-
+ drivers/net/irda/ks959-sir.c | 2 +-
+ drivers/net/irda/ksdazzle-sir.c | 2 +-
+ drivers/net/irda/sh_irda.c | 2 +-
+ drivers/net/irda/sh_sir.c | 2 +-
+ drivers/net/irda/smsc-ircc2.c | 5 +-
+ drivers/net/irda/vlsi_ir.h | 6 +-
+ drivers/net/ixgbe/ixgbe.h | 9 +-
+ drivers/net/ixgbe/ixgbe_82599.c | 18 +-
+ drivers/net/ixgbe/ixgbe_common.h | 25 +-
+ drivers/net/ixgbe/ixgbe_dcb_82599.c | 2 +-
+ drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +-
+ drivers/net/ixgbe/ixgbe_ethtool.c | 107 +-
+ drivers/net/ixgbe/ixgbe_fcoe.c | 56 +-
+ drivers/net/ixgbe/ixgbe_main.c | 425 +-
+ drivers/net/ixgbe/ixgbe_phy.c | 33 +-
+ drivers/net/ixgbe/ixgbe_phy.h | 1 +
+ drivers/net/ixgbe/ixgbe_sriov.c | 30 +-
+ drivers/net/ixgbe/ixgbe_type.h | 2 +
+ drivers/net/ixgbevf/ixgbevf_main.c | 18 +-
+ drivers/net/jazzsonic.c | 17 +-
+ drivers/net/ks8842.c | 706 +-
+ drivers/net/ksz884x.c | 61 +-
+ drivers/net/lance.c | 56 +-
+ drivers/net/ll_temac_main.c | 65 +-
+ drivers/net/loopback.c | 33 +-
+ drivers/net/mac8390.c | 57 +-
+ drivers/net/mac89x0.c | 52 +-
+ drivers/net/macb.c | 2 +-
+ drivers/net/macsonic.c | 37 +-
+ drivers/net/macvlan.c | 95 +-
+ drivers/net/macvtap.c | 2 +-
+ drivers/net/mlx4/catas.c | 4 +-
+ drivers/net/mlx4/en_ethtool.c | 38 +-
+ drivers/net/mlx4/en_main.c | 29 +-
+ drivers/net/mlx4/en_netdev.c | 1 +
+ drivers/net/mlx4/eq.c | 20 +-
+ drivers/net/mlx4/main.c | 16 +-
+ drivers/net/mlx4/mlx4.h | 15 +-
+ drivers/net/mlx4/mlx4_en.h | 62 +-
+ drivers/net/mlx4/mr.c | 2 +-
+ drivers/net/mv643xx_eth.c | 12 +-
+ drivers/net/myri10ge/myri10ge.c | 10 +-
+ drivers/net/natsemi.c | 56 +-
+ drivers/net/netxen/netxen_nic_ctx.c | 16 +-
+ drivers/net/netxen/netxen_nic_ethtool.c | 13 +-
+ drivers/net/ni52.c | 37 +-
+ drivers/net/niu.c | 13 +-
+ drivers/net/ns83820.c | 44 +-
+ drivers/net/octeon/octeon_mgmt.c | 8 +-
+ drivers/net/phy/broadcom.c | 46 +-
+ drivers/net/phy/icplus.c | 2 +
+ drivers/net/phy/marvell.c | 77 +-
+ drivers/net/phy/mdio-octeon.c | 6 +-
+ drivers/net/phy/micrel.c | 167 +-
+ drivers/net/phy/phy.c | 8 +-
+ drivers/net/phy/phy_device.c | 2 +
+ drivers/net/ppp_generic.c | 37 +-
+ drivers/net/pppoe.c | 3 +-
+ drivers/net/ps3_gelic_wireless.h | 10 +-
+ drivers/net/qla3xxx.c | 1435 +--
+ drivers/net/qlcnic/qlcnic.h | 225 +-
+ drivers/net/qlcnic/qlcnic_ctx.c | 526 +-
+ drivers/net/qlcnic/qlcnic_ethtool.c | 42 +-
+ drivers/net/qlcnic/qlcnic_hdr.h | 78 +-
+ drivers/net/qlcnic/qlcnic_hw.c | 62 +-
+ drivers/net/qlcnic/qlcnic_init.c | 136 +-
+ drivers/net/qlcnic/qlcnic_main.c | 1139 ++-
+ drivers/net/qlge/qlge.h | 30 +-
+ drivers/net/qlge/qlge_dbg.c | 814 +-
+ drivers/net/qlge/qlge_main.c | 47 +-
+ drivers/net/qlge/qlge_mpi.c | 17 -
+ drivers/net/r6040.c | 302 +-
+ drivers/net/r8169.c | 2 +-
+ drivers/net/s2io-regs.h | 2 +-
+ drivers/net/s2io.c | 83 +-
+ drivers/net/s2io.h | 2 +-
+ drivers/net/sb1250-mac.c | 2 +-
+ drivers/net/sfc/efx.c | 304 +-
+ drivers/net/sfc/efx.h | 9 +-
+ drivers/net/sfc/ethtool.c | 167 +-
+ drivers/net/sfc/falcon.c | 200 +-
+ drivers/net/sfc/falcon_boards.c | 35 +-
+ drivers/net/sfc/falcon_xmac.c | 5 +-
+ drivers/net/sfc/io.h | 37 +-
+ drivers/net/sfc/mcdi.c | 98 +-
+ drivers/net/sfc/mcdi_mac.c | 8 +-
+ drivers/net/sfc/mcdi_phy.c | 41 +-
+ drivers/net/sfc/mdio_10g.c | 39 +-
+ drivers/net/sfc/mdio_10g.h | 3 +-
+ drivers/net/sfc/mtd.c | 23 +-
+ drivers/net/sfc/net_driver.h | 88 +-
+ drivers/net/sfc/nic.c | 553 +-
+ drivers/net/sfc/nic.h | 9 +-
+ drivers/net/sfc/qt202x_phy.c | 42 +-
+ drivers/net/sfc/rx.c | 469 +-
+ drivers/net/sfc/selftest.c | 154 +-
+ drivers/net/sfc/siena.c | 68 +-
+ drivers/net/sfc/tenxpress.c | 12 +-
+ drivers/net/sfc/tx.c | 41 +-
+ drivers/net/sfc/workarounds.h | 2 +-
+ drivers/net/sh_eth.c | 57 +-
+ drivers/net/sky2.c | 40 +-
+ drivers/net/sky2.h | 6 +-
+ drivers/net/smsc911x.c | 94 +-
+ drivers/net/smsc9420.c | 2 +-
+ drivers/net/starfire.c | 47 +-
+ drivers/net/stmmac/common.h | 1 +
+ drivers/net/stmmac/dwmac1000.h | 2 +-
+ drivers/net/stmmac/dwmac1000_core.c | 2 +
+ drivers/net/stmmac/dwmac100_core.c | 2 +
+ drivers/net/stmmac/enh_desc.c | 2 +-
+ drivers/net/stmmac/stmmac_main.c | 37 +-
+ drivers/net/sun3_82586.c | 35 +-
+ drivers/net/tc35815.c | 2 +-
+ drivers/net/tehuti.h | 2 +-
+ drivers/net/tg3.c | 799 +-
+ drivers/net/tg3.h | 98 +-
+ drivers/net/tulip/de2104x.c | 4 +-
+ drivers/net/tulip/dmfe.c | 20 +-
+ drivers/net/tulip/eeprom.c | 10 +-
+ drivers/net/tulip/tulip.h | 64 +-
+ drivers/net/tulip/tulip_core.c | 132 +-
+ drivers/net/tulip/winbond-840.c | 4 +-
+ drivers/net/tun.c | 10 +-
+ drivers/net/typhoon.c | 2 +-
+ drivers/net/typhoon.h | 26 +-
+ drivers/net/ucc_geth.c | 16 +-
+ drivers/net/ucc_geth.h | 46 +-
+ drivers/net/usb/asix.c | 2 +-
+ drivers/net/usb/cdc-phonet.c | 8 +-
+ drivers/net/usb/hso.c | 8 +-
+ drivers/net/usb/ipheth.c | 13 +-
+ drivers/net/usb/kaweth.c | 2 +-
+ drivers/net/usb/net1080.c | 4 +-
+ drivers/net/usb/pegasus.c | 125 +-
+ drivers/net/usb/pegasus.h | 296 +-
+ drivers/net/usb/sierra_net.c | 2 +-
+ drivers/net/usb/usbnet.c | 17 +-
+ drivers/net/via-velocity.h | 12 +-
+ drivers/net/vmxnet3/vmxnet3_defs.h | 6 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 46 +-
+ drivers/net/vmxnet3/vmxnet3_ethtool.c | 18 +-
+ drivers/net/vmxnet3/vmxnet3_int.h | 4 +-
+ drivers/net/vxge/Makefile | 2 +-
+ drivers/net/vxge/vxge-config.c | 4 +-
+ drivers/net/vxge/vxge-config.h | 4 +-
+ drivers/net/vxge/vxge-ethtool.c | 4 +-
+ drivers/net/vxge/vxge-ethtool.h | 4 +-
+ drivers/net/vxge/vxge-main.c | 599 +-
+ drivers/net/vxge/vxge-main.h | 27 +-
+ drivers/net/vxge/vxge-reg.h | 4 +-
+ drivers/net/vxge/vxge-traffic.c | 8 +-
+ drivers/net/vxge/vxge-traffic.h | 4 +-
+ drivers/net/vxge/vxge-version.h | 9 +-
+ drivers/net/wan/cosa.c | 10 +-
+ drivers/net/wan/farsync.c | 125 +-
+ drivers/net/wan/hd64570.h | 2 +-
+ drivers/net/wan/hdlc_cisco.c | 4 +-
+ drivers/net/wan/hdlc_fr.c | 2 +-
+ drivers/net/wan/sdla.c | 13 +-
+ drivers/net/wd.c | 4 +-
+ drivers/net/wimax/i2400m/control.c | 4 +-
+ drivers/net/wimax/i2400m/fw.c | 8 +-
+ drivers/net/wimax/i2400m/op-rfkill.c | 2 +-
+ drivers/net/wireless/adm8211.c | 58 +-
+ drivers/net/wireless/adm8211.h | 6 +-
+ drivers/net/wireless/airo.c | 56 +-
+ drivers/net/wireless/at76c50x-usb.c | 270 +-
+ drivers/net/wireless/at76c50x-usb.h | 41 +-
+ drivers/net/wireless/ath/ar9170/cmd.c | 7 +-
+ drivers/net/wireless/ath/ar9170/led.c | 4 +-
+ drivers/net/wireless/ath/ar9170/main.c | 191 +-
+ drivers/net/wireless/ath/ar9170/phy.c | 8 +-
+ drivers/net/wireless/ath/ath5k/Makefile | 1 +
+ drivers/net/wireless/ath/ath5k/ani.c | 20 +-
+ drivers/net/wireless/ath/ath5k/ath5k.h | 19 +-
+ drivers/net/wireless/ath/ath5k/attach.c | 2 -
+ drivers/net/wireless/ath/ath5k/base.c | 438 +-
+ drivers/net/wireless/ath/ath5k/base.h | 4 +-
+ drivers/net/wireless/ath/ath5k/caps.c | 7 -
+ drivers/net/wireless/ath/ath5k/debug.c | 99 +-
+ drivers/net/wireless/ath/ath5k/debug.h | 9 +-
+ drivers/net/wireless/ath/ath5k/desc.c | 152 +-
+ drivers/net/wireless/ath/ath5k/desc.h | 310 +-
+ drivers/net/wireless/ath/ath5k/dma.c | 13 -
+ drivers/net/wireless/ath/ath5k/eeprom.c | 3 +-
+ drivers/net/wireless/ath/ath5k/gpio.c | 7 -
+ drivers/net/wireless/ath/ath5k/pcu.c | 24 -
+ drivers/net/wireless/ath/ath5k/phy.c | 82 +-
+ drivers/net/wireless/ath/ath5k/qcu.c | 9 -
+ drivers/net/wireless/ath/ath5k/reset.c | 64 +-
+ drivers/net/wireless/ath/ath5k/sysfs.c | 116 +
+ drivers/net/wireless/ath/ath9k/Makefile | 3 +-
+ drivers/net/wireless/ath/ath9k/ahb.c | 7 +-
+ drivers/net/wireless/ath/ath9k/ani.c | 743 +-
+ drivers/net/wireless/ath/ath9k/ani.h | 78 +-
+ drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 1319 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 492 +-
+ drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 2479 ++--
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 196 +-
+ drivers/net/wireless/ath/ath9k/ar9002_initvals.h | 8251 +++++-------
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 1 +
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 71 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.h | 33 +
+ .../{ar9003_initvals.h => ar9003_2p0_initvals.h} | 254 +-
+ .../{ar9003_initvals.h => ar9003_2p2_initvals.h} | 433 +-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 10 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 15 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 4 +-
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 185 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 44 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mac.h | 8 +-
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 714 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 699 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 298 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 92 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 3 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 138 +-
+ drivers/net/wireless/ath/ath9k/calib.h | 7 +-
+ drivers/net/wireless/ath/ath9k/common.c | 318 +-
+ drivers/net/wireless/ath/ath9k/common.h | 77 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 68 +-
+ drivers/net/wireless/ath/ath9k/debug.h | 2 +
+ drivers/net/wireless/ath/ath9k/eeprom.c | 29 +
+ drivers/net/wireless/ath/ath9k/eeprom.h | 7 +-
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 12 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 616 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 14 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 9 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 71 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.h | 2 +
+ drivers/net/wireless/ath/ath9k/htc.h | 38 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 23 +
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 163 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 512 +-
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 86 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 3 +-
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 22 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 314 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 123 +-
+ drivers/net/wireless/ath/ath9k/init.c | 61 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 14 +-
+ drivers/net/wireless/ath/ath9k/mac.h | 16 +-
+ drivers/net/wireless/ath/ath9k/main.c | 475 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 8 +-
+ drivers/net/wireless/ath/ath9k/rc.c | 633 +-
+ drivers/net/wireless/ath/ath9k/rc.h | 89 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 292 +-
+ drivers/net/wireless/ath/ath9k/reg.h | 90 +-
+ drivers/net/wireless/ath/ath9k/virtual.c | 8 +-
+ drivers/net/wireless/ath/ath9k/wmi.c | 3 -
+ drivers/net/wireless/ath/ath9k/xmit.c | 251 +-
+ drivers/net/wireless/b43/b43.h | 6 +-
+ drivers/net/wireless/b43/dma.c | 69 +-
+ drivers/net/wireless/b43/dma.h | 8 +-
+ drivers/net/wireless/b43/main.c | 4 +-
+ drivers/net/wireless/b43/phy_g.c | 2 +-
+ drivers/net/wireless/b43/phy_lp.c | 8 +-
+ drivers/net/wireless/b43/phy_n.c | 16 +-
+ drivers/net/wireless/b43/sdio.c | 1 +
+ drivers/net/wireless/b43/wa.c | 8 +-
+ drivers/net/wireless/b43/xmit.h | 20 +-
+ drivers/net/wireless/b43legacy/b43legacy.h | 6 +-
+ drivers/net/wireless/b43legacy/dma.c | 49 +-
+ drivers/net/wireless/b43legacy/dma.h | 8 +-
+ drivers/net/wireless/b43legacy/xmit.h | 10 +-
+ drivers/net/wireless/hostap/hostap_80211.h | 18 +-
+ drivers/net/wireless/hostap/hostap_ap.c | 5 +-
+ drivers/net/wireless/hostap/hostap_common.h | 10 +-
+ drivers/net/wireless/hostap/hostap_hw.c | 2 +-
+ drivers/net/wireless/hostap/hostap_main.c | 4 +-
+ drivers/net/wireless/hostap/hostap_wlan.h | 32 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 34 +-
+ drivers/net/wireless/ipw2x00/ipw2100.h | 16 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 7 +-
+ drivers/net/wireless/ipw2x00/ipw2200.h | 122 +-
+ drivers/net/wireless/ipw2x00/libipw.h | 63 +-
+ drivers/net/wireless/ipw2x00/libipw_module.c | 4 +-
+ drivers/net/wireless/ipw2x00/libipw_tx.c | 16 +-
+ drivers/net/wireless/ipw2x00/libipw_wx.c | 6 +-
+ drivers/net/wireless/iwlwifi/Kconfig | 15 +-
+ drivers/net/wireless/iwlwifi/Makefile | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 12 +-
+ drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 28 +-
+ drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-3945.c | 208 +-
+ drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-4965.c | 98 +-
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 80 +-
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 538 +-
+ .../iwlwifi/{iwl-calib.c => iwl-agn-calib.c} | 223 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 239 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 7 +
+ drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 32 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 320 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 20 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 351 +
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 89 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 123 +
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 594 +-
+ drivers/net/wireless/iwlwifi/iwl-agn.h | 48 +
+ drivers/net/wireless/iwlwifi/iwl-calib.h | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-commands.h | 422 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 395 +-
+ drivers/net/wireless/iwlwifi/iwl-core.h | 44 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-debugfs.c | 144 +-
+ drivers/net/wireless/iwlwifi/iwl-dev.h | 123 +-
+ drivers/net/wireless/iwlwifi/iwl-eeprom.c | 3 +
+ drivers/net/wireless/iwlwifi/iwl-eeprom.h | 17 +-
+ drivers/net/wireless/iwlwifi/iwl-fh.h | 13 +-
+ drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-helpers.h | 27 +
+ drivers/net/wireless/iwlwifi/iwl-rx.c | 246 +-
+ drivers/net/wireless/iwlwifi/iwl-scan.c | 67 +-
+ drivers/net/wireless/iwlwifi/iwl-spectrum.h | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-sta.c | 164 +-
+ drivers/net/wireless/iwlwifi/iwl-sta.h | 32 +-
+ drivers/net/wireless/iwlwifi/iwl-tx.c | 33 +-
+ drivers/net/wireless/iwlwifi/iwl3945-base.c | 160 +-
+ drivers/net/wireless/iwmc3200wifi/cfg80211.c | 12 +-
+ drivers/net/wireless/iwmc3200wifi/commands.h | 50 +-
+ drivers/net/wireless/iwmc3200wifi/hal.c | 2 +-
+ drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +-
+ drivers/net/wireless/iwmc3200wifi/lmac.h | 32 +-
+ drivers/net/wireless/iwmc3200wifi/rx.c | 4 +-
+ drivers/net/wireless/iwmc3200wifi/umac.h | 60 +-
+ drivers/net/wireless/libertas/Makefile | 3 -
+ drivers/net/wireless/libertas/README | 12 +
+ drivers/net/wireless/libertas/assoc.c | 2264 ----
+ drivers/net/wireless/libertas/assoc.h | 155 -
+ drivers/net/wireless/libertas/cfg.c | 1861 +++-
+ drivers/net/wireless/libertas/cfg.h | 15 +-
+ drivers/net/wireless/libertas/cmd.c | 767 +-
+ drivers/net/wireless/libertas/cmd.h | 27 +-
+ drivers/net/wireless/libertas/cmdresp.c | 190 +-
+ drivers/net/wireless/libertas/debugfs.c | 191 +-
+ drivers/net/wireless/libertas/decl.h | 7 +-
+ drivers/net/wireless/libertas/defs.h | 18 -
+ drivers/net/wireless/libertas/dev.h | 68 +-
+ drivers/net/wireless/libertas/ethtool.c | 29 +-
+ drivers/net/wireless/libertas/host.h | 250 +-
+ drivers/net/wireless/libertas/if_sdio.c | 58 +
+ drivers/net/wireless/libertas/if_usb.c | 16 +-
+ drivers/net/wireless/libertas/main.c | 326 +-
+ drivers/net/wireless/libertas/mesh.c | 222 +-
+ drivers/net/wireless/libertas/mesh.h | 19 +-
+ drivers/net/wireless/libertas/radiotap.h | 4 +-
+ drivers/net/wireless/libertas/rx.c | 129 +-
+ drivers/net/wireless/libertas/scan.c | 1354 --
+ drivers/net/wireless/libertas/scan.h | 63 -
+ drivers/net/wireless/libertas/tx.c | 12 +-
+ drivers/net/wireless/libertas/types.h | 66 +-
+ drivers/net/wireless/libertas/wext.c | 2353 ----
+ drivers/net/wireless/libertas/wext.h | 17 -
+ drivers/net/wireless/libertas_tf/if_usb.c | 5 +-
+ drivers/net/wireless/libertas_tf/libertas_tf.h | 7 +-
+ drivers/net/wireless/libertas_tf/main.c | 18 +
+ drivers/net/wireless/mac80211_hwsim.c | 106 +-
+ drivers/net/wireless/mwl8k.c | 254 +-
+ drivers/net/wireless/orinoco/cfg.c | 5 +-
+ drivers/net/wireless/orinoco/fw.c | 2 +-
+ drivers/net/wireless/orinoco/hermes.h | 18 +-
+ drivers/net/wireless/orinoco/hermes_dld.c | 10 +-
+ drivers/net/wireless/orinoco/hw.c | 6 +-
+ drivers/net/wireless/orinoco/main.c | 10 +-
+ drivers/net/wireless/orinoco/orinoco.h | 2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 18 +-
+ drivers/net/wireless/orinoco/wext.c | 6 +-
+ drivers/net/wireless/p54/eeprom.c | 80 +-
+ drivers/net/wireless/p54/fwio.c | 53 +-
+ drivers/net/wireless/p54/led.c | 8 +-
+ drivers/net/wireless/p54/main.c | 17 +
+ drivers/net/wireless/p54/net2280.h | 16 +-
+ drivers/net/wireless/p54/p54pci.c | 3 +-
+ drivers/net/wireless/p54/p54pci.h | 6 +-
+ drivers/net/wireless/p54/p54spi.c | 5 +-
+ drivers/net/wireless/p54/p54spi.h | 2 +-
+ drivers/net/wireless/p54/p54usb.c | 6 +-
+ drivers/net/wireless/p54/p54usb.h | 6 +-
+ drivers/net/wireless/p54/txrx.c | 36 +-
+ drivers/net/wireless/prism54/isl_ioctl.c | 15 +-
+ drivers/net/wireless/prism54/isl_oid.h | 18 +-
+ drivers/net/wireless/prism54/islpci_eth.h | 4 +-
+ drivers/net/wireless/prism54/islpci_mgt.h | 2 +-
+ drivers/net/wireless/ray_cs.c | 23 +-
+ drivers/net/wireless/rndis_wlan.c | 90 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 85 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 87 +-
+ drivers/net/wireless/rt2x00/rt2500usb.c | 63 +-
+ drivers/net/wireless/rt2x00/rt2800.h | 93 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 734 +-
+ drivers/net/wireless/rt2x00/rt2800lib.h | 54 +-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 366 +-
+ drivers/net/wireless/rt2x00/rt2800pci.h | 19 -
+ drivers/net/wireless/rt2x00/rt2800usb.c | 293 +-
+ drivers/net/wireless/rt2x00/rt2800usb.h | 37 -
+ drivers/net/wireless/rt2x00/rt2x00.h | 69 +-
+ drivers/net/wireless/rt2x00/rt2x00config.c | 16 +-
+ drivers/net/wireless/rt2x00/rt2x00debug.c | 1 +
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 139 +-
+ drivers/net/wireless/rt2x00/rt2x00dump.h | 9 +-
+ drivers/net/wireless/rt2x00/rt2x00ht.c | 47 +-
+ drivers/net/wireless/rt2x00/rt2x00lib.h | 52 +-
+ drivers/net/wireless/rt2x00/rt2x00link.c | 73 +-
+ drivers/net/wireless/rt2x00/rt2x00mac.c | 75 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 39 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.h | 10 -
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 90 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 20 +-
+ drivers/net/wireless/rt2x00/rt2x00reg.h | 5 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 118 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.h | 39 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 130 +-
+ drivers/net/wireless/rt2x00/rt61pci.h | 4 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 59 +-
+ drivers/net/wireless/rt2x00/rt73usb.h | 4 +-
+ drivers/net/wireless/rtl818x/rtl8180.h | 4 +-
+ drivers/net/wireless/rtl818x/rtl8180_dev.c | 34 +-
+ drivers/net/wireless/rtl818x/rtl8180_grf5101.c | 12 +-
+ drivers/net/wireless/rtl818x/rtl8180_max2820.c | 19 +-
+ drivers/net/wireless/rtl818x/rtl8180_rtl8225.c | 5 +-
+ drivers/net/wireless/rtl818x/rtl8180_sa2400.c | 28 +-
+ drivers/net/wireless/rtl818x/rtl8187.h | 8 +-
+ drivers/net/wireless/rtl818x/rtl8187_dev.c | 11 +-
+ drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 8 +-
+ drivers/net/wireless/rtl818x/rtl818x.h | 3 +-
+ drivers/net/wireless/wl12xx/Kconfig | 4 +-
+ drivers/net/wireless/wl12xx/Makefile | 2 +-
+ drivers/net/wireless/wl12xx/wl1251.h | 3 +
+ drivers/net/wireless/wl12xx/wl1251_acx.h | 102 +-
+ drivers/net/wireless/wl12xx/wl1251_boot.c | 8 +-
+ drivers/net/wireless/wl12xx/wl1251_cmd.h | 34 +-
+ drivers/net/wireless/wl12xx/wl1251_event.h | 4 +-
+ drivers/net/wireless/wl12xx/wl1251_main.c | 27 +-
+ drivers/net/wireless/wl12xx/wl1251_rx.c | 6 +
+ drivers/net/wireless/wl12xx/wl1251_rx.h | 2 +-
+ drivers/net/wireless/wl12xx/wl1251_sdio.c | 40 +-
+ drivers/net/wireless/wl12xx/wl1251_spi.c | 1 +
+ drivers/net/wireless/wl12xx/wl1251_tx.c | 10 +-
+ drivers/net/wireless/wl12xx/wl1251_tx.h | 14 +-
+ drivers/net/wireless/wl12xx/wl1271.h | 58 +-
+ drivers/net/wireless/wl12xx/wl1271_acx.c | 41 +-
+ drivers/net/wireless/wl12xx/wl1271_acx.h | 117 +-
+ drivers/net/wireless/wl12xx/wl1271_boot.c | 4 +-
+ drivers/net/wireless/wl12xx/wl1271_cmd.c | 275 +-
+ drivers/net/wireless/wl12xx/wl1271_cmd.h | 124 +-
+ drivers/net/wireless/wl12xx/wl1271_conf.h | 16 +-
+ drivers/net/wireless/wl12xx/wl1271_event.c | 99 +-
+ drivers/net/wireless/wl12xx/wl1271_event.h | 5 +-
+ drivers/net/wireless/wl12xx/wl1271_ini.h | 123 +
+ drivers/net/wireless/wl12xx/wl1271_main.c | 289 +-
+ drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +-
+ drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +-
+ drivers/net/wireless/wl12xx/wl1271_scan.c | 257 +
+ drivers/net/wireless/wl12xx/wl1271_scan.h | 109 +
+ drivers/net/wireless/wl12xx/wl1271_sdio.c | 2 +-
+ drivers/net/wireless/wl12xx/wl1271_spi.c | 1 +
+ drivers/net/wireless/wl12xx/wl1271_testmode.c | 11 +-
+ drivers/net/wireless/wl12xx/wl1271_tx.c | 36 +-
+ drivers/net/wireless/wl12xx/wl1271_tx.h | 7 +-
+ drivers/net/wireless/wl12xx/wl12xx_80211.h | 26 +-
+ drivers/net/wireless/wl3501.h | 16 +-
+ drivers/net/wireless/zd1211rw/zd_mac.c | 5 +-
+ drivers/net/wireless/zd1211rw/zd_mac.h | 15 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 2 +-
+ drivers/net/wireless/zd1211rw/zd_usb.h | 14 +-
+ drivers/net/xen-netfront.c | 1 +
+ drivers/net/xtsonic.c | 12 +-
+ drivers/parisc/ccio-dma.c | 4 +-
+ drivers/parisc/led.c | 3 +-
+ drivers/pci/pci-acpi.c | 1 +
+ drivers/pci/pci.c | 20 +-
+ drivers/pci/pci.h | 1 +
+ drivers/pci/pcie/pme/pcie_pme.c | 5 +-
+ drivers/pcmcia/sa11xx_base.c | 2 +-
+ drivers/platform/x86/Kconfig | 44 +
+ drivers/platform/x86/Makefile | 4 +
+ drivers/platform/x86/acer-wmi.c | 79 +-
+ drivers/platform/x86/acerhdf.c | 151 +-
+ drivers/platform/x86/asus-laptop.c | 29 +-
+ drivers/platform/x86/asus_acpi.c | 7 +-
+ drivers/platform/x86/classmate-laptop.c | 13 +-
+ drivers/platform/x86/compal-laptop.c | 929 ++-
+ drivers/platform/x86/dell-laptop.c | 9 +-
+ drivers/platform/x86/dell-wmi.c | 11 +-
+ drivers/platform/x86/eeepc-laptop.c | 2 +-
+ drivers/platform/x86/fujitsu-laptop.c | 16 +-
+ drivers/platform/x86/hp-wmi.c | 281 +-
+ drivers/platform/x86/intel_ips.c | 1660 +++
+ drivers/platform/x86/intel_menlow.c | 33 +-
+ drivers/platform/x86/intel_pmic_gpio.c | 340 +
+ .../x86/intel_rar_register.c} | 8 +-
+ drivers/platform/x86/intel_scu_ipc.c | 180 +-
+ drivers/platform/x86/msi-laptop.c | 8 +-
+ drivers/platform/x86/msi-wmi.c | 2 +-
+ drivers/platform/x86/panasonic-laptop.c | 7 +-
+ drivers/platform/x86/sony-laptop.c | 13 +-
+ drivers/platform/x86/thinkpad_acpi.c | 73 -
+ drivers/platform/x86/toshiba_acpi.c | 135 +-
+ drivers/platform/x86/wmi.c | 28 +-
+ drivers/pnp/core.c | 3 +
+ drivers/pnp/pnpacpi/core.c | 23 +
+ drivers/rapidio/rio.c | 2 +-
+ drivers/rtc/rtc-fm3130.c | 2 +-
+ drivers/rtc/rtc-rx8025.c | 2 +-
+ drivers/s390/cio/qdio_setup.c | 2 +
+ drivers/s390/net/claw.c | 2 +-
+ drivers/s390/net/qeth_core.h | 27 +-
+ drivers/s390/net/qeth_core_main.c | 423 +-
+ drivers/s390/net/qeth_core_mpc.h | 5 +-
+ drivers/s390/net/qeth_core_sys.c | 5 +-
+ drivers/s390/net/qeth_l2_main.c | 108 +-
+ drivers/s390/net/qeth_l3.h | 1 +
+ drivers/s390/net/qeth_l3_main.c | 262 +-
+ drivers/s390/net/qeth_l3_sys.c | 14 +
+ drivers/s390/net/smsgiucv.c | 11 +-
+ drivers/s390/scsi/zfcp_aux.c | 10 +-
+ drivers/s390/scsi/zfcp_cfdc.c | 12 +-
+ drivers/s390/scsi/zfcp_dbf.c | 5 +-
+ drivers/s390/scsi/zfcp_dbf.h | 1 +
+ drivers/s390/scsi/zfcp_def.h | 5 +
+ drivers/s390/scsi/zfcp_erp.c | 24 +-
+ drivers/s390/scsi/zfcp_ext.h | 11 +-
+ drivers/s390/scsi/zfcp_fc.c | 54 +
+ drivers/s390/scsi/zfcp_fc.h | 27 +
+ drivers/s390/scsi/zfcp_fsf.c | 169 +-
+ drivers/s390/scsi/zfcp_fsf.h | 34 +-
+ drivers/s390/scsi/zfcp_qdio.c | 206 +-
+ drivers/s390/scsi/zfcp_qdio.h | 95 +-
+ drivers/s390/scsi/zfcp_scsi.c | 103 +-
+ drivers/s390/scsi/zfcp_sysfs.c | 12 +-
+ drivers/scsi/Kconfig | 4 +
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/aacraid/linit.c | 14 +-
+ drivers/scsi/advansys.c | 2 +-
+ drivers/scsi/aic7xxx/aic7770.c | 12 +-
+ drivers/scsi/aic7xxx/aic7770_osm.c | 2 +-
+ drivers/scsi/aic7xxx/aic79xx_core.c | 624 +-
+ drivers/scsi/aic7xxx/aic79xx_osm.c | 108 +-
+ drivers/scsi/aic7xxx/aic79xx_osm.h | 7 -
+ drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 8 +-
+ drivers/scsi/aic7xxx/aic79xx_pci.c | 56 +-
+ drivers/scsi/aic7xxx/aic79xx_proc.c | 13 +-
+ drivers/scsi/aic7xxx/aic7xxx_93cx6.c | 10 +-
+ drivers/scsi/aic7xxx/aic7xxx_core.c | 430 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.c | 76 +-
+ drivers/scsi/aic7xxx/aic7xxx_osm.h | 7 -
+ drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 8 +-
+ drivers/scsi/aic7xxx/aic7xxx_pci.c | 74 +-
+ drivers/scsi/aic7xxx/aic7xxx_proc.c | 15 +-
+ drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +-
+ drivers/scsi/aic94xx/aic94xx_seq.c | 4 +-
+ drivers/scsi/aic94xx/aic94xx_task.c | 2 +-
+ drivers/scsi/arcmsr/arcmsr.h | 315 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 2309 ++--
+ drivers/scsi/be2iscsi/Kconfig | 2 +-
+ drivers/scsi/be2iscsi/be.h | 6 +-
+ drivers/scsi/be2iscsi/be_cmds.c | 116 +-
+ drivers/scsi/be2iscsi/be_cmds.h | 27 +-
+ drivers/scsi/be2iscsi/be_iscsi.c | 199 +-
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 -
+ drivers/scsi/be2iscsi/be_main.c | 333 +-
+ drivers/scsi/be2iscsi/be_main.h | 29 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 64 +-
+ drivers/scsi/be2iscsi/be_mgmt.h | 19 +-
+ drivers/scsi/bfa/Makefile | 2 +-
+ drivers/scsi/bfa/bfa_cb_ioim_macros.h | 7 +-
+ drivers/scsi/bfa/bfa_core.c | 3 +-
+ drivers/scsi/bfa/bfa_fcpim.c | 29 +-
+ drivers/scsi/bfa/bfa_fcpim_priv.h | 6 +-
+ drivers/scsi/bfa/bfa_fcport.c | 139 +-
+ drivers/scsi/bfa/bfa_fcs.c | 20 +-
+ drivers/scsi/bfa/bfa_fcs_lport.c | 3 +
+ drivers/scsi/bfa/bfa_fcxp.c | 14 +-
+ drivers/scsi/bfa/bfa_fwimg_priv.h | 25 +-
+ drivers/scsi/bfa/bfa_hw_cb.c | 7 +-
+ drivers/scsi/bfa/bfa_hw_ct.c | 7 +-
+ drivers/scsi/bfa/bfa_intr.c | 1 +
+ drivers/scsi/bfa/bfa_ioc.c | 172 +-
+ drivers/scsi/bfa/bfa_ioc.h | 12 +-
+ drivers/scsi/bfa/bfa_ioc_cb.c | 36 +-
+ drivers/scsi/bfa/bfa_ioc_ct.c | 71 +-
+ drivers/scsi/bfa/bfa_iocfc.c | 107 +-
+ drivers/scsi/bfa/bfa_iocfc.h | 19 +-
+ drivers/scsi/bfa/bfa_ioim.c | 65 +-
+ drivers/scsi/bfa/bfa_log_module.c | 86 +
+ drivers/scsi/bfa/bfa_lps.c | 6 -
+ drivers/scsi/bfa/bfa_port.c | 31 +-
+ drivers/scsi/bfa/bfa_port_priv.h | 7 +-
+ drivers/scsi/bfa/bfa_priv.h | 3 -
+ drivers/scsi/bfa/bfa_rport.c | 5 -
+ drivers/scsi/bfa/bfa_sgpg.c | 5 -
+ drivers/scsi/bfa/bfa_uf.c | 10 +-
+ drivers/scsi/bfa/bfad.c | 114 +-
+ drivers/scsi/bfa/bfad_attr.c | 46 +-
+ drivers/scsi/bfa/bfad_debugfs.c | 547 +
+ drivers/scsi/bfa/bfad_drv.h | 36 +-
+ drivers/scsi/bfa/bfad_fwimg.c | 76 +-
+ drivers/scsi/bfa/bfad_im.c | 33 +-
+ drivers/scsi/bfa/bfad_im_compat.h | 13 +-
+ drivers/scsi/bfa/bfad_intr.c | 8 +-
+ drivers/scsi/bfa/fabric.c | 44 +-
+ drivers/scsi/bfa/fcpim.c | 32 +-
+ drivers/scsi/bfa/fcs_fabric.h | 5 +
+ drivers/scsi/bfa/fcs_rport.h | 3 +
+ drivers/scsi/bfa/fcs_vport.h | 1 +
+ drivers/scsi/bfa/fdmi.c | 6 +-
+ drivers/scsi/bfa/include/aen/bfa_aen_ioc.h | 8 +
+ drivers/scsi/bfa/include/bfa.h | 4 +
+ drivers/scsi/bfa/include/bfa_fcpim.h | 20 +-
+ drivers/scsi/bfa/include/bfa_svc.h | 1 +
+ drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 3 +
+ drivers/scsi/bfa/include/bfi/bfi_ioc.h | 20 +-
+ drivers/scsi/bfa/include/bfi/bfi_iocfc.h | 2 +
+ drivers/scsi/bfa/include/bfi/bfi_pbc.h | 62 +
+ drivers/scsi/bfa/include/cna/port/bfa_port.h | 1 +
+ drivers/scsi/bfa/include/cs/bfa_debug.h | 3 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_adapter.h | 3 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 6 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_boot.h | 10 +
+ drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 2 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_fcport.h | 26 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 7 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 12 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_itnim.h | 10 +
+ drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 41 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_pci.h | 11 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_port.h | 14 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 29 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_status.h | 46 +-
+ drivers/scsi/bfa/include/fcb/bfa_fcb_vport.h | 3 +-
+ drivers/scsi/bfa/include/fcs/bfa_fcs.h | 4 +-
+ drivers/scsi/bfa/include/fcs/bfa_fcs_fcpim.h | 1 +
+ drivers/scsi/bfa/include/fcs/bfa_fcs_rport.h | 1 +
+ drivers/scsi/bfa/include/fcs/bfa_fcs_vport.h | 4 +
+ drivers/scsi/bfa/include/log/bfa_log_linux.h | 6 +-
+ drivers/scsi/bfa/include/protocol/fc.h | 1 +
+ drivers/scsi/bfa/lport_api.c | 30 +-
+ drivers/scsi/bfa/ms.c | 9 +-
+ drivers/scsi/bfa/ns.c | 14 +-
+ drivers/scsi/bfa/rport.c | 88 +-
+ drivers/scsi/bfa/rport_api.c | 11 +-
+ drivers/scsi/bfa/rport_ftrs.c | 14 +-
+ drivers/scsi/bfa/scn.c | 2 +-
+ drivers/scsi/bfa/vport.c | 56 +-
+ drivers/scsi/bnx2i/bnx2i.h | 14 +
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 4 +
+ drivers/scsi/bnx2i/bnx2i_init.c | 37 +-
+ drivers/scsi/bnx2i/bnx2i_iscsi.c | 236 +-
+ drivers/scsi/cxgb3i/cxgb3i_ddp.c | 2 +
+ drivers/scsi/cxgb3i/cxgb3i_offload.c | 9 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 1 +
+ drivers/scsi/dpt_i2o.c | 26 +-
+ drivers/scsi/fcoe/fcoe.c | 154 +-
+ drivers/scsi/fcoe/libfcoe.c | 1519 ++-
+ drivers/scsi/fnic/fnic_main.c | 11 +-
+ drivers/scsi/fnic/fnic_scsi.c | 22 +-
+ drivers/scsi/hosts.c | 14 +-
+ drivers/scsi/hpsa.c | 754 +-
+ drivers/scsi/hpsa.h | 1 -
+ drivers/scsi/hpsa_cmd.h | 4 +
+ drivers/scsi/hptiop.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 85 +-
+ drivers/scsi/ibmvscsi/ibmvfc.h | 6 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 157 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.h | 4 +
+ drivers/scsi/ibmvscsi/ibmvstgt.c | 4 +-
+ drivers/scsi/ibmvscsi/rpa_vscsi.c | 16 +-
+ drivers/scsi/ipr.c | 148 +-
+ drivers/scsi/ipr.h | 30 +-
+ drivers/scsi/libfc/fc_disc.c | 39 +-
+ drivers/scsi/libfc/fc_elsct.c | 2 +-
+ drivers/scsi/libfc/fc_exch.c | 219 +-
+ drivers/scsi/libfc/fc_fcp.c | 15 +-
+ drivers/scsi/libfc/fc_libfc.c | 78 +
+ drivers/scsi/libfc/fc_libfc.h | 2 +-
+ drivers/scsi/libfc/fc_lport.c | 216 +-
+ drivers/scsi/libfc/fc_rport.c | 709 +-
+ drivers/scsi/libsas/sas_ata.c | 12 +-
+ drivers/scsi/libsas/sas_expander.c | 2 +-
+ drivers/scsi/libsas/sas_scsi_host.c | 4 +-
+ drivers/scsi/libsas/sas_task.c | 6 +-
+ drivers/scsi/lpfc/lpfc.h | 17 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 96 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 36 +
+ drivers/scsi/lpfc/lpfc_crtn.h | 11 +
+ drivers/scsi/lpfc/lpfc_disc.h | 2 +
+ drivers/scsi/lpfc/lpfc_els.c | 112 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 220 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 17 +-
+ drivers/scsi/lpfc/lpfc_init.c | 279 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 23 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 31 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 86 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 345 +-
+ drivers/scsi/lpfc/lpfc_sli.h | 2 +
+ drivers/scsi/lpfc/lpfc_sli4.h | 8 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2.h | 17 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 193 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 17 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 119 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 172 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 36 +-
+ drivers/scsi/mpt2sas/mpt2sas_config.c | 6 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 411 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 748 +-
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 575 +-
+ drivers/scsi/mvsas/mv_sas.c | 20 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 18 +-
+ drivers/scsi/pm8001/pm8001_sas.c | 4 +-
+ drivers/scsi/pmcraid.c | 893 +-
+ drivers/scsi/pmcraid.h | 305 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 33 +-
+ drivers/scsi/qla2xxx/qla_bsg.c | 294 +-
+ drivers/scsi/qla2xxx/qla_bsg.h | 9 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 2 +-
+ drivers/scsi/qla2xxx/qla_dbg.h | 2 +-
+ drivers/scsi/qla2xxx/qla_def.h | 54 +-
+ drivers/scsi/qla2xxx/qla_dfs.c | 2 +-
+ drivers/scsi/qla2xxx/qla_fw.h | 2 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 29 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 74 +-
+ drivers/scsi/qla2xxx/qla_init.c | 178 +-
+ drivers/scsi/qla2xxx/qla_inline.h | 2 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 259 +-
+ drivers/scsi/qla2xxx/qla_isr.c | 206 +-
+ drivers/scsi/qla2xxx/qla_mbx.c | 158 +-
+ drivers/scsi/qla2xxx/qla_mid.c | 61 +-
+ drivers/scsi/qla2xxx/qla_nx.c | 550 +-
+ drivers/scsi/qla2xxx/qla_nx.h | 45 +-
+ drivers/scsi/qla2xxx/qla_os.c | 109 +-
+ drivers/scsi/qla2xxx/qla_settings.h | 2 +-
+ drivers/scsi/qla2xxx/qla_sup.c | 49 +-
+ drivers/scsi/qla2xxx/qla_version.h | 8 +-
+ drivers/scsi/qla4xxx/Kconfig | 8 +-
+ drivers/scsi/qla4xxx/Makefile | 2 +-
+ drivers/scsi/qla4xxx/ql4_def.h | 143 +-
+ drivers/scsi/qla4xxx/ql4_fw.h | 139 +-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 106 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 242 +-
+ drivers/scsi/qla4xxx/ql4_inline.h | 2 +-
+ drivers/scsi/qla4xxx/ql4_iocb.c | 73 +-
+ drivers/scsi/qla4xxx/ql4_isr.c | 396 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 191 +-
+ drivers/scsi/qla4xxx/ql4_nvram.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_nvram.h | 10 +-
+ drivers/scsi/qla4xxx/ql4_nx.c | 2321 ++++
+ drivers/scsi/qla4xxx/ql4_nx.h | 779 ++
+ drivers/scsi/qla4xxx/ql4_os.c | 758 +-
+ drivers/scsi/qla4xxx/ql4_version.h | 2 +-
+ drivers/scsi/scsi_debug.c | 6 +-
+ drivers/scsi/scsi_error.c | 29 +-
+ drivers/scsi/scsi_pm.c | 206 +
+ drivers/scsi/scsi_priv.h | 19 +
+ drivers/scsi/scsi_scan.c | 24 +-
+ drivers/scsi/scsi_sysfs.c | 68 +-
+ drivers/scsi/scsi_transport_fc.c | 2 +-
+ drivers/scsi/scsi_transport_iscsi.c | 81 +-
+ drivers/scsi/sd.c | 21 +-
+ drivers/scsi/sg.c | 12 +-
+ drivers/serial/68360serial.c | 6 +-
+ drivers/serial/cpm_uart/cpm_uart_core.c | 2 +-
+ drivers/serial/nwpserial.c | 2 +-
+ drivers/serial/sn_console.c | 6 +-
+ drivers/ssb/driver_chipcommon.c | 25 +
+ drivers/ssb/driver_chipcommon_pmu.c | 17 +-
+ drivers/ssb/main.c | 76 +-
+ drivers/ssb/pci.c | 15 +-
+ drivers/staging/Kconfig | 4 +-
+ drivers/staging/Makefile | 2 +-
+ drivers/staging/batman-adv/hard-interface.c | 5 +-
+ drivers/staging/cx25821/Makefile | 11 +-
+ drivers/staging/cx25821/cx25821-alsa.c | 35 +-
+ drivers/staging/cx25821/cx25821-audio-upstream.c | 38 +-
+ drivers/staging/cx25821/cx25821-audio.h | 13 +-
+ drivers/staging/cx25821/cx25821-audups11.c | 420 -
+ drivers/staging/cx25821/cx25821-core.c | 86 +-
+ drivers/staging/cx25821/cx25821-i2c.c | 3 +
+ drivers/staging/cx25821/cx25821-medusa-defines.h | 15 +-
+ drivers/staging/cx25821/cx25821-medusa-reg.h | 32 +-
+ drivers/staging/cx25821/cx25821-medusa-video.c | 18 +-
+ drivers/staging/cx25821/cx25821-medusa-video.h | 4 +-
+ drivers/staging/cx25821/cx25821-reg.h | 1826 ++--
+ drivers/staging/cx25821/cx25821-sram.h | 50 +-
+ .../staging/cx25821/cx25821-video-upstream-ch2.c | 91 +-
+ .../staging/cx25821/cx25821-video-upstream-ch2.h | 2 +-
+ drivers/staging/cx25821/cx25821-video-upstream.c | 72 +-
+ drivers/staging/cx25821/cx25821-video-upstream.h | 2 +-
+ drivers/staging/cx25821/cx25821-video.c | 905 ++-
+ drivers/staging/cx25821/cx25821-video.h | 20 +-
+ drivers/staging/cx25821/cx25821-video0.c | 434 -
+ drivers/staging/cx25821/cx25821-video1.c | 434 -
+ drivers/staging/cx25821/cx25821-video2.c | 436 -
+ drivers/staging/cx25821/cx25821-video3.c | 435 -
+ drivers/staging/cx25821/cx25821-video4.c | 434 -
+ drivers/staging/cx25821/cx25821-video5.c | 434 -
+ drivers/staging/cx25821/cx25821-video6.c | 434 -
+ drivers/staging/cx25821/cx25821-video7.c | 433 -
+ drivers/staging/cx25821/cx25821-videoioctl.c | 480 -
+ drivers/staging/cx25821/cx25821-vidups10.c | 418 -
+ drivers/staging/cx25821/cx25821-vidups9.c | 416 -
+ drivers/staging/cx25821/cx25821.h | 49 +-
+ drivers/staging/lirc/Kconfig | 110 +
+ drivers/staging/lirc/Makefile | 19 +
+ drivers/staging/lirc/TODO | 8 +
+ drivers/staging/lirc/TODO.lirc_i2c | 3 +
+ drivers/staging/lirc/lirc_bt829.c | 383 +
+ drivers/staging/lirc/lirc_ene0100.c | 646 +
+ drivers/staging/lirc/lirc_ene0100.h | 169 +
+ drivers/staging/lirc/lirc_i2c.c | 536 +
+ drivers/staging/lirc/lirc_igorplugusb.c | 555 +
+ drivers/staging/lirc/lirc_imon.c | 1058 ++
+ drivers/staging/lirc/lirc_it87.c | 1019 ++
+ drivers/staging/lirc/lirc_it87.h | 116 +
+ drivers/staging/lirc/lirc_ite8709.c | 542 +
+ drivers/staging/lirc/lirc_parallel.c | 705 +
+ drivers/staging/lirc/lirc_parallel.h | 26 +
+ drivers/staging/lirc/lirc_sasem.c | 933 ++
+ drivers/staging/lirc/lirc_serial.c | 1313 ++
+ drivers/staging/lirc/lirc_sir.c | 1282 ++
+ drivers/staging/lirc/lirc_streamzap.c | 821 ++
+ drivers/staging/lirc/lirc_ttusbir.c | 396 +
+ drivers/staging/lirc/lirc_zilog.c | 1387 ++
+ drivers/staging/memrar/memrar_handler.c | 3 +-
+ drivers/staging/octeon/ethernet-mdio.c | 2 +-
+ drivers/staging/rar_register/Kconfig | 30 -
+ drivers/staging/rar_register/Makefile | 2 -
+ drivers/staging/tm6000/Kconfig | 4 +-
+ drivers/staging/tm6000/Makefile | 8 +-
+ drivers/staging/tm6000/tm6000-alsa.c | 263 +-
+ drivers/staging/tm6000/tm6000-cards.c | 58 +-
+ drivers/staging/tm6000/tm6000-core.c | 182 +-
+ drivers/staging/tm6000/tm6000-dvb.c | 173 +-
+ drivers/staging/tm6000/tm6000-i2c.c | 25 +-
+ drivers/staging/tm6000/tm6000-input.c | 364 +
+ drivers/staging/tm6000/tm6000-stds.c | 36 +-
+ drivers/staging/tm6000/tm6000-usb-isoc.h | 5 +-
+ drivers/staging/tm6000/tm6000-video.c | 337 +-
+ drivers/staging/tm6000/tm6000.h | 88 +-
+ drivers/staging/winbond/wbusb.c | 2 +-
+ drivers/usb/atm/cxacru.c | 18 +-
+ drivers/usb/atm/speedtch.c | 10 +-
+ drivers/usb/atm/ueagle-atm.c | 13 +-
+ drivers/usb/class/cdc-acm.c | 2 +-
+ drivers/usb/class/usblp.c | 2 +-
+ drivers/usb/gadget/f_uvc.c | 16 +-
+ drivers/usb/gadget/f_uvc.h | 352 +-
+ drivers/usb/gadget/rndis.c | 5 +-
+ drivers/usb/gadget/uvc.h | 36 -
+ drivers/usb/gadget/webcam.c | 24 +-
+ drivers/usb/host/fhci-sched.c | 2 +-
+ drivers/usb/serial/kl5kusb105.c | 2 +-
+ drivers/usb/wusbcore/wusbhc.c | 2 +-
+ drivers/uwb/wlp/wss-lc.c | 2 +-
+ drivers/vhost/net.c | 306 +-
+ drivers/vhost/vhost.c | 232 +-
+ drivers/vhost/vhost.h | 55 +-
+ drivers/video/backlight/locomolcd.c | 4 +-
+ drivers/video/carminefb.c | 2 +-
+ drivers/video/omap2/displays/panel-acx565akm.c | 4 +-
+ drivers/video/tgafb.c | 2 +-
+ firmware/Makefile | 2 +-
+ firmware/cxgb3/t3fw-7.10.0.bin.ihex | 1935 +++
+ firmware/cxgb3/t3fw-7.4.0.bin.ihex | 1917 ---
+ fs/Kconfig | 2 +-
+ fs/befs/linuxvfs.c | 2 +-
+ fs/block_dev.c | 4 +-
+ fs/compat.c | 2 +-
+ fs/compat_ioctl.c | 11 +-
+ fs/ecryptfs/crypto.c | 2 +-
+ fs/ext4/extents.c | 2 +-
+ fs/ext4/mballoc.c | 2 +-
+ fs/ext4/super.c | 2 +-
+ fs/freevxfs/vxfs_super.c | 2 +-
+ fs/fuse/dir.c | 2 +-
+ fs/namei.c | 6 +-
+ fs/ncpfs/inode.c | 4 +-
+ fs/nfs/dir.c | 2 +-
+ fs/ocfs2/dlm/dlmdebug.c | 6 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 3 +-
+ fs/ocfs2/dlmglue.c | 4 +-
+ fs/ocfs2/super.c | 2 +-
+ fs/open.c | 11 +-
+ fs/reiserfs/inode.c | 2 +-
+ include/drm/i915_drm.h | 9 +
+ include/linux/Kbuild | 1 +
+ include/linux/atmdev.h | 17 +
+ include/linux/brcmphy.h | 7 +
+ include/linux/caif/caif_socket.h | 34 +
+ include/linux/can/platform/flexcan.h | 20 +
+ include/linux/capability.h | 3 -
+ include/linux/cgroup.h | 7 +
+ include/linux/cpufreq.h | 5 -
+ include/linux/device.h | 112 +-
+ include/linux/dvb/frontend.h | 1 +
+ include/linux/dvb/version.h | 2 +-
+ include/linux/eeprom_93cx6.h | 1 +
+ include/linux/etherdevice.h | 14 +
+ include/linux/ethtool.h | 57 +-
+ include/linux/filter.h | 48 +
+ include/linux/fs.h | 1 +
+ include/linux/fscache.h | 3 +-
+ include/linux/hid.h | 1 +
+ include/linux/i2c/adp5588.h | 37 +
+ include/linux/i2c/mcs.h | 34 +
+ include/linux/i2c/mcs5000_ts.h | 24 -
+ include/linux/i2c/qt602240_ts.h | 38 +
+ include/linux/ide.h | 2 +-
+ include/linux/if.h | 2 +
+ include/linux/if_bonding.h | 1 +
+ include/linux/if_bridge.h | 2 -
+ include/linux/if_ether.h | 2 +-
+ include/linux/if_fddi.h | 8 +-
+ include/linux/if_frad.h | 2 +-
+ include/linux/if_hippi.h | 8 +-
+ include/linux/if_link.h | 5 +-
+ include/linux/if_macvlan.h | 23 +-
+ include/linux/if_packet.h | 1 +
+ include/linux/if_pppox.h | 8 +-
+ include/linux/in.h | 1 +
+ include/linux/input.h | 60 +-
+ include/linux/input/adxl34x.h | 349 +
+ include/linux/input/cy8ctmg110_pdata.h | 10 +
+ include/linux/input/matrix_keypad.h | 6 +
+ include/linux/intel_pmic_gpio.h | 15 +
+ include/linux/ip_vs.h | 2 +
+ include/linux/ipv6.h | 6 +-
+ include/linux/iscsi_boot_sysfs.h | 123 +
+ include/linux/iscsi_ibft.h | 12 +-
+ include/linux/isdnif.h | 2 +-
+ include/linux/jffs2.h | 2 +-
+ include/linux/kernel.h | 11 +-
+ include/linux/ks8842.h | 4 +
+ include/linux/kvm.h | 13 +
+ include/linux/kvm_host.h | 35 +-
+ include/linux/kvm_types.h | 4 +-
+ include/linux/lru_cache.h | 2 +-
+ include/linux/lsm_audit.h | 32 +
+ include/linux/mISDNif.h | 2 +-
+ include/linux/marvell_phy.h | 1 +
+ include/linux/mm.h | 8 +
+ include/linux/nbd.h | 2 +-
+ include/linux/ncp.h | 10 +-
+ include/linux/ncp_fs_sb.h | 14 +-
+ include/linux/netdevice.h | 169 +-
+ include/linux/netfilter/Kbuild | 6 +-
+ include/linux/netfilter/nf_conntrack_common.h | 4 +
+ include/linux/netfilter/nfnetlink_log.h | 1 +
+ include/linux/netfilter/xt_CHECKSUM.h | 20 +
+ include/linux/netfilter/xt_IDLETIMER.h | 45 +
+ include/linux/netfilter/xt_cpu.h | 11 +
+ include/linux/netfilter/xt_ipvs.h | 27 +
+ include/linux/netfilter/xt_quota.h | 2 +-
+ include/linux/netfilter_ipv4/ipt_LOG.h | 3 +-
+ include/linux/netfilter_ipv6/ip6t_LOG.h | 3 +-
+ include/linux/netpoll.h | 24 +-
+ include/linux/nl80211.h | 24 +-
+ include/linux/notifier.h | 1 +
+ include/linux/padata.h | 121 +-
+ include/linux/pci_ids.h | 6 +-
+ include/linux/percpu.h | 20 +-
+ include/linux/phonet.h | 4 +-
+ include/linux/phy.h | 24 +-
+ include/linux/plist.h | 29 +
+ include/linux/pm.h | 16 +
+ include/linux/pm_qos_params.h | 13 +-
+ include/linux/pm_wakeup.h | 10 +-
+ include/linux/pnp.h | 1 +
+ include/linux/ptp_classify.h | 126 +
+ .../rar_register => include/linux}/rar_register.h | 0
+ include/linux/rds.h | 12 +-
+ include/linux/reiserfs_fs.h | 2 +-
+ include/linux/rtnetlink.h | 1 +
+ include/linux/sctp.h | 80 +-
+ include/linux/security.h | 11 +-
+ include/linux/skbuff.h | 70 +-
+ include/linux/snmp.h | 1 +
+ include/linux/socket.h | 5 +
+ include/linux/spi/ads7846.h | 3 +-
+ include/linux/ssb/ssb.h | 159 +-
+ include/linux/suspend.h | 17 +-
+ include/linux/swiotlb.h | 27 +-
+ include/linux/timer.h | 15 +
+ include/linux/types.h | 5 +-
+ include/linux/u64_stats_sync.h | 140 +
+ include/linux/usb/video.h | 404 +
+ include/linux/user_namespace.h | 14 +
+ include/linux/wlp.h | 22 +-
+ include/linux/xattr.h | 14 +
+ include/media/ir-core.h | 8 +-
+ include/media/ir-kbd-i2c.h | 2 +-
+ include/media/lirc.h | 165 +
+ include/media/lirc_dev.h | 225 +
+ include/media/rc-map.h | 10 +
+ include/media/sh_mobile_ceu.h | 3 +
+ include/media/sh_mobile_csi2.h | 46 +
+ include/media/soc_camera.h | 3 +
+ include/media/v4l2-mediabus.h | 13 +-
+ include/media/videobuf-core.h | 6 +-
+ include/media/videobuf-dma-sg.h | 39 +-
+ include/media/videobuf-vmalloc.h | 2 +-
+ include/net/act_api.h | 2 +
+ include/net/af_unix.h | 4 +-
+ include/net/bluetooth/bluetooth.h | 3 +-
+ include/net/bluetooth/hci.h | 187 +-
+ include/net/bluetooth/hci_core.h | 30 +-
+ include/net/bluetooth/l2cap.h | 34 +-
+ include/net/bluetooth/rfcomm.h | 14 +-
+ include/net/caif/caif_dev.h | 8 +-
+ include/net/caif/caif_layer.h | 6 -
+ include/net/caif/caif_spi.h | 153 +
+ include/net/caif/cfcnfg.h | 16 +-
+ include/net/caif/cfsrvl.h | 15 +-
+ include/net/cfg80211.h | 221 +-
+ include/net/dn_dev.h | 8 +-
+ include/net/dn_nsp.h | 16 +-
+ include/net/dn_route.h | 4 +-
+ include/net/genetlink.h | 15 +-
+ include/net/inet_common.h | 59 +-
+ include/net/inet_frag.h | 1 +
+ include/net/inet_sock.h | 3 +-
+ include/net/inetpeer.h | 30 +-
+ include/net/ip.h | 29 +-
+ include/net/ip6_fib.h | 10 +-
+ include/net/ip6_tunnel.h | 2 +-
+ include/net/ip_vs.h | 14 +-
+ include/net/ipip.h | 2 +-
+ include/net/ipv6.h | 16 +-
+ include/net/ipx.h | 8 +-
+ include/net/irda/irda.h | 4 -
+ include/net/irda/irlap_frame.h | 18 +-
+ include/net/lib80211.h | 3 -
+ include/net/mac80211.h | 145 +-
+ include/net/mip6.h | 2 +-
+ include/net/ndisc.h | 2 +-
+ include/net/neighbour.h | 2 +-
+ include/net/netfilter/nf_conntrack.h | 17 +-
+ include/net/netfilter/nf_conntrack_acct.h | 12 +
+ include/net/netfilter/nf_conntrack_core.h | 2 +-
+ include/net/netfilter/nf_conntrack_extend.h | 9 +-
+ include/net/netfilter/nf_nat_protocol.h | 8 +-
+ include/net/netfilter/nf_nat_rule.h | 2 -
+ include/net/netfilter/nfnetlink_log.h | 2 +
+ include/net/netfilter/xt_rateest.h | 11 +-
+ include/net/netlink.h | 2 +-
+ include/net/phonet/pn_dev.h | 1 +
+ include/net/pkt_sched.h | 2 +-
+ include/net/regulatory.h | 1 -
+ include/net/route.h | 6 +-
+ include/net/sch_generic.h | 38 +-
+ include/net/scm.h | 30 +-
+ include/net/sctp/structs.h | 4 +-
+ include/net/snmp.h | 75 +-
+ include/net/sock.h | 14 +-
+ include/net/tcp.h | 260 +-
+ include/net/udp.h | 38 +-
+ include/rxrpc/packet.h | 8 +-
+ include/scsi/fc/fc_els.h | 11 +
+ include/scsi/fc/fc_fcoe.h | 15 +-
+ include/scsi/fc/fc_fip.h | 46 +-
+ include/scsi/fc/fc_ns.h | 7 +
+ include/scsi/fc_encode.h | 7 +
+ include/scsi/fc_frame.h | 52 +-
+ include/scsi/iscsi_if.h | 2 +
+ include/scsi/libfc.h | 75 +-
+ include/scsi/libfcoe.h | 72 +-
+ include/scsi/libsas.h | 11 +-
+ include/scsi/scsi_device.h | 8 +
+ include/scsi/scsi_transport_iscsi.h | 2 +
+ include/sound/pcm.h | 2 +-
+ include/trace/events/power.h | 27 +-
+ init/main.c | 1 +
+ kernel/audit.c | 2 +-
+ kernel/cgroup.c | 23 +
+ kernel/cpuset.c | 2 +-
+ kernel/debug/debug_core.c | 2 +-
+ kernel/debug/gdbstub.c | 2 +-
+ kernel/padata.c | 755 +-
+ kernel/pm_qos_params.c | 215 +-
+ kernel/power/hibernate.c | 26 +-
+ kernel/power/main.c | 55 +
+ kernel/power/snapshot.c | 2 +-
+ kernel/power/suspend.c | 13 +-
+ kernel/power/swap.c | 6 +-
+ kernel/signal.c | 9 +-
+ kernel/time/tick-broadcast.c | 2 +-
+ kernel/timer.c | 13 +
+ kernel/user_namespace.c | 44 +
+ lib/Kconfig.debug | 2 +-
+ lib/devres.c | 2 +-
+ lib/random32.c | 2 +-
+ lib/swiotlb.c | 137 +-
+ lib/vsprintf.c | 9 +
+ mm/memory-failure.c | 33 +
+ mm/percpu.c | 85 +-
+ net/8021q/vlan.c | 13 +-
+ net/8021q/vlan.h | 13 +-
+ net/8021q/vlan_core.c | 26 +-
+ net/8021q/vlan_dev.c | 161 +-
+ net/8021q/vlanproc.c | 16 +-
+ net/Kconfig | 12 +-
+ net/Makefile | 4 +-
+ net/atm/br2684.c | 66 +-
+ net/atm/clip.c | 2 +-
+ net/atm/common.c | 30 +
+ net/bluetooth/Kconfig | 13 -
+ net/bluetooth/bnep/bnep.h | 8 +-
+ net/bluetooth/hci_conn.c | 34 +-
+ net/bluetooth/hci_core.c | 204 +-
+ net/bluetooth/hci_event.c | 39 +-
+ net/bluetooth/hci_sock.c | 90 +
+ net/bluetooth/hci_sysfs.c | 38 +
+ net/bluetooth/l2cap.c | 669 +-
+ net/bluetooth/rfcomm/sock.c | 2 +-
+ net/bluetooth/rfcomm/tty.c | 4 +-
+ net/bridge/br.c | 2 -
+ net/bridge/br_device.c | 142 +-
+ net/bridge/br_fdb.c | 6 +-
+ net/bridge/br_forward.c | 11 +
+ net/bridge/br_if.c | 33 +-
+ net/bridge/br_input.c | 24 +-
+ net/bridge/br_multicast.c | 11 +-
+ net/bridge/br_netfilter.c | 60 +-
+ net/bridge/br_netlink.c | 9 +-
+ net/bridge/br_notify.c | 5 +-
+ net/bridge/br_private.h | 67 +-
+ net/bridge/br_stp_bpdu.c | 7 +-
+ net/bridge/br_sysfs_br.c | 72 +
+ net/bridge/netfilter/ebt_redirect.c | 3 +-
+ net/bridge/netfilter/ebt_ulog.c | 8 +-
+ net/bridge/netfilter/ebtables.c | 11 +-
+ net/caif/Kconfig | 7 +-
+ net/caif/Makefile | 14 +-
+ net/caif/caif_config_util.c | 5 +
+ net/caif/caif_dev.c | 12 +-
+ net/caif/caif_socket.c | 61 +-
+ net/caif/cfcnfg.c | 54 +-
+ net/caif/cfctrl.c | 8 +-
+ net/caif/cfdbgl.c | 2 +-
+ net/caif/cfdgml.c | 7 +-
+ net/caif/cfpkt_skbuff.c | 5 +-
+ net/caif/cfrfml.c | 318 +-
+ net/caif/cfserl.c | 7 +-
+ net/caif/cfsrvl.c | 26 +-
+ net/caif/cfutill.c | 8 +-
+ net/caif/cfveil.c | 7 +-
+ net/caif/cfvidl.c | 2 +-
+ net/caif/chnl_net.c | 67 +-
+ net/can/raw.c | 15 +-
+ net/compat.c | 53 +-
+ net/core/Makefile | 2 +-
+ net/core/datagram.c | 8 +-
+ net/core/dev.c | 387 +-
+ net/core/drop_monitor.c | 33 +-
+ net/core/dst.c | 2 +-
+ net/core/ethtool.c | 108 +-
+ net/core/filter.c | 212 +-
+ net/core/flow.c | 9 +-
+ net/core/gen_estimator.c | 1 +
+ net/core/gen_stats.c | 14 +-
+ net/core/iovec.c | 9 +-
+ net/core/link_watch.c | 1 -
+ net/core/net-sysfs.c | 19 +-
+ net/core/netevent.c | 5 +-
+ net/core/netpoll.c | 182 +-
+ net/core/pktgen.c | 212 +-
+ net/core/rtnetlink.c | 11 +-
+ net/core/scm.c | 33 +-
+ net/core/skbuff.c | 3 +-
+ net/core/sock.c | 49 +-
+ net/core/stream.c | 6 -
+ net/core/timestamping.c | 126 +
+ net/core/utils.c | 3 -
+ net/dccp/ackvec.c | 4 +-
+ net/dccp/ccids/ccid3.c | 4 +-
+ net/dccp/dccp.h | 12 +-
+ net/dccp/input.c | 13 +-
+ net/dccp/ipv4.c | 4 +-
+ net/dccp/ipv6.c | 30 +-
+ net/dccp/options.c | 20 +-
+ net/dccp/proto.c | 14 +-
+ net/decnet/dn_route.c | 158 +-
+ net/dsa/slave.c | 3 +-
+ net/econet/af_econet.c | 27 +-
+ net/ethernet/eth.c | 5 +-
+ net/ethernet/pe2.c | 3 +-
+ net/ipv4/af_inet.c | 84 +-
+ net/ipv4/arp.c | 51 +-
+ net/ipv4/datagram.c | 4 +-
+ net/ipv4/devinet.c | 1 +
+ net/ipv4/fib_frontend.c | 13 +-
+ net/ipv4/icmp.c | 37 +-
+ net/ipv4/igmp.c | 32 +-
+ net/ipv4/inet_connection_sock.c | 21 +-
+ net/ipv4/inet_fragment.c | 1 -
+ net/ipv4/inet_hashtables.c | 4 -
+ net/ipv4/inetpeer.c | 244 +-
+ net/ipv4/ip_forward.c | 10 +-
+ net/ipv4/ip_fragment.c | 27 +-
+ net/ipv4/ip_gre.c | 16 +-
+ net/ipv4/ip_input.c | 26 +-
+ net/ipv4/ip_output.c | 78 +-
+ net/ipv4/ip_sockglue.c | 45 +-
+ net/ipv4/ipconfig.c | 7 +
+ net/ipv4/ipip.c | 8 +-
+ net/ipv4/ipmr.c | 8 +-
+ net/ipv4/netfilter.c | 12 +-
+ net/ipv4/netfilter/arp_tables.c | 22 +-
+ net/ipv4/netfilter/ip_queue.c | 57 +-
+ net/ipv4/netfilter/ip_tables.c | 16 +-
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 50 +-
+ net/ipv4/netfilter/ipt_LOG.c | 54 +-
+ net/ipv4/netfilter/ipt_NETMAP.c | 6 +-
+ net/ipv4/netfilter/ipt_REJECT.c | 12 +-
+ net/ipv4/netfilter/nf_defrag_ipv4.c | 5 +
+ net/ipv4/netfilter/nf_nat_core.c | 29 +-
+ net/ipv4/netfilter/nf_nat_proto_common.c | 12 +-
+ net/ipv4/netfilter/nf_nat_proto_dccp.c | 6 +-
+ net/ipv4/netfilter/nf_nat_proto_gre.c | 12 +-
+ net/ipv4/netfilter/nf_nat_proto_icmp.c | 10 +-
+ net/ipv4/netfilter/nf_nat_proto_sctp.c | 6 +-
+ net/ipv4/netfilter/nf_nat_proto_tcp.c | 5 +-
+ net/ipv4/netfilter/nf_nat_proto_udp.c | 5 +-
+ net/ipv4/netfilter/nf_nat_proto_udplite.c | 6 +-
+ net/ipv4/netfilter/nf_nat_proto_unknown.c | 4 +-
+ net/ipv4/netfilter/nf_nat_rule.c | 10 +-
+ net/ipv4/netfilter/nf_nat_standalone.c | 10 +-
+ net/ipv4/proc.c | 16 +-
+ net/ipv4/protocol.c | 3 +-
+ net/ipv4/raw.c | 22 +-
+ net/ipv4/route.c | 518 +-
+ net/ipv4/syncookies.c | 105 +-
+ net/ipv4/tcp.c | 78 +-
+ net/ipv4/tcp_input.c | 20 +-
+ net/ipv4/tcp_ipv4.c | 175 +-
+ net/ipv4/tcp_minisocks.c | 9 +-
+ net/ipv4/tcp_output.c | 77 +-
+ net/ipv4/tcp_timer.c | 1 -
+ net/ipv4/tunnel4.c | 2 -
+ net/ipv4/udp.c | 4 +-
+ net/ipv4/udplite.c | 3 +-
+ net/ipv4/xfrm4_input.c | 1 -
+ net/ipv4/xfrm4_policy.c | 2 +-
+ net/ipv6/addrconf.c | 53 +-
+ net/ipv6/addrlabel.c | 6 +-
+ net/ipv6/af_inet6.c | 32 +-
+ net/ipv6/anycast.c | 96 +-
+ net/ipv6/datagram.c | 18 +-
+ net/ipv6/exthdrs.c | 34 +-
+ net/ipv6/fib6_rules.c | 10 +-
+ net/ipv6/inet6_connection_sock.c | 9 +-
+ net/ipv6/ip6_fib.c | 30 +-
+ net/ipv6/ip6_output.c | 38 +-
+ net/ipv6/ip6_tunnel.c | 8 +-
+ net/ipv6/ipv6_sockglue.c | 2 -
+ net/ipv6/mcast.c | 190 +-
+ net/ipv6/ndisc.c | 8 +-
+ net/ipv6/netfilter.c | 4 +-
+ net/ipv6/netfilter/ip6_queue.c | 57 +-
+ net/ipv6/netfilter/ip6_tables.c | 21 +-
+ net/ipv6/netfilter/ip6t_LOG.c | 81 +-
+ net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 2 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 20 +-
+ net/ipv6/proc.c | 17 +-
+ net/ipv6/raw.c | 32 +-
+ net/ipv6/reassembly.c | 21 +-
+ net/ipv6/route.c | 319 +-
+ net/ipv6/sit.c | 16 +-
+ net/ipv6/syncookies.c | 58 +-
+ net/ipv6/tcp_ipv6.c | 47 +-
+ net/ipv6/udp.c | 11 +-
+ net/irda/irnet/irnet_ppp.c | 10 +-
+ net/irda/irttp.c | 14 +-
+ net/iucv/iucv.c | 14 +-
+ net/l2tp/l2tp_ip.c | 6 +-
+ net/mac80211/Kconfig | 8 +
+ net/mac80211/Makefile | 4 +
+ net/mac80211/agg-rx.c | 123 +-
+ net/mac80211/agg-tx.c | 554 +-
+ net/mac80211/cfg.c | 124 +-
+ net/mac80211/debugfs.c | 154 +-
+ net/mac80211/debugfs_key.c | 2 +-
+ net/mac80211/debugfs_sta.c | 65 +-
+ net/mac80211/driver-ops.h | 102 +-
+ net/mac80211/driver-trace.h | 210 +-
+ net/mac80211/ht.c | 52 +-
+ net/mac80211/ibss.c | 171 +-
+ net/mac80211/ieee80211_i.h | 81 +-
+ net/mac80211/iface.c | 190 +-
+ net/mac80211/key.c | 295 +-
+ net/mac80211/key.h | 33 +-
+ net/mac80211/main.c | 124 +-
+ net/mac80211/mesh.c | 73 +-
+ net/mac80211/mesh.h | 2 -
+ net/mac80211/mesh_hwmp.c | 4 +-
+ net/mac80211/mesh_pathtbl.c | 4 +-
+ net/mac80211/mesh_plink.c | 42 +-
+ net/mac80211/mlme.c | 284 +-
+ net/mac80211/pm.c | 18 +-
+ net/mac80211/rate.h | 13 +
+ net/mac80211/rc80211_minstrel.c | 1 -
+ net/mac80211/rc80211_minstrel_ht.c | 827 ++
+ net/mac80211/rc80211_minstrel_ht.h | 130 +
+ net/mac80211/rc80211_minstrel_ht_debugfs.c | 118 +
+ net/mac80211/rx.c | 195 +-
+ net/mac80211/scan.c | 6 +-
+ net/mac80211/sta_info.c | 24 +-
+ net/mac80211/sta_info.h | 113 +-
+ net/mac80211/status.c | 6 +-
+ net/mac80211/tkip.c | 8 +-
+ net/mac80211/tkip.h | 2 +-
+ net/mac80211/tx.c | 112 +-
+ net/mac80211/util.c | 42 +-
+ net/mac80211/wep.c | 29 +-
+ net/mac80211/wep.h | 2 +-
+ net/mac80211/work.c | 45 +-
+ net/mac80211/wpa.c | 13 +-
+ net/netfilter/Kconfig | 71 +-
+ net/netfilter/Makefile | 4 +
+ net/netfilter/ipvs/Kconfig | 11 +-
+ net/netfilter/ipvs/ip_vs_app.c | 43 -
+ net/netfilter/ipvs/ip_vs_conn.c | 55 +-
+ net/netfilter/ipvs/ip_vs_core.c | 57 +-
+ net/netfilter/ipvs/ip_vs_ctl.c | 10 +-
+ net/netfilter/ipvs/ip_vs_ftp.c | 176 +-
+ net/netfilter/ipvs/ip_vs_lblc.c | 2 +-
+ net/netfilter/ipvs/ip_vs_lblcr.c | 2 +-
+ net/netfilter/ipvs/ip_vs_proto.c | 1 +
+ net/netfilter/ipvs/ip_vs_proto_sctp.c | 55 +-
+ net/netfilter/ipvs/ip_vs_proto_tcp.c | 50 +-
+ net/netfilter/ipvs/ip_vs_proto_udp.c | 56 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 115 +-
+ net/netfilter/nf_conntrack_acct.c | 14 +-
+ net/netfilter/nf_conntrack_core.c | 49 +-
+ net/netfilter/nf_conntrack_extend.c | 22 +-
+ net/netfilter/nf_conntrack_h323_main.c | 12 +-
+ net/netfilter/nf_conntrack_netbios_ns.c | 2 +-
+ net/netfilter/nf_conntrack_netlink.c | 2 +-
+ net/netfilter/nf_conntrack_proto_tcp.c | 42 +-
+ net/netfilter/nfnetlink_log.c | 73 +-
+ net/netfilter/nfnetlink_queue.c | 39 +-
+ net/netfilter/xt_CHECKSUM.c | 70 +
+ net/netfilter/xt_CT.c | 4 +-
+ net/netfilter/xt_IDLETIMER.c | 315 +
+ net/netfilter/xt_NOTRACK.c | 2 +-
+ net/netfilter/xt_RATEEST.c | 12 +-
+ net/netfilter/xt_TCPMSS.c | 8 +-
+ net/netfilter/xt_TEE.c | 8 +-
+ net/netfilter/xt_TPROXY.c | 6 +-
+ net/netfilter/xt_cluster.c | 2 +-
+ net/netfilter/xt_connbytes.c | 10 +
+ net/netfilter/xt_conntrack.c | 11 +-
+ net/netfilter/xt_cpu.c | 63 +
+ net/netfilter/xt_ipvs.c | 189 +
+ net/netfilter/xt_quota.c | 12 +-
+ net/netfilter/xt_sctp.c | 3 +-
+ net/netfilter/xt_socket.c | 2 +-
+ net/netfilter/xt_state.c | 14 +-
+ net/netfilter/xt_statistic.c | 19 +-
+ net/netlink/af_netlink.c | 42 +-
+ net/netlink/genetlink.c | 15 +-
+ net/packet/af_packet.c | 37 +-
+ net/phonet/pn_dev.c | 15 +-
+ net/rose/rose_route.c | 4 +-
+ net/rxrpc/ar-peer.c | 4 +-
+ net/sched/act_api.c | 11 +-
+ net/sched/act_mirred.c | 12 +-
+ net/sched/act_nat.c | 34 +-
+ net/sched/act_pedit.c | 3 +-
+ net/sched/act_police.c | 12 +-
+ net/sched/act_simple.c | 4 +-
+ net/sched/cls_u32.c | 6 +-
+ net/sched/sch_atm.c | 98 +-
+ net/sched/sch_generic.c | 25 +-
+ net/sched/sch_htb.c | 2 -
+ net/sctp/associola.c | 2 +-
+ net/sctp/protocol.c | 9 +-
+ net/sctp/sm_make_chunk.c | 2 +-
+ net/socket.c | 177 +-
+ net/unix/af_unix.c | 99 +-
+ net/wanrouter/wanmain.c | 7 +-
+ net/wanrouter/wanproc.c | 7 +-
+ net/wireless/chan.c | 5 +-
+ net/wireless/core.c | 65 +-
+ net/wireless/core.h | 1 +
+ net/wireless/genregdb.awk | 1 +
+ net/wireless/ibss.c | 4 +-
+ net/wireless/lib80211_crypt_ccmp.c | 1 -
+ net/wireless/lib80211_crypt_tkip.c | 3 +-
+ net/wireless/lib80211_crypt_wep.c | 1 -
+ net/wireless/mlme.c | 16 +-
+ net/wireless/nl80211.c | 93 +-
+ net/wireless/reg.c | 668 +-
+ net/wireless/reg.h | 2 +-
+ net/wireless/scan.c | 5 +
+ net/wireless/sme.c | 2 +-
+ net/wireless/util.c | 4 +-
+ net/wireless/wext-compat.c | 11 +-
+ net/xfrm/xfrm_policy.c | 3 +-
+ security/Kconfig | 6 +
+ security/Makefile | 2 +
+ security/apparmor/.gitignore | 5 +
+ security/apparmor/Kconfig | 31 +
+ security/apparmor/Makefile | 24 +
+ security/apparmor/apparmorfs.c | 239 +
+ security/apparmor/audit.c | 215 +
+ security/apparmor/capability.c | 141 +
+ security/apparmor/context.c | 216 +
+ security/apparmor/domain.c | 823 ++
+ security/apparmor/file.c | 457 +
+ security/apparmor/include/apparmor.h | 92 +
+ security/apparmor/include/apparmorfs.h | 20 +
+ security/apparmor/include/audit.h | 123 +
+ security/apparmor/include/capability.h | 45 +
+ security/apparmor/include/context.h | 154 +
+ security/apparmor/include/domain.h | 36 +
+ security/apparmor/include/file.h | 217 +
+ security/apparmor/include/ipc.h | 28 +
+ security/apparmor/include/match.h | 132 +
+ security/apparmor/include/path.h | 31 +
+ security/apparmor/include/policy.h | 305 +
+ security/apparmor/include/policy_unpack.h | 20 +
+ security/apparmor/include/procattr.h | 26 +
+ security/apparmor/include/resource.h | 46 +
+ security/apparmor/include/sid.h | 24 +
+ security/apparmor/ipc.c | 114 +
+ security/apparmor/lib.c | 133 +
+ security/apparmor/lsm.c | 938 ++
+ security/apparmor/match.c | 353 +
+ security/apparmor/path.c | 235 +
+ security/apparmor/policy.c | 1184 ++
+ security/apparmor/policy_unpack.c | 703 +
+ security/apparmor/procattr.c | 170 +
+ security/apparmor/resource.c | 134 +
+ security/apparmor/sid.c | 55 +
+ security/capability.c | 5 +-
+ security/inode.c | 4 +-
+ security/integrity/ima/ima_fs.c | 9 +-
+ security/keys/internal.h | 5 +
+ security/keys/keyctl.c | 29 +-
+ security/keys/proc.c | 20 +-
+ security/keys/process_keys.c | 64 +-
+ security/keys/request_key.c | 1 +
+ security/security.c | 5 +-
+ security/selinux/avc.c | 25 +-
+ security/selinux/hooks.c | 292 +-
+ security/selinux/include/classmap.h | 16 +-
+ security/selinux/netnode.c | 2 -
+ security/selinux/selinuxfs.c | 16 +
+ security/selinux/ss/avtab.c | 39 +-
+ security/selinux/ss/conditional.c | 65 +-
+ security/selinux/ss/policydb.c | 658 +-
+ security/selinux/ss/policydb.h | 4 +-
+ security/selinux/ss/services.c | 7 +-
+ security/selinux/ss/symtab.c | 2 +-
+ security/smack/smack.h | 10 -
+ security/smack/smack_lsm.c | 18 +-
+ security/tomoyo/Makefile | 2 +-
+ security/tomoyo/common.c | 2836 ++---
+ security/tomoyo/common.h | 850 +-
+ security/tomoyo/domain.c | 855 +-
+ security/tomoyo/file.c | 1533 +--
+ security/tomoyo/gc.c | 360 +-
+ security/tomoyo/group.c | 130 +
+ security/tomoyo/load_policy.c | 81 +
+ security/tomoyo/memory.c | 282 +
+ security/tomoyo/mount.c | 284 +
+ security/tomoyo/path_group.c | 172 -
+ security/tomoyo/realpath.c | 426 +-
+ security/tomoyo/securityfs_if.c | 155 +
+ security/tomoyo/tomoyo.c | 35 +-
+ security/tomoyo/util.c | 963 ++
+ sound/core/pcm_native.c | 13 +-
+ sound/drivers/Kconfig | 2 +-
+ sound/pci/trident/trident_main.c | 2 +-
+ sound/soc/fsl/mpc8610_hpcd.c | 2 +-
+ sound/soc/imx/imx-ssi.c | 2 +-
+ sound/soc/soc-core.c | 2 +-
+ sound/usb/pcm.c | 2 +-
+ tools/perf/builtin-timechart.c | 11 +-
+ virt/kvm/assigned-dev.c | 7 +-
+ virt/kvm/coalesced_mmio.c | 1 +
+ virt/kvm/eventfd.c | 1 +
+ virt/kvm/ioapic.c | 3 +-
+ virt/kvm/iommu.c | 12 +-
+ virt/kvm/irq_comm.c | 15 +-
+ virt/kvm/kvm_main.c | 106 +-
+ 2376 files changed, 158675 insertions(+), 108042 deletions(-)
+ create mode 100644 Documentation/ABI/testing/debugfs-ec
+ create mode 100644 Documentation/DocBook/v4l/lirc_device_interface.xml
+ create mode 100644 Documentation/apparmor.txt
+ create mode 100644 Documentation/kvm/msr.txt
+ create mode 100644 Documentation/kvm/review-checklist.txt
+ create mode 100644 Documentation/networking/caif/spi_porting.txt
+ create mode 100644 Documentation/scsi/hpsa.txt
+ create mode 100644 arch/arm/plat-samsung/include/plat/keypad.h
+ create mode 100644 arch/powerpc/kvm/book3s_mmu_hpte.c
+ rename crypto/{twofish.c => twofish_generic.c} (99%)
+ create mode 100644 drivers/acpi/ec_sys.c
+ create mode 100644 drivers/base/power/wakeup.c
+ create mode 100644 drivers/bluetooth/hci_ath.c
+ create mode 100644 drivers/firmware/iscsi_boot_sysfs.c
+ create mode 100644 drivers/hid/hid-axff.c
+ create mode 100644 drivers/hid/hid-elecom.c
+ create mode 100644 drivers/input/keyboard/mcs_touchkey.c
+ create mode 100644 drivers/input/keyboard/samsung-keypad.c
+ create mode 100644 drivers/input/misc/adxl34x-i2c.c
+ create mode 100644 drivers/input/misc/adxl34x-spi.c
+ create mode 100644 drivers/input/misc/adxl34x.c
+ create mode 100644 drivers/input/misc/adxl34x.h
+ create mode 100644 drivers/input/misc/pwm-beeper.c
+ create mode 100644 drivers/input/touchscreen/ad7879-i2c.c
+ create mode 100644 drivers/input/touchscreen/ad7879-spi.c
+ create mode 100644 drivers/input/touchscreen/ad7879.h
+ create mode 100644 drivers/input/touchscreen/cy8ctmg110_ts.c
+ create mode 100644 drivers/input/touchscreen/qt602240_ts.c
+ create mode 100644 drivers/media/IR/ir-lirc-codec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-dib0700-nec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-dib0700-rc5.c
+ create mode 100644 drivers/media/IR/keymaps/rc-lirc.c
+ create mode 100644 drivers/media/IR/keymaps/rc-rc6-mce.c
+ create mode 100644 drivers/media/IR/lirc_dev.c
+ create mode 100644 drivers/media/IR/mceusb.c
+ create mode 100644 drivers/media/video/au0828/au0828-vbi.c
+ create mode 100644 drivers/media/video/davinci/Kconfig
+ create mode 100644 drivers/media/video/fsl-viu.c
+ create mode 100644 drivers/media/video/gspca/spca1528.c
+ create mode 100644 drivers/media/video/gspca/sq930x.c
+ delete mode 100644 drivers/media/video/ov511.c
+ delete mode 100644 drivers/media/video/ov511.h
+ delete mode 100644 drivers/media/video/ovcamchip/Makefile
+ delete mode 100644 drivers/media/video/ovcamchip/ov6x20.c
+ delete mode 100644 drivers/media/video/ovcamchip/ov6x30.c
+ delete mode 100644 drivers/media/video/ovcamchip/ov76be.c
+ delete mode 100644 drivers/media/video/ovcamchip/ov7x10.c
+ delete mode 100644 drivers/media/video/ovcamchip/ov7x20.c
+ delete mode 100644 drivers/media/video/ovcamchip/ovcamchip_core.c
+ delete mode 100644 drivers/media/video/ovcamchip/ovcamchip_priv.h
+ create mode 100644 drivers/media/video/sh_mobile_csi2.c
+ delete mode 100644 drivers/media/video/stv680.c
+ delete mode 100644 drivers/media/video/stv680.h
+ delete mode 100644 drivers/media/video/usbvideo/quickcam_messenger.c
+ delete mode 100644 drivers/media/video/usbvideo/quickcam_messenger.h
+ delete mode 100644 drivers/media/video/w9968cf.c
+ delete mode 100644 drivers/media/video/w9968cf.h
+ delete mode 100644 drivers/media/video/w9968cf_decoder.h
+ delete mode 100644 drivers/media/video/w9968cf_vpp.h
+ delete mode 100644 drivers/media/video/zc0301/Kconfig
+ delete mode 100644 drivers/media/video/zc0301/Makefile
+ delete mode 100644 drivers/media/video/zc0301/zc0301.h
+ delete mode 100644 drivers/media/video/zc0301/zc0301_core.c
+ delete mode 100644 drivers/media/video/zc0301/zc0301_pas202bcb.c
+ delete mode 100644 drivers/media/video/zc0301/zc0301_pb0330.c
+ delete mode 100644 drivers/media/video/zc0301/zc0301_sensor.h
+ create mode 100644 drivers/net/bnx2x/Makefile
+ rename drivers/net/{ => bnx2x}/bnx2x.h (84%)
+ create mode 100644 drivers/net/bnx2x/bnx2x_cmn.c
+ create mode 100644 drivers/net/bnx2x/bnx2x_cmn.h
+ rename drivers/net/{ => bnx2x}/bnx2x_dump.h (100%)
+ create mode 100644 drivers/net/bnx2x/bnx2x_ethtool.c
+ rename drivers/net/{ => bnx2x}/bnx2x_fw_defs.h (100%)
+ rename drivers/net/{ => bnx2x}/bnx2x_fw_file_hdr.h (100%)
+ rename drivers/net/{ => bnx2x}/bnx2x_hsi.h (100%)
+ rename drivers/net/{ => bnx2x}/bnx2x_init.h (100%)
+ rename drivers/net/{ => bnx2x}/bnx2x_init_ops.h (100%)
+ rename drivers/net/{ => bnx2x}/bnx2x_link.c (99%)
+ rename drivers/net/{ => bnx2x}/bnx2x_link.h (100%)
+ create mode 100644 drivers/net/bnx2x/bnx2x_main.c
+ rename drivers/net/{ => bnx2x}/bnx2x_reg.h (100%)
+ create mode 100644 drivers/net/bnx2x/bnx2x_stats.c
+ create mode 100644 drivers/net/bnx2x/bnx2x_stats.h
+ delete mode 100644 drivers/net/bnx2x_main.c
+ create mode 100644 drivers/net/caif/caif_spi.c
+ create mode 100644 drivers/net/caif/caif_spi_slave.c
+ create mode 100644 drivers/net/can/flexcan.c
+ create mode 100644 drivers/net/can/usb/esd_usb2.c
+ create mode 100644 drivers/net/cxgb4vf/Makefile
+ create mode 100644 drivers/net/cxgb4vf/adapter.h
+ create mode 100644 drivers/net/cxgb4vf/cxgb4vf_main.c
+ create mode 100644 drivers/net/cxgb4vf/sge.c
+ create mode 100644 drivers/net/cxgb4vf/t4vf_common.h
+ create mode 100644 drivers/net/cxgb4vf/t4vf_defs.h
+ create mode 100644 drivers/net/cxgb4vf/t4vf_hw.c
+ create mode 100644 drivers/net/wireless/ath/ath5k/sysfs.c
+ copy drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p0_initvals.h} (87%)
+ rename drivers/net/wireless/ath/ath9k/{ar9003_initvals.h => ar9003_2p2_initvals.h} (78%)
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+ rename drivers/net/wireless/iwlwifi/{iwl-calib.c => iwl-agn-calib.c} (83%)
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rx.c
+ delete mode 100644 drivers/net/wireless/libertas/assoc.c
+ delete mode 100644 drivers/net/wireless/libertas/assoc.h
+ delete mode 100644 drivers/net/wireless/libertas/scan.c
+ delete mode 100644 drivers/net/wireless/libertas/scan.h
+ delete mode 100644 drivers/net/wireless/libertas/wext.c
+ delete mode 100644 drivers/net/wireless/libertas/wext.h
+ create mode 100644 drivers/net/wireless/wl12xx/wl1271_ini.h
+ create mode 100644 drivers/net/wireless/wl12xx/wl1271_scan.c
+ create mode 100644 drivers/net/wireless/wl12xx/wl1271_scan.h
+ create mode 100644 drivers/platform/x86/intel_ips.c
+ create mode 100644 drivers/platform/x86/intel_pmic_gpio.c
+ rename drivers/{staging/rar_register/rar_register.c => platform/x86/intel_rar_register.c} (99%)
+ create mode 100644 drivers/scsi/bfa/bfad_debugfs.c
+ create mode 100644 drivers/scsi/bfa/include/bfi/bfi_pbc.h
+ create mode 100644 drivers/scsi/qla4xxx/ql4_nx.c
+ create mode 100644 drivers/scsi/qla4xxx/ql4_nx.h
+ create mode 100644 drivers/scsi/scsi_pm.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-audups11.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video0.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video1.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video2.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video3.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video4.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video5.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video6.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-video7.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-videoioctl.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-vidups10.c
+ delete mode 100644 drivers/staging/cx25821/cx25821-vidups9.c
+ create mode 100644 drivers/staging/lirc/Kconfig
+ create mode 100644 drivers/staging/lirc/Makefile
+ create mode 100644 drivers/staging/lirc/TODO
+ create mode 100644 drivers/staging/lirc/TODO.lirc_i2c
+ create mode 100644 drivers/staging/lirc/lirc_bt829.c
+ create mode 100644 drivers/staging/lirc/lirc_ene0100.c
+ create mode 100644 drivers/staging/lirc/lirc_ene0100.h
+ create mode 100644 drivers/staging/lirc/lirc_i2c.c
+ create mode 100644 drivers/staging/lirc/lirc_igorplugusb.c
+ create mode 100644 drivers/staging/lirc/lirc_imon.c
+ create mode 100644 drivers/staging/lirc/lirc_it87.c
+ create mode 100644 drivers/staging/lirc/lirc_it87.h
+ create mode 100644 drivers/staging/lirc/lirc_ite8709.c
+ create mode 100644 drivers/staging/lirc/lirc_parallel.c
+ create mode 100644 drivers/staging/lirc/lirc_parallel.h
+ create mode 100644 drivers/staging/lirc/lirc_sasem.c
+ create mode 100644 drivers/staging/lirc/lirc_serial.c
+ create mode 100644 drivers/staging/lirc/lirc_sir.c
+ create mode 100644 drivers/staging/lirc/lirc_streamzap.c
+ create mode 100644 drivers/staging/lirc/lirc_ttusbir.c
+ create mode 100644 drivers/staging/lirc/lirc_zilog.c
+ delete mode 100644 drivers/staging/rar_register/Kconfig
+ delete mode 100644 drivers/staging/rar_register/Makefile
+ create mode 100644 drivers/staging/tm6000/tm6000-input.c
+ create mode 100644 firmware/cxgb3/t3fw-7.10.0.bin.ihex
+ delete mode 100644 firmware/cxgb3/t3fw-7.4.0.bin.ihex
+ create mode 100644 include/linux/can/platform/flexcan.h
+ create mode 100644 include/linux/i2c/mcs.h
+ delete mode 100644 include/linux/i2c/mcs5000_ts.h
+ create mode 100644 include/linux/i2c/qt602240_ts.h
+ create mode 100644 include/linux/input/adxl34x.h
+ create mode 100644 include/linux/input/cy8ctmg110_pdata.h
+ create mode 100644 include/linux/intel_pmic_gpio.h
+ create mode 100644 include/linux/iscsi_boot_sysfs.h
+ create mode 100644 include/linux/netfilter/xt_CHECKSUM.h
+ create mode 100644 include/linux/netfilter/xt_IDLETIMER.h
+ create mode 100644 include/linux/netfilter/xt_cpu.h
+ create mode 100644 include/linux/netfilter/xt_ipvs.h
+ create mode 100644 include/linux/ptp_classify.h
+ rename {drivers/staging/rar_register => include/linux}/rar_register.h (100%)
+ create mode 100644 include/linux/u64_stats_sync.h
+ create mode 100644 include/media/lirc.h
+ create mode 100644 include/media/lirc_dev.h
+ create mode 100644 include/media/sh_mobile_csi2.h
+ create mode 100644 include/net/caif/caif_spi.h
+ create mode 100644 net/core/timestamping.c
+ create mode 100644 net/mac80211/rc80211_minstrel_ht.c
+ create mode 100644 net/mac80211/rc80211_minstrel_ht.h
+ create mode 100644 net/mac80211/rc80211_minstrel_ht_debugfs.c
+ create mode 100644 net/netfilter/xt_CHECKSUM.c
+ create mode 100644 net/netfilter/xt_IDLETIMER.c
+ create mode 100644 net/netfilter/xt_cpu.c
+ create mode 100644 net/netfilter/xt_ipvs.c
+ create mode 100644 security/apparmor/.gitignore
+ create mode 100644 security/apparmor/Kconfig
+ create mode 100644 security/apparmor/Makefile
+ create mode 100644 security/apparmor/apparmorfs.c
+ create mode 100644 security/apparmor/audit.c
+ create mode 100644 security/apparmor/capability.c
+ create mode 100644 security/apparmor/context.c
+ create mode 100644 security/apparmor/domain.c
+ create mode 100644 security/apparmor/file.c
+ create mode 100644 security/apparmor/include/apparmor.h
+ create mode 100644 security/apparmor/include/apparmorfs.h
+ create mode 100644 security/apparmor/include/audit.h
+ create mode 100644 security/apparmor/include/capability.h
+ create mode 100644 security/apparmor/include/context.h
+ create mode 100644 security/apparmor/include/domain.h
+ create mode 100644 security/apparmor/include/file.h
+ create mode 100644 security/apparmor/include/ipc.h
+ create mode 100644 security/apparmor/include/match.h
+ create mode 100644 security/apparmor/include/path.h
+ create mode 100644 security/apparmor/include/policy.h
+ create mode 100644 security/apparmor/include/policy_unpack.h
+ create mode 100644 security/apparmor/include/procattr.h
+ create mode 100644 security/apparmor/include/resource.h
+ create mode 100644 security/apparmor/include/sid.h
+ create mode 100644 security/apparmor/ipc.c
+ create mode 100644 security/apparmor/lib.c
+ create mode 100644 security/apparmor/lsm.c
+ create mode 100644 security/apparmor/match.c
+ create mode 100644 security/apparmor/path.c
+ create mode 100644 security/apparmor/policy.c
+ create mode 100644 security/apparmor/policy_unpack.c
+ create mode 100644 security/apparmor/procattr.c
+ create mode 100644 security/apparmor/resource.c
+ create mode 100644 security/apparmor/sid.c
+ create mode 100644 security/tomoyo/group.c
+ create mode 100644 security/tomoyo/load_policy.c
+ create mode 100644 security/tomoyo/memory.c
+ create mode 100644 security/tomoyo/mount.c
+ delete mode 100644 security/tomoyo/path_group.c
+ create mode 100644 security/tomoyo/securityfs_if.c
+ create mode 100644 security/tomoyo/util.c
+Merging fixes/fixes
+$ git merge fixes/fixes
+Already up-to-date.
+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
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 2 +-
+ arch/sparc/mm/iommu.c | 2 +-
+ drivers/sbus/char/display7seg.c | 8 ++++----
+ drivers/sbus/char/envctrl.c | 2 --
+ drivers/sbus/char/flash.c | 15 ++++++++-------
+ drivers/sbus/char/openprom.c | 15 ++++++++-------
+ drivers/sbus/char/uctrl.c | 7 ++++---
+ 7 files changed, 26 insertions(+), 25 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/cxgb3/cxgb3_main.c | 25 +++++++++++++------------
+ drivers/net/cxgb4vf/cxgb4vf_main.c | 31 ++++++++++++++++---------------
+ drivers/net/davinci_emac.c | 2 +-
+ drivers/net/enic/enic_main.c | 17 ++---------------
+ drivers/net/via-velocity.c | 4 ++--
+ 5 files changed, 34 insertions(+), 45 deletions(-)
+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/rc-fixes
+$ git merge kbuild-current/rc-fixes
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Already up-to-date.
+Merging quilt/tty.current
+$ git merge quilt/tty.current
+Already up-to-date.
+Merging quilt/usb.current
+$ git merge quilt/usb.current
+Already up-to-date.
+Merging quilt/staging.current
+$ git merge quilt/staging.current
+Already up-to-date.
+Merging cpufreq-current/fixes
+$ git merge cpufreq-current/fixes
+Already up-to-date.
+Merging input-current/for-linus
+$ git merge input-current/for-linus
+Already up-to-date.
+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 ide-curent/master
+$ git merge ide-curent/master
+Merge made by recursive.
+ drivers/ide/ide-cd.c | 14 +++++++++++---
+ drivers/ide/via82cxxx.c | 2 +-
+ 2 files changed, 12 insertions(+), 4 deletions(-)
+Merging dwmw2/master
+$ git merge dwmw2/master
+Already up-to-date.
+Merging gcl-current/merge
+$ git merge gcl-current/merge
+Already up-to-date.
+Merging arm/devel
+$ git merge arm/devel
+Already up-to-date.
+Merging davinci/davinci-next
+$ git merge davinci/davinci-next
+Resolved 'arch/arm/mach-davinci/board-da850-evm.c' using previous resolution.
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+CONFLICT (content): Merge conflict in arch/arm/mach-davinci/board-da850-evm.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4359834] Merge remote branch 'davinci/davinci-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/configs/tnetv107x_defconfig | 1741 ++++++++++++++++++++++
+ arch/arm/mach-davinci/Kconfig | 12 +
+ arch/arm/mach-davinci/Makefile | 3 +
+ arch/arm/mach-davinci/board-da830-evm.c | 32 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 66 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 35 +
+ arch/arm/mach-davinci/board-tnetv107x-evm.c | 174 +++
+ arch/arm/mach-davinci/da830.c | 5 -
+ arch/arm/mach-davinci/da850.c | 25 -
+ arch/arm/mach-davinci/devices-da8xx.c | 50 +-
+ arch/arm/mach-davinci/devices-tnetv107x.c | 320 ++++
+ arch/arm/mach-davinci/dm355.c | 22 +-
+ arch/arm/mach-davinci/dm365.c | 28 +-
+ arch/arm/mach-davinci/dm644x.c | 22 +-
+ arch/arm/mach-davinci/dm646x.c | 30 +-
+ arch/arm/mach-davinci/dma.c | 62 +-
+ arch/arm/mach-davinci/gpio-tnetv107x.c | 205 +++
+ arch/arm/mach-davinci/include/mach/da8xx.h | 3 +-
+ arch/arm/mach-davinci/include/mach/debug-macro.S | 50 +-
+ arch/arm/mach-davinci/include/mach/dm646x.h | 1 +
+ arch/arm/mach-davinci/include/mach/edma.h | 11 +
+ arch/arm/mach-davinci/include/mach/gpio.h | 22 +-
+ arch/arm/mach-davinci/include/mach/serial.h | 21 +
+ arch/arm/mach-davinci/include/mach/tnetv107x.h | 55 +
+ arch/arm/mach-davinci/include/mach/uncompress.h | 87 +-
+ arch/arm/mach-davinci/tnetv107x.c | 753 ++++++++++
+ 26 files changed, 3681 insertions(+), 154 deletions(-)
+ create mode 100644 arch/arm/configs/tnetv107x_defconfig
+ create mode 100644 arch/arm/mach-davinci/board-tnetv107x-evm.c
+ create mode 100644 arch/arm/mach-davinci/devices-tnetv107x.c
+ create mode 100644 arch/arm/mach-davinci/gpio-tnetv107x.c
+ create mode 100644 arch/arm/mach-davinci/include/mach/tnetv107x.h
+ create mode 100644 arch/arm/mach-davinci/tnetv107x.c
+Merging i.MX/for-next
+$ git merge i.MX/for-next
+Merge made by recursive.
+ arch/arm/mach-imx/Kconfig | 9 +
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 ++++++++++++++++++++
+ arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +-
+ arch/arm/mach-mx25/mach-cpuimx25.c | 4 +-
+ arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +-
+ arch/arm/mach-mx3/mach-cpuimx35.c | 4 +-
+ arch/arm/plat-mxc/include/mach/eukrea-baseboards.h | 4 +-
+ arch/arm/plat-mxc/include/mach/gpio.h | 1 +
+ 9 files changed, 282 insertions(+), 8 deletions(-)
+ create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+Merging msm/for-next
+$ git merge msm/for-next
+Auto-merging arch/arm/mach-msm/acpuclock-arm11.c
+Auto-merging arch/arm/mach-msm/board-trout.c
+Merge made by recursive.
+ arch/arm/mach-msm/Kconfig | 7 +
+ arch/arm/mach-msm/Makefile | 4 +-
+ arch/arm/mach-msm/acpuclock-arm11.c | 1 -
+ arch/arm/mach-msm/board-msm7x30.c | 28 ++-
+ arch/arm/mach-msm/board-qsd8x50.c | 27 ++-
+ arch/arm/mach-msm/board-trout-gpio.c | 115 +++++++++
+ arch/arm/mach-msm/board-trout-mmc.c | 189 +++++++++++++++
+ arch/arm/mach-msm/board-trout.c | 11 +
+ arch/arm/mach-msm/clock.c | 1 -
+ arch/arm/mach-msm/devices-msm7x30.c | 21 ++
+ arch/arm/mach-msm/devices-qsd8x50.c | 21 ++
+ arch/arm/mach-msm/devices.h | 33 +++
+ arch/arm/mach-msm/gpio.c | 32 +++
+ arch/arm/mach-msm/gpio_hw-7x30.h | 100 ++++++++
+ arch/arm/mach-msm/gpio_hw-7xxx.h | 84 +++++++
+ arch/arm/mach-msm/gpio_hw-8x50.h | 100 ++++++++
+ arch/arm/mach-msm/gpio_hw.h | 35 +++
+ arch/arm/mach-msm/include/mach/gpio.h | 2 +
+ arch/arm/mach-msm/msm7200a-gpio.c | 421 +++++++++++++++++++++++++++++++++
+ arch/arm/mach-msm/msm7200a-gpio.h | 87 +++++++
+ arch/arm/mach-msm/smd.c | 2 +-
+ drivers/mmc/host/msm_sdcc.c | 38 ++--
+ drivers/video/msm/mddi.c | 4 +-
+ drivers/video/msm/mdp.c | 1 -
+ 24 files changed, 1334 insertions(+), 30 deletions(-)
+ create mode 100644 arch/arm/mach-msm/board-trout-mmc.c
+ create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h
+ create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h
+ create mode 100644 arch/arm/mach-msm/gpio_hw-8x50.h
+ create mode 100644 arch/arm/mach-msm/gpio_hw.h
+ create mode 100644 arch/arm/mach-msm/msm7200a-gpio.c
+ create mode 100644 arch/arm/mach-msm/msm7200a-gpio.h
+Merging omap/for-next
+$ git merge omap/for-next
+Removing arch/arm/configs/am3517_evm_defconfig
+Removing arch/arm/configs/cm_t35_defconfig
+Removing arch/arm/configs/devkit8000_defconfig
+Removing arch/arm/configs/igep0020_defconfig
+Removing arch/arm/configs/omap3_beagle_defconfig
+Removing arch/arm/configs/omap3_evm_defconfig
+Removing arch/arm/configs/omap3_pandora_defconfig
+Removing arch/arm/configs/omap3_stalker_lks_defconfig
+Removing arch/arm/configs/omap3_touchbook_defconfig
+Removing arch/arm/configs/omap_2430sdp_defconfig
+Removing arch/arm/configs/omap_3430sdp_defconfig
+Removing arch/arm/configs/omap_3630sdp_defconfig
+Removing arch/arm/configs/omap_apollon_2420_defconfig
+Removing arch/arm/configs/omap_h4_2420_defconfig
+Removing arch/arm/configs/omap_ldp_defconfig
+Removing arch/arm/configs/omap_zoom2_defconfig
+Removing arch/arm/configs/omap_zoom3_defconfig
+Removing arch/arm/configs/overo_defconfig
+Removing arch/arm/configs/rx51_defconfig
+Removing arch/arm/plat-omap/include/plat/dsp_common.h
+Merge made by recursive.
+ arch/arm/configs/am3517_evm_defconfig | 127 ----
+ arch/arm/configs/cm_t35_defconfig | 157 ----
+ arch/arm/configs/devkit8000_defconfig | 184 -----
+ arch/arm/configs/igep0020_defconfig | 179 -----
+ arch/arm/configs/omap3_beagle_defconfig | 134 ----
+ arch/arm/configs/omap3_evm_defconfig | 160 ----
+ arch/arm/configs/omap3_pandora_defconfig | 158 ----
+ arch/arm/configs/omap3_stalker_lks_defconfig | 150 ----
+ arch/arm/configs/omap3_touchbook_defconfig | 621 ---------------
+ arch/arm/configs/omap_2430sdp_defconfig | 136 ----
+ arch/arm/configs/omap_3430sdp_defconfig | 178 -----
+ arch/arm/configs/omap_3630sdp_defconfig | 154 ----
+ arch/arm/configs/omap_apollon_2420_defconfig | 92 ---
+ arch/arm/configs/omap_h4_2420_defconfig | 107 ---
+ arch/arm/configs/omap_ldp_defconfig | 135 ----
+ arch/arm/configs/omap_zoom2_defconfig | 143 ----
+ arch/arm/configs/omap_zoom3_defconfig | 155 ----
+ arch/arm/configs/overo_defconfig | 275 -------
+ arch/arm/configs/rx51_defconfig | 222 ------
+ arch/arm/mach-omap1/Kconfig | 13 +
+ arch/arm/mach-omap1/Makefile | 3 +
+ arch/arm/mach-omap1/board-ams-delta.c | 2 +-
+ arch/arm/mach-omap1/board-fsample.c | 12 +
+ arch/arm/mach-omap1/board-generic.c | 4 +-
+ arch/arm/mach-omap1/board-h2.c | 31 +-
+ arch/arm/mach-omap1/board-h3.c | 15 +-
+ arch/arm/mach-omap1/board-htcherald.c | 2 +-
+ arch/arm/mach-omap1/board-innovator.c | 4 +-
+ arch/arm/mach-omap1/board-nokia770.c | 136 +----
+ arch/arm/mach-omap1/board-osk.c | 2 +-
+ arch/arm/mach-omap1/board-palmte.c | 86 +---
+ arch/arm/mach-omap1/board-palmtt.c | 2 +-
+ arch/arm/mach-omap1/board-palmz71.c | 2 +-
+ arch/arm/mach-omap1/board-perseus2.c | 12 +
+ arch/arm/mach-omap1/board-sx1.c | 2 +-
+ arch/arm/mach-omap1/board-voiceblue.c | 2 +-
+ arch/arm/mach-omap1/clock.c | 22 +-
+ arch/arm/mach-omap1/clock.h | 2 +-
+ arch/arm/mach-omap1/clock_data.c | 149 +++-
+ arch/arm/mach-omap1/devices.c | 72 --
+ arch/arm/mach-omap1/include/mach/debug-macro.S | 10 +-
+ arch/arm/mach-omap1/mailbox.c | 55 +-
+ arch/arm/mach-omap1/mcbsp.c | 3 -
+ arch/arm/mach-omap1/mux.c | 6 +-
+ arch/arm/mach-omap1/serial.c | 7 +
+ arch/arm/mach-omap1/usb.c | 530 +++++++++++++
+ arch/arm/mach-omap2/Kconfig | 89 +++
+ arch/arm/mach-omap2/Makefile | 23 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 23 +-
+ arch/arm/mach-omap2/board-3430sdp.c | 24 +-
+ arch/arm/mach-omap2/board-3630sdp.c | 129 +++-
+ arch/arm/mach-omap2/board-4430sdp.c | 70 ++-
+ arch/arm/mach-omap2/board-am3517evm.c | 8 +-
+ arch/arm/mach-omap2/board-apollon.c | 30 +-
+ arch/arm/mach-omap2/board-cm-t35.c | 28 +-
+ arch/arm/mach-omap2/board-devkit8000.c | 169 ++---
+ .../{board-sdp-flash.c => board-flash.c} | 93 +--
+ arch/arm/mach-omap2/board-generic.c | 1 -
+ arch/arm/mach-omap2/board-h4.c | 60 +-
+ arch/arm/mach-omap2/board-igep0020.c | 8 +-
+ arch/arm/mach-omap2/board-ldp.c | 43 +-
+ arch/arm/mach-omap2/board-n8x0.c | 11 +
+ arch/arm/mach-omap2/board-omap3beagle.c | 32 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 8 +-
+ arch/arm/mach-omap2/board-omap3pandora.c | 156 ++++-
+ arch/arm/mach-omap2/board-omap3stalker.c | 8 +-
+ arch/arm/mach-omap2/board-omap3touchbook.c | 33 +-
+ arch/arm/mach-omap2/board-omap4panda.c | 304 ++++++++
+ arch/arm/mach-omap2/board-overo.c | 74 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 78 ++-
+ arch/arm/mach-omap2/board-rx51-video.c | 1 -
+ arch/arm/mach-omap2/board-rx51.c | 2 +-
+ arch/arm/mach-omap2/board-zoom2.c | 64 ++-
+ arch/arm/mach-omap2/board-zoom3.c | 64 ++-
+ arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
+ arch/arm/mach-omap2/cm.c | 6 +-
+ arch/arm/mach-omap2/devices.c | 88 +--
+ arch/arm/mach-omap2/gpmc-nand.c | 37 +-
+ arch/arm/mach-omap2/gpmc.c | 284 +++++++-
+ arch/arm/mach-omap2/i2c.c | 27 +-
+ arch/arm/mach-omap2/id.c | 64 ++-
+ .../include/mach/{board-sdp.h => board-flash.h} | 9 +-
+ arch/arm/mach-omap2/include/mach/board-zoom.h | 6 +
+ arch/arm/mach-omap2/include/mach/debug-macro.S | 29 +-
+ arch/arm/mach-omap2/include/mach/id.h | 22 +
+ arch/arm/mach-omap2/include/mach/omap4-common.h | 7 +
+ arch/arm/mach-omap2/io.c | 13 +-
+ arch/arm/mach-omap2/iommu2.c | 44 +-
+ arch/arm/mach-omap2/mailbox.c | 182 ++---
+ arch/arm/mach-omap2/mcbsp.c | 13 +-
+ arch/arm/mach-omap2/mux.c | 338 +--------
+ arch/arm/mach-omap2/mux.h | 28 +-
+ arch/arm/mach-omap2/mux2420.c | 688 +++++++++++++++++
+ arch/arm/mach-omap2/mux2420.h | 282 +++++++
+ arch/arm/mach-omap2/mux2430.c | 791 ++++++++++++++++++++
+ arch/arm/mach-omap2/mux2430.h | 370 +++++++++
+ arch/arm/mach-omap2/mux34xx.c | 8 +-
+ arch/arm/mach-omap2/omap-headsmp.S | 16 -
+ arch/arm/mach-omap2/omap-hotplug.c | 79 ++
+ arch/arm/mach-omap2/omap-iommu.c | 2 +-
+ arch/arm/mach-omap2/omap-smp.c | 3 +-
+ arch/arm/mach-omap2/omap44xx-smc.S | 25 +
+ arch/arm/mach-omap2/omap_hwmod.c | 106 ++-
+ arch/arm/mach-omap2/omap_hwmod_2420_data.c | 79 ++-
+ arch/arm/mach-omap2/omap_hwmod_2430_data.c | 81 ++-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 92 ++-
+ arch/arm/mach-omap2/omap_hwmod_common_data.c | 3 +
+ arch/arm/mach-omap2/omap_hwmod_common_data.h | 1 +
+ arch/arm/mach-omap2/pm.c | 84 ++
+ arch/arm/mach-omap2/pm24xx.c | 1 -
+ arch/arm/mach-omap2/pm34xx.c | 7 +-
+ arch/arm/mach-omap2/pm44xx.c | 135 ++++
+ arch/arm/mach-omap2/powerdomain.c | 1 +
+ arch/arm/mach-omap2/powerdomains34xx.h | 12 +-
+ arch/arm/mach-omap2/serial.c | 80 ++-
+ arch/arm/mach-omap2/usb-ehci.c | 1 -
+ arch/arm/mach-omap2/usb-fs.c | 359 +++++++++
+ arch/arm/mach-omap2/usb-musb.c | 1 -
+ arch/arm/mach-omap2/usb-tusb6010.c | 14 +-
+ arch/arm/plat-omap/Kconfig | 33 +-
+ arch/arm/plat-omap/Makefile | 1 +
+ arch/arm/plat-omap/common.c | 10 +-
+ arch/arm/plat-omap/debug-leds.c | 2 +-
+ arch/arm/plat-omap/devices.c | 124 ---
+ arch/arm/plat-omap/dma.c | 11 +-
+ arch/arm/plat-omap/gpio.c | 4 +-
+ arch/arm/plat-omap/i2c.c | 12 +-
+ arch/arm/plat-omap/include/plat/board.h | 8 +
+ arch/arm/plat-omap/include/plat/clock.h | 130 +++-
+ arch/arm/plat-omap/include/plat/common.h | 9 +-
+ arch/arm/plat-omap/include/plat/cpu.h | 17 +-
+ arch/arm/plat-omap/include/plat/dma.h | 1 +
+ arch/arm/plat-omap/include/plat/dsp_common.h | 40 -
+ arch/arm/plat-omap/include/plat/gpmc.h | 42 +-
+ arch/arm/plat-omap/include/plat/iommu.h | 2 +
+ arch/arm/plat-omap/include/plat/mailbox.h | 20 +-
+ arch/arm/plat-omap/include/plat/mux.h | 224 +------
+ arch/arm/plat-omap/include/plat/nand.h | 6 +-
+ arch/arm/plat-omap/include/plat/omap-pm.h | 130 +++-
+ arch/arm/plat-omap/include/plat/omap_device.h | 2 +
+ arch/arm/plat-omap/include/plat/omap_hwmod.h | 14 +-
+ arch/arm/plat-omap/include/plat/smp.h | 1 +
+ arch/arm/plat-omap/include/plat/uncompress.h | 6 +
+ arch/arm/plat-omap/include/plat/usb.h | 49 ++-
+ arch/arm/plat-omap/iommu.c | 27 +-
+ arch/arm/plat-omap/iopgtable.h | 8 +-
+ arch/arm/plat-omap/mailbox.c | 248 +++----
+ arch/arm/plat-omap/mux.c | 2 +-
+ arch/arm/plat-omap/omap-pm-noop.c | 61 ++-
+ arch/arm/plat-omap/omap_device.c | 37 +-
+ arch/arm/plat-omap/usb.c | 644 +----------------
+ drivers/mtd/nand/omap2.c | 218 ++----
+ drivers/video/console/Kconfig | 2 +-
+ drivers/video/omap/lcd_apollon.c | 3 -
+ 154 files changed, 6420 insertions(+), 6534 deletions(-)
+ delete mode 100644 arch/arm/configs/am3517_evm_defconfig
+ delete mode 100644 arch/arm/configs/cm_t35_defconfig
+ delete mode 100644 arch/arm/configs/devkit8000_defconfig
+ delete mode 100644 arch/arm/configs/igep0020_defconfig
+ delete mode 100644 arch/arm/configs/omap3_beagle_defconfig
+ delete mode 100644 arch/arm/configs/omap3_evm_defconfig
+ delete mode 100644 arch/arm/configs/omap3_pandora_defconfig
+ delete mode 100644 arch/arm/configs/omap3_stalker_lks_defconfig
+ delete mode 100644 arch/arm/configs/omap3_touchbook_defconfig
+ delete mode 100644 arch/arm/configs/omap_2430sdp_defconfig
+ delete mode 100644 arch/arm/configs/omap_3430sdp_defconfig
+ delete mode 100644 arch/arm/configs/omap_3630sdp_defconfig
+ delete mode 100644 arch/arm/configs/omap_apollon_2420_defconfig
+ delete mode 100644 arch/arm/configs/omap_h4_2420_defconfig
+ delete mode 100644 arch/arm/configs/omap_ldp_defconfig
+ delete mode 100644 arch/arm/configs/omap_zoom2_defconfig
+ delete mode 100644 arch/arm/configs/omap_zoom3_defconfig
+ delete mode 100644 arch/arm/configs/overo_defconfig
+ delete mode 100644 arch/arm/configs/rx51_defconfig
+ create mode 100644 arch/arm/mach-omap1/usb.c
+ rename arch/arm/mach-omap2/{board-sdp-flash.c => board-flash.c} (66%)
+ create mode 100644 arch/arm/mach-omap2/board-omap4panda.c
+ rename arch/arm/mach-omap2/include/mach/{board-sdp.h => board-flash.h} (71%)
+ create mode 100644 arch/arm/mach-omap2/include/mach/id.h
+ create mode 100644 arch/arm/mach-omap2/mux2420.c
+ create mode 100644 arch/arm/mach-omap2/mux2420.h
+ create mode 100644 arch/arm/mach-omap2/mux2430.c
+ create mode 100644 arch/arm/mach-omap2/mux2430.h
+ create mode 100644 arch/arm/mach-omap2/omap-hotplug.c
+ create mode 100644 arch/arm/mach-omap2/pm.c
+ create mode 100644 arch/arm/mach-omap2/pm44xx.c
+ create mode 100644 arch/arm/mach-omap2/usb-fs.c
+ delete mode 100644 arch/arm/plat-omap/include/plat/dsp_common.h
+Merging pxa/for-next
+$ git merge pxa/for-next
+Already up-to-date.
+Merging samsung/next-samsung
+$ git merge samsung/next-samsung
+Already up-to-date.
+Merging s5p/for-next
+$ git merge s5p/for-next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/plat-samsung/include/plat/keypad.h' using previous resolution.
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/arm/Makefile
+Removing arch/arm/configs/s5pc110_defconfig
+Auto-merging arch/arm/mm/Kconfig
+Auto-merging arch/arm/plat-samsung/include/plat/keypad.h
+CONFLICT (add/add): Merge conflict in arch/arm/plat-samsung/include/plat/keypad.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 61e22c4] Merge remote branch 's5p/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/Kconfig | 36 ++-
+ arch/arm/Makefile | 1 +
+ arch/arm/configs/s5pc110_defconfig | 66 ---
+ arch/arm/configs/s5pv210_defconfig | 5 +
+ arch/arm/mach-s3c64xx/Kconfig | 16 +-
+ arch/arm/mach-s3c64xx/Makefile | 2 +
+ arch/arm/mach-s3c64xx/clock.c | 24 +-
+ arch/arm/mach-s3c64xx/include/mach/map.h | 6 +
+ arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 5 +
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 33 ++
+ arch/arm/mach-s3c64xx/s3c6410.c | 6 +-
+ arch/arm/mach-s3c64xx/setup-ide.c | 46 ++
+ arch/arm/mach-s3c64xx/setup-keypad.c | 34 ++
+ arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 15 +-
+ arch/arm/mach-s5p6440/Kconfig | 9 +-
+ arch/arm/mach-s5p6440/Makefile | 1 +
+ arch/arm/mach-s5p6440/cpu.c | 3 +-
+ arch/arm/mach-s5p6440/include/mach/irqs.h | 2 +-
+ arch/arm/mach-s5p6440/include/mach/map.h | 4 +-
+ arch/arm/mach-s5p6440/include/mach/system.h | 7 +-
+ arch/arm/mach-s5p6440/mach-smdk6440.c | 51 ++-
+ arch/arm/mach-s5p6440/setup-i2c0.c | 7 +-
+ arch/arm/mach-s5p6440/setup-i2c1.c | 30 ++
+ arch/arm/mach-s5p6442/Kconfig | 1 +
+ arch/arm/mach-s5p6442/clock.c | 6 +
+ arch/arm/mach-s5p6442/include/mach/irqs.h | 2 +-
+ arch/arm/mach-s5p6442/include/mach/map.h | 3 +
+ arch/arm/mach-s5p6442/include/mach/system.h | 7 +-
+ arch/arm/mach-s5p6442/mach-smdk6442.c | 25 +-
+ arch/arm/mach-s5pc100/Kconfig | 18 +
+ arch/arm/mach-s5pc100/Makefile | 2 +
+ arch/arm/mach-s5pc100/clock.c | 2 +-
+ arch/arm/mach-s5pc100/cpu.c | 5 +
+ arch/arm/mach-s5pc100/include/mach/irqs.h | 4 +-
+ arch/arm/mach-s5pc100/include/mach/map.h | 13 +
+ arch/arm/mach-s5pc100/include/mach/regs-clock.h | 3 +
+ arch/arm/mach-s5pc100/include/mach/system.h | 9 +-
+ arch/arm/mach-s5pc100/mach-smdkc100.c | 75 +++-
+ arch/arm/mach-s5pc100/setup-ide.c | 70 +++
+ arch/arm/mach-s5pc100/setup-keypad.c | 34 ++
+ arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 22 +-
+ arch/arm/mach-s5pv210/Kconfig | 65 +++-
+ arch/arm/mach-s5pv210/Makefile | 2 +
+ arch/arm/mach-s5pv210/cpu.c | 24 +-
+ arch/arm/mach-s5pv210/gpiolib.c | 14 +
+ arch/arm/mach-s5pv210/include/mach/gpio.h | 12 +-
+ arch/arm/mach-s5pv210/include/mach/irqs.h | 4 +-
+ arch/arm/mach-s5pv210/include/mach/map.h | 9 +
+ arch/arm/mach-s5pv210/include/mach/memory.h | 9 +-
+ arch/arm/mach-s5pv210/include/mach/regs-clock.h | 2 +
+ arch/arm/mach-s5pv210/include/mach/system.h | 7 +-
+ arch/arm/mach-s5pv210/mach-aquila.c | 370 ++++++++++++++-
+ arch/arm/mach-s5pv210/mach-goni.c | 395 +++++++++++++++-
+ arch/arm/mach-s5pv210/mach-smdkc110.c | 66 ++-
+ arch/arm/mach-s5pv210/mach-smdkv210.c | 93 +++-
+ arch/arm/mach-s5pv210/setup-ide.c | 50 ++
+ arch/arm/mach-s5pv210/setup-keypad.c | 34 ++
+ arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 42 ++-
+ arch/arm/mach-s5pv310/Kconfig | 26 +
+ arch/arm/mach-s5pv310/Makefile | 24 +
+ arch/arm/mach-s5pv310/Makefile.boot | 2 +
+ arch/arm/mach-s5pv310/clock.c | 544 ++++++++++++++++++++++
+ arch/arm/mach-s5pv310/cpu.c | 122 +++++
+ arch/arm/mach-s5pv310/headsmp.S | 41 ++
+ arch/arm/mach-s5pv310/include/mach/debug-macro.S | 36 ++
+ arch/arm/mach-s5pv310/include/mach/entry-macro.S | 84 ++++
+ arch/arm/mach-s5pv310/include/mach/gpio.h | 135 ++++++
+ arch/arm/mach-s5pv310/include/mach/hardware.h | 18 +
+ arch/arm/mach-s5pv310/include/mach/io.h | 26 +
+ arch/arm/mach-s5pv310/include/mach/irqs.h | 74 +++
+ arch/arm/mach-s5pv310/include/mach/map.h | 69 +++
+ arch/arm/mach-s5pv310/include/mach/memory.h | 22 +
+ arch/arm/mach-s5pv310/include/mach/pwm-clock.h | 70 +++
+ arch/arm/mach-s5pv310/include/mach/regs-clock.h | 62 +++
+ arch/arm/mach-s5pv310/include/mach/regs-irq.h | 19 +
+ arch/arm/mach-s5pv310/include/mach/smp.h | 29 ++
+ arch/arm/mach-s5pv310/include/mach/system.h | 22 +
+ arch/arm/mach-s5pv310/include/mach/timex.h | 29 ++
+ arch/arm/mach-s5pv310/include/mach/uncompress.h | 30 ++
+ arch/arm/mach-s5pv310/include/mach/vmalloc.h | 22 +
+ arch/arm/mach-s5pv310/init.c | 41 ++
+ arch/arm/mach-s5pv310/irq-combiner.c | 125 +++++
+ arch/arm/mach-s5pv310/localtimer.c | 25 +
+ arch/arm/mach-s5pv310/mach-smdkv310.c | 92 ++++
+ arch/arm/mach-s5pv310/platsmp.c | 192 ++++++++
+ arch/arm/mach-s5pv310/setup-i2c0.c | 20 +
+ arch/arm/mach-s5pv310/time.c | 287 ++++++++++++
+ arch/arm/mm/Kconfig | 3 +-
+ arch/arm/plat-s5p/Kconfig | 5 +-
+ arch/arm/plat-s5p/Makefile | 1 +
+ arch/arm/plat-s5p/cpu.c | 19 +-
+ arch/arm/plat-s5p/dev-pmu.c | 36 ++
+ arch/arm/plat-s5p/include/plat/map-s5p.h | 23 +-
+ arch/arm/plat-s5p/include/plat/pll.h | 41 ++
+ arch/arm/plat-s5p/include/plat/reset.h | 16 +
+ arch/arm/plat-s5p/include/plat/s5pv310.h | 34 ++
+ arch/arm/plat-s5p/include/plat/system-reset.h | 31 ++
+ arch/arm/plat-s5p/irq.c | 2 +
+ arch/arm/plat-samsung/Kconfig | 15 +
+ arch/arm/plat-samsung/Makefile | 7 +-
+ arch/arm/plat-samsung/dev-hsmmc.c | 5 +
+ arch/arm/plat-samsung/dev-hsmmc1.c | 5 +
+ arch/arm/plat-samsung/dev-hsmmc2.c | 5 +
+ arch/arm/plat-samsung/dev-hsmmc3.c | 77 +++
+ arch/arm/plat-samsung/dev-ide.c | 44 ++
+ arch/arm/plat-samsung/dev-keypad.c | 58 +++
+ arch/arm/plat-samsung/dev-wdt.c | 2 +-
+ arch/arm/plat-samsung/include/plat/adc-core.h | 28 ++
+ arch/arm/plat-samsung/include/plat/ata-core.h | 28 ++
+ arch/arm/plat-samsung/include/plat/ata.h | 36 ++
+ arch/arm/plat-samsung/include/plat/devs.h | 16 +
+ arch/arm/plat-samsung/include/plat/keypad-core.h | 31 ++
+ arch/arm/plat-samsung/include/plat/keypad.h | 13 +
+ arch/arm/plat-samsung/include/plat/regs-ata.h | 56 +++
+ arch/arm/plat-samsung/include/plat/regs-rtc.h | 3 +
+ arch/arm/plat-samsung/include/plat/regs-serial.h | 2 +
+ arch/arm/plat-samsung/include/plat/sdhci.h | 127 +++---
+ arch/arm/plat-samsung/platformdata.c | 37 ++
+ drivers/i2c/busses/Kconfig | 11 +-
+ drivers/rtc/Kconfig | 9 +-
+ drivers/rtc/rtc-s3c.c | 44 ++-
+ drivers/serial/Kconfig | 4 +-
+ drivers/serial/s5pv210.c | 8 +
+ drivers/serial/samsung.c | 9 +-
+ 124 files changed, 4753 insertions(+), 334 deletions(-)
+ delete mode 100644 arch/arm/configs/s5pc110_defconfig
+ create mode 100644 arch/arm/mach-s3c64xx/setup-ide.c
+ create mode 100644 arch/arm/mach-s3c64xx/setup-keypad.c
+ create mode 100644 arch/arm/mach-s5p6440/setup-i2c1.c
+ create mode 100644 arch/arm/mach-s5pc100/setup-ide.c
+ create mode 100644 arch/arm/mach-s5pc100/setup-keypad.c
+ create mode 100644 arch/arm/mach-s5pv210/setup-ide.c
+ create mode 100644 arch/arm/mach-s5pv210/setup-keypad.c
+ create mode 100644 arch/arm/mach-s5pv310/Kconfig
+ create mode 100644 arch/arm/mach-s5pv310/Makefile
+ create mode 100644 arch/arm/mach-s5pv310/Makefile.boot
+ create mode 100644 arch/arm/mach-s5pv310/clock.c
+ create mode 100644 arch/arm/mach-s5pv310/cpu.c
+ create mode 100644 arch/arm/mach-s5pv310/headsmp.S
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/io.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/map.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/memory.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/pwm-clock.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-clock.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-irq.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/smp.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/system.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/timex.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-s5pv310/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-s5pv310/init.c
+ create mode 100644 arch/arm/mach-s5pv310/irq-combiner.c
+ create mode 100644 arch/arm/mach-s5pv310/localtimer.c
+ create mode 100644 arch/arm/mach-s5pv310/mach-smdkv310.c
+ create mode 100644 arch/arm/mach-s5pv310/platsmp.c
+ create mode 100644 arch/arm/mach-s5pv310/setup-i2c0.c
+ create mode 100644 arch/arm/mach-s5pv310/time.c
+ create mode 100644 arch/arm/plat-s5p/dev-pmu.c
+ create mode 100644 arch/arm/plat-s5p/include/plat/reset.h
+ create mode 100644 arch/arm/plat-s5p/include/plat/s5pv310.h
+ create mode 100644 arch/arm/plat-s5p/include/plat/system-reset.h
+ create mode 100644 arch/arm/plat-samsung/dev-hsmmc3.c
+ create mode 100644 arch/arm/plat-samsung/dev-ide.c
+ create mode 100644 arch/arm/plat-samsung/dev-keypad.c
+ create mode 100644 arch/arm/plat-samsung/include/plat/adc-core.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/ata-core.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/ata.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/keypad-core.h
+ create mode 100644 arch/arm/plat-samsung/include/plat/regs-ata.h
+ create mode 100644 arch/arm/plat-samsung/platformdata.c
+Merging tegra/for-next
+$ git merge tegra/for-next
+Resolved 'arch/arm/Kconfig' using previous resolution.
+Resolved 'arch/arm/mm/Kconfig' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/Kconfig
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/mm/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 428b415] Merge remote branch 'tegra/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 9 +
+ arch/arm/Kconfig | 24 +-
+ arch/arm/Makefile | 1 +
+ arch/arm/configs/tegra_defconfig | 1095 +++++++++++++++++++
+ arch/arm/mach-tegra/Kconfig | 50 +
+ arch/arm/mach-tegra/Makefile | 14 +
+ arch/arm/mach-tegra/Makefile.boot | 3 +
+ arch/arm/mach-tegra/board-harmony-pinmux.c | 144 +++
+ arch/arm/mach-tegra/board-harmony.c | 127 +++
+ arch/arm/mach-tegra/board-harmony.h | 22 +
+ arch/arm/mach-tegra/board.h | 32 +
+ arch/arm/mach-tegra/clock.c | 488 +++++++++
+ arch/arm/mach-tegra/clock.h | 147 +++
+ arch/arm/mach-tegra/common.c | 61 ++
+ arch/arm/mach-tegra/gpio-names.h | 247 +++++
+ arch/arm/mach-tegra/gpio.c | 348 ++++++
+ arch/arm/mach-tegra/headsmp.S | 61 ++
+ arch/arm/mach-tegra/hotplug.c | 140 +++
+ arch/arm/mach-tegra/include/mach/barriers.h | 30 +
+ arch/arm/mach-tegra/include/mach/clk.h | 26 +
+ arch/arm/mach-tegra/include/mach/clkdev.h | 32 +
+ arch/arm/mach-tegra/include/mach/debug-macro.S | 46 +
+ arch/arm/mach-tegra/include/mach/entry-macro.S | 118 ++
+ arch/arm/mach-tegra/include/mach/gpio.h | 53 +
+ arch/arm/mach-tegra/include/mach/hardware.h | 24 +
+ arch/arm/mach-tegra/include/mach/io.h | 79 ++
+ arch/arm/mach-tegra/include/mach/iomap.h | 203 ++++
+ arch/arm/mach-tegra/include/mach/irqs.h | 173 +++
+ arch/arm/mach-tegra/include/mach/memory.h | 28 +
+ arch/arm/mach-tegra/include/mach/pinmux.h | 348 ++++++
+ arch/arm/mach-tegra/include/mach/smp.h | 30 +
+ arch/arm/mach-tegra/include/mach/system.h | 39 +
+ arch/arm/mach-tegra/include/mach/timex.h | 26 +
+ arch/arm/mach-tegra/include/mach/uncompress.h | 78 ++
+ arch/arm/mach-tegra/include/mach/vmalloc.h | 28 +
+ arch/arm/mach-tegra/io.c | 78 ++
+ arch/arm/mach-tegra/irq.c | 34 +
+ arch/arm/mach-tegra/localtimer.c | 25 +
+ arch/arm/mach-tegra/pinmux.c | 945 ++++++++++++++++
+ arch/arm/mach-tegra/platsmp.c | 156 +++
+ arch/arm/mach-tegra/tegra2_clocks.c | 1359 ++++++++++++++++++++++++
+ arch/arm/mach-tegra/timer.c | 187 ++++
+ arch/arm/mm/Kconfig | 2 +-
+ 43 files changed, 7154 insertions(+), 6 deletions(-)
+ create mode 100644 arch/arm/configs/tegra_defconfig
+ create mode 100644 arch/arm/mach-tegra/Kconfig
+ create mode 100644 arch/arm/mach-tegra/Makefile
+ create mode 100644 arch/arm/mach-tegra/Makefile.boot
+ create mode 100644 arch/arm/mach-tegra/board-harmony-pinmux.c
+ create mode 100644 arch/arm/mach-tegra/board-harmony.c
+ create mode 100644 arch/arm/mach-tegra/board-harmony.h
+ create mode 100644 arch/arm/mach-tegra/board.h
+ create mode 100644 arch/arm/mach-tegra/clock.c
+ create mode 100644 arch/arm/mach-tegra/clock.h
+ create mode 100644 arch/arm/mach-tegra/common.c
+ create mode 100644 arch/arm/mach-tegra/gpio-names.h
+ create mode 100644 arch/arm/mach-tegra/gpio.c
+ create mode 100644 arch/arm/mach-tegra/headsmp.S
+ create mode 100644 arch/arm/mach-tegra/hotplug.c
+ create mode 100644 arch/arm/mach-tegra/include/mach/barriers.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/clk.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-tegra/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-tegra/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/io.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/iomap.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/memory.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/pinmux.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/smp.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/system.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/timex.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-tegra/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-tegra/io.c
+ create mode 100644 arch/arm/mach-tegra/irq.c
+ create mode 100644 arch/arm/mach-tegra/localtimer.c
+ create mode 100644 arch/arm/mach-tegra/pinmux.c
+ create mode 100644 arch/arm/mach-tegra/platsmp.c
+ create mode 100644 arch/arm/mach-tegra/tegra2_clocks.c
+ create mode 100644 arch/arm/mach-tegra/timer.c
+Merging avr32/avr32-arch
+$ git merge avr32/avr32-arch
+Already up-to-date.
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Merge made by recursive.
+ arch/blackfin/include/asm/elf.h | 1 +
+ .../mach-bf527/include/mach/defBF52x_base.h | 81 --------------------
+ .../mach-bf548/include/mach/defBF54x_base.h | 60 ---------------
+ 3 files changed, 1 insertions(+), 141 deletions(-)
+Merging cris/for-next
+$ git merge cris/for-next
+Merge made by recursive.
+ arch/cris/Kconfig | 5 ++-
+ arch/cris/arch-v10/drivers/eeprom.c | 2 -
+ arch/cris/arch-v10/drivers/gpio.c | 30 +++++++----
+ arch/cris/arch-v10/drivers/i2c.c | 24 ++++++---
+ arch/cris/arch-v10/drivers/sync_serial.c | 30 +++++++---
+ arch/cris/arch-v10/kernel/time.c | 54 +------------------
+ arch/cris/arch-v32/drivers/cryptocop.c | 28 +++++++---
+ arch/cris/arch-v32/drivers/i2c.c | 12 ++--
+ arch/cris/arch-v32/drivers/mach-a3/gpio.c | 28 +++++++---
+ arch/cris/arch-v32/drivers/mach-fs/gpio.c | 42 +++++++++------
+ arch/cris/arch-v32/drivers/sync_serial.c | 30 +++++++---
+ arch/cris/arch-v32/kernel/time.c | 85 ++++++++++++-----------------
+ arch/cris/kernel/time.c | 7 ++-
+ arch/cris/mm/fault.c | 8 ++--
+ 14 files changed, 197 insertions(+), 188 deletions(-)
+Merging ia64/test
+$ git merge ia64/test
+Merge made by recursive.
+ arch/ia64/configs/bigsur_defconfig | 1428 ++------------------------
+ arch/ia64/configs/generic_defconfig | 1788 ++++-----------------------------
+ arch/ia64/configs/gensparse_defconfig | 1493 +++------------------------
+ arch/ia64/configs/sim_defconfig | 756 +-------------
+ arch/ia64/configs/tiger_defconfig | 1356 +++----------------------
+ arch/ia64/configs/xen_domu_defconfig | 1678 +++----------------------------
+ arch/ia64/configs/zx1_defconfig | 1681 +++-----------------------------
+ arch/ia64/include/asm/page.h | 2 +-
+ arch/ia64/kernel/perfmon.c | 22 +-
+ arch/ia64/kernel/vmlinux.lds.S | 362 ++++----
+ 10 files changed, 1058 insertions(+), 9508 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Merge made by recursive.
+ arch/m68k/mac/config.c | 9 +++++++++
+ arch/m68k/mac/misc.c | 6 +++---
+ arch/m68k/sun3/leds.c | 4 ++--
+ drivers/zorro/proc.c | 17 +++++++++--------
+ 4 files changed, 23 insertions(+), 13 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Merge made by recursive.
+ arch/m68k/include/asm/ide.h | 13 +++++++++++--
+ arch/m68knommu/kernel/process.c | 10 +++++-----
+ drivers/serial/68328serial.c | 8 --------
+ drivers/spi/coldfire_qspi.c | 1 +
+ 4 files changed, 17 insertions(+), 15 deletions(-)
+Merging microblaze/next
+$ git merge microblaze/next
+Auto-merging arch/microblaze/include/asm/system.h
+Auto-merging lib/Kconfig.debug
+Merge made by recursive.
+ arch/microblaze/Kconfig | 31 ++
+ arch/microblaze/Kconfig.debug | 1 +
+ arch/microblaze/boot/Makefile | 11 +-
+ arch/microblaze/include/asm/cacheflush.h | 18 +-
+ arch/microblaze/include/asm/dma-mapping.h | 6 -
+ arch/microblaze/include/asm/elf.h | 2 +-
+ arch/microblaze/include/asm/exceptions.h | 21 +-
+ arch/microblaze/include/asm/kgdb.h | 28 ++
+ arch/microblaze/include/asm/page.h | 12 +-
+ arch/microblaze/include/asm/pvr.h | 2 +-
+ arch/microblaze/include/asm/setup.h | 2 -
+ arch/microblaze/include/asm/system.h | 1 -
+ arch/microblaze/include/asm/uaccess.h | 4 +-
+ arch/microblaze/include/asm/unwind.h | 29 ++
+ arch/microblaze/kernel/Makefile | 3 +-
+ arch/microblaze/kernel/cpu/mb.c | 1 +
+ arch/microblaze/kernel/entry-nommu.S | 28 ++
+ arch/microblaze/kernel/entry.S | 607 ++++++++++---------------
+ arch/microblaze/kernel/exceptions.c | 9 +-
+ arch/microblaze/kernel/head.S | 4 +-
+ arch/microblaze/kernel/hw_exception_handler.S | 4 +-
+ arch/microblaze/kernel/irq.c | 2 +
+ arch/microblaze/kernel/kgdb.c | 147 ++++++
+ arch/microblaze/kernel/misc.S | 2 +-
+ arch/microblaze/kernel/process.c | 7 +-
+ arch/microblaze/kernel/ptrace.c | 17 +-
+ arch/microblaze/kernel/stacktrace.c | 44 +--
+ arch/microblaze/kernel/timer.c | 24 +-
+ arch/microblaze/kernel/traps.c | 91 ++--
+ arch/microblaze/kernel/unwind.c | 318 +++++++++++++
+ arch/microblaze/kernel/vmlinux.lds.S | 16 +-
+ arch/microblaze/mm/fault.c | 16 -
+ arch/microblaze/mm/init.c | 7 +-
+ lib/Kconfig.debug | 6 +-
+ 34 files changed, 977 insertions(+), 544 deletions(-)
+ create mode 100644 arch/microblaze/include/asm/kgdb.h
+ create mode 100644 arch/microblaze/include/asm/unwind.h
+ create mode 100644 arch/microblaze/kernel/kgdb.c
+ create mode 100644 arch/microblaze/kernel/unwind.c
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Removing arch/mips/nxp/pnx833x/stb22x/Makefile
+Removing arch/mips/nxp/pnx8550/jbs/Makefile
+Removing arch/mips/nxp/pnx8550/stb810/Makefile
+Auto-merging drivers/net/Kconfig
+Auto-merging drivers/net/au1000_eth.c
+Auto-merging drivers/rtc/Kconfig
+Auto-merging drivers/serial/Kconfig
+Merge made by recursive.
+ arch/mips/Kbuild | 15 +
+ arch/mips/Kbuild.platforms | 32 +
+ arch/mips/Kconfig | 27 +-
+ arch/mips/Makefile | 519 +-----
+ arch/mips/alchemy/Kconfig | 28 +-
+ arch/mips/alchemy/Platform | 114 ++
+ arch/mips/alchemy/common/Makefile | 2 -
+ arch/mips/alchemy/common/clocks.c | 4 -
+ arch/mips/alchemy/common/platform.c | 17 +-
+ arch/mips/alchemy/devboards/Makefile | 2 -
+ arch/mips/alchemy/devboards/db1200/platform.c | 8 +-
+ arch/mips/alchemy/devboards/pb1200/Makefile | 2 -
+ arch/mips/alchemy/gpr/Makefile | 8 +
+ arch/mips/alchemy/gpr/board_setup.c | 93 +
+ arch/mips/{nxp/pnx8550/jbs => alchemy/gpr}/init.c | 40 +-
+ arch/mips/alchemy/gpr/platform.c | 183 ++
+ arch/mips/alchemy/mtx-1/Makefile | 5 +-
+ arch/mips/alchemy/mtx-1/board_setup.c | 12 +-
+ arch/mips/alchemy/xxs1500/Makefile | 4 +-
+ arch/mips/ar7/Makefile | 1 -
+ arch/mips/ar7/Platform | 6 +
+ arch/mips/ar7/platform.c | 42 +-
+ arch/mips/bcm47xx/Platform | 7 +
+ arch/mips/bcm63xx/Makefile | 2 -
+ arch/mips/bcm63xx/Platform | 7 +
+ arch/mips/boot/Makefile | 49 +-
+ arch/mips/boot/compressed/Makefile | 54 +-
+ arch/mips/cavium-octeon/Makefile | 3 +-
+ arch/mips/cavium-octeon/Platform | 11 +
+ arch/mips/cavium-octeon/cpu.c | 6 +-
+ arch/mips/cavium-octeon/csrc-octeon.c | 55 +
+ arch/mips/cavium-octeon/octeon-irq.c | 553 +++---
+ arch/mips/cavium-octeon/octeon_boot.h | 16 +-
+ arch/mips/cavium-octeon/serial.c | 4 -
+ arch/mips/cavium-octeon/setup.c | 14 +-
+ arch/mips/cavium-octeon/smp.c | 170 +-
+ arch/mips/cobalt/Makefile | 2 -
+ arch/mips/cobalt/Platform | 6 +
+ arch/mips/configs/db1000_defconfig | 3 +-
+ arch/mips/configs/db1100_defconfig | 3 +-
+ arch/mips/configs/db1200_defconfig | 3 +-
+ arch/mips/configs/db1500_defconfig | 3 +-
+ arch/mips/configs/db1550_defconfig | 3 +-
+ arch/mips/configs/gpr_defconfig | 2060 ++++++++++++++++++++
+ arch/mips/configs/mtx1_defconfig | 3 +-
+ arch/mips/configs/pb1100_defconfig | 3 +-
+ arch/mips/configs/pb1200_defconfig | 3 +-
+ arch/mips/configs/pb1500_defconfig | 3 +-
+ arch/mips/configs/pb1550_defconfig | 3 +-
+ arch/mips/configs/powertv_defconfig | 275 ++-
+ arch/mips/dec/Makefile | 2 -
+ arch/mips/dec/Platform | 8 +
+ arch/mips/dec/promcon.c | 3 +-
+ arch/mips/emma/Makefile | 6 +
+ arch/mips/emma/Platform | 4 +
+ arch/mips/emma/markeins/irq.c | 8 +-
+ arch/mips/include/asm/arch_hweight.h | 38 +
+ arch/mips/include/asm/bitops.h | 5 +-
+ arch/mips/include/asm/bootinfo.h | 6 +
+ arch/mips/include/asm/cacheops.h | 2 +
+ arch/mips/include/asm/cop2.h | 12 +
+ arch/mips/include/asm/cpu-features.h | 3 +-
+ arch/mips/include/asm/cpu.h | 9 +-
+ arch/mips/include/asm/elf.h | 5 +
+ arch/mips/include/asm/emma/emma2rh.h | 84 +-
+ arch/mips/include/asm/emma/markeins.h | 37 +-
+ arch/mips/include/asm/hazards.h | 4 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 1 +
+ .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 15 +-
+ arch/mips/include/asm/mach-cavium-octeon/irq.h | 66 +-
+ arch/mips/include/asm/mach-jz4740/base.h | 26 +
+ arch/mips/include/asm/mach-jz4740/clock.h | 28 +
+ .../asm/mach-jz4740/cpu-feature-overrides.h | 51 +
+ arch/mips/include/asm/mach-jz4740/dma.h | 90 +
+ arch/mips/include/asm/mach-jz4740/gpio.h | 398 ++++
+ arch/mips/include/asm/mach-jz4740/irq.h | 57 +
+ arch/mips/include/asm/mach-jz4740/jz4740_fb.h | 67 +
+ arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 15 +
+ arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 34 +
+ arch/mips/include/asm/mach-jz4740/platform.h | 36 +
+ arch/mips/include/asm/mach-jz4740/timer.h | 22 +
+ arch/mips/include/asm/mach-jz4740/war.h | 25 +
+ arch/mips/include/asm/mach-loongson/loongson.h | 9 +-
+ arch/mips/include/asm/mach-pb1x00/pb1550.h | 8 -
+ arch/mips/include/asm/mach-powertv/asic_reg_map.h | 2 +-
+ arch/mips/include/asm/mach-powertv/dma-coherence.h | 8 +-
+ arch/mips/include/asm/mach-powertv/ioremap.h | 165 ++-
+ arch/mips/include/asm/mipsregs.h | 1 +
+ arch/mips/include/asm/octeon/octeon.h | 3 +
+ .../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h | 4 -
+ arch/mips/include/asm/processor.h | 11 +
+ arch/mips/include/asm/uasm.h | 51 +-
+ arch/mips/jazz/Makefile | 2 -
+ arch/mips/jazz/Platform | 6 +
+ arch/mips/jz4740/Kconfig | 12 +
+ arch/mips/jz4740/Makefile | 20 +
+ arch/mips/jz4740/Platform | 3 +
+ arch/mips/jz4740/board-qi_lb60.c | 471 +++++
+ arch/mips/jz4740/clock-debugfs.c | 109 +
+ arch/mips/jz4740/clock.c | 924 +++++++++
+ arch/mips/jz4740/clock.h | 76 +
+ arch/mips/jz4740/dma.c | 289 +++
+ arch/mips/jz4740/gpio.c | 604 ++++++
+ arch/mips/jz4740/irq.c | 167 ++
+ arch/mips/jz4740/irq.h | 21 +
+ arch/mips/jz4740/platform.c | 291 +++
+ arch/mips/jz4740/pm.c | 56 +
+ arch/mips/jz4740/prom.c | 68 +
+ arch/mips/jz4740/pwm.c | 177 ++
+ arch/mips/jz4740/reset.c | 79 +
+ arch/mips/jz4740/reset.h | 6 +
+ arch/mips/jz4740/serial.c | 33 +
+ arch/mips/jz4740/serial.h | 20 +
+ arch/mips/jz4740/setup.c | 29 +
+ arch/mips/jz4740/time.c | 144 ++
+ arch/mips/jz4740/timer.c | 48 +
+ arch/mips/jz4740/timer.h | 136 ++
+ arch/mips/kernel/Makefile | 2 -
+ arch/mips/kernel/cpu-bugs64.c | 2 +-
+ arch/mips/kernel/cpu-probe.c | 23 +
+ arch/mips/kernel/mcount.S | 6 +-
+ arch/mips/kernel/smp.c | 4 +
+ arch/mips/kernel/smtc.c | 3 +-
+ arch/mips/kernel/syscall.c | 49 +-
+ arch/mips/kernel/traps.c | 7 +-
+ arch/mips/lasat/Makefile | 2 -
+ arch/mips/lasat/Platform | 7 +
+ arch/mips/loongson/Platform | 32 +
+ arch/mips/loongson/common/cs5536/Makefile | 2 -
+ arch/mips/loongson/common/irq.c | 14 +-
+ arch/mips/loongson/fuloong-2e/Makefile | 2 -
+ arch/mips/loongson/fuloong-2e/irq.c | 13 +-
+ arch/mips/loongson/lemote-2f/irq.c | 16 +-
+ arch/mips/math-emu/Makefile | 1 -
+ arch/mips/math-emu/dp_modf.c | 2 +-
+ arch/mips/math-emu/dp_tint.c | 3 +-
+ arch/mips/math-emu/dp_tlong.c | 3 +-
+ arch/mips/math-emu/sp_modf.c | 2 +-
+ arch/mips/math-emu/sp_tint.c | 3 +-
+ arch/mips/math-emu/sp_tlong.c | 3 +-
+ arch/mips/mipssim/Makefile | 2 -
+ arch/mips/mipssim/Platform | 6 +
+ arch/mips/mm/Makefile | 2 -
+ arch/mips/mm/fault.c | 1 -
+ arch/mips/mm/sc-rm7k.c | 163 ++-
+ arch/mips/mm/tlbex.c | 5 +
+ arch/mips/mm/uasm.c | 162 +-
+ arch/mips/mti-malta/Makefile | 2 -
+ arch/mips/mti-malta/Platform | 7 +
+ arch/mips/nxp/pnx833x/stb22x/Makefile | 3 -
+ arch/mips/nxp/pnx8550/jbs/Makefile | 4 -
+ arch/mips/nxp/pnx8550/stb810/Makefile | 4 -
+ arch/mips/pci/msi-octeon.c | 103 +-
+ arch/mips/pci/ops-titan-ht.c | 4 +-
+ arch/mips/pmc-sierra/Platform | 14 +
+ arch/mips/pmc-sierra/msp71xx/msp_hwbutton.c | 11 -
+ arch/mips/pmc-sierra/yosemite/ht-irq.c | 13 +-
+ arch/mips/pmc-sierra/yosemite/irq.c | 4 -
+ arch/mips/pnx833x/Makefile | 3 +
+ arch/mips/pnx833x/Platform | 5 +
+ arch/mips/{nxp => }/pnx833x/common/Makefile | 2 -
+ arch/mips/{nxp => }/pnx833x/common/interrupts.c | 0
+ arch/mips/{nxp => }/pnx833x/common/platform.c | 12 +-
+ arch/mips/{nxp => }/pnx833x/common/prom.c | 0
+ arch/mips/{nxp => }/pnx833x/common/reset.c | 0
+ arch/mips/{nxp => }/pnx833x/common/setup.c | 0
+ arch/mips/pnx833x/stb22x/Makefile | 1 +
+ arch/mips/{nxp => }/pnx833x/stb22x/board.c | 0
+ arch/mips/pnx8550/Makefile | 3 +
+ arch/mips/pnx8550/Platform | 7 +
+ arch/mips/{nxp => }/pnx8550/common/Makefile | 2 -
+ arch/mips/{nxp => }/pnx8550/common/int.c | 0
+ arch/mips/pnx8550/common/pci.c | 134 ++
+ arch/mips/{nxp => }/pnx8550/common/platform.c | 0
+ arch/mips/{nxp => }/pnx8550/common/proc.c | 0
+ arch/mips/{nxp => }/pnx8550/common/prom.c | 0
+ arch/mips/{nxp => }/pnx8550/common/reset.c | 0
+ arch/mips/pnx8550/common/setup.c | 145 ++
+ arch/mips/{nxp => }/pnx8550/common/time.c | 0
+ arch/mips/pnx8550/jbs/Makefile | 4 +
+ arch/mips/{nxp => }/pnx8550/jbs/board_setup.c | 0
+ arch/mips/{nxp => }/pnx8550/jbs/init.c | 0
+ arch/mips/{nxp => }/pnx8550/jbs/irqmap.c | 0
+ arch/mips/pnx8550/stb810/Makefile | 4 +
+ arch/mips/{nxp => }/pnx8550/stb810/board_setup.c | 0
+ arch/mips/{nxp => }/pnx8550/stb810/irqmap.c | 0
+ arch/mips/{nxp => }/pnx8550/stb810/prom_init.c | 0
+ arch/mips/powertv/Makefile | 5 +-
+ arch/mips/powertv/Platform | 7 +
+ arch/mips/powertv/asic/asic-calliope.c | 2 +-
+ arch/mips/powertv/asic/asic-cronus.c | 4 +-
+ arch/mips/powertv/asic/asic-zeus.c | 2 +-
+ arch/mips/powertv/asic/asic_devices.c | 24 +-
+ arch/mips/powertv/init.c | 4 +-
+ arch/mips/powertv/ioremap.c | 136 ++
+ arch/mips/powertv/memory.c | 342 +++-
+ arch/mips/powertv/powertv_setup.c | 6 -
+ arch/mips/rb532/Makefile | 2 -
+ arch/mips/rb532/Platform | 7 +
+ arch/mips/sgi-ip22/Makefile | 2 -
+ arch/mips/sgi-ip22/Platform | 34 +
+ arch/mips/sgi-ip27/Makefile | 2 -
+ arch/mips/sgi-ip27/Platform | 19 +
+ arch/mips/sgi-ip27/ip27-klconfig.c | 8 +-
+ arch/mips/sgi-ip32/Makefile | 2 -
+ arch/mips/sgi-ip32/Platform | 11 +
+ arch/mips/sibyte/Makefile | 27 +
+ arch/mips/sibyte/Platform | 43 +
+ arch/mips/sibyte/bcm1480/Makefile | 2 -
+ arch/mips/sibyte/common/Makefile | 2 -
+ arch/mips/sibyte/sb1250/Makefile | 2 -
+ arch/mips/sni/Makefile | 2 -
+ arch/mips/sni/Platform | 11 +
+ arch/mips/txx9/Makefile | 17 +
+ arch/mips/txx9/Platform | 10 +
+ arch/mips/txx9/generic/Makefile | 2 -
+ arch/mips/txx9/jmr3927/Makefile | 2 -
+ arch/mips/txx9/rbtx4927/Makefile | 2 -
+ arch/mips/txx9/rbtx4938/Makefile | 2 -
+ arch/mips/txx9/rbtx4939/Makefile | 2 -
+ arch/mips/vr41xx/Platform | 32 +
+ arch/mips/vr41xx/common/Makefile | 2 -
+ arch/mips/{gt64120 => }/wrppmc/Makefile | 4 +-
+ arch/mips/wrppmc/Platform | 7 +
+ arch/mips/{gt64120 => }/wrppmc/irq.c | 0
+ arch/mips/{gt64120 => }/wrppmc/pci.c | 0
+ arch/mips/{gt64120 => }/wrppmc/reset.c | 0
+ arch/mips/{gt64120 => }/wrppmc/serial.c | 0
+ arch/mips/{gt64120 => }/wrppmc/setup.c | 0
+ arch/mips/{gt64120 => }/wrppmc/time.c | 0
+ drivers/hwmon/Kconfig | 10 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/jz4740-hwmon.c | 230 +++
+ drivers/mmc/host/Kconfig | 9 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/jz4740_mmc.c | 1029 ++++++++++
+ drivers/mtd/nand/Kconfig | 6 +
+ drivers/mtd/nand/Makefile | 1 +
+ drivers/mtd/nand/jz4740_nand.c | 516 +++++
+ drivers/net/Kconfig | 2 +-
+ drivers/net/au1000_eth.c | 31 +-
+ drivers/pcmcia/Kconfig | 4 +-
+ drivers/power/Kconfig | 11 +
+ drivers/power/Makefile | 1 +
+ drivers/power/jz4740-battery.c | 445 +++++
+ drivers/rtc/Kconfig | 13 +-
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-jz4740.c | 345 ++++
+ drivers/serial/8250.c | 13 +-
+ drivers/serial/Kconfig | 8 -
+ drivers/usb/Kconfig | 3 +-
+ drivers/usb/host/ohci-hcd.c | 7 +-
+ drivers/usb/host/ohci-jz4740.c | 276 +++
+ drivers/video/Kconfig | 9 +
+ drivers/video/Makefile | 1 +
+ drivers/video/jz4740_fb.c | 847 ++++++++
+ drivers/video/tdfxfb.c | 4 +-
+ drivers/watchdog/Kconfig | 18 +
+ drivers/watchdog/Makefile | 2 +
+ drivers/watchdog/octeon-wdt-main.c | 745 +++++++
+ drivers/watchdog/octeon-wdt-nmi.S | 64 +
+ include/linux/power/jz4740-battery.h | 24 +
+ kernel/printk.c | 33 +-
+ 263 files changed, 14454 insertions(+), 1787 deletions(-)
+ create mode 100644 arch/mips/Kbuild
+ create mode 100644 arch/mips/Kbuild.platforms
+ create mode 100644 arch/mips/alchemy/Platform
+ create mode 100644 arch/mips/alchemy/gpr/Makefile
+ create mode 100644 arch/mips/alchemy/gpr/board_setup.c
+ copy arch/mips/{nxp/pnx8550/jbs => alchemy/gpr}/init.c (71%)
+ create mode 100644 arch/mips/alchemy/gpr/platform.c
+ create mode 100644 arch/mips/ar7/Platform
+ create mode 100644 arch/mips/bcm47xx/Platform
+ create mode 100644 arch/mips/bcm63xx/Platform
+ create mode 100644 arch/mips/cavium-octeon/Platform
+ create mode 100644 arch/mips/cobalt/Platform
+ create mode 100644 arch/mips/configs/gpr_defconfig
+ create mode 100644 arch/mips/dec/Platform
+ create mode 100644 arch/mips/emma/Makefile
+ create mode 100644 arch/mips/emma/Platform
+ create mode 100644 arch/mips/include/asm/arch_hweight.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/base.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/clock.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/cpu-feature-overrides.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/dma.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/gpio.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/irq.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_fb.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_mmc.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/jz4740_nand.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/platform.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/timer.h
+ create mode 100644 arch/mips/include/asm/mach-jz4740/war.h
+ create mode 100644 arch/mips/jazz/Platform
+ create mode 100644 arch/mips/jz4740/Kconfig
+ create mode 100644 arch/mips/jz4740/Makefile
+ create mode 100644 arch/mips/jz4740/Platform
+ create mode 100644 arch/mips/jz4740/board-qi_lb60.c
+ create mode 100644 arch/mips/jz4740/clock-debugfs.c
+ create mode 100644 arch/mips/jz4740/clock.c
+ create mode 100644 arch/mips/jz4740/clock.h
+ create mode 100644 arch/mips/jz4740/dma.c
+ create mode 100644 arch/mips/jz4740/gpio.c
+ create mode 100644 arch/mips/jz4740/irq.c
+ create mode 100644 arch/mips/jz4740/irq.h
+ create mode 100644 arch/mips/jz4740/platform.c
+ create mode 100644 arch/mips/jz4740/pm.c
+ create mode 100644 arch/mips/jz4740/prom.c
+ create mode 100644 arch/mips/jz4740/pwm.c
+ create mode 100644 arch/mips/jz4740/reset.c
+ create mode 100644 arch/mips/jz4740/reset.h
+ create mode 100644 arch/mips/jz4740/serial.c
+ create mode 100644 arch/mips/jz4740/serial.h
+ create mode 100644 arch/mips/jz4740/setup.c
+ create mode 100644 arch/mips/jz4740/time.c
+ create mode 100644 arch/mips/jz4740/timer.c
+ create mode 100644 arch/mips/jz4740/timer.h
+ create mode 100644 arch/mips/lasat/Platform
+ create mode 100644 arch/mips/loongson/Platform
+ create mode 100644 arch/mips/mipssim/Platform
+ create mode 100644 arch/mips/mti-malta/Platform
+ delete mode 100644 arch/mips/nxp/pnx833x/stb22x/Makefile
+ delete mode 100644 arch/mips/nxp/pnx8550/jbs/Makefile
+ delete mode 100644 arch/mips/nxp/pnx8550/stb810/Makefile
+ create mode 100644 arch/mips/pmc-sierra/Platform
+ create mode 100644 arch/mips/pnx833x/Makefile
+ create mode 100644 arch/mips/pnx833x/Platform
+ rename arch/mips/{nxp => }/pnx833x/common/Makefile (69%)
+ rename arch/mips/{nxp => }/pnx833x/common/interrupts.c (100%)
+ rename arch/mips/{nxp => }/pnx833x/common/platform.c (97%)
+ rename arch/mips/{nxp => }/pnx833x/common/prom.c (100%)
+ rename arch/mips/{nxp => }/pnx833x/common/reset.c (100%)
+ rename arch/mips/{nxp => }/pnx833x/common/setup.c (100%)
+ create mode 100644 arch/mips/pnx833x/stb22x/Makefile
+ rename arch/mips/{nxp => }/pnx833x/stb22x/board.c (100%)
+ create mode 100644 arch/mips/pnx8550/Makefile
+ create mode 100644 arch/mips/pnx8550/Platform
+ rename arch/mips/{nxp => }/pnx8550/common/Makefile (97%)
+ rename arch/mips/{nxp => }/pnx8550/common/int.c (100%)
+ create mode 100644 arch/mips/pnx8550/common/pci.c
+ rename arch/mips/{nxp => }/pnx8550/common/platform.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/common/proc.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/common/prom.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/common/reset.c (100%)
+ create mode 100644 arch/mips/pnx8550/common/setup.c
+ rename arch/mips/{nxp => }/pnx8550/common/time.c (100%)
+ create mode 100644 arch/mips/pnx8550/jbs/Makefile
+ rename arch/mips/{nxp => }/pnx8550/jbs/board_setup.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/jbs/init.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/jbs/irqmap.c (100%)
+ create mode 100644 arch/mips/pnx8550/stb810/Makefile
+ rename arch/mips/{nxp => }/pnx8550/stb810/board_setup.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/stb810/irqmap.c (100%)
+ rename arch/mips/{nxp => }/pnx8550/stb810/prom_init.c (100%)
+ create mode 100644 arch/mips/powertv/Platform
+ create mode 100644 arch/mips/powertv/ioremap.c
+ create mode 100644 arch/mips/rb532/Platform
+ create mode 100644 arch/mips/sgi-ip22/Platform
+ create mode 100644 arch/mips/sgi-ip27/Platform
+ create mode 100644 arch/mips/sgi-ip32/Platform
+ create mode 100644 arch/mips/sibyte/Makefile
+ create mode 100644 arch/mips/sibyte/Platform
+ create mode 100644 arch/mips/sni/Platform
+ create mode 100644 arch/mips/txx9/Makefile
+ create mode 100644 arch/mips/txx9/Platform
+ create mode 100644 arch/mips/vr41xx/Platform
+ rename arch/mips/{gt64120 => }/wrppmc/Makefile (80%)
+ create mode 100644 arch/mips/wrppmc/Platform
+ rename arch/mips/{gt64120 => }/wrppmc/irq.c (100%)
+ rename arch/mips/{gt64120 => }/wrppmc/pci.c (100%)
+ rename arch/mips/{gt64120 => }/wrppmc/reset.c (100%)
+ rename arch/mips/{gt64120 => }/wrppmc/serial.c (100%)
+ rename arch/mips/{gt64120 => }/wrppmc/setup.c (100%)
+ rename arch/mips/{gt64120 => }/wrppmc/time.c (100%)
+ create mode 100644 drivers/hwmon/jz4740-hwmon.c
+ create mode 100644 drivers/mmc/host/jz4740_mmc.c
+ create mode 100644 drivers/mtd/nand/jz4740_nand.c
+ create mode 100644 drivers/power/jz4740-battery.c
+ create mode 100644 drivers/rtc/rtc-jz4740.c
+ create mode 100644 drivers/usb/host/ohci-jz4740.c
+ create mode 100644 drivers/video/jz4740_fb.c
+ create mode 100644 drivers/watchdog/octeon-wdt-main.c
+ create mode 100644 drivers/watchdog/octeon-wdt-nmi.S
+ create mode 100644 include/linux/power/jz4740-battery.h
+Merging parisc/next
+$ git merge parisc/next
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Auto-merging arch/powerpc/mm/numa.c
+Auto-merging drivers/net/Kconfig
+Auto-merging drivers/video/Kconfig
+Merge made by recursive.
+ Documentation/powerpc/dts-bindings/fsl/diu.txt | 20 +-
+ Documentation/powerpc/dts-bindings/fsl/i2c.txt | 2 +
+ arch/powerpc/Kconfig | 5 +-
+ arch/powerpc/boot/dts/canyonlands.dts | 4 +-
+ arch/powerpc/boot/dts/glacier.dts | 4 +-
+ arch/powerpc/boot/dts/pdm360ng.dts | 410 +++++++
+ arch/powerpc/include/asm/abs_addr.h | 2 +-
+ arch/powerpc/include/asm/asm-compat.h | 2 +
+ arch/powerpc/include/asm/cputable.h | 4 +
+ arch/powerpc/include/asm/dbell.h | 8 +-
+ arch/powerpc/include/asm/hvcall.h | 1 +
+ arch/powerpc/include/asm/hw_breakpoint.h | 74 ++
+ arch/powerpc/include/asm/machdep.h | 5 +-
+ arch/powerpc/include/asm/mmu-book3e.h | 4 +
+ arch/powerpc/include/asm/mpc5121.h | 32 +
+ arch/powerpc/include/asm/paca.h | 2 +-
+ arch/powerpc/include/asm/percpu.h | 3 -
+ arch/powerpc/include/asm/ppc-opcode.h | 7 +
+ arch/powerpc/include/asm/processor.h | 8 +
+ arch/powerpc/include/asm/reg.h | 2 +-
+ arch/powerpc/include/asm/reg_booke.h | 5 +-
+ arch/powerpc/include/asm/rtas.h | 13 +
+ arch/powerpc/include/asm/time.h | 7 -
+ arch/powerpc/include/asm/topology.h | 3 +
+ arch/powerpc/include/asm/vdso_datapage.h | 2 +
+ arch/powerpc/kernel/Makefile | 4 +-
+ arch/powerpc/kernel/asm-offsets.c | 2 +-
+ arch/powerpc/kernel/cputable.c | 118 ++-
+ arch/powerpc/kernel/crash_dump.c | 4 +-
+ arch/powerpc/kernel/dbell.c | 78 ++-
+ arch/powerpc/kernel/exceptions-64e.S | 50 +-
+ arch/powerpc/kernel/exceptions-64s.S | 1 +
+ arch/powerpc/kernel/hw_breakpoint.c | 364 ++++++
+ arch/powerpc/kernel/idle_book3e.S | 86 ++
+ arch/powerpc/kernel/irq.c | 16 +
+ arch/powerpc/kernel/machine_kexec.c | 22 +-
+ arch/powerpc/kernel/machine_kexec_64.c | 78 ++-
+ arch/powerpc/kernel/paca.c | 10 +
+ arch/powerpc/kernel/process.c | 36 +
+ arch/powerpc/kernel/prom_init.c | 44 +-
+ arch/powerpc/kernel/ptrace.c | 64 +
+ arch/powerpc/kernel/rtas.c | 105 ++-
+ arch/powerpc/kernel/setup-common.c | 13 +
+ arch/powerpc/kernel/setup_64.c | 19 +-
+ arch/powerpc/kernel/signal.c | 3 +
+ arch/powerpc/kernel/smp.c | 10 -
+ arch/powerpc/kernel/time.c | 197 +---
+ arch/powerpc/kernel/traps.c | 29 +-
+ arch/powerpc/kernel/vdso32/gettimeofday.S | 184 +---
+ arch/powerpc/kernel/vdso64/gettimeofday.S | 88 +--
+ arch/powerpc/kvm/timing.c | 2 +-
+ arch/powerpc/lib/Makefile | 5 +-
+ arch/powerpc/lib/ldstfp.S | 375 ++++++
+ arch/powerpc/lib/sstep.c | 1514 +++++++++++++++++++++++-
+ arch/powerpc/mm/fsl_booke_mmu.c | 7 +-
+ arch/powerpc/mm/numa.c | 122 ++-
+ arch/powerpc/mm/pgtable.c | 1 -
+ arch/powerpc/mm/tlb_hash32.c | 15 -
+ arch/powerpc/mm/tlb_nohash.c | 129 ++-
+ arch/powerpc/oprofile/Makefile | 2 +-
+ arch/powerpc/oprofile/common.c | 2 +-
+ arch/powerpc/platforms/40x/Kconfig | 16 -
+ arch/powerpc/platforms/512x/Kconfig | 20 +-
+ arch/powerpc/platforms/512x/Makefile | 1 +
+ arch/powerpc/platforms/512x/clock.c | 18 +
+ arch/powerpc/platforms/512x/mpc5121_ads.c | 2 +
+ arch/powerpc/platforms/512x/mpc5121_generic.c | 2 +
+ arch/powerpc/platforms/512x/mpc512x.h | 2 +
+ arch/powerpc/platforms/512x/mpc512x_shared.c | 284 +++++
+ arch/powerpc/platforms/512x/pdm360ng.c | 129 ++
+ arch/powerpc/platforms/52xx/lite5200_pm.c | 3 -
+ arch/powerpc/platforms/52xx/mpc52xx_pm.c | 3 -
+ arch/powerpc/platforms/85xx/smp.c | 4 +-
+ arch/powerpc/platforms/iseries/vio.c | 3 +-
+ arch/powerpc/platforms/powermac/cpufreq_32.c | 8 +-
+ arch/powerpc/platforms/powermac/feature.c | 6 +-
+ arch/powerpc/platforms/pseries/Makefile | 4 +
+ arch/powerpc/platforms/pseries/dlpar.c | 1 +
+ arch/powerpc/platforms/pseries/eeh_cache.c | 3 +-
+ arch/powerpc/platforms/pseries/event_sources.c | 23 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 7 +-
+ arch/powerpc/platforms/pseries/ras.c | 5 +-
+ arch/powerpc/platforms/pseries/reconfig.c | 4 +-
+ arch/powerpc/platforms/pseries/suspend.c | 214 ++++
+ arch/powerpc/platforms/pseries/xics.c | 2 -
+ arch/powerpc/sysdev/fsl_soc.h | 1 +
+ arch/powerpc/sysdev/mpic.c | 18 +
+ arch/powerpc/sysdev/mpic.h | 1 +
+ arch/powerpc/xmon/xmon.c | 152 +++
+ drivers/char/hvc_console.c | 12 +-
+ drivers/char/hvsi.c | 4 +-
+ drivers/i2c/busses/i2c-mpc.c | 69 +-
+ drivers/input/serio/i8042-io.h | 5 +
+ drivers/mtd/maps/Kconfig | 2 +-
+ drivers/mtd/maps/redwood.c | 43 -
+ drivers/net/Kconfig | 2 +-
+ drivers/net/smc91x.h | 37 -
+ drivers/serial/mpc52xx_uart.c | 145 ++-
+ drivers/video/Kconfig | 1 +
+ drivers/video/fsl-diu-fb.c | 137 ++-
+ drivers/video/xilinxfb.c | 2 +
+ {drivers/video => include/linux}/fsl-diu-fb.h | 0
+ kernel/hw_breakpoint.c | 12 +
+ 103 files changed, 4956 insertions(+), 879 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/pdm360ng.dts
+ create mode 100644 arch/powerpc/include/asm/hw_breakpoint.h
+ create mode 100644 arch/powerpc/kernel/hw_breakpoint.c
+ create mode 100644 arch/powerpc/kernel/idle_book3e.S
+ create mode 100644 arch/powerpc/lib/ldstfp.S
+ create mode 100644 arch/powerpc/platforms/512x/pdm360ng.c
+ create mode 100644 arch/powerpc/platforms/pseries/suspend.c
+ rename {drivers/video => include/linux}/fsl-diu-fb.h (100%)
+Merging 4xx/next
+$ git merge 4xx/next
+Already up-to-date.
+Merging 52xx-and-virtex/next
+$ git merge 52xx-and-virtex/next
+Already up-to-date.
+Merging galak/next
+$ git merge galak/next
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/platforms/85xx/mpc85xx_mds.c
+Auto-merging arch/powerpc/sysdev/fsl_pci.c
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ arch/powerpc/Kconfig | 10 +-
+ arch/powerpc/boot/dts/mpc8308rdb.dts | 303 +++++++++
+ arch/powerpc/boot/dts/mpc8540ads.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8541cds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8544ds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8548cds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8555cds.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8560ads.dts | 4 +-
+ arch/powerpc/boot/dts/mpc8568mds.dts | 4 +-
+ arch/powerpc/boot/dts/p1021mds.dts | 1 +
+ arch/powerpc/boot/dts/p1022ds.dts | 633 +++++++++++++++++++
+ arch/powerpc/boot/dts/stxssa8555.dts | 380 +++++++++++
+ arch/powerpc/boot/dts/tqm8540.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8541.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8548-bigflash.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8548.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8555.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8560.dts | 9 +-
+ arch/powerpc/boot/dts/tqm8xx.dts | 172 +++++
+ arch/powerpc/configs/mpc85xx_defconfig | 34 +-
+ arch/powerpc/configs/mpc85xx_smp_defconfig | 34 +-
+ arch/powerpc/configs/tqm8xx_defconfig | 934 ++++++++++++++++++++++++++++
+ arch/powerpc/platforms/83xx/Kconfig | 8 +
+ arch/powerpc/platforms/83xx/Makefile | 1 +
+ arch/powerpc/platforms/83xx/mpc830x_rdb.c | 94 +++
+ arch/powerpc/platforms/85xx/Kconfig | 8 +
+ arch/powerpc/platforms/85xx/Makefile | 1 +
+ arch/powerpc/platforms/85xx/mpc85xx_mds.c | 279 +++++----
+ arch/powerpc/platforms/85xx/p1022_ds.c | 148 +++++
+ arch/powerpc/platforms/85xx/smp.c | 63 ++
+ arch/powerpc/platforms/85xx/tqm85xx.c | 21 +
+ arch/powerpc/platforms/8xx/Kconfig | 6 +
+ arch/powerpc/platforms/8xx/Makefile | 1 +
+ arch/powerpc/platforms/8xx/tqm8xx_setup.c | 156 +++++
+ arch/powerpc/sysdev/fsl_pci.c | 1 +
+ include/linux/pci_ids.h | 1 +
+ 36 files changed, 3185 insertions(+), 186 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/mpc8308rdb.dts
+ create mode 100644 arch/powerpc/boot/dts/p1022ds.dts
+ create mode 100644 arch/powerpc/boot/dts/stxssa8555.dts
+ create mode 100644 arch/powerpc/boot/dts/tqm8xx.dts
+ create mode 100644 arch/powerpc/configs/tqm8xx_defconfig
+ create mode 100644 arch/powerpc/platforms/83xx/mpc830x_rdb.c
+ create mode 100644 arch/powerpc/platforms/85xx/p1022_ds.c
+ create mode 100644 arch/powerpc/platforms/8xx/tqm8xx_setup.c
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ arch/s390/include/asm/ccwdev.h | 2 +
+ arch/s390/include/asm/topology.h | 2 -
+ arch/s390/kernel/head.S | 2 +-
+ arch/s390/mm/cmm.c | 11 +++++-
+ drivers/s390/block/dasd_eckd.c | 73 +++++++++++++++++++++++++++++++-------
+ drivers/s390/cio/ccwreq.c | 16 +++++++--
+ drivers/s390/cio/chsc.c | 48 +++++++++++++++++++++++++
+ drivers/s390/cio/chsc.h | 2 +
+ drivers/s390/cio/device.c | 47 ++++++++++++++++++++++--
+ drivers/s390/cio/device_pgid.c | 3 ++
+ drivers/s390/cio/io_sch.h | 10 +++--
+ drivers/s390/net/smsgiucv_app.c | 7 ++++
+ 12 files changed, 194 insertions(+), 29 deletions(-)
+Merging sh/master
+$ git merge sh/master
+Merge made by recursive.
+ arch/sh/Kconfig | 3 +-
+ arch/sh/boards/Kconfig | 16 +
+ arch/sh/boards/Makefile | 2 +
+ arch/sh/boards/board-sh2007.c | 133 +++
+ arch/sh/boards/board-sh7757lcr.c | 374 +++++++
+ arch/sh/configs/sh2007_defconfig | 1357 +++++++++++++++++++++++++
+ arch/sh/configs/sh7757lcr_defconfig | 1126 ++++++++++++++++++++
+ arch/sh/drivers/dma/dma-api.c | 4 +-
+ arch/sh/drivers/pci/pci-sh7751.c | 2 +-
+ arch/sh/drivers/pci/pci-sh7780.c | 2 +-
+ arch/sh/drivers/pci/pcie-sh7786.c | 2 +-
+ arch/sh/include/asm/Kbuild | 2 +
+ arch/sh/include/asm/elf.h | 27 +-
+ arch/sh/include/asm/fixmap.h | 4 +-
+ arch/sh/include/asm/irq.h | 2 +-
+ arch/sh/include/asm/kprobes.h | 1 -
+ arch/sh/include/asm/processor_32.h | 3 -
+ arch/sh/include/asm/processor_64.h | 3 -
+ arch/sh/include/asm/ptrace.h | 169 ++--
+ arch/sh/include/asm/ptrace_32.h | 83 ++
+ arch/sh/include/asm/ptrace_64.h | 20 +
+ arch/sh/include/asm/system_32.h | 13 +-
+ arch/sh/include/asm/tlbflush.h | 2 +
+ arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++---
+ arch/sh/include/mach-common/mach/sh2007.h | 117 +++
+ arch/sh/kernel/Makefile | 2 +-
+ arch/sh/kernel/cpu/sh4/probe.c | 2 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++--
+ arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++--
+ arch/sh/kernel/kprobes.c | 100 +-
+ arch/sh/kernel/ptrace.c | 33 +
+ arch/sh/kernel/ptrace_32.c | 27 +
+ arch/sh/kernel/ptrace_64.c | 79 ++
+ arch/sh/kernel/reboot.c | 4 +
+ arch/sh/mm/consistent.c | 3 +-
+ arch/sh/mm/init.c | 52 +-
+ arch/sh/mm/tlbflush_32.c | 16 +
+ arch/sh/mm/tlbflush_64.c | 5 +
+ arch/sh/tools/mach-types | 2 +
+ drivers/Makefile | 2 +-
+ drivers/clocksource/sh_cmt.c | 12 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 23 +-
+ drivers/serial/sh-sci.h | 17 +-
+ drivers/sh/clk.c | 17 +-
+ sound/soc/sh/siu_pcm.c | 2 +
+ 47 files changed, 5042 insertions(+), 1193 deletions(-)
+ create mode 100644 arch/sh/boards/board-sh2007.c
+ create mode 100644 arch/sh/boards/board-sh7757lcr.c
+ create mode 100644 arch/sh/configs/sh2007_defconfig
+ create mode 100644 arch/sh/configs/sh7757lcr_defconfig
+ create mode 100644 arch/sh/include/asm/ptrace_32.h
+ create mode 100644 arch/sh/include/asm/ptrace_64.h
+ create mode 100644 arch/sh/include/mach-common/mach/sh2007.h
+ create mode 100644 arch/sh/kernel/ptrace.c
+Merging genesis/master
+$ git merge genesis/master
+Recorded preimage for 'drivers/net/irda/sh_irda.c'
+Auto-merging MAINTAINERS
+Auto-merging arch/sh/boards/mach-ap325rxa/setup.c
+Auto-merging drivers/i2c/busses/Kconfig
+Auto-merging drivers/i2c/busses/i2c-sh_mobile.c
+Auto-merging drivers/net/irda/sh_irda.c
+CONFLICT (content): Merge conflict in drivers/net/irda/sh_irda.c
+Auto-merging drivers/serial/sh-sci.h
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/video/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/net/irda/sh_irda.c'.
+[master 8afd0ef] Merge remote branch 'genesis/master'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 3 +-
+ arch/arm/mach-shmobile/Kconfig | 26 +
+ arch/arm/mach-shmobile/Makefile | 6 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 817 +++++++++++++++++++-
+ arch/arm/mach-shmobile/board-g3evm.c | 59 ++-
+ arch/arm/mach-shmobile/board-g4evm.c | 153 ++++-
+ arch/arm/mach-shmobile/clock-sh7367.c | 357 ++++++++--
+ arch/arm/mach-shmobile/clock-sh7372.c | 560 ++++++++++++++
+ arch/arm/mach-shmobile/clock-sh7377.c | 369 +++++++++
+ arch/arm/mach-shmobile/clock.c | 44 ++
+ arch/arm/mach-shmobile/include/mach/common.h | 10 +
+ arch/arm/mach-shmobile/include/mach/irqs.h | 6 +
+ arch/arm/mach-shmobile/include/mach/memory.h | 3 +
+ arch/arm/mach-shmobile/include/mach/sh7372.h | 30 +
+ arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +-
+ arch/arm/mach-shmobile/intc-sh7367.c | 178 +++++-
+ arch/arm/mach-shmobile/intc-sh7372.c | 232 ++++++-
+ arch/arm/mach-shmobile/intc-sh7377.c | 300 +++++++-
+ arch/arm/mach-shmobile/pfc-sh7372.c | 3 +
+ arch/arm/mach-shmobile/setup-sh7367.c | 30 +-
+ arch/arm/mach-shmobile/setup-sh7372.c | 391 +++++++++-
+ arch/arm/mach-shmobile/setup-sh7377.c | 34 +-
+ arch/sh/boards/mach-ap325rxa/setup.c | 2 +-
+ arch/sh/boards/mach-kfr2r09/Makefile | 6 +-
+ arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 2 +-
+ arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 16 +-
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/shdma.c | 8 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 121 ++-
+ drivers/net/irda/sh_irda.c | 5 +-
+ drivers/serial/sh-sci.c | 42 +-
+ drivers/serial/sh-sci.h | 29 +-
+ drivers/sh/Makefile | 5 +-
+ drivers/sh/clk-cpg.c | 58 ++-
+ drivers/video/Kconfig | 15 +
+ drivers/video/Makefile | 2 +
+ drivers/video/sh_mipi_dsi.c | 505 ++++++++++++
+ drivers/video/sh_mobile_hdmi.c | 1028 +++++++++++++++++++++++++
+ drivers/video/sh_mobile_lcdcfb.c | 196 ++++--
+ include/linux/serial_core.h | 3 +
+ include/linux/sh_clk.h | 23 +-
+ include/video/mipi_display.h | 130 ++++
+ include/video/sh_mipi_dsi.h | 35 +
+ include/video/sh_mobile_hdmi.h | 22 +
+ include/video/sh_mobile_lcdc.h | 41 +-
+ 46 files changed, 5602 insertions(+), 310 deletions(-)
+ create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c
+ create mode 100644 arch/arm/mach-shmobile/clock-sh7377.c
+ create mode 100644 arch/arm/mach-shmobile/clock.c
+ create mode 100644 drivers/video/sh_mipi_dsi.c
+ create mode 100644 drivers/video/sh_mobile_hdmi.c
+ create mode 100644 include/video/mipi_display.h
+ create mode 100644 include/video/sh_mipi_dsi.h
+ create mode 100644 include/video/sh_mobile_hdmi.h
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging tile/master
+$ git merge tile/master
+Auto-merging MAINTAINERS
+Auto-merging include/linux/types.h
+Merge made by recursive.
+ MAINTAINERS | 6 +
+ arch/tile/Kbuild | 3 +
+ arch/tile/Kconfig | 356 ++++
+ arch/tile/Kconfig.debug | 43 +
+ arch/tile/Makefile | 52 +
+ arch/tile/configs/tile_defconfig | 1290 ++++++++++++++
+ arch/tile/include/arch/abi.h | 98 ++
+ arch/tile/include/arch/chip.h | 23 +
+ arch/tile/include/arch/chip_tile64.h | 255 +++
+ arch/tile/include/arch/chip_tilepro.h | 255 +++
+ arch/tile/include/arch/icache.h | 94 +
+ arch/tile/include/arch/interrupts.h | 19 +
+ arch/tile/include/arch/interrupts_32.h | 304 ++++
+ arch/tile/include/arch/sim_def.h | 512 ++++++
+ arch/tile/include/arch/spr_def.h | 19 +
+ arch/tile/include/arch/spr_def_32.h | 162 ++
+ arch/tile/include/asm/Kbuild | 3 +
+ arch/tile/include/asm/asm-offsets.h | 1 +
+ arch/tile/include/asm/atomic.h | 159 ++
+ arch/tile/include/asm/atomic_32.h | 370 ++++
+ arch/tile/include/asm/auxvec.h | 20 +
+ arch/tile/include/asm/backtrace.h | 193 ++
+ arch/tile/include/asm/bitops.h | 126 ++
+ arch/tile/include/asm/bitops_32.h | 132 ++
+ arch/tile/include/asm/bitsperlong.h | 26 +
+ arch/tile/include/asm/bug.h | 1 +
+ arch/tile/include/asm/bugs.h | 1 +
+ arch/tile/include/asm/byteorder.h | 1 +
+ arch/tile/include/asm/cache.h | 52 +
+ arch/tile/include/asm/cacheflush.h | 140 ++
+ arch/tile/include/asm/checksum.h | 24 +
+ arch/tile/include/asm/compat.h | 257 +++
+ arch/tile/include/asm/cputime.h | 1 +
+ arch/tile/include/asm/current.h | 31 +
+ arch/tile/include/asm/delay.h | 34 +
+ arch/tile/include/asm/device.h | 1 +
+ arch/tile/include/asm/div64.h | 1 +
+ arch/tile/include/asm/dma-mapping.h | 102 ++
+ arch/tile/include/asm/dma.h | 25 +
+ arch/tile/include/asm/elf.h | 167 ++
+ arch/tile/include/asm/emergency-restart.h | 1 +
+ arch/tile/include/asm/errno.h | 1 +
+ arch/tile/include/asm/fcntl.h | 1 +
+ arch/tile/include/asm/fixmap.h | 124 ++
+ arch/tile/include/asm/ftrace.h | 20 +
+ arch/tile/include/asm/futex.h | 141 ++
+ arch/tile/include/asm/hardirq.h | 47 +
+ arch/tile/include/asm/hardwall.h | 56 +
+ arch/tile/include/asm/highmem.h | 73 +
+ arch/tile/include/asm/homecache.h | 125 ++
+ arch/tile/include/asm/hugetlb.h | 109 ++
+ arch/tile/include/asm/hv_driver.h | 60 +
+ arch/tile/include/asm/hw_irq.h | 18 +
+ arch/tile/include/asm/ide.h | 25 +
+ arch/tile/include/asm/io.h | 279 +++
+ arch/tile/include/asm/ioctl.h | 1 +
+ arch/tile/include/asm/ioctls.h | 1 +
+ arch/tile/include/asm/ipc.h | 1 +
+ arch/tile/include/asm/ipcbuf.h | 1 +
+ arch/tile/include/asm/irq.h | 87 +
+ arch/tile/include/asm/irq_regs.h | 1 +
+ arch/tile/include/asm/irqflags.h | 266 +++
+ arch/tile/include/asm/kdebug.h | 1 +
+ arch/tile/include/asm/kexec.h | 53 +
+ arch/tile/include/asm/kmap_types.h | 43 +
+ arch/tile/include/asm/linkage.h | 51 +
+ arch/tile/include/asm/local.h | 1 +
+ arch/tile/include/asm/memprof.h | 33 +
+ arch/tile/include/asm/mman.h | 40 +
+ arch/tile/include/asm/mmu.h | 31 +
+ arch/tile/include/asm/mmu_context.h | 131 ++
+ arch/tile/include/asm/mmzone.h | 81 +
+ arch/tile/include/asm/module.h | 1 +
+ arch/tile/include/asm/msgbuf.h | 1 +
+ arch/tile/include/asm/mutex.h | 1 +
+ arch/tile/include/asm/opcode-tile.h | 30 +
+ arch/tile/include/asm/opcode-tile_32.h | 1506 ++++++++++++++++
+ arch/tile/include/asm/opcode-tile_64.h | 1506 ++++++++++++++++
+ arch/tile/include/asm/opcode_constants.h | 26 +
+ arch/tile/include/asm/opcode_constants_32.h | 480 +++++
+ arch/tile/include/asm/opcode_constants_64.h | 480 +++++
+ arch/tile/include/asm/page.h | 339 ++++
+ arch/tile/include/asm/param.h | 1 +
+ arch/tile/include/asm/pci-bridge.h | 117 ++
+ arch/tile/include/asm/pci.h | 128 ++
+ arch/tile/include/asm/percpu.h | 24 +
+ arch/tile/include/asm/pgalloc.h | 119 ++
+ arch/tile/include/asm/pgtable.h | 480 +++++
+ arch/tile/include/asm/pgtable_32.h | 129 ++
+ arch/tile/include/asm/poll.h | 1 +
+ arch/tile/include/asm/posix_types.h | 1 +
+ arch/tile/include/asm/processor.h | 338 ++++
+ arch/tile/include/asm/ptrace.h | 166 ++
+ arch/tile/include/asm/resource.h | 1 +
+ arch/tile/include/asm/scatterlist.h | 22 +
+ arch/tile/include/asm/sections.h | 44 +
+ arch/tile/include/asm/sembuf.h | 1 +
+ arch/tile/include/asm/setup.h | 32 +
+ arch/tile/include/asm/shmbuf.h | 1 +
+ arch/tile/include/asm/shmparam.h | 1 +
+ arch/tile/include/asm/sigcontext.h | 27 +
+ arch/tile/include/asm/sigframe.h | 33 +
+ arch/tile/include/asm/siginfo.h | 30 +
+ arch/tile/include/asm/signal.h | 32 +
+ arch/tile/include/asm/smp.h | 147 ++
+ arch/tile/include/asm/socket.h | 1 +
+ arch/tile/include/asm/sockios.h | 1 +
+ arch/tile/include/asm/spinlock.h | 24 +
+ arch/tile/include/asm/spinlock_32.h | 199 +++
+ arch/tile/include/asm/spinlock_types.h | 60 +
+ arch/tile/include/asm/stack.h | 74 +
+ arch/tile/include/asm/stat.h | 1 +
+ arch/tile/include/asm/statfs.h | 1 +
+ arch/tile/include/asm/string.h | 32 +
+ arch/tile/include/asm/swab.h | 29 +
+ arch/tile/include/asm/syscall.h | 79 +
+ arch/tile/include/asm/syscalls.h | 108 ++
+ arch/tile/include/asm/system.h | 248 +++
+ arch/tile/include/asm/termbits.h | 1 +
+ arch/tile/include/asm/termios.h | 1 +
+ arch/tile/include/asm/thread_info.h | 166 ++
+ arch/tile/include/asm/timex.h | 47 +
+ arch/tile/include/asm/tlb.h | 25 +
+ arch/tile/include/asm/tlbflush.h | 128 ++
+ arch/tile/include/asm/topology.h | 85 +
+ arch/tile/include/asm/traps.h | 62 +
+ arch/tile/include/asm/types.h | 1 +
+ arch/tile/include/asm/uaccess.h | 580 +++++++
+ arch/tile/include/asm/ucontext.h | 1 +
+ arch/tile/include/asm/unaligned.h | 24 +
+ arch/tile/include/asm/unistd.h | 46 +
+ arch/tile/include/asm/user.h | 21 +
+ arch/tile/include/asm/xor.h | 1 +
+ arch/tile/include/hv/drv_pcie_rc_intf.h | 38 +
+ arch/tile/include/hv/hypervisor.h | 2375 +++++++++++++++++++++++++
+ arch/tile/include/hv/pagesize.h | 32 +
+ arch/tile/include/hv/syscall_public.h | 42 +
+ arch/tile/kernel/Makefile | 17 +
+ arch/tile/kernel/asm-offsets.c | 76 +
+ arch/tile/kernel/backtrace.c | 621 +++++++
+ arch/tile/kernel/compat.c | 167 ++
+ arch/tile/kernel/compat_signal.c | 435 +++++
+ arch/tile/kernel/early_printk.c | 109 ++
+ arch/tile/kernel/entry.S | 141 ++
+ arch/tile/kernel/hardwall.c | 796 +++++++++
+ arch/tile/kernel/head_32.S | 180 ++
+ arch/tile/kernel/hvglue.lds | 58 +
+ arch/tile/kernel/init_task.c | 59 +
+ arch/tile/kernel/intvec_32.S | 2008 +++++++++++++++++++++
+ arch/tile/kernel/irq.c | 334 ++++
+ arch/tile/kernel/machine_kexec.c | 279 +++
+ arch/tile/kernel/messaging.c | 116 ++
+ arch/tile/kernel/module.c | 257 +++
+ arch/tile/kernel/pci-dma.c | 251 +++
+ arch/tile/kernel/proc.c | 91 +
+ arch/tile/kernel/process.c | 671 +++++++
+ arch/tile/kernel/ptrace.c | 205 +++
+ arch/tile/kernel/reboot.c | 51 +
+ arch/tile/kernel/regs_32.S | 145 ++
+ arch/tile/kernel/relocate_kernel.S | 280 +++
+ arch/tile/kernel/setup.c | 1511 ++++++++++++++++
+ arch/tile/kernel/signal.c | 358 ++++
+ arch/tile/kernel/single_step.c | 663 +++++++
+ arch/tile/kernel/smp.c | 256 +++
+ arch/tile/kernel/smpboot.c | 278 +++
+ arch/tile/kernel/stack.c | 486 ++++++
+ arch/tile/kernel/sys.c | 120 ++
+ arch/tile/kernel/tile-desc_32.c | 2498 +++++++++++++++++++++++++++
+ arch/tile/kernel/time.c | 221 +++
+ arch/tile/kernel/tlb.c | 97 +
+ arch/tile/kernel/traps.c | 317 ++++
+ arch/tile/kernel/vmlinux.lds.S | 98 ++
+ arch/tile/lib/Makefile | 16 +
+ arch/tile/lib/atomic_32.c | 330 ++++
+ arch/tile/lib/atomic_asm_32.S | 196 +++
+ arch/tile/lib/cacheflush.c | 23 +
+ arch/tile/lib/checksum.c | 102 ++
+ arch/tile/lib/cpumask.c | 52 +
+ arch/tile/lib/delay.c | 34 +
+ arch/tile/lib/exports.c | 79 +
+ arch/tile/lib/mb_incoherent.S | 34 +
+ arch/tile/lib/memchr_32.c | 68 +
+ arch/tile/lib/memcpy_32.S | 628 +++++++
+ arch/tile/lib/memcpy_tile64.c | 271 +++
+ arch/tile/lib/memmove_32.c | 63 +
+ arch/tile/lib/memset_32.c | 275 +++
+ arch/tile/lib/spinlock_32.c | 221 +++
+ arch/tile/lib/spinlock_common.h | 64 +
+ arch/tile/lib/strchr_32.c | 66 +
+ arch/tile/lib/strlen_32.c | 36 +
+ arch/tile/lib/uaccess.c | 32 +
+ arch/tile/lib/usercopy_32.S | 223 +++
+ arch/tile/mm/Makefile | 9 +
+ arch/tile/mm/elf.c | 164 ++
+ arch/tile/mm/extable.c | 30 +
+ arch/tile/mm/fault.c | 867 ++++++++++
+ arch/tile/mm/highmem.c | 328 ++++
+ arch/tile/mm/homecache.c | 433 +++++
+ arch/tile/mm/hugetlbpage.c | 343 ++++
+ arch/tile/mm/init.c | 1085 ++++++++++++
+ arch/tile/mm/migrate.h | 50 +
+ arch/tile/mm/migrate_32.S | 211 +++
+ arch/tile/mm/mmap.c | 75 +
+ arch/tile/mm/pgtable.c | 530 ++++++
+ drivers/char/Makefile | 1 +
+ drivers/char/hvc_tile.c | 67 +
+ include/asm-generic/unistd.h | 33 +-
+ include/linux/list.h | 13 +-
+ include/linux/types.h | 12 +
+ scripts/checksyscalls.sh | 1 -
+ 210 files changed, 39334 insertions(+), 21 deletions(-)
+ create mode 100644 arch/tile/Kbuild
+ create mode 100644 arch/tile/Kconfig
+ create mode 100644 arch/tile/Kconfig.debug
+ create mode 100644 arch/tile/Makefile
+ create mode 100644 arch/tile/configs/tile_defconfig
+ create mode 100644 arch/tile/include/arch/abi.h
+ create mode 100644 arch/tile/include/arch/chip.h
+ create mode 100644 arch/tile/include/arch/chip_tile64.h
+ create mode 100644 arch/tile/include/arch/chip_tilepro.h
+ create mode 100644 arch/tile/include/arch/icache.h
+ create mode 100644 arch/tile/include/arch/interrupts.h
+ create mode 100644 arch/tile/include/arch/interrupts_32.h
+ create mode 100644 arch/tile/include/arch/sim_def.h
+ create mode 100644 arch/tile/include/arch/spr_def.h
+ create mode 100644 arch/tile/include/arch/spr_def_32.h
+ create mode 100644 arch/tile/include/asm/Kbuild
+ create mode 100644 arch/tile/include/asm/asm-offsets.h
+ create mode 100644 arch/tile/include/asm/atomic.h
+ create mode 100644 arch/tile/include/asm/atomic_32.h
+ create mode 100644 arch/tile/include/asm/auxvec.h
+ create mode 100644 arch/tile/include/asm/backtrace.h
+ create mode 100644 arch/tile/include/asm/bitops.h
+ create mode 100644 arch/tile/include/asm/bitops_32.h
+ create mode 100644 arch/tile/include/asm/bitsperlong.h
+ create mode 100644 arch/tile/include/asm/bug.h
+ create mode 100644 arch/tile/include/asm/bugs.h
+ create mode 100644 arch/tile/include/asm/byteorder.h
+ create mode 100644 arch/tile/include/asm/cache.h
+ create mode 100644 arch/tile/include/asm/cacheflush.h
+ create mode 100644 arch/tile/include/asm/checksum.h
+ create mode 100644 arch/tile/include/asm/compat.h
+ create mode 100644 arch/tile/include/asm/cputime.h
+ create mode 100644 arch/tile/include/asm/current.h
+ create mode 100644 arch/tile/include/asm/delay.h
+ create mode 100644 arch/tile/include/asm/device.h
+ create mode 100644 arch/tile/include/asm/div64.h
+ create mode 100644 arch/tile/include/asm/dma-mapping.h
+ create mode 100644 arch/tile/include/asm/dma.h
+ create mode 100644 arch/tile/include/asm/elf.h
+ create mode 100644 arch/tile/include/asm/emergency-restart.h
+ create mode 100644 arch/tile/include/asm/errno.h
+ create mode 100644 arch/tile/include/asm/fcntl.h
+ create mode 100644 arch/tile/include/asm/fixmap.h
+ create mode 100644 arch/tile/include/asm/ftrace.h
+ create mode 100644 arch/tile/include/asm/futex.h
+ create mode 100644 arch/tile/include/asm/hardirq.h
+ create mode 100644 arch/tile/include/asm/hardwall.h
+ create mode 100644 arch/tile/include/asm/highmem.h
+ create mode 100644 arch/tile/include/asm/homecache.h
+ create mode 100644 arch/tile/include/asm/hugetlb.h
+ create mode 100644 arch/tile/include/asm/hv_driver.h
+ create mode 100644 arch/tile/include/asm/hw_irq.h
+ create mode 100644 arch/tile/include/asm/ide.h
+ create mode 100644 arch/tile/include/asm/io.h
+ create mode 100644 arch/tile/include/asm/ioctl.h
+ create mode 100644 arch/tile/include/asm/ioctls.h
+ create mode 100644 arch/tile/include/asm/ipc.h
+ create mode 100644 arch/tile/include/asm/ipcbuf.h
+ create mode 100644 arch/tile/include/asm/irq.h
+ create mode 100644 arch/tile/include/asm/irq_regs.h
+ create mode 100644 arch/tile/include/asm/irqflags.h
+ create mode 100644 arch/tile/include/asm/kdebug.h
+ create mode 100644 arch/tile/include/asm/kexec.h
+ create mode 100644 arch/tile/include/asm/kmap_types.h
+ create mode 100644 arch/tile/include/asm/linkage.h
+ create mode 100644 arch/tile/include/asm/local.h
+ create mode 100644 arch/tile/include/asm/memprof.h
+ create mode 100644 arch/tile/include/asm/mman.h
+ create mode 100644 arch/tile/include/asm/mmu.h
+ create mode 100644 arch/tile/include/asm/mmu_context.h
+ create mode 100644 arch/tile/include/asm/mmzone.h
+ create mode 100644 arch/tile/include/asm/module.h
+ create mode 100644 arch/tile/include/asm/msgbuf.h
+ create mode 100644 arch/tile/include/asm/mutex.h
+ create mode 100644 arch/tile/include/asm/opcode-tile.h
+ create mode 100644 arch/tile/include/asm/opcode-tile_32.h
+ create mode 100644 arch/tile/include/asm/opcode-tile_64.h
+ create mode 100644 arch/tile/include/asm/opcode_constants.h
+ create mode 100644 arch/tile/include/asm/opcode_constants_32.h
+ create mode 100644 arch/tile/include/asm/opcode_constants_64.h
+ create mode 100644 arch/tile/include/asm/page.h
+ create mode 100644 arch/tile/include/asm/param.h
+ create mode 100644 arch/tile/include/asm/pci-bridge.h
+ create mode 100644 arch/tile/include/asm/pci.h
+ create mode 100644 arch/tile/include/asm/percpu.h
+ create mode 100644 arch/tile/include/asm/pgalloc.h
+ create mode 100644 arch/tile/include/asm/pgtable.h
+ create mode 100644 arch/tile/include/asm/pgtable_32.h
+ create mode 100644 arch/tile/include/asm/poll.h
+ create mode 100644 arch/tile/include/asm/posix_types.h
+ create mode 100644 arch/tile/include/asm/processor.h
+ create mode 100644 arch/tile/include/asm/ptrace.h
+ create mode 100644 arch/tile/include/asm/resource.h
+ create mode 100644 arch/tile/include/asm/scatterlist.h
+ create mode 100644 arch/tile/include/asm/sections.h
+ create mode 100644 arch/tile/include/asm/sembuf.h
+ create mode 100644 arch/tile/include/asm/setup.h
+ create mode 100644 arch/tile/include/asm/shmbuf.h
+ create mode 100644 arch/tile/include/asm/shmparam.h
+ create mode 100644 arch/tile/include/asm/sigcontext.h
+ create mode 100644 arch/tile/include/asm/sigframe.h
+ create mode 100644 arch/tile/include/asm/siginfo.h
+ create mode 100644 arch/tile/include/asm/signal.h
+ create mode 100644 arch/tile/include/asm/smp.h
+ create mode 100644 arch/tile/include/asm/socket.h
+ create mode 100644 arch/tile/include/asm/sockios.h
+ create mode 100644 arch/tile/include/asm/spinlock.h
+ create mode 100644 arch/tile/include/asm/spinlock_32.h
+ create mode 100644 arch/tile/include/asm/spinlock_types.h
+ create mode 100644 arch/tile/include/asm/stack.h
+ create mode 100644 arch/tile/include/asm/stat.h
+ create mode 100644 arch/tile/include/asm/statfs.h
+ create mode 100644 arch/tile/include/asm/string.h
+ create mode 100644 arch/tile/include/asm/swab.h
+ create mode 100644 arch/tile/include/asm/syscall.h
+ create mode 100644 arch/tile/include/asm/syscalls.h
+ create mode 100644 arch/tile/include/asm/system.h
+ create mode 100644 arch/tile/include/asm/termbits.h
+ create mode 100644 arch/tile/include/asm/termios.h
+ create mode 100644 arch/tile/include/asm/thread_info.h
+ create mode 100644 arch/tile/include/asm/timex.h
+ create mode 100644 arch/tile/include/asm/tlb.h
+ create mode 100644 arch/tile/include/asm/tlbflush.h
+ create mode 100644 arch/tile/include/asm/topology.h
+ create mode 100644 arch/tile/include/asm/traps.h
+ create mode 100644 arch/tile/include/asm/types.h
+ create mode 100644 arch/tile/include/asm/uaccess.h
+ create mode 100644 arch/tile/include/asm/ucontext.h
+ create mode 100644 arch/tile/include/asm/unaligned.h
+ create mode 100644 arch/tile/include/asm/unistd.h
+ create mode 100644 arch/tile/include/asm/user.h
+ create mode 100644 arch/tile/include/asm/xor.h
+ create mode 100644 arch/tile/include/hv/drv_pcie_rc_intf.h
+ create mode 100644 arch/tile/include/hv/hypervisor.h
+ create mode 100644 arch/tile/include/hv/pagesize.h
+ create mode 100644 arch/tile/include/hv/syscall_public.h
+ create mode 100644 arch/tile/kernel/Makefile
+ create mode 100644 arch/tile/kernel/asm-offsets.c
+ create mode 100644 arch/tile/kernel/backtrace.c
+ create mode 100644 arch/tile/kernel/compat.c
+ create mode 100644 arch/tile/kernel/compat_signal.c
+ create mode 100644 arch/tile/kernel/early_printk.c
+ create mode 100644 arch/tile/kernel/entry.S
+ create mode 100644 arch/tile/kernel/hardwall.c
+ create mode 100644 arch/tile/kernel/head_32.S
+ create mode 100644 arch/tile/kernel/hvglue.lds
+ create mode 100644 arch/tile/kernel/init_task.c
+ create mode 100644 arch/tile/kernel/intvec_32.S
+ create mode 100644 arch/tile/kernel/irq.c
+ create mode 100644 arch/tile/kernel/machine_kexec.c
+ create mode 100644 arch/tile/kernel/messaging.c
+ create mode 100644 arch/tile/kernel/module.c
+ create mode 100644 arch/tile/kernel/pci-dma.c
+ create mode 100644 arch/tile/kernel/proc.c
+ create mode 100644 arch/tile/kernel/process.c
+ create mode 100644 arch/tile/kernel/ptrace.c
+ create mode 100644 arch/tile/kernel/reboot.c
+ create mode 100644 arch/tile/kernel/regs_32.S
+ create mode 100644 arch/tile/kernel/relocate_kernel.S
+ create mode 100644 arch/tile/kernel/setup.c
+ create mode 100644 arch/tile/kernel/signal.c
+ create mode 100644 arch/tile/kernel/single_step.c
+ create mode 100644 arch/tile/kernel/smp.c
+ create mode 100644 arch/tile/kernel/smpboot.c
+ create mode 100644 arch/tile/kernel/stack.c
+ create mode 100644 arch/tile/kernel/sys.c
+ create mode 100644 arch/tile/kernel/tile-desc_32.c
+ create mode 100644 arch/tile/kernel/time.c
+ create mode 100644 arch/tile/kernel/tlb.c
+ create mode 100644 arch/tile/kernel/traps.c
+ create mode 100644 arch/tile/kernel/vmlinux.lds.S
+ create mode 100644 arch/tile/lib/Makefile
+ create mode 100644 arch/tile/lib/atomic_32.c
+ create mode 100644 arch/tile/lib/atomic_asm_32.S
+ create mode 100644 arch/tile/lib/cacheflush.c
+ create mode 100644 arch/tile/lib/checksum.c
+ create mode 100644 arch/tile/lib/cpumask.c
+ create mode 100644 arch/tile/lib/delay.c
+ create mode 100644 arch/tile/lib/exports.c
+ create mode 100644 arch/tile/lib/mb_incoherent.S
+ create mode 100644 arch/tile/lib/memchr_32.c
+ create mode 100644 arch/tile/lib/memcpy_32.S
+ create mode 100644 arch/tile/lib/memcpy_tile64.c
+ create mode 100644 arch/tile/lib/memmove_32.c
+ create mode 100644 arch/tile/lib/memset_32.c
+ create mode 100644 arch/tile/lib/spinlock_32.c
+ create mode 100644 arch/tile/lib/spinlock_common.h
+ create mode 100644 arch/tile/lib/strchr_32.c
+ create mode 100644 arch/tile/lib/strlen_32.c
+ create mode 100644 arch/tile/lib/uaccess.c
+ create mode 100644 arch/tile/lib/usercopy_32.S
+ create mode 100644 arch/tile/mm/Makefile
+ create mode 100644 arch/tile/mm/elf.c
+ create mode 100644 arch/tile/mm/extable.c
+ create mode 100644 arch/tile/mm/fault.c
+ create mode 100644 arch/tile/mm/highmem.c
+ create mode 100644 arch/tile/mm/homecache.c
+ create mode 100644 arch/tile/mm/hugetlbpage.c
+ create mode 100644 arch/tile/mm/init.c
+ create mode 100644 arch/tile/mm/migrate.h
+ create mode 100644 arch/tile/mm/migrate_32.S
+ create mode 100644 arch/tile/mm/mmap.c
+ create mode 100644 arch/tile/mm/pgtable.c
+ create mode 100644 drivers/char/hvc_tile.c
+Merging xtensa/master
+$ git merge xtensa/master
+Auto-merging arch/xtensa/kernel/time.c
+Merge made by recursive.
+ arch/xtensa/Kconfig | 17 +-
+ arch/xtensa/Makefile | 7 +-
+ arch/xtensa/boot/Makefile | 1 +
+ arch/xtensa/configs/iss_defconfig | 1 +
+ arch/xtensa/include/asm/cacheflush.h | 1 +
+ arch/xtensa/include/asm/coprocessor.h | 9 +-
+ arch/xtensa/include/asm/elf.h | 1 +
+ arch/xtensa/include/asm/io.h | 40 ++--
+ arch/xtensa/include/asm/irq.h | 7 +-
+ arch/xtensa/include/asm/pgalloc.h | 1 +
+ arch/xtensa/include/asm/processor.h | 1 -
+ arch/xtensa/include/asm/ptrace.h | 2 +
+ arch/xtensa/include/asm/serial.h | 12 +-
+ arch/xtensa/kernel/Makefile | 8 +-
+ arch/xtensa/kernel/asm-offsets.c | 1 +
+ arch/xtensa/kernel/entry.S | 1 +
+ arch/xtensa/kernel/head.S | 4 +-
+ arch/xtensa/kernel/time.c | 2 +-
+ arch/xtensa/platforms/iss/network.c | 22 +-
+ arch/xtensa/platforms/xtavnet/Makefile | 10 +
+ .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++
+ .../platforms/xtavnet/include/platform/lcd.h | 22 ++
+ .../platforms/xtavnet/include/platform/serial.h | 1 +
+ arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++
+ arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++
+ 25 files changed, 554 insertions(+), 50 deletions(-)
+ create mode 100644 arch/xtensa/platforms/xtavnet/Makefile
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h
+ create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c
+ create mode 100644 arch/xtensa/platforms/xtavnet/setup.c
+Merging ceph/for-next
+$ git merge ceph/for-next
+Merge made by recursive.
+ fs/ceph/Kconfig | 10 +
+ fs/ceph/Makefile | 2 +-
+ fs/ceph/README | 1 +
+ fs/ceph/addr.c | 2 +-
+ fs/ceph/armor.c | 6 +-
+ fs/ceph/auth.c | 6 +-
+ fs/ceph/auth_x.c | 6 +-
+ fs/ceph/buffer.c | 16 -
+ fs/ceph/caps.c | 282 ++++----
+ fs/ceph/ceph_frag.h | 4 +-
+ fs/ceph/ceph_fs.c | 50 +-
+ fs/ceph/ceph_fs.h | 38 +-
+ fs/ceph/ceph_hash.h | 4 +-
+ fs/ceph/ceph_strings.c | 1 +
+ fs/ceph/crush/crush.h | 4 +-
+ fs/ceph/crush/hash.h | 4 +-
+ fs/ceph/crush/mapper.h | 4 +-
+ fs/ceph/crypto.c | 27 +-
+ fs/ceph/crypto.h | 4 +-
+ fs/ceph/debugfs.c | 15 +-
+ fs/ceph/decode.h | 11 +-
+ fs/ceph/dir.c | 2 +
+ fs/ceph/file.c | 72 ++-
+ fs/ceph/inode.c | 5 +-
+ fs/ceph/ioctl.c | 24 +
+ fs/ceph/ioctl.h | 2 +
+ fs/ceph/mds_client.c | 169 ++++-
+ fs/ceph/mds_client.h | 30 +-
+ fs/ceph/mdsmap.c | 6 +-
+ fs/ceph/mdsmap.h | 8 +
+ fs/ceph/messenger.c | 229 +++++-
+ fs/ceph/messenger.h | 4 +
+ fs/ceph/mon_client.c | 173 ++++-
+ fs/ceph/mon_client.h | 5 +
+ fs/ceph/msgr.h | 4 +-
+ fs/ceph/osd_client.c | 362 ++++++++--
+ fs/ceph/osd_client.h | 67 ++
+ fs/ceph/osdmap.c | 20 +-
+ fs/ceph/osdmap.h | 2 +
+ fs/ceph/pagelist.c | 2 +-
+ fs/ceph/pagelist.h | 2 +-
+ fs/ceph/rados.h | 13 +-
+ fs/ceph/rbd.c | 1830 ++++++++++++++++++++++++++++++++++++++++++++++++
+ fs/ceph/rbd.h | 8 +
+ fs/ceph/rbd_types.h | 71 ++
+ fs/ceph/super.c | 276 ++++++--
+ fs/ceph/super.h | 66 ++-
+ fs/ceph/xattr.c | 2 +
+ 48 files changed, 3433 insertions(+), 518 deletions(-)
+ create mode 100644 fs/ceph/rbd.c
+ create mode 100644 fs/ceph/rbd.h
+ create mode 100644 fs/ceph/rbd_types.h
+Merging cifs/master
+$ git merge cifs/master
+Auto-merging net/Kconfig
+Auto-merging net/Makefile
+Merge made by recursive.
+ Documentation/networking/dns_resolver.txt | 146 ++++++++++++++++++
+ fs/afs/Kconfig | 1 +
+ fs/afs/cell.c | 40 ++++--
+ fs/cifs/Kconfig | 17 +-
+ fs/cifs/README | 5 +-
+ fs/cifs/cifs_debug.c | 25 +++
+ fs/cifs/cifs_dfs_ref.c | 5 +-
+ fs/cifs/cifs_spnego.c | 4 +
+ fs/cifs/cifsfs.c | 13 +--
+ fs/cifs/cifsproto.h | 4 +-
+ fs/cifs/connect.c | 1 +
+ fs/cifs/dns_resolve.c | 231 ++++++-----------------------
+ fs/cifs/dns_resolve.h | 2 -
+ fs/cifs/inode.c | 43 ++++--
+ fs/cifs/netmisc.c | 45 +++---
+ include/keys/dns_resolver-type.h | 23 +++
+ include/linux/dns_resolver.h | 34 +++++
+ net/Kconfig | 1 +
+ net/Makefile | 1 +
+ net/dns_resolver/Kconfig | 27 ++++
+ net/dns_resolver/Makefile | 7 +
+ net/dns_resolver/dns_key.c | 210 ++++++++++++++++++++++++++
+ net/dns_resolver/dns_query.c | 159 ++++++++++++++++++++
+ net/dns_resolver/internal.h | 44 ++++++
+ 24 files changed, 831 insertions(+), 257 deletions(-)
+ create mode 100644 Documentation/networking/dns_resolver.txt
+ create mode 100644 include/keys/dns_resolver-type.h
+ create mode 100644 include/linux/dns_resolver.h
+ create mode 100644 net/dns_resolver/Kconfig
+ create mode 100644 net/dns_resolver/Makefile
+ create mode 100644 net/dns_resolver/dns_key.c
+ create mode 100644 net/dns_resolver/dns_query.c
+ create mode 100644 net/dns_resolver/internal.h
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Merge made by recursive.
+ fs/ecryptfs/file.c | 56 +++++++++++++++++++++++++++++-----------------
+ fs/ecryptfs/inode.c | 5 ++-
+ fs/ecryptfs/messaging.c | 2 +-
+ 3 files changed, 39 insertions(+), 24 deletions(-)
+Merging ext3/for_next
+$ git merge ext3/for_next
+Auto-merging MAINTAINERS
+Auto-merging fs/gfs2/quota.c
+Auto-merging fs/quota/dquot.c
+Auto-merging fs/xfs/linux-2.6/xfs_quotaops.c
+Auto-merging fs/xfs/quota/xfs_qm_syscalls.c
+Merge made by recursive.
+ MAINTAINERS | 6 ++-
+ fs/ext3/Kconfig | 1 +
+ fs/ext3/inode.c | 62 ++++++++++++----------------
+ fs/ext3/namei.c | 3 +-
+ fs/ext3/resize.c | 2 -
+ fs/ext3/super.c | 17 ++------
+ fs/gfs2/quota.c | 10 ++--
+ fs/jbd/journal.c | 7 ---
+ fs/jbd/recovery.c | 11 +----
+ fs/quota/dquot.c | 79 ++++++++++++++++++++++++++----------
+ fs/quota/quota_tree.c | 85 +++++++++++++++++++--------------------
+ fs/quota/quota_tree.h | 6 ---
+ fs/quota/quota_v1.c | 3 +-
+ fs/quota/quota_v2.c | 11 ++---
+ fs/xfs/linux-2.6/xfs_quotaops.c | 10 ++--
+ fs/xfs/quota/xfs_qm_syscalls.c | 32 +++++++-------
+ include/linux/dqblk_xfs.h | 24 +++++-----
+ include/linux/ext3_fs.h | 1 -
+ include/linux/quotaops.h | 26 +++++-------
+ 19 files changed, 191 insertions(+), 205 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Resolved 'fs/ext4/inode.c' using previous resolution.
+Resolved 'fs/xfs/linux-2.6/xfs_aops.c' using previous resolution.
+Auto-merging fs/ext4/extents.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/super.c
+Auto-merging fs/jbd2/journal.c
+Auto-merging fs/jbd2/transaction.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/xfs/linux-2.6/xfs_aops.c
+CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c
+Auto-merging fs/xfs/linux-2.6/xfs_aops.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/jbd2.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master dde4c62] Merge remote branch 'ext4/next'
+$ git diff -M --stat --summary HEAD^..
+ fs/ext4/acl.c | 1 +
+ fs/ext4/balloc.c | 6 +-
+ fs/ext4/block_validity.c | 8 +-
+ fs/ext4/dir.c | 23 ++--
+ fs/ext4/ext4.h | 113 +++++++++++----
+ fs/ext4/ext4_jbd2.c | 71 ++++++----
+ fs/ext4/ext4_jbd2.h | 56 ++++----
+ fs/ext4/extents.c | 18 +--
+ fs/ext4/file.c | 5 +-
+ fs/ext4/ialloc.c | 4 +-
+ fs/ext4/inode.c | 183 +++++++++++-------------
+ fs/ext4/mballoc.c | 119 ++++++++--------
+ fs/ext4/migrate.c | 2 +-
+ fs/ext4/move_extent.c | 10 +-
+ fs/ext4/namei.c | 16 +--
+ fs/ext4/resize.c | 8 +-
+ fs/ext4/super.c | 330 ++++++++++++++++++++++++++++++-------------
+ fs/ext4/xattr.c | 3 +-
+ fs/jbd2/checkpoint.c | 2 +-
+ fs/jbd2/commit.c | 21 ++--
+ fs/jbd2/journal.c | 27 ++--
+ fs/jbd2/recovery.c | 10 +-
+ fs/jbd2/transaction.c | 130 +++++++++++-------
+ include/linux/jbd2.h | 12 +-
+ include/trace/events/ext4.h | 20 ++-
+ 25 files changed, 709 insertions(+), 489 deletions(-)
+Merging fatfs/master
+$ git merge fatfs/master
+Already up-to-date.
+Merging fuse/for-next
+$ git merge fuse/for-next
+Merge made by recursive.
+ fs/fuse/dev.c | 229 ++++++++++++++++++++++++++++++++++++++++++++++++--
+ fs/fuse/file.c | 2 +-
+ fs/fuse/fuse_i.h | 3 +
+ include/linux/fuse.h | 34 +++++++-
+ 4 files changed, 260 insertions(+), 8 deletions(-)
+Merging gfs2/master
+$ git merge gfs2/master
+Already up-to-date.
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging logfs/master
+$ git merge logfs/master
+Resolved 'fs/logfs/logfs.h' using previous resolution.
+Auto-merging fs/logfs/dir.c
+Auto-merging fs/logfs/file.c
+Auto-merging fs/logfs/logfs.h
+CONFLICT (content): Merge conflict in fs/logfs/logfs.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 362b6ab] Merge remote branch 'logfs/master'
+$ git diff -M --stat --summary HEAD^..
+ fs/logfs/dir.c | 2 +-
+ fs/logfs/file.c | 6 +++---
+ fs/logfs/logfs.h | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Auto-merging fs/nfs/dir.c
+Auto-merging fs/nfs/file.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/write.c
+Auto-merging include/linux/nfs_fs.h
+Auto-merging net/sunrpc/auth.c
+Merge made by recursive.
+ fs/nfs/Kconfig | 10 +-
+ fs/nfs/callback_proc.c | 19 +--
+ fs/nfs/client.c | 21 +-
+ fs/nfs/delegation.c | 20 +--
+ fs/nfs/delegation.h | 4 +-
+ fs/nfs/dir.c | 9 -
+ fs/nfs/direct.c | 29 ++-
+ fs/nfs/file.c | 51 ++---
+ fs/nfs/inode.c | 74 ++++++-
+ fs/nfs/internal.h | 7 +-
+ fs/nfs/nfs2xdr.c | 7 +-
+ fs/nfs/nfs3xdr.c | 8 +-
+ fs/nfs/nfs4_fs.h | 57 ++++-
+ fs/nfs/nfs4proc.c | 474 +++++++++++++++++++++++-----------------
+ fs/nfs/nfs4renewd.c | 4 +-
+ fs/nfs/nfs4state.c | 82 +++++---
+ fs/nfs/nfs4xdr.c | 107 +++++++--
+ fs/nfs/pagelist.c | 8 +-
+ fs/nfs/read.c | 3 +-
+ fs/nfs/super.c | 4 +
+ fs/nfs/unlink.c | 2 +-
+ fs/nfs/write.c | 9 +-
+ include/linux/nfs4.h | 1 +
+ include/linux/nfs_fs.h | 13 +-
+ include/linux/nfs_fs_sb.h | 7 +-
+ include/linux/nfs_mount.h | 1 +
+ include/linux/nfs_page.h | 1 +
+ include/linux/nfs_xdr.h | 12 +-
+ include/linux/sunrpc/auth.h | 21 +--
+ include/linux/sunrpc/clnt.h | 5 +-
+ include/linux/sunrpc/sched.h | 7 +-
+ include/linux/sunrpc/xprt.h | 1 +
+ net/sunrpc/auth.c | 157 +++++++++----
+ net/sunrpc/auth_generic.c | 23 +--
+ net/sunrpc/auth_gss/auth_gss.c | 29 +--
+ net/sunrpc/auth_null.c | 2 +-
+ net/sunrpc/auth_unix.c | 21 +-
+ net/sunrpc/clnt.c | 182 +++++++++++----
+ net/sunrpc/sched.c | 104 ++--------
+ net/sunrpc/sunrpc_syms.c | 15 +-
+ net/sunrpc/xprt.c | 3 +
+ 41 files changed, 965 insertions(+), 649 deletions(-)
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging net/sunrpc/sunrpc_syms.c
+Merge made by recursive.
+ fs/nfsd/nfs3proc.c | 6 +-
+ fs/nfsd/nfs4callback.c | 55 +++++++++-------
+ fs/nfsd/nfs4state.c | 37 +++++------
+ fs/nfsd/nfs4xdr.c | 1 +
+ fs/nfsd/nfsctl.c | 20 ++---
+ fs/nfsd/nfssvc.c | 153 ++++++++++++++++++++++++++----------------
+ fs/nfsd/vfs.c | 5 +-
+ include/linux/sunrpc/cache.h | 1 +
+ net/sunrpc/cache.c | 7 ++-
+ net/sunrpc/sunrpc_syms.c | 1 +
+ 10 files changed, 165 insertions(+), 121 deletions(-)
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Removing fs/nilfs2/bmap_union.h
+Merge made by recursive.
+ Documentation/filesystems/nilfs2.txt | 12 +-
+ fs/nilfs2/bmap.c | 6 +-
+ fs/nilfs2/bmap.h | 16 +-
+ fs/nilfs2/bmap_union.h | 42 --
+ fs/nilfs2/btnode.c | 23 +-
+ fs/nilfs2/btnode.h | 4 +-
+ fs/nilfs2/btree.c | 914 +++++++++++++++++++---------------
+ fs/nilfs2/btree.h | 12 +-
+ fs/nilfs2/dir.c | 33 +-
+ fs/nilfs2/direct.c | 96 ++---
+ fs/nilfs2/direct.h | 11 -
+ fs/nilfs2/gcinode.c | 17 +-
+ fs/nilfs2/mdt.c | 1 +
+ fs/nilfs2/nilfs.h | 22 +-
+ fs/nilfs2/page.c | 5 +-
+ fs/nilfs2/page.h | 2 +
+ fs/nilfs2/recovery.c | 348 +++++++------
+ fs/nilfs2/segbuf.h | 24 +-
+ fs/nilfs2/segment.c | 19 +-
+ fs/nilfs2/segment.h | 10 +-
+ fs/nilfs2/super.c | 333 +++++++++----
+ fs/nilfs2/the_nilfs.c | 161 +++++--
+ fs/nilfs2/the_nilfs.h | 23 +-
+ include/linux/nilfs2_fs.h | 67 ++-
+ 24 files changed, 1295 insertions(+), 906 deletions(-)
+ delete mode 100644 fs/nilfs2/bmap_union.h
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Already up-to-date.
+Merging omfs/for-next
+$ git merge omfs/for-next
+Merge made by recursive.
+ fs/omfs/dir.c | 22 ++++++++--------------
+ fs/omfs/file.c | 8 ++++----
+ fs/omfs/inode.c | 44 +++++++++++++++++++++++++++++++++-----------
+ fs/omfs/omfs.h | 1 +
+ fs/omfs/omfs_fs.h | 1 +
+ 5 files changed, 47 insertions(+), 29 deletions(-)
+Merging squashfs/master
+$ git merge squashfs/master
+Merge made by recursive.
+ fs/squashfs/Kconfig | 2 +-
+ fs/squashfs/Makefile | 2 +-
+ fs/squashfs/xattr.c | 4 ++--
+ fs/squashfs/xattr.h | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+Merging udf/for_next
+$ git merge udf/for_next
+Merge made by recursive.
+ fs/udf/file.c | 1 -
+ fs/udf/super.c | 2 --
+ 2 files changed, 0 insertions(+), 3 deletions(-)
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Already up-to-date.
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Already up-to-date.
+Merging xfs/master
+$ git merge xfs/master
+Already up-to-date.
+Merging vfs/for-next
+$ git merge vfs/for-next
+Resolved 'fs/nilfs2/super.c' using previous resolution.
+Resolved 'fs/xfs/linux-2.6/xfs_aops.c' using previous resolution.
+Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution.
+Auto-merging fs/9p/v9fs_vfs.h
+Auto-merging fs/9p/vfs_inode.c
+Auto-merging fs/9p/vfs_super.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/cifs/inode.c
+Auto-merging fs/compat.c
+Auto-merging fs/direct-io.c
+Auto-merging fs/ecryptfs/inode.c
+Auto-merging fs/ext3/inode.c
+Auto-merging fs/ext3/super.c
+Auto-merging fs/ext4/ext4.h
+Auto-merging fs/ext4/ialloc.c
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/xattr.c
+Auto-merging fs/freevxfs/vxfs_super.c
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/gfs2/aops.c
+Auto-merging fs/gfs2/super.c
+Auto-merging fs/logfs/dir.c
+Auto-merging fs/logfs/file.c
+Auto-merging fs/logfs/logfs.h
+Auto-merging fs/ncpfs/inode.c
+Auto-merging fs/nfs/inode.c
+Auto-merging fs/nfs/internal.h
+Auto-merging fs/nfs/super.c
+Auto-merging fs/nfsd/nfs4xdr.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/nilfs2/dir.c
+Auto-merging fs/nilfs2/nilfs.h
+Auto-merging fs/nilfs2/recovery.c
+Auto-merging fs/nilfs2/super.c
+CONFLICT (content): Merge conflict in fs/nilfs2/super.c
+Auto-merging fs/ocfs2/aops.c
+Auto-merging fs/ocfs2/dlmfs/dlmfs.c
+Auto-merging fs/ocfs2/super.c
+Auto-merging fs/omfs/file.c
+Auto-merging fs/omfs/inode.c
+Auto-merging fs/quota/dquot.c
+Auto-merging fs/reiserfs/inode.c
+Auto-merging fs/ubifs/super.c
+Auto-merging fs/udf/file.c
+Auto-merging fs/udf/super.c
+Auto-merging fs/xfs/linux-2.6/xfs_aops.c
+CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_aops.c
+Auto-merging fs/xfs/linux-2.6/xfs_iops.c
+Auto-merging fs/xfs/linux-2.6/xfs_linux.h
+Auto-merging fs/xfs/linux-2.6/xfs_super.c
+CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
+Auto-merging fs/xfs/xfs_vnodeops.c
+Auto-merging include/linux/ext3_fs.h
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/mm.h
+Auto-merging include/linux/reiserfs_fs.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5881903] Merge remote branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/Locking | 22 +-
+ Documentation/filesystems/porting | 45 +++
+ arch/alpha/kernel/osf_sys.c | 8 +-
+ arch/mips/include/asm/statfs.h | 12 +-
+ arch/parisc/hpux/sys_hpux.c | 10 +-
+ arch/powerpc/platforms/cell/spufs/inode.c | 12 +-
+ arch/s390/hypfs/inode.c | 6 +-
+ arch/s390/include/asm/statfs.h | 9 +-
+ arch/um/include/shared/os.h | 3 +
+ arch/um/kernel/ksyms.c | 3 +
+ arch/um/os-Linux/file.c | 15 +
+ arch/um/os-Linux/user_syms.c | 4 +
+ drivers/staging/pohmelfs/inode.c | 18 +-
+ fs/9p/v9fs_vfs.h | 2 +-
+ fs/9p/vfs_inode.c | 19 +-
+ fs/9p/vfs_super.c | 4 +-
+ fs/adfs/inode.c | 16 +-
+ fs/affs/affs.h | 3 +-
+ fs/affs/file.c | 11 +-
+ fs/affs/inode.c | 38 ++-
+ fs/affs/super.c | 32 +--
+ fs/afs/inode.c | 5 +-
+ fs/afs/internal.h | 2 +-
+ fs/afs/super.c | 2 +-
+ fs/attr.c | 88 +++---
+ fs/bfs/bfs.h | 1 -
+ fs/bfs/file.c | 17 +-
+ fs/bfs/inode.c | 116 +++-----
+ fs/binfmt_misc.c | 5 +-
+ fs/block_dev.c | 17 +-
+ fs/btrfs/ctree.h | 4 +-
+ fs/btrfs/inode.c | 34 ++-
+ fs/btrfs/super.c | 2 +-
+ fs/buffer.c | 180 ++--------
+ fs/cachefiles/bind.c | 2 +-
+ fs/cachefiles/daemon.c | 6 +-
+ fs/cifs/cifsfs.c | 9 +-
+ fs/cifs/inode.c | 86 +++---
+ fs/coda/inode.c | 8 +-
+ fs/compat.c | 10 +-
+ fs/cramfs/inode.c | 88 +++---
+ fs/dcache.c | 27 ++-
+ fs/direct-io.c | 74 ++---
+ fs/drop_caches.c | 2 +-
+ fs/ecryptfs/inode.c | 18 +-
+ fs/ecryptfs/super.c | 14 +-
+ fs/exofs/exofs.h | 3 +-
+ fs/exofs/file.c | 1 -
+ fs/exofs/inode.c | 127 +++----
+ fs/exofs/super.c | 2 +-
+ fs/ext2/balloc.c | 11 +-
+ fs/ext2/dir.c | 23 +-
+ fs/ext2/ext2.h | 5 +-
+ fs/ext2/ialloc.c | 13 +-
+ fs/ext2/inode.c | 87 +++---
+ fs/ext2/super.c | 14 +-
+ fs/ext2/xattr.c | 25 +-
+ fs/ext3/ialloc.c | 12 -
+ fs/ext3/inode.c | 63 +++-
+ fs/ext3/super.c | 14 +-
+ fs/ext3/xattr.c | 12 +-
+ fs/ext4/ext4.h | 3 +-
+ fs/ext4/ialloc.c | 2 +-
+ fs/ext4/inode.c | 53 ++-
+ fs/ext4/super.c | 10 +-
+ fs/ext4/xattr.c | 12 +-
+ fs/fat/fat.h | 1 -
+ fs/fat/file.c | 49 +--
+ fs/fat/inode.c | 26 +-
+ fs/freevxfs/vxfs_extern.h | 2 +-
+ fs/freevxfs/vxfs_inode.c | 8 +-
+ fs/freevxfs/vxfs_super.c | 2 +-
+ fs/fs-writeback.c | 8 +-
+ fs/fuse/dir.c | 17 +-
+ fs/fuse/inode.c | 6 +-
+ fs/gfs2/aops.c | 10 +-
+ fs/gfs2/inode.c | 27 +-
+ fs/gfs2/ops_inode.c | 18 +-
+ fs/gfs2/super.c | 43 +--
+ fs/gfs2/xattr.c | 24 +-
+ fs/hfs/hfs_fs.h | 2 +-
+ fs/hfs/inode.c | 70 ++++-
+ fs/hfs/super.c | 2 +-
+ fs/hfsplus/hfsplus_fs.h | 1 +
+ fs/hfsplus/inode.c | 77 ++++-
+ fs/hfsplus/super.c | 10 +-
+ fs/hostfs/hostfs.h | 22 +-
+ fs/hostfs/hostfs_kern.c | 517 +++++++++++++----------------
+ fs/hostfs/hostfs_user.c | 112 ++-----
+ fs/hpfs/file.c | 11 +-
+ fs/hpfs/hpfs_fn.h | 2 +-
+ fs/hpfs/inode.c | 24 +-
+ fs/hpfs/super.c | 2 +-
+ fs/hppfs/hppfs.c | 8 +-
+ fs/hugetlbfs/inode.c | 41 +--
+ fs/inode.c | 177 ++++-------
+ fs/jffs2/dir.c | 16 +-
+ fs/jffs2/fs.c | 10 +-
+ fs/jffs2/os-linux.h | 2 +-
+ fs/jffs2/super.c | 2 +-
+ fs/jffs2/xattr.c | 2 +-
+ fs/jfs/file.c | 14 +-
+ fs/jfs/inode.c | 63 +++-
+ fs/jfs/jfs_inode.h | 2 +-
+ fs/jfs/super.c | 8 +-
+ fs/libfs.c | 70 +---
+ fs/logfs/dir.c | 5 +-
+ fs/logfs/file.c | 18 +-
+ fs/logfs/inode.c | 51 +--
+ fs/logfs/journal.c | 2 -
+ fs/logfs/logfs.h | 4 +-
+ fs/logfs/readwrite.c | 62 ++--
+ fs/logfs/segment.c | 1 -
+ fs/logfs/super.c | 23 +-
+ fs/mbcache.c | 168 +++-------
+ fs/minix/bitmap.c | 6 +-
+ fs/minix/dir.c | 21 +-
+ fs/minix/file.c | 22 ++
+ fs/minix/inode.c | 35 ++-
+ fs/minix/minix.h | 4 +-
+ fs/ncpfs/inode.c | 36 +-
+ fs/nfs/inode.c | 13 +-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/super.c | 4 +-
+ fs/nfsd/nfs4xdr.c | 6 +-
+ fs/nfsd/vfs.c | 10 +-
+ fs/nilfs2/dir.c | 25 +-
+ fs/nilfs2/gcdat.c | 2 +-
+ fs/nilfs2/inode.c | 78 ++++-
+ fs/nilfs2/nilfs.h | 2 +-
+ fs/nilfs2/recovery.c | 11 +-
+ fs/nilfs2/super.c | 20 +-
+ fs/notify/inode_mark.c | 6 +-
+ fs/notify/inotify/inotify.c | 7 +-
+ fs/ntfs/inode.c | 10 +-
+ fs/ntfs/inode.h | 2 +-
+ fs/ntfs/super.c | 2 +-
+ fs/ocfs2/aops.c | 9 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 15 +-
+ fs/ocfs2/file.c | 22 +-
+ fs/ocfs2/inode.c | 29 +-
+ fs/ocfs2/inode.h | 5 +-
+ fs/ocfs2/super.c | 3 +-
+ fs/omfs/file.c | 36 ++-
+ fs/omfs/inode.c | 9 +-
+ fs/proc/base.c | 16 +-
+ fs/proc/generic.c | 18 +-
+ fs/proc/inode.c | 6 +-
+ fs/proc/proc_sysctl.c | 15 +-
+ fs/qnx4/inode.c | 11 +-
+ fs/quota/dquot.c | 2 +-
+ fs/ramfs/file-nommu.c | 7 +-
+ fs/reiserfs/file.c | 50 ++--
+ fs/reiserfs/inode.c | 134 +++++---
+ fs/reiserfs/super.c | 10 +-
+ fs/smbfs/inode.c | 12 +-
+ fs/statfs.c | 95 ++++--
+ fs/super.c | 9 +
+ fs/sync.c | 25 --
+ fs/sysfs/inode.c | 8 +-
+ fs/sysfs/mount.c | 2 +-
+ fs/sysfs/sysfs.h | 2 +-
+ fs/sysv/dir.c | 21 +-
+ fs/sysv/file.c | 22 ++
+ fs/sysv/ialloc.c | 1 -
+ fs/sysv/inode.c | 19 +-
+ fs/sysv/itree.c | 19 +-
+ fs/sysv/super.c | 1 -
+ fs/sysv/sysv.h | 4 +-
+ fs/ubifs/file.c | 23 +-
+ fs/ubifs/super.c | 12 +-
+ fs/ubifs/ubifs.h | 2 +-
+ fs/udf/file.c | 22 ++
+ fs/udf/ialloc.c | 2 -
+ fs/udf/inode.c | 61 ++--
+ fs/udf/super.c | 3 +-
+ fs/udf/udfdecl.h | 3 +-
+ fs/ufs/dir.c | 13 +-
+ fs/ufs/ialloc.c | 2 -
+ fs/ufs/inode.c | 63 +++--
+ fs/ufs/super.c | 2 +-
+ fs/ufs/truncate.c | 16 +-
+ fs/ufs/ufs.h | 2 +-
+ fs/ufs/util.h | 4 +-
+ fs/xfs/linux-2.6/xfs_aops.c | 62 +++-
+ fs/xfs/linux-2.6/xfs_iops.c | 20 +-
+ fs/xfs/linux-2.6/xfs_linux.h | 2 -
+ fs/xfs/linux-2.6/xfs_super.c | 6 +-
+ fs/xfs/xfs_vnodeops.c | 38 ++-
+ include/asm-generic/statfs.h | 9 +-
+ include/linux/buffer_head.h | 20 +-
+ include/linux/dcache.h | 1 +
+ include/linux/ext3_fs.h | 2 +-
+ include/linux/fs.h | 65 +---
+ include/linux/mbcache.h | 20 +-
+ include/linux/mm.h | 1 +
+ include/linux/reiserfs_fs.h | 2 +-
+ include/linux/reiserfs_fs_i.h | 4 +-
+ include/linux/statfs.h | 25 ++-
+ ipc/mqueue.c | 16 +-
+ kernel/acct.c | 2 +-
+ mm/shmem.c | 23 +-
+ mm/truncate.c | 38 ++-
+ 203 files changed, 2542 insertions(+), 2450 deletions(-)
+$ git am -3 ../patches/0001-v9fs-fixup-for-inode_setattr-being-removed.patch
+Applying: v9fs: fixup for inode_setattr being removed
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/9p/vfs_inode.c
+$ git add .
+$ git commit -v -a --amend
+[master 89521fe] Merge remote branch 'vfs/for-next'
+$ git am -3 ../patches/0001-xfs-update-tracing-for-clear_inode-to-evit_inode-tra.patch
+Applying: xfs: update tracing for clear_inode to evit_inode transition
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/xfs/linux-2.6/xfs_super.c
+M fs/xfs/linux-2.6/xfs_trace.h
+$ git add .
+$ git commit -v -a --amend
+[master 085d2d7] Merge remote branch 'vfs/for-next'
+$ git am -3 ../patches/0001-cifs-fix-for-clear_inode-evict_inode-API-change.patch
+Applying: cifs: fix for clear_inode -> evict_inode API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/cifs/cifsfs.c
+$ git add .
+$ git commit -v -a --amend
+[master f7873c2] Merge remote branch 'vfs/for-next'
+Merging pci/linux-next
+$ git merge pci/linux-next
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging drivers/net/e1000e/netdev.c
+Auto-merging drivers/net/r8169.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/pci/pci.h
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-bus-pci | 27 ++++++
+ Documentation/filesystems/sysfs-pci.txt | 7 +-
+ Documentation/kernel-parameters.txt | 2 +
+ arch/ia64/kernel/msi_ia64.c | 2 +-
+ arch/ia64/sn/kernel/msi_sn.c | 2 +-
+ arch/x86/include/asm/pci_x86.h | 1 +
+ arch/x86/kernel/apic/io_apic.c | 2 +-
+ arch/x86/pci/acpi.c | 9 ++
+ arch/x86/pci/common.c | 20 +++++
+ arch/x86/pci/irq.c | 6 +-
+ arch/x86/pci/legacy.c | 2 +-
+ drivers/acpi/pci_root.c | 9 ++
+ drivers/firmware/dmi_scan.c | 25 ++++++
+ drivers/net/e1000e/netdev.c | 16 +---
+ drivers/net/r8169.c | 16 +---
+ drivers/pci/Makefile | 3 +
+ drivers/pci/bus.c | 4 +-
+ drivers/pci/hotplug/fakephp.c | 2 +-
+ drivers/pci/hotplug/pciehp_pci.c | 2 +-
+ drivers/pci/hotplug/shpchp_hpc.c | 2 +-
+ drivers/pci/hotplug/shpchp_pci.c | 19 +---
+ drivers/pci/msi.c | 29 ++++++-
+ drivers/pci/pci-driver.c | 32 ++++++-
+ drivers/pci/pci-label.c | 143 +++++++++++++++++++++++++++++++
+ drivers/pci/pci-sysfs.c | 75 ++++++++++++++++-
+ drivers/pci/pci.c | 4 -
+ drivers/pci/pci.h | 9 ++
+ drivers/pci/pcie/Kconfig | 20 +++--
+ drivers/pci/pcie/aer/aerdrv_core.c | 17 ++--
+ drivers/pci/pcie/aspm.c | 16 +++-
+ drivers/pci/probe.c | 10 ++
+ drivers/pci/proc.c | 6 +-
+ drivers/pci/quirks.c | 42 ++++++++-
+ drivers/pci/search.c | 2 +-
+ drivers/pci/setup-bus.c | 12 ++-
+ drivers/pci/setup-irq.c | 3 +-
+ include/linux/dmi.h | 9 ++
+ include/linux/msi.h | 2 +
+ include/linux/pci.h | 2 +
+ 39 files changed, 517 insertions(+), 94 deletions(-)
+ create mode 100644 drivers/pci/pci-label.c
+Merging hid/for-next
+$ git merge hid/for-next
+Recorded preimage for 'drivers/hid/hid-ids.h'
+Auto-merging drivers/hid/hid-ids.h
+CONFLICT (content): Merge conflict in drivers/hid/hid-ids.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/hid/hid-ids.h'.
+[master 41c7bde] Merge remote branch 'hid/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/hid/hid-ids.h | 3 +
+ drivers/hid/hidraw.c | 105 +++++++++++++++++++++++++++++++++++++++--
+ drivers/hid/usbhid/hid-core.c | 30 +++++++++++-
+ include/linux/hid.h | 3 +
+ include/linux/hidraw.h | 3 +
+ 5 files changed, 138 insertions(+), 6 deletions(-)
+Merging quilt/i2c
+$ git merge quilt/i2c
+Auto-merging drivers/media/video/cx88/cx88-i2c.c
+Auto-merging drivers/media/video/em28xx/em28xx-cards.c
+Merge made by recursive.
+ Documentation/i2c/instantiating-devices | 2 +-
+ drivers/i2c/Kconfig | 13 ++
+ drivers/i2c/Makefile | 3 +-
+ drivers/i2c/i2c-core.c | 158 +++++++++++----
+ drivers/i2c/i2c-dev.c | 66 +++++--
+ drivers/i2c/i2c-mux.c | 165 ++++++++++++++++
+ drivers/i2c/muxes/Kconfig | 18 ++
+ drivers/i2c/muxes/Makefile | 8 +
+ drivers/i2c/muxes/pca954x.c | 301 +++++++++++++++++++++++++++++
+ drivers/macintosh/therm_windtunnel.c | 4 +-
+ drivers/media/video/bt8xx/bttv-i2c.c | 2 +-
+ drivers/media/video/cx18/cx18-i2c.c | 3 +-
+ drivers/media/video/cx23885/cx23885-i2c.c | 15 +-
+ drivers/media/video/cx88/cx88-i2c.c | 19 +--
+ drivers/media/video/em28xx/em28xx-cards.c | 2 +-
+ drivers/media/video/ivtv/ivtv-i2c.c | 9 +-
+ drivers/media/video/v4l2-common.c | 3 +-
+ drivers/usb/host/ohci-pnx4008.c | 2 +-
+ drivers/video/matrox/i2c-matroxfb.c | 2 +-
+ include/linux/i2c-mux.h | 46 +++++
+ include/linux/i2c.h | 33 ++--
+ include/linux/i2c/pca954x.h | 47 +++++
+ 22 files changed, 805 insertions(+), 116 deletions(-)
+ create mode 100644 drivers/i2c/i2c-mux.c
+ create mode 100644 drivers/i2c/muxes/Kconfig
+ create mode 100644 drivers/i2c/muxes/Makefile
+ create mode 100644 drivers/i2c/muxes/pca954x.c
+ create mode 100644 include/linux/i2c-mux.h
+ create mode 100644 include/linux/i2c/pca954x.h
+Merging bjdooks-i2c/next-i2c
+$ git merge bjdooks-i2c/next-i2c
+Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution.
+Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution.
+Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/plat-omap/i2c.c
+CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
+Auto-merging drivers/i2c/busses/i2c-cpm.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
+Auto-merging drivers/i2c/busses/i2c-ibm_iic.c
+Auto-merging drivers/i2c/busses/i2c-mpc.c
+CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
+Auto-merging drivers/i2c/busses/i2c-pxa.c
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 35a4519] Merge remote branch 'bjdooks-i2c/next-i2c'
+$ git diff -M --stat --summary HEAD^..
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Auto-merging MAINTAINERS
+Auto-merging drivers/hwmon/Kconfig
+Auto-merging drivers/hwmon/Makefile
+Merge made by recursive.
+ Documentation/hwmon/emc2103 | 33 ++
+ Documentation/hwmon/ltc4245 | 24 ++-
+ Documentation/hwmon/sysfs-interface | 29 ++-
+ Documentation/hwmon/w83627ehf | 15 +-
+ MAINTAINERS | 7 +
+ drivers/hwmon/Kconfig | 10 +
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/asc7621.c | 9 +-
+ drivers/hwmon/emc1403.c | 33 ++
+ drivers/hwmon/emc2103.c | 740 +++++++++++++++++++++++++++++++++++
+ drivers/hwmon/it87.c | 46 ++-
+ drivers/hwmon/lm75.c | 39 ++
+ drivers/hwmon/lm75.h | 1 +
+ drivers/hwmon/ltc4245.c | 177 ++++++++-
+ drivers/hwmon/pc87360.c | 30 +-
+ drivers/hwmon/w83627ehf.c | 97 ++++-
+ include/linux/i2c/ltc4245.h | 21 +
+ 17 files changed, 1258 insertions(+), 54 deletions(-)
+ create mode 100644 Documentation/hwmon/emc2103
+ create mode 100644 drivers/hwmon/emc2103.c
+ create mode 100644 include/linux/i2c/ltc4245.h
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Auto-merging Documentation/kernel-parameters.txt
+Merge made by recursive.
+ Documentation/DocBook/stylesheet.xsl | 1 +
+ Documentation/kbuild/kbuild.txt | 8 +-
+ Documentation/kbuild/makefiles.txt | 100 +++++++++++------------
+ Documentation/kernel-parameters.txt | 130 +-----------------------------
+ Documentation/scsi/scsi-parameters.txt | 139 ++++++++++++++++++++++++++++++++
+ Documentation/vm/page-types.c | 2 +-
+ fs/aio.c | 21 +++---
+ 7 files changed, 207 insertions(+), 194 deletions(-)
+ create mode 100644 Documentation/scsi/scsi-parameters.txt
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Merge made by recursive.
+ drivers/media/video/gspca/gspca.c | 2 +-
+ drivers/media/video/gspca/sonixj.c | 10 +-
+ drivers/media/video/gspca/sq930x.c | 347 ++++++++---------------------------
+ drivers/media/video/gspca/t613.c | 4 +-
+ drivers/media/video/gspca/vc032x.c | 360 ++++++++++++++++++++++++++++++------
+ 5 files changed, 383 insertions(+), 340 deletions(-)
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Auto-merging Documentation/kbuild/kbuild.txt
+Auto-merging Documentation/kbuild/makefiles.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/mips/Makefile
+Auto-merging lib/Kconfig.debug
+Merge made by recursive.
+ Documentation/coccinelle.txt | 258 +++++++++++++++++++
+ Documentation/kbuild/kbuild.txt | 26 ++-
+ Documentation/kbuild/kconfig.txt | 2 +-
+ Documentation/kbuild/makefiles.txt | 27 ++-
+ MAINTAINERS | 14 +-
+ Makefile | 41 ++-
+ arch/avr32/Makefile | 2 +-
+ arch/blackfin/Makefile | 4 +-
+ arch/frv/Makefile | 22 +--
+ arch/ia64/Makefile | 6 +-
+ arch/m32r/Makefile | 4 +-
+ arch/m68k/Makefile | 2 +-
+ arch/mips/Makefile | 6 +-
+ arch/powerpc/Makefile | 2 +-
+ arch/s390/Makefile | 3 +-
+ arch/score/Makefile | 3 +-
+ lib/Kconfig.debug | 13 +
+ scripts/Makefile.build | 37 ++--
+ scripts/Makefile.help | 3 +
+ scripts/Makefile.modpost | 9 +-
+ scripts/checkkconfigsymbols.sh | 2 +-
+ scripts/coccicheck | 80 ++++++
+ scripts/coccinelle/alloc/drop_kmalloc_cast.cocci | 67 +++++
+ scripts/coccinelle/alloc/kzalloc-simple.cocci | 82 ++++++
+ scripts/coccinelle/deref_null.cocci | 293 ++++++++++++++++++++++
+ scripts/coccinelle/err_cast.cocci | 56 ++++
+ scripts/coccinelle/resource_size.cocci | 93 +++++++
+ scripts/decodecode | 10 +-
+ scripts/dtc/fstree.c | 1 +
+ scripts/kconfig/.gitignore | 1 +
+ scripts/kconfig/Makefile | 77 +++---
+ scripts/kconfig/conf.c | 181 ++++++++------
+ scripts/kconfig/confdata.c | 221 +++++++++++-----
+ scripts/kconfig/expr.c | 2 +-
+ scripts/kconfig/expr.h | 3 +
+ scripts/kconfig/gconf.c | 7 +-
+ scripts/kconfig/lkc.h | 2 +
+ scripts/kconfig/lkc_proto.h | 1 +
+ scripts/kconfig/lxdialog/checklist.c | 10 +-
+ scripts/kconfig/mconf.c | 2 +-
+ scripts/kconfig/menu.c | 27 ++-
+ scripts/kconfig/qconf.cc | 106 ++++----
+ scripts/kconfig/qconf.h | 17 +-
+ scripts/kconfig/symbol.c | 292 +++++++++++++++++++---
+ scripts/mod/file2alias.c | 6 +-
+ scripts/mod/modpost.c | 102 ++++++--
+ scripts/mod/modpost.h | 43 ++++
+ scripts/package/builddeb | 5 +-
+ 48 files changed, 1876 insertions(+), 397 deletions(-)
+ create mode 100644 Documentation/coccinelle.txt
+ create mode 100644 scripts/Makefile.help
+ create mode 100755 scripts/coccicheck
+ create mode 100644 scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
+ create mode 100644 scripts/coccinelle/alloc/kzalloc-simple.cocci
+ create mode 100644 scripts/coccinelle/deref_null.cocci
+ create mode 100644 scripts/coccinelle/err_cast.cocci
+ create mode 100644 scripts/coccinelle/resource_size.cocci
+Merging kconfig/for-next
+$ git merge kconfig/for-next
+Already uptodate!
+Merge made by recursive.
+Merging ide/master
+$ git merge ide/master
+Merge made by recursive.
+ drivers/ide/ide-taskfile.c | 10 +++-------
+ drivers/ide/tx4938ide.c | 2 +-
+ drivers/ide/tx4939ide.c | 2 +-
+ 3 files changed, 5 insertions(+), 9 deletions(-)
+Merging libata/NEXT
+$ git merge libata/NEXT
+Auto-merging drivers/pci/quirks.c
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ drivers/ata/Kconfig | 18 +
+ drivers/ata/Makefile | 2 +
+ drivers/ata/ahci.c | 2 +-
+ drivers/ata/ahci_platform.c | 26 +-
+ drivers/ata/ata_generic.c | 4 -
+ drivers/ata/ata_piix.c | 8 +
+ drivers/ata/libata-core.c | 161 ++---
+ drivers/ata/libata-eh.c | 1 +
+ drivers/ata/pata_samsung_cf.c | 683 ++++++++++++++++
+ drivers/ata/pata_scc.c | 3 +-
+ drivers/ata/sata_dwc_460ex.c | 1756 +++++++++++++++++++++++++++++++++++++++++
+ drivers/ata/sata_fsl.c | 20 +-
+ drivers/ata/sata_mv.c | 47 +-
+ drivers/ata/sata_nv.c | 32 +-
+ drivers/pci/quirks.c | 6 +
+ include/linux/ahci_platform.h | 4 +-
+ include/linux/pci_ids.h | 2 +
+ 17 files changed, 2616 insertions(+), 159 deletions(-)
+ create mode 100644 drivers/ata/pata_samsung_cf.c
+ create mode 100644 drivers/ata/sata_dwc_460ex.c
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Auto-merging drivers/infiniband/hw/cxgb3/iwch_cm.c
+Auto-merging drivers/infiniband/hw/cxgb3/iwch_qp.c
+Auto-merging drivers/infiniband/hw/cxgb4/cm.c
+Auto-merging drivers/infiniband/hw/cxgb4/qp.c
+Auto-merging drivers/infiniband/hw/nes/nes_cm.c
+Auto-merging drivers/infiniband/hw/nes/nes_nic.c
+Merge made by recursive.
+ drivers/infiniband/core/cm.c | 10 +-
+ drivers/infiniband/core/user_mad.c | 2 -
+ drivers/infiniband/core/verbs.c | 4 +-
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +-
+ drivers/infiniband/hw/cxgb3/iwch_qp.c | 4 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 91 ++++++-----
+ drivers/infiniband/hw/cxgb4/cq.c | 4 +-
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 +
+ drivers/infiniband/hw/cxgb4/mem.c | 2 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 240 +++++++++++++------------
+ drivers/infiniband/hw/cxgb4/t4.h | 32 ++--
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 10 +
+ drivers/infiniband/hw/ehca/ehca_eq.c | 8 +-
+ drivers/infiniband/hw/ehca/ehca_main.c | 3 +-
+ drivers/infiniband/hw/ehca/ehca_qp.c | 2 +-
+ drivers/infiniband/hw/ehca/hcp_if.c | 32 +++-
+ drivers/infiniband/hw/ehca/hcp_phyp.c | 11 +-
+ drivers/infiniband/hw/ehca/hcp_phyp.h | 2 +-
+ drivers/infiniband/hw/ipath/ipath_driver.c | 13 +-
+ drivers/infiniband/hw/mthca/mthca_cmd.c | 2 +-
+ drivers/infiniband/hw/nes/nes.c | 37 ++---
+ drivers/infiniband/hw/nes/nes.h | 2 +
+ drivers/infiniband/hw/nes/nes_cm.c | 10 +-
+ drivers/infiniband/hw/nes/nes_hw.c | 17 +-
+ drivers/infiniband/hw/nes/nes_hw.h | 3 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 15 +-
+ drivers/infiniband/hw/nes/nes_utils.c | 5 +
+ drivers/infiniband/hw/nes/nes_verbs.c | 21 ++-
+ drivers/infiniband/hw/qib/qib.h | 3 +
+ drivers/infiniband/hw/qib/qib_common.h | 16 ++-
+ drivers/infiniband/hw/qib/qib_driver.c | 2 +-
+ drivers/infiniband/hw/qib/qib_file_ops.c | 203 +++++++++++-----------
+ drivers/infiniband/hw/qib/qib_fs.c | 18 +-
+ drivers/infiniband/hw/qib/qib_iba7322.c | 4 +-
+ drivers/infiniband/hw/qib/qib_init.c | 2 +-
+ drivers/infiniband/hw/qib/qib_qp.c | 2 +-
+ drivers/infiniband/hw/qib/qib_rc.c | 47 ++----
+ drivers/infiniband/hw/qib/qib_sdma.c | 2 +
+ drivers/infiniband/hw/qib/qib_sysfs.c | 21 ++-
+ drivers/infiniband/hw/qib/qib_tx.c | 2 +-
+ drivers/infiniband/hw/qib/qib_uc.c | 6 -
+ drivers/infiniband/hw/qib/qib_ud.c | 17 +--
+ drivers/infiniband/hw/qib/qib_verbs.c | 7 +-
+ drivers/infiniband/ulp/iser/iser_initiator.c | 2 +-
+ drivers/infiniband/ulp/srp/ib_srp.c | 118 +++++++------
+ include/rdma/ib_verbs.h | 2 +-
+ 46 files changed, 572 insertions(+), 487 deletions(-)
+Merging acpi/test
+$ git merge acpi/test
+Auto-merging drivers/acpi/ec.c
+Auto-merging drivers/pci/pci-acpi.c
+Merge made by recursive.
+ drivers/acpi/acpica/acevents.h | 4 +-
+ drivers/acpi/acpica/acglobal.h | 7 -
+ drivers/acpi/acpica/achware.h | 5 +-
+ drivers/acpi/acpica/aclocal.h | 6 +-
+ drivers/acpi/acpica/acnamesp.h | 7 -
+ drivers/acpi/acpica/acobject.h | 16 ++--
+ drivers/acpi/acpica/acpredef.h | 13 +-
+ drivers/acpi/acpica/acstruct.h | 32 +++---
+ drivers/acpi/acpica/dsinit.c | 14 +-
+ drivers/acpi/acpica/dsmethod.c | 20 +++-
+ drivers/acpi/acpica/dsmthdat.c | 16 +--
+ drivers/acpi/acpica/dsobject.c | 16 +++-
+ drivers/acpi/acpica/dsopcode.c | 6 +-
+ drivers/acpi/acpica/dsutils.c | 4 +-
+ drivers/acpi/acpica/evevent.c | 5 +-
+ drivers/acpi/acpica/evgpe.c | 69 +++++++++---
+ drivers/acpi/acpica/evgpeblk.c | 70 ++---------
+ drivers/acpi/acpica/evgpeinit.c | 236 +++----------------------------------
+ drivers/acpi/acpica/evrgnini.c | 10 +-
+ drivers/acpi/acpica/evxfevnt.c | 249 ++++++++++++++++-----------------------
+ drivers/acpi/acpica/exconfig.c | 2 +-
+ drivers/acpi/acpica/exdump.c | 6 +-
+ drivers/acpi/acpica/exfldio.c | 4 +-
+ drivers/acpi/acpica/exprep.c | 23 +---
+ drivers/acpi/acpica/exregion.c | 6 +-
+ drivers/acpi/acpica/hwgpe.c | 35 +-----
+ drivers/acpi/acpica/hwsleep.c | 2 +-
+ drivers/acpi/acpica/nsaccess.c | 9 +-
+ drivers/acpi/acpica/nsalloc.c | 94 +++++++--------
+ drivers/acpi/acpica/nsdump.c | 2 +-
+ drivers/acpi/acpica/nsinit.c | 16 ++--
+ drivers/acpi/acpica/nsnames.c | 4 +-
+ drivers/acpi/acpica/nsparse.c | 4 +-
+ drivers/acpi/acpica/nsrepair.c | 2 +-
+ drivers/acpi/acpica/nsrepair2.c | 7 +
+ drivers/acpi/acpica/nssearch.c | 15 +--
+ drivers/acpi/acpica/nsutils.c | 113 ------------------
+ drivers/acpi/acpica/nswalk.c | 15 +--
+ drivers/acpi/acpica/nsxfobj.c | 2 +-
+ drivers/acpi/acpica/utglobal.c | 2 +-
+ drivers/acpi/acpica/utxface.c | 8 +-
+ drivers/acpi/button.c | 6 +-
+ drivers/acpi/ec.c | 39 +-----
+ drivers/acpi/osl.c | 20 ---
+ drivers/acpi/scan.c | 7 +-
+ drivers/acpi/sleep.c | 75 ++++--------
+ drivers/acpi/sleep.h | 5 +-
+ drivers/acpi/system.c | 6 +-
+ drivers/acpi/wakeup.c | 66 ++++-------
+ drivers/pci/pci-acpi.c | 6 +-
+ include/acpi/acoutput.h | 3 +-
+ include/acpi/acpixf.h | 13 +-
+ include/acpi/actbl2.h | 48 ++++++++
+ include/acpi/actypes.h | 8 +-
+ 54 files changed, 503 insertions(+), 975 deletions(-)
+Merging idle-test/idle-test
+$ git merge idle-test/idle-test
+Auto-merging drivers/idle/intel_idle.c
+Merge made by recursive.
+ drivers/idle/intel_idle.c | 59 ++++-----------------------------------------
+ 1 files changed, 5 insertions(+), 54 deletions(-)
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Auto-merging Documentation/ioctl/ioctl-number.txt
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ MAINTAINERS | 1 +
+ drivers/firewire/Kconfig | 24 +
+ drivers/firewire/Makefile | 1 +
+ drivers/firewire/core-card.c | 218 +++++--
+ drivers/firewire/core-cdev.c | 409 ++++++++++---
+ drivers/firewire/core-device.c | 11 +-
+ drivers/firewire/core-iso.c | 34 +-
+ drivers/firewire/core-topology.c | 22 +-
+ drivers/firewire/core-transaction.c | 306 +++++++---
+ drivers/firewire/core.h | 24 +-
+ drivers/firewire/net.c | 4 +-
+ drivers/firewire/nosy-user.h | 25 +
+ drivers/firewire/nosy.c | 721 +++++++++++++++++++++
+ drivers/firewire/nosy.h | 237 +++++++
+ drivers/firewire/ohci.c | 701 ++++++++++++++++-----
+ drivers/firewire/ohci.h | 1 +
+ drivers/firewire/sbp2.c | 13 +-
+ drivers/ieee1394/dv1394.c | 18 +-
+ drivers/ieee1394/eth1394.c | 3 -
+ drivers/ieee1394/raw1394.c | 7 +-
+ drivers/ieee1394/sbp2.c | 11 +-
+ drivers/ieee1394/video1394.c | 17 +-
+ drivers/media/dvb/firewire/firedtv-fw.c | 4 +-
+ include/linux/firewire-cdev.h | 501 ++++++++++++---
+ include/linux/firewire.h | 62 ++-
+ tools/firewire/Makefile | 19 +
+ tools/firewire/decode-fcp.c | 213 +++++++
+ tools/firewire/list.h | 62 ++
+ tools/firewire/nosy-dump.c | 1031 +++++++++++++++++++++++++++++++
+ tools/firewire/nosy-dump.h | 173 ++++++
+ 31 files changed, 4303 insertions(+), 571 deletions(-)
+ create mode 100644 drivers/firewire/nosy-user.h
+ create mode 100644 drivers/firewire/nosy.c
+ create mode 100644 drivers/firewire/nosy.h
+ create mode 100644 tools/firewire/Makefile
+ create mode 100644 tools/firewire/decode-fcp.c
+ create mode 100644 tools/firewire/list.h
+ create mode 100644 tools/firewire/nosy-dump.c
+ create mode 100644 tools/firewire/nosy-dump.h
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Already up-to-date.
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging dlm/next
+$ git merge dlm/next
+Already up-to-date.
+Merging swiotlb/master
+$ git merge swiotlb/master
+Merge made by recursive.
+ arch/x86/include/asm/xen/page.h | 8 +-
+ arch/x86/include/asm/xen/swiotlb-xen.h | 14 +
+ arch/x86/kernel/pci-dma.c | 7 +-
+ arch/x86/xen/Makefile | 1 +
+ arch/x86/xen/enlighten.c | 4 +
+ arch/x86/xen/mmu.c | 293 ++++++++++++++++++-
+ arch/x86/xen/pci-swiotlb-xen.c | 58 ++++
+ drivers/xen/Kconfig | 4 +
+ drivers/xen/Makefile | 3 +-
+ drivers/xen/balloon.c | 15 +-
+ drivers/xen/swiotlb-xen.c | 515 ++++++++++++++++++++++++++++++++
+ include/linux/vmalloc.h | 2 +
+ include/xen/interface/memory.h | 50 +++
+ include/xen/swiotlb-xen.h | 65 ++++
+ include/xen/xen-ops.h | 6 +
+ mm/vmalloc.c | 4 +
+ 16 files changed, 1024 insertions(+), 25 deletions(-)
+ create mode 100644 arch/x86/include/asm/xen/swiotlb-xen.h
+ create mode 100644 arch/x86/xen/pci-swiotlb-xen.c
+ create mode 100644 drivers/xen/swiotlb-xen.c
+ create mode 100644 include/xen/swiotlb-xen.h
+Merging swiotlb-xen/master
+$ git merge swiotlb-xen/master
+Already up-to-date.
+Merging ibft/master
+$ git merge ibft/master
+Already up-to-date.
+Merging scsi/master
+$ git merge scsi/master
+Already up-to-date.
+Merging async_tx/next
+$ git merge async_tx/next
+Resolved 'arch/arm/mach-ux500/devices-db8500.c' using previous resolution.
+Auto-merging arch/arm/mach-ux500/devices-db8500.c
+CONFLICT (content): Merge conflict in arch/arm/mach-ux500/devices-db8500.c
+Auto-merging drivers/dma/Kconfig
+Auto-merging drivers/pci/intel-iommu.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4a96caf] Merge remote branch 'async_tx/next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-ux500/devices-db8500.c | 28 +-
+ arch/arm/mach-ux500/include/mach/db8500-regs.h | 6 +-
+ arch/arm/mach-ux500/ste-dma40-db8500.h | 2 +-
+ arch/arm/plat-nomadik/include/plat/ste_dma40.h | 4 +-
+ drivers/dma/Kconfig | 20 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/coh901318.c | 169 ++++
+ drivers/dma/dmatest.c | 2 +-
+ drivers/dma/intel_mid_dma.c | 1143 ++++++++++++++++++++++++
+ drivers/dma/intel_mid_dma_regs.h | 260 ++++++
+ drivers/dma/ioat/dma.h | 1 +
+ drivers/dma/ioat/dma_v2.c | 24 +-
+ drivers/dma/ioat/dma_v3.c | 5 +-
+ drivers/dma/pch_dma.c | 957 ++++++++++++++++++++
+ drivers/dma/ste_dma40.c | 860 +++++++++++-------
+ drivers/dma/ste_dma40_ll.c | 40 +-
+ drivers/dma/ste_dma40_ll.h | 15 +-
+ drivers/dma/timb_dma.c | 8 +-
+ drivers/pci/intel-iommu.c | 28 +
+ include/linux/dmaengine.h | 71 ++
+ include/linux/intel_mid_dma.h | 86 ++
+ include/linux/pch_dma.h | 37 +
+ 22 files changed, 3388 insertions(+), 380 deletions(-)
+ create mode 100644 drivers/dma/intel_mid_dma.c
+ create mode 100644 drivers/dma/intel_mid_dma_regs.h
+ create mode 100644 drivers/dma/pch_dma.c
+ create mode 100644 include/linux/intel_mid_dma.h
+ create mode 100644 include/linux/pch_dma.h
+Merging net/master
+$ git merge net/master
+Already up-to-date.
+Merging wireless/master
+$ git merge wireless/master
+Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c
+Merge made by recursive.
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 ++-
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 18 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 388 +++++++++++++++++++++++-
+ drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 17 +-
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 6 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 3 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 118 ++++----
+ drivers/net/wireless/ath/ath9k/calib.h | 8 +-
+ drivers/net/wireless/ath/ath9k/htc.h | 2 +
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 10 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 25 +-
+ drivers/net/wireless/ath/ath9k/hw.h | 25 +-
+ drivers/net/wireless/ath/ath9k/main.c | 104 ++++---
+ drivers/net/wireless/ath/ath9k/recv.c | 10 +-
+ drivers/net/wireless/ath/ath9k/xmit.c | 36 +--
+ drivers/net/wireless/ipw2x00/ipw2100.c | 4 +
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 11 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 2 +-
+ drivers/net/wireless/p54/p54pci.c | 2 +
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 21 +-
+ drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +-
+ net/mac80211/main.c | 2 +
+ net/mac80211/scan.c | 14 -
+ 26 files changed, 659 insertions(+), 230 deletions(-)
+Merging mtd/master
+$ git merge mtd/master
+Auto-merging drivers/mtd/maps/physmap_of.c
+Auto-merging drivers/mtd/mtdchar.c
+Auto-merging drivers/mtd/nand/Kconfig
+Auto-merging drivers/mtd/nand/fsl_upm.c
+Auto-merging drivers/mtd/nand/mxc_nand.c
+Auto-merging drivers/mtd/nand/socrates_nand.c
+Merge made by recursive.
+ drivers/mtd/Kconfig | 1 -
+ drivers/mtd/chips/cfi_cmdset_0001.c | 10 ++
+ drivers/mtd/chips/cfi_cmdset_0002.c | 15 +++-
+ drivers/mtd/chips/cfi_probe.c | 4 +-
+ drivers/mtd/devices/m25p80.c | 30 ++++---
+ drivers/mtd/devices/mtd_dataflash.c | 12 ++--
+ drivers/mtd/devices/sst25l.c | 2 +-
+ drivers/mtd/maps/ixp4xx.c | 35 ++++++--
+ drivers/mtd/maps/physmap.c | 6 +-
+ drivers/mtd/maps/physmap_of.c | 6 +-
+ drivers/mtd/mtd_blkdevs.c | 1 +
+ drivers/mtd/mtdchar.c | 42 +++++++++-
+ drivers/mtd/mtdconcat.c | 20 +++--
+ drivers/mtd/mtdpart.c | 10 ++
+ drivers/mtd/nand/Kconfig | 31 +++----
+ drivers/mtd/nand/davinci_nand.c | 17 ++++
+ drivers/mtd/nand/denali.h | 160 +++++++++++++++++------------------
+ drivers/mtd/nand/diskonchip.c | 5 +-
+ drivers/mtd/nand/mxc_nand.c | 46 +----------
+ drivers/mtd/nand/nand_base.c | 78 +++++++++++++----
+ drivers/mtd/nand/nand_bbt.c | 102 ++++++++++++++++------
+ drivers/mtd/nand/nand_ids.c | 4 +
+ drivers/mtd/nand/nandsim.c | 14 ++--
+ drivers/mtd/nand/r852.c | 6 +-
+ drivers/mtd/nand/s3c2410.c | 15 ++--
+ drivers/mtd/nand/sm_common.c | 2 +-
+ drivers/mtd/onenand/Kconfig | 4 +-
+ drivers/mtd/onenand/onenand_base.c | 49 ++++++++---
+ drivers/mtd/onenand/samsung.c | 21 ++---
+ drivers/mtd/tests/mtd_pagetest.c | 9 +-
+ include/linux/mtd/bbm.h | 6 ++
+ include/linux/mtd/mtd.h | 1 +
+ include/linux/mtd/nand.h | 2 -
+ include/linux/mtd/onenand.h | 2 +
+ include/mtd/mtd-abi.h | 1 +
+ 35 files changed, 476 insertions(+), 293 deletions(-)
+Merging crypto/master
+$ git merge crypto/master
+Already up-to-date.
+Merging sound/for-next
+$ git merge sound/for-next
+Resolved 'Documentation/kernel-parameters.txt' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
+Auto-merging arch/arm/mach-davinci/board-da830-evm.c
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c
+Auto-merging arch/arm/mach-ep93xx/clock.c
+Auto-merging arch/arm/mach-ep93xx/core.c
+Auto-merging arch/arm/mach-ep93xx/include/mach/platform.h
+Auto-merging arch/arm/mach-kirkwood/common.c
+Auto-merging arch/arm/mach-kirkwood/common.h
+Auto-merging arch/arm/mach-kirkwood/include/mach/kirkwood.h
+Auto-merging arch/arm/mach-kirkwood/openrd-setup.c
+Auto-merging arch/arm/mach-omap2/mcbsp.c
+Auto-merging include/sound/pcm.h
+Auto-merging sound/drivers/Kconfig
+Auto-merging sound/soc/au1x/psc-i2s.c
+Removing sound/soc/fsl/mpc5200_psc_i2s.h
+Auto-merging sound/soc/imx/imx-ssi.c
+Auto-merging sound/soc/soc-core.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3cdb27c] Merge remote branch 'sound/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 167 +-----
+ Documentation/sound/alsa/HD-Audio-Models.txt | 6 +
+ Documentation/sound/alsa/Procfile.txt | 8 +
+ Documentation/sound/alsa/alsa-parameters.txt | 135 ++++
+ Documentation/sound/oss/oss-parameters.txt | 51 ++
+ arch/arm/mach-davinci/board-da830-evm.c | 2 +-
+ arch/arm/mach-davinci/board-da850-evm.c | 2 +-
+ arch/arm/mach-davinci/board-dm646x-evm.c | 4 +-
+ arch/arm/mach-davinci/include/mach/asp.h | 51 ++-
+ arch/arm/mach-ep93xx/clock.c | 67 ++-
+ arch/arm/mach-ep93xx/core.c | 67 ++
+ arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 10 +
+ arch/arm/mach-ep93xx/include/mach/platform.h | 3 +
+ arch/arm/mach-ep93xx/snappercl15.c | 1 +
+ arch/arm/mach-kirkwood/common.c | 38 ++
+ arch/arm/mach-kirkwood/common.h | 2 +
+ arch/arm/mach-kirkwood/include/mach/kirkwood.h | 3 +
+ arch/arm/mach-kirkwood/openrd-setup.c | 13 +
+ arch/arm/mach-omap2/mcbsp.c | 10 +-
+ arch/arm/plat-mxc/include/mach/ssi.h | 3 +
+ arch/arm/plat-omap/include/plat/mcbsp.h | 2 +
+ arch/arm/plat-omap/mcbsp.c | 51 +-
+ arch/arm/plat-orion/include/plat/audio.h | 11 +
+ arch/um/drivers/hostaudio_kern.c | 6 +
+ drivers/usb/gadget/f_audio.c | 6 +-
+ drivers/usb/gadget/gmidi.c | 2 +-
+ include/linux/usb/audio-v2.h | 17 +-
+ include/linux/usb/audio.h | 12 +-
+ include/sound/asound.h | 6 +-
+ include/sound/pcm.h | 6 +-
+ include/sound/sh_fsi.h | 49 ++-
+ include/sound/soc-dapm.h | 2 +
+ include/sound/soc.h | 21 +
+ include/sound/tlv320dac33-plat.h | 2 +
+ include/sound/uda134x.h | 12 +
+ sound/core/pcm_lib.c | 25 +-
+ sound/core/pcm_misc.c | 16 +
+ sound/drivers/Kconfig | 24 +-
+ sound/isa/msnd/msnd_pinnacle.c | 5 +-
+ sound/isa/sb/emu8000_pcm.c | 9 +-
+ sound/oss/au1550_ac97.c | 91 ++--
+ sound/oss/dmasound/dmasound_core.c | 63 ++-
+ sound/oss/midi_synth.c | 4 +-
+ sound/oss/msnd_pinnacle.c | 35 +-
+ sound/oss/sh_dac_audio.c | 27 +-
+ sound/oss/soundcard.c | 20 +-
+ sound/oss/swarm_cs4297a.c | 41 +-
+ sound/oss/vidc.c | 3 -
+ sound/oss/vwsnd.c | 32 +-
+ sound/oss/waveartist.c | 10 +-
+ sound/pci/als4000.c | 4 +-
+ sound/pci/asihpi/asihpi.c | 16 +-
+ sound/pci/asihpi/hpi.h | 68 ++-
+ sound/pci/asihpi/hpi6000.c | 7 +
+ sound/pci/asihpi/hpi_internal.h | 40 +-
+ sound/pci/asihpi/hpicmn.c | 10 +-
+ sound/pci/asihpi/hpidebug.c | 2 +-
+ sound/pci/asihpi/hpidebug.h | 4 +-
+ sound/pci/asihpi/hpifunc.c | 327 ++++++----
+ sound/pci/asihpi/hpimsgx.c | 2 +-
+ sound/pci/asihpi/hpioctl.c | 21 +-
+ sound/pci/echoaudio/echoaudio.c | 2 +
+ sound/pci/hda/hda_codec.c | 97 ++--
+ sound/pci/hda/hda_codec.h | 32 +-
+ sound/pci/hda/hda_hwdep.c | 4 +-
+ sound/pci/hda/hda_intel.c | 5 +-
+ sound/pci/hda/hda_proc.c | 7 +-
+ sound/pci/hda/patch_analog.c | 7 +-
+ sound/pci/hda/patch_conexant.c | 95 +++-
+ sound/pci/hda/patch_hdmi.c | 43 ++-
+ sound/pci/hda/patch_intelhdmi.c | 3 +-
+ sound/pci/hda/patch_nvhdmi.c | 3 +-
+ sound/pci/hda/patch_realtek.c | 720 +++++++++++++++++++---
+ sound/pci/hda/patch_sigmatel.c | 12 +-
+ sound/pci/hda/patch_via.c | 32 +-
+ sound/pci/riptide/riptide.c | 18 +-
+ sound/pci/sis7019.c | 16 +-
+ sound/pci/via82xx.c | 9 +-
+ sound/soc/Kconfig | 4 +
+ sound/soc/Makefile | 4 +
+ sound/soc/atmel/atmel-pcm.c | 1 -
+ sound/soc/atmel/atmel_ssc_dai.c | 1 -
+ sound/soc/au1x/psc-ac97.c | 13 +-
+ sound/soc/au1x/psc-i2s.c | 13 +-
+ sound/soc/au1x/psc.h | 1 -
+ sound/soc/blackfin/bf5xx-ac97.c | 6 +-
+ sound/soc/blackfin/bf5xx-tdm.c | 6 +-
+ sound/soc/codecs/Kconfig | 20 +-
+ sound/soc/codecs/Makefile | 6 +
+ sound/soc/codecs/ad1836.c | 1 +
+ sound/soc/codecs/ad193x.c | 41 ++-
+ sound/soc/codecs/ad193x.h | 5 +
+ sound/soc/codecs/ak4642.c | 36 +-
+ sound/soc/codecs/cs42l51.c | 763 +++++++++++++++++++++++
+ sound/soc/codecs/cs42l51.h | 163 +++++
+ sound/soc/codecs/da7210.c | 48 +-
+ sound/soc/codecs/jz4740.c | 511 +++++++++++++++
+ sound/soc/codecs/jz4740.h | 20 +
+ sound/soc/codecs/spdif_transciever.c | 94 +++-
+ sound/soc/codecs/spdif_transciever.h | 1 +
+ sound/soc/codecs/tlv320aic23.c | 7 +-
+ sound/soc/codecs/tlv320dac33.c | 180 ++++--
+ sound/soc/codecs/twl4030.c | 388 +++++++------
+ sound/soc/codecs/twl4030.h | 4 +
+ sound/soc/codecs/twl6040.c | 58 +-
+ sound/soc/codecs/uda134x.c | 64 ++-
+ sound/soc/codecs/uda134x.h | 5 +-
+ sound/soc/codecs/wm2000.c | 2 +
+ sound/soc/codecs/wm8523.c | 10 +-
+ sound/soc/codecs/wm8711.c | 3 +-
+ sound/soc/codecs/wm8741.c | 579 +++++++++++++++++
+ sound/soc/codecs/wm8741.h | 214 +++++++
+ sound/soc/codecs/wm8750.c | 11 +-
+ sound/soc/codecs/wm8904.c | 13 +-
+ sound/soc/codecs/wm8940.c | 7 +-
+ sound/soc/codecs/wm8955.c | 10 +-
+ sound/soc/codecs/wm8960.c | 99 +++-
+ sound/soc/codecs/wm8961.c | 9 +-
+ sound/soc/codecs/wm8974.c | 3 +-
+ sound/soc/codecs/wm8978.c | 10 +-
+ sound/soc/codecs/wm8990.c | 4 -
+ sound/soc/codecs/wm8994.c | 75 +++
+ sound/soc/codecs/wm8994.h | 3 +
+ sound/soc/codecs/wm9081.c | 11 +-
+ sound/soc/codecs/wm_hubs.c | 2 +
+ sound/soc/davinci/davinci-i2s.c | 163 +++++-
+ sound/soc/davinci/davinci-i2s.h | 5 +
+ sound/soc/davinci/davinci-mcasp.c | 6 +-
+ sound/soc/davinci/davinci-pcm.c | 7 +-
+ sound/soc/davinci/davinci-pcm.h | 3 +-
+ sound/soc/davinci/davinci-vcif.c | 2 +-
+ sound/soc/ep93xx/Kconfig | 18 +
+ sound/soc/ep93xx/Makefile | 11 +
+ sound/soc/ep93xx/ep93xx-i2s.c | 487 +++++++++++++++
+ sound/soc/ep93xx/ep93xx-i2s.h | 18 +
+ sound/soc/ep93xx/ep93xx-pcm.c | 319 ++++++++++
+ sound/soc/ep93xx/ep93xx-pcm.h | 22 +
+ sound/soc/ep93xx/snappercl15.c | 150 +++++
+ sound/soc/fsl/mpc5200_psc_i2s.c | 1 -
+ sound/soc/fsl/mpc5200_psc_i2s.h | 12 -
+ sound/soc/imx/Kconfig | 19 +-
+ sound/soc/imx/Makefile | 2 +
+ sound/soc/imx/eukrea-tlv320.c | 137 ++++
+ sound/soc/imx/imx-pcm-dma-mx2.c | 6 +-
+ sound/soc/imx/imx-pcm-fiq.c | 6 +-
+ sound/soc/imx/imx-ssi.c | 11 +-
+ sound/soc/jz4740/Kconfig | 23 +
+ sound/soc/jz4740/Makefile | 13 +
+ sound/soc/jz4740/jz4740-i2s.c | 540 ++++++++++++++++
+ sound/soc/jz4740/jz4740-i2s.h | 18 +
+ sound/soc/jz4740/jz4740-pcm.c | 373 +++++++++++
+ sound/soc/jz4740/jz4740-pcm.h | 22 +
+ sound/soc/jz4740/qi_lb60.c | 166 +++++
+ sound/soc/kirkwood/Kconfig | 20 +
+ sound/soc/kirkwood/Makefile | 9 +
+ sound/soc/kirkwood/kirkwood-dma.c | 383 ++++++++++++
+ sound/soc/kirkwood/kirkwood-dma.h | 17 +
+ sound/soc/kirkwood/kirkwood-i2s.c | 495 +++++++++++++++
+ sound/soc/kirkwood/kirkwood-i2s.h | 17 +
+ sound/soc/kirkwood/kirkwood-openrd.c | 126 ++++
+ sound/soc/kirkwood/kirkwood.h | 129 ++++
+ sound/soc/nuc900/Kconfig | 27 +
+ sound/soc/nuc900/Makefile | 11 +
+ sound/soc/nuc900/nuc900-ac97.c | 430 +++++++++++++
+ sound/soc/nuc900/nuc900-audio.c | 81 +++
+ sound/soc/nuc900/nuc900-audio.h | 117 ++++
+ sound/soc/nuc900/nuc900-pcm.c | 354 +++++++++++
+ sound/soc/omap/omap-mcbsp.c | 175 ++++--
+ sound/soc/omap/omap3pandora.c | 36 +-
+ sound/soc/omap/rx51.c | 73 +++-
+ sound/soc/s3c24xx/Kconfig | 10 +-
+ sound/soc/s3c24xx/Makefile | 2 +
+ sound/soc/s3c24xx/s3c-ac97.c | 1 -
+ sound/soc/s3c24xx/s3c-i2s-v2.c | 3 +-
+ sound/soc/s3c24xx/smartq_wm8987.c | 295 +++++++++
+ sound/soc/s3c24xx/smdk_wm9713.c | 3 +
+ sound/soc/s6000/s6000-i2s.c | 38 +-
+ sound/soc/sh/Kconfig | 4 +-
+ sound/soc/sh/fsi-ak4642.c | 13 +-
+ sound/soc/sh/fsi-da7210.c | 13 +-
+ sound/soc/sh/fsi.c | 257 ++++++--
+ sound/soc/soc-core.c | 115 ++++-
+ sound/sound_core.c | 9 +-
+ sound/usb/card.c | 2 +-
+ sound/usb/clock.c | 59 +-
+ sound/usb/clock.h | 4 +-
+ sound/usb/endpoint.c | 5 +-
+ sound/usb/format.c | 9 +-
+ sound/usb/midi.c | 14 +-
+ sound/usb/mixer.c | 77 ++-
+ sound/usb/mixer.h | 1 -
+ sound/usb/pcm.h | 3 -
+ sound/usb/quirks-table.h | 30 +-
+ sound/usb/quirks.c | 1 +
+ 194 files changed, 10998 insertions(+), 1418 deletions(-)
+ create mode 100644 Documentation/sound/alsa/alsa-parameters.txt
+ create mode 100644 Documentation/sound/oss/oss-parameters.txt
+ create mode 100644 arch/arm/plat-orion/include/plat/audio.h
+ create mode 100644 sound/soc/codecs/cs42l51.c
+ create mode 100644 sound/soc/codecs/cs42l51.h
+ create mode 100644 sound/soc/codecs/jz4740.c
+ create mode 100644 sound/soc/codecs/jz4740.h
+ create mode 100644 sound/soc/codecs/wm8741.c
+ create mode 100644 sound/soc/codecs/wm8741.h
+ create mode 100644 sound/soc/ep93xx/Kconfig
+ create mode 100644 sound/soc/ep93xx/Makefile
+ create mode 100644 sound/soc/ep93xx/ep93xx-i2s.c
+ create mode 100644 sound/soc/ep93xx/ep93xx-i2s.h
+ create mode 100644 sound/soc/ep93xx/ep93xx-pcm.c
+ create mode 100644 sound/soc/ep93xx/ep93xx-pcm.h
+ create mode 100644 sound/soc/ep93xx/snappercl15.c
+ delete mode 100644 sound/soc/fsl/mpc5200_psc_i2s.h
+ create mode 100644 sound/soc/imx/eukrea-tlv320.c
+ create mode 100644 sound/soc/jz4740/Kconfig
+ create mode 100644 sound/soc/jz4740/Makefile
+ create mode 100644 sound/soc/jz4740/jz4740-i2s.c
+ create mode 100644 sound/soc/jz4740/jz4740-i2s.h
+ create mode 100644 sound/soc/jz4740/jz4740-pcm.c
+ create mode 100644 sound/soc/jz4740/jz4740-pcm.h
+ create mode 100644 sound/soc/jz4740/qi_lb60.c
+ create mode 100644 sound/soc/kirkwood/Kconfig
+ create mode 100644 sound/soc/kirkwood/Makefile
+ create mode 100644 sound/soc/kirkwood/kirkwood-dma.c
+ create mode 100644 sound/soc/kirkwood/kirkwood-dma.h
+ create mode 100644 sound/soc/kirkwood/kirkwood-i2s.c
+ create mode 100644 sound/soc/kirkwood/kirkwood-i2s.h
+ create mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
+ create mode 100644 sound/soc/kirkwood/kirkwood.h
+ create mode 100644 sound/soc/nuc900/Kconfig
+ create mode 100644 sound/soc/nuc900/Makefile
+ create mode 100644 sound/soc/nuc900/nuc900-ac97.c
+ create mode 100644 sound/soc/nuc900/nuc900-audio.c
+ create mode 100644 sound/soc/nuc900/nuc900-audio.h
+ create mode 100644 sound/soc/nuc900/nuc900-pcm.c
+ create mode 100644 sound/soc/s3c24xx/smartq_wm8987.c
+Merging cpufreq/next
+$ git merge cpufreq/next
+Already up-to-date.
+Merging quilt/rr
+$ git merge quilt/rr
+Resolved 'arch/um/drivers/hostaudio_kern.c' using previous resolution.
+Auto-merging arch/um/drivers/hostaudio_kern.c
+CONFLICT (content): Merge conflict in arch/um/drivers/hostaudio_kern.c
+Auto-merging drivers/message/fusion/mptbase.c
+Auto-merging drivers/net/myri10ge/myri10ge.c
+Auto-merging drivers/net/wireless/libertas/if_sdio.c
+Auto-merging drivers/net/wireless/libertas/if_usb.c
+Auto-merging drivers/net/wireless/libertas_tf/if_usb.c
+Auto-merging drivers/scsi/bfa/bfad.c
+Auto-merging drivers/usb/atm/ueagle-atm.c
+Auto-merging init/main.c
+Auto-merging kernel/module.c
+Auto-merging scripts/mod/modpost.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c1cb0d0] Merge branch 'quilt/rr'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cpu-hotplug.txt | 2 +-
+ arch/um/drivers/hostaudio_kern.c | 10 +
+ drivers/acpi/debug.c | 32 +-
+ drivers/block/virtio_blk.c | 64 ++-
+ drivers/char/hvc_iucv.c | 9 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 42 +-
+ drivers/ide/ide.c | 20 +-
+ drivers/input/misc/ati_remote2.c | 26 +-
+ drivers/input/mouse/psmouse-base.c | 14 +-
+ drivers/message/fusion/mptbase.c | 3 +-
+ drivers/misc/lkdtm.c | 4 +-
+ drivers/net/myri10ge/myri10ge.c | 54 ++-
+ drivers/net/virtio_net.c | 14 +
+ drivers/net/wireless/libertas/if_sdio.c | 32 +-
+ drivers/net/wireless/libertas/if_usb.c | 3 +
+ drivers/net/wireless/libertas_tf/if_usb.c | 3 +
+ drivers/scsi/bfa/bfad.c | 2 +
+ drivers/staging/rtl8187se/r8180_core.c | 6 +-
+ drivers/staging/rtl8192e/r8192E_core.c | 6 +-
+ drivers/staging/rtl8192su/r8192U_core.c | 6 +-
+ drivers/usb/atm/ueagle-atm.c | 2 +
+ drivers/video/uvesafb.c | 7 +-
+ drivers/video/vt8623fb.c | 2 +
+ fs/nfs/callback.c | 11 +-
+ include/linux/moduleparam.h | 288 ++++++--
+ init/main.c | 8 +-
+ kernel/module.c | 1088 +++++++++++++++--------------
+ kernel/params.c | 233 +++++--
+ net/mac80211/rate.c | 2 +
+ net/sunrpc/xprtsock.c | 26 +-
+ scripts/mod/modpost.c | 13 +
+ 31 files changed, 1273 insertions(+), 759 deletions(-)
+$ git am -3 ../patches/0001-nfs-update-for-module_param_named-API-change.patch
+Applying: nfs: update for module_param_named API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/sunrpc/auth.c
+$ git add .
+$ git commit -v -a --amend
+[master f3f9e57] Merge branch 'quilt/rr'
+$ git am -3 ../patches/0001-AppArmor-update-for-module_param_named-API-change.patch
+Applying: AppArmor: update for module_param_named API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M security/apparmor/lsm.c
+$ git add .
+$ git commit -v -a --amend
+[master 2dd3971] Merge branch 'quilt/rr'
+Merging input/next
+$ git merge input/next
+Auto-merging drivers/hid/hid-wacom.c
+Auto-merging drivers/input/mouse/synaptics.c
+Auto-merging drivers/input/tablet/wacom_wac.c
+Merge made by recursive.
+ drivers/hid/hid-wacom.c | 49 ++++++------
+ drivers/input/evdev.c | 152 +++++++++++++++++------------------
+ drivers/input/input.c | 46 ++++++++++-
+ drivers/input/joydev.c | 31 ++++----
+ drivers/input/joystick/a3d.c | 3 +-
+ drivers/input/joystick/adi.c | 2 +-
+ drivers/input/joystick/amijoy.c | 4 +-
+ drivers/input/joystick/gf2k.c | 20 +++---
+ drivers/input/joystick/interact.c | 14 +--
+ drivers/input/joystick/sidewinder.c | 18 +++--
+ drivers/input/keyboard/gpio_keys.c | 22 +++++
+ drivers/input/keyboard/hil_kbd.c | 21 +++--
+ drivers/input/misc/uinput.c | 29 ++++---
+ drivers/input/mouse/pc110pad.c | 4 +-
+ drivers/input/mouse/synaptics.c | 4 +-
+ drivers/input/mousedev.c | 44 ++++++----
+ drivers/input/tablet/aiptek.c | 15 ++--
+ drivers/input/tablet/wacom_wac.c | 4 +-
+ include/linux/gpio_keys.h | 2 +
+ include/linux/input.h | 53 +++++++-----
+ 20 files changed, 308 insertions(+), 229 deletions(-)
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Resolved 'drivers/block/virtio_blk.c' using previous resolution.
+Resolved 'drivers/scsi/scsi_error.c' using previous resolution.
+Auto-merging drivers/block/cciss.c
+Auto-merging drivers/block/drbd/drbd_receiver.c
+Auto-merging drivers/block/nbd.c
+Auto-merging drivers/block/virtio_blk.c
+CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
+Auto-merging drivers/ide/ide-cd.c
+Auto-merging drivers/ide/ide-gd.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Auto-merging drivers/scsi/scsi_error.c
+CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging include/linux/fs.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6084e27] Merge remote branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/scatterlist.h | 2 -
+ arch/avr32/include/asm/scatterlist.h | 2 -
+ arch/blackfin/include/asm/scatterlist.h | 2 -
+ arch/cris/include/asm/scatterlist.h | 2 -
+ arch/frv/include/asm/scatterlist.h | 2 -
+ arch/h8300/include/asm/scatterlist.h | 2 -
+ arch/ia64/include/asm/scatterlist.h | 9 -
+ arch/m32r/include/asm/scatterlist.h | 2 -
+ arch/m68k/include/asm/scatterlist.h | 3 -
+ arch/microblaze/include/asm/scatterlist.h | 2 -
+ arch/mips/include/asm/scatterlist.h | 2 -
+ arch/mn10300/include/asm/scatterlist.h | 2 -
+ arch/parisc/include/asm/scatterlist.h | 1 -
+ arch/powerpc/include/asm/scatterlist.h | 3 -
+ arch/s390/include/asm/scatterlist.h | 2 -
+ arch/score/include/asm/scatterlist.h | 2 -
+ arch/sh/include/asm/scatterlist.h | 2 -
+ arch/sparc/include/asm/scatterlist.h | 1 -
+ arch/um/drivers/ubd_kern.c | 7 +-
+ arch/x86/include/asm/scatterlist.h | 1 -
+ arch/xtensa/include/asm/scatterlist.h | 2 -
+ block/blk-barrier.c | 35 +-
+ block/blk-core.c | 112 +-
+ block/blk-exec.c | 2 +-
+ block/blk-lib.c | 48 +-
+ block/blk-map.c | 2 +-
+ block/blk-merge.c | 9 +-
+ block/blk-settings.c | 17 +
+ block/blk-sysfs.c | 82 +-
+ block/blk.h | 6 +-
+ block/cfq-iosched.c | 21 +-
+ block/compat_ioctl.c | 56 -
+ block/elevator.c | 19 +-
+ block/ioctl.c | 21 +-
+ drivers/ata/libata-scsi.c | 4 +-
+ drivers/block/DAC960.c | 13 +-
+ drivers/block/amiflop.c | 29 +-
+ drivers/block/aoe/aoeblk.c | 6 +-
+ drivers/block/ataflop.c | 32 +-
+ drivers/block/brd.c | 9 +-
+ drivers/block/cciss.c | 2165 +++++++++++++++++------------
+ drivers/block/cciss.h | 135 ++-
+ drivers/block/cciss_cmd.h | 36 +-
+ drivers/block/cciss_scsi.c | 670 +++++-----
+ drivers/block/cpqarray.c | 78 +-
+ drivers/block/drbd/drbd_actlog.c | 8 +-
+ drivers/block/drbd/drbd_int.h | 16 +-
+ drivers/block/drbd/drbd_main.c | 102 +--
+ drivers/block/drbd/drbd_nl.c | 4 -
+ drivers/block/drbd/drbd_proc.c | 19 +-
+ drivers/block/drbd/drbd_receiver.c | 135 +--
+ drivers/block/drbd/drbd_req.c | 2 +-
+ drivers/block/drbd/drbd_worker.c | 15 +-
+ drivers/block/floppy.c | 182 +--
+ drivers/block/hd.c | 2 +-
+ drivers/block/loop.c | 9 +-
+ drivers/block/mg_disk.c | 4 +-
+ drivers/block/nbd.c | 7 +-
+ drivers/block/osdblk.c | 15 +-
+ drivers/block/paride/pcd.c | 21 +-
+ drivers/block/paride/pd.c | 11 +-
+ drivers/block/paride/pf.c | 26 +-
+ drivers/block/pktcdvd.c | 20 +-
+ drivers/block/ps3disk.c | 25 +-
+ drivers/block/swim.c | 20 +-
+ drivers/block/swim3.c | 32 +-
+ drivers/block/ub.c | 35 +-
+ drivers/block/umem.c | 2 +-
+ drivers/block/viodasd.c | 21 +-
+ drivers/block/virtio_blk.c | 88 +-
+ drivers/block/xd.c | 19 +-
+ drivers/block/xen-blkfront.c | 393 ++++--
+ drivers/block/xsysace.c | 8 +-
+ drivers/block/z2ram.c | 13 +-
+ drivers/cdrom/cdrom.c | 46 +-
+ drivers/cdrom/gdrom.c | 48 +-
+ drivers/cdrom/viocd.c | 106 +-
+ drivers/ide/ide-atapi.c | 17 +-
+ drivers/ide/ide-cd.c | 98 +-
+ drivers/ide/ide-cd_ioctl.c | 2 +-
+ drivers/ide/ide-disk.c | 18 +-
+ drivers/ide/ide-disk_ioctl.c | 9 +-
+ drivers/ide/ide-eh.c | 5 +-
+ drivers/ide/ide-floppy.c | 27 +-
+ drivers/ide/ide-floppy_ioctl.c | 12 +-
+ drivers/ide/ide-gd.c | 19 +-
+ drivers/ide/ide-io.c | 8 +-
+ drivers/ide/ide-pm.c | 8 +-
+ drivers/ide/ide-tape.c | 22 +-
+ drivers/md/dm-io.c | 12 +-
+ drivers/md/dm-kcopyd.c | 2 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-stripe.c | 2 +-
+ drivers/md/dm.c | 47 +-
+ drivers/md/linear.c | 2 +-
+ drivers/md/md.c | 16 +-
+ drivers/md/md.h | 4 +-
+ drivers/md/multipath.c | 8 +-
+ drivers/md/raid0.c | 2 +-
+ drivers/md/raid1.c | 22 +-
+ drivers/md/raid10.c | 12 +-
+ drivers/md/raid5.c | 2 +-
+ drivers/memstick/core/mspro_block.c | 12 +-
+ drivers/message/i2o/i2o_block.c | 30 +-
+ drivers/mmc/card/block.c | 5 +
+ drivers/mmc/card/queue.c | 4 +-
+ drivers/mtd/mtd_blkdevs.c | 15 +-
+ drivers/s390/block/dasd.c | 8 +-
+ drivers/s390/block/dcssblk.c | 5 +
+ drivers/s390/char/tape_block.c | 8 +-
+ drivers/scsi/aha1542.c | 25 -
+ drivers/scsi/osd/osd_initiator.c | 8 +-
+ drivers/scsi/scsi_error.c | 25 +-
+ drivers/scsi/scsi_lib.c | 14 +-
+ drivers/scsi/sd.c | 126 ++-
+ drivers/scsi/sd.h | 2 +-
+ drivers/scsi/sr.c | 25 +-
+ drivers/scsi/sun3_NCR5380.c | 2 +-
+ drivers/scsi/sun3_scsi.c | 2 +-
+ drivers/scsi/sun3_scsi_vme.c | 2 +-
+ drivers/staging/hv/blkvsc_drv.c | 13 +-
+ drivers/xen/xenbus/xenbus_client.c | 90 +-
+ fs/bio.c | 5 +-
+ fs/block_dev.c | 10 +-
+ fs/btrfs/disk-io.c | 8 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/btrfs/volumes.c | 18 +-
+ fs/coda/psdev.c | 12 +-
+ fs/coda/upcall.c | 12 +-
+ fs/exofs/ios.c | 2 +-
+ fs/fs-writeback.c | 161 ++-
+ fs/gfs2/log.c | 4 +-
+ fs/gfs2/meta_io.c | 8 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/nilfs2/segbuf.c | 2 +-
+ fs/splice.c | 14 +-
+ include/linux/audit.h | 2 +-
+ include/linux/backing-dev.h | 23 +-
+ include/linux/bio.h | 158 +--
+ include/linux/blk_types.h | 193 +++
+ include/linux/blkdev.h | 142 +--
+ include/linux/blktrace_api.h | 18 +-
+ include/linux/coda_psdev.h | 8 +-
+ include/linux/drbd.h | 2 +-
+ include/linux/drbd_nl.h | 9 +-
+ include/linux/fs.h | 45 +-
+ include/trace/events/block.h | 15 +-
+ include/trace/events/writeback.h | 159 +++
+ kernel/power/block_io.c | 2 +-
+ kernel/trace/blktrace.c | 80 +-
+ mm/backing-dev.c | 446 +++----
+ mm/page-writeback.c | 5 +
+ mm/page_io.c | 2 +-
+ 153 files changed, 4263 insertions(+), 3223 deletions(-)
+ create mode 100644 include/linux/blk_types.h
+ create mode 100644 include/trace/events/writeback.h
+$ git am -3 ../patches/0001-ceph-update-for-removal-of-request-flag-wrappers.patch
+Applying: ceph: update for removal of request flag wrappers
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/ceph/rbd.c
+$ git add .
+$ git commit -v -a --amend
+[master 3118cb1] Merge remote branch 'block/for-next'
+$ git reset --hard HEAD^
+HEAD is now at 868904f Merge remote branch 'input/next'
+Merging refs/next/20100804/block
+$ git merge refs/next/20100804/block
+Resolved 'drivers/block/virtio_blk.c' using previous resolution.
+Resolved 'drivers/scsi/scsi_error.c' using previous resolution.
+Auto-merging drivers/block/cciss.c
+Auto-merging drivers/block/drbd/drbd_receiver.c
+Auto-merging drivers/block/nbd.c
+Auto-merging drivers/block/virtio_blk.c
+CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
+Auto-merging drivers/ide/ide-cd.c
+Auto-merging drivers/ide/ide-gd.c
+Auto-merging drivers/mtd/mtd_blkdevs.c
+Auto-merging drivers/scsi/scsi_error.c
+CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/btrfs/inode.c
+Auto-merging fs/fs-writeback.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging include/linux/fs.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f1c7f37] Merge commit 'refs/next/20100804/block'
+$ git diff -M --stat --summary HEAD^..
+ arch/alpha/include/asm/scatterlist.h | 2 -
+ arch/avr32/include/asm/scatterlist.h | 2 -
+ arch/blackfin/include/asm/scatterlist.h | 2 -
+ arch/cris/include/asm/scatterlist.h | 2 -
+ arch/frv/include/asm/scatterlist.h | 2 -
+ arch/h8300/include/asm/scatterlist.h | 2 -
+ arch/ia64/include/asm/scatterlist.h | 9 -
+ arch/m32r/include/asm/scatterlist.h | 2 -
+ arch/m68k/include/asm/scatterlist.h | 3 -
+ arch/microblaze/include/asm/scatterlist.h | 2 -
+ arch/mips/include/asm/scatterlist.h | 2 -
+ arch/mn10300/include/asm/scatterlist.h | 2 -
+ arch/parisc/include/asm/scatterlist.h | 1 -
+ arch/powerpc/include/asm/scatterlist.h | 3 -
+ arch/s390/include/asm/scatterlist.h | 2 -
+ arch/score/include/asm/scatterlist.h | 2 -
+ arch/sh/include/asm/scatterlist.h | 2 -
+ arch/sparc/include/asm/scatterlist.h | 1 -
+ arch/um/drivers/ubd_kern.c | 7 +-
+ arch/x86/include/asm/scatterlist.h | 1 -
+ arch/xtensa/include/asm/scatterlist.h | 2 -
+ block/blk-barrier.c | 35 +-
+ block/blk-core.c | 112 +-
+ block/blk-exec.c | 2 +-
+ block/blk-lib.c | 48 +-
+ block/blk-map.c | 2 +-
+ block/blk-merge.c | 9 +-
+ block/blk-settings.c | 17 +
+ block/blk-sysfs.c | 82 +-
+ block/blk.h | 6 +-
+ block/cfq-iosched.c | 21 +-
+ block/compat_ioctl.c | 56 -
+ block/elevator.c | 19 +-
+ block/ioctl.c | 21 +-
+ drivers/ata/libata-scsi.c | 4 +-
+ drivers/block/DAC960.c | 13 +-
+ drivers/block/amiflop.c | 29 +-
+ drivers/block/aoe/aoeblk.c | 6 +-
+ drivers/block/ataflop.c | 32 +-
+ drivers/block/brd.c | 9 +-
+ drivers/block/cciss.c | 2165 +++++++++++++++++------------
+ drivers/block/cciss.h | 135 ++-
+ drivers/block/cciss_cmd.h | 36 +-
+ drivers/block/cciss_scsi.c | 670 +++++-----
+ drivers/block/cpqarray.c | 72 +-
+ drivers/block/drbd/drbd_actlog.c | 8 +-
+ drivers/block/drbd/drbd_main.c | 10 +-
+ drivers/block/drbd/drbd_receiver.c | 22 +-
+ drivers/block/drbd/drbd_req.c | 2 +-
+ drivers/block/floppy.c | 182 +--
+ drivers/block/hd.c | 2 +-
+ drivers/block/loop.c | 9 +-
+ drivers/block/mg_disk.c | 4 +-
+ drivers/block/nbd.c | 7 +-
+ drivers/block/osdblk.c | 15 +-
+ drivers/block/paride/pcd.c | 21 +-
+ drivers/block/paride/pd.c | 11 +-
+ drivers/block/paride/pf.c | 26 +-
+ drivers/block/pktcdvd.c | 20 +-
+ drivers/block/ps3disk.c | 25 +-
+ drivers/block/swim.c | 20 +-
+ drivers/block/swim3.c | 32 +-
+ drivers/block/ub.c | 35 +-
+ drivers/block/umem.c | 2 +-
+ drivers/block/viodasd.c | 21 +-
+ drivers/block/virtio_blk.c | 88 +-
+ drivers/block/xd.c | 19 +-
+ drivers/block/xen-blkfront.c | 16 +-
+ drivers/block/xsysace.c | 8 +-
+ drivers/block/z2ram.c | 13 +-
+ drivers/cdrom/cdrom.c | 46 +-
+ drivers/cdrom/gdrom.c | 48 +-
+ drivers/cdrom/viocd.c | 106 +-
+ drivers/ide/ide-atapi.c | 17 +-
+ drivers/ide/ide-cd.c | 98 +-
+ drivers/ide/ide-cd_ioctl.c | 2 +-
+ drivers/ide/ide-disk.c | 18 +-
+ drivers/ide/ide-disk_ioctl.c | 9 +-
+ drivers/ide/ide-eh.c | 5 +-
+ drivers/ide/ide-floppy.c | 27 +-
+ drivers/ide/ide-floppy_ioctl.c | 12 +-
+ drivers/ide/ide-gd.c | 19 +-
+ drivers/ide/ide-io.c | 8 +-
+ drivers/ide/ide-pm.c | 8 +-
+ drivers/ide/ide-tape.c | 22 +-
+ drivers/md/dm-io.c | 12 +-
+ drivers/md/dm-kcopyd.c | 2 +-
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-stripe.c | 2 +-
+ drivers/md/dm.c | 47 +-
+ drivers/md/linear.c | 2 +-
+ drivers/md/md.c | 16 +-
+ drivers/md/md.h | 4 +-
+ drivers/md/multipath.c | 8 +-
+ drivers/md/raid0.c | 2 +-
+ drivers/md/raid1.c | 22 +-
+ drivers/md/raid10.c | 12 +-
+ drivers/md/raid5.c | 2 +-
+ drivers/memstick/core/mspro_block.c | 12 +-
+ drivers/message/i2o/i2o_block.c | 30 +-
+ drivers/mmc/card/block.c | 5 +
+ drivers/mmc/card/queue.c | 4 +-
+ drivers/mtd/mtd_blkdevs.c | 15 +-
+ drivers/s390/block/dasd.c | 8 +-
+ drivers/s390/block/dcssblk.c | 5 +
+ drivers/s390/char/tape_block.c | 8 +-
+ drivers/scsi/aha1542.c | 25 -
+ drivers/scsi/osd/osd_initiator.c | 8 +-
+ drivers/scsi/scsi_error.c | 25 +-
+ drivers/scsi/scsi_lib.c | 14 +-
+ drivers/scsi/sd.c | 126 ++-
+ drivers/scsi/sd.h | 2 +-
+ drivers/scsi/sr.c | 25 +-
+ drivers/scsi/sun3_NCR5380.c | 2 +-
+ drivers/scsi/sun3_scsi.c | 2 +-
+ drivers/scsi/sun3_scsi_vme.c | 2 +-
+ drivers/staging/hv/blkvsc_drv.c | 13 +-
+ fs/bio.c | 5 +-
+ fs/block_dev.c | 10 +-
+ fs/btrfs/disk-io.c | 8 +-
+ fs/btrfs/inode.c | 6 +-
+ fs/btrfs/volumes.c | 18 +-
+ fs/exofs/ios.c | 2 +-
+ fs/fs-writeback.c | 82 +-
+ fs/gfs2/log.c | 4 +-
+ fs/gfs2/meta_io.c | 8 +-
+ fs/gfs2/ops_fstype.c | 2 +-
+ fs/nilfs2/segbuf.c | 2 +-
+ fs/splice.c | 2 -
+ include/linux/audit.h | 2 +-
+ include/linux/backing-dev.h | 7 +-
+ include/linux/bio.h | 127 ++-
+ include/linux/blkdev.h | 140 +--
+ include/linux/blktrace_api.h | 18 +-
+ include/linux/fs.h | 40 +-
+ include/trace/events/block.h | 15 +-
+ include/trace/events/writeback.h | 157 +++
+ kernel/power/block_io.c | 2 +-
+ kernel/trace/blktrace.c | 80 +-
+ mm/backing-dev.c | 114 +--
+ mm/page-writeback.c | 5 +
+ mm/page_io.c | 2 +-
+ 142 files changed, 3502 insertions(+), 2537 deletions(-)
+ create mode 100644 include/trace/events/writeback.h
+$ git am -3 ../patches/0001-ceph-update-for-removal-of-request-flag-wrappers.patch
+Applying: ceph: update for removal of request flag wrappers
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/ceph/rbd.c
+$ git add .
+$ git commit -v -a --amend
+[master 7aab830] Merge commit 'refs/next/20100804/block'
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Resolved 'drivers/md/dm.c' using previous resolution.
+Auto-merging Documentation/devices.txt
+Auto-merging drivers/md/dm-raid1.c
+Auto-merging drivers/md/dm-stripe.c
+Auto-merging drivers/md/dm.c
+CONFLICT (content): Merge conflict in drivers/md/dm.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0c1f7fa] Merge branch 'quilt/device-mapper'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devices.txt | 1 +
+ drivers/md/dm-crypt.c | 339 +++++++++++++++++++++------------------
+ drivers/md/dm-delay.c | 6 +-
+ drivers/md/dm-exception-store.c | 4 +-
+ drivers/md/dm-exception-store.h | 3 +-
+ drivers/md/dm-ioctl.c | 206 ++++++++++++------------
+ drivers/md/dm-linear.c | 3 +-
+ drivers/md/dm-mpath.c | 1 +
+ drivers/md/dm-raid1.c | 2 +-
+ drivers/md/dm-snap-persistent.c | 6 +-
+ drivers/md/dm-snap.c | 62 +++++--
+ drivers/md/dm-stripe.c | 87 +++++++++--
+ drivers/md/dm-table.c | 99 +++++++++++-
+ drivers/md/dm-target.c | 5 +
+ drivers/md/dm-zero.c | 5 +
+ drivers/md/dm.c | 267 +++++++++++++++++++++++-------
+ drivers/md/dm.h | 9 +-
+ include/linux/device-mapper.h | 16 ++-
+ include/linux/dm-ioctl.h | 5 +-
+ include/linux/miscdevice.h | 1 +
+ 20 files changed, 754 insertions(+), 373 deletions(-)
+Merging embedded/master
+$ git merge embedded/master
+Already up-to-date.
+Merging firmware/master
+$ git merge firmware/master
+Already up-to-date.
+Merging pcmcia/master
+$ git merge pcmcia/master
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging drivers/bluetooth/dtl1_cs.c
+Auto-merging drivers/net/wireless/ray_cs.c
+Removing drivers/pcmcia/pcmcia_ioctl.c
+Auto-merging drivers/pcmcia/pxa2xx_base.c
+Auto-merging drivers/ssb/main.c
+Removing include/pcmcia/cs_types.h
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 23 -
+ Documentation/pcmcia/driver-changes.txt | 12 +
+ drivers/ata/pata_pcmcia.c | 38 +-
+ drivers/bluetooth/bluecard_cs.c | 32 +-
+ drivers/bluetooth/bt3c_cs.c | 27 +-
+ drivers/bluetooth/btuart_cs.c | 31 +-
+ drivers/bluetooth/dtl1_cs.c | 35 +-
+ drivers/char/pcmcia/cm4000_cs.c | 30 +-
+ drivers/char/pcmcia/cm4040_cs.c | 37 +-
+ drivers/char/pcmcia/ipwireless/main.c | 47 +-
+ drivers/char/pcmcia/ipwireless/main.h | 1 -
+ drivers/char/pcmcia/ipwireless/tty.h | 1 -
+ drivers/char/pcmcia/synclink_cs.c | 29 +-
+ drivers/ide/ide-cs.c | 39 +-
+ drivers/isdn/hardware/avm/avm_cs.c | 25 +-
+ drivers/isdn/hisax/avma1_cs.c | 29 +-
+ drivers/isdn/hisax/elsa_cs.c | 32 +-
+ drivers/isdn/hisax/sedlbauer_cs.c | 83 +--
+ drivers/isdn/hisax/teles_cs.c | 30 +-
+ drivers/mmc/host/sdricoh_cs.c | 1 -
+ drivers/mtd/maps/pcmciamtd.c | 15 +-
+ drivers/net/pcmcia/3c574_cs.c | 14 +-
+ drivers/net/pcmcia/3c589_cs.c | 14 +-
+ drivers/net/pcmcia/axnet_cs.c | 48 +-
+ drivers/net/pcmcia/com20020_cs.c | 22 +-
+ drivers/net/pcmcia/fmvj18x_cs.c | 48 +-
+ drivers/net/pcmcia/ibmtr_cs.c | 29 +-
+ drivers/net/pcmcia/nmclan_cs.c | 32 +-
+ drivers/net/pcmcia/pcnet_cs.c | 63 +-
+ drivers/net/pcmcia/smc91c92_cs.c | 71 +-
+ drivers/net/pcmcia/xirc2ps_cs.c | 60 +-
+ drivers/net/wireless/airo_cs.c | 74 +--
+ drivers/net/wireless/atmel_cs.c | 25 +-
+ drivers/net/wireless/b43/pcmcia.c | 13 +-
+ drivers/net/wireless/hostap/hostap_cs.c | 136 +--
+ drivers/net/wireless/libertas/if_cs.c | 16 +-
+ drivers/net/wireless/orinoco/orinoco_cs.c | 30 +-
+ drivers/net/wireless/orinoco/spectrum_cs.c | 62 +-
+ drivers/net/wireless/ray_cs.c | 27 +-
+ drivers/net/wireless/wl3501_cs.c | 24 +-
+ drivers/parport/parport_cs.c | 23 +-
+ drivers/pcmcia/Makefile | 1 -
+ drivers/pcmcia/au1000_generic.h | 1 -
+ drivers/pcmcia/au1000_pb1x00.c | 2 -
+ drivers/pcmcia/cistpl.c | 11 +-
+ drivers/pcmcia/cs.c | 79 +--
+ drivers/pcmcia/cs_internal.h | 62 +-
+ drivers/pcmcia/db1xxx_ss.c | 1 -
+ drivers/pcmcia/ds.c | 184 ++--
+ drivers/pcmcia/i82092.c | 1 -
+ drivers/pcmcia/i82365.c | 1 -
+ drivers/pcmcia/m32r_cfc.c | 1 -
+ drivers/pcmcia/m32r_pcc.c | 1 -
+ drivers/pcmcia/m8xx_pcmcia.c | 1 -
+ drivers/pcmcia/pcmcia_cis.c | 1 -
+ drivers/pcmcia/pcmcia_ioctl.c | 1077 ----------------------
+ drivers/pcmcia/pcmcia_resource.c | 331 ++++---
+ drivers/pcmcia/pd6729.c | 1 -
+ drivers/pcmcia/pxa2xx_base.c | 1 -
+ drivers/pcmcia/rsrc_iodyn.c | 8 +-
+ drivers/pcmcia/rsrc_mgr.c | 6 +-
+ drivers/pcmcia/rsrc_nonstatic.c | 15 +-
+ drivers/pcmcia/sa1100_generic.c | 1 -
+ drivers/pcmcia/soc_common.h | 1 -
+ drivers/pcmcia/socket_sysfs.c | 1 -
+ drivers/pcmcia/tcic.c | 1 -
+ drivers/pcmcia/xxs1500_ss.c | 1 -
+ drivers/pcmcia/yenta_socket.c | 1 -
+ drivers/scsi/pcmcia/aha152x_stub.c | 17 +-
+ drivers/scsi/pcmcia/fdomain_stub.c | 15 +-
+ drivers/scsi/pcmcia/nsp_cs.c | 61 +-
+ drivers/scsi/pcmcia/qlogic_stub.c | 33 +-
+ drivers/scsi/pcmcia/sym53c500_cs.c | 31 +-
+ drivers/serial/serial_cs.c | 68 +-
+ drivers/ssb/main.c | 1 -
+ drivers/ssb/pcmcia.c | 15 +-
+ drivers/ssb/scan.c | 1 -
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 37 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 36 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 62 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 63 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 63 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 16 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 37 +-
+ drivers/staging/wlags49_h2/wl_cs.c | 11 +-
+ drivers/staging/wlags49_h2/wl_internal.h | 1 -
+ drivers/telephony/ixj_pcmcia.c | 20 +-
+ drivers/usb/host/sl811_cs.c | 24 +-
+ include/pcmcia/cistpl.h | 2 +
+ include/pcmcia/cs.h | 157 +---
+ include/pcmcia/cs_types.h | 40 -
+ include/pcmcia/ds.h | 251 +-----
+ include/pcmcia/ss.h | 25 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.c | 9 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 -
+ sound/pcmcia/vx/vxpocket.c | 9 +-
+ sound/pcmcia/vx/vxpocket.h | 1 -
+ 97 files changed, 1189 insertions(+), 3138 deletions(-)
+ delete mode 100644 drivers/pcmcia/pcmcia_ioctl.c
+ delete mode 100644 include/pcmcia/cs_types.h
+Merging battery/master
+$ git merge battery/master
+Resolved 'drivers/power/Kconfig' using previous resolution.
+Resolved 'drivers/power/Makefile' using previous resolution.
+Auto-merging drivers/power/Kconfig
+CONFLICT (content): Merge conflict in drivers/power/Kconfig
+Auto-merging drivers/power/Makefile
+CONFLICT (content): Merge conflict in drivers/power/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4157bb7] Merge remote branch 'battery/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/power/Kconfig | 13 +
+ drivers/power/Makefile | 2 +
+ drivers/power/intel_mid_battery.c | 799 +++++++++++++++++++++++++++++++++++++
+ drivers/power/s3c_adc_battery.c | 431 ++++++++++++++++++++
+ include/linux/s3c_adc_battery.h | 36 ++
+ 5 files changed, 1281 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/power/intel_mid_battery.c
+ create mode 100644 drivers/power/s3c_adc_battery.c
+ create mode 100644 include/linux/s3c_adc_battery.h
+Merging leds/for-mm
+$ git merge leds/for-mm
+Auto-merging drivers/leds/Kconfig
+Merge made by recursive.
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Already up-to-date.
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/debug_core.c
+Auto-merging kernel/debug/gdbstub.c
+Merge made by recursive.
+ arch/arm/include/asm/kgdb.h | 6 +-
+ arch/arm/kernel/kgdb.c | 124 +++++++++++++-------
+ arch/mips/include/asm/kgdb.h | 19 ++--
+ arch/mips/kernel/kgdb.c | 211 +++++++++++++++++++++++-----------
+ arch/powerpc/kernel/kgdb.c | 2 +-
+ arch/x86/include/asm/kgdb.h | 20 ++--
+ arch/x86/kernel/kgdb.c | 189 +++++++++++++++----------------
+ drivers/char/vt.c | 78 +++++++++++++
+ drivers/gpu/drm/drm_fb_helper.c | 76 ++++++++++++-
+ drivers/gpu/drm/i915/intel_display.c | 102 ++++++++++++++++-
+ drivers/gpu/drm/i915/intel_fb.c | 2 +
+ drivers/serial/kgdboc.c | 18 +++
+ drivers/video/console/fbcon.c | 26 ++++
+ drivers/video/console/fbcon.h | 1 +
+ include/drm/drm_crtc_helper.h | 2 +
+ include/drm/drm_fb_helper.h | 5 +
+ include/linux/console.h | 13 ++
+ include/linux/fb.h | 13 ++
+ include/linux/kdb.h | 4 +
+ include/linux/kgdb.h | 15 +++-
+ kernel/debug/debug_core.c | 2 +
+ kernel/debug/gdbstub.c | 189 ++++++++++++++++++++++---------
+ kernel/debug/kdb/kdb_main.c | 132 +++++++++++++++++++--
+ kernel/debug/kdb/kdb_private.h | 2 -
+ kernel/trace/Makefile | 3 +
+ kernel/trace/trace.c | 43 ++++----
+ kernel/trace/trace.h | 19 +++
+ kernel/trace/trace_kdb.c | 136 ++++++++++++++++++++++
+ mm/highmem.c | 7 +
+ 29 files changed, 1139 insertions(+), 320 deletions(-)
+ create mode 100644 kernel/trace/trace_kdb.c
+Merging slab/for-next
+$ git merge slab/for-next
+Merge made by recursive.
+ include/linux/page-flags.h | 2 -
+ include/linux/slab.h | 6 ++-
+ mm/slab.c | 2 +-
+ mm/slob.c | 9 ++++-
+ mm/slub.c | 86 ++++++++++++++++++++++----------------------
+ 5 files changed, 56 insertions(+), 49 deletions(-)
+Merging uclinux/for-next
+$ git merge uclinux/for-next
+Already up-to-date.
+Merging md/for-next
+$ git merge md/for-next
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/md.h
+Auto-merging drivers/md/raid5.c
+Merge made by recursive.
+ drivers/md/bitmap.c | 508 ++++++++++++++++++++++++++++-----------------------
+ drivers/md/bitmap.h | 6 +
+ drivers/md/md.c | 234 +++++++++++++++---------
+ drivers/md/md.h | 51 +++++-
+ drivers/md/raid5.c | 168 ++++++++++-------
+ drivers/md/raid5.h | 9 +-
+ 6 files changed, 596 insertions(+), 380 deletions(-)
+Merging mfd/for-next
+$ git merge mfd/for-next
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/input/keyboard/Makefile
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/touchscreen/Makefile
+Removing include/linux/mfd/mc13783-private.h
+Merge made by recursive.
+ drivers/gpio/Kconfig | 7 +
+ drivers/gpio/Makefile | 1 +
+ drivers/gpio/stmpe-gpio.c | 399 +++++++++++++
+ drivers/gpio/wm831x-gpio.c | 32 ++
+ drivers/hwmon/mc13783-adc.c | 17 +-
+ drivers/input/keyboard/Kconfig | 10 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/stmpe-keypad.c | 386 +++++++++++++
+ drivers/input/touchscreen/Kconfig | 10 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/stmpe-ts.c | 397 +++++++++++++
+ drivers/mfd/88pm860x-core.c | 86 ++--
+ drivers/mfd/Kconfig | 51 ++-
+ drivers/mfd/Makefile | 3 +
+ drivers/mfd/ab3100-otp.c | 16 +-
+ drivers/mfd/ab3550-core.c | 23 +-
+ drivers/mfd/ab8500-spi.c | 7 +-
+ drivers/mfd/abx500-core.c | 2 +-
+ drivers/mfd/davinci_voicecodec.c | 6 +-
+ drivers/mfd/jz4740-adc.c | 394 +++++++++++++
+ drivers/mfd/max8925-core.c | 27 +
+ drivers/mfd/mc13783-core.c | 30 +-
+ drivers/mfd/mfd-core.c | 4 +-
+ drivers/mfd/stmpe.c | 985 +++++++++++++++++++++++++++++++++
+ drivers/mfd/stmpe.h | 183 ++++++
+ drivers/mfd/t7l66xb.c | 3 +-
+ drivers/mfd/tc6387xb.c | 16 +-
+ drivers/mfd/tc6393xb.c | 4 +-
+ drivers/mfd/twl6030-pwm.c | 163 ++++++
+ drivers/mfd/ucb1400_core.c | 2 +-
+ drivers/mfd/wm831x-core.c | 14 +
+ include/linux/jz4740-adc.h | 32 ++
+ include/linux/mfd/mc13783-private.h | 220 --------
+ include/linux/mfd/mc13783.h | 2 +
+ include/linux/mfd/stmpe.h | 201 +++++++
+ include/linux/mfd/wm8994/gpio.h | 4 +
+ 36 files changed, 3432 insertions(+), 307 deletions(-)
+ create mode 100644 drivers/gpio/stmpe-gpio.c
+ create mode 100644 drivers/input/keyboard/stmpe-keypad.c
+ create mode 100644 drivers/input/touchscreen/stmpe-ts.c
+ create mode 100644 drivers/mfd/jz4740-adc.c
+ create mode 100644 drivers/mfd/stmpe.c
+ create mode 100644 drivers/mfd/stmpe.h
+ create mode 100644 drivers/mfd/twl6030-pwm.c
+ create mode 100644 include/linux/jz4740-adc.h
+ delete mode 100644 include/linux/mfd/mc13783-private.h
+ create mode 100644 include/linux/mfd/stmpe.h
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Auto-merging drivers/gpu/drm/drm_edid.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_sdvo.c
+Auto-merging drivers/gpu/drm/i915/intel_tv.c
+Removing drivers/gpu/drm/nouveau/nouveau_grctx.c
+Auto-merging drivers/gpu/drm/savage/savage_bci.c
+Auto-merging include/drm/drm_crtc_helper.h
+Merge made by recursive.
+ drivers/char/agp/intel-agp.c | 4 +-
+ drivers/char/agp/intel-agp.h | 6 +
+ drivers/char/agp/intel-gtt.c | 83 ++-
+ drivers/gpu/drm/Kconfig | 11 +-
+ drivers/gpu/drm/Makefile | 7 +-
+ drivers/gpu/drm/drm_bufs.c | 15 +-
+ drivers/gpu/drm/drm_crtc.c | 30 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 71 +-
+ drivers/gpu/drm/drm_drv.c | 39 +-
+ drivers/gpu/drm/drm_edid.c | 4 +-
+ drivers/gpu/drm/drm_gem.c | 11 +
+ drivers/gpu/drm/{ttm/ttm_global.c => drm_global.c} | 30 +-
+ drivers/gpu/drm/drm_info.c | 23 +-
+ drivers/gpu/drm/drm_ioctl.c | 77 +-
+ drivers/gpu/drm/drm_irq.c | 26 +-
+ drivers/gpu/drm/drm_mm.c | 359 ++++---
+ drivers/gpu/drm/drm_pci.c | 143 +++
+ drivers/gpu/drm/drm_platform.c | 122 +++
+ drivers/gpu/drm/drm_stub.c | 92 +--
+ drivers/gpu/drm/drm_sysfs.c | 3 +-
+ drivers/gpu/drm/drm_trace.h | 66 ++
+ drivers/gpu/drm/drm_trace_points.c | 4 +
+ drivers/gpu/drm/drm_vm.c | 14 +-
+ drivers/gpu/drm/i2c/Makefile | 3 +
+ drivers/gpu/drm/i2c/ch7006_drv.c | 22 +-
+ drivers/gpu/drm/i2c/ch7006_priv.h | 2 +-
+ drivers/gpu/drm/i2c/sil164_drv.c | 462 ++++++++
+ drivers/gpu/drm/i810/i810_dma.c | 81 +-
+ drivers/gpu/drm/i810/i810_drv.h | 64 +-
+ drivers/gpu/drm/i830/i830_dma.c | 95 +-
+ drivers/gpu/drm/i830/i830_drv.h | 48 +-
+ drivers/gpu/drm/i830/i830_irq.c | 10 +-
+ drivers/gpu/drm/i915/i915_dma.c | 24 +-
+ drivers/gpu/drm/i915/i915_drv.c | 66 +-
+ drivers/gpu/drm/i915/i915_drv.h | 29 +-
+ drivers/gpu/drm/i915/i915_gem.c | 163 ++-
+ drivers/gpu/drm/i915/i915_gem_tiling.c | 2 -
+ drivers/gpu/drm/i915/i915_irq.c | 58 +-
+ drivers/gpu/drm/i915/i915_reg.h | 56 +-
+ drivers/gpu/drm/i915/i915_suspend.c | 9 +-
+ drivers/gpu/drm/i915/i915_trace.h | 36 +
+ drivers/gpu/drm/i915/intel_display.c | 586 ++++++++---
+ drivers/gpu/drm/i915/intel_dp.c | 143 +++-
+ drivers/gpu/drm/i915/intel_drv.h | 10 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 9 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 331 +++----
+ drivers/gpu/drm/i915/intel_overlay.c | 9 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 8 +-
+ drivers/gpu/drm/i915/intel_tv.c | 12 +-
+ drivers/gpu/drm/mga/mga_dma.c | 103 +-
+ drivers/gpu/drm/mga/mga_drv.c | 4 +-
+ drivers/gpu/drm/mga/mga_drv.h | 187 ++--
+ drivers/gpu/drm/mga/mga_irq.c | 9 +-
+ drivers/gpu/drm/mga/mga_state.c | 47 +-
+ drivers/gpu/drm/mga/mga_warp.c | 4 +-
+ drivers/gpu/drm/nouveau/Kconfig | 11 +-
+ drivers/gpu/drm/nouveau/Makefile | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_acpi.c | 38 +-
+ drivers/gpu/drm/nouveau/nouveau_bios.c | 636 +++++++++---
+ drivers/gpu/drm/nouveau/nouveau_bios.h | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 11 +-
+ drivers/gpu/drm/nouveau/nouveau_calc.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_channel.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_connector.c | 404 ++++----
+ drivers/gpu/drm/nouveau/nouveau_connector.h | 7 +-
+ drivers/gpu/drm/nouveau/nouveau_dma.c | 8 +-
+ drivers/gpu/drm/nouveau/nouveau_dp.c | 41 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.c | 41 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 137 ++--
+ drivers/gpu/drm/nouveau/nouveau_encoder.h | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 35 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 11 +-
+ drivers/gpu/drm/nouveau/nouveau_grctx.c | 160 ---
+ drivers/gpu/drm/nouveau/nouveau_i2c.c | 42 +
+ drivers/gpu/drm/nouveau/nouveau_i2c.h | 3 +
+ drivers/gpu/drm/nouveau/nouveau_mem.c | 332 ++-----
+ drivers/gpu/drm/nouveau/nouveau_notifier.c | 30 +-
+ drivers/gpu/drm/nouveau/nouveau_object.c | 105 +--
+ drivers/gpu/drm/nouveau/nouveau_reg.h | 91 ++-
+ drivers/gpu/drm/nouveau/nouveau_sgdma.c | 46 +-
+ drivers/gpu/drm/nouveau/nouveau_state.c | 255 +++--
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 20 +-
+ drivers/gpu/drm/nouveau/nv04_crtc.c | 5 +
+ drivers/gpu/drm/nouveau/nv04_dac.c | 50 +-
+ drivers/gpu/drm/nouveau/nv04_dfp.c | 12 +-
+ drivers/gpu/drm/nouveau/nv04_display.c | 90 +-
+ drivers/gpu/drm/nouveau/nv04_fifo.c | 20 +-
+ drivers/gpu/drm/nouveau/nv04_graph.c | 5 +-
+ drivers/gpu/drm/nouveau/nv04_instmem.c | 21 +-
+ drivers/gpu/drm/nouveau/nv04_mc.c | 4 +
+ drivers/gpu/drm/nouveau/nv04_tv.c | 125 +--
+ drivers/gpu/drm/nouveau/nv10_fifo.c | 10 -
+ .../gpu/drm/nouveau/{nv17_gpio.c => nv10_gpio.c} | 4 +-
+ drivers/gpu/drm/nouveau/nv17_tv.c | 65 +-
+ drivers/gpu/drm/nouveau/nv20_graph.c | 100 +-
+ drivers/gpu/drm/nouveau/nv30_fb.c | 87 ++
+ drivers/gpu/drm/nouveau/nv40_fifo.c | 8 -
+ drivers/gpu/drm/nouveau/nv40_graph.c | 60 +-
+ drivers/gpu/drm/nouveau/nv40_mc.c | 2 +-
+ drivers/gpu/drm/nouveau/nv50_crtc.c | 42 +-
+ drivers/gpu/drm/nouveau/nv50_dac.c | 43 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 419 +++++---
+ drivers/gpu/drm/nouveau/nv50_display.h | 6 +-
+ drivers/gpu/drm/nouveau/nv50_fifo.c | 126 +--
+ drivers/gpu/drm/nouveau/nv50_gpio.c | 35 +
+ drivers/gpu/drm/nouveau/nv50_graph.c | 86 +-
+ drivers/gpu/drm/nouveau/nv50_instmem.c | 68 +-
+ drivers/gpu/drm/nouveau/nv50_sor.c | 105 +-
+ drivers/gpu/drm/nouveau/nvreg.h | 22 -
+ drivers/gpu/drm/r128/r128_cce.c | 52 +-
+ drivers/gpu/drm/r128/r128_drv.c | 2 +-
+ drivers/gpu/drm/r128/r128_drv.h | 122 +--
+ drivers/gpu/drm/r128/r128_irq.c | 4 +-
+ drivers/gpu/drm/r128/r128_state.c | 121 +--
+ drivers/gpu/drm/radeon/Makefile | 1 +
+ drivers/gpu/drm/radeon/atom.c | 9 +-
+ drivers/gpu/drm/radeon/atom.h | 2 +
+ drivers/gpu/drm/radeon/atombios_crtc.c | 212 +++--
+ drivers/gpu/drm/radeon/atombios_dp.c | 18 +-
+ drivers/gpu/drm/radeon/evergreen.c | 22 +-
+ drivers/gpu/drm/radeon/evergreen_reg.h | 5 +
+ drivers/gpu/drm/radeon/evergreend.h | 5 +
+ drivers/gpu/drm/radeon/r100.c | 55 +-
+ drivers/gpu/drm/radeon/r100d.h | 2 +
+ drivers/gpu/drm/radeon/r300.c | 46 +-
+ drivers/gpu/drm/radeon/r300d.h | 2 +
+ drivers/gpu/drm/radeon/r420.c | 2 +
+ drivers/gpu/drm/radeon/r500_reg.h | 5 +
+ drivers/gpu/drm/radeon/r520.c | 2 +
+ drivers/gpu/drm/radeon/r600.c | 49 +-
+ drivers/gpu/drm/radeon/r600_audio.c | 22 +-
+ drivers/gpu/drm/radeon/r600_blit_shaders.c | 1115 +++++++-------------
+ drivers/gpu/drm/radeon/r600_cs.c | 232 ++++-
+ drivers/gpu/drm/radeon/r600_hdmi.c | 6 +-
+ drivers/gpu/drm/radeon/r600d.h | 12 +
+ drivers/gpu/drm/radeon/radeon.h | 53 +-
+ drivers/gpu/drm/radeon/radeon_acpi.c | 67 ++
+ drivers/gpu/drm/radeon/radeon_asic.h | 1 +
+ drivers/gpu/drm/radeon/radeon_atombios.c | 75 +-
+ drivers/gpu/drm/radeon/radeon_bios.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_combios.c | 51 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 45 +-
+ drivers/gpu/drm/radeon/radeon_cp.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_device.c | 45 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 77 ++-
+ drivers/gpu/drm/radeon/radeon_drv.c | 5 +-
+ drivers/gpu/drm/radeon/radeon_encoders.c | 13 +-
+ drivers/gpu/drm/radeon/radeon_kms.c | 37 +-
+ drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 18 +-
+ drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 30 +-
+ drivers/gpu/drm/radeon/radeon_legacy_tv.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_mode.h | 18 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 27 +-
+ drivers/gpu/drm/radeon/radeon_pm.c | 114 ++-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 20 +-
+ drivers/gpu/drm/radeon/reg_srcs/r300 | 13 -
+ drivers/gpu/drm/radeon/reg_srcs/r420 | 14 +-
+ drivers/gpu/drm/radeon/reg_srcs/rs600 | 13 -
+ drivers/gpu/drm/radeon/reg_srcs/rv515 | 13 -
+ drivers/gpu/drm/radeon/rs400.c | 10 +-
+ drivers/gpu/drm/radeon/rs600.c | 16 +-
+ drivers/gpu/drm/radeon/rs690.c | 44 +-
+ drivers/gpu/drm/radeon/rv515.c | 25 +-
+ drivers/gpu/drm/radeon/rv770.c | 27 +-
+ drivers/gpu/drm/radeon/rv770d.h | 6 +
+ drivers/gpu/drm/savage/savage_bci.c | 24 +-
+ drivers/gpu/drm/sis/sis_drv.c | 3 +-
+ drivers/gpu/drm/sis/sis_mm.c | 14 +-
+ drivers/gpu/drm/ttm/Makefile | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 10 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 2 -
+ drivers/gpu/drm/ttm/ttm_module.c | 4 -
+ drivers/gpu/drm/via/via_dma.c | 120 +--
+ drivers/gpu/drm/via/via_dmablit.c | 71 +-
+ drivers/gpu/drm/via/via_dmablit.h | 8 +-
+ drivers/gpu/drm/via/via_drv.h | 22 +-
+ drivers/gpu/drm/via/via_irq.c | 13 +-
+ drivers/gpu/drm/via/via_map.c | 4 +-
+ drivers/gpu/drm/via/via_mm.c | 7 +-
+ drivers/gpu/drm/via/via_verifier.c | 47 +-
+ drivers/gpu/drm/via/via_verifier.h | 4 +-
+ drivers/gpu/drm/via/via_video.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 20 +-
+ include/drm/drm.h | 2 +
+ include/drm/drmP.h | 60 +-
+ include/drm/drm_crtc_helper.h | 3 +
+ include/drm/drm_global.h | 53 +
+ include/drm/drm_mm.h | 27 +-
+ include/drm/drm_mode.h | 1 +
+ include/drm/i2c/sil164.h | 63 ++
+ include/drm/radeon_drm.h | 2 +
+ include/drm/ttm/ttm_bo_driver.h | 7 +-
+ include/drm/ttm/ttm_module.h | 20 -
+ 197 files changed, 6796 insertions(+), 4897 deletions(-)
+ rename drivers/gpu/drm/{ttm/ttm_global.c => drm_global.c} (79%)
+ create mode 100644 drivers/gpu/drm/drm_platform.c
+ create mode 100644 drivers/gpu/drm/drm_trace.h
+ create mode 100644 drivers/gpu/drm/drm_trace_points.c
+ create mode 100644 drivers/gpu/drm/i2c/sil164_drv.c
+ delete mode 100644 drivers/gpu/drm/nouveau/nouveau_grctx.c
+ rename drivers/gpu/drm/nouveau/{nv17_gpio.c => nv10_gpio.c} (95%)
+ create mode 100644 drivers/gpu/drm/nouveau/nv30_fb.c
+ create mode 100644 drivers/gpu/drm/radeon/radeon_acpi.c
+ create mode 100644 include/drm/drm_global.h
+ create mode 100644 include/drm/i2c/sil164.h
+Merging viafb/viafb-next
+$ git merge viafb/viafb-next
+Merge made by recursive.
+ drivers/video/via/via-core.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+Merging voltage/for-next
+$ git merge voltage/for-next
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/mfd/Makefile
+Merge made by recursive.
+ drivers/mfd/Kconfig | 10 +
+ drivers/mfd/Makefile | 1 +
+ drivers/mfd/ab8500-core.c | 4 +-
+ drivers/mfd/max8998.c | 160 ++++++++
+ drivers/regulator/Kconfig | 34 ++
+ drivers/regulator/Makefile | 5 +
+ drivers/regulator/ab8500.c | 427 +++++++++++++++++++++
+ drivers/regulator/ad5398.c | 288 +++++++++++++++
+ drivers/regulator/isl6271a-regulator.c | 236 ++++++++++++
+ drivers/regulator/max8998.c | 635 ++++++++++++++++++++++++++++++++
+ drivers/regulator/tps65023-regulator.c | 2 +
+ drivers/regulator/tps6586x-regulator.c | 394 ++++++++++++++++++++
+ include/linux/mfd/ab8500.h | 6 +
+ include/linux/mfd/max8998-private.h | 112 ++++++
+ include/linux/mfd/max8998.h | 78 ++++
+ include/linux/regulator/ab8500.h | 25 ++
+ 16 files changed, 2416 insertions(+), 1 deletions(-)
+ create mode 100644 drivers/mfd/max8998.c
+ create mode 100644 drivers/regulator/ab8500.c
+ create mode 100644 drivers/regulator/ad5398.c
+ create mode 100644 drivers/regulator/isl6271a-regulator.c
+ create mode 100644 drivers/regulator/max8998.c
+ create mode 100644 drivers/regulator/tps6586x-regulator.c
+ create mode 100644 include/linux/mfd/max8998-private.h
+ create mode 100644 include/linux/mfd/max8998.h
+ create mode 100644 include/linux/regulator/ab8500.h
+Merging security-testing/next
+$ git merge security-testing/next
+Recorded preimage for 'security/apparmor/domain.c'
+Recorded preimage for 'security/apparmor/ipc.c'
+Recorded preimage for 'security/apparmor/lsm.c'
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging fs/fuse/dir.c
+Auto-merging fs/nfs/dir.c
+Auto-merging include/linux/fs.h
+Auto-merging security/apparmor/domain.c
+CONFLICT (add/add): Merge conflict in security/apparmor/domain.c
+Auto-merging security/apparmor/ipc.c
+CONFLICT (add/add): Merge conflict in security/apparmor/ipc.c
+Auto-merging security/apparmor/lsm.c
+CONFLICT (add/add): Merge conflict in security/apparmor/lsm.c
+Auto-merging security/smack/smack_lsm.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'security/apparmor/domain.c'.
+Recorded resolution for 'security/apparmor/ipc.c'.
+Recorded resolution for 'security/apparmor/lsm.c'.
+[master 188dc3d] Merge remote branch 'security-testing/next'
+$ git diff -M --stat --summary HEAD^..
+Merging lblnet/master
+$ git merge lblnet/master
+Already up-to-date.
+Merging agp/agp-next
+$ git merge agp/agp-next
+Auto-merging drivers/char/agp/backend.c
+Auto-merging drivers/char/agp/hp-agp.c
+Merge made by recursive.
+Merging uwb/for-upstream
+$ git merge uwb/for-upstream
+Auto-merging include/linux/wlp.h
+Merge made by recursive.
+ drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------
+ drivers/uwb/wlp/messages.c | 40 ++++++++++++++++----------------
+ drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------
+ drivers/uwb/wlp/wlp-lc.c | 12 +++++-----
+ include/linux/wlp.h | 2 +-
+ 5 files changed, 58 insertions(+), 58 deletions(-)
+Merging watchdog/master
+$ git merge watchdog/master
+Auto-merging drivers/watchdog/Kconfig
+Auto-merging drivers/watchdog/Makefile
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ drivers/watchdog/Kconfig | 11 +
+ drivers/watchdog/Makefile | 1 +
+ drivers/watchdog/f71808e_wdt.c | 768 ++++++++++++++++++++++++++++++++++++++++
+ drivers/watchdog/hpwdt.c | 24 +-
+ drivers/watchdog/s3c2410_wdt.c | 17 +-
+ drivers/watchdog/sch311x_wdt.c | 4 +-
+ drivers/watchdog/wdt_pci.c | 15 +-
+ include/linux/pci_ids.h | 3 +
+ 8 files changed, 813 insertions(+), 30 deletions(-)
+ create mode 100644 drivers/watchdog/f71808e_wdt.c
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Already up-to-date.
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Auto-merging fs/exofs/file.c
+Auto-merging fs/exofs/inode.c
+Auto-merging fs/exofs/ios.c
+Auto-merging fs/exofs/super.c
+Merge made by recursive.
+ fs/exofs/file.c | 29 +++++++++++++++++------------
+ fs/exofs/inode.c | 9 ++-------
+ fs/exofs/ios.c | 44 ++++++++++++--------------------------------
+ fs/exofs/super.c | 1 -
+ 4 files changed, 31 insertions(+), 52 deletions(-)
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Already up-to-date.
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/for-next
+$ git merge audit/for-next
+Already up-to-date.
+Merging quilt/aoe
+$ git merge quilt/aoe
+Auto-merging drivers/block/aoe/aoecmd.c
+Merge made by recursive.
+ drivers/block/aoe/aoecmd.c | 8 ++++++--
+ 1 files changed, 6 insertions(+), 2 deletions(-)
+Merging suspend/linux-next
+$ git merge suspend/linux-next
+Already up-to-date.
+Merging bluetooth/master
+$ git merge bluetooth/master
+Merge made by recursive.
+ include/net/bluetooth/hci_core.h | 2 +-
+ net/bluetooth/hci_core.c | 2 +-
+ net/bluetooth/hci_sock.c | 8 +++-----
+ net/bluetooth/hci_sysfs.c | 3 +--
+ net/bluetooth/l2cap.c | 24 +++++++++++++++++++++---
+ net/bluetooth/rfcomm/tty.c | 2 +-
+ 6 files changed, 28 insertions(+), 13 deletions(-)
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging fs/compat.c
+Auto-merging fs/inode.c
+Auto-merging fs/namei.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/notify/inode_mark.c
+CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
+Auto-merging fs/open.c
+Auto-merging include/linux/Kbuild
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/security.h
+Auto-merging kernel/audit.c
+Auto-merging security/security.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f fs/notify/inotify/inotify.c
+fs/notify/inotify/inotify.c: needs merge
+rm 'fs/notify/inotify/inotify.c'
+$ git commit -v -a
+[master 5092f12] Merge remote branch 'fsnotify/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/feature-removal-schedule.txt | 8 -
+ arch/x86/ia32/ia32entry.S | 2 +
+ arch/x86/ia32/sys_ia32.c | 9 +
+ arch/x86/include/asm/sys_ia32.h | 3 +
+ arch/x86/include/asm/unistd_32.h | 4 +-
+ arch/x86/include/asm/unistd_64.h | 4 +
+ arch/x86/kernel/syscall_table_32.S | 2 +
+ fs/compat.c | 5 +-
+ fs/exec.c | 4 +-
+ fs/file_table.c | 9 +
+ fs/inode.c | 8 +-
+ fs/namei.c | 2 +-
+ fs/namespace.c | 5 +
+ fs/nfsd/vfs.c | 4 +-
+ fs/notify/Kconfig | 1 +
+ fs/notify/Makefile | 4 +-
+ fs/notify/dnotify/dnotify.c | 213 +++----
+ fs/notify/fanotify/Kconfig | 26 +
+ fs/notify/fanotify/Makefile | 1 +
+ fs/notify/fanotify/fanotify.c | 212 +++++++
+ fs/notify/fanotify/fanotify_user.c | 760 ++++++++++++++++++++++++
+ fs/notify/fsnotify.c | 201 ++++++--
+ fs/notify/fsnotify.h | 27 +-
+ fs/notify/group.c | 182 +------
+ fs/notify/inode_mark.c | 331 ++++--------
+ fs/notify/inotify/Kconfig | 15 -
+ fs/notify/inotify/Makefile | 1 -
+ fs/notify/inotify/inotify.c | 872 ----------------------------
+ fs/notify/inotify/inotify.h | 7 +-
+ fs/notify/inotify/inotify_fsnotify.c | 151 ++++--
+ fs/notify/inotify/inotify_user.c | 369 ++++++++-----
+ fs/notify/mark.c | 371 ++++++++++++
+ fs/notify/notification.c | 236 +++++---
+ fs/notify/vfsmount_mark.c | 187 ++++++
+ fs/open.c | 3 +-
+ fs/read_write.c | 8 +-
+ include/asm-generic/fcntl.h | 8 +
+ include/linux/Kbuild | 1 +
+ include/linux/dnotify.h | 1 +
+ include/linux/fanotify.h | 105 ++++
+ include/linux/fs.h | 16 +-
+ include/linux/fsnotify.h | 161 +++---
+ include/linux/fsnotify_backend.h | 211 +++++---
+ include/linux/inotify.h | 185 +------
+ include/linux/mount.h | 6 +-
+ include/linux/security.h | 1 +
+ include/linux/syscalls.h | 4 +
+ init/Kconfig | 10 +-
+ kernel/Makefile | 5 +-
+ kernel/audit.c | 1 -
+ kernel/audit.h | 26 +-
+ kernel/audit_tree.c | 237 +++++----
+ kernel/audit_watch.c | 274 +++++----
+ kernel/auditfilter.c | 39 +-
+ kernel/auditsc.c | 10 +-
+ kernel/sys_ni.c | 4 +
+ kernel/sysctl.c | 7 +-
+ security/security.c | 16 +-
+ 58 files changed, 3197 insertions(+), 2378 deletions(-)
+ create mode 100644 fs/notify/fanotify/Kconfig
+ create mode 100644 fs/notify/fanotify/Makefile
+ create mode 100644 fs/notify/fanotify/fanotify.c
+ create mode 100644 fs/notify/fanotify/fanotify_user.c
+ delete mode 100644 fs/notify/inotify/inotify.c
+ create mode 100644 fs/notify/mark.c
+ create mode 100644 fs/notify/vfsmount_mark.c
+ create mode 100644 include/linux/fanotify.h
+Merging irda/for-next
+$ git merge irda/for-next
+Resolved 'drivers/net/irda/irda-usb.c' using previous resolution.
+Auto-merging drivers/net/irda/irda-usb.c
+CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 70673d47] Merge remote branch 'irda/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/net/irda/irda-usb.c | 9 +++++----
+ 1 files changed, 5 insertions(+), 4 deletions(-)
+Merging catalin/for-next
+$ git merge catalin/for-next
+Resolved 'arch/arm/include/asm/io.h' using previous resolution.
+Resolved 'arch/arm/kernel/entry-armv.S' using previous resolution.
+Resolved 'arch/arm/mm/cache-l2x0.c' using previous resolution.
+Resolved 'arch/arm/mm/mmu.c' using previous resolution.
+Auto-merging arch/arm/include/asm/io.h
+CONFLICT (content): Merge conflict in arch/arm/include/asm/io.h
+Auto-merging arch/arm/kernel/entry-armv.S
+CONFLICT (content): Merge conflict in arch/arm/kernel/entry-armv.S
+Auto-merging arch/arm/kernel/setup.c
+Auto-merging arch/arm/kernel/traps.c
+Auto-merging arch/arm/mm/Kconfig
+Auto-merging arch/arm/mm/cache-l2x0.c
+CONFLICT (content): Merge conflict in arch/arm/mm/cache-l2x0.c
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/mm/mmu.c
+CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c
+Auto-merging arch/arm/mm/proc-v6.S
+Auto-merging arch/arm/mm/proc-v7.S
+Auto-merging lib/Kconfig.debug
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 385f669] Merge remote branch 'catalin/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/include/asm/assembler.h | 13 +++--
+ arch/arm/include/asm/cacheflush.h | 9 +--
+ arch/arm/include/asm/domain.h | 31 +++++++++++-
+ arch/arm/include/asm/futex.h | 9 ++--
+ arch/arm/include/asm/pgtable.h | 29 ++++++++++-
+ arch/arm/include/asm/smp_plat.h | 4 ++
+ arch/arm/include/asm/tlbflush.h | 12 ++++-
+ arch/arm/include/asm/traps.h | 2 +
+ arch/arm/include/asm/uaccess.h | 16 +++---
+ arch/arm/kernel/entry-armv.S | 4 +-
+ arch/arm/kernel/fiq.c | 5 ++
+ arch/arm/kernel/traps.c | 14 ++++--
+ arch/arm/lib/getuser.S | 13 +++--
+ arch/arm/lib/putuser.S | 29 ++++++-----
+ arch/arm/lib/uaccess.S | 83 ++++++++++++++++---------------
+ arch/arm/mm/Kconfig | 16 ++++++
+ arch/arm/mm/cache-l2x0.c | 15 +++++-
+ arch/arm/mm/copypage-v4mc.c | 2 +-
+ arch/arm/mm/copypage-v6.c | 2 +-
+ arch/arm/mm/copypage-xscale.c | 2 +-
+ arch/arm/mm/dma-mapping.c | 6 ++
+ arch/arm/mm/fault-armv.c | 8 ++--
+ arch/arm/mm/flush.c | 46 +++++++++++++----
+ arch/arm/mm/mmu.c | 20 ++++++-
+ arch/arm/mm/proc-macros.S | 7 +++
+ arch/arm/mm/proc-v7.S | 5 +-
+ lib/Kconfig.debug | 7 +++
+ mm/kmemleak.c | 98 ++++++++++++++++++++++++++++---------
+ 28 files changed, 361 insertions(+), 146 deletions(-)
+Merging alacrity/linux-next
+$ git merge alacrity/linux-next
+Auto-merging MAINTAINERS
+Auto-merging arch/x86/Kconfig
+Auto-merging drivers/Makefile
+Auto-merging drivers/net/Kconfig
+Auto-merging drivers/net/Makefile
+Auto-merging include/linux/Kbuild
+Auto-merging lib/Kconfig
+Auto-merging lib/Makefile
+Merge made by recursive.
+ MAINTAINERS | 25 +
+ arch/x86/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/net/Kconfig | 14 +
+ drivers/net/Makefile | 1 +
+ drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++
+ drivers/vbus/Kconfig | 25 +
+ drivers/vbus/Makefile | 6 +
+ drivers/vbus/bus-proxy.c | 248 +++++++
+ drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++
+ include/linux/Kbuild | 4 +
+ include/linux/ioq.h | 414 ++++++++++++
+ include/linux/shm_signal.h | 189 ++++++
+ include/linux/vbus_driver.h | 83 +++
+ include/linux/vbus_pci.h | 145 ++++
+ include/linux/venet.h | 133 ++++
+ lib/Kconfig | 21 +
+ lib/Makefile | 2 +
+ lib/ioq.c | 304 +++++++++
+ lib/shm_signal.c | 196 ++++++
+ 20 files changed, 4389 insertions(+), 0 deletions(-)
+ create mode 100644 drivers/net/vbus-enet.c
+ create mode 100644 drivers/vbus/Kconfig
+ create mode 100644 drivers/vbus/Makefile
+ create mode 100644 drivers/vbus/bus-proxy.c
+ create mode 100644 drivers/vbus/pci-bridge.c
+ create mode 100644 include/linux/ioq.h
+ create mode 100644 include/linux/shm_signal.h
+ create mode 100644 include/linux/vbus_driver.h
+ create mode 100644 include/linux/vbus_pci.h
+ create mode 100644 include/linux/venet.h
+ create mode 100644 lib/ioq.c
+ create mode 100644 lib/shm_signal.c
+Merging i7core_edac/linux_next
+$ git merge i7core_edac/linux_next
+Resolved 'MAINTAINERS' using previous resolution.
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging drivers/edac/i7core_edac.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master beeeee5] Merge remote branch 'i7core_edac/linux_next'
+$ git diff -M --stat --summary HEAD^..
+Merging devicetree/next-devicetree
+$ git merge devicetree/next-devicetree
+Resolved 'arch/microblaze/kernel/Makefile' using previous resolution.
+Auto-merging arch/microblaze/Kconfig
+Removing arch/microblaze/include/asm/of_device.h
+Removing arch/microblaze/include/asm/of_platform.h
+Auto-merging arch/microblaze/include/asm/page.h
+Auto-merging arch/microblaze/kernel/Makefile
+CONFLICT (content): Merge conflict in arch/microblaze/kernel/Makefile
+Auto-merging arch/microblaze/kernel/irq.c
+Removing arch/microblaze/kernel/of_device.c
+Removing arch/microblaze/kernel/of_platform.c
+Auto-merging arch/powerpc/Kconfig
+Removing arch/powerpc/include/asm/of_device.h
+Removing arch/powerpc/include/asm/of_platform.h
+Auto-merging arch/powerpc/include/asm/topology.h
+Auto-merging arch/powerpc/kernel/Makefile
+Auto-merging arch/powerpc/kernel/irq.c
+Removing arch/powerpc/kernel/of_device.c
+Auto-merging arch/powerpc/kernel/setup-common.c
+Auto-merging arch/powerpc/platforms/512x/clock.c
+Auto-merging arch/powerpc/platforms/powermac/feature.c
+Removing arch/sparc/include/asm/of_device.h
+Removing arch/sparc/include/asm/of_platform.h
+Auto-merging arch/sparc/mm/iommu.c
+Auto-merging drivers/char/hw_random/n2-drv.c
+Auto-merging drivers/crypto/n2_core.c
+Auto-merging drivers/gpio/gpiolib.c
+Auto-merging drivers/i2c/busses/i2c-mpc.c
+Auto-merging drivers/i2c/i2c-core.c
+Auto-merging drivers/net/ibm_newemac/core.c
+Auto-merging drivers/net/niu.c
+Auto-merging drivers/sbus/char/display7seg.c
+Auto-merging drivers/sbus/char/envctrl.c
+Auto-merging drivers/sbus/char/flash.c
+Auto-merging drivers/sbus/char/uctrl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 70bea20] Merge remote branch 'devicetree/next-devicetree'
+$ git diff -M --stat --summary HEAD^..
+ arch/microblaze/Kconfig | 17 +-
+ arch/microblaze/include/asm/irq.h | 24 -
+ arch/microblaze/include/asm/of_device.h | 44 --
+ arch/microblaze/include/asm/of_platform.h | 54 --
+ arch/microblaze/include/asm/page.h | 7 -
+ arch/microblaze/include/asm/pci-bridge.h | 5 -
+ arch/microblaze/include/asm/prom.h | 115 +---
+ arch/microblaze/include/asm/topology.h | 10 -
+ arch/microblaze/kernel/Makefile | 4 +-
+ arch/microblaze/kernel/irq.c | 14 +-
+ arch/microblaze/kernel/of_device.c | 112 ---
+ arch/microblaze/kernel/of_platform.c | 200 -----
+ arch/microblaze/kernel/prom_parse.c | 877 +----------------------
+ arch/microblaze/kernel/reset.c | 12 +-
+ arch/microblaze/kernel/setup.c | 6 -
+ arch/powerpc/Kconfig | 18 +-
+ arch/powerpc/include/asm/irq.h | 28 -
+ arch/powerpc/include/asm/macio.h | 2 +-
+ arch/powerpc/include/asm/of_device.h | 27 -
+ arch/powerpc/include/asm/of_platform.h | 29 -
+ arch/powerpc/include/asm/pci-bridge.h | 5 -
+ arch/powerpc/include/asm/prom.h | 133 +---
+ arch/powerpc/include/asm/smu.h | 4 +-
+ arch/powerpc/include/asm/topology.h | 7 -
+ arch/powerpc/kernel/Makefile | 2 +-
+ arch/powerpc/kernel/dma-swiotlb.c | 8 -
+ arch/powerpc/kernel/ibmebus.c | 8 +-
+ arch/powerpc/kernel/irq.c | 14 +-
+ arch/powerpc/kernel/legacy_serial.c | 1 +
+ arch/powerpc/kernel/of_device.c | 133 ----
+ arch/powerpc/kernel/of_platform.c | 203 +------
+ arch/powerpc/kernel/pci-common.c | 1 +
+ arch/powerpc/kernel/prom_parse.c | 924 +-----------------------
+ arch/powerpc/kernel/setup-common.c | 7 -
+ arch/powerpc/platforms/512x/clock.c | 2 +-
+ arch/powerpc/platforms/52xx/lite5200.c | 1 +
+ arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 36 +-
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 33 +-
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 6 +-
+ arch/powerpc/platforms/82xx/ep8248e.c | 4 +-
+ arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 40 +-
+ arch/powerpc/platforms/83xx/suspend.c | 6 +-
+ arch/powerpc/platforms/86xx/gef_gpio.c | 24 +-
+ arch/powerpc/platforms/amigaone/setup.c | 3 +-
+ arch/powerpc/platforms/cell/axon_msi.c | 4 +-
+ arch/powerpc/platforms/cell/beat_iommu.c | 2 +-
+ arch/powerpc/platforms/cell/iommu.c | 2 +-
+ arch/powerpc/platforms/cell/qpace_setup.c | 14 +-
+ arch/powerpc/platforms/cell/setup.c | 14 +-
+ arch/powerpc/platforms/iseries/mf.c | 1 +
+ arch/powerpc/platforms/pasemi/gpio_mdio.c | 4 +-
+ arch/powerpc/platforms/powermac/feature.c | 2 +
+ arch/powerpc/platforms/powermac/pic.c | 72 ++-
+ arch/powerpc/sysdev/axonram.c | 12 +-
+ arch/powerpc/sysdev/bestcomm/bestcomm.c | 7 +-
+ arch/powerpc/sysdev/bestcomm/sram.c | 1 +
+ arch/powerpc/sysdev/cpm1.c | 10 +-
+ arch/powerpc/sysdev/cpm_common.c | 5 +-
+ arch/powerpc/sysdev/fsl_gtm.c | 1 +
+ arch/powerpc/sysdev/fsl_msi.c | 4 +-
+ arch/powerpc/sysdev/fsl_pmc.c | 3 +-
+ arch/powerpc/sysdev/fsl_rio.c | 4 +-
+ arch/powerpc/sysdev/mpc8xxx_gpio.c | 5 +-
+ arch/powerpc/sysdev/mv64x60_dev.c | 7 +-
+ arch/powerpc/sysdev/pmi.c | 6 +-
+ arch/powerpc/sysdev/ppc4xx_gpio.c | 5 +-
+ arch/powerpc/sysdev/qe_lib/gpio.c | 31 +-
+ arch/powerpc/sysdev/qe_lib/qe.c | 5 +-
+ arch/powerpc/sysdev/simple_gpio.c | 5 +-
+ arch/sparc/Kconfig | 4 +-
+ arch/sparc/include/asm/device.h | 11 +-
+ arch/sparc/include/asm/floppy_64.h | 10 +-
+ arch/sparc/include/asm/of_device.h | 38 -
+ arch/sparc/include/asm/of_platform.h | 18 -
+ arch/sparc/include/asm/parport.h | 12 +-
+ arch/sparc/include/asm/prom.h | 10 +-
+ arch/sparc/kernel/apc.c | 6 +-
+ arch/sparc/kernel/auxio_64.c | 5 +-
+ arch/sparc/kernel/central.c | 8 +-
+ arch/sparc/kernel/chmc.c | 16 +-
+ arch/sparc/kernel/ioport.c | 2 +-
+ arch/sparc/kernel/of_device_32.c | 63 +-
+ arch/sparc/kernel/of_device_64.c | 61 +-
+ arch/sparc/kernel/of_device_common.c | 35 +-
+ arch/sparc/kernel/pci.c | 6 +-
+ arch/sparc/kernel/pci_fire.c | 6 +-
+ arch/sparc/kernel/pci_impl.h | 2 +-
+ arch/sparc/kernel/pci_psycho.c | 16 +-
+ arch/sparc/kernel/pci_sabre.c | 16 +-
+ arch/sparc/kernel/pci_schizo.c | 32 +-
+ arch/sparc/kernel/pci_sun4v.c | 6 +-
+ arch/sparc/kernel/pmc.c | 4 +-
+ arch/sparc/kernel/power.c | 6 +-
+ arch/sparc/kernel/prom.h | 8 -
+ arch/sparc/kernel/prom_64.c | 6 +-
+ arch/sparc/kernel/prom_common.c | 2 +-
+ arch/sparc/kernel/prom_irqtrans.c | 2 +-
+ arch/sparc/kernel/psycho_common.c | 2 +-
+ arch/sparc/kernel/psycho_common.h | 2 +-
+ arch/sparc/kernel/sbus.c | 16 +-
+ arch/sparc/kernel/time_32.c | 4 +-
+ arch/sparc/kernel/time_64.c | 12 +-
+ arch/sparc/mm/io-unit.c | 4 +-
+ arch/sparc/mm/iommu.c | 4 +-
+ drivers/atm/fore200e.c | 8 +-
+ drivers/base/platform.c | 13 +-
+ drivers/char/bsr.c | 1 +
+ drivers/char/hw_random/n2-drv.c | 4 +-
+ drivers/crypto/n2_core.c | 10 +-
+ drivers/gpio/gpiolib.c | 55 ++-
+ drivers/gpio/xilinx_gpio.c | 15 +-
+ drivers/hwmon/ultra45_env.c | 4 +-
+ drivers/i2c/busses/i2c-cpm.c | 6 +-
+ drivers/i2c/busses/i2c-ibm_iic.c | 4 +-
+ drivers/i2c/busses/i2c-mpc.c | 2 +-
+ drivers/i2c/i2c-core.c | 9 +
+ drivers/input/misc/sparcspkr.c | 12 +-
+ drivers/input/serio/i8042-sparcio.h | 13 +-
+ drivers/macintosh/macio_sysfs.c | 5 +-
+ drivers/mmc/host/mmc_spi.c | 8 +
+ drivers/mtd/maps/sun_uflash.c | 4 +-
+ drivers/net/fsl_pq_mdio.c | 1 +
+ drivers/net/ibm_newemac/core.c | 4 +-
+ drivers/net/myri_sbus.c | 6 +-
+ drivers/net/niu.c | 15 +-
+ drivers/net/niu.h | 4 +-
+ drivers/net/sunbmac.c | 6 +-
+ drivers/net/sunhme.c | 10 +-
+ drivers/net/sunlance.c | 6 +-
+ drivers/net/sunqe.c | 10 +-
+ drivers/net/xilinx_emaclite.c | 2 +-
+ drivers/of/Kconfig | 40 +-
+ drivers/of/Makefile | 2 +
+ drivers/of/address.c | 595 +++++++++++++++
+ drivers/of/base.c | 76 +--
+ drivers/of/device.c | 91 ++-
+ drivers/of/fdt.c | 26 +-
+ drivers/of/gpio.c | 93 ++-
+ drivers/of/irq.c | 349 +++++++++
+ drivers/of/of_i2c.c | 50 +-
+ drivers/of/of_mdio.c | 1 +
+ drivers/of/of_spi.c | 11 +-
+ drivers/of/platform.c | 384 ++++++++++-
+ drivers/parport/parport_sunbpp.c | 6 +-
+ drivers/sbus/char/bbc_i2c.c | 10 +-
+ drivers/sbus/char/display7seg.c | 4 +-
+ drivers/sbus/char/envctrl.c | 4 +-
+ drivers/sbus/char/flash.c | 4 +-
+ drivers/sbus/char/uctrl.c | 6 +-
+ drivers/scsi/qlogicpti.c | 8 +-
+ drivers/scsi/sun_esp.c | 6 +-
+ drivers/serial/sunhv.c | 8 +-
+ drivers/serial/sunsab.c | 6 +-
+ drivers/serial/sunsu.c | 4 +-
+ drivers/serial/sunzilog.c | 16 +-
+ drivers/serial/uartlite.c | 1 +
+ drivers/spi/mpc512x_psc_spi.c | 2 +
+ drivers/spi/mpc52xx_psc_spi.c | 11 +-
+ drivers/spi/mpc52xx_spi.c | 3 +-
+ drivers/spi/spi.c | 4 +
+ drivers/spi/spi_mpc8xxx.c | 4 +-
+ drivers/spi/spi_ppc4xx.c | 2 +-
+ drivers/spi/xilinx_spi.c | 3 +
+ drivers/spi/xilinx_spi_of.c | 4 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 1 +
+ drivers/video/bw2.c | 4 +-
+ drivers/video/cg14.c | 4 +-
+ drivers/video/cg3.c | 4 +-
+ drivers/video/cg6.c | 4 +-
+ drivers/video/controlfb.c | 2 +
+ drivers/video/ffb.c | 4 +-
+ drivers/video/leo.c | 4 +-
+ drivers/video/offb.c | 3 +-
+ drivers/video/p9100.c | 4 +-
+ drivers/video/sunxvr1000.c | 4 +-
+ drivers/video/tcx.c | 4 +-
+ drivers/watchdog/cpwd.c | 6 +-
+ drivers/watchdog/riowd.c | 4 +-
+ include/asm-generic/gpio.h | 15 +
+ include/linux/of.h | 10 +
+ include/linux/of_address.h | 44 ++
+ include/linux/of_device.h | 61 ++-
+ include/linux/of_gpio.h | 35 +-
+ include/linux/of_i2c.h | 13 +-
+ include/linux/of_irq.h | 70 ++
+ include/linux/of_platform.h | 53 +-
+ include/linux/of_spi.h | 11 +-
+ sound/sparc/amd7930.c | 6 +-
+ sound/sparc/cs4231.c | 18 +-
+ sound/sparc/dbri.c | 6 +-
+ 190 files changed, 2492 insertions(+), 3864 deletions(-)
+ delete mode 100644 arch/microblaze/include/asm/of_device.h
+ delete mode 100644 arch/microblaze/include/asm/of_platform.h
+ delete mode 100644 arch/microblaze/kernel/of_device.c
+ delete mode 100644 arch/microblaze/kernel/of_platform.c
+ delete mode 100644 arch/powerpc/include/asm/of_device.h
+ delete mode 100644 arch/powerpc/include/asm/of_platform.h
+ delete mode 100644 arch/powerpc/kernel/of_device.c
+ delete mode 100644 arch/sparc/include/asm/of_device.h
+ delete mode 100644 arch/sparc/include/asm/of_platform.h
+ create mode 100644 drivers/of/address.c
+ create mode 100644 drivers/of/irq.c
+ create mode 100644 include/linux/of_address.h
+ create mode 100644 include/linux/of_irq.h
+Merging spi/next-spi
+$ git merge spi/next-spi
+Auto-merging drivers/mmc/host/mmc_spi.c
+Auto-merging drivers/spi/mpc512x_psc_spi.c
+Auto-merging drivers/spi/spi.c
+Merge made by recursive.
+ drivers/mmc/host/mmc_spi.c | 59 ++---------
+ drivers/spi/amba-pl022.c | 6 +-
+ drivers/spi/mpc512x_psc_spi.c | 16 ++--
+ drivers/spi/omap_spi_100k.c | 23 ++--
+ drivers/spi/spi.c | 225 ++++++++++++++++++++++++++++++++++------
+ drivers/spi/spi_bitbang.c | 9 +-
+ drivers/spi/spi_bitbang_txrx.h | 16 ++-
+ drivers/spi/spi_butterfly.c | 2 +-
+ drivers/spi/spi_gpio.c | 109 +++++++++++++++----
+ drivers/spi/spi_lm70llp.c | 2 +-
+ drivers/spi/spi_s3c24xx_gpio.c | 8 +-
+ drivers/spi/spi_sh_sci.c | 8 +-
+ include/linux/spi/spi.h | 12 ++
+ include/linux/spi/spi_gpio.h | 5 +
+ 14 files changed, 353 insertions(+), 147 deletions(-)
+Merging limits/writable_limits
+$ git merge limits/writable_limits
+Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution.
+Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution.
+Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution.
+Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution.
+Resolved 'include/asm-generic/unistd.h' using previous resolution.
+Auto-merging arch/x86/ia32/ia32entry.S
+CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
+Auto-merging arch/x86/include/asm/unistd_32.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
+Auto-merging arch/x86/include/asm/unistd_64.h
+CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
+Auto-merging arch/x86/kernel/syscall_table_32.S
+CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
+Auto-merging include/asm-generic/unistd.h
+CONFLICT (content): Merge conflict in include/asm-generic/unistd.h
+Auto-merging include/linux/security.h
+Auto-merging include/linux/syscalls.h
+Auto-merging security/capability.c
+Auto-merging security/security.c
+Auto-merging security/selinux/hooks.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f8bd81d] Merge remote branch 'limits/writable_limits'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/ia32/ia32entry.S | 1 +
+ arch/x86/include/asm/unistd_32.h | 3 +-
+ arch/x86/include/asm/unistd_64.h | 2 +
+ arch/x86/kernel/syscall_table_32.S | 1 +
+ include/asm-generic/unistd.h | 4 +-
+ include/linux/posix-timers.h | 2 +-
+ include/linux/resource.h | 9 ++
+ include/linux/security.h | 9 +-
+ include/linux/syscalls.h | 4 +
+ kernel/compat.c | 17 +---
+ kernel/posix-cpu-timers.c | 8 +-
+ kernel/sys.c | 202 ++++++++++++++++++++++++++++--------
+ security/capability.c | 3 +-
+ security/security.c | 5 +-
+ security/selinux/hooks.c | 12 ++-
+ 15 files changed, 207 insertions(+), 75 deletions(-)
+Merging omap_dss2/for-next
+$ git merge omap_dss2/for-next
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging include/linux/omapfb.h
+Merge made by recursive.
+ arch/arm/mach-omap2/board-omap3evm.c | 7 +-
+ arch/arm/plat-omap/include/plat/display.h | 9 +-
+ arch/arm/plat-omap/include/plat/nokia-dsi-panel.h | 31 ++
+ drivers/video/omap2/displays/panel-taal.c | 567 +++++++++++++++----
+ .../video/omap2/displays/panel-toppoly-tdo35s.c | 8 +-
+ drivers/video/omap2/dss/dispc.c | 16 +-
+ drivers/video/omap2/dss/display.c | 4 +-
+ drivers/video/omap2/dss/dsi.c | 463 ++++++++---------
+ drivers/video/omap2/dss/dss.c | 6 +
+ drivers/video/omap2/dss/dss.h | 11 +-
+ drivers/video/omap2/dss/manager.c | 236 +++++----
+ drivers/video/omap2/dss/overlay.c | 2 +-
+ drivers/video/omap2/dss/rfbi.c | 2 +-
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 188 ++++++-
+ drivers/video/omap2/omapfb/omapfb-main.c | 229 ++++++---
+ drivers/video/omap2/omapfb/omapfb-sysfs.c | 70 ++-
+ drivers/video/omap2/omapfb/omapfb.h | 29 +-
+ include/linux/omapfb.h | 5 +-
+ 18 files changed, 1281 insertions(+), 602 deletions(-)
+ create mode 100644 arch/arm/plat-omap/include/plat/nokia-dsi-panel.h
+Merging xen/upstream/xen
+$ git merge xen/upstream/xen
+Resolved 'drivers/xen/Kconfig' using previous resolution.
+Resolved 'drivers/xen/Makefile' using previous resolution.
+Resolved 'include/xen/xen-ops.h' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging arch/x86/xen/Makefile
+Auto-merging arch/x86/xen/enlighten.c
+Auto-merging arch/x86/xen/mmu.c
+Auto-merging drivers/block/xen-blkfront.c
+Auto-merging drivers/xen/Kconfig
+CONFLICT (content): Merge conflict in drivers/xen/Kconfig
+Auto-merging drivers/xen/Makefile
+CONFLICT (content): Merge conflict in drivers/xen/Makefile
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/xen/xen-ops.h
+CONFLICT (content): Merge conflict in include/xen/xen-ops.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 97f7e31] Merge remote branch 'xen/upstream/xen'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 11 ++
+ arch/x86/include/asm/hypervisor.h | 1 +
+ arch/x86/include/asm/irq_vectors.h | 3 +
+ arch/x86/include/asm/setup.h | 2 +-
+ arch/x86/include/asm/xen/hypercall.h | 6 +
+ arch/x86/kernel/cpu/hypervisor.c | 3 +
+ arch/x86/kernel/entry_32.S | 3 +
+ arch/x86/kernel/entry_64.S | 3 +
+ arch/x86/xen/Kconfig | 5 +
+ arch/x86/xen/Makefile | 2 +-
+ arch/x86/xen/enlighten.c | 197 +++++++++++++++++++++++++++++---
+ arch/x86/xen/mmu.c | 35 ++++++
+ arch/x86/xen/mmu.h | 1 +
+ arch/x86/xen/platform-pci-unplug.c | 137 ++++++++++++++++++++++
+ arch/x86/xen/setup.c | 72 ++++++++++++
+ arch/x86/xen/smp.c | 2 +
+ arch/x86/xen/suspend.c | 12 ++
+ arch/x86/xen/time.c | 96 +++++++++-------
+ arch/x86/xen/xen-ops.h | 13 ++-
+ drivers/block/xen-blkfront.c | 30 +++++
+ drivers/input/xen-kbdfront.c | 2 +-
+ drivers/video/xen-fbfront.c | 2 +-
+ drivers/xen/Kconfig | 10 ++
+ drivers/xen/Makefile | 1 +
+ drivers/xen/events.c | 95 ++++++++++++++--
+ drivers/xen/grant-table.c | 77 +++++++++++--
+ drivers/xen/manage.c | 46 +++++++-
+ drivers/xen/platform-pci.c | 207 ++++++++++++++++++++++++++++++++++
+ drivers/xen/xenbus/xenbus_probe.c | 52 +++++++--
+ drivers/xen/xenbus/xenbus_xs.c | 57 ++++++++--
+ drivers/xen/xenfs/super.c | 4 +-
+ drivers/xen/xenfs/xenbus.c | 3 +
+ include/asm-generic/vmlinux.lds.h | 1 +
+ include/linux/pci_ids.h | 3 +
+ include/xen/events.h | 7 +
+ include/xen/grant_table.h | 4 +
+ include/xen/hvm.h | 30 +++++
+ include/xen/interface/features.h | 6 +
+ include/xen/interface/grant_table.h | 1 +
+ include/xen/interface/hvm/hvm_op.h | 46 ++++++++
+ include/xen/interface/hvm/params.h | 95 ++++++++++++++++
+ include/xen/platform_pci.h | 49 ++++++++
+ include/xen/xen-ops.h | 3 +
+ 43 files changed, 1317 insertions(+), 118 deletions(-)
+ create mode 100644 arch/x86/xen/platform-pci-unplug.c
+ create mode 100644 drivers/xen/platform-pci.c
+ create mode 100644 include/xen/hvm.h
+ create mode 100644 include/xen/interface/hvm/hvm_op.h
+ create mode 100644 include/xen/interface/hvm/params.h
+ create mode 100644 include/xen/platform_pci.h
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Resolved 'Makefile' using previous resolution.
+Resolved 'arch/powerpc/kernel/time.c' using previous resolution.
+Resolved 'drivers/Makefile' using previous resolution.
+Resolved 'drivers/cpufreq/cpufreq.c' using previous resolution.
+Removing Documentation/ABI/testing/debugfs-kmemtrace
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Auto-merging Documentation/kernel-parameters.txt
+Removing Documentation/trace/kmemtrace.txt
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+CONFLICT (content): Merge conflict in Makefile
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/cris/Kconfig
+Auto-merging arch/microblaze/Kconfig
+Auto-merging arch/mips/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/powerpc/include/asm/cputable.h
+Auto-merging arch/powerpc/include/asm/machdep.h
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Auto-merging arch/powerpc/kernel/process.c
+Auto-merging arch/powerpc/kernel/smp.c
+Auto-merging arch/powerpc/kernel/time.c
+CONFLICT (content): Merge conflict in arch/powerpc/kernel/time.c
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/i387.h
+Auto-merging arch/x86/include/asm/msr-index.h
+Auto-merging arch/x86/include/asm/xsave.h
+Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Removing arch/x86/kernel/dumpstack.h
+Auto-merging arch/x86/kernel/entry_32.S
+Auto-merging arch/x86/kernel/i387.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/kvm/svm.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging arch/xtensa/Kconfig
+Auto-merging drivers/Makefile
+CONFLICT (content): Merge conflict in drivers/Makefile
+Auto-merging drivers/cpufreq/cpufreq.c
+CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
+Auto-merging drivers/idle/intel_idle.c
+Auto-merging drivers/misc/Kconfig
+Auto-merging drivers/pci/intel-iommu.c
+Auto-merging drivers/xen/events.c
+Auto-merging fs/exec.c
+Auto-merging include/asm-generic/vmlinux.lds.h
+Auto-merging include/linux/kernel.h
+Removing include/linux/kmemtrace.h
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/vmalloc.h
+Removing include/trace/boot.h
+Auto-merging init/main.c
+Auto-merging kernel/Makefile
+Auto-merging kernel/cpuset.c
+Auto-merging kernel/debug/kdb/kdb_main.c
+Auto-merging kernel/hw_breakpoint.c
+Auto-merging kernel/posix-cpu-timers.c
+Removing kernel/softlockup.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/timer.c
+Auto-merging kernel/trace/Makefile
+Removing kernel/trace/kmemtrace.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/trace/trace.h
+Removing kernel/trace/trace_boot.c
+Removing kernel/trace/trace_ksym.c
+Removing kernel/trace/trace_sysprof.c
+Auto-merging lib/Kconfig.debug
+Auto-merging mm/backing-dev.c
+Auto-merging mm/slab.c
+Auto-merging 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 5f5a8dd] Merge remote branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/debugfs-kmemtrace | 71 --
+ Documentation/feature-removal-schedule.txt | 21 +
+ Documentation/kernel-parameters.txt | 5 +-
+ Documentation/trace/ftrace-design.txt | 153 +++-
+ Documentation/trace/kmemtrace.txt | 126 ---
+ Documentation/trace/kprobetrace.txt | 2 +-
+ Documentation/x86/zero-page.txt | 1 +
+ MAINTAINERS | 9 +-
+ Makefile | 4 +-
+ arch/Kconfig | 7 +
+ arch/alpha/Kconfig | 4 -
+ arch/alpha/include/asm/local64.h | 1 +
+ arch/arm/Kconfig | 4 -
+ arch/arm/include/asm/local64.h | 1 +
+ arch/arm/kernel/perf_event.c | 18 +-
+ arch/avr32/Kconfig | 3 -
+ arch/avr32/include/asm/local64.h | 1 +
+ arch/blackfin/Kconfig | 3 -
+ arch/blackfin/include/asm/local64.h | 1 +
+ arch/cris/Kconfig | 3 -
+ arch/cris/include/asm/local64.h | 1 +
+ arch/frv/Kconfig | 4 -
+ arch/frv/include/asm/local64.h | 1 +
+ arch/frv/kernel/local64.h | 1 +
+ arch/h8300/Kconfig | 4 -
+ arch/h8300/include/asm/local64.h | 1 +
+ arch/ia64/Kconfig | 4 -
+ arch/ia64/include/asm/local64.h | 1 +
+ arch/ia64/kernel/time.c | 7 +-
+ arch/m32r/Kconfig | 3 -
+ arch/m32r/include/asm/local64.h | 1 +
+ arch/m68k/Kconfig | 3 -
+ arch/m68k/include/asm/local64.h | 1 +
+ arch/m68knommu/Kconfig | 4 -
+ arch/microblaze/Kconfig | 3 -
+ arch/microblaze/include/asm/local64.h | 1 +
+ arch/mips/Kconfig | 4 -
+ arch/mips/include/asm/local64.h | 1 +
+ arch/mn10300/Kconfig | 3 -
+ arch/mn10300/include/asm/local64.h | 1 +
+ arch/parisc/Kconfig | 4 -
+ arch/parisc/include/asm/local64.h | 1 +
+ arch/parisc/kernel/ftrace.c | 4 +-
+ arch/powerpc/Kconfig | 3 -
+ arch/powerpc/include/asm/cputable.h | 3 +-
+ arch/powerpc/include/asm/local64.h | 1 +
+ arch/powerpc/include/asm/perf_event.h | 12 +
+ arch/powerpc/kernel/misc.S | 26 -
+ arch/powerpc/kernel/perf_event.c | 41 +-
+ arch/powerpc/kernel/process.c | 11 +
+ arch/powerpc/kernel/time.c | 60 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 5 +-
+ arch/s390/Kconfig | 3 -
+ arch/s390/include/asm/local64.h | 1 +
+ arch/s390/kernel/time.c | 8 +-
+ arch/score/Kconfig | 3 -
+ arch/score/include/asm/local64.h | 1 +
+ arch/sh/Kconfig | 3 -
+ arch/sh/include/asm/local64.h | 1 +
+ arch/sh/kernel/perf_event.c | 6 +-
+ arch/sparc/Kconfig | 3 -
+ arch/sparc/include/asm/local64.h | 1 +
+ arch/sparc/include/asm/perf_event.h | 8 +
+ arch/sparc/kernel/helpers.S | 6 +-
+ arch/sparc/kernel/perf_event.c | 25 +-
+ arch/um/Kconfig.common | 4 -
+ arch/um/kernel/time.c | 13 +-
+ arch/x86/Kconfig | 15 +-
+ arch/x86/boot/boot.h | 16 +
+ arch/x86/boot/main.c | 3 +
+ arch/x86/boot/string.c | 63 ++
+ arch/x86/boot/tty.c | 171 +++-
+ arch/x86/include/asm/alternative.h | 7 +-
+ arch/x86/include/asm/apb_timer.h | 1 -
+ arch/x86/include/asm/bootparam.h | 11 +-
+ arch/x86/include/asm/cmpxchg_32.h | 68 +-
+ arch/x86/include/asm/cmpxchg_64.h | 40 +-
+ arch/x86/include/asm/cpufeature.h | 41 +-
+ arch/x86/include/asm/hw_breakpoint.h | 2 +-
+ arch/x86/include/asm/i387.h | 24 +-
+ arch/x86/include/asm/local64.h | 1 +
+ arch/x86/include/asm/mce.h | 4 +
+ arch/x86/include/asm/mrst.h | 26 +
+ arch/x86/include/asm/msr-index.h | 24 +-
+ arch/x86/include/asm/msr.h | 4 +-
+ arch/x86/include/asm/nmi.h | 2 +
+ arch/x86/include/asm/olpc_ofw.h | 31 +
+ arch/x86/include/asm/perf_event.h | 18 +-
+ arch/x86/include/asm/perf_event_p4.h | 99 +-
+ arch/x86/include/asm/processor.h | 20 +
+ arch/x86/include/asm/required-features.h | 2 +
+ arch/x86/include/asm/rwsem.h | 21 +-
+ arch/x86/include/asm/stacktrace.h | 49 +
+ arch/x86/include/asm/uv/uv_bau.h | 151 ++-
+ arch/x86/include/asm/xsave.h | 34 +-
+ arch/x86/kernel/Makefile | 1 +
+ arch/x86/kernel/acpi/realmode/wakeup.S | 2 +-
+ arch/x86/kernel/alternative.c | 1 +
+ arch/x86/kernel/amd_iommu.c | 8 +-
+ arch/x86/kernel/apb_timer.c | 37 +-
+ arch/x86/kernel/aperture_64.c | 4 +-
+ arch/x86/kernel/apic/Makefile | 7 +-
+ arch/x86/kernel/apic/es7000_32.c | 1 -
+ arch/x86/kernel/apic/hw_nmi.c | 107 ++
+ arch/x86/kernel/apic/nmi.c | 7 -
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/amd.c | 77 ++-
+ arch/x86/kernel/cpu/common.c | 28 +-
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 108 ++-
+ arch/x86/kernel/cpu/mcheck/mce.c | 34 +-
+ arch/x86/kernel/cpu/mcheck/mce_intel.c | 9 +-
+ arch/x86/kernel/cpu/mtrr/cleanup.c | 6 +-
+ arch/x86/kernel/cpu/mtrr/generic.c | 3 +-
+ arch/x86/kernel/cpu/mtrr/main.c | 56 +-
+ arch/x86/kernel/cpu/perf_event.c | 62 +-
+ arch/x86/kernel/cpu/perf_event_p4.c | 156 ++-
+ arch/x86/kernel/cpu/scattered.c | 63 ++
+ .../cpu/{addon_cpuid_features.c => topology.c} | 58 +-
+ arch/x86/kernel/dumpstack.c | 1 -
+ arch/x86/kernel/dumpstack.h | 56 -
+ arch/x86/kernel/dumpstack_32.c | 2 -
+ arch/x86/kernel/dumpstack_64.c | 1 -
+ arch/x86/kernel/entry_32.S | 2 +-
+ arch/x86/kernel/head_32.S | 6 +
+ arch/x86/kernel/head_64.S | 5 +-
+ arch/x86/kernel/hpet.c | 13 +-
+ arch/x86/kernel/hw_breakpoint.c | 51 +-
+ arch/x86/kernel/i387.c | 39 +-
+ arch/x86/kernel/kprobes.c | 33 +-
+ arch/x86/kernel/mrst.c | 105 ++-
+ arch/x86/kernel/olpc.c | 20 +-
+ arch/x86/kernel/olpc_ofw.c | 106 ++
+ arch/x86/kernel/process.c | 40 +-
+ arch/x86/kernel/process_32.c | 4 +
+ arch/x86/kernel/process_64.c | 5 +
+ arch/x86/kernel/setup.c | 6 +
+ arch/x86/kernel/smpboot.c | 7 +
+ arch/x86/kernel/stacktrace.c | 31 +-
+ arch/x86/kernel/tlb_uv.c | 740 +++++++++----
+ arch/x86/kernel/traps.c | 7 +
+ arch/x86/kernel/tsc.c | 5 +-
+ arch/x86/kernel/verify_cpu_64.S | 3 +-
+ arch/x86/kernel/vsyscall_64.c | 17 +-
+ arch/x86/kernel/xsave.c | 195 +++-
+ arch/x86/kvm/svm.c | 9 +-
+ arch/x86/kvm/vmx.c | 8 +-
+ arch/x86/kvm/x86.c | 2 +-
+ arch/x86/lib/clear_page_64.S | 2 +-
+ arch/x86/lib/copy_page_64.S | 2 +-
+ arch/x86/lib/copy_user_64.S | 2 +-
+ arch/x86/lib/memcpy_64.S | 2 +-
+ arch/x86/lib/memset_64.S | 2 +-
+ arch/x86/mm/dump_pagetables.c | 32 +-
+ arch/x86/mm/ioremap.c | 14 +-
+ arch/x86/mm/kmmio.c | 16 +-
+ arch/x86/mm/pat.c | 2 +-
+ arch/x86/mm/pf_in.c | 30 +-
+ arch/x86/mm/testmmiotrace.c | 22 +
+ arch/x86/mm/tlb.c | 4 +-
+ arch/x86/vdso/Makefile | 3 +-
+ arch/x86/vdso/checkundef.sh | 10 +
+ arch/x86/vdso/vdso32-setup.c | 2 +-
+ arch/x86/vdso/vma.c | 2 +-
+ arch/xtensa/Kconfig | 3 -
+ arch/xtensa/include/asm/local64.h | 1 +
+ drivers/Makefile | 4 +-
+ drivers/acpi/acpi_pad.c | 2 +-
+ drivers/acpi/processor_idle.c | 2 +-
+ drivers/clocksource/acpi_pm.c | 9 +-
+ drivers/input/misc/ixp4xx-beeper.c | 3 +-
+ drivers/macintosh/via-pmu.c | 9 +-
+ drivers/misc/Kconfig | 4 +-
+ drivers/pci/intel-iommu.c | 2 +
+ drivers/xen/events.c | 1 +
+ fs/exec.c | 1 +
+ fs/file.c | 3 -
+ fs/partitions/check.c | 1 -
+ include/asm-generic/local64.h | 96 ++
+ include/asm-generic/vmlinux.lds.h | 4 -
+ include/linux/clocksource.h | 17 +-
+ include/linux/compiler.h | 2 +
+ include/linux/cpu.h | 25 +
+ include/linux/cpuset.h | 6 +
+ include/linux/delay.h | 6 +
+ include/linux/fdtable.h | 1 +
+ include/linux/ftrace.h | 5 +
+ include/linux/ftrace_event.h | 18 +-
+ include/linux/interrupt.h | 7 +-
+ include/linux/io.h | 4 +-
+ include/linux/iommu.h | 1 +
+ include/linux/kernel.h | 12 +-
+ include/linux/kmemtrace.h | 25 -
+ include/linux/nmi.h | 13 +
+ include/linux/perf_event.h | 97 +-
+ include/linux/rcupdate.h | 82 ++
+ include/linux/sched.h | 83 +-
+ include/linux/slab_def.h | 3 +-
+ include/linux/slub_def.h | 3 +-
+ include/linux/syscalls.h | 2 -
+ include/linux/time.h | 21 +-
+ include/linux/topology.h | 1 +
+ include/linux/vmalloc.h | 2 +-
+ include/linux/workqueue.h | 4 +
+ include/trace/boot.h | 60 -
+ include/trace/events/sched.h | 32 +-
+ include/trace/events/timer.h | 80 +-
+ include/trace/ftrace.h | 23 +-
+ include/trace/syscall.h | 1 -
+ init/main.c | 29 +-
+ kernel/Makefile | 2 +-
+ kernel/cpu.c | 6 -
+ kernel/cpuset.c | 21 +-
+ kernel/debug/kdb/kdb_main.c | 4 +-
+ kernel/fork.c | 2 +-
+ kernel/hrtimer.c | 17 +-
+ kernel/hw_breakpoint.c | 78 +-
+ kernel/irq/manage.c | 2 +-
+ kernel/lockdep.c | 2 +-
+ kernel/perf_event.c | 460 ++++----
+ kernel/posix-cpu-timers.c | 36 +-
+ kernel/posix-timers.c | 11 +-
+ kernel/rcupdate.c | 160 +++
+ kernel/rcutiny.c | 2 +
+ kernel/rcutorture.c | 3 +-
+ kernel/rcutree.c | 2 +
+ kernel/sched.c | 397 +++++--
+ kernel/sched_clock.c | 95 ++-
+ kernel/sched_cpupri.c | 8 +-
+ kernel/sched_cpupri.h | 2 +-
+ kernel/sched_debug.c | 2 +-
+ kernel/sched_fair.c | 532 +++++++---
+ kernel/sched_rt.c | 3 -
+ kernel/sched_stats.h | 27 +-
+ kernel/softlockup.c | 293 -----
+ kernel/sysctl.c | 55 +-
+ kernel/time.c | 16 -
+ kernel/time/Kconfig | 4 +-
+ kernel/time/clocksource.c | 33 +-
+ kernel/time/tick-sched.c | 10 +-
+ kernel/time/timekeeping.c | 79 +-
+ kernel/timer.c | 40 +-
+ kernel/trace/Kconfig | 72 +--
+ kernel/trace/Makefile | 4 -
+ kernel/trace/ftrace.c | 5 +-
+ kernel/trace/kmemtrace.c | 529 ---------
+ kernel/trace/ring_buffer.c | 40 +-
+ kernel/trace/trace.c | 127 +--
+ kernel/trace/trace.h | 90 +--
+ kernel/trace/trace_boot.c | 185 ----
+ kernel/trace/trace_clock.c | 7 +-
+ kernel/trace/trace_entries.h | 94 --
+ kernel/trace/trace_event_perf.c | 27 +-
+ kernel/trace/trace_events.c | 299 +++---
+ kernel/trace/trace_events_filter.c | 27 +-
+ kernel/trace/trace_export.c | 8 +-
+ kernel/trace/trace_functions.c | 6 +-
+ kernel/trace/trace_functions_graph.c | 3 +-
+ kernel/trace/trace_irqsoff.c | 3 +
+ kernel/trace/trace_kprobe.c | 380 +++++--
+ kernel/trace/trace_ksym.c | 508 ---------
+ kernel/trace/trace_output.c | 69 --
+ kernel/trace/trace_sched_wakeup.c | 7 +-
+ kernel/trace/trace_selftest.c | 87 --
+ kernel/trace/trace_stack.c | 6 +-
+ kernel/trace/trace_syscalls.c | 7 +-
+ kernel/trace/trace_sysprof.c | 329 ------
+ kernel/watchdog.c | 567 ++++++++++
+ kernel/workqueue.c | 15 +
+ kernel/workqueue_sched.h | 16 +
+ lib/Kconfig.debug | 41 +-
+ lib/ioremap.c | 10 +-
+ mm/backing-dev.c | 1 -
+ mm/mmap.c | 6 +-
+ mm/slab.c | 1 -
+ mm/slob.c | 5 +-
+ mm/slub.c | 1 -
+ mm/vmalloc.c | 2 +-
+ scripts/package/Makefile | 37 +-
+ scripts/recordmcount.pl | 2 +-
+ tools/perf/.gitignore | 2 +
+ tools/perf/Documentation/perf-buildid-cache.txt | 8 +-
+ tools/perf/Documentation/perf-probe.txt | 8 +-
+ tools/perf/Documentation/perf-record.txt | 13 +
+ tools/perf/Documentation/perf-stat.txt | 7 +
+ tools/perf/Documentation/perf-top.txt | 8 +-
+ tools/perf/MANIFEST | 12 +
+ tools/perf/Makefile | 113 +-
+ tools/perf/arch/sh/Makefile | 4 +
+ tools/perf/arch/sh/util/dwarf-regs.c | 55 +
+ tools/perf/builtin-annotate.c | 6 +-
+ tools/perf/builtin-buildid-cache.c | 3 +-
+ tools/perf/builtin-buildid-list.c | 4 +-
+ tools/perf/builtin-diff.c | 9 +-
+ tools/perf/builtin-probe.c | 3 +-
+ tools/perf/builtin-record.c | 81 +-
+ tools/perf/builtin-report.c | 27 +-
+ tools/perf/builtin-stat.c | 14 +-
+ tools/perf/builtin-top.c | 20 +-
+ tools/perf/builtin-trace.c | 32 +-
+ tools/perf/feature-tests.mak | 119 ++
+ tools/perf/perf-archive.sh | 20 +-
+ tools/perf/perf.c | 2 +
+ .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 30 +
+ .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 184 +++
+ .../perf/scripts/python/bin/sched-migration-record | 2 +
+ .../perf/scripts/python/bin/sched-migration-report | 3 +
+ tools/perf/scripts/python/sched-migration.py | 461 ++++++++
+ tools/perf/util/build-id.c | 28 +-
+ tools/perf/util/cache.h | 1 +
+ tools/perf/util/callchain.c | 2 +-
+ tools/perf/util/callchain.h | 2 +-
+ tools/perf/util/config.c | 64 ++-
+ tools/perf/util/cpumap.c | 57 +-
+ tools/perf/util/cpumap.h | 2 +-
+ tools/perf/util/debug.c | 10 +-
+ tools/perf/util/event.c | 79 +-
+ tools/perf/util/event.h | 5 +-
+ tools/perf/util/header.c | 13 +-
+ tools/perf/util/hist.c | 212 +++--
+ tools/perf/util/hist.h | 30 +-
+ tools/perf/util/map.c | 81 +-
+ tools/perf/util/map.h | 4 +-
+ tools/perf/util/newt.c | 1164 +++++++++++++-------
+ tools/perf/util/parse-events.c | 11 +-
+ tools/perf/util/probe-event.c | 271 ++++--
+ tools/perf/util/probe-event.h | 29 +-
+ tools/perf/util/probe-finder.c | 248 ++++-
+ tools/perf/util/probe-finder.h | 10 +-
+ tools/perf/util/session.c | 54 +-
+ tools/perf/util/sort.c | 40 +-
+ tools/perf/util/sort.h | 22 +-
+ tools/perf/util/symbol.c | 256 +++--
+ tools/perf/util/symbol.h | 16 +-
+ tools/perf/util/thread.c | 7 +
+ tools/perf/util/thread.h | 2 +
+ tools/perf/util/util.h | 3 +
+ 336 files changed, 8828 insertions(+), 6177 deletions(-)
+ delete mode 100644 Documentation/ABI/testing/debugfs-kmemtrace
+ delete mode 100644 Documentation/trace/kmemtrace.txt
+ create mode 100644 arch/alpha/include/asm/local64.h
+ create mode 100644 arch/arm/include/asm/local64.h
+ create mode 100644 arch/avr32/include/asm/local64.h
+ create mode 100644 arch/blackfin/include/asm/local64.h
+ create mode 100644 arch/cris/include/asm/local64.h
+ create mode 100644 arch/frv/include/asm/local64.h
+ create mode 100644 arch/frv/kernel/local64.h
+ create mode 100644 arch/h8300/include/asm/local64.h
+ create mode 100644 arch/ia64/include/asm/local64.h
+ create mode 100644 arch/m32r/include/asm/local64.h
+ create mode 100644 arch/m68k/include/asm/local64.h
+ create mode 100644 arch/microblaze/include/asm/local64.h
+ create mode 100644 arch/mips/include/asm/local64.h
+ create mode 100644 arch/mn10300/include/asm/local64.h
+ create mode 100644 arch/parisc/include/asm/local64.h
+ create mode 100644 arch/powerpc/include/asm/local64.h
+ create mode 100644 arch/s390/include/asm/local64.h
+ create mode 100644 arch/score/include/asm/local64.h
+ create mode 100644 arch/sh/include/asm/local64.h
+ create mode 100644 arch/sparc/include/asm/local64.h
+ create mode 100644 arch/x86/include/asm/local64.h
+ create mode 100644 arch/x86/include/asm/olpc_ofw.h
+ create mode 100644 arch/x86/kernel/apic/hw_nmi.c
+ create mode 100644 arch/x86/kernel/cpu/scattered.c
+ rename arch/x86/kernel/cpu/{addon_cpuid_features.c => topology.c} (66%)
+ delete mode 100644 arch/x86/kernel/dumpstack.h
+ create mode 100644 arch/x86/kernel/olpc_ofw.c
+ create mode 100755 arch/x86/vdso/checkundef.sh
+ create mode 100644 arch/xtensa/include/asm/local64.h
+ create mode 100644 include/asm-generic/local64.h
+ delete mode 100644 include/linux/kmemtrace.h
+ delete mode 100644 include/trace/boot.h
+ delete mode 100644 kernel/softlockup.c
+ delete mode 100644 kernel/trace/kmemtrace.c
+ delete mode 100644 kernel/trace/trace_boot.c
+ delete mode 100644 kernel/trace/trace_ksym.c
+ delete mode 100644 kernel/trace/trace_sysprof.c
+ create mode 100644 kernel/watchdog.c
+ create mode 100644 kernel/workqueue_sched.h
+ create mode 100644 tools/perf/MANIFEST
+ create mode 100644 tools/perf/arch/sh/Makefile
+ create mode 100644 tools/perf/arch/sh/util/dwarf-regs.c
+ create mode 100644 tools/perf/feature-tests.mak
+ create mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py
+ create mode 100644 tools/perf/scripts/python/bin/sched-migration-record
+ create mode 100644 tools/perf/scripts/python/bin/sched-migration-report
+ create mode 100644 tools/perf/scripts/python/sched-migration.py
+Merging lost-spurious-irq/lost-spurious-irq
+$ git merge lost-spurious-irq/lost-spurious-irq
+Resolved 'drivers/ata/sata_fsl.c' using previous resolution.
+Resolved 'drivers/ata/sata_mv.c' using previous resolution.
+Resolved 'drivers/ata/sata_nv.c' using previous resolution.
+Auto-merging arch/arm/mach-bcmring/core.c
+Auto-merging arch/arm/mach-ep93xx/core.c
+Auto-merging arch/arm/mach-integrator/integrator_ap.c
+Auto-merging arch/arm/plat-iop/time.c
+Auto-merging arch/ia64/kernel/time.c
+Auto-merging drivers/ata/libata-core.c
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging drivers/ata/sata_fsl.c
+CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c
+Auto-merging drivers/ata/sata_mv.c
+CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
+Auto-merging drivers/ata/sata_nv.c
+CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c
+Auto-merging drivers/clocksource/sh_cmt.c
+Auto-merging include/linux/interrupt.h
+Auto-merging kernel/irq/manage.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 63a7dc5] Merge remote branch 'lost-spurious-irq/lost-spurious-irq'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-aaec2000/core.c | 2 +-
+ arch/arm/mach-at91/at91rm9200_time.c | 2 +-
+ arch/arm/mach-at91/at91sam926x_time.c | 2 +-
+ arch/arm/mach-bcmring/core.c | 2 +-
+ arch/arm/mach-clps711x/time.c | 2 +-
+ arch/arm/mach-cns3xxx/core.c | 2 +-
+ arch/arm/mach-ebsa110/core.c | 2 +-
+ arch/arm/mach-ep93xx/core.c | 2 +-
+ arch/arm/mach-footbridge/dc21285-timer.c | 2 +-
+ arch/arm/mach-footbridge/isa-timer.c | 2 +-
+ arch/arm/mach-h720x/cpu-h7201.c | 2 +-
+ arch/arm/mach-h720x/cpu-h7202.c | 2 +-
+ arch/arm/mach-integrator/integrator_ap.c | 2 +-
+ arch/arm/mach-ixp2000/core.c | 2 +-
+ arch/arm/mach-ixp23xx/core.c | 2 +-
+ arch/arm/mach-ixp4xx/common.c | 2 +-
+ arch/arm/mach-lh7a40x/time.c | 2 +-
+ arch/arm/mach-mmp/time.c | 2 +-
+ arch/arm/mach-netx/time.c | 2 +-
+ arch/arm/mach-ns9xxx/irq.c | 3 -
+ arch/arm/mach-ns9xxx/time-ns9360.c | 2 +-
+ arch/arm/mach-nuc93x/time.c | 2 +-
+ arch/arm/mach-omap1/time.c | 2 +-
+ arch/arm/mach-omap1/timer32k.c | 2 +-
+ arch/arm/mach-omap2/timer-gp.c | 2 +-
+ arch/arm/mach-pnx4008/time.c | 2 +-
+ arch/arm/mach-pxa/time.c | 2 +-
+ arch/arm/mach-sa1100/time.c | 2 +-
+ arch/arm/mach-shark/core.c | 2 +-
+ arch/arm/mach-u300/timer.c | 2 +-
+ arch/arm/mach-w90x900/time.c | 2 +-
+ arch/arm/plat-iop/time.c | 2 +-
+ arch/arm/plat-mxc/time.c | 2 +-
+ arch/arm/plat-samsung/time.c | 2 +-
+ arch/arm/plat-versatile/timer-sp.c | 2 +-
+ arch/blackfin/kernel/time-ts.c | 6 +-
+ arch/ia64/kernel/time.c | 2 +-
+ arch/parisc/kernel/irq.c | 2 +-
+ arch/powerpc/platforms/cell/interrupt.c | 5 +-
+ arch/x86/kernel/time.c | 2 +-
+ drivers/ata/libata-core.c | 54 ++-
+ drivers/ata/libata-eh.c | 4 +-
+ drivers/ata/libata-sff.c | 37 +-
+ drivers/ata/sata_fsl.c | 8 +-
+ drivers/ata/sata_mv.c | 25 +-
+ drivers/ata/sata_nv.c | 57 +--
+ drivers/clocksource/sh_cmt.c | 3 +-
+ drivers/clocksource/sh_mtu2.c | 3 +-
+ drivers/clocksource/sh_tmu.c | 3 +-
+ drivers/usb/core/hcd.c | 1 +
+ include/linux/interrupt.h | 43 +-
+ include/linux/irq.h | 40 +-
+ include/linux/libata.h | 2 +
+ kernel/irq/chip.c | 20 +-
+ kernel/irq/handle.c | 7 +-
+ kernel/irq/internals.h | 10 +-
+ kernel/irq/manage.c | 18 +-
+ kernel/irq/proc.c | 5 +-
+ kernel/irq/spurious.c | 978 +++++++++++++++++++++++++-----
+ 59 files changed, 1062 insertions(+), 344 deletions(-)
+Merging edac-amd/for-next
+$ git merge edac-amd/for-next
+Already up-to-date.
+Merging oprofile/for-next
+$ git merge oprofile/for-next
+Merge made by recursive.
+ arch/x86/oprofile/nmi_int.c | 16 ++++++++++++++--
+ drivers/oprofile/event_buffer.c | 3 ++-
+ 2 files changed, 16 insertions(+), 3 deletions(-)
+Merging percpu/for-next
+$ git merge percpu/for-next
+Already up-to-date.
+Merging workqueues/for-next
+$ git merge workqueues/for-next
+Recorded preimage for 'fs/cifs/cifsfs.c'
+Resolved 'fs/cifs/cifsglob.h' using previous resolution.
+Resolved 'fs/cifs/file.c' using previous resolution.
+Resolved 'include/linux/libata.h' using previous resolution.
+Resolved 'include/linux/workqueue.h' using previous resolution.
+Resolved 'kernel/trace/Kconfig' using previous resolution.
+Resolved 'kernel/workqueue.c' using previous resolution.
+Removing Documentation/slow-work.txt
+Auto-merging arch/x86/kernel/smpboot.c
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/ata/libata-core.c
+Auto-merging drivers/ata/libata-eh.c
+Auto-merging drivers/ata/libata-scsi.c
+Auto-merging drivers/ata/libata-sff.c
+Auto-merging drivers/gpu/drm/drm_crtc_helper.c
+Auto-merging drivers/media/video/ivtv/ivtv-driver.c
+Auto-merging drivers/media/video/ivtv/ivtv-driver.h
+Auto-merging fs/cifs/Kconfig
+Auto-merging fs/cifs/cifsfs.c
+CONFLICT (content): Merge conflict in fs/cifs/cifsfs.c
+Auto-merging fs/cifs/cifsglob.h
+CONFLICT (content): Merge conflict in fs/cifs/cifsglob.h
+Auto-merging fs/cifs/dir.c
+Auto-merging fs/cifs/file.c
+CONFLICT (content): Merge conflict in fs/cifs/file.c
+Auto-merging fs/gfs2/incore.h
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/sys.c
+Auto-merging include/linux/libata.h
+CONFLICT (content): Merge conflict in include/linux/libata.h
+Removing include/linux/slow-work.h
+Auto-merging include/linux/workqueue.h
+CONFLICT (content): Merge conflict in include/linux/workqueue.h
+Removing include/trace/events/workqueue.h
+Auto-merging init/Kconfig
+Auto-merging init/main.c
+Auto-merging kernel/Makefile
+Removing kernel/slow-work-debugfs.c
+Removing kernel/slow-work.c
+Removing kernel/slow-work.h
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/trace/Kconfig
+CONFLICT (content): Merge conflict in kernel/trace/Kconfig
+Auto-merging kernel/workqueue.c
+CONFLICT (content): Merge conflict in kernel/workqueue.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/cifs/cifsfs.c'.
+[master 0bc2c93] Merge remote branch 'workqueues/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/caching/fscache.txt | 10 +-
+ Documentation/slow-work.txt | 322 ---
+ arch/ia64/kernel/smpboot.c | 2 +-
+ arch/x86/kernel/smpboot.c | 2 +-
+ drivers/acpi/osl.c | 40 +-
+ drivers/ata/libata-core.c | 20 +-
+ drivers/ata/libata-eh.c | 4 +-
+ drivers/ata/libata-scsi.c | 10 +-
+ drivers/ata/libata-sff.c | 9 +-
+ drivers/ata/libata.h | 1 -
+ drivers/gpu/drm/drm_crtc_helper.c | 29 +-
+ drivers/media/video/ivtv/ivtv-driver.c | 26 +-
+ drivers/media/video/ivtv/ivtv-driver.h | 8 +-
+ drivers/media/video/ivtv/ivtv-irq.c | 15 +-
+ drivers/media/video/ivtv/ivtv-irq.h | 2 +-
+ fs/cachefiles/namei.c | 13 +-
+ fs/cachefiles/rdwr.c | 4 +-
+ fs/cifs/Kconfig | 1 -
+ fs/cifs/cifsfs.c | 5 -
+ fs/cifs/cifsglob.h | 8 +-
+ fs/cifs/dir.c | 2 +-
+ fs/cifs/file.c | 30 +-
+ fs/cifs/misc.c | 20 +-
+ fs/fscache/Kconfig | 1 -
+ fs/fscache/internal.h | 8 +
+ fs/fscache/main.c | 106 +-
+ fs/fscache/object-list.c | 11 +-
+ fs/fscache/object.c | 106 +-
+ fs/fscache/operation.c | 67 +-
+ fs/fscache/page.c | 36 +-
+ fs/gfs2/Kconfig | 1 -
+ fs/gfs2/incore.h | 3 +-
+ fs/gfs2/main.c | 14 +-
+ fs/gfs2/ops_fstype.c | 8 +-
+ fs/gfs2/recovery.c | 54 +-
+ fs/gfs2/recovery.h | 6 +-
+ fs/gfs2/sys.c | 3 +-
+ include/drm/drm_crtc.h | 3 +-
+ include/linux/cpu.h | 2 +
+ include/linux/fscache-cache.h | 47 +-
+ include/linux/kthread.h | 65 +
+ include/linux/libata.h | 1 +
+ include/linux/slow-work.h | 163 --
+ include/linux/workqueue.h | 154 +-
+ include/trace/events/workqueue.h | 92 -
+ init/Kconfig | 24 -
+ init/main.c | 2 -
+ kernel/Makefile | 2 -
+ kernel/async.c | 141 +-
+ kernel/kthread.c | 164 ++
+ kernel/power/process.c | 21 +-
+ kernel/slow-work-debugfs.c | 227 --
+ kernel/slow-work.c | 1068 ---------
+ kernel/slow-work.h | 72 -
+ kernel/sysctl.c | 8 -
+ kernel/trace/Kconfig | 11 -
+ kernel/workqueue.c | 3160 +++++++++++++++++++++----
+ kernel/workqueue_sched.h | 13 +-
+ 58 files changed, 3505 insertions(+), 2942 deletions(-)
+ delete mode 100644 Documentation/slow-work.txt
+ delete mode 100644 include/linux/slow-work.h
+ delete mode 100644 include/trace/events/workqueue.h
+ delete mode 100644 kernel/slow-work-debugfs.c
+ delete mode 100644 kernel/slow-work.c
+ delete mode 100644 kernel/slow-work.h
+Merging sfi/sfi-test
+$ git merge sfi/sfi-test
+Already up-to-date.
+Merging asm-generic/next
+$ git merge asm-generic/next
+Already up-to-date.
+Merging drivers-x86/linux-next
+$ git merge drivers-x86/linux-next
+Already up-to-date.
+Merging hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Resolved 'mm/memory-failure.c' using previous resolution.
+Auto-merging mm/memory-failure.c
+CONFLICT (content): Merge conflict in mm/memory-failure.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 5f47dfe] Merge remote branch 'hwpoison/hwpoison'
+$ git diff -M --stat --summary HEAD^..
+ include/linux/hugetlb.h | 14 +---
+ include/linux/hugetlb_inline.h | 22 +++++++
+ include/linux/pagemap.h | 9 +++-
+ include/linux/poison.h | 9 ---
+ include/linux/rmap.h | 5 ++
+ mm/hugetlb.c | 104 ++++++++++++++++++++++++++++++++++-
+ mm/hwpoison-inject.c | 15 +++--
+ mm/memory-failure.c | 120 ++++++++++++++++++++++++++++++----------
+ mm/rmap.c | 59 ++++++++++++++++++++
+ 9 files changed, 299 insertions(+), 58 deletions(-)
+ create mode 100644 include/linux/hugetlb_inline.h
+Merging sysctl/master
+$ git merge sysctl/master
+Already up-to-date.
+Merging bkl-core/bkl/core
+$ git merge bkl-core/bkl/core
+Auto-merging fs/exec.c
+Auto-merging init/main.c
+Auto-merging kernel/trace/trace.c
+Merge made by recursive.
+ fs/exec.c | 7 -------
+ init/main.c | 5 -----
+ kernel/trace/trace.c | 8 --------
+ 3 files changed, 0 insertions(+), 20 deletions(-)
+Merging bkl-procfs/bkl/procfs
+$ git merge bkl-procfs/bkl/procfs
+Already up-to-date.
+Merging bkl-ioctl/bkl/ioctl
+$ git merge bkl-ioctl/bkl/ioctl
+Auto-merging net/sunrpc/cache.c
+Merge made by recursive.
+ fs/ncpfs/ioctl.c | 1 -
+ net/sunrpc/cache.c | 1 -
+ 2 files changed, 0 insertions(+), 2 deletions(-)
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Auto-merging drivers/base/platform.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging include/linux/device.h
+Auto-merging kernel/cgroup.c
+Auto-merging kernel/sysctl.c
+Auto-merging lib/Kconfig.debug
+Merge made by recursive.
+ Documentation/DocBook/device-drivers.tmpl | 1 +
+ Documentation/filesystems/sysfs.txt | 46 +++--
+ Documentation/firmware_class/hotplug-script | 17 +-
+ arch/powerpc/sysdev/mv64x60_pci.c | 1 -
+ drivers/base/bus.c | 2 +-
+ drivers/base/dd.c | 4 +
+ drivers/base/dma-coherent.c | 2 +-
+ drivers/base/firmware_class.c | 262 +++++++++++++--------------
+ drivers/base/platform.c | 110 +++--------
+ drivers/firmware/dcdbas.c | 5 +-
+ drivers/firmware/dmi-id.c | 4 +-
+ drivers/leds/leds-bd2802.c | 4 +-
+ drivers/regulator/core.c | 1 -
+ drivers/scsi/arcmsr/arcmsr_attr.c | 3 -
+ drivers/scsi/lpfc/lpfc_attr.c | 1 -
+ drivers/uio/uio_cif.c | 2 +-
+ drivers/uio/uio_pdrv_genirq.c | 1 -
+ drivers/uio/uio_sercos3.c | 2 +-
+ fs/sysfs/file.c | 3 +-
+ include/linux/device.h | 13 +-
+ include/linux/platform_device.h | 62 ++++++-
+ include/linux/sysfs.h | 12 +-
+ kernel/cgroup.c | 13 ++-
+ kernel/sysctl.c | 2 +-
+ lib/Kconfig.debug | 1 -
+ 25 files changed, 286 insertions(+), 288 deletions(-)
+Merging quilt/tty
+$ git merge quilt/tty
+Recorded preimage for 'drivers/char/vt.c'
+Resolved 'include/linux/serial_core.h' using previous resolution.
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging drivers/char/Makefile
+Auto-merging drivers/char/keyboard.c
+Auto-merging drivers/char/synclink_gt.c
+Auto-merging drivers/char/vt.c
+CONFLICT (content): Merge conflict in drivers/char/vt.c
+Auto-merging drivers/gpu/drm/i915/intel_fb.c
+Auto-merging drivers/gpu/drm/nouveau/nouveau_fbcon.c
+Auto-merging drivers/serial/68328serial.c
+Auto-merging drivers/serial/68360serial.c
+Auto-merging drivers/serial/8250.c
+Auto-merging drivers/serial/Kconfig
+Auto-merging drivers/usb/class/cdc-acm.c
+Auto-merging drivers/video/console/fbcon.c
+Auto-merging fs/compat_ioctl.c
+Auto-merging include/linux/fb.h
+Auto-merging include/linux/serial_core.h
+CONFLICT (content): Merge conflict in include/linux/serial_core.h
+Auto-merging lib/Kconfig.debug
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/char/vt.c'.
+[master 87dce98] Merge branch 'quilt/tty'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kernel-parameters.txt | 3 +
+ arch/alpha/include/asm/ioctls.h | 4 +-
+ arch/alpha/include/asm/termbits.h | 1 +
+ arch/arm/include/asm/ioctls.h | 2 +
+ arch/arm/include/asm/termbits.h | 1 +
+ arch/avr32/include/asm/ioctls.h | 4 +-
+ arch/avr32/include/asm/termbits.h | 1 +
+ arch/cris/include/asm/ioctls.h | 4 +-
+ arch/cris/include/asm/termbits.h | 1 +
+ arch/frv/include/asm/ioctls.h | 2 +
+ arch/frv/include/asm/termbits.h | 1 +
+ arch/h8300/include/asm/ioctls.h | 2 +
+ arch/h8300/include/asm/termbits.h | 1 +
+ arch/ia64/include/asm/ioctls.h | 4 +-
+ arch/ia64/include/asm/termbits.h | 1 +
+ arch/m32r/include/asm/ioctls.h | 4 +-
+ arch/m32r/include/asm/termbits.h | 1 +
+ arch/m68k/include/asm/ioctls.h | 2 +
+ arch/m68k/include/asm/termbits.h | 1 +
+ arch/mips/include/asm/ioctls.h | 5 +-
+ arch/mips/include/asm/termbits.h | 1 +
+ arch/mn10300/include/asm/ioctls.h | 4 +-
+ arch/mn10300/include/asm/termbits.h | 1 +
+ arch/parisc/include/asm/ioctls.h | 4 +-
+ arch/parisc/include/asm/termbits.h | 1 +
+ arch/powerpc/include/asm/ioctls.h | 2 +
+ arch/powerpc/include/asm/termbits.h | 1 +
+ arch/s390/include/asm/ioctls.h | 2 +
+ arch/sh/include/asm/ioctls.h | 2 +
+ arch/sparc/include/asm/ioctls.h | 2 +
+ arch/sparc/include/asm/termbits.h | 1 +
+ arch/xtensa/include/asm/ioctls.h | 2 +
+ arch/xtensa/include/asm/termbits.h | 1 +
+ drivers/char/Makefile | 1 +
+ drivers/char/amiserial.c | 25 +-
+ drivers/char/briq_panel.c | 6 +-
+ drivers/char/cyclades.c | 22 +-
+ drivers/char/epca.c | 4 +-
+ drivers/char/ip2/ip2main.c | 4 +
+ drivers/char/isicom.c | 13 +-
+ drivers/char/istallion.c | 68 +-
+ drivers/char/keyboard.c | 10 +-
+ drivers/char/mxser.c | 2 +-
+ drivers/char/n_gsm.c | 1 -
+ drivers/char/n_hdlc.c | 16 +-
+ drivers/char/n_r3964.c | 10 +-
+ drivers/char/n_tty.c | 17 +-
+ drivers/char/nozomi.c | 4 +-
+ drivers/char/pty.c | 47 +-
+ drivers/char/riscom8.c | 14 +-
+ drivers/char/rocket.c | 28 +-
+ drivers/char/selection.c | 13 +-
+ drivers/char/serial167.c | 8 +-
+ drivers/char/specialix.c | 13 +-
+ drivers/char/stallion.c | 20 +-
+ drivers/char/sx.c | 12 +-
+ drivers/char/synclink.c | 21 +-
+ drivers/char/synclink_gt.c | 92 +-
+ drivers/char/synclinkmp.c | 43 +-
+ drivers/char/tty_io.c | 150 ++--
+ drivers/char/tty_ioctl.c | 18 +-
+ drivers/char/tty_ldisc.c | 43 +-
+ drivers/char/tty_mutex.c | 47 +
+ drivers/char/tty_port.c | 4 +-
+ drivers/char/vc_screen.c | 4 +-
+ drivers/char/vt.c | 37 +-
+ drivers/char/vt_ioctl.c | 17 +-
+ drivers/gpu/drm/i915/intel_fb.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 +
+ drivers/gpu/drm/radeon/radeon_fb.c | 2 +-
+ drivers/serial/21285.c | 10 +-
+ drivers/serial/68328serial.c | 18 +-
+ drivers/serial/68360serial.c | 4 +-
+ drivers/serial/8250.c | 46 +-
+ drivers/serial/8250_early.c | 57 +-
+ drivers/serial/8250_pci.c | 13 +
+ drivers/serial/Kconfig | 44 +
+ drivers/serial/Makefile | 4 +
+ drivers/serial/altera_uart.c | 2 +-
+ drivers/serial/atmel_serial.c | 11 +-
+ drivers/serial/bfin_5xx.c | 7 +-
+ drivers/serial/crisv10.c | 12 +-
+ drivers/serial/imx.c | 10 +-
+ drivers/serial/ioc3_serial.c | 9 +-
+ drivers/serial/ioc4_serial.c | 9 +-
+ drivers/serial/max3100.c | 7 +-
+ drivers/serial/max3107-aava.c | 344 +++++++
+ drivers/serial/max3107.c | 1197 ++++++++++++++++++++++++
+ drivers/serial/max3107.h | 441 +++++++++
+ drivers/serial/mcf.c | 31 +-
+ drivers/serial/mfd.c | 1498 +++++++++++++++++++++++++++++++
+ drivers/serial/mrst_max3110.c | 844 +++++++++++++++++
+ drivers/serial/mrst_max3110.h | 59 ++
+ drivers/serial/serial_core.c | 288 +++----
+ drivers/serial/timbuart.c | 6 +-
+ drivers/usb/class/cdc-acm.c | 12 +-
+ drivers/usb/serial/digi_acceleport.c | 14 +-
+ drivers/video/console/fbcon.c | 4 +-
+ drivers/video/console/vgacon.c | 2 -
+ fs/compat_ioctl.c | 1 +
+ include/asm-generic/ioctls.h | 8 +-
+ include/asm-generic/termbits.h | 1 +
+ include/linux/console_struct.h | 4 +-
+ include/linux/fb.h | 4 +
+ include/linux/istallion.h | 2 +-
+ include/linux/serial.h | 9 +-
+ include/linux/serial_8250.h | 5 +
+ include/linux/serial_core.h | 11 +-
+ include/linux/serial_mfd.h | 47 +
+ include/linux/serial_reg.h | 16 +
+ include/linux/tty.h | 68 ++
+ include/linux/vt_kern.h | 64 ++-
+ lib/Kconfig.debug | 10 +
+ 113 files changed, 5524 insertions(+), 639 deletions(-)
+ create mode 100644 drivers/char/tty_mutex.c
+ create mode 100644 drivers/serial/max3107-aava.c
+ create mode 100644 drivers/serial/max3107.c
+ create mode 100644 drivers/serial/max3107.h
+ create mode 100644 drivers/serial/mfd.c
+ create mode 100644 drivers/serial/mrst_max3110.c
+ create mode 100644 drivers/serial/mrst_max3110.h
+ create mode 100644 include/linux/serial_mfd.h
+Merging quilt/usb
+$ git merge quilt/usb
+Recorded preimage for 'Documentation/usb/linux.inf'
+Renaming arch/arm/mach-mx2/mach-pca100.c => arch/arm/mach-imx/mach-pca100.c
+Auto-merging arch/arm/mach-imx/mach-pca100.c
+Auto-merging Documentation/usb/linux.inf
+CONFLICT (content): Merge conflict in Documentation/usb/linux.inf
+Auto-merging arch/arm/mach-mx3/mach-armadillo5x0.c
+Auto-merging arch/arm/mach-mx3/mach-mx31lilly.c
+Auto-merging arch/arm/mach-mx3/mach-mx31lite.c
+Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c
+Auto-merging arch/arm/mach-mx3/mach-pcm037.c
+Auto-merging arch/arm/mach-mx3/mach-pcm043.c
+Auto-merging arch/arm/mach-mx3/mx31moboard-smartbot.c
+Auto-merging drivers/net/e1000e/netdev.c
+Auto-merging drivers/net/r8169.c
+Auto-merging drivers/usb/atm/cxacru.c
+Auto-merging drivers/usb/atm/speedtch.c
+Auto-merging drivers/usb/atm/ueagle-atm.c
+Auto-merging drivers/usb/class/usblp.c
+Auto-merging drivers/usb/core/hcd.c
+Auto-merging drivers/usb/gadget/gmidi.c
+Auto-merging drivers/usb/gadget/webcam.c
+Auto-merging drivers/usb/host/ohci-hcd.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'Documentation/usb/linux.inf'.
+[master a6dab55] Merge branch 'quilt/usb'
+$ git diff -M --stat --summary HEAD^..
+ .../testing/sysfs-devices-platform-_UDC_-gadget | 12 +
+ Documentation/usb/ehci.txt | 2 +-
+ Documentation/usb/gadget_multi.txt | 150 +++
+ Documentation/usb/gadget_serial.txt | 87 +--
+ Documentation/usb/hotplug.txt | 4 +-
+ Documentation/usb/linux-cdc-acm.inf | 107 ++
+ Documentation/usb/linux.inf | 228 +---
+ arch/arm/mach-imx/mach-pca100.c | 4 +-
+ arch/arm/mach-mx3/mach-armadillo5x0.c | 4 +-
+ arch/arm/mach-mx3/mach-mx31lilly.c | 4 +-
+ arch/arm/mach-mx3/mach-mx31lite.c | 2 +-
+ arch/arm/mach-mx3/mach-mx31moboard.c | 2 +-
+ arch/arm/mach-mx3/mach-pcm037.c | 4 +-
+ arch/arm/mach-mx3/mach-pcm043.c | 2 +-
+ arch/arm/mach-mx3/mx31moboard-smartbot.c | 2 +-
+ .../arm/plat-samsung/include/plat/regs-usb-hsotg.h | 2 +
+ drivers/staging/usbip/vhci_hcd.c | 6 +-
+ drivers/usb/Makefile | 2 +-
+ drivers/usb/atm/cxacru.c | 11 +-
+ drivers/usb/atm/speedtch.c | 10 +-
+ drivers/usb/atm/ueagle-atm.c | 5 +-
+ drivers/usb/atm/usbatm.c | 23 +-
+ drivers/usb/atm/usbatm.h | 22 +-
+ drivers/usb/atm/xusbatm.c | 10 +-
+ drivers/usb/c67x00/c67x00-hcd.c | 4 +-
+ drivers/usb/class/usblp.c | 371 +++---
+ drivers/usb/core/devio.c | 7 +-
+ drivers/usb/core/driver.c | 7 +-
+ drivers/usb/core/endpoint.c | 9 +-
+ drivers/usb/core/generic.c | 4 +-
+ drivers/usb/core/hcd-pci.c | 202 ++-
+ drivers/usb/core/hcd.c | 79 +-
+ drivers/usb/core/hub.c | 13 +-
+ drivers/usb/core/inode.c | 4 -
+ drivers/usb/core/quirks.c | 3 +
+ drivers/usb/gadget/Kconfig | 52 +-
+ drivers/usb/gadget/Makefile | 3 +-
+ drivers/usb/gadget/audio.c | 4 +-
+ drivers/usb/gadget/cdc2.c | 4 +-
+ drivers/usb/gadget/composite.c | 73 +-
+ drivers/usb/gadget/dbgp.c | 434 +++++++
+ drivers/usb/gadget/dummy_hcd.c | 6 +-
+ drivers/usb/gadget/ether.c | 6 +-
+ drivers/usb/gadget/f_fs.c | 38 +-
+ drivers/usb/gadget/f_hid.c | 6 +-
+ drivers/usb/gadget/f_loopback.c | 4 +-
+ drivers/usb/gadget/f_mass_storage.c | 125 ++-
+ drivers/usb/gadget/f_sourcesink.c | 2 +-
+ drivers/usb/gadget/file_storage.c | 104 ++-
+ drivers/usb/gadget/g_ffs.c | 176 +--
+ drivers/usb/gadget/gmidi.c | 2 +-
+ drivers/usb/gadget/hid.c | 4 +-
+ drivers/usb/gadget/inode.c | 16 +-
+ drivers/usb/gadget/langwell_udc.c | 6 +-
+ drivers/usb/gadget/mass_storage.c | 24 +-
+ drivers/usb/gadget/multi.c | 262 +++--
+ drivers/usb/gadget/printer.c | 9 +-
+ drivers/usb/gadget/s3c-hsotg.c | 153 ++-
+ drivers/usb/gadget/serial.c | 4 +-
+ drivers/usb/gadget/storage_common.c | 105 ++-
+ drivers/usb/gadget/u_ether.c | 15 +-
+ drivers/usb/gadget/u_serial.c | 1 +
+ drivers/usb/gadget/webcam.c | 4 +-
+ drivers/usb/gadget/zero.c | 2 +-
+ drivers/usb/host/Kconfig | 11 +-
+ drivers/usb/host/ehci-au1xxx.c | 2 +-
+ drivers/usb/host/ehci-dbg.c | 196 +++-
+ drivers/usb/host/ehci-fsl.c | 3 +-
+ drivers/usb/host/ehci-hcd.c | 49 +-
+ drivers/usb/host/ehci-hub.c | 25 +-
+ drivers/usb/host/ehci-lpm.c | 83 ++
+ drivers/usb/host/ehci-omap.c | 36 +
+ drivers/usb/host/ehci-pci.c | 26 +-
+ drivers/usb/host/ehci-q.c | 3 +-
+ drivers/usb/host/ehci-sched.c | 182 ++--
+ drivers/usb/host/ehci.h | 18 +-
+ drivers/usb/host/hwa-hc.c | 4 +-
+ drivers/usb/host/imx21-hcd.c | 2 +-
+ drivers/usb/host/isp1362.h | 24 +-
+ drivers/usb/host/isp1760-hcd.c | 3 +-
+ drivers/usb/host/ohci-dbg.c | 4 +-
+ drivers/usb/host/ohci-hcd.c | 6 +-
+ drivers/usb/host/ohci-hub.c | 23 +-
+ drivers/usb/host/ohci-pci.c | 2 +-
+ drivers/usb/host/ohci-ssb.c | 52 +-
+ drivers/usb/host/oxu210hp-hcd.c | 7 +-
+ drivers/usb/host/sl811-hcd.c | 5 +-
+ drivers/usb/host/uhci-debug.c | 20 +-
+ drivers/usb/host/uhci-hcd.c | 64 +-
+ drivers/usb/host/uhci-hcd.h | 7 +-
+ drivers/usb/host/uhci-hub.c | 6 +-
+ drivers/usb/host/uhci-q.c | 4 +-
+ drivers/usb/host/whci/hcd.c | 2 +-
+ drivers/usb/host/whci/qset.c | 2 +-
+ drivers/usb/host/xhci-mem.c | 101 +-
+ drivers/usb/host/xhci-pci.c | 9 +
+ drivers/usb/host/xhci-ring.c | 1332 +++++++++++++++-----
+ drivers/usb/host/xhci.c | 344 +++---
+ drivers/usb/host/xhci.h | 30 +-
+ drivers/usb/misc/ftdi-elan.c | 4 +-
+ drivers/usb/misc/iowarrior.c | 23 +-
+ drivers/usb/misc/legousbtower.c | 6 +-
+ drivers/usb/misc/rio500.c | 15 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 10 +-
+ drivers/usb/misc/usblcd.c | 24 +-
+ drivers/usb/misc/usbtest.c | 14 +-
+ drivers/usb/mon/mon_bin.c | 24 +-
+ drivers/usb/musb/musb_core.c | 7 +-
+ drivers/usb/musb/musb_debugfs.c | 32 +-
+ drivers/usb/musb/musb_gadget_ep0.c | 3 +
+ drivers/usb/musb/musb_virthub.c | 2 +-
+ drivers/usb/musb/musbhsdma.c | 5 +-
+ drivers/usb/musb/omap2430.c | 6 -
+ drivers/usb/otg/Kconfig | 2 -
+ drivers/usb/otg/ulpi.c | 134 ++-
+ drivers/usb/serial/Kconfig | 9 +
+ drivers/usb/serial/Makefile | 1 +
+ drivers/usb/serial/cp210x.c | 4 +
+ drivers/usb/serial/ftdi_sio.c | 4 +
+ drivers/usb/serial/ftdi_sio_ids.h | 10 +
+ drivers/usb/serial/generic.c | 5 +-
+ drivers/usb/serial/io_ti.c | 4 +-
+ drivers/usb/serial/ipaq.c | 1 -
+ drivers/usb/serial/iuu_phoenix.c | 54 +-
+ drivers/usb/serial/option.c | 17 +-
+ drivers/usb/serial/ssu100.c | 698 ++++++++++
+ drivers/usb/serial/usb-serial.c | 32 +-
+ drivers/usb/storage/freecom.c | 23 +-
+ drivers/usb/storage/isd200.c | 3 +-
+ drivers/usb/storage/usb.c | 4 +
+ drivers/usb/usb-skeleton.c | 8 +-
+ include/linux/usb.h | 5 +-
+ include/linux/usb/composite.h | 6 +
+ include/linux/usb/ehci_def.h | 23 +
+ include/linux/usb/functionfs.h | 6 +-
+ include/linux/usb/hcd.h | 31 +-
+ include/linux/usb/otg.h | 11 +-
+ include/linux/usb/quirks.h | 4 +
+ include/linux/usb/ulpi.h | 40 +
+ 139 files changed, 4980 insertions(+), 2073 deletions(-)
+ create mode 100644 Documentation/usb/gadget_multi.txt
+ create mode 100644 Documentation/usb/linux-cdc-acm.inf
+ create mode 100644 drivers/usb/gadget/dbgp.c
+ create mode 100644 drivers/usb/host/ehci-lpm.c
+ create mode 100644 drivers/usb/serial/ssu100.c
+Merging staging-next/staging-next
+$ git merge staging-next/staging-next
+Resolved 'drivers/staging/Kconfig' using previous resolution.
+Resolved 'drivers/staging/batman-adv/bat_sysfs.c' using previous resolution.
+Resolved 'drivers/staging/batman-adv/hard-interface.c' using previous resolution.
+Resolved 'drivers/staging/comedi/drivers/quatech_daqp_cs.c' using previous resolution.
+Resolved 'drivers/staging/wlags49_h2/wl_cs.c' using previous resolution.
+Auto-merging drivers/staging/Kconfig
+CONFLICT (content): Merge conflict in drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Auto-merging drivers/staging/batman-adv/bat_sysfs.c
+CONFLICT (content): Merge conflict in drivers/staging/batman-adv/bat_sysfs.c
+CONFLICT (delete/modify): drivers/staging/batman-adv/device.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/batman-adv/device.c left in tree.
+Auto-merging drivers/staging/batman-adv/hard-interface.c
+CONFLICT (content): Merge conflict in drivers/staging/batman-adv/hard-interface.c
+Auto-merging drivers/staging/comedi/drivers/adl_pci9111.c
+Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c
+Auto-merging drivers/staging/comedi/drivers/cb_pcidda.c
+Auto-merging drivers/staging/comedi/drivers/das08_cs.c
+Auto-merging drivers/staging/comedi/drivers/ni_daq_700.c
+Auto-merging drivers/staging/comedi/drivers/ni_daq_dio24.c
+Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c
+CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/quatech_daqp_cs.c
+Auto-merging drivers/staging/cx25821/cx25821-alsa.c
+CONFLICT (delete/modify): drivers/staging/cx25821/cx25821-audups11.c deleted in HEAD and modified in staging-next/staging-next. Version staging-next/staging-next of drivers/staging/cx25821/cx25821-audups11.c left in tree.
+Removing drivers/staging/dt3155/Kconfig
+Removing drivers/staging/dt3155/Makefile
+Removing drivers/staging/dt3155/TODO
+Removing drivers/staging/dt3155/allocator.README
+Removing drivers/staging/dt3155/allocator.c
+Removing drivers/staging/dt3155/allocator.h
+Removing drivers/staging/dt3155/dt3155.h
+Removing drivers/staging/dt3155/dt3155.sysvinit
+Removing drivers/staging/dt3155/dt3155_drv.c
+Removing drivers/staging/dt3155/dt3155_drv.h
+Removing drivers/staging/dt3155/dt3155_io.c
+Removing drivers/staging/dt3155/dt3155_io.h
+Removing drivers/staging/dt3155/dt3155_isr.c
+Removing drivers/staging/dt3155/dt3155_isr.h
+Auto-merging drivers/staging/hv/blkvsc_drv.c
+Auto-merging drivers/staging/hv/channel_mgmt.c
+Auto-merging drivers/staging/hv/hv_utils.c
+Auto-merging drivers/staging/hv/vmbus_drv.c
+Auto-merging drivers/staging/memrar/memrar_handler.c
+Removing drivers/staging/msm/lcdc_grapefruit.c
+Removing drivers/staging/msm/lcdc_st1_wxga.c
+Removing drivers/staging/msm/lcdc_wxga.c
+Removing drivers/staging/msm/mddi_toshiba_wvga.c
+Auto-merging drivers/staging/pohmelfs/inode.c
+Removing drivers/staging/ramzswap/Kconfig
+Removing drivers/staging/ramzswap/Makefile
+Removing drivers/staging/ramzswap/ramzswap.txt
+Removing drivers/staging/ramzswap/ramzswap_drv.c
+Auto-merging drivers/staging/rt2860/usb_main_dev.c
+Removing drivers/staging/rt3070/md4.h
+Auto-merging drivers/staging/rtl8192e/r8192E_core.c
+Auto-merging drivers/staging/rtl8192su/r8192U_core.c
+Removing drivers/staging/rtl8192u/ieee80211.h
+Auto-merging drivers/staging/rtl8192u/r8192U_core.c
+Auto-merging drivers/staging/winbond/wbusb.c
+Auto-merging drivers/staging/wlags49_h2/wl_cs.c
+CONFLICT (content): Merge conflict in drivers/staging/wlags49_h2/wl_cs.c
+Removing drivers/staging/wlan-ng/p80211wext.c
+Removing drivers/staging/xgifb/XGI.h
+Removing drivers/staging/xgifb/osdef.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/cx25821/cx25821-audups11.c
+drivers/staging/Kconfig: needs merge
+drivers/staging/batman-adv/bat_sysfs.c: needs merge
+drivers/staging/batman-adv/device.c: needs merge
+drivers/staging/batman-adv/hard-interface.c: needs merge
+drivers/staging/comedi/drivers/quatech_daqp_cs.c: needs merge
+drivers/staging/cx25821/cx25821-audups11.c: needs merge
+drivers/staging/wlags49_h2/wl_cs.c: needs merge
+rm 'drivers/staging/cx25821/cx25821-audups11.c'
+$ git rm -f drivers/staging/batman-adv/device.c
+drivers/staging/Kconfig: needs merge
+drivers/staging/batman-adv/bat_sysfs.c: needs merge
+drivers/staging/batman-adv/device.c: needs merge
+drivers/staging/batman-adv/hard-interface.c: needs merge
+drivers/staging/comedi/drivers/quatech_daqp_cs.c: needs merge
+drivers/staging/wlags49_h2/wl_cs.c: needs merge
+rm 'drivers/staging/batman-adv/device.c'
+$ git commit -v -a
+[master fd213ea] Merge remote branch 'staging-next/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/x86/kernel/cpu/mshyperv.c | 1 +
+ drivers/staging/Kconfig | 14 +-
+ drivers/staging/Makefile | 8 +-
+ drivers/staging/adis16255/adis16255.c | 4 +-
+ drivers/staging/batman-adv/CHANGELOG | 12 +
+ drivers/staging/batman-adv/Kconfig | 2 +-
+ drivers/staging/batman-adv/Makefile | 4 +-
+ drivers/staging/batman-adv/README | 2 +-
+ drivers/staging/batman-adv/TODO | 9 +-
+ drivers/staging/batman-adv/aggregation.c | 9 +-
+ drivers/staging/batman-adv/aggregation.h | 5 +
+ drivers/staging/batman-adv/bat_debugfs.c | 341 ++
+ drivers/staging/batman-adv/bat_debugfs.h | 33 +
+ drivers/staging/batman-adv/bat_sysfs.c | 302 +-
+ drivers/staging/batman-adv/bat_sysfs.h | 13 +
+ drivers/staging/batman-adv/bitarray.c | 17 +-
+ drivers/staging/batman-adv/bitarray.h | 13 +-
+ drivers/staging/batman-adv/device.c | 354 --
+ drivers/staging/batman-adv/hard-interface.c | 79 +-
+ drivers/staging/batman-adv/hard-interface.h | 5 +
+ drivers/staging/batman-adv/hash.c | 2 +-
+ drivers/staging/batman-adv/hash.h | 12 +-
+ drivers/staging/batman-adv/icmp_socket.c | 334 ++
+ .../staging/batman-adv/{device.h => icmp_socket.h} | 24 +-
+ drivers/staging/batman-adv/main.c | 62 +-
+ drivers/staging/batman-adv/main.h | 82 +-
+ drivers/staging/batman-adv/originator.c | 156 +-
+ drivers/staging/batman-adv/originator.h | 10 +-
+ drivers/staging/batman-adv/packet.h | 32 +-
+ drivers/staging/batman-adv/ring_buffer.h | 5 +
+ drivers/staging/batman-adv/routing.c | 406 ++-
+ drivers/staging/batman-adv/routing.h | 13 +-
+ drivers/staging/batman-adv/send.c | 81 +-
+ drivers/staging/batman-adv/send.h | 7 +-
+ drivers/staging/batman-adv/soft-interface.c | 165 +-
+ drivers/staging/batman-adv/soft-interface.h | 13 +-
+ .../staging/batman-adv/sysfs-class-net-batman-adv | 14 +
+ drivers/staging/batman-adv/sysfs-class-net-mesh | 33 +
+ drivers/staging/batman-adv/translation-table.c | 171 +-
+ drivers/staging/batman-adv/translation-table.h | 14 +-
+ drivers/staging/batman-adv/types.h | 43 +-
+ drivers/staging/batman-adv/vis.c | 147 +-
+ drivers/staging/batman-adv/vis.h | 13 +-
+ drivers/staging/comedi/TODO | 1 -
+ drivers/staging/comedi/comedi_fops.c | 11 +-
+ drivers/staging/comedi/comedidev.h | 58 +-
+ drivers/staging/comedi/drivers/8255.c | 17 +-
+ drivers/staging/comedi/drivers/acl7225b.c | 17 +-
+ .../comedi/drivers/addi-data/addi_amcc_s5933.h | 6 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 38 +-
+ .../staging/comedi/drivers/addi-data/addi_eeprom.c | 12 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3120.c | 8 +-
+ drivers/staging/comedi/drivers/addi_apci_035.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_1500.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_1516.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_1564.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_16xx.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_2016.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_2032.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_2200.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_3001.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_3120.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 4 +
+ drivers/staging/comedi/drivers/addi_apci_3xxx.c | 4 +
+ drivers/staging/comedi/drivers/adl_pci6208.c | 48 +-
+ drivers/staging/comedi/drivers/adl_pci7230.c | 51 +-
+ drivers/staging/comedi/drivers/adl_pci7296.c | 51 +-
+ drivers/staging/comedi/drivers/adl_pci7432.c | 51 +-
+ drivers/staging/comedi/drivers/adl_pci8164.c | 51 +-
+ drivers/staging/comedi/drivers/adl_pci9111.c | 213 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 42 +-
+ drivers/staging/comedi/drivers/adq12b.c | 17 +-
+ drivers/staging/comedi/drivers/adv_pci1710.c | 89 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 42 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 355 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 17 +-
+ drivers/staging/comedi/drivers/aio_iiro_16.c | 17 +-
+ drivers/staging/comedi/drivers/am9513.h | 22 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 57 +-
+ drivers/staging/comedi/drivers/amplc_pc236.c | 57 +-
+ drivers/staging/comedi/drivers/amplc_pc263.c | 57 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 44 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 50 +-
+ drivers/staging/comedi/drivers/c6xdigio.c | 17 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 16 +-
+ drivers/staging/comedi/drivers/cb_pcidas.c | 48 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 48 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 48 +-
+ drivers/staging/comedi/drivers/cb_pcidio.c | 46 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 50 +-
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 46 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 37 -
+ drivers/staging/comedi/drivers/comedi_parport.c | 17 +-
+ drivers/staging/comedi/drivers/comedi_test.c | 17 +-
+ drivers/staging/comedi/drivers/contec_pci_dio.c | 49 +-
+ drivers/staging/comedi/drivers/daqboard2000.c | 44 +-
+ drivers/staging/comedi/drivers/das08.c | 71 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 3 +-
+ drivers/staging/comedi/drivers/das16.c | 17 +-
+ drivers/staging/comedi/drivers/das16m1.c | 17 +-
+ drivers/staging/comedi/drivers/das1800.c | 17 +-
+ drivers/staging/comedi/drivers/das6402.c | 17 +-
+ drivers/staging/comedi/drivers/das800.c | 17 +-
+ drivers/staging/comedi/drivers/dmm32at.c | 99 +-
+ drivers/staging/comedi/drivers/dt2801.c | 17 +-
+ drivers/staging/comedi/drivers/dt2811.c | 17 +-
+ drivers/staging/comedi/drivers/dt2814.c | 17 +-
+ drivers/staging/comedi/drivers/dt2815.c | 17 +-
+ drivers/staging/comedi/drivers/dt2817.c | 17 +-
+ drivers/staging/comedi/drivers/dt282x.c | 17 +-
+ drivers/staging/comedi/drivers/dt3000.c | 42 +-
+ drivers/staging/comedi/drivers/dt9812.c | 6 +-
+ drivers/staging/comedi/drivers/fl512.c | 17 +-
+ drivers/staging/comedi/drivers/gsc_hpdi.c | 72 +-
+ drivers/staging/comedi/drivers/icp_multi.c | 17 +-
+ drivers/staging/comedi/drivers/icp_multi.h | 6 +-
+ drivers/staging/comedi/drivers/ii_pci20kc.c | 17 +-
+ drivers/staging/comedi/drivers/jr3_pci.c | 69 +-
+ drivers/staging/comedi/drivers/ke_counter.c | 48 +-
+ drivers/staging/comedi/drivers/me4000.c | 464 ++-
+ drivers/staging/comedi/drivers/me_daq.c | 48 +-
+ drivers/staging/comedi/drivers/mite.c | 10 +-
+ drivers/staging/comedi/drivers/mpc624.c | 17 +-
+ drivers/staging/comedi/drivers/mpc8260cpm.c | 13 +-
+ drivers/staging/comedi/drivers/multiq3.c | 17 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 38 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 38 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 40 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 38 +-
+ drivers/staging/comedi/drivers/ni_at_a2150.c | 17 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 17 +-
+ drivers/staging/comedi/drivers/ni_atmio.c | 13 +-
+ drivers/staging/comedi/drivers/ni_atmio16d.c | 17 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 3 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 3 +-
+ drivers/staging/comedi/drivers/ni_labpc.c | 121 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 38 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 38 +-
+ drivers/staging/comedi/drivers/ni_tio.c | 54 +-
+ drivers/staging/comedi/drivers/pcl711.c | 31 +-
+ drivers/staging/comedi/drivers/pcl724.c | 17 +-
+ drivers/staging/comedi/drivers/pcl725.c | 17 +-
+ drivers/staging/comedi/drivers/pcl726.c | 17 +-
+ drivers/staging/comedi/drivers/pcl730.c | 17 +-
+ drivers/staging/comedi/drivers/pcl812.c | 493 ++-
+ drivers/staging/comedi/drivers/pcl816.c | 240 +-
+ drivers/staging/comedi/drivers/pcl818.c | 17 +-
+ drivers/staging/comedi/drivers/pcm3724.c | 19 +-
+ drivers/staging/comedi/drivers/pcm3730.c | 17 +-
+ drivers/staging/comedi/drivers/pcm_common.c | 4 +
+ drivers/staging/comedi/drivers/pcmad.c | 17 +-
+ drivers/staging/comedi/drivers/pcmda12.c | 29 +-
+ drivers/staging/comedi/drivers/pcmmio.c | 34 +-
+ drivers/staging/comedi/drivers/pcmuio.c | 17 +-
+ drivers/staging/comedi/drivers/poc.c | 17 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 58 +-
+ drivers/staging/comedi/drivers/rtd520.c | 42 +-
+ drivers/staging/comedi/drivers/rti800.c | 17 +-
+ drivers/staging/comedi/drivers/rti802.c | 17 +-
+ drivers/staging/comedi/drivers/s526.c | 17 +-
+ drivers/staging/comedi/drivers/s626.c | 163 +-
+ drivers/staging/comedi/drivers/s626.h | 9 -
+ drivers/staging/comedi/drivers/serial2002.c | 115 +-
+ drivers/staging/comedi/drivers/skel.c | 109 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 17 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 26 +-
+ drivers/staging/comedi/drivers/usbdux.c | 4 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 2 +-
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 4 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 22 +-
+ drivers/staging/cx25821/cx25821-alsa.c | 2 +-
+ drivers/staging/cxt1e1/functions.c | 12 -
+ drivers/staging/cxt1e1/hwprobe.c | 6 -
+ drivers/staging/cxt1e1/linux.c | 163 -
+ drivers/staging/cxt1e1/musycc.c | 204 -
+ drivers/staging/cxt1e1/pmc93x6_eeprom.c | 4 -
+ drivers/staging/cxt1e1/pmcc4.h | 4 -
+ drivers/staging/cxt1e1/pmcc4_drv.c | 158 -
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 11 -
+ drivers/staging/dream/camera/msm_vfe8x.c | 45 +-
+ drivers/staging/dream/pmem.c | 46 +-
+ drivers/staging/dt3155/Kconfig | 4 -
+ drivers/staging/dt3155/Makefile | 6 -
+ drivers/staging/dt3155/TODO | 10 -
+ drivers/staging/dt3155/allocator.README | 98 -
+ drivers/staging/dt3155/allocator.c | 294 --
+ drivers/staging/dt3155/allocator.h | 28 -
+ drivers/staging/dt3155/dt3155.h | 161 -
+ drivers/staging/dt3155/dt3155.sysvinit | 60 -
+ drivers/staging/dt3155/dt3155_drv.c | 1099 -----
+ drivers/staging/dt3155/dt3155_drv.h | 45 -
+ drivers/staging/dt3155/dt3155_io.c | 165 -
+ drivers/staging/dt3155/dt3155_io.h | 358 --
+ drivers/staging/dt3155/dt3155_isr.c | 509 ---
+ drivers/staging/dt3155/dt3155_isr.h | 77 -
+ drivers/staging/dt3155v4l/dt3155v4l.c | 31 +-
+ drivers/staging/easycap/Kconfig | 17 +
+ drivers/staging/easycap/Makefile | 13 +
+ drivers/staging/easycap/README | 130 +
+ drivers/staging/easycap/easycap.h | 642 +++
+ drivers/staging/easycap/easycap_debug.h | 27 +
+ drivers/staging/easycap/easycap_ioctl.c | 2687 +++++++++++
+ drivers/staging/easycap/easycap_ioctl.h | 28 +
+ drivers/staging/easycap/easycap_low.c | 1041 +++++
+ drivers/staging/easycap/easycap_main.c | 4354 ++++++++++++++++++
+ drivers/staging/easycap/easycap_settings.c | 489 ++
+ drivers/staging/easycap/easycap_sound.c | 1046 +++++
+ drivers/staging/easycap/easycap_sound.h | 28 +
+ drivers/staging/easycap/easycap_standard.h | 27 +
+ drivers/staging/easycap/easycap_testcard.c | 392 ++
+ drivers/staging/et131x/et1310_phy.c | 8 +-
+ drivers/staging/hv/Kconfig | 2 +-
+ drivers/staging/hv/Makefile | 2 +-
+ drivers/staging/hv/blkvsc.c | 12 +-
+ drivers/staging/hv/blkvsc_drv.c | 26 +-
+ drivers/staging/hv/channel.c | 54 +-
+ drivers/staging/hv/channel_mgmt.c | 43 -
+ drivers/staging/hv/channel_mgmt.h | 8 +-
+ drivers/staging/hv/connection.c | 23 +-
+ drivers/staging/hv/hv.c | 29 +-
+ drivers/staging/hv/hv_timesource.c | 101 +
+ drivers/staging/hv/hv_utils.c | 12 -
+ drivers/staging/hv/logging.h | 17 -
+ drivers/staging/hv/netvsc.c | 65 -
+ drivers/staging/hv/netvsc_drv.c | 51 +-
+ drivers/staging/hv/ring_buffer.c | 71 +-
+ drivers/staging/hv/ring_buffer.h | 35 +-
+ drivers/staging/hv/rndis_filter.c | 86 +-
+ drivers/staging/hv/storvsc.c | 36 -
+ drivers/staging/hv/storvsc_drv.c | 49 +-
+ drivers/staging/hv/vmbus.c | 18 -
+ drivers/staging/hv/vmbus_drv.c | 99 +-
+ drivers/staging/iio/Documentation/overview.txt | 2 +-
+ drivers/staging/iio/Kconfig | 2 +
+ drivers/staging/iio/Makefile | 4 +-
+ drivers/staging/iio/TODO | 2 +-
+ drivers/staging/iio/accel/Kconfig | 50 +-
+ drivers/staging/iio/accel/Makefile | 3 +-
+ drivers/staging/iio/accel/adis16209.h | 33 +-
+ drivers/staging/iio/accel/adis16209_core.c | 15 +-
+ drivers/staging/iio/accel/adis16209_ring.c | 94 +-
+ drivers/staging/iio/accel/adis16209_trigger.c | 10 +-
+ drivers/staging/iio/accel/adis16220.h | 1 -
+ drivers/staging/iio/accel/adis16220_core.c | 20 +-
+ drivers/staging/iio/accel/adis16240.h | 27 +-
+ drivers/staging/iio/accel/adis16240_core.c | 17 +-
+ drivers/staging/iio/accel/adis16240_ring.c | 91 +-
+ drivers/staging/iio/accel/adis16240_trigger.c | 10 +-
+ drivers/staging/iio/accel/kxsd9.c | 6 -
+ drivers/staging/iio/accel/lis3l02dq.h | 35 +-
+ drivers/staging/iio/accel/lis3l02dq_core.c | 144 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 210 +-
+ drivers/staging/iio/accel/sca3000.h | 14 +-
+ drivers/staging/iio/accel/sca3000_core.c | 14 +-
+ drivers/staging/iio/adc/Makefile | 2 +-
+ drivers/staging/iio/adc/adc.h | 3 +
+ drivers/staging/iio/adc/max1363.h | 69 +-
+ drivers/staging/iio/adc/max1363_core.c | 861 ++++-
+ drivers/staging/iio/adc/max1363_ring.c | 60 +-
+ drivers/staging/iio/chrdev.h | 3 -
+ drivers/staging/iio/gyro/Makefile | 2 +-
+ drivers/staging/iio/gyro/adis16260.h | 25 +-
+ drivers/staging/iio/gyro/adis16260_core.c | 12 +-
+ drivers/staging/iio/gyro/adis16260_ring.c | 92 +-
+ drivers/staging/iio/gyro/adis16260_trigger.c | 10 +-
+ drivers/staging/iio/iio.h | 51 +-
+ drivers/staging/iio/imu/Kconfig | 18 +-
+ drivers/staging/iio/imu/Makefile | 3 +-
+ drivers/staging/iio/imu/adis16300.h | 28 +-
+ drivers/staging/iio/imu/adis16300_core.c | 160 +-
+ drivers/staging/iio/imu/adis16300_ring.c | 142 +-
+ drivers/staging/iio/imu/adis16300_trigger.c | 10 +-
+ drivers/staging/iio/imu/adis16350.h | 40 +-
+ drivers/staging/iio/imu/adis16350_core.c | 17 +-
+ drivers/staging/iio/imu/adis16350_ring.c | 91 +-
+ drivers/staging/iio/imu/adis16350_trigger.c | 10 +-
+ drivers/staging/iio/imu/adis16400.h | 45 +-
+ drivers/staging/iio/imu/adis16400_core.c | 101 +-
+ drivers/staging/iio/imu/adis16400_ring.c | 137 +-
+ drivers/staging/iio/imu/adis16400_trigger.c | 10 +-
+ drivers/staging/iio/industrialio-core.c | 22 +-
+ drivers/staging/iio/industrialio-ring.c | 4 +-
+ drivers/staging/iio/industrialio-trigger.c | 51 +-
+ drivers/staging/iio/light/Kconfig | 1 -
+ drivers/staging/iio/light/light.h | 7 +-
+ drivers/staging/iio/light/tsl2563.c | 389 ++-
+ drivers/staging/iio/magnetometer/Kconfig | 15 +
+ drivers/staging/iio/magnetometer/Makefile | 5 +
+ drivers/staging/iio/magnetometer/hmc5843.c | 624 +++
+ drivers/staging/iio/ring_generic.h | 23 +-
+ drivers/staging/iio/ring_sw.c | 69 +
+ drivers/staging/iio/ring_sw.h | 15 +-
+ drivers/staging/iio/sysfs.h | 14 +-
+ drivers/staging/iio/trigger.h | 24 +-
+ drivers/staging/iio/trigger/Makefile | 3 +-
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 12 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 15 +-
+ drivers/staging/line6/Kconfig | 1 +
+ drivers/staging/line6/driver.c | 68 +-
+ drivers/staging/memrar/TODO | 2 +-
+ drivers/staging/memrar/memrar-abi | 4 +-
+ drivers/staging/memrar/memrar_handler.c | 37 +-
+ drivers/staging/msm/Kconfig | 10 -
+ drivers/staging/msm/Makefile | 5 -
+ drivers/staging/msm/lcdc_grapefruit.c | 60 -
+ drivers/staging/msm/lcdc_st1_wxga.c | 54 -
+ drivers/staging/msm/lcdc_wxga.c | 56 -
+ drivers/staging/msm/mddi_toshiba_wvga.c | 63 -
+ drivers/staging/msm/mddihost.h | 2 -
+ drivers/staging/msm/mdp4_debugfs.c | 10 +-
+ drivers/staging/msm/mdp4_overlay.c | 8 +-
+ drivers/staging/msm/msm_fb_def.h | 4 -
+ drivers/staging/msm/staging-devices.c | 13 +-
+ drivers/staging/octeon/cvmx-cmd-queue.c | 6 +-
+ drivers/staging/octeon/cvmx-fau.h | 2 +-
+ drivers/staging/octeon/ethernet-spi.c | 2 +
+ drivers/staging/otus/80211core/ctxrx.c | 2 +-
+ drivers/staging/otus/TODO | 16 +-
+ drivers/staging/otus/apdbg.c | 24 +-
+ drivers/staging/otus/hal/hpani.c | 16 +-
+ drivers/staging/otus/hal/hpmain.c | 28 +-
+ drivers/staging/otus/hal/hpreg.c | 17 +-
+ drivers/staging/otus/ioctl.c | 55 +-
+ drivers/staging/otus/wrap_sec.c | 2 +-
+ drivers/staging/otus/wrap_usb.c | 5 +
+ drivers/staging/otus/wwrap.c | 968 ++---
+ drivers/staging/otus/zdusb.c | 251 +-
+ drivers/staging/panel/panel.c | 1071 +++--
+ drivers/staging/pohmelfs/inode.c | 6 +-
+ drivers/staging/quatech_usb2/quatech_usb2.c | 24 +-
+ drivers/staging/quickstart/Kconfig | 10 +
+ drivers/staging/quickstart/Makefile | 1 +
+ drivers/staging/quickstart/quickstart.c | 474 ++
+ drivers/staging/ramzswap/Kconfig | 21 -
+ drivers/staging/ramzswap/Makefile | 3 -
+ drivers/staging/ramzswap/ramzswap.txt | 51 -
+ drivers/staging/ramzswap/ramzswap_drv.c | 837 ----
+ drivers/staging/rt2860/ap.h | 6 +-
+ drivers/staging/rt2860/chlist.h | 50 +-
+ drivers/staging/rt2860/common/cmm_wpa.c | 4 +-
+ drivers/staging/rt2860/common/rtmp_timer.c | 4 +-
+ drivers/staging/rt2860/mlme.h | 21 +-
+ drivers/staging/rt2860/rt_linux.c | 2 +-
+ drivers/staging/rt2860/rtmp.h | 4 +-
+ drivers/staging/rt2860/usb_main_dev.c | 9 +-
+ drivers/staging/rt3070/md4.h | 42 -
+ drivers/staging/rtl8187se/Kconfig | 1 +
+ drivers/staging/rtl8192e/Kconfig | 1 +
+ drivers/staging/rtl8192e/ieee80211/dot11d.c | 18 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211.h | 97 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 20 -
+ .../staging/rtl8192e/ieee80211/ieee80211_crypt.h | 8 -
+ .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 48 -
+ .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 198 +-
+ .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 96 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_module.c | 68 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 16 -
+ .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 185 +-
+ .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 73 +-
+ drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 9 -
+ drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 132 +-
+ .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 17 -
+ drivers/staging/rtl8192e/r8190_rtl8256.c | 6 +-
+ drivers/staging/rtl8192e/r8192E.h | 4 +-
+ drivers/staging/rtl8192e/r8192E_core.c | 69 +-
+ drivers/staging/rtl8192e/r8192E_dm.c | 22 +-
+ drivers/staging/rtl8192e/r8192E_wx.c | 157 +-
+ drivers/staging/rtl8192e/r819xE_phy.c | 2 +-
+ drivers/staging/rtl8192su/Kconfig | 1 +
+ drivers/staging/rtl8192su/TODO | 7 +-
+ drivers/staging/rtl8192su/ieee80211/dot11d.c | 28 +-
+ drivers/staging/rtl8192su/ieee80211/dot11d.h | 25 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211.h | 32 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 5 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_crypt.h | 2 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 7 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 31 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 6 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_module.c | 26 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 43 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2 +-
+ .../rtl8192su/ieee80211/ieee80211_softmac.c | 290 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 11 -
+ drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 17 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_BA.h | 30 +-
+ .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 50 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_HT.h | 42 +-
+ .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 147 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 88 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_TS.h | 23 +-
+ .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 41 +-
+ drivers/staging/rtl8192su/r8192SU_HWImg.c | 37 +-
+ drivers/staging/rtl8192su/r8192SU_HWImg.h | 22 +-
+ drivers/staging/rtl8192su/r8192SU_led.c | 9 -
+ drivers/staging/rtl8192su/r8192S_Efuse.c | 510 +--
+ drivers/staging/rtl8192su/r8192S_Efuse.h | 70 +-
+ drivers/staging/rtl8192su/r8192S_firmware.c | 26 +-
+ drivers/staging/rtl8192su/r8192S_firmware.h | 100 +-
+ drivers/staging/rtl8192su/r8192S_hw.h | 152 +-
+ drivers/staging/rtl8192su/r8192S_phy.c | 659 +---
+ drivers/staging/rtl8192su/r8192U.h | 309 +-
+ drivers/staging/rtl8192su/r8192U_core.c | 169 +-
+ drivers/staging/rtl8192su/r8192U_dm.c | 29 +-
+ drivers/staging/rtl8192su/r8192U_wx.c | 128 +-
+ drivers/staging/rtl8192su/r819xU_cmdpkt.c | 44 +-
+ drivers/staging/rtl8192su/r819xU_cmdpkt.h | 1 +
+ drivers/staging/rtl8192u/Kconfig | 1 +
+ drivers/staging/rtl8192u/dot11d.h | 2 +-
+ drivers/staging/rtl8192u/ieee80211.h | 2595 -----------
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 2 +-
+ drivers/staging/rtl8192u/r8192U.h | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 73 +-
+ drivers/staging/rtl8192u/r8192U_wx.h | 2 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 2 +-
+ drivers/staging/sep/sep_driver_api.h | 2 +-
+ drivers/staging/slicoss/slic.h | 12 -
+ drivers/staging/slicoss/slicoss.c | 3952 ++++++++---------
+ drivers/staging/sm7xx/smtcfb.c | 2 +-
+ drivers/staging/solo6x10/Kconfig | 7 +
+ drivers/staging/solo6x10/Makefile | 6 +
+ drivers/staging/solo6x10/TODO | 28 +
+ drivers/staging/solo6x10/solo6010-core.c | 282 ++
+ drivers/staging/solo6x10/solo6010-disp.c | 271 ++
+ drivers/staging/solo6x10/solo6010-enc.c | 229 +
+ drivers/staging/solo6x10/solo6010-g723.c | 398 ++
+ drivers/staging/solo6x10/solo6010-gpio.c | 103 +
+ drivers/staging/solo6x10/solo6010-i2c.c | 331 ++
+ drivers/staging/solo6x10/solo6010-jpeg.h | 105 +
+ drivers/staging/solo6x10/solo6010-offsets.h | 78 +
+ drivers/staging/solo6x10/solo6010-osd-font.h | 154 +
+ drivers/staging/solo6x10/solo6010-p2m.c | 208 +
+ drivers/staging/solo6x10/solo6010-registers.h | 657 +++
+ drivers/staging/solo6x10/solo6010-tw28.c | 823 ++++
+ drivers/staging/solo6x10/solo6010-tw28.h | 65 +
+ drivers/staging/solo6x10/solo6010-v4l2-enc.c | 1564 +++++++
+ drivers/staging/solo6x10/solo6010-v4l2.c | 859 ++++
+ drivers/staging/solo6x10/solo6010.h | 317 ++
+ drivers/staging/spectra/Kconfig | 40 +
+ drivers/staging/spectra/Makefile | 11 +
+ drivers/staging/spectra/README | 29 +
+ drivers/staging/spectra/ffsdefs.h | 58 +
+ drivers/staging/spectra/ffsport.c | 827 ++++
+ drivers/staging/spectra/ffsport.h | 84 +
+ drivers/staging/spectra/flash.c | 4731 ++++++++++++++++++++
+ drivers/staging/spectra/flash.h | 198 +
+ drivers/staging/spectra/lld.c | 339 ++
+ drivers/staging/spectra/lld.h | 111 +
+ drivers/staging/spectra/lld_cdma.c | 910 ++++
+ drivers/staging/spectra/lld_cdma.h | 123 +
+ drivers/staging/spectra/lld_emu.c | 780 ++++
+ drivers/staging/spectra/lld_emu.h | 51 +
+ drivers/staging/spectra/lld_mtd.c | 687 +++
+ drivers/staging/spectra/lld_mtd.h | 51 +
+ drivers/staging/spectra/lld_nand.c | 2601 +++++++++++
+ drivers/staging/spectra/lld_nand.h | 131 +
+ drivers/staging/spectra/nand_regs.h | 619 +++
+ drivers/staging/spectra/spectraswconfig.h | 82 +
+ drivers/staging/ti-st/Kconfig | 2 +-
+ drivers/staging/ti-st/TODO | 13 +-
+ drivers/staging/ti-st/bt_drv.c | 29 +-
+ drivers/staging/ti-st/st.h | 66 +-
+ drivers/staging/ti-st/st_core.c | 202 +-
+ drivers/staging/ti-st/st_core.h | 74 +-
+ drivers/staging/ti-st/st_kim.c | 347 +-
+ drivers/staging/ti-st/st_kim.h | 94 +-
+ drivers/staging/ti-st/st_ll.c | 8 +-
+ drivers/staging/ti-st/st_ll.h | 9 +-
+ drivers/staging/ti-st/sysfs-uim | 12 +
+ .../staging/tidspbridge/Documentation/CONTRIBUTORS | 45 +
+ drivers/staging/tidspbridge/Documentation/README | 70 +
+ .../staging/tidspbridge/Documentation/error-codes | 157 +
+ drivers/staging/tidspbridge/Kconfig | 90 +
+ drivers/staging/tidspbridge/Makefile | 34 +
+ drivers/staging/tidspbridge/TODO | 18 +
+ drivers/staging/tidspbridge/core/_cmm.h | 45 +
+ drivers/staging/tidspbridge/core/_deh.h | 35 +
+ drivers/staging/tidspbridge/core/_msg_sm.h | 142 +
+ drivers/staging/tidspbridge/core/_tiomap.h | 371 ++
+ drivers/staging/tidspbridge/core/_tiomap_pwr.h | 85 +
+ drivers/staging/tidspbridge/core/chnl_sm.c | 1014 +++++
+ drivers/staging/tidspbridge/core/dsp-clock.c | 422 ++
+ drivers/staging/tidspbridge/core/io_sm.c | 2333 ++++++++++
+ drivers/staging/tidspbridge/core/msg_sm.c | 673 +++
+ drivers/staging/tidspbridge/core/tiomap3430.c | 1802 ++++++++
+ drivers/staging/tidspbridge/core/tiomap3430_pwr.c | 550 +++
+ drivers/staging/tidspbridge/core/tiomap_io.c | 455 ++
+ drivers/staging/tidspbridge/core/tiomap_io.h | 104 +
+ drivers/staging/tidspbridge/core/ue_deh.c | 273 ++
+ drivers/staging/tidspbridge/core/wdt.c | 150 +
+ drivers/staging/tidspbridge/dynload/cload.c | 1953 ++++++++
+ .../staging/tidspbridge/dynload/dload_internal.h | 344 ++
+ drivers/staging/tidspbridge/dynload/doff.h | 354 ++
+ drivers/staging/tidspbridge/dynload/getsection.c | 407 ++
+ drivers/staging/tidspbridge/dynload/header.h | 49 +
+ drivers/staging/tidspbridge/dynload/module_list.h | 159 +
+ drivers/staging/tidspbridge/dynload/params.h | 226 +
+ drivers/staging/tidspbridge/dynload/reloc.c | 484 ++
+ drivers/staging/tidspbridge/dynload/reloc_table.h | 102 +
+ .../tidspbridge/dynload/reloc_table_c6000.c | 257 ++
+ drivers/staging/tidspbridge/dynload/tramp.c | 1143 +++++
+ .../tidspbridge/dynload/tramp_table_c6000.c | 164 +
+ drivers/staging/tidspbridge/gen/gb.c | 167 +
+ drivers/staging/tidspbridge/gen/gh.c | 215 +
+ drivers/staging/tidspbridge/gen/gs.c | 89 +
+ drivers/staging/tidspbridge/gen/uuidutil.c | 113 +
+ drivers/staging/tidspbridge/hw/EasiGlobal.h | 41 +
+ drivers/staging/tidspbridge/hw/MMUAccInt.h | 76 +
+ drivers/staging/tidspbridge/hw/MMURegAcM.h | 225 +
+ drivers/staging/tidspbridge/hw/hw_defs.h | 58 +
+ drivers/staging/tidspbridge/hw/hw_mmu.c | 562 +++
+ drivers/staging/tidspbridge/hw/hw_mmu.h | 163 +
+ .../tidspbridge/include/dspbridge/_chnl_sm.h | 181 +
+ .../tidspbridge/include/dspbridge/brddefs.h | 39 +
+ .../staging/tidspbridge/include/dspbridge/cfg.h | 222 +
+ .../tidspbridge/include/dspbridge/cfgdefs.h | 81 +
+ .../staging/tidspbridge/include/dspbridge/chnl.h | 130 +
+ .../tidspbridge/include/dspbridge/chnldefs.h | 66 +
+ .../tidspbridge/include/dspbridge/chnlpriv.h | 98 +
+ .../staging/tidspbridge/include/dspbridge/clk.h | 101 +
+ .../staging/tidspbridge/include/dspbridge/cmm.h | 386 ++
+ .../tidspbridge/include/dspbridge/cmmdefs.h | 105 +
+ .../staging/tidspbridge/include/dspbridge/cod.h | 369 ++
+ .../staging/tidspbridge/include/dspbridge/dbc.h | 46 +
+ .../staging/tidspbridge/include/dspbridge/dbdcd.h | 358 ++
+ .../tidspbridge/include/dspbridge/dbdcddef.h | 78 +
+ .../staging/tidspbridge/include/dspbridge/dbdefs.h | 514 +++
+ .../tidspbridge/include/dspbridge/dbldefs.h | 141 +
+ .../staging/tidspbridge/include/dspbridge/dbll.h | 62 +
+ .../tidspbridge/include/dspbridge/dblldefs.h | 496 ++
+ .../tidspbridge/include/dspbridge/dehdefs.h | 32 +
+ .../staging/tidspbridge/include/dspbridge/dev.h | 702 +++
+ .../tidspbridge/include/dspbridge/devdefs.h | 26 +
+ .../staging/tidspbridge/include/dspbridge/disp.h | 204 +
+ .../tidspbridge/include/dspbridge/dispdefs.h | 35 +
+ .../staging/tidspbridge/include/dspbridge/dmm.h | 75 +
+ .../staging/tidspbridge/include/dspbridge/drv.h | 521 +++
+ .../tidspbridge/include/dspbridge/drvdefs.h | 25 +
+ .../tidspbridge/include/dspbridge/dspapi-ioctl.h | 475 ++
+ .../staging/tidspbridge/include/dspbridge/dspapi.h | 167 +
+ .../tidspbridge/include/dspbridge/dspchnl.h | 72 +
+ .../tidspbridge/include/dspbridge/dspdefs.h | 1054 +++++
+ .../staging/tidspbridge/include/dspbridge/dspdeh.h | 43 +
+ .../staging/tidspbridge/include/dspbridge/dspdrv.h | 62 +
+ .../staging/tidspbridge/include/dspbridge/dspio.h | 41 +
+ .../tidspbridge/include/dspbridge/dspioctl.h | 73 +
+ .../staging/tidspbridge/include/dspbridge/dspmsg.h | 56 +
+ .../tidspbridge/include/dspbridge/dynamic_loader.h | 492 ++
+ drivers/staging/tidspbridge/include/dspbridge/gb.h | 79 +
+ .../tidspbridge/include/dspbridge/getsection.h | 108 +
+ drivers/staging/tidspbridge/include/dspbridge/gh.h | 34 +
+ drivers/staging/tidspbridge/include/dspbridge/gs.h | 59 +
+ .../tidspbridge/include/dspbridge/host_os.h | 88 +
+ drivers/staging/tidspbridge/include/dspbridge/io.h | 114 +
+ .../staging/tidspbridge/include/dspbridge/io_sm.h | 298 ++
+ .../staging/tidspbridge/include/dspbridge/iodefs.h | 36 +
+ .../staging/tidspbridge/include/dspbridge/ldr.h | 29 +
+ .../staging/tidspbridge/include/dspbridge/list.h | 225 +
+ .../staging/tidspbridge/include/dspbridge/mbx_sh.h | 184 +
+ .../tidspbridge/include/dspbridge/memdefs.h | 30 +
+ .../staging/tidspbridge/include/dspbridge/mgr.h | 205 +
+ .../tidspbridge/include/dspbridge/mgrpriv.h | 45 +
+ .../staging/tidspbridge/include/dspbridge/msg.h | 86 +
+ .../tidspbridge/include/dspbridge/msgdefs.h | 29 +
+ .../staging/tidspbridge/include/dspbridge/nldr.h | 57 +
+ .../tidspbridge/include/dspbridge/nldrdefs.h | 293 ++
+ .../staging/tidspbridge/include/dspbridge/node.h | 583 +++
+ .../tidspbridge/include/dspbridge/nodedefs.h | 28 +
+ .../tidspbridge/include/dspbridge/nodepriv.h | 182 +
+ .../staging/tidspbridge/include/dspbridge/ntfy.h | 217 +
+ .../staging/tidspbridge/include/dspbridge/proc.h | 621 +++
+ .../tidspbridge/include/dspbridge/procpriv.h | 25 +
+ .../staging/tidspbridge/include/dspbridge/pwr.h | 107 +
+ .../staging/tidspbridge/include/dspbridge/pwr_sh.h | 33 +
+ .../include/dspbridge/resourcecleanup.h | 52 +
+ .../staging/tidspbridge/include/dspbridge/rmm.h | 181 +
+ .../staging/tidspbridge/include/dspbridge/rms_sh.h | 95 +
+ .../tidspbridge/include/dspbridge/rmstypes.h | 24 +
+ .../tidspbridge/include/dspbridge/services.h | 50 +
+ .../staging/tidspbridge/include/dspbridge/strm.h | 404 ++
+ .../tidspbridge/include/dspbridge/strmdefs.h | 46 +
+ .../staging/tidspbridge/include/dspbridge/sync.h | 109 +
+ .../tidspbridge/include/dspbridge/utildefs.h | 39 +
+ .../tidspbridge/include/dspbridge/uuidutil.h | 62 +
+ .../staging/tidspbridge/include/dspbridge/wdt.h | 79 +
+ drivers/staging/tidspbridge/pmgr/chnl.c | 163 +
+ drivers/staging/tidspbridge/pmgr/chnlobj.h | 46 +
+ drivers/staging/tidspbridge/pmgr/cmm.c | 1154 +++++
+ drivers/staging/tidspbridge/pmgr/cod.c | 652 +++
+ drivers/staging/tidspbridge/pmgr/dbll.c | 1585 +++++++
+ drivers/staging/tidspbridge/pmgr/dev.c | 1151 +++++
+ drivers/staging/tidspbridge/pmgr/dmm.c | 533 +++
+ drivers/staging/tidspbridge/pmgr/dspapi.c | 1906 ++++++++
+ drivers/staging/tidspbridge/pmgr/io.c | 142 +
+ drivers/staging/tidspbridge/pmgr/ioobj.h | 38 +
+ drivers/staging/tidspbridge/pmgr/msg.c | 129 +
+ drivers/staging/tidspbridge/pmgr/msgobj.h | 38 +
+ drivers/staging/tidspbridge/rmgr/dbdcd.c | 1512 +++++++
+ drivers/staging/tidspbridge/rmgr/disp.c | 752 ++++
+ drivers/staging/tidspbridge/rmgr/drv.c | 929 ++++
+ drivers/staging/tidspbridge/rmgr/drv_interface.c | 656 +++
+ drivers/staging/tidspbridge/rmgr/drv_interface.h | 28 +
+ drivers/staging/tidspbridge/rmgr/dspdrv.c | 142 +
+ drivers/staging/tidspbridge/rmgr/mgr.c | 375 ++
+ drivers/staging/tidspbridge/rmgr/nldr.c | 1974 ++++++++
+ drivers/staging/tidspbridge/rmgr/node.c | 3234 +++++++++++++
+ drivers/staging/tidspbridge/rmgr/proc.c | 1936 ++++++++
+ drivers/staging/tidspbridge/rmgr/pwr.c | 176 +
+ drivers/staging/tidspbridge/rmgr/rmm.c | 537 +++
+ drivers/staging/tidspbridge/rmgr/strm.c | 853 ++++
+ drivers/staging/tidspbridge/services/cfg.c | 253 ++
+ drivers/staging/tidspbridge/services/ntfy.c | 31 +
+ drivers/staging/tidspbridge/services/services.c | 70 +
+ drivers/staging/tidspbridge/services/sync.c | 104 +
+ drivers/staging/usbip/stub.h | 17 +-
+ drivers/staging/usbip/stub_dev.c | 101 +-
+ drivers/staging/usbip/stub_main.c | 65 +-
+ drivers/staging/usbip/stub_rx.c | 101 +-
+ drivers/staging/usbip/usbip_common.h | 2 +-
+ drivers/staging/vme/bridges/vme_ca91cx42.c | 12 +-
+ drivers/staging/vme/bridges/vme_tsi148.c | 10 +-
+ drivers/staging/vme/devices/vme_user.c | 99 +-
+ drivers/staging/vt6655/80211hdr.h | 118 +-
+ drivers/staging/vt6655/80211mgr.c | 118 +-
+ drivers/staging/vt6655/80211mgr.h | 336 +-
+ drivers/staging/vt6655/IEEE11h.c | 68 +-
+ drivers/staging/vt6655/IEEE11h.h | 2 +-
+ drivers/staging/vt6655/Makefile | 1 +
+ drivers/staging/vt6655/TODO | 3 +-
+ drivers/staging/vt6655/aes_ccmp.c | 112 +-
+ drivers/staging/vt6655/aes_ccmp.h | 2 +-
+ drivers/staging/vt6655/baseband.c | 196 +-
+ drivers/staging/vt6655/baseband.h | 52 +-
+ drivers/staging/vt6655/bssdb.c | 351 +-
+ drivers/staging/vt6655/bssdb.h | 246 +-
+ drivers/staging/vt6655/card.c | 1369 +-----
+ drivers/staging/vt6655/card.h | 158 +-
+ drivers/staging/vt6655/channel.c | 835 ++++
+ drivers/staging/vt6655/channel.h | 58 +
+ drivers/staging/vt6655/country.h | 15 -
+ drivers/staging/vt6655/datarate.c | 90 +-
+ drivers/staging/vt6655/datarate.h | 24 +-
+ drivers/staging/vt6655/desc.h | 352 +-
+ drivers/staging/vt6655/device.h | 526 ++--
+ drivers/staging/vt6655/device_cfg.h | 8 -
+ drivers/staging/vt6655/device_main.c | 566 ++--
+ drivers/staging/vt6655/dpc.c | 516 +--
+ drivers/staging/vt6655/dpc.h | 2 +-
+ drivers/staging/vt6655/hostap.c | 84 +-
+ drivers/staging/vt6655/iocmd.h | 347 +-
+ drivers/staging/vt6655/ioctl.c | 128 +-
+ drivers/staging/vt6655/ioctl.h | 6 +-
+ drivers/staging/vt6655/iwctl.c | 152 +-
+ drivers/staging/vt6655/key.c | 288 +-
+ drivers/staging/vt6655/key.h | 114 +-
+ drivers/staging/vt6655/mac.c | 363 +-
+ drivers/staging/vt6655/mac.h | 203 +-
+ drivers/staging/vt6655/mib.c | 110 +-
+ drivers/staging/vt6655/mib.h | 429 +-
+ drivers/staging/vt6655/michael.c | 46 +-
+ drivers/staging/vt6655/michael.h | 6 +-
+ drivers/staging/vt6655/power.c | 74 +-
+ drivers/staging/vt6655/power.h | 12 +-
+ drivers/staging/vt6655/rc4.c | 40 +-
+ drivers/staging/vt6655/rc4.h | 12 +-
+ drivers/staging/vt6655/rf.c | 196 +-
+ drivers/staging/vt6655/rf.h | 20 +-
+ drivers/staging/vt6655/rxtx.c | 1104 +++---
+ drivers/staging/vt6655/rxtx.h | 62 +-
+ drivers/staging/vt6655/srom.c | 82 +-
+ drivers/staging/vt6655/srom.h | 80 +-
+ drivers/staging/vt6655/tcrc.c | 12 +-
+ drivers/staging/vt6655/tcrc.h | 6 +-
+ drivers/staging/vt6655/tether.c | 20 +-
+ drivers/staging/vt6655/tether.h | 60 +-
+ drivers/staging/vt6655/tkip.c | 14 +-
+ drivers/staging/vt6655/tkip.h | 10 +-
+ drivers/staging/vt6655/tmacro.h | 12 +-
+ drivers/staging/vt6655/ttype.h | 57 +-
+ drivers/staging/vt6655/upc.h | 22 +-
+ drivers/staging/vt6655/vntwifi.c | 174 +-
+ drivers/staging/vt6655/vntwifi.h | 82 +-
+ drivers/staging/vt6655/wcmd.c | 169 +-
+ drivers/staging/vt6655/wcmd.h | 18 +-
+ drivers/staging/vt6655/wctl.c | 62 +-
+ drivers/staging/vt6655/wctl.h | 9 +-
+ drivers/staging/vt6655/wmgr.c | 807 ++--
+ drivers/staging/vt6655/wmgr.h | 192 +-
+ drivers/staging/vt6655/wpa.c | 62 +-
+ drivers/staging/vt6655/wpa.h | 8 +-
+ drivers/staging/vt6655/wpa2.c | 70 +-
+ drivers/staging/vt6655/wpa2.h | 8 +-
+ drivers/staging/vt6655/wpactl.c | 80 +-
+ drivers/staging/vt6655/wpactl.h | 4 +-
+ drivers/staging/vt6655/wroute.c | 44 +-
+ drivers/staging/vt6655/wroute.h | 2 +-
+ drivers/staging/vt6656/80211mgr.c | 516 ++--
+ drivers/staging/vt6656/80211mgr.h | 33 +-
+ drivers/staging/vt6656/aes_ccmp.c | 4 +-
+ drivers/staging/vt6656/baseband.c | 6 +-
+ drivers/staging/vt6656/baseband.h | 19 +-
+ drivers/staging/vt6656/bssdb.c | 117 +-
+ drivers/staging/vt6656/bssdb.h | 12 +-
+ drivers/staging/vt6656/card.c | 7 +-
+ drivers/staging/vt6656/channel.c | 45 +-
+ drivers/staging/vt6656/channel.h | 12 +-
+ drivers/staging/vt6656/control.c | 2 +-
+ drivers/staging/vt6656/control.h | 14 +-
+ drivers/staging/vt6656/datarate.c | 69 +-
+ drivers/staging/vt6656/desc.h | 79 +-
+ drivers/staging/vt6656/device.h | 52 +-
+ drivers/staging/vt6656/device_cfg.h | 16 +-
+ drivers/staging/vt6656/dpc.c | 48 +-
+ drivers/staging/vt6656/firmware.c | 2 +-
+ drivers/staging/vt6656/int.c | 7 +-
+ drivers/staging/vt6656/int.h | 8 +-
+ drivers/staging/vt6656/iocmd.h | 16 +-
+ drivers/staging/vt6656/ioctl.c | 12 +-
+ drivers/staging/vt6656/iowpa.h | 47 +-
+ drivers/staging/vt6656/iwctl.c | 131 +-
+ drivers/staging/vt6656/iwctl.h | 4 +-
+ drivers/staging/vt6656/key.c | 34 +-
+ drivers/staging/vt6656/mac.c | 4 +-
+ drivers/staging/vt6656/mac.h | 8 +-
+ drivers/staging/vt6656/main_usb.c | 321 +-
+ drivers/staging/vt6656/mib.c | 25 +-
+ drivers/staging/vt6656/mib.h | 25 +-
+ drivers/staging/vt6656/michael.c | 4 +-
+ drivers/staging/vt6656/michael.h | 6 +-
+ drivers/staging/vt6656/power.c | 10 +-
+ drivers/staging/vt6656/power.h | 2 +-
+ drivers/staging/vt6656/rf.h | 19 +-
+ drivers/staging/vt6656/rndis.h | 2 +-
+ drivers/staging/vt6656/rxtx.c | 79 +-
+ drivers/staging/vt6656/rxtx.h | 6 +-
+ drivers/staging/vt6656/tether.h | 41 +-
+ drivers/staging/vt6656/tkip.c | 6 +-
+ drivers/staging/vt6656/ttype.h | 31 -
+ drivers/staging/vt6656/usbpipe.c | 99 +-
+ drivers/staging/vt6656/usbpipe.h | 33 +-
+ drivers/staging/vt6656/wcmd.c | 41 +-
+ drivers/staging/vt6656/wcmd.h | 3 -
+ drivers/staging/vt6656/wctl.c | 24 +-
+ drivers/staging/vt6656/wmgr.c | 75 +-
+ drivers/staging/vt6656/wmgr.h | 11 +-
+ drivers/staging/vt6656/wpa.c | 6 +-
+ drivers/staging/vt6656/wpa2.h | 18 +-
+ drivers/staging/vt6656/wpactl.c | 12 +-
+ drivers/staging/winbond/mac_structures.h | 144 +-
+ drivers/staging/winbond/phy_calibration.c | 834 ++--
+ drivers/staging/winbond/reg.c | 36 +-
+ drivers/staging/winbond/wbusb.c | 2 +-
+ drivers/staging/wlags49_h2/hcf.c | 2 +-
+ drivers/staging/wlags49_h2/mdd.h | 4 +-
+ drivers/staging/wlags49_h2/wl_cs.c | 499 +--
+ drivers/staging/wlags49_h2/wl_cs.h | 2 -
+ drivers/staging/wlags49_h2/wl_netdev.c | 4 +-
+ drivers/staging/wlags49_h2/wl_pci.c | 16 +-
+ drivers/staging/wlags49_h2/wl_pci.h | 8 +-
+ drivers/staging/wlags49_h2/wl_profile.c | 2 +-
+ drivers/staging/wlags49_h2/wl_util.c | 37 +-
+ drivers/staging/wlags49_h2/wl_util.h | 2 -
+ drivers/staging/wlan-ng/Kconfig | 2 +-
+ drivers/staging/wlan-ng/Makefile | 1 -
+ drivers/staging/wlan-ng/cfg80211.c | 760 ++++
+ drivers/staging/wlan-ng/hfa384x.h | 4 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 34 +-
+ drivers/staging/wlan-ng/p80211conv.c | 70 +-
+ drivers/staging/wlan-ng/p80211conv.h | 42 +-
+ drivers/staging/wlan-ng/p80211hdr.h | 24 +-
+ drivers/staging/wlan-ng/p80211ioctl.h | 4 +-
+ drivers/staging/wlan-ng/p80211meta.h | 16 +-
+ drivers/staging/wlan-ng/p80211metastruct.h | 62 +-
+ drivers/staging/wlan-ng/p80211mgmt.h | 24 +-
+ drivers/staging/wlan-ng/p80211msg.h | 4 +-
+ drivers/staging/wlan-ng/p80211netdev.c | 77 +-
+ drivers/staging/wlan-ng/p80211netdev.h | 9 +-
+ drivers/staging/wlan-ng/p80211req.c | 18 +-
+ drivers/staging/wlan-ng/p80211wext.c | 1690 -------
+ drivers/staging/wlan-ng/prism2fw.c | 118 +-
+ drivers/staging/wlan-ng/prism2mgmt.c | 24 +-
+ drivers/staging/wlan-ng/prism2mib.c | 76 +-
+ drivers/staging/wlan-ng/prism2sta.c | 91 +-
+ drivers/staging/wlan-ng/prism2usb.c | 2 +-
+ drivers/staging/xgifb/XGI.h | 10 -
+ drivers/staging/xgifb/XGI_accel.c | 307 --
+ drivers/staging/xgifb/XGI_accel.h | 14 +-
+ drivers/staging/xgifb/XGI_main.h | 182 +-
+ drivers/staging/xgifb/XGI_main_26.c | 255 +-
+ drivers/staging/xgifb/XGIfb.h | 31 +-
+ drivers/staging/xgifb/osdef.h | 153 -
+ drivers/staging/xgifb/vb_def.h | 4 +-
+ drivers/staging/xgifb/vb_ext.c | 510 +--
+ drivers/staging/xgifb/vb_ext.h | 26 +-
+ drivers/staging/xgifb/vb_init.c | 895 ++---
+ drivers/staging/xgifb/vb_init.h | 4 +-
+ drivers/staging/xgifb/vb_setmode.c | 2060 ++++-----
+ drivers/staging/xgifb/vb_setmode.h | 66 +-
+ drivers/staging/xgifb/vb_struct.h | 951 ++--
+ drivers/staging/xgifb/vb_table.h | 633 ++--
+ drivers/staging/xgifb/vb_util.c | 137 +-
+ drivers/staging/xgifb/vb_util.h | 20 +-
+ drivers/staging/xgifb/vgatypes.h | 271 +-
+ drivers/staging/zram/Kconfig | 29 +
+ drivers/staging/zram/Makefile | 3 +
+ drivers/staging/{ramzswap => zram}/xvmalloc.c | 0
+ drivers/staging/{ramzswap => zram}/xvmalloc.h | 0
+ drivers/staging/{ramzswap => zram}/xvmalloc_int.h | 0
+ drivers/staging/zram/zram.txt | 62 +
+ drivers/staging/zram/zram_drv.c | 805 ++++
+ .../{ramzswap/ramzswap_drv.h => zram/zram_drv.h} | 71 +-
+ .../ramzswap_ioctl.h => zram/zram_ioctl.h} | 21 +-
+ 812 files changed, 106309 insertions(+), 33791 deletions(-)
+ create mode 100644 drivers/staging/batman-adv/bat_debugfs.c
+ create mode 100644 drivers/staging/batman-adv/bat_debugfs.h
+ delete mode 100644 drivers/staging/batman-adv/device.c
+ create mode 100644 drivers/staging/batman-adv/icmp_socket.c
+ rename drivers/staging/batman-adv/{device.h => icmp_socket.h} (54%)
+ create mode 100644 drivers/staging/batman-adv/sysfs-class-net-batman-adv
+ create mode 100644 drivers/staging/batman-adv/sysfs-class-net-mesh
+ delete mode 100644 drivers/staging/dt3155/Kconfig
+ delete mode 100644 drivers/staging/dt3155/Makefile
+ delete mode 100644 drivers/staging/dt3155/TODO
+ delete mode 100644 drivers/staging/dt3155/allocator.README
+ delete mode 100644 drivers/staging/dt3155/allocator.c
+ delete mode 100644 drivers/staging/dt3155/allocator.h
+ delete mode 100644 drivers/staging/dt3155/dt3155.h
+ delete mode 100644 drivers/staging/dt3155/dt3155.sysvinit
+ delete mode 100644 drivers/staging/dt3155/dt3155_drv.c
+ delete mode 100644 drivers/staging/dt3155/dt3155_drv.h
+ delete mode 100644 drivers/staging/dt3155/dt3155_io.c
+ delete mode 100644 drivers/staging/dt3155/dt3155_io.h
+ delete mode 100644 drivers/staging/dt3155/dt3155_isr.c
+ delete mode 100644 drivers/staging/dt3155/dt3155_isr.h
+ create mode 100644 drivers/staging/easycap/Kconfig
+ create mode 100644 drivers/staging/easycap/Makefile
+ create mode 100644 drivers/staging/easycap/README
+ create mode 100644 drivers/staging/easycap/easycap.h
+ create mode 100644 drivers/staging/easycap/easycap_debug.h
+ create mode 100644 drivers/staging/easycap/easycap_ioctl.c
+ create mode 100644 drivers/staging/easycap/easycap_ioctl.h
+ create mode 100644 drivers/staging/easycap/easycap_low.c
+ create mode 100644 drivers/staging/easycap/easycap_main.c
+ create mode 100644 drivers/staging/easycap/easycap_settings.c
+ create mode 100644 drivers/staging/easycap/easycap_sound.c
+ create mode 100644 drivers/staging/easycap/easycap_sound.h
+ create mode 100644 drivers/staging/easycap/easycap_standard.h
+ create mode 100644 drivers/staging/easycap/easycap_testcard.c
+ create mode 100644 drivers/staging/hv/hv_timesource.c
+ create mode 100644 drivers/staging/iio/magnetometer/Kconfig
+ create mode 100644 drivers/staging/iio/magnetometer/Makefile
+ create mode 100644 drivers/staging/iio/magnetometer/hmc5843.c
+ delete mode 100644 drivers/staging/msm/lcdc_grapefruit.c
+ delete mode 100644 drivers/staging/msm/lcdc_st1_wxga.c
+ delete mode 100644 drivers/staging/msm/lcdc_wxga.c
+ delete mode 100644 drivers/staging/msm/mddi_toshiba_wvga.c
+ create mode 100644 drivers/staging/quickstart/Kconfig
+ create mode 100644 drivers/staging/quickstart/Makefile
+ create mode 100644 drivers/staging/quickstart/quickstart.c
+ delete mode 100644 drivers/staging/ramzswap/Kconfig
+ delete mode 100644 drivers/staging/ramzswap/Makefile
+ delete mode 100644 drivers/staging/ramzswap/ramzswap.txt
+ delete mode 100644 drivers/staging/ramzswap/ramzswap_drv.c
+ delete mode 100644 drivers/staging/rt3070/md4.h
+ delete mode 100644 drivers/staging/rtl8192u/ieee80211.h
+ create mode 100644 drivers/staging/solo6x10/Kconfig
+ create mode 100644 drivers/staging/solo6x10/Makefile
+ create mode 100644 drivers/staging/solo6x10/TODO
+ create mode 100644 drivers/staging/solo6x10/solo6010-core.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-disp.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-enc.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-g723.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-gpio.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-i2c.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-jpeg.h
+ create mode 100644 drivers/staging/solo6x10/solo6010-offsets.h
+ create mode 100644 drivers/staging/solo6x10/solo6010-osd-font.h
+ create mode 100644 drivers/staging/solo6x10/solo6010-p2m.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-registers.h
+ create mode 100644 drivers/staging/solo6x10/solo6010-tw28.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-tw28.h
+ create mode 100644 drivers/staging/solo6x10/solo6010-v4l2-enc.c
+ create mode 100644 drivers/staging/solo6x10/solo6010-v4l2.c
+ create mode 100644 drivers/staging/solo6x10/solo6010.h
+ create mode 100644 drivers/staging/spectra/Kconfig
+ create mode 100644 drivers/staging/spectra/Makefile
+ create mode 100644 drivers/staging/spectra/README
+ create mode 100644 drivers/staging/spectra/ffsdefs.h
+ create mode 100644 drivers/staging/spectra/ffsport.c
+ create mode 100644 drivers/staging/spectra/ffsport.h
+ create mode 100644 drivers/staging/spectra/flash.c
+ create mode 100644 drivers/staging/spectra/flash.h
+ create mode 100644 drivers/staging/spectra/lld.c
+ create mode 100644 drivers/staging/spectra/lld.h
+ create mode 100644 drivers/staging/spectra/lld_cdma.c
+ create mode 100644 drivers/staging/spectra/lld_cdma.h
+ create mode 100644 drivers/staging/spectra/lld_emu.c
+ create mode 100644 drivers/staging/spectra/lld_emu.h
+ create mode 100644 drivers/staging/spectra/lld_mtd.c
+ create mode 100644 drivers/staging/spectra/lld_mtd.h
+ create mode 100644 drivers/staging/spectra/lld_nand.c
+ create mode 100644 drivers/staging/spectra/lld_nand.h
+ create mode 100644 drivers/staging/spectra/nand_regs.h
+ create mode 100644 drivers/staging/spectra/spectraswconfig.h
+ create mode 100644 drivers/staging/tidspbridge/Documentation/CONTRIBUTORS
+ create mode 100644 drivers/staging/tidspbridge/Documentation/README
+ create mode 100644 drivers/staging/tidspbridge/Documentation/error-codes
+ create mode 100644 drivers/staging/tidspbridge/Kconfig
+ create mode 100644 drivers/staging/tidspbridge/Makefile
+ create mode 100644 drivers/staging/tidspbridge/TODO
+ create mode 100644 drivers/staging/tidspbridge/core/_cmm.h
+ create mode 100644 drivers/staging/tidspbridge/core/_deh.h
+ create mode 100644 drivers/staging/tidspbridge/core/_msg_sm.h
+ create mode 100644 drivers/staging/tidspbridge/core/_tiomap.h
+ create mode 100644 drivers/staging/tidspbridge/core/_tiomap_pwr.h
+ create mode 100644 drivers/staging/tidspbridge/core/chnl_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/dsp-clock.c
+ create mode 100644 drivers/staging/tidspbridge/core/io_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/msg_sm.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap3430.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.c
+ create mode 100644 drivers/staging/tidspbridge/core/tiomap_io.h
+ create mode 100644 drivers/staging/tidspbridge/core/ue_deh.c
+ create mode 100644 drivers/staging/tidspbridge/core/wdt.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/cload.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/dload_internal.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/doff.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/getsection.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/header.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/module_list.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/params.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table.h
+ create mode 100644 drivers/staging/tidspbridge/dynload/reloc_table_c6000.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/tramp.c
+ create mode 100644 drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
+ create mode 100644 drivers/staging/tidspbridge/gen/gb.c
+ create mode 100644 drivers/staging/tidspbridge/gen/gh.c
+ create mode 100644 drivers/staging/tidspbridge/gen/gs.c
+ create mode 100644 drivers/staging/tidspbridge/gen/uuidutil.c
+ create mode 100644 drivers/staging/tidspbridge/hw/EasiGlobal.h
+ create mode 100644 drivers/staging/tidspbridge/hw/MMUAccInt.h
+ create mode 100644 drivers/staging/tidspbridge/hw/MMURegAcM.h
+ create mode 100644 drivers/staging/tidspbridge/hw/hw_defs.h
+ create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.c
+ create mode 100644 drivers/staging/tidspbridge/hw/hw_mmu.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/_chnl_sm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/brddefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfg.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cfgdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnl.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnldefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/chnlpriv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/clk.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cmmdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/cod.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbc.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbldefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbll.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dblldefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dehdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dev.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/devdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/disp.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dispdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dmm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/drv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/drvdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspapi.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdeh.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspio.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspioctl.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/dynamic_loader.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gb.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/getsection.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gh.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/gs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/host_os.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/io.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/iodefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/ldr.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/list.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mbx_sh.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/memdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgr.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/mgrpriv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/msg.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/msgdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldr.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/node.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodedefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/nodepriv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/ntfy.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/proc.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/procpriv.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/pwr_sh.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rms_sh.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/rmstypes.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/services.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/strm.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/strmdefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/sync.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/utildefs.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
+ create mode 100644 drivers/staging/tidspbridge/include/dspbridge/wdt.h
+ create mode 100644 drivers/staging/tidspbridge/pmgr/chnl.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/chnlobj.h
+ create mode 100644 drivers/staging/tidspbridge/pmgr/cmm.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/cod.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/dbll.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/dev.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/dmm.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/dspapi.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/io.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/ioobj.h
+ create mode 100644 drivers/staging/tidspbridge/pmgr/msg.c
+ create mode 100644 drivers/staging/tidspbridge/pmgr/msgobj.h
+ create mode 100644 drivers/staging/tidspbridge/rmgr/dbdcd.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/disp.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/drv.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/drv_interface.h
+ create mode 100644 drivers/staging/tidspbridge/rmgr/dspdrv.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/mgr.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/nldr.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/node.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/proc.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/pwr.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/rmm.c
+ create mode 100644 drivers/staging/tidspbridge/rmgr/strm.c
+ create mode 100644 drivers/staging/tidspbridge/services/cfg.c
+ create mode 100644 drivers/staging/tidspbridge/services/ntfy.c
+ create mode 100644 drivers/staging/tidspbridge/services/services.c
+ create mode 100644 drivers/staging/tidspbridge/services/sync.c
+ create mode 100644 drivers/staging/vt6655/channel.c
+ create mode 100644 drivers/staging/vt6655/channel.h
+ create mode 100644 drivers/staging/wlan-ng/cfg80211.c
+ delete mode 100644 drivers/staging/wlan-ng/p80211wext.c
+ delete mode 100644 drivers/staging/xgifb/XGI.h
+ delete mode 100644 drivers/staging/xgifb/osdef.h
+ create mode 100644 drivers/staging/zram/Kconfig
+ create mode 100644 drivers/staging/zram/Makefile
+ rename drivers/staging/{ramzswap => zram}/xvmalloc.c (100%)
+ rename drivers/staging/{ramzswap => zram}/xvmalloc.h (100%)
+ rename drivers/staging/{ramzswap => zram}/xvmalloc_int.h (100%)
+ create mode 100644 drivers/staging/zram/zram.txt
+ create mode 100644 drivers/staging/zram/zram_drv.c
+ rename drivers/staging/{ramzswap/ramzswap_drv.h => zram/zram_drv.h} (69%)
+ rename drivers/staging/{ramzswap/ramzswap_ioctl.h => zram/zram_ioctl.h} (68%)
+Merging slabh/slabh
+$ git merge slabh/slabh
+Already up-to-date.
+Merging scsi-post-merge/merge-base:master
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master
+From ../next
+ * [new branch] scsi-post-merge/master -> scsi-post-merge/master
+$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base
+From ../next
+ * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base
+$ git checkout scsi-post-merge/master
+Switched to branch 'scsi-post-merge/master'
+$ git rebase --onto master scsi-post-merge/merge-base
+First, rewinding head to replay your work on top of it...
+Applying: [SCSI] be2iscsi: Add support for iscsi boot
+Applying: [SCSI] be2iscsi: Increase max sector
+Applying: [SCSI] be2iscsi: Driver Version change to 2.0.549.0
+Applying: [SCSI] be2iscsi: select ISCSI_BOOT_SYSFS
+Using index info to reconstruct a base tree...
+Falling back to patching base and 3-way merge...
+Auto-merging drivers/scsi/be2iscsi/Kconfig
+$ cd ../next
+$ git pull -f ../rebase-tmp scsi-post-merge/master
+From ../rebase-tmp
+ * branch scsi-post-merge/master -> FETCH_HEAD
+Updating fd213ea..2b850d9
+Fast-forward
+ drivers/scsi/be2iscsi/Kconfig | 1 +
+ drivers/scsi/be2iscsi/be_cmds.h | 147 ++++++++++++++++--
+ drivers/scsi/be2iscsi/be_iscsi.c | 76 ++++++----
+ drivers/scsi/be2iscsi/be_iscsi.h | 2 +
+ drivers/scsi/be2iscsi/be_main.c | 311 ++++++++++++++++++++++++++++++++++++++
+ drivers/scsi/be2iscsi/be_main.h | 7 +-
+ drivers/scsi/be2iscsi/be_mgmt.c | 71 +++++++++
+ 7 files changed, 567 insertions(+), 48 deletions(-)
+$ git am -3 ../patches/0001-cifs-include-linux-err.h-for-IS_ERR-and-PTR_ERR.patch
+Applying: cifs: include linux/err.h for IS_ERR and PTR_ERR
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..a0bb5da
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,26 @@
+Importing driver-core.current based on 2.6.35
+Unchanged quilt series driver-core.current
+Importing tty.current based on quilt/driver-core.current
+Unchanged quilt series tty.current
+Importing usb.current based on quilt/tty.current
+Unchanged quilt series usb.current
+Importing staging.current based on quilt/usb.current
+Unchanged quilt series staging.current
+Importing i2c based on 2.6.35-rc5-git3
+Unchanged quilt series i2c
+Importing jdelvare-hwmon based on 2.6.35-rc5-git3
+Unchanged quilt series jdelvare-hwmon
+Importing kernel-doc based on 2.6.35-rc3
+Unchanged quilt series kernel-doc
+Importing rr based on v2.6.35-rc6-19-g86c65a7
+Unchanged quilt series rr
+Importing device-mapper based on v2.6.35-rc5-176-gcd5b8f8
+Unchanged quilt series device-mapper
+Importing aoe based on v2.6.31-rc9
+Unchanged quilt series aoe
+Importing driver-core based on quilt/staging.current
+Unchanged quilt series driver-core
+Importing tty based on quilt/driver-core
+Unchanged quilt series tty
+Importing usb based on quilt/tty
+Unchanged quilt series usb
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..962f759
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20100805
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists