Add linux-next specific files for 20100518
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 0000000..e77c936
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,162 @@
+Name SHA1
+---- ----
+origin ba2e1c5f25a99dec3873745031ad23ce3fd79bff
+fixes be1066bbcd443a65df312fdecea7e4959adedb45
+arm-current e40152ee1e1c7a63f4777791863215e3faa37a86
+m68k-current 92183b346f02773dae09182c65f16b013f295d80
+powerpc-merge 131c6c9eddfa252e376edb4aeff9c7fe1b96a798
+sparc-current 28a1f533ae8606020238b840b82ae70a3f87609e
+scsi-rc-fixes 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a
+net-current c02db8c6290bb992442fec1407643c94cc414375
+sound-current 105ce39ca4fabf20e3211cae1abc8f037e6a1f7f
+pci-current fc2a093e7ad23e935aa29e349bc27173c92f1a95
+wireless-current b8d92c9c141ee3dc9b3537b1f0ffb4a54ea8d9b2
+kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870
+driver-core.current a45b31e4aa15c05767bfb208e6724ee458d83578
+tty.current a45b31e4aa15c05767bfb208e6724ee458d83578
+usb.current a45b31e4aa15c05767bfb208e6724ee458d83578
+staging.current a45b31e4aa15c05767bfb208e6724ee458d83578
+cpufreq-current fd187aaf980c45f1d16a94a846faa68e24de03c8
+input-current 64716b9a1b91ae93d2e07b4ad981a1c08964563f
+md-current 1176568de7e066c0be9e46c37503b9fd4730edcf
+audit-current def57543418a5f47debae28a0a9dea2effc11692
+crypto-current 180ce7e81030e1ef763d58f97f9ab840ff57d848
+ide-curent a9ddabc52ce3757a4331d6c1e8bf4065333cc51b
+dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442
+gcl-current 95b1ed2ac7ffe3205afc6f5a20320fbdb984da92
+arm ac1d426e825ab5778995f2f6f053ca2e6b45c622
+davinci 7735227e76e1660e448ec66c30e7bfd06f7cd9b7
+i.MX 4a31f2eff3b8fcf009db35f89eb222ed7835b6b9
+msm 3392c97d2b7e8d338c7205b0b4e0cae5d8f350ca
+omap 0b088e693d0f2126444b9e97ec7e716602d884e3
+pxa 19d6c13b56a78b3757e747f469285c2a546d634a
+samsung 9e733442c532c7c591d8f92e44c02ffc0caa3e5a
+avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc
+blackfin 39710479303fd3affb3e204e9a7a75cc676977b5
+cris f35d77645808d1b890abb1a36260bf228854259e
+ia64 81d24b3a593834d61b0e283bd7362cfa6ceb068e
+m68k 6987b1a7598bb48e021b99b2fe8309250db2318a
+m68knommu 1f93acba01a980404535af119c0acb59f3492943
+microblaze 1a798f46525464f95fe59ba0dec09cd83563cae7
+mips 0e866450e31761c1143ef641116a5cda3d0555a6
+parisc 25cf84cf377c0aae5dbcf937ea89bc7893db5176
+powerpc 1ed31d6db90d51010545921e59d369d2f92b7ac2
+4xx a89eda26753311d8ff2da64da621714b2f8d5dcc
+52xx-and-virtex ff0210f6f9ed59e8f761d045b8e979bd6e5cf93a
+galak 78f622377f7d31d988db350a43c5689dd5f31876
+s390 939e379e9e183ae6291ac7caa4a5e1dfadae4ccc
+sh a71ba09655d197f22938fffa6f5d210ff5134f98
+genesis 2f4c82c35a4be8462b7d0279e993a9147c960f5a
+sparc 3a5b27bf6f29574d667230c7e76e4b83fe3014e0
+xtensa 0c2345ea9b9632168921016aa658112ef722e80a
+ceph e6fd9bdb0491107edee349bacade024bfc98304e
+cifs 4065c802da7484fa36f8cdf10f18d087233ecb88
+configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5
+ecryptfs ae0660764caffebba056214a8450e7217430939f
+ext3 6e4d424e137362aa0496ebd65aab9591307c3aee
+ext4 de766fda10a9ea3f0d24cf78ec590cbc9edce22e
+fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5
+fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34
+gfs2 6a99be5d7b5973767b1ffa4fa68fed0738589c99
+jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598
+logfs 6f485b41875dbf5160c1990322469c1f65f77b28
+nfs 126e216a8730532dfb685205309275f87e3d133e
+nfsd 4dc6ec00f6347b72312fa41dfc587d5302b05544
+nilfs2 d240e06713007bba309b074a386b7072b73c31a6
+ocfs2 026635e443d12d99c6ed44accbab1cd123298a9a
+squashfs e0d1f70010dce062ccce1bbd940a661e60b82631
+udf c15d0fc0fc399d2639240b35ad7ed93ed5a59412
+v9fs ad94465037460dc0403684b41795b1abcf14181e
+ubifs 2fde99cb55fb9d9b88180512a5e8a5d939d27fec
+xfs 6ff75b78182c314112c1173edaab6c164c95d775
+vfs a79ef7ef8ff1db0c3726aa300008ecdc15278c38
+pci 33852cb03ee4cdb05dc6e3a21ec19a4ee63511a4
+hid 82c5a747fd94bce9bb566ea358e944870854ee3e
+i2c a0ede4fb02575244c0e95fe6b86c7cc435dbb963
+bjdooks-i2c bd588d8800abd6c6c92b85f07cc2c4a5780c7b8f
+jdelvare-hwmon d6762ed748464fe9466e30e630720f65fc76d5fd
+kernel-doc a18764a8431bcc8feb2434b55973948d5dd76ea2
+v4l-dvb 167241f1735ab92c368b7c6794cc1d506ff3d9bf
+kbuild fb994ecc2b1c214951366c2ba5d8b121f0010d1f
+kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810
+ide c48b24ba6db637e92f477ac2646be21e12b29f86
+libata c7a8209f766961eea4cfc6f22d2d6e06ef63546c
+infiniband ffebedb7ab3f7964a70a1771547b26af38a189d2
+acpi 1777f9af1f3236bb40f867ba06a37fa53691c8ce
+ieee1394 f2d7e01bbe8e250f3de255f805b71c7088eee778
+ubi be436f6238a17b8432b9de0212bcfc838afb1f85
+kvm 9d72e8f82d810fedc4be635c69ae853a0d60d2e9
+dlm 89d799d008710e048ee14df4f4e5441e9f4d5d50
+ibft 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a
+scsi 9cccde93fed1ca988eb2fb17ab9194bf7b5ed1b0
+async_tx 0b28330e39bbe0ffee4c56b09fc415fcec595ea3
+net 6811d58fc148c393f80a9f5a9db49d7e75cdc546
+wireless 0c348d7c1422d59a86d6fb37b53d75788043e50b
+mtd 11c93605faecfe6f9a28a6f3d14989bad077055a
+crypto 5bdd5ded95b3188d58ba43ac801b8849cbea1b16
+sound ac50e319e4bbc2de63e76539edb2b257f3f18f05
+cpufreq 81f07b43424f6c328b1c9f54277b24b9f627c9b7
+rr 23ca86e2f77dbec6c50fee8d082d7bdefaec5418
+mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c
+input 30ba3ead05763b172acaa65ae1be71af2a878940
+lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f
+block ba38039a046dd7e7482d0c8bb8e0bb9f620d007f
+device-mapper cafeca17acd526690a86b62f7c13e9a7a0c6c34b
+embedded 4744b43431e8613f920c5cba88346756f53c5165
+firmware 6e03a201bbe8137487f340d26aa662110e324b20
+pcmcia acd200bf45487271d54f05938ad9e30f32a530ee
+battery 06b9e650ce5eaf14ac1486b2f05baaf2ba22ad22
+leds 34f3b3aa6713dede7dc894d7cbfdc281c67c1df0
+backlight d78a2afe03ba90ab68753df75260f09e4fedf937
+kgdb 61e2aba62ec09b9100d23b7efc64ec02c00fca24
+slab 85d75b0eef070523d97dd73d7122513837b45cb5
+uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298
+md eb6c26a9b1240faaf1c6e41adcd8d38ae24664a2
+mfd df7a1c8065653227f6983acc8442e62a63de26c0
+hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91
+drm 8bf3aae6214792a5f758fb6f82cf25a98ac8e5a0
+viafb ec66841e495b9ab4f92bdf91efe8cf56e1471fbd
+voltage 70d12bfcd0ce6da5f318a68aa8abae7f715bfb6e
+security-testing 4d09ec0f705cf88a12add029c058b53f288cfaa2
+lblnet 86d710146fb9975f04c505ec78caa43d227c1018
+agp 7f32e2e05c240201b42b58dec1b4a072e2127792
+uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259
+watchdog acae735ba4a1b0ca871c30e9214dc5b19cce6d7b
+bdev feaf3848a813a106f163013af6fcf6c4bfec92d9
+dwmw2-iommu 4f506e07e0a3dff34427cece255a8f390a78d5a0
+cputime 96830a57de1197519b62af6a4c9ceea556c18c3d
+osd ddf08f4b90a413892bbb9bb2e8a57aed991cd47d
+jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94
+nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32
+trivial 7db82437cfcac4bdfe79a6323eb554fdfa271623
+audit def57543418a5f47debae28a0a9dea2effc11692
+aoe c3643395dc3b8d47932e2bbc2992532ae88ee522
+suspend 25f3a5a2854dce8b8413fd24cc9d5b9e3632be54
+bluetooth 2b0b05ddc04b6d45e71cd36405df512075786f1e
+fsnotify a663c31fafdd9dc316edcaae2aacc24ccb8eb692
+irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554
+drbd 5c3c7e64bbcb60db39d0d55c8fab39ef41d41c30
+catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f
+alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d
+i7core_edac 508fa179f8e0da5d7241e12ad1562b96f291e800
+devicetree b08369db1245efba77a528301f1b517ce68bf3e2
+spi fa3a16126e660847f34daa369c4671afa5854d13
+omap_dss2 0125f6d3995db17b9d28ac8fe16f89d800ddecde
+tip 392348bfa7aa5d9c5da003ed7a675fb4248c3f97
+edac-amd 5b89d2f9ace1970324facc68ca9b8fae19ce8096
+oprofile 45c34e05c4e3d36e7c44e790241ea11a1d90d54e
+percpu 308eb7add8adaca8088c28a3f7610069b70d1ad6
+workqueues 4d707b9f48e2c4aa94b96f1133813b73df71fb55
+sfi 011a606d0670196c17110b6770e39cc0865aa614
+asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf
+hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e
+sysctl c656ae95d1c5c8ed5763356263ace2d03087efec
+bkl-core b8bc1389b74c2b66255651a6fcfae56c78b6e63f
+bkl-procfs 99df95a22f7cfcf85405d4edc07c2d953542f0dd
+bkl-ioctl d6c89d9aca0933d90ab926bf448b32f24a163792
+driver-core 47207fd900f4aeb48e0c2e75343deb52ec5fb104
+tty 97c1de418e0589115593419e720bbcacce6e3414
+usb 9f50507cb967122f03a6be7efd9d3fe29126d329
+staging-next 59497bba59035a2b09ac21f96bb904d1101bd95f
+slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c
+scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 0000000..2a821dc
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,164 @@
+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://repo.or.cz/linux-kbuild.git#for-linus
+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
+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
+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
+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://repo.or.cz/linux-kbuild.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
+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
+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/
+mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next
+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
+drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens
+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
+omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next
+tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest
+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
+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..6ee44f3
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,10197 @@
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at e40152e Linus 2.6.34
+Merging origin/master
+$ git merge origin/master
+Updating e40152e..ba2e1c5f
+Fast-forward
+ arch/alpha/include/asm/atomic.h | 4 +-
+ arch/arm/include/asm/atomic.h | 2 +-
+ arch/avr32/include/asm/atomic.h | 2 +-
+ arch/cris/include/asm/atomic.h | 2 +-
+ arch/frv/include/asm/atomic.h | 2 +-
+ arch/h8300/include/asm/atomic.h | 2 +-
+ arch/ia64/include/asm/atomic.h | 4 +-
+ arch/m32r/include/asm/atomic.h | 2 +-
+ arch/m68k/amiga/Makefile | 2 +-
+ arch/m68k/amiga/platform.c | 83 ++++++++++++
+ arch/m68k/bvme6000/rtc.c | 29 ++---
+ arch/m68k/hp300/time.h | 4 +-
+ arch/m68k/include/asm/atomic_mm.h | 2 +-
+ arch/m68k/include/asm/atomic_no.h | 2 +-
+ arch/m68k/include/asm/bitops_mm.h | 14 +-
+ arch/m68k/include/asm/param.h | 16 +--
+ arch/m68k/kernel/traps.c | 2 +-
+ arch/m68k/mac/config.c | 10 +-
+ arch/m68k/mm/fault.c | 14 +--
+ arch/m68k/mvme16x/rtc.c | 19 +--
+ arch/m68k/q40/config.c | 2 +-
+ arch/mips/include/asm/atomic.h | 4 +-
+ arch/mn10300/include/asm/atomic.h | 2 +-
+ arch/parisc/include/asm/atomic.h | 4 +-
+ arch/sh/include/asm/atomic.h | 2 +-
+ arch/sparc/include/asm/atomic_32.h | 2 +-
+ arch/sparc/include/asm/atomic_64.h | 4 +-
+ arch/x86/include/asm/atomic.h | 2 +-
+ arch/x86/include/asm/atomic64_64.h | 2 +-
+ arch/xtensa/include/asm/atomic.h | 2 +-
+ drivers/base/platform.c | 4 +-
+ drivers/block/amiflop.c | 47 +++----
+ drivers/char/serial167.c | 2 -
+ drivers/net/a2065.c | 1 +
+ drivers/net/ariadne.c | 1 +
+ drivers/net/hydra.c | 1 +
+ drivers/net/zorro8390.c | 1 +
+ drivers/scsi/zorro7xx.c | 1 +
+ drivers/video/amifb.c | 49 +++++---
+ drivers/video/cirrusfb.c | 1 +
+ drivers/video/fm2fb.c | 1 +
+ drivers/zorro/proc.c | 6 +-
+ drivers/zorro/zorro-driver.c | 24 ++++
+ drivers/zorro/zorro-sysfs.c | 11 ++
+ drivers/zorro/zorro.c | 243 ++++++++++++++++++-----------------
+ fs/logfs/dev_bdev.c | 6 +
+ fs/logfs/dev_mtd.c | 26 ++++-
+ fs/logfs/file.c | 16 ++-
+ fs/logfs/gc.c | 49 +++----
+ fs/logfs/inode.c | 6 +-
+ fs/logfs/journal.c | 7 +-
+ fs/logfs/logfs.h | 13 +-
+ fs/logfs/readwrite.c | 19 ++-
+ fs/logfs/segment.c | 7 +-
+ fs/logfs/super.c | 8 +-
+ include/asm-generic/atomic.h | 2 +-
+ include/linux/mod_devicetable.h | 9 ++
+ include/linux/platform_device.h | 6 +-
+ include/linux/types.h | 4 +-
+ include/linux/zorro.h | 22 +---
+ kernel/ptrace.c | 11 --
+ scripts/mod/file2alias.c | 14 ++
+ sound/oss/dmasound/dmasound_paula.c | 51 +++++---
+ 63 files changed, 536 insertions(+), 376 deletions(-)
+ create mode 100644 arch/m68k/amiga/platform.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
+Already up-to-date.
+Merging scsi-rc-fixes/master
+$ git merge scsi-rc-fixes/master
+Merge made by recursive.
+ drivers/scsi/libsas/sas_ata.c | 5 +++--
+ drivers/scsi/libsas/sas_scsi_host.c | 16 ++++++++--------
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+Merging net-current/master
+$ git merge net-current/master
+Already up-to-date.
+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
+Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
+Auto-merging net/mac80211/work.c
+Merge made by recursive.
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++
+ drivers/net/wireless/iwlwifi/iwl-dev.h | 2 ++
+ net/mac80211/work.c | 27 +++++++++++++++++++++++++--
+ 3 files changed, 33 insertions(+), 2 deletions(-)
+Merging kbuild-current/for-linus
+$ git merge kbuild-current/for-linus
+Already up-to-date.
+Merging quilt/driver-core.current
+$ git merge quilt/driver-core.current
+Merge made by recursive.
+ drivers/base/cpu.c | 2 +-
+ drivers/base/firmware_class.c | 26 ++++++++++++++++++++------
+ include/linux/firmware.h | 1 +
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+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
+Merge made by recursive.
+ drivers/input/serio/i8042-x86ia64io.h | 30 +++++++++++++++++++++++++++++-
+ 1 files changed, 29 insertions(+), 1 deletions(-)
+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/cmd640.c | 6 ++----
+ drivers/ide/ide_platform.c | 1 +
+ drivers/ide/pdc202xx_old.c | 5 +++--
+ include/linux/ide.h | 4 ++--
+ 4 files changed, 8 insertions(+), 8 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
+Auto-merging MAINTAINERS
+Removing arch/arm/common/icst307.c
+Removing arch/arm/common/icst525.c
+Removing arch/arm/include/asm/hardware/icst307.h
+Removing arch/arm/include/asm/hardware/icst525.h
+Removing arch/arm/mach-integrator/common.h
+Removing arch/arm/mach-pxa/corgi_lcd.c
+Removing arch/arm/mach-pxa/corgi_ssp.c
+Removing arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
+Removing arch/arm/mach-pxa/include/mach/ssp.h
+Removing arch/arm/mach-pxa/ssp.c
+Removing arch/arm/mach-realview/clock.c
+Removing arch/arm/mach-realview/clock.h
+Removing arch/arm/mach-versatile/clock.c
+Removing arch/arm/mach-versatile/clock.h
+Removing arch/arm/oprofile/backtrace.c
+Removing arch/arm/oprofile/op_arm_model.h
+Removing arch/arm/oprofile/op_counter.h
+Removing arch/arm/oprofile/op_model_arm11_core.c
+Removing arch/arm/oprofile/op_model_arm11_core.h
+Removing arch/arm/oprofile/op_model_mpcore.c
+Removing arch/arm/oprofile/op_model_mpcore.h
+Removing arch/arm/oprofile/op_model_v6.c
+Removing arch/arm/oprofile/op_model_v7.c
+Removing arch/arm/oprofile/op_model_v7.h
+Removing arch/arm/oprofile/op_model_xscale.c
+Removing drivers/input/keyboard/corgikbd.c
+Removing drivers/input/keyboard/spitzkbd.c
+Removing drivers/input/keyboard/tosakbd.c
+Removing drivers/input/touchscreen/corgi_ts.c
+Merge made by recursive.
+ Documentation/arm/00-INDEX | 2 +
+ Documentation/arm/SPEAr/overview.txt | 60 +
+ Documentation/feature-removal-schedule.txt | 23 -
+ MAINTAINERS | 72 +-
+ arch/arm/Kconfig | 171 +-
+ arch/arm/Makefile | 10 +-
+ arch/arm/boot/compressed/Makefile | 1 +
+ arch/arm/boot/compressed/decompress.c | 4 +
+ arch/arm/boot/compressed/piggy.lzma.S | 6 +
+ arch/arm/common/Kconfig | 5 +-
+ arch/arm/common/Makefile | 4 +-
+ arch/arm/common/clkdev.c | 7 +-
+ arch/arm/common/icst.c | 100 +
+ arch/arm/common/icst307.c | 161 --
+ arch/arm/common/icst525.c | 160 --
+ arch/arm/common/pl330.c | 1966 ++++++++++++++++++++
+ arch/arm/common/vic.c | 107 +-
+ arch/arm/configs/cns3420vb_defconfig | 831 +++++++++
+ arch/arm/configs/mmp2_defconfig | 75 +-
+ arch/arm/configs/spear300_defconfig | 773 ++++++++
+ arch/arm/configs/spear310_defconfig | 775 ++++++++
+ arch/arm/configs/spear320_defconfig | 775 ++++++++
+ arch/arm/configs/spear600_defconfig | 760 ++++++++
+ arch/arm/configs/stamp9g20_defconfig | 1456 +++++++++++++++
+ arch/arm/include/asm/hardware/arm_timer.h | 39 +-
+ arch/arm/include/asm/hardware/cache-l2x0.h | 3 +
+ arch/arm/include/asm/hardware/icst.h | 59 +
+ arch/arm/include/asm/hardware/icst307.h | 38 -
+ arch/arm/include/asm/hardware/icst525.h | 36 -
+ arch/arm/include/asm/hardware/pl330.h | 217 +++
+ arch/arm/include/asm/hardware/sp810.h | 59 +
+ arch/arm/include/asm/ioctls.h | 3 +
+ arch/arm/include/asm/mach/pci.h | 11 +
+ arch/arm/include/asm/mach/time.h | 2 +-
+ arch/arm/include/asm/pci.h | 15 +
+ arch/arm/include/asm/perf_event.h | 17 +
+ arch/arm/include/asm/pgtable.h | 2 +-
+ arch/arm/include/asm/pmu.h | 32 +-
+ arch/arm/include/asm/scatterlist.h | 20 +-
+ arch/arm/include/asm/smp.h | 2 +-
+ arch/arm/include/asm/system.h | 2 +-
+ arch/arm/kernel/bios32.c | 3 +
+ arch/arm/kernel/dma.c | 36 +
+ arch/arm/kernel/perf_event.c | 928 +++++++++-
+ arch/arm/kernel/pmu.c | 127 +-
+ arch/arm/kernel/smp.c | 2 +-
+ arch/arm/kernel/time.c | 70 +-
+ arch/arm/mach-at91/Kconfig | 14 +
+ arch/arm/mach-at91/Makefile | 2 +
+ arch/arm/mach-at91/board-stamp9g20.c | 315 ++++
+ arch/arm/mach-at91/include/mach/board.h | 8 +-
+ arch/arm/mach-at91/include/mach/cpu.h | 4 +-
+ arch/arm/mach-at91/include/mach/system.h | 7 +-
+ arch/arm/mach-bcmring/arch.c | 16 +
+ arch/arm/mach-clps711x/mm.c | 1 -
+ arch/arm/mach-cns3xxx/Kconfig | 12 +
+ arch/arm/mach-cns3xxx/Makefile | 2 +
+ arch/arm/mach-cns3xxx/Makefile.boot | 3 +
+ arch/arm/mach-cns3xxx/cns3420vb.c | 148 ++
+ arch/arm/mach-cns3xxx/core.c | 249 +++
+ arch/arm/mach-cns3xxx/core.h | 23 +
+ arch/arm/mach-cns3xxx/include/mach/cns3xxx.h | 635 +++++++
+ arch/arm/mach-cns3xxx/include/mach/debug-macro.S | 21 +
+ arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 82 +
+ arch/arm/mach-cns3xxx/include/mach/hardware.h | 22 +
+ arch/arm/mach-cns3xxx/include/mach/io.h | 17 +
+ arch/arm/mach-cns3xxx/include/mach/irqs.h | 24 +
+ arch/arm/mach-cns3xxx/include/mach/memory.h | 26 +
+ arch/arm/mach-cns3xxx/include/mach/system.h | 29 +
+ arch/arm/mach-cns3xxx/include/mach/timex.h | 12 +
+ arch/arm/mach-cns3xxx/include/mach/uncompress.h | 55 +
+ arch/arm/mach-cns3xxx/include/mach/vmalloc.h | 11 +
+ arch/arm/mach-cns3xxx/pm.c | 86 +
+ arch/arm/mach-ep93xx/adssphere.c | 2 +-
+ arch/arm/mach-ep93xx/clock.c | 13 +
+ arch/arm/mach-ep93xx/core.c | 123 ++-
+ arch/arm/mach-ep93xx/edb93xx.c | 4 +-
+ arch/arm/mach-ep93xx/gesbc9312.c | 2 +-
+ arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 1 +
+ arch/arm/mach-ep93xx/include/mach/platform.h | 12 +
+ arch/arm/mach-ep93xx/micro9.c | 2 +-
+ arch/arm/mach-ep93xx/simone.c | 6 +-
+ arch/arm/mach-ep93xx/snappercl15.c | 6 +-
+ arch/arm/mach-ep93xx/ts72xx.c | 2 +-
+ arch/arm/mach-integrator/Kconfig | 1 +
+ arch/arm/mach-integrator/Makefile | 2 +-
+ arch/arm/mach-integrator/common.h | 2 -
+ arch/arm/mach-integrator/core.c | 127 +--
+ arch/arm/mach-integrator/cpu.c | 53 +-
+ arch/arm/mach-integrator/impd1.c | 43 +-
+ arch/arm/mach-integrator/include/mach/clkdev.h | 7 +-
+ .../arm/mach-integrator/include/mach/entry-macro.S | 1 +
+ arch/arm/mach-integrator/include/mach/hardware.h | 17 +-
+ arch/arm/mach-integrator/include/mach/platform.h | 54 +-
+ arch/arm/mach-integrator/integrator_ap.c | 166 ++-
+ arch/arm/mach-integrator/integrator_cp.c | 88 +-
+ arch/arm/mach-integrator/leds.c | 1 +
+ arch/arm/mach-integrator/pci_v3.c | 7 +-
+ arch/arm/mach-iop32x/n2100.c | 2 +-
+ arch/arm/mach-ixp4xx/common.c | 1 -
+ arch/arm/mach-kirkwood/Kconfig | 18 +
+ arch/arm/mach-kirkwood/Makefile | 3 +
+ arch/arm/mach-kirkwood/guruplug-setup.c | 131 ++
+ arch/arm/mach-kirkwood/netxbig_v2-setup.c | 415 +++++
+ arch/arm/mach-mmp/aspenite.c | 13 +
+ arch/arm/mach-mmp/include/mach/gpio.h | 2 +-
+ arch/arm/mach-mmp/include/mach/irqs.h | 10 +-
+ arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 187 ++-
+ arch/arm/mach-mmp/include/mach/mmp2.h | 14 +-
+ arch/arm/mach-mmp/include/mach/pxa168.h | 21 +
+ arch/arm/mach-mmp/include/mach/regs-apbc.h | 10 +-
+ arch/arm/mach-mmp/include/mach/regs-smc.h | 37 +
+ arch/arm/mach-mmp/include/mach/timex.h | 4 +
+ arch/arm/mach-mmp/jasper.c | 64 +
+ arch/arm/mach-mmp/mmp2.c | 52 +-
+ arch/arm/mach-mmp/pxa168.c | 15 +
+ arch/arm/mach-msm/Kconfig | 2 +
+ arch/arm/mach-nomadik/Kconfig | 1 +
+ arch/arm/mach-nomadik/Makefile | 2 +-
+ arch/arm/mach-nomadik/board-nhk8815.c | 10 +-
+ arch/arm/mach-nomadik/clock.c | 38 +-
+ arch/arm/mach-nomadik/clock.h | 1 -
+ arch/arm/mach-nomadik/cpu-8815.c | 83 +-
+ arch/arm/mach-nomadik/include/mach/gpio.h | 67 +-
+ arch/arm/mach-omap1/board-htcherald.c | 1 -
+ arch/arm/mach-omap2/devices.c | 34 +
+ arch/arm/mach-omap2/omap_hwmod.c | 1 -
+ arch/arm/mach-orion5x/dns323-setup.c | 1 +
+ arch/arm/mach-pxa/Kconfig | 57 +-
+ arch/arm/mach-pxa/Makefile | 4 +-
+ arch/arm/mach-pxa/cm-x300.c | 104 +-
+ arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +-
+ arch/arm/mach-pxa/corgi.c | 56 +-
+ arch/arm/mach-pxa/corgi_lcd.c | 288 ---
+ arch/arm/mach-pxa/corgi_pm.c | 77 +-
+ arch/arm/mach-pxa/corgi_ssp.c | 274 ---
+ arch/arm/mach-pxa/csb726.c | 11 +-
+ arch/arm/mach-pxa/em-x270.c | 2 +-
+ arch/arm/mach-pxa/generic.c | 31 -
+ arch/arm/mach-pxa/include/mach/corgi.h | 1 -
+ arch/arm/mach-pxa/include/mach/mfp-pxa2xx.h | 2 +
+ arch/arm/mach-pxa/include/mach/mmc.h | 2 +-
+ arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h | 375 ----
+ arch/arm/mach-pxa/include/mach/ssp.h | 109 --
+ arch/arm/mach-pxa/include/mach/tosa.h | 2 +-
+ arch/arm/mach-pxa/include/mach/vpac270.h | 42 +
+ arch/arm/mach-pxa/include/mach/z2.h | 41 +
+ arch/arm/mach-pxa/littleton.c | 3 +-
+ arch/arm/mach-pxa/lubbock.c | 2 +-
+ arch/arm/mach-pxa/mfp-pxa2xx.c | 43 +-
+ arch/arm/mach-pxa/mioa701.c | 2 +-
+ arch/arm/mach-pxa/mxm8x10.c | 2 +-
+ arch/arm/mach-pxa/palmld.c | 2 +-
+ arch/arm/mach-pxa/palmt5.c | 2 +-
+ arch/arm/mach-pxa/palmtc.c | 2 +-
+ arch/arm/mach-pxa/palmtx.c | 2 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 2 +-
+ arch/arm/mach-pxa/poodle.c | 5 +-
+ arch/arm/mach-pxa/pxa3xx.c | 1 -
+ arch/arm/mach-pxa/raumfeld.c | 2 +-
+ arch/arm/mach-pxa/sharpsl.h | 23 -
+ arch/arm/mach-pxa/sharpsl_pm.c | 1 -
+ arch/arm/mach-pxa/spitz.c | 6 +-
+ arch/arm/mach-pxa/spitz_pm.c | 28 +-
+ arch/arm/mach-pxa/ssp.c | 510 -----
+ arch/arm/mach-pxa/stargate2.c | 5 +-
+ arch/arm/mach-pxa/tosa.c | 2 +-
+ arch/arm/mach-pxa/trizeps4.c | 2 +-
+ arch/arm/mach-pxa/vpac270.c | 615 ++++++
+ arch/arm/mach-pxa/z2.c | 609 ++++++
+ arch/arm/mach-pxa/zeus.c | 2 +-
+ arch/arm/mach-pxa/zylonite.c | 6 +-
+ arch/arm/mach-realview/Makefile | 2 +-
+ arch/arm/mach-realview/clock.c | 64 -
+ arch/arm/mach-realview/clock.h | 19 -
+ arch/arm/mach-realview/core.c | 194 +--
+ arch/arm/mach-realview/hotplug.c | 2 +-
+ arch/arm/mach-realview/include/mach/clkdev.h | 9 +
+ arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 +
+ arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +-
+ arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +-
+ arch/arm/mach-realview/include/mach/platform.h | 20 -
+ arch/arm/mach-realview/realview_eb.c | 34 +-
+ arch/arm/mach-realview/realview_pb1176.c | 17 +-
+ arch/arm/mach-realview/realview_pb11mp.c | 34 +-
+ arch/arm/mach-realview/realview_pba8.c | 17 +-
+ arch/arm/mach-realview/realview_pbx.c | 32 +
+ arch/arm/mach-s3c2410/Kconfig | 1 +
+ arch/arm/mach-s3c2410/h1940-bluetooth.c | 32 +-
+ arch/arm/mach-s3c2410/include/mach/dma.h | 2 +-
+ arch/arm/mach-s3c2410/include/mach/gpio-fns.h | 47 +-
+ arch/arm/mach-s3c2410/include/mach/gpio-nrs.h | 12 +
+ arch/arm/mach-s3c2410/include/mach/irqs.h | 25 +-
+ arch/arm/mach-s3c2410/include/mach/map.h | 5 +-
+ arch/arm/mach-s3c2410/include/mach/regs-clock.h | 2 +
+ arch/arm/mach-s3c2410/include/mach/regs-dsc.h | 36 +
+ arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 45 +
+ arch/arm/mach-s3c2410/include/mach/regs-gpioj.h | 36 -
+ arch/arm/mach-s3c2410/include/mach/regs-irq.h | 10 +
+ .../mach-s3c2410/include/mach/regs-s3c2416-mem.h | 30 +
+ arch/arm/mach-s3c2410/include/mach/regs-s3c2416.h | 24 +
+ arch/arm/mach-s3c2410/include/mach/uncompress.h | 4 +-
+ arch/arm/mach-s3c2410/mach-amlm5900.c | 5 +-
+ arch/arm/mach-s3c2410/mach-bast.c | 9 +-
+ arch/arm/mach-s3c2410/mach-h1940.c | 20 +-
+ arch/arm/mach-s3c2410/mach-n30.c | 7 +-
+ arch/arm/mach-s3c2410/mach-qt2410.c | 10 +-
+ arch/arm/mach-s3c2410/mach-vr1000.c | 5 +-
+ arch/arm/mach-s3c2410/s3c2410.c | 8 +
+ arch/arm/mach-s3c2412/Kconfig | 3 +-
+ arch/arm/mach-s3c2412/mach-jive.c | 26 +-
+ arch/arm/mach-s3c2412/mach-smdk2413.c | 8 +-
+ arch/arm/mach-s3c2416/Kconfig | 38 +
+ arch/arm/mach-s3c2416/Makefile | 19 +
+ arch/arm/mach-s3c2416/clock.c | 135 ++
+ arch/arm/mach-s3c2416/irq.c | 254 +++
+ arch/arm/mach-s3c2416/mach-smdk2416.c | 150 ++
+ arch/arm/mach-s3c2416/s3c2416.c | 128 ++
+ arch/arm/mach-s3c2440/Kconfig | 1 +
+ arch/arm/mach-s3c2440/mach-mini2440.c | 23 +-
+ arch/arm/mach-s3c2440/mach-nexcoder.c | 9 +-
+ arch/arm/mach-s3c2440/mach-osiris.c | 5 +-
+ arch/arm/mach-s3c2440/s3c2440.c | 8 +
+ arch/arm/mach-s3c2443/Kconfig | 1 +
+ arch/arm/mach-s3c2443/clock.c | 479 +-----
+ arch/arm/mach-s3c64xx/gpiolib.c | 6 +
+ arch/arm/mach-s3c64xx/include/mach/pll.h | 35 +-
+ arch/arm/mach-s5p6440/gpio.c | 5 +
+ arch/arm/mach-spear3xx/Kconfig | 33 +
+ arch/arm/mach-spear3xx/Kconfig300 | 17 +
+ arch/arm/mach-spear3xx/Kconfig310 | 17 +
+ arch/arm/mach-spear3xx/Kconfig320 | 17 +
+ arch/arm/mach-spear3xx/Makefile | 26 +
+ arch/arm/mach-spear3xx/Makefile.boot | 3 +
+ arch/arm/mach-spear3xx/clock.c | 389 ++++
+ arch/arm/mach-spear3xx/include/mach/clkdev.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/debug-macro.S | 14 +
+ arch/arm/mach-spear3xx/include/mach/entry-macro.S | 46 +
+ arch/arm/mach-spear3xx/include/mach/generic.h | 205 ++
+ arch/arm/mach-spear3xx/include/mach/gpio.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/hardware.h | 20 +
+ arch/arm/mach-spear3xx/include/mach/io.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/irqs.h | 152 ++
+ arch/arm/mach-spear3xx/include/mach/memory.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/misc_regs.h | 163 ++
+ arch/arm/mach-spear3xx/include/mach/spear.h | 144 ++
+ arch/arm/mach-spear3xx/include/mach/spear300.h | 83 +
+ arch/arm/mach-spear3xx/include/mach/spear310.h | 70 +
+ arch/arm/mach-spear3xx/include/mach/spear320.h | 96 +
+ arch/arm/mach-spear3xx/include/mach/system.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/timex.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/uncompress.h | 19 +
+ arch/arm/mach-spear3xx/include/mach/vmalloc.h | 19 +
+ arch/arm/mach-spear3xx/spear300.c | 468 +++++
+ arch/arm/mach-spear3xx/spear300_evb.c | 77 +
+ arch/arm/mach-spear3xx/spear310.c | 302 +++
+ arch/arm/mach-spear3xx/spear310_evb.c | 84 +
+ arch/arm/mach-spear3xx/spear320.c | 549 ++++++
+ arch/arm/mach-spear3xx/spear320_evb.c | 81 +
+ arch/arm/mach-spear3xx/spear3xx.c | 548 ++++++
+ arch/arm/mach-spear6xx/Kconfig | 20 +
+ arch/arm/mach-spear6xx/Kconfig600 | 17 +
+ arch/arm/mach-spear6xx/Makefile | 12 +
+ arch/arm/mach-spear6xx/Makefile.boot | 3 +
+ arch/arm/mach-spear6xx/clock.c | 483 +++++
+ arch/arm/mach-spear6xx/include/mach/clkdev.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/debug-macro.S | 14 +
+ arch/arm/mach-spear6xx/include/mach/entry-macro.S | 55 +
+ arch/arm/mach-spear6xx/include/mach/generic.h | 45 +
+ arch/arm/mach-spear6xx/include/mach/gpio.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/hardware.h | 21 +
+ arch/arm/mach-spear6xx/include/mach/io.h | 20 +
+ arch/arm/mach-spear6xx/include/mach/irqs.h | 97 +
+ arch/arm/mach-spear6xx/include/mach/memory.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/misc_regs.h | 173 ++
+ arch/arm/mach-spear6xx/include/mach/spear.h | 173 ++
+ arch/arm/mach-spear6xx/include/mach/spear600.h | 21 +
+ arch/arm/mach-spear6xx/include/mach/system.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/timex.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/uncompress.h | 19 +
+ arch/arm/mach-spear6xx/include/mach/vmalloc.h | 19 +
+ arch/arm/mach-spear6xx/spear600.c | 25 +
+ arch/arm/mach-spear6xx/spear600_evb.c | 51 +
+ arch/arm/mach-spear6xx/spear6xx.c | 158 ++
+ arch/arm/mach-u300/mmc.c | 3 +-
+ arch/arm/mach-ux500/Kconfig | 41 +-
+ arch/arm/mach-ux500/Makefile | 6 +-
+ arch/arm/mach-ux500/board-mop500.c | 134 +--
+ arch/arm/mach-ux500/board-u5500.c | 41 +
+ arch/arm/mach-ux500/clock.c | 501 +++++-
+ arch/arm/mach-ux500/clock.h | 125 ++
+ arch/arm/mach-ux500/cpu-db5500.c | 50 +
+ arch/arm/mach-ux500/{cpu-u8500.c => cpu-db8500.c} | 55 +-
+ arch/arm/mach-ux500/cpu.c | 99 +
+ arch/arm/mach-ux500/devices-db5500.c | 46 +
+ arch/arm/mach-ux500/devices-db8500.c | 107 ++
+ arch/arm/mach-ux500/devices.c | 88 +
+ arch/arm/mach-ux500/include/mach/db5500-regs.h | 103 +
+ arch/arm/mach-ux500/include/mach/db8500-regs.h | 135 ++
+ arch/arm/mach-ux500/include/mach/debug-macro.S | 12 +-
+ arch/arm/mach-ux500/include/mach/devices.h | 29 +
+ arch/arm/mach-ux500/include/mach/entry-macro.S | 2 +-
+ arch/arm/mach-ux500/include/mach/gpio.h | 50 +
+ arch/arm/mach-ux500/include/mach/hardware.h | 197 +-
+ arch/arm/mach-ux500/include/mach/irqs.h | 9 +-
+ arch/arm/mach-ux500/include/mach/setup.h | 24 +-
+ arch/arm/mach-ux500/platsmp.c | 13 +-
+ arch/arm/mach-versatile/Makefile | 2 +-
+ arch/arm/mach-versatile/clock.c | 65 -
+ arch/arm/mach-versatile/clock.h | 20 -
+ arch/arm/mach-versatile/core.c | 194 +--
+ arch/arm/mach-versatile/include/mach/clkdev.h | 9 +
+ arch/arm/mach-versatile/include/mach/entry-macro.S | 1 +
+ arch/arm/mach-versatile/include/mach/hardware.h | 3 +-
+ arch/arm/mach-versatile/include/mach/platform.h | 26 +-
+ arch/arm/mach-vexpress/Kconfig | 9 +
+ arch/arm/mach-vexpress/Makefile | 8 +
+ arch/arm/mach-vexpress/Makefile.boot | 3 +
+ arch/arm/mach-vexpress/core.h | 26 +
+ arch/arm/mach-vexpress/ct-ca9x4.c | 249 +++
+ arch/arm/mach-vexpress/headsmp.S | 39 +
+ arch/arm/mach-vexpress/include/mach/clkdev.h | 15 +
+ arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 47 +
+ arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 +
+ arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 +
+ arch/arm/mach-vexpress/include/mach/hardware.h | 1 +
+ arch/arm/mach-vexpress/include/mach/io.h | 28 +
+ arch/arm/mach-vexpress/include/mach/irqs.h | 4 +
+ arch/arm/mach-vexpress/include/mach/memory.h | 25 +
+ arch/arm/mach-vexpress/include/mach/motherboard.h | 121 ++
+ arch/arm/mach-vexpress/include/mach/smp.h | 21 +
+ arch/arm/mach-vexpress/include/mach/system.h | 37 +
+ arch/arm/mach-vexpress/include/mach/timex.h | 23 +
+ arch/arm/mach-vexpress/include/mach/uncompress.h | 52 +
+ arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 +
+ arch/arm/mach-vexpress/localtimer.c | 26 +
+ arch/arm/mach-vexpress/platsmp.c | 190 ++
+ arch/arm/mach-vexpress/v2m.c | 361 ++++
+ arch/arm/mm/Kconfig | 26 +-
+ arch/arm/mm/abort-ev7.S | 21 +
+ arch/arm/mm/alignment.c | 53 +-
+ arch/arm/mm/cache-l2x0.c | 39 +-
+ arch/arm/mm/copypage-fa.c | 2 +-
+ arch/arm/mm/fault-armv.c | 2 -
+ arch/arm/mm/fault.c | 5 +
+ arch/arm/mm/init.c | 34 -
+ arch/arm/mm/mm.h | 3 -
+ arch/arm/mm/mmu.c | 39 +-
+ arch/arm/nwfpe/fpmodule.c | 13 +-
+ arch/arm/oprofile/Makefile | 7 +-
+ arch/arm/oprofile/backtrace.c | 83 -
+ arch/arm/oprofile/common.c | 375 +++-
+ arch/arm/oprofile/op_arm_model.h | 35 -
+ arch/arm/oprofile/op_counter.h | 27 -
+ arch/arm/oprofile/op_model_arm11_core.c | 162 --
+ arch/arm/oprofile/op_model_arm11_core.h | 45 -
+ arch/arm/oprofile/op_model_mpcore.c | 306 ---
+ arch/arm/oprofile/op_model_mpcore.h | 61 -
+ arch/arm/oprofile/op_model_v6.c | 78 -
+ arch/arm/oprofile/op_model_v7.c | 415 -----
+ arch/arm/oprofile/op_model_v7.h | 103 -
+ arch/arm/oprofile/op_model_xscale.c | 444 -----
+ arch/arm/plat-iop/Makefile | 2 +
+ arch/arm/plat-iop/pmu.c | 40 +
+ arch/arm/plat-nomadik/Kconfig | 5 +
+ arch/arm/plat-nomadik/Makefile | 1 +
+ arch/arm/{mach-nomadik => plat-nomadik}/gpio.c | 188 ++-
+ arch/arm/plat-nomadik/include/plat/gpio.h | 70 +
+ arch/arm/plat-nomadik/timer.c | 145 +-
+ arch/arm/plat-pxa/Kconfig | 5 +
+ arch/arm/plat-pxa/Makefile | 3 +-
+ arch/arm/plat-pxa/include/plat/mfp.h | 7 +
+ .../regs-ssp.h => plat-pxa/include/plat/ssp.h} | 128 +-
+ arch/arm/plat-pxa/mfp.c | 1 +
+ arch/arm/plat-pxa/pmu.c | 33 +
+ arch/arm/plat-pxa/ssp.c | 224 +++
+ arch/arm/plat-s3c24xx/Kconfig | 7 +
+ arch/arm/plat-s3c24xx/Makefile | 1 +
+ arch/arm/plat-s3c24xx/common-smdk.c | 9 +-
+ arch/arm/plat-s3c24xx/cpu.c | 21 +
+ arch/arm/plat-s3c24xx/gpio.c | 144 +--
+ arch/arm/plat-s3c24xx/gpiolib.c | 60 +-
+ arch/arm/plat-s3c24xx/include/plat/pll.h | 25 +
+ arch/arm/plat-s3c24xx/include/plat/s3c2416.h | 31 +
+ arch/arm/plat-s3c24xx/include/plat/s3c2443.h | 19 +
+ arch/arm/plat-s3c24xx/pm.c | 9 +-
+ arch/arm/plat-s3c24xx/s3c2410-clock.c | 15 +-
+ arch/arm/plat-s3c24xx/s3c2443-clock.c | 472 +++++
+ arch/arm/plat-s3c24xx/setup-i2c.c | 5 +-
+ arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 16 +-
+ arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 16 +-
+ arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 16 +-
+ arch/arm/plat-samsung/clock.c | 15 +
+ arch/arm/plat-samsung/gpio-config.c | 103 +-
+ arch/arm/plat-samsung/include/plat/clock.h | 1 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 1 +
+ .../plat-samsung/include/plat/gpio-cfg-helpers.h | 58 +
+ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 11 +
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 3 +
+ arch/arm/plat-samsung/include/plat/pll6553x.h | 51 +
+ arch/arm/plat-spear/Kconfig | 31 +
+ arch/arm/plat-spear/Makefile | 8 +
+ arch/arm/plat-spear/clock.c | 435 +++++
+ arch/arm/plat-spear/include/plat/clkdev.h | 20 +
+ arch/arm/plat-spear/include/plat/clock.h | 126 ++
+ arch/arm/plat-spear/include/plat/debug-macro.S | 38 +
+ arch/arm/plat-spear/include/plat/gpio.h | 24 +
+ arch/arm/plat-spear/include/plat/io.h | 22 +
+ arch/arm/plat-spear/include/plat/memory.h | 20 +
+ arch/arm/plat-spear/include/plat/padmux.h | 92 +
+ arch/arm/plat-spear/include/plat/shirq.h | 73 +
+ arch/arm/plat-spear/include/plat/system.h | 41 +
+ arch/arm/plat-spear/include/plat/timex.h | 19 +
+ arch/arm/plat-spear/include/plat/uncompress.h | 43 +
+ arch/arm/plat-spear/include/plat/vmalloc.h | 19 +
+ arch/arm/plat-spear/padmux.c | 164 ++
+ arch/arm/plat-spear/shirq.c | 118 ++
+ arch/arm/plat-spear/time.c | 292 +++
+ arch/arm/plat-versatile/Makefile | 4 +
+ .../{mach-integrator => plat-versatile}/clock.c | 43 +-
+ arch/arm/plat-versatile/include/plat/clock.h | 15 +
+ arch/arm/plat-versatile/include/plat/timer-sp.h | 2 +
+ arch/arm/plat-versatile/sched-clock.c | 53 +
+ arch/arm/plat-versatile/timer-sp.c | 156 ++
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/input/keyboard/Kconfig | 48 -
+ drivers/input/keyboard/Makefile | 3 -
+ drivers/input/keyboard/corgikbd.c | 414 ----
+ drivers/input/keyboard/spitzkbd.c | 496 -----
+ drivers/input/keyboard/tosakbd.c | 431 -----
+ drivers/input/touchscreen/Kconfig | 16 -
+ drivers/input/touchscreen/Makefile | 1 -
+ drivers/input/touchscreen/corgi_ts.c | 385 ----
+ drivers/mmc/host/mmci.c | 19 +-
+ drivers/mmc/host/mmci.h | 6 +-
+ drivers/mmc/host/pxamci.c | 2 +-
+ drivers/pcmcia/Kconfig | 3 +-
+ drivers/pcmcia/Makefile | 1 +
+ drivers/pcmcia/pxa2xx_vpac270.c | 229 +++
+ drivers/serial/Kconfig | 7 +-
+ drivers/serial/atmel_serial.c | 207 ++-
+ drivers/spi/pxa2xx_spi.c | 25 +-
+ drivers/usb/gadget/at91_udc.c | 7 +
+ include/linux/amba/mmci.h | 23 +-
+ sound/soc/pxa/Kconfig | 1 +
+ sound/soc/pxa/pxa-ssp.c | 135 +-
+ 446 files changed, 28157 insertions(+), 8731 deletions(-)
+ create mode 100644 Documentation/arm/SPEAr/overview.txt
+ create mode 100644 arch/arm/boot/compressed/piggy.lzma.S
+ create mode 100644 arch/arm/common/icst.c
+ delete mode 100644 arch/arm/common/icst307.c
+ delete mode 100644 arch/arm/common/icst525.c
+ create mode 100644 arch/arm/common/pl330.c
+ create mode 100644 arch/arm/configs/cns3420vb_defconfig
+ create mode 100644 arch/arm/configs/spear300_defconfig
+ create mode 100644 arch/arm/configs/spear310_defconfig
+ create mode 100644 arch/arm/configs/spear320_defconfig
+ create mode 100644 arch/arm/configs/spear600_defconfig
+ create mode 100644 arch/arm/configs/stamp9g20_defconfig
+ create mode 100644 arch/arm/include/asm/hardware/icst.h
+ delete mode 100644 arch/arm/include/asm/hardware/icst307.h
+ delete mode 100644 arch/arm/include/asm/hardware/icst525.h
+ create mode 100644 arch/arm/include/asm/hardware/pl330.h
+ create mode 100644 arch/arm/include/asm/hardware/sp810.h
+ create mode 100644 arch/arm/mach-at91/board-stamp9g20.c
+ create mode 100644 arch/arm/mach-cns3xxx/Kconfig
+ create mode 100644 arch/arm/mach-cns3xxx/Makefile
+ create mode 100644 arch/arm/mach-cns3xxx/Makefile.boot
+ create mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c
+ create mode 100644 arch/arm/mach-cns3xxx/core.c
+ create mode 100644 arch/arm/mach-cns3xxx/core.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/cns3xxx.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/io.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/memory.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/system.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/timex.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-cns3xxx/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-cns3xxx/pm.c
+ delete mode 100644 arch/arm/mach-integrator/common.h
+ create mode 100644 arch/arm/mach-kirkwood/guruplug-setup.c
+ create mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c
+ create mode 100644 arch/arm/mach-mmp/include/mach/regs-smc.h
+ delete mode 100644 arch/arm/mach-pxa/corgi_lcd.c
+ delete mode 100644 arch/arm/mach-pxa/corgi_ssp.c
+ delete mode 100644 arch/arm/mach-pxa/include/mach/pxa2xx-gpio.h
+ delete mode 100644 arch/arm/mach-pxa/include/mach/ssp.h
+ create mode 100644 arch/arm/mach-pxa/include/mach/vpac270.h
+ create mode 100644 arch/arm/mach-pxa/include/mach/z2.h
+ delete mode 100644 arch/arm/mach-pxa/ssp.c
+ create mode 100644 arch/arm/mach-pxa/vpac270.c
+ create mode 100644 arch/arm/mach-pxa/z2.c
+ delete mode 100644 arch/arm/mach-realview/clock.c
+ delete mode 100644 arch/arm/mach-realview/clock.h
+ create mode 100644 arch/arm/mach-s3c2410/include/mach/regs-s3c2416-mem.h
+ create mode 100644 arch/arm/mach-s3c2410/include/mach/regs-s3c2416.h
+ create mode 100644 arch/arm/mach-s3c2416/Kconfig
+ create mode 100644 arch/arm/mach-s3c2416/Makefile
+ create mode 100644 arch/arm/mach-s3c2416/clock.c
+ create mode 100644 arch/arm/mach-s3c2416/irq.c
+ create mode 100644 arch/arm/mach-s3c2416/mach-smdk2416.c
+ create mode 100644 arch/arm/mach-s3c2416/s3c2416.c
+ create mode 100644 arch/arm/mach-spear3xx/Kconfig
+ create mode 100644 arch/arm/mach-spear3xx/Kconfig300
+ create mode 100644 arch/arm/mach-spear3xx/Kconfig310
+ create mode 100644 arch/arm/mach-spear3xx/Kconfig320
+ create mode 100644 arch/arm/mach-spear3xx/Makefile
+ create mode 100644 arch/arm/mach-spear3xx/Makefile.boot
+ create mode 100644 arch/arm/mach-spear3xx/clock.c
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/generic.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/io.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/memory.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/misc_regs.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/spear.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/spear300.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/spear310.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/spear320.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/system.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/timex.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-spear3xx/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-spear3xx/spear300.c
+ create mode 100644 arch/arm/mach-spear3xx/spear300_evb.c
+ create mode 100644 arch/arm/mach-spear3xx/spear310.c
+ create mode 100644 arch/arm/mach-spear3xx/spear310_evb.c
+ create mode 100644 arch/arm/mach-spear3xx/spear320.c
+ create mode 100644 arch/arm/mach-spear3xx/spear320_evb.c
+ create mode 100644 arch/arm/mach-spear3xx/spear3xx.c
+ create mode 100644 arch/arm/mach-spear6xx/Kconfig
+ create mode 100644 arch/arm/mach-spear6xx/Kconfig600
+ create mode 100644 arch/arm/mach-spear6xx/Makefile
+ create mode 100644 arch/arm/mach-spear6xx/Makefile.boot
+ create mode 100644 arch/arm/mach-spear6xx/clock.c
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/generic.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/io.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/memory.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/misc_regs.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/spear.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/spear600.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/system.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/timex.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-spear6xx/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-spear6xx/spear600.c
+ create mode 100644 arch/arm/mach-spear6xx/spear600_evb.c
+ create mode 100644 arch/arm/mach-spear6xx/spear6xx.c
+ create mode 100644 arch/arm/mach-ux500/board-u5500.c
+ create mode 100644 arch/arm/mach-ux500/clock.h
+ create mode 100644 arch/arm/mach-ux500/cpu-db5500.c
+ rename arch/arm/mach-ux500/{cpu-u8500.c => cpu-db8500.c} (53%)
+ create mode 100644 arch/arm/mach-ux500/cpu.c
+ create mode 100644 arch/arm/mach-ux500/devices-db5500.c
+ create mode 100644 arch/arm/mach-ux500/devices-db8500.c
+ create mode 100644 arch/arm/mach-ux500/devices.c
+ create mode 100644 arch/arm/mach-ux500/include/mach/db5500-regs.h
+ create mode 100644 arch/arm/mach-ux500/include/mach/db8500-regs.h
+ create mode 100644 arch/arm/mach-ux500/include/mach/devices.h
+ create mode 100644 arch/arm/mach-ux500/include/mach/gpio.h
+ delete mode 100644 arch/arm/mach-versatile/clock.c
+ delete mode 100644 arch/arm/mach-versatile/clock.h
+ create mode 100644 arch/arm/mach-vexpress/Kconfig
+ create mode 100644 arch/arm/mach-vexpress/Makefile
+ create mode 100644 arch/arm/mach-vexpress/Makefile.boot
+ create mode 100644 arch/arm/mach-vexpress/core.h
+ create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c
+ create mode 100644 arch/arm/mach-vexpress/headsmp.S
+ create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S
+ create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S
+ create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/io.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/system.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h
+ create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h
+ create mode 100644 arch/arm/mach-vexpress/localtimer.c
+ create mode 100644 arch/arm/mach-vexpress/platsmp.c
+ create mode 100644 arch/arm/mach-vexpress/v2m.c
+ delete mode 100644 arch/arm/oprofile/backtrace.c
+ delete mode 100644 arch/arm/oprofile/op_arm_model.h
+ delete mode 100644 arch/arm/oprofile/op_counter.h
+ delete mode 100644 arch/arm/oprofile/op_model_arm11_core.c
+ delete mode 100644 arch/arm/oprofile/op_model_arm11_core.h
+ delete mode 100644 arch/arm/oprofile/op_model_mpcore.c
+ delete mode 100644 arch/arm/oprofile/op_model_mpcore.h
+ delete mode 100644 arch/arm/oprofile/op_model_v6.c
+ delete mode 100644 arch/arm/oprofile/op_model_v7.c
+ delete mode 100644 arch/arm/oprofile/op_model_v7.h
+ delete mode 100644 arch/arm/oprofile/op_model_xscale.c
+ create mode 100644 arch/arm/plat-iop/pmu.c
+ rename arch/arm/{mach-nomadik => plat-nomadik}/gpio.c (74%)
+ create mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h
+ rename arch/arm/{mach-pxa/include/mach/regs-ssp.h => plat-pxa/include/plat/ssp.h} (75%)
+ create mode 100644 arch/arm/plat-pxa/pmu.c
+ create mode 100644 arch/arm/plat-pxa/ssp.c
+ create mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2416.h
+ create mode 100644 arch/arm/plat-s3c24xx/s3c2443-clock.c
+ create mode 100644 arch/arm/plat-samsung/include/plat/pll6553x.h
+ create mode 100644 arch/arm/plat-spear/Kconfig
+ create mode 100644 arch/arm/plat-spear/Makefile
+ create mode 100644 arch/arm/plat-spear/clock.c
+ create mode 100644 arch/arm/plat-spear/include/plat/clkdev.h
+ create mode 100644 arch/arm/plat-spear/include/plat/clock.h
+ create mode 100644 arch/arm/plat-spear/include/plat/debug-macro.S
+ create mode 100644 arch/arm/plat-spear/include/plat/gpio.h
+ create mode 100644 arch/arm/plat-spear/include/plat/io.h
+ create mode 100644 arch/arm/plat-spear/include/plat/memory.h
+ create mode 100644 arch/arm/plat-spear/include/plat/padmux.h
+ create mode 100644 arch/arm/plat-spear/include/plat/shirq.h
+ create mode 100644 arch/arm/plat-spear/include/plat/system.h
+ create mode 100644 arch/arm/plat-spear/include/plat/timex.h
+ create mode 100644 arch/arm/plat-spear/include/plat/uncompress.h
+ create mode 100644 arch/arm/plat-spear/include/plat/vmalloc.h
+ create mode 100644 arch/arm/plat-spear/padmux.c
+ create mode 100644 arch/arm/plat-spear/shirq.c
+ create mode 100644 arch/arm/plat-spear/time.c
+ create mode 100644 arch/arm/plat-versatile/Makefile
+ rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%)
+ create mode 100644 arch/arm/plat-versatile/include/plat/clock.h
+ create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h
+ create mode 100644 arch/arm/plat-versatile/sched-clock.c
+ create mode 100644 arch/arm/plat-versatile/timer-sp.c
+ delete mode 100644 drivers/input/keyboard/corgikbd.c
+ delete mode 100644 drivers/input/keyboard/spitzkbd.c
+ delete mode 100644 drivers/input/keyboard/tosakbd.c
+ delete mode 100644 drivers/input/touchscreen/corgi_ts.c
+ create mode 100644 drivers/pcmcia/pxa2xx_vpac270.c
+$ git am -3 ../patches/arm__update_gfp_slab.h_includes
+Applying: arm: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/arm/mach-vexpress/ct-ca9x4.c
+$ git add .
+$ git commit -v -a --amend
+[master b4be6f9] Merge remote branch 'arm/devel'
+Merging davinci/davinci-next
+$ git merge davinci/davinci-next
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arm/mach-davinci/da830.c
+Merge made by recursive.
+ arch/arm/Kconfig | 1 -
+ arch/arm/mach-davinci/Kconfig | 2 +
+ arch/arm/mach-davinci/board-da830-evm.c | 52 ++-
+ arch/arm/mach-davinci/board-da850-evm.c | 28 +-
+ arch/arm/mach-davinci/board-dm355-evm.c | 18 +-
+ arch/arm/mach-davinci/board-dm355-leopard.c | 18 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 12 +-
+ arch/arm/mach-davinci/board-dm644x-evm.c | 60 +--
+ arch/arm/mach-davinci/board-dm646x-evm.c | 22 +-
+ arch/arm/mach-davinci/board-neuros-osd2.c | 54 +--
+ arch/arm/mach-davinci/board-sffsdr.c | 20 +-
+ arch/arm/mach-davinci/cdce949.c | 1 +
+ arch/arm/mach-davinci/clock.c | 32 +-
+ arch/arm/mach-davinci/clock.h | 9 +-
+ arch/arm/mach-davinci/common.c | 57 ++-
+ arch/arm/mach-davinci/cp_intc.c | 22 +-
+ arch/arm/mach-davinci/da830.c | 29 +-
+ arch/arm/mach-davinci/da850.c | 30 +-
+ arch/arm/mach-davinci/devices-da8xx.c | 15 +-
+ arch/arm/mach-davinci/devices.c | 50 ++-
+ arch/arm/mach-davinci/dm355.c | 21 +-
+ arch/arm/mach-davinci/dm365.c | 34 +-
+ arch/arm/mach-davinci/dm644x.c | 21 +-
+ arch/arm/mach-davinci/dm646x.c | 53 +--
+ arch/arm/mach-davinci/dma.c | 234 +++++-----
+ arch/arm/mach-davinci/gpio.c | 160 ++++---
+ arch/arm/mach-davinci/include/mach/common.h | 32 +-
+ arch/arm/mach-davinci/include/mach/cp_intc.h | 3 +-
+ arch/arm/mach-davinci/include/mach/cputype.h | 8 +
+ arch/arm/mach-davinci/include/mach/da8xx.h | 29 +-
+ arch/arm/mach-davinci/include/mach/dm355.h | 3 +
+ arch/arm/mach-davinci/include/mach/dm365.h | 4 +
+ arch/arm/mach-davinci/include/mach/dm644x.h | 6 +
+ arch/arm/mach-davinci/include/mach/dm646x.h | 4 +-
+ arch/arm/mach-davinci/include/mach/gpio.h | 72 ++--
+ arch/arm/mach-davinci/include/mach/irqs.h | 97 ++++
+ arch/arm/mach-davinci/include/mach/mux.h | 290 +++++++++++-
+ arch/arm/mach-davinci/include/mach/psc.h | 55 ++-
+ arch/arm/mach-davinci/include/mach/serial.h | 1 -
+ arch/arm/mach-davinci/include/mach/system.h | 5 +-
+ arch/arm/mach-davinci/io.c | 20 +-
+ arch/arm/mach-davinci/irq.c | 7 +-
+ arch/arm/mach-davinci/mux.c | 19 +-
+ arch/arm/mach-davinci/mux.h | 2 +-
+ arch/arm/mach-davinci/psc.c | 10 +-
+ arch/arm/mach-davinci/serial.c | 34 +-
+ arch/arm/mach-davinci/time.c | 37 +-
+ drivers/rtc/Kconfig | 10 +
+ drivers/rtc/Makefile | 1 +
+ drivers/rtc/rtc-davinci.c | 673 ++++++++++++++++++++++++++
+ drivers/rtc/rtc-omap.c | 12 +-
+ 51 files changed, 1820 insertions(+), 669 deletions(-)
+ create mode 100644 drivers/rtc/rtc-davinci.c
+$ git am -3 ../patches/davinci__update_gfp_slab.h_includes
+Applying: davinci: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/rtc/rtc-davinci.c
+$ git add .
+$ git commit -v -a --amend
+[master 2445852] Merge remote branch 'davinci/davinci-next'
+Merging i.MX/for-next
+$ git merge i.MX/for-next
+Auto-merging arch/arm/mach-mx5/clock-mx51.c
+Merge made by recursive.
+ arch/arm/configs/mx51_defconfig | 17 ++-
+ arch/arm/mach-mx3/Kconfig | 1 +
+ arch/arm/mach-mx3/devices.c | 19 +++
+ arch/arm/mach-mx3/devices.h | 1 +
+ arch/arm/mach-mx3/mach-mx31_3ds.c | 55 +++++++
+ arch/arm/mach-mx3/mach-mx31lilly.c | 145 ++++++++++++++++++
+ arch/arm/mach-mx3/mach-mx31moboard.c | 104 +++++---------
+ arch/arm/mach-mx3/mx31lite-db.c | 1 +
+ arch/arm/mach-mx3/mx31moboard-devboard.c | 9 +
+ arch/arm/mach-mx3/mx31moboard-marxbot.c | 8 +
+ arch/arm/mach-mx3/mx31moboard-smartbot.c | 53 ++++++-
+ arch/arm/mach-mx5/board-mx51_babbage.c | 155 ++++++++++++++++++++
+ arch/arm/mach-mx5/clock-mx51.c | 45 ++++++
+ arch/arm/mach-mx5/devices.c | 94 ++++++++++++-
+ arch/arm/mach-mx5/devices.h | 3 +
+ arch/arm/plat-mxc/ehci.c | 100 ++++++++++++-
+ arch/arm/plat-mxc/gpio.c | 5 +-
+ arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 3 +-
+ arch/arm/plat-mxc/include/mach/iomux-mx51.h | 33 +++--
+ arch/arm/plat-mxc/include/mach/mxc_ehci.h | 14 ++-
+ arch/arm/plat-mxc/time.c | 46 +++---
+ arch/arm/plat-mxc/tzic.c | 4 +-
+ drivers/mmc/core/sdio.c | 6 +
+ drivers/mmc/host/mxcmmc.c | 114 +++++++++++++--
+ drivers/mtd/nand/mxc_nand.c | 125 +++++++++-------
+ drivers/usb/host/ehci-mxc.c | 4 +-
+ include/linux/mmc/host.h | 3 +
+ 27 files changed, 976 insertions(+), 191 deletions(-)
+Merging msm/for-next
+$ git merge msm/for-next
+Auto-merging MAINTAINERS
+Removing arch/arm/mach-msm/clock-7x01a.c
+Removing arch/arm/mach-msm/devices.c
+Merge made by recursive.
+ MAINTAINERS | 1 +
+ arch/arm/mach-msm/Kconfig | 92 ++-
+ arch/arm/mach-msm/Makefile | 23 +-
+ arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++
+ arch/arm/mach-msm/acpuclock.h | 32 +
+ arch/arm/mach-msm/board-halibut.c | 17 +-
+ arch/arm/mach-msm/board-mahimahi.c | 87 ++
+ arch/arm/mach-msm/board-msm7x27.c | 179 ++++
+ arch/arm/mach-msm/board-msm7x30.c | 120 +++
+ arch/arm/mach-msm/board-qsd8x50.c | 94 ++
+ arch/arm/mach-msm/board-sapphire.c | 118 +++
+ arch/arm/mach-msm/{board-dream.c => board-trout.c} | 8 +-
+ arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0
+ arch/arm/mach-msm/clock-7x01a.c | 126 ---
+ arch/arm/mach-msm/clock-7x30.h | 168 ++++
+ arch/arm/mach-msm/clock-pcom.c | 131 +++
+ arch/arm/mach-msm/clock-pcom.h | 153 +++
+ arch/arm/mach-msm/clock.c | 258 ++++--
+ arch/arm/mach-msm/clock.h | 71 ++-
+ arch/arm/mach-msm/devices-msm7x00.c | 393 ++++++++
+ arch/arm/mach-msm/devices-msm7x30.c | 128 +++
+ arch/arm/mach-msm/devices-qsd8x50.c | 92 ++
+ arch/arm/mach-msm/devices.c | 268 -----
+ arch/arm/mach-msm/devices.h | 11 +
+ arch/arm/mach-msm/dma.c | 28 +-
+ arch/arm/mach-msm/gpio.c | 85 ++
+ arch/arm/mach-msm/include/mach/board.h | 14 +-
+ arch/arm/mach-msm/include/mach/clk.h | 57 ++
+ arch/arm/mach-msm/include/mach/dma.h | 34 +-
+ arch/arm/mach-msm/include/mach/gpio.h | 142 +++
+ arch/arm/mach-msm/include/mach/io.h | 5 +
+ arch/arm/mach-msm/include/mach/irqs-7x00.h | 75 ++
+ arch/arm/mach-msm/include/mach/irqs-7x30.h | 170 ++++
+ arch/arm/mach-msm/include/mach/irqs-8x50.h | 105 ++
+ arch/arm/mach-msm/include/mach/irqs.h | 81 +--
+ arch/arm/mach-msm/include/mach/memory.h | 8 +
+ arch/arm/mach-msm/include/mach/msm_fb.h | 147 +++
+ arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 139 +++
+ arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 122 +++
+ arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 147 +++
+ arch/arm/mach-msm/include/mach/msm_iomap.h | 95 +--
+ arch/arm/mach-msm/include/mach/msm_smd.h | 109 ++
+ arch/arm/mach-msm/include/mach/sirc.h | 115 +++
+ arch/arm/mach-msm/include/mach/system.h | 5 +
+ arch/arm/mach-msm/include/mach/vreg.h | 2 +-
+ arch/arm/mach-msm/io.c | 75 ++-
+ arch/arm/mach-msm/irq-vic.c | 365 +++++++
+ arch/arm/mach-msm/irq.c | 4 +-
+ arch/arm/mach-msm/last_radio_log.c | 82 ++
+ arch/arm/mach-msm/proc_comm.c | 26 +-
+ arch/arm/mach-msm/proc_comm.h | 105 ++-
+ arch/arm/mach-msm/sirc.c | 177 ++++
+ arch/arm/mach-msm/smd.c | 1046 ++++++++++++++++++++
+ arch/arm/mach-msm/smd_debug.c | 315 ++++++
+ arch/arm/mach-msm/smd_private.h | 403 ++++++++
+ arch/arm/mach-msm/timer.c | 2 +
+ arch/arm/mach-msm/vreg.c | 154 +++-
+ drivers/mmc/host/msm_sdcc.c | 472 ++++++----
+ drivers/mmc/host/msm_sdcc.h | 15 +-
+ drivers/video/Kconfig | 1 -
+ include/linux/msm_mdp.h | 78 ++
+ 61 files changed, 7193 insertions(+), 908 deletions(-)
+ create mode 100644 arch/arm/mach-msm/acpuclock-arm11.c
+ create mode 100644 arch/arm/mach-msm/acpuclock.h
+ create mode 100644 arch/arm/mach-msm/board-mahimahi.c
+ create mode 100644 arch/arm/mach-msm/board-msm7x27.c
+ create mode 100644 arch/arm/mach-msm/board-msm7x30.c
+ create mode 100644 arch/arm/mach-msm/board-qsd8x50.c
+ create mode 100644 arch/arm/mach-msm/board-sapphire.c
+ rename arch/arm/mach-msm/{board-dream.c => board-trout.c} (93%)
+ rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%)
+ delete mode 100644 arch/arm/mach-msm/clock-7x01a.c
+ create mode 100644 arch/arm/mach-msm/clock-7x30.h
+ create mode 100644 arch/arm/mach-msm/clock-pcom.c
+ create mode 100644 arch/arm/mach-msm/clock-pcom.h
+ create mode 100644 arch/arm/mach-msm/devices-msm7x00.c
+ create mode 100644 arch/arm/mach-msm/devices-msm7x30.c
+ create mode 100644 arch/arm/mach-msm/devices-qsd8x50.c
+ delete mode 100644 arch/arm/mach-msm/devices.c
+ create mode 100644 arch/arm/mach-msm/gpio.c
+ create mode 100644 arch/arm/mach-msm/include/mach/clk.h
+ create mode 100644 arch/arm/mach-msm/include/mach/gpio.h
+ create mode 100644 arch/arm/mach-msm/include/mach/irqs-7x00.h
+ create mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h
+ create mode 100644 arch/arm/mach-msm/include/mach/irqs-8x50.h
+ create mode 100644 arch/arm/mach-msm/include/mach/msm_fb.h
+ create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+ create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+ create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+ create mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h
+ create mode 100644 arch/arm/mach-msm/include/mach/sirc.h
+ create mode 100644 arch/arm/mach-msm/irq-vic.c
+ create mode 100644 arch/arm/mach-msm/last_radio_log.c
+ create mode 100644 arch/arm/mach-msm/sirc.c
+ create mode 100644 arch/arm/mach-msm/smd.c
+ create mode 100644 arch/arm/mach-msm/smd_debug.c
+ create mode 100644 arch/arm/mach-msm/smd_private.h
+ create mode 100644 include/linux/msm_mdp.h
+Merging omap/for-next
+$ git merge omap/for-next
+Auto-merging arch/arm/mach-omap2/devices.c
+Removing arch/arm/mach-omap2/omap3-iommu.c
+Merge made by recursive.
+ arch/arm/configs/am3517_evm_defconfig | 92 +++++++-
+ arch/arm/configs/ams_delta_defconfig | 10 +-
+ arch/arm/configs/devkit8000_defconfig | 157 +++++++-----
+ arch/arm/configs/omap3_defconfig | 34 +--
+ arch/arm/configs/omap_4430sdp_defconfig | 57 +++++-
+ arch/arm/mach-omap1/Kconfig | 10 +
+ arch/arm/mach-omap1/Makefile | 1 +
+ arch/arm/mach-omap1/ams-delta-fiq-handler.S | 278 ++++++++++++++++++++++
+ arch/arm/mach-omap1/ams-delta-fiq.c | 155 ++++++++++++
+ arch/arm/mach-omap1/board-ams-delta.c | 18 ++-
+ arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 79 ++++++
+ arch/arm/mach-omap1/include/mach/debug-macro.S | 21 +--
+ arch/arm/mach-omap2/Kconfig | 1 +
+ arch/arm/mach-omap2/Makefile | 7 +-
+ arch/arm/mach-omap2/board-2430sdp.c | 21 ++-
+ arch/arm/mach-omap2/board-3430sdp.c | 1 +
+ arch/arm/mach-omap2/board-4430sdp.c | 128 +++++++----
+ arch/arm/mach-omap2/board-am3517evm.c | 166 ++++++++++++-
+ arch/arm/mach-omap2/board-cm-t35.c | 1 +
+ arch/arm/mach-omap2/board-devkit8000.c | 155 ++++++++++++
+ arch/arm/mach-omap2/board-omap3evm.c | 6 +-
+ arch/arm/mach-omap2/board-overo.c | 14 +-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 92 ++++++-
+ arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +-
+ arch/arm/mach-omap2/board-zoom2.c | 4 +-
+ arch/arm/mach-omap2/board-zoom3.c | 4 +-
+ arch/arm/mach-omap2/clock3xxx_data.c | 4 +-
+ arch/arm/mach-omap2/devices.c | 37 +++
+ arch/arm/mach-omap2/hsmmc.c | 27 ++-
+ arch/arm/mach-omap2/include/mach/am35xx.h | 20 ++-
+ arch/arm/mach-omap2/include/mach/debug-macro.S | 15 +-
+ arch/arm/mach-omap2/include/mach/omap4-common.h | 26 ++
+ arch/arm/mach-omap2/io.c | 9 +
+ arch/arm/mach-omap2/iommu2.c | 6 +-
+ arch/arm/mach-omap2/mux34xx.c | 86 -------
+ arch/arm/mach-omap2/omap-iommu.c | 157 ++++++++++++
+ arch/arm/mach-omap2/omap-smp.c | 2 +-
+ arch/arm/mach-omap2/omap3-iommu.c | 105 --------
+ arch/arm/mach-omap2/omap4-common.c | 72 ++++++
+ arch/arm/mach-omap2/pm-debug.c | 3 +
+ arch/arm/mach-omap2/pm.h | 1 +
+ arch/arm/mach-omap2/pm24xx.c | 4 +-
+ arch/arm/mach-omap2/pm34xx.c | 62 +++--
+ arch/arm/plat-omap/Kconfig | 9 +-
+ arch/arm/plat-omap/common.c | 3 -
+ arch/arm/plat-omap/dma.c | 45 +++-
+ arch/arm/plat-omap/gpio.c | 236 ++++++++-----------
+ arch/arm/plat-omap/include/plat/common.h | 3 -
+ arch/arm/plat-omap/include/plat/gpio.h | 4 +-
+ arch/arm/plat-omap/include/plat/irqs.h | 4 +
+ arch/arm/plat-omap/include/plat/mmc.h | 4 +
+ arch/arm/plat-omap/include/plat/multi.h | 16 +-
+ arch/arm/plat-omap/include/plat/omap44xx.h | 3 +
+ arch/arm/plat-omap/include/plat/serial.h | 16 ++-
+ arch/arm/plat-omap/include/plat/uncompress.h | 44 ++--
+ arch/arm/plat-omap/iommu.c | 101 +++++---
+ arch/arm/plat-omap/iovmm.c | 9 +-
+ arch/arm/plat-omap/sram.c | 16 ++-
+ drivers/input/serio/Kconfig | 16 ++
+ drivers/input/serio/Makefile | 1 +
+ drivers/input/serio/ams_delta_serio.c | 177 ++++++++++++++
+ drivers/spi/Kconfig | 6 +-
+ 62 files changed, 2188 insertions(+), 675 deletions(-)
+ create mode 100644 arch/arm/mach-omap1/ams-delta-fiq-handler.S
+ create mode 100644 arch/arm/mach-omap1/ams-delta-fiq.c
+ create mode 100644 arch/arm/mach-omap1/include/mach/ams-delta-fiq.h
+ create mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h
+ create mode 100644 arch/arm/mach-omap2/omap-iommu.c
+ delete mode 100644 arch/arm/mach-omap2/omap3-iommu.c
+ create mode 100644 arch/arm/mach-omap2/omap4-common.c
+ create mode 100644 drivers/input/serio/ams_delta_serio.c
+Merging pxa/for-next
+$ git merge pxa/for-next
+Already up-to-date.
+Merging samsung/next-samsung
+$ git merge samsung/next-samsung
+Auto-merging arch/arm/Makefile
+Auto-merging arch/arm/mm/mmu.c
+Merge made by recursive.
+ arch/arm/Makefile | 2 +
+ arch/arm/mach-s3c2410/Kconfig | 1 +
+ arch/arm/mach-s3c2410/Makefile.boot | 10 +-
+ arch/arm/mach-s3c2410/mach-bast.c | 2 +-
+ arch/arm/mach-s3c2410/mach-h1940.c | 7 +-
+ arch/arm/mach-s3c2410/pm.c | 15 +-
+ arch/arm/mach-s3c2412/mach-jive.c | 2 +-
+ arch/arm/mach-s3c2412/mach-smdk2413.c | 6 +-
+ arch/arm/mach-s3c2440/Kconfig | 13 +
+ arch/arm/mach-s3c2440/Makefile | 1 +
+ arch/arm/mach-s3c2440/mach-rx1950.c | 582 ++++++++++++++
+ arch/arm/mach-s3c2440/mach-rx3715.c | 2 +-
+ arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +-
+ arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +-
+ arch/arm/mach-s3c64xx/Makefile | 1 +
+ arch/arm/mach-s3c64xx/clock.c | 10 +
+ arch/arm/mach-s3c64xx/dev-ts.c | 61 ++
+ arch/arm/mach-s3c64xx/mach-smdk6400.c | 2 +-
+ arch/arm/mach-s3c64xx/mach-smdk6410.c | 7 +-
+ arch/arm/mach-s5p6440/clock.c | 350 ++++++---
+ arch/arm/mach-s5p6440/cpu.c | 2 +-
+ arch/arm/mach-s5p6440/include/mach/pwm-clock.h | 24 +-
+ arch/arm/mach-s5p6442/cpu.c | 2 +-
+ arch/arm/mach-s5p6442/include/mach/pwm-clock.h | 21 +-
+ arch/arm/mach-s5pv210/clock.c | 833 +++++++++++++++++---
+ arch/arm/mach-s5pv210/cpu.c | 2 +-
+ arch/arm/mach-s5pv210/include/mach/pwm-clock.h | 21 +-
+ arch/arm/mm/mmu.c | 5 +-
+ arch/arm/plat-s3c24xx/devs.c | 22 +-
+ arch/arm/plat-s5p/clock.c | 13 +
+ arch/arm/plat-s5p/include/plat/s5p-clock.h | 2 +
+ arch/arm/plat-samsung/Kconfig | 11 +
+ arch/arm/plat-samsung/Makefile | 1 +
+ arch/arm/plat-samsung/dev-hwmon.c | 42 +
+ arch/arm/plat-samsung/include/plat/cpu.h | 3 +
+ arch/arm/plat-samsung/include/plat/hwmon.h | 10 +
+ .../mach => plat-samsung/include/plat}/ts.h | 2 +-
+ drivers/input/touchscreen/s3c2410_ts.c | 2 +-
+ 38 files changed, 1807 insertions(+), 289 deletions(-)
+ create mode 100644 arch/arm/mach-s3c2440/mach-rx1950.c
+ create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c
+ create mode 100644 arch/arm/plat-samsung/dev-hwmon.c
+ rename arch/arm/{mach-s3c2410/include/mach => plat-samsung/include/plat}/ts.h (92%)
+Merging avr32/avr32-arch
+$ git merge avr32/avr32-arch
+Already up-to-date.
+Merging blackfin/for-linus
+$ git merge blackfin/for-linus
+Already up-to-date.
+Merging cris/for-next
+$ git merge cris/for-next
+Merge made by recursive.
+ arch/cris/arch-v10/drivers/ds1302.c | 20 +++++++++++++++-----
+ arch/cris/arch-v10/drivers/pcf8563.c | 19 +++++++++++++++----
+ arch/cris/arch-v32/drivers/i2c.c | 22 ++++++++++++++--------
+ arch/cris/arch-v32/drivers/pcf8563.c | 21 ++++++++++++++++-----
+ 4 files changed, 60 insertions(+), 22 deletions(-)
+Merging ia64/test
+$ git merge ia64/test
+Merge made by recursive.
+ arch/ia64/Kconfig | 3 ---
+ arch/ia64/hp/common/sba_iommu.c | 8 ++++----
+ arch/ia64/include/asm/mmzone.h | 4 ----
+ arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 10 +++++-----
+ arch/ia64/kernel/entry.S | 8 ++++++++
+ arch/ia64/kernel/irq_ia64.c | 9 +++------
+ arch/ia64/kernel/process.c | 2 +-
+ arch/ia64/kernel/salinfo.c | 5 ++---
+ arch/ia64/kernel/topology.c | 4 ++--
+ arch/ia64/kernel/unaligned.c | 24 +++++-------------------
+ arch/ia64/mm/fault.c | 13 +++----------
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c | 4 ++--
+ 12 files changed, 35 insertions(+), 59 deletions(-)
+Merging m68k/for-next
+$ git merge m68k/for-next
+Merge made by recursive.
+ drivers/net/mac8390.c | 44 ++++++++++++++++++++++----------------------
+ 1 files changed, 22 insertions(+), 22 deletions(-)
+Merging m68knommu/for-next
+$ git merge m68knommu/for-next
+Merge made by recursive.
+ arch/m68k/include/asm/m520xsim.h | 4 +
+ arch/m68k/include/asm/m523xsim.h | 8 +
+ arch/m68k/include/asm/m5249sim.h | 6 +-
+ arch/m68k/include/asm/m527xsim.h | 10 ++
+ arch/m68k/include/asm/m528xsim.h | 67 +---------
+ arch/m68k/include/asm/m532xsim.h | 1 +
+ arch/m68k/include/asm/mcfqspi.h | 64 +++++++++
+ arch/m68knommu/Kconfig | 4 +
+ arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++
+ arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++
+ arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++
+ arch/m68knommu/platform/5272/intc.c | 39 +++++-
+ arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++
+ arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++
+ arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++
+ arch/m68knommu/platform/68328/ints.c | 8 +-
+ arch/m68knommu/platform/68360/ints.c | 8 +-
+ arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++-
+ arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++-
+ arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++-
+ 20 files changed, 1249 insertions(+), 102 deletions(-)
+ create mode 100644 arch/m68k/include/asm/mcfqspi.h
+Merging microblaze/next
+$ git merge microblaze/next
+Merge made by recursive.
+ arch/microblaze/include/asm/exceptions.h | 5 +
+ arch/microblaze/include/asm/system.h | 1 -
+ arch/microblaze/include/asm/unwind.h | 29 +++
+ arch/microblaze/kernel/Makefile | 2 +-
+ arch/microblaze/kernel/entry-nommu.S | 28 +++
+ arch/microblaze/kernel/entry.S | 27 ++
+ arch/microblaze/kernel/hw_exception_handler.S | 4 +-
+ arch/microblaze/kernel/stacktrace.c | 44 +---
+ arch/microblaze/kernel/traps.c | 91 +++----
+ arch/microblaze/kernel/unwind.c | 318 +++++++++++++++++++++++++
+ 10 files changed, 454 insertions(+), 95 deletions(-)
+ create mode 100644 arch/microblaze/include/asm/unwind.h
+ create mode 100644 arch/microblaze/kernel/unwind.c
+Merging mips/mips-for-linux-next
+$ git merge mips/mips-for-linux-next
+Resolved 'arch/mips/oprofile/op_model_loongson2.c' using previous resolution.
+Auto-merging arch/mips/math-emu/cp1emu.c
+Auto-merging arch/mips/oprofile/op_model_loongson2.c
+CONFLICT (content): Merge conflict in arch/mips/oprofile/op_model_loongson2.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f142de2] Merge remote branch 'mips/mips-for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/mips/Kconfig | 2 +
+ arch/mips/alchemy/common/dbdma.c | 101 +-
+ arch/mips/alchemy/common/irq.c | 174 +-
+ arch/mips/alchemy/common/power.c | 16 -
+ arch/mips/alchemy/devboards/pb1000/board_setup.c | 16 +-
+ arch/mips/alchemy/devboards/pb1100/board_setup.c | 5 -
+ arch/mips/alchemy/devboards/pb1200/board_setup.c | 6 -
+ arch/mips/alchemy/devboards/pb1500/board_setup.c | 5 -
+ arch/mips/alchemy/devboards/pb1550/board_setup.c | 5 -
+ arch/mips/ar7/platform.c | 17 +-
+ arch/mips/bcm63xx/gpio.c | 6 +-
+ arch/mips/configs/ar7_defconfig | 196 ++-
+ arch/mips/configs/bcm47xx_defconfig | 973 +++++---
+ arch/mips/configs/mtx1_defconfig | 2404 ++++++++------------
+ arch/mips/configs/rb532_defconfig | 521 +++--
+ arch/mips/include/asm/mach-au1x00/au1000.h | 34 +-
+ arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 4 -
+ arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 4 +-
+ .../asm/mach-loongson/cpu-feature-overrides.h | 2 +
+ arch/mips/include/asm/mach-loongson/gpio.h | 35 +
+ arch/mips/kernel/cpu-probe.c | 30 +
+ arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 4 +-
+ arch/mips/kernel/mips-mt-fpaff.c | 4 +-
+ arch/mips/kernel/setup.c | 21 -
+ arch/mips/kernel/traps.c | 2 +-
+ arch/mips/loongson/common/Makefile | 1 +
+ arch/mips/loongson/common/gpio.c | 139 ++
+ arch/mips/math-emu/cp1emu.c | 11 +-
+ arch/mips/oprofile/op_model_loongson2.c | 60 +-
+ arch/mips/powertv/asic/prealloc-calliope.c | 673 ++----
+ arch/mips/powertv/asic/prealloc-cronus.c | 668 ++----
+ arch/mips/powertv/asic/prealloc-cronuslite.c | 302 +--
+ arch/mips/powertv/asic/prealloc-zeus.c | 505 ++---
+ arch/mips/powertv/asic/prealloc.h | 70 +
+ drivers/rtc/rtc-cmos.c | 83 +-
+ drivers/video/tdfxfb.c | 4 +-
+ 36 files changed, 3348 insertions(+), 3755 deletions(-)
+ create mode 100644 arch/mips/include/asm/mach-loongson/gpio.h
+ create mode 100644 arch/mips/loongson/common/gpio.c
+ create mode 100644 arch/mips/powertv/asic/prealloc.h
+Merging parisc/next
+$ git merge parisc/next
+Already up-to-date.
+Merging powerpc/next
+$ git merge powerpc/next
+Auto-merging arch/powerpc/kernel/irq.c
+Removing drivers/misc/hdpuftrs/Makefile
+Removing drivers/misc/hdpuftrs/hdpu_cpustate.c
+Removing drivers/misc/hdpuftrs/hdpu_nexus.c
+Removing include/linux/hdpu_features.h
+Merge made by recursive.
+ Documentation/powerpc/dts-bindings/4xx/reboot.txt | 18 +
+ arch/powerpc/Kconfig | 1 +
+ arch/powerpc/Kconfig.debug | 12 +
+ arch/powerpc/boot/Makefile | 9 +-
+ arch/powerpc/boot/dts/iss4xx-mpic.dts | 155 ++++
+ arch/powerpc/boot/dts/iss4xx.dts | 116 +++
+ arch/powerpc/boot/treeboot-iss4xx.c | 56 ++
+ arch/powerpc/boot/wrapper | 9 +-
+ arch/powerpc/configs/44x/iss476-smp_defconfig | 1026 +++++++++++++++++++++
+ arch/powerpc/include/asm/cache.h | 6 +-
+ arch/powerpc/include/asm/cputable.h | 5 +
+ arch/powerpc/include/asm/hvcall.h | 1 +
+ arch/powerpc/include/asm/mmu-44x.h | 51 +-
+ arch/powerpc/include/asm/mmu.h | 1 +
+ arch/powerpc/include/asm/mmzone.h | 2 +-
+ arch/powerpc/include/asm/mpic.h | 3 -
+ arch/powerpc/include/asm/parport.h | 11 +-
+ arch/powerpc/include/asm/pgalloc-64.h | 6 +
+ arch/powerpc/include/asm/pgtable-ppc32.h | 2 +-
+ arch/powerpc/include/asm/ptrace.h | 64 ++
+ arch/powerpc/include/asm/reg.h | 4 +
+ arch/powerpc/include/asm/reg_booke.h | 24 +
+ arch/powerpc/include/asm/smp.h | 18 +-
+ arch/powerpc/include/asm/topology.h | 16 +-
+ arch/powerpc/kernel/cputable.c | 29 +
+ arch/powerpc/kernel/entry_32.S | 5 +
+ arch/powerpc/kernel/exceptions-64s.S | 13 +-
+ arch/powerpc/kernel/head_44x.S | 828 +++++++++++++----
+ arch/powerpc/kernel/head_8xx.S | 70 +-
+ arch/powerpc/kernel/head_booke.h | 4 +
+ arch/powerpc/kernel/irq.c | 17 +-
+ arch/powerpc/kernel/kprobes.c | 3 +
+ arch/powerpc/kernel/lparcfg.c | 12 +-
+ arch/powerpc/kernel/misc_32.S | 9 +-
+ arch/powerpc/kernel/process.c | 3 +
+ arch/powerpc/kernel/ptrace.c | 103 ++
+ arch/powerpc/kernel/rtas.c | 15 +-
+ arch/powerpc/kernel/rtasd.c | 10 +-
+ arch/powerpc/kernel/setup-common.c | 86 +-
+ arch/powerpc/kernel/smp.c | 67 +-
+ arch/powerpc/kernel/traps.c | 40 +
+ arch/powerpc/kernel/vio.c | 49 +-
+ arch/powerpc/lib/string.S | 4 +-
+ arch/powerpc/mm/44x_mmu.c | 144 +++-
+ arch/powerpc/mm/fault.c | 19 +-
+ arch/powerpc/mm/init_64.c | 43 +
+ arch/powerpc/mm/mmu_context_nohash.c | 8 +
+ arch/powerpc/mm/mmu_decl.h | 7 +-
+ arch/powerpc/mm/numa.c | 58 +-
+ arch/powerpc/mm/pgtable_32.c | 12 +-
+ arch/powerpc/mm/pgtable_64.c | 8 +
+ arch/powerpc/mm/tlb_nohash_low.S | 118 +++-
+ arch/powerpc/platforms/44x/Kconfig | 20 +
+ arch/powerpc/platforms/44x/Makefile | 1 +
+ arch/powerpc/platforms/44x/iss4xx.c | 167 ++++
+ arch/powerpc/platforms/Kconfig.cputype | 5 +-
+ arch/powerpc/platforms/cell/cbe_cpufreq.c | 2 +-
+ arch/powerpc/platforms/iseries/pci.c | 10 +-
+ arch/powerpc/platforms/iseries/smp.c | 2 +-
+ arch/powerpc/platforms/pasemi/cpufreq.c | 2 +-
+ arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 7 +-
+ arch/powerpc/platforms/powermac/setup.c | 2 +-
+ arch/powerpc/platforms/powermac/smp.c | 4 +-
+ arch/powerpc/platforms/pseries/dlpar.c | 8 +-
+ arch/powerpc/platforms/pseries/hotplug-cpu.c | 67 +-
+ arch/powerpc/platforms/pseries/plpar_wrappers.h | 8 +
+ arch/powerpc/platforms/pseries/smp.c | 42 +-
+ arch/powerpc/platforms/pseries/xics.c | 38 +-
+ arch/powerpc/sysdev/mpic.c | 72 +-
+ arch/powerpc/sysdev/ppc4xx_soc.c | 24 +-
+ drivers/i2c/busses/i2c-cpm.c | 2 +-
+ drivers/i2c/busses/i2c-ibm_iic.c | 14 +-
+ drivers/i2c/busses/i2c-mpc.c | 6 +-
+ drivers/macintosh/macio-adb.c | 1 +
+ drivers/macintosh/smu.c | 4 +-
+ drivers/macintosh/therm_adt746x.c | 2 +
+ drivers/macintosh/windfarm_pm81.c | 6 +-
+ drivers/macintosh/windfarm_pm91.c | 9 +-
+ drivers/misc/Makefile | 1 -
+ drivers/misc/hdpuftrs/Makefile | 1 -
+ drivers/misc/hdpuftrs/hdpu_cpustate.c | 256 -----
+ drivers/misc/hdpuftrs/hdpu_nexus.c | 149 ---
+ drivers/serial/mpsc.c | 1 +
+ include/linux/hdpu_features.h | 26 -
+ sound/aoa/core/gpio-pmf.c | 9 +-
+ 86 files changed, 3430 insertions(+), 940 deletions(-)
+ create mode 100644 Documentation/powerpc/dts-bindings/4xx/reboot.txt
+ create mode 100644 arch/powerpc/boot/dts/iss4xx-mpic.dts
+ create mode 100644 arch/powerpc/boot/dts/iss4xx.dts
+ create mode 100644 arch/powerpc/boot/treeboot-iss4xx.c
+ create mode 100644 arch/powerpc/configs/44x/iss476-smp_defconfig
+ create mode 100644 arch/powerpc/platforms/44x/iss4xx.c
+ delete mode 100644 drivers/misc/hdpuftrs/Makefile
+ delete mode 100644 drivers/misc/hdpuftrs/hdpu_cpustate.c
+ delete mode 100644 drivers/misc/hdpuftrs/hdpu_nexus.c
+ delete mode 100644 include/linux/hdpu_features.h
+Merging 4xx/next
+$ git merge 4xx/next
+Merge made by recursive.
+ arch/powerpc/boot/4xx.c | 12 +-
+ arch/powerpc/boot/dts/icon.dts | 447 ++++++++++
+ arch/powerpc/boot/dts/katmai.dts | 1 +
+ arch/powerpc/boot/dts/redwood.dts | 122 +++
+ arch/powerpc/configs/44x/icon_defconfig | 1316 ++++++++++++++++++++++++++++
+ arch/powerpc/platforms/44x/Kconfig | 11 +
+ arch/powerpc/platforms/44x/ppc44x_simple.c | 3 +-
+ arch/powerpc/sysdev/ppc4xx_pci.c | 119 +++
+ arch/powerpc/sysdev/ppc4xx_pci.h | 58 ++
+ 9 files changed, 2082 insertions(+), 7 deletions(-)
+ create mode 100644 arch/powerpc/boot/dts/icon.dts
+ create mode 100644 arch/powerpc/configs/44x/icon_defconfig
+Merging 52xx-and-virtex/next
+$ git merge 52xx-and-virtex/next
+Auto-merging drivers/serial/mpc52xx_uart.c
+Merge made by recursive.
+ arch/powerpc/platforms/512x/Kconfig | 13 +--
+ drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++-------
+ 2 files changed, 120 insertions(+), 38 deletions(-)
+Merging galak/next
+$ git merge galak/next
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Merge made by recursive.
+ .../powerpc/dts-bindings/fsl/8xxx_gpio.txt | 22 +++-
+ arch/powerpc/boot/dts/mpc8315erdb.dts | 16 ++-
+ arch/powerpc/boot/dts/mpc8377_rdb.dts | 14 ++
+ arch/powerpc/boot/dts/mpc8378_rdb.dts | 14 ++
+ arch/powerpc/boot/dts/mpc8379_rdb.dts | 14 ++
+ arch/powerpc/boot/dts/p1020rdb.dts | 125 +++++++++++++++++
+ arch/powerpc/kernel/asm-offsets.c | 8 +
+ arch/powerpc/kernel/head_fsl_booke.S | 13 ++-
+ arch/powerpc/mm/fsl_booke_mmu.c | 25 +---
+ arch/powerpc/mm/mmu_decl.h | 10 ++-
+ arch/powerpc/mm/tlb_nohash_low.S | 28 ++++
+ arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 +
+ arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 +
+ arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 +-
+ arch/powerpc/sysdev/mpc8xxx_gpio.c | 147 ++++++++++++++++++++
+ 15 files changed, 412 insertions(+), 29 deletions(-)
+Merging s390/features
+$ git merge s390/features
+Merge made by recursive.
+ arch/s390/Kconfig | 7 -
+ arch/s390/Makefile | 6 +
+ arch/s390/hypfs/hypfs.h | 4 +
+ arch/s390/hypfs/hypfs_diag.c | 123 +++++++-
+ arch/s390/hypfs/hypfs_vm.c | 87 +++++-
+ arch/s390/hypfs/inode.c | 42 ++-
+ arch/s390/include/asm/cputime.h | 9 +-
+ arch/s390/include/asm/lowcore.h | 89 +++---
+ arch/s390/include/asm/ptrace.h | 3 +-
+ arch/s390/include/asm/qdio.h | 2 -
+ arch/s390/include/asm/setup.h | 5 +-
+ arch/s390/include/asm/system.h | 5 -
+ arch/s390/include/asm/thread_info.h | 1 +
+ arch/s390/include/asm/timex.h | 8 +-
+ arch/s390/include/asm/topology.h | 2 +
+ arch/s390/kernel/asm-offsets.c | 6 +-
+ arch/s390/kernel/debug.c | 1 +
+ arch/s390/kernel/early.c | 4 +
+ arch/s390/kernel/entry.S | 324 ++++++++-----------
+ arch/s390/kernel/entry64.S | 617 +++++++++++++++++------------------
+ arch/s390/kernel/head.S | 4 +-
+ arch/s390/kernel/nmi.c | 3 +-
+ arch/s390/kernel/processor.c | 37 ++-
+ arch/s390/kernel/ptrace.c | 68 ++++
+ arch/s390/kernel/s390_ext.c | 3 +-
+ arch/s390/kernel/setup.c | 27 +--
+ arch/s390/kernel/signal.c | 2 +
+ arch/s390/kernel/topology.c | 7 +-
+ arch/s390/kernel/traps.c | 31 +-
+ arch/s390/kernel/vdso.c | 4 -
+ arch/s390/kernel/vtime.c | 15 +-
+ arch/s390/kvm/Kconfig | 11 +
+ arch/s390/kvm/sie64a.S | 77 ++++-
+ arch/s390/mm/fault.c | 32 +-
+ drivers/s390/block/dasd.c | 22 ++
+ drivers/s390/block/dasd_3990_erp.c | 20 ++
+ drivers/s390/block/dasd_alias.c | 125 +++++---
+ drivers/s390/block/dasd_devmap.c | 174 ++++------
+ drivers/s390/block/dasd_eckd.c | 116 ++++++-
+ drivers/s390/block/dasd_eckd.h | 2 +-
+ drivers/s390/block/dasd_int.h | 49 ++--
+ drivers/s390/char/Kconfig | 3 +-
+ drivers/s390/char/fs3270.c | 1 +
+ drivers/s390/char/keyboard.c | 21 +-
+ drivers/s390/char/vmcp.c | 38 +--
+ drivers/s390/char/zcore.c | 4 +-
+ drivers/s390/cio/chsc_sch.c | 1 +
+ drivers/s390/cio/cio.c | 3 +-
+ drivers/s390/cio/css.c | 8 +-
+ drivers/s390/cio/qdio.h | 15 +-
+ drivers/s390/cio/qdio_main.c | 67 +---
+ drivers/s390/cio/qdio_setup.c | 8 +-
+ drivers/s390/cio/qdio_thinint.c | 4 +-
+ drivers/s390/crypto/zcrypt_api.c | 2 +-
+ drivers/s390/net/qeth_core_main.c | 17 +-
+ drivers/s390/scsi/zfcp_cfdc.c | 1 +
+ include/linux/elf.h | 1 +
+ kernel/sysctl.c | 5 +-
+ 58 files changed, 1369 insertions(+), 1004 deletions(-)
+Merging sh/master
+$ git merge sh/master
+Auto-merging drivers/base/platform.c
+Merge made by recursive.
+ Documentation/DocBook/sh.tmpl | 10 +-
+ arch/sh/Kconfig | 36 ++-
+ arch/sh/Makefile | 1 -
+ arch/sh/boards/board-urquell.c | 3 +
+ arch/sh/boards/mach-ecovec24/setup.c | 26 +-
+ arch/sh/boards/mach-highlander/setup.c | 12 +-
+ arch/sh/boards/mach-sdk7786/setup.c | 17 +
+ arch/sh/boards/mach-se/7724/setup.c | 20 +-
+ arch/sh/boards/mach-x3proto/setup.c | 7 +
+ arch/sh/boot/compressed/Makefile | 6 +
+ arch/sh/boot/compressed/head_32.S | 4 +
+ arch/sh/configs/sdk7786_defconfig | 636 +++++++++++++++++++---------
+ arch/sh/include/asm/cache.h | 4 -
+ arch/sh/include/asm/clkdev.h | 35 ++
+ arch/sh/include/asm/clock.h | 161 +-------
+ arch/sh/include/asm/dmaengine.h | 63 +---
+ arch/sh/include/asm/hw_breakpoint.h | 1 -
+ arch/sh/include/asm/hwblk.h | 12 +-
+ arch/sh/include/asm/io_generic.h | 1 +
+ arch/sh/include/asm/irq.h | 19 +
+ arch/sh/include/asm/kexec.h | 8 +
+ arch/sh/include/asm/machvec.h | 2 +
+ arch/sh/include/asm/mmzone.h | 3 +-
+ arch/sh/include/asm/page.h | 15 +-
+ arch/sh/include/asm/processor.h | 7 +
+ arch/sh/include/asm/processor_32.h | 2 -
+ arch/sh/include/asm/setup.h | 1 +
+ arch/sh/include/asm/siu.h | 8 +-
+ arch/sh/include/asm/smp-ops.h | 51 +++
+ arch/sh/include/asm/smp.h | 40 ++-
+ arch/sh/include/cpu-sh4/cpu/dma-register.h | 3 +-
+ arch/sh/include/cpu-sh4/cpu/mmu_context.h | 18 +-
+ arch/sh/include/mach-sdk7786/mach/fpga.h | 9 +
+ arch/sh/kernel/Makefile | 2 +-
+ arch/sh/kernel/clkdev.c | 169 ++++++++
+ arch/sh/kernel/cpu/Makefile | 2 +-
+ arch/sh/kernel/cpu/clock-cpg.c | 312 +-------------
+ arch/sh/kernel/cpu/clock.c | 630 +---------------------------
+ arch/sh/kernel/cpu/hwblk.c | 5 +
+ arch/sh/kernel/cpu/init.c | 24 +-
+ arch/sh/kernel/cpu/sh2/probe.c | 5 +-
+ arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 -
+ arch/sh/kernel/cpu/sh2a/probe.c | 4 +-
+ arch/sh/kernel/cpu/sh2a/setup-mxg.c | 9 -
+ arch/sh/kernel/cpu/sh2a/setup-sh7201.c | 9 -
+ arch/sh/kernel/cpu/sh2a/setup-sh7203.c | 12 -
+ arch/sh/kernel/cpu/sh2a/setup-sh7206.c | 15 -
+ arch/sh/kernel/cpu/sh3/probe.c | 4 +-
+ arch/sh/kernel/cpu/sh3/setup-sh7705.c | 9 -
+ arch/sh/kernel/cpu/sh3/setup-sh770x.c | 9 -
+ arch/sh/kernel/cpu/sh3/setup-sh7710.c | 9 -
+ arch/sh/kernel/cpu/sh3/setup-sh7720.c | 24 -
+ arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 17 +-
+ arch/sh/kernel/cpu/sh4/probe.c | 4 +-
+ arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 9 -
+ arch/sh/kernel/cpu/sh4/setup-sh7750.c | 15 -
+ arch/sh/kernel/cpu/sh4/setup-sh7760.c | 9 -
+ arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 231 +++++++---
+ arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 210 +++++++---
+ arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 177 ++++++---
+ arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 279 +++++++++----
+ arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 295 +++++++++----
+ arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 11 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 12 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 12 +-
+ arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 176 ++++++--
+ arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 223 ++++++++--
+ arch/sh/kernel/cpu/sh4a/clock-shx3.c | 13 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 16 -
+ arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 13 -
+ arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 21 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 27 --
+ arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 81 +----
+ arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 6 -
+ arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 18 -
+ arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 27 --
+ arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 24 +-
+ arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 30 +--
+ arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 157 +++++--
+ arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 -
+ arch/sh/kernel/cpu/sh4a/smp-shx3.c | 74 +++-
+ arch/sh/kernel/cpu/sh5/probe.c | 4 +-
+ arch/sh/kernel/cpu/sh5/setup-sh5.c | 9 -
+ arch/sh/kernel/crash_dump.c | 20 +-
+ arch/sh/kernel/dwarf.c | 1 +
+ arch/sh/kernel/head_32.S | 7 +-
+ arch/sh/kernel/hw_breakpoint.c | 5 -
+ arch/sh/kernel/idle.c | 8 +-
+ arch/sh/kernel/irq.c | 91 +++-
+ arch/sh/kernel/localtimer.c | 6 +-
+ arch/sh/kernel/machine_kexec.c | 62 +++-
+ arch/sh/kernel/machvec.c | 1 +
+ arch/sh/kernel/process.c | 2 +-
+ arch/sh/kernel/setup.c | 300 +++----------
+ arch/sh/kernel/smp.c | 160 ++++++-
+ arch/sh/kernel/topology.c | 6 +-
+ arch/sh/mm/Makefile | 9 +-
+ arch/sh/mm/cache-shx3.c | 44 ++
+ arch/sh/mm/cache.c | 7 +
+ arch/sh/mm/fault_32.c | 14 +-
+ arch/sh/mm/init.c | 173 ++++++++-
+ arch/sh/mm/pmb.c | 4 +-
+ arch/sh/mm/tlb-debugfs.c | 179 ++++++++
+ arch/sh/mm/tlbflush_64.c | 20 +-
+ drivers/base/platform.c | 20 +
+ drivers/clocksource/sh_cmt.c | 45 +-
+ drivers/clocksource/sh_mtu2.c | 37 +-
+ drivers/clocksource/sh_tmu.c | 41 +-
+ drivers/dma/shdma.c | 25 +-
+ drivers/dma/shdma.h | 4 +-
+ drivers/serial/sh-sci.c | 189 ++++++---
+ drivers/sh/Kconfig | 24 +
+ drivers/sh/Makefile | 2 +
+ drivers/sh/clk-cpg.c | 298 +++++++++++++
+ drivers/sh/clk.c | 545 ++++++++++++++++++++++++
+ drivers/sh/intc.c | 333 +++++++++++++--
+ include/linux/device.h | 4 +
+ include/linux/serial_sci.h | 4 +-
+ include/linux/sh_clk.h | 150 +++++++
+ include/linux/sh_dma.h | 102 +++++
+ include/linux/sh_intc.h | 26 +-
+ 121 files changed, 4869 insertions(+), 2817 deletions(-)
+ create mode 100644 arch/sh/include/asm/clkdev.h
+ create mode 100644 arch/sh/include/asm/smp-ops.h
+ create mode 100644 arch/sh/kernel/clkdev.c
+ create mode 100644 arch/sh/mm/cache-shx3.c
+ create mode 100644 arch/sh/mm/tlb-debugfs.c
+ create mode 100644 drivers/sh/Kconfig
+ create mode 100644 drivers/sh/clk-cpg.c
+ create mode 100644 drivers/sh/clk.c
+ create mode 100644 include/linux/sh_clk.h
+ create mode 100644 include/linux/sh_dma.h
+Merging genesis/master
+$ git merge genesis/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/dma/shdma.c
+Auto-merging drivers/i2c/busses/Kconfig
+Merge made by recursive.
+ MAINTAINERS | 3 +-
+ arch/arm/mach-shmobile/board-ap4evb.c | 106 +++++++++-
+ arch/arm/mach-shmobile/board-g4evm.c | 127 +++++++++++
+ arch/arm/mach-shmobile/include/mach/irqs.h | 6 +
+ arch/arm/mach-shmobile/include/mach/memory.h | 3 +
+ arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +-
+ arch/arm/mach-shmobile/intc-sh7367.c | 178 ++++++++++++++-
+ arch/arm/mach-shmobile/intc-sh7372.c | 12 +-
+ arch/arm/mach-shmobile/intc-sh7377.c | 300 ++++++++++++++++++++++++-
+ arch/arm/mach-shmobile/setup-sh7372.c | 47 ++++
+ drivers/dma/Kconfig | 2 +-
+ drivers/dma/shdma.c | 8 +-
+ drivers/i2c/busses/Kconfig | 2 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 121 +++++++---
+ include/linux/serial_sci.h | 2 +-
+ 15 files changed, 856 insertions(+), 64 deletions(-)
+Merging sparc/master
+$ git merge sparc/master
+Already up-to-date.
+Merging xtensa/master
+$ git merge xtensa/master
+Merge made by recursive.
+ arch/xtensa/Kconfig | 17 +-
+ arch/xtensa/Makefile | 7 +-
+ arch/xtensa/boot/Makefile | 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 ++++++++++++++++++++
+ 24 files changed, 553 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/addr.c | 11 +-
+ fs/ceph/auth.c | 9 +-
+ fs/ceph/auth.h | 2 +
+ fs/ceph/auth_none.c | 1 +
+ fs/ceph/auth_x.c | 19 ++-
+ fs/ceph/caps.c | 24 ++--
+ fs/ceph/ceph_fs.h | 62 +++++++-
+ fs/ceph/ceph_strings.c | 16 ++-
+ fs/ceph/debugfs.c | 13 +-
+ fs/ceph/dir.c | 45 ++++--
+ fs/ceph/export.c | 14 +-
+ fs/ceph/file.c | 8 +-
+ fs/ceph/inode.c | 97 +++++++------
+ fs/ceph/ioctl.c | 2 +-
+ fs/ceph/mds_client.c | 385 ++++++++++++++++++++++++++++++------------------
+ fs/ceph/mds_client.h | 6 +-
+ fs/ceph/messenger.c | 85 ++++-------
+ fs/ceph/messenger.h | 10 +-
+ fs/ceph/mon_client.c | 232 +++++++++++++++++------------
+ fs/ceph/mon_client.h | 27 ++--
+ fs/ceph/msgpool.c | 180 ++++-------------------
+ fs/ceph/msgpool.h | 12 +-
+ fs/ceph/msgr.h | 21 +++-
+ fs/ceph/osd_client.c | 94 ++++--------
+ fs/ceph/pagelist.c | 2 +-
+ fs/ceph/rados.h | 23 +++-
+ fs/ceph/snap.c | 2 +-
+ fs/ceph/super.c | 125 ++++++++++------
+ fs/ceph/super.h | 30 ++--
+ fs/ceph/xattr.c | 35 ++---
+ 30 files changed, 852 insertions(+), 740 deletions(-)
+Merging cifs/master
+$ git merge cifs/master
+Merge made by recursive.
+ fs/cifs/asn1.c | 103 ++++-----
+ fs/cifs/cifs_debug.c | 48 ++--
+ fs/cifs/cifs_debug.h | 42 +++-
+ fs/cifs/cifs_dfs_ref.c | 34 ++--
+ fs/cifs/cifs_spnego.c | 6 +-
+ fs/cifs/cifs_unicode.c | 5 +-
+ fs/cifs/cifsacl.c | 76 +++---
+ fs/cifs/cifsencrypt.c | 10 +-
+ fs/cifs/cifsfs.c | 163 ++-----------
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/cifsglob.h | 9 +-
+ fs/cifs/cifsproto.h | 30 ++-
+ fs/cifs/cifssmb.c | 437 +++++++++++++++++----------------
+ fs/cifs/connect.c | 639 ++++++++++++++++++++++++++----------------------
+ fs/cifs/dir.c | 91 +++++---
+ fs/cifs/dns_resolve.c | 16 +-
+ fs/cifs/export.c | 2 +-
+ fs/cifs/file.c | 222 ++++++++---------
+ fs/cifs/inode.c | 123 ++++++----
+ fs/cifs/ioctl.c | 10 +-
+ fs/cifs/link.c | 10 +-
+ fs/cifs/misc.c | 81 +++---
+ fs/cifs/netmisc.c | 16 +-
+ fs/cifs/readdir.c | 85 ++++----
+ fs/cifs/sess.c | 81 ++++---
+ fs/cifs/transport.c | 92 ++++----
+ fs/cifs/xattr.c | 40 ++--
+ 27 files changed, 1228 insertions(+), 1245 deletions(-)
+Merging configfs/linux-next
+$ git merge configfs/linux-next
+Already up-to-date.
+Merging ecryptfs/next
+$ git merge ecryptfs/next
+Auto-merging fs/ecryptfs/main.c
+Merge made by recursive.
+ fs/ecryptfs/main.c | 28 +++++++++++++++++++++++-----
+ 1 files changed, 23 insertions(+), 5 deletions(-)
+$ git revert ae0660764caffebba056214a8450e7217430939f
+Finished one revert.
+[master 9429c91] Revert "ecryptfs: disallow ecryptfs as underlying filesystem"
+ 1 files changed, 5 insertions(+), 23 deletions(-)
+Merging ext3/for_next
+$ git merge ext3/for_next
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/xfs/quota/xfs_qm_syscalls.c
+Merge made by recursive.
+ Documentation/filesystems/ext3.txt | 15 ++-
+ fs/ext2/balloc.c | 6 +
+ fs/ext2/ialloc.c | 9 +-
+ fs/ext2/inode.c | 7 +-
+ fs/ext2/super.c | 99 +++++------
+ fs/ext2/xattr.c | 2 +
+ fs/ext3/balloc.c | 6 +
+ fs/ext3/fsync.c | 20 +--
+ fs/ext3/inode.c | 2 +-
+ fs/ext3/super.c | 77 +++++---
+ fs/ext4/inode.c | 2 +-
+ fs/gfs2/quota.c | 12 +-
+ fs/jbd/commit.c | 8 +-
+ fs/jbd/journal.c | 33 ++++
+ fs/jfs/file.c | 2 +-
+ fs/ocfs2/dlmglue.c | 3 +-
+ fs/ocfs2/file.c | 21 +--
+ fs/ocfs2/quota.h | 12 +-
+ fs/ocfs2/quota_global.c | 347 +++++++++++++++++++++---------------
+ fs/ocfs2/quota_local.c | 133 +++++++-------
+ fs/ocfs2/super.c | 4 +
+ fs/quota/dquot.c | 275 +++++++++++++++++-----------
+ fs/quota/quota.c | 63 +++++--
+ fs/quota/quota_tree.c | 50 +++---
+ fs/quota/quota_tree.h | 6 +
+ fs/quota/quota_v1.c | 4 +-
+ fs/quota/quota_v2.c | 6 +-
+ fs/reiserfs/inode.c | 3 +-
+ fs/udf/file.c | 2 +-
+ fs/ufs/inode.c | 2 +-
+ fs/ufs/namei.c | 2 +-
+ fs/ufs/symlink.c | 8 +
+ fs/ufs/truncate.c | 10 +-
+ fs/ufs/ufs.h | 2 +
+ fs/xfs/linux-2.6/xfs_quotaops.c | 8 +-
+ fs/xfs/quota/xfs_qm_syscalls.c | 10 +-
+ include/linux/dqblk_xfs.h | 9 +
+ include/linux/ext2_fs_sb.h | 9 +
+ include/linux/jbd.h | 3 +-
+ include/linux/quota.h | 48 ++++--
+ include/linux/quotaops.h | 15 ++-
+ 41 files changed, 829 insertions(+), 526 deletions(-)
+Merging ext4/next
+$ git merge ext4/next
+Auto-merging fs/ext4/inode.c
+Auto-merging fs/ext4/mballoc.c
+Auto-merging fs/ext4/move_extent.c
+Merge made by recursive.
+ fs/ext4/extents.c | 82 +++++++++++++++++++++++++++++++++++--------------
+ fs/ext4/fsync.c | 2 +-
+ fs/ext4/ialloc.c | 81 ++++++++++++++++++++++--------------------------
+ fs/ext4/inode.c | 12 ++++++-
+ fs/ext4/ioctl.c | 2 +
+ fs/ext4/mballoc.c | 34 +++++++++++---------
+ fs/ext4/move_extent.c | 1 +
+ fs/ext4/resize.c | 3 +-
+ fs/ext4/super.c | 20 ++++++------
+ fs/ext4/symlink.c | 2 +
+ fs/jbd2/transaction.c | 5 +--
+ 11 files changed, 145 insertions(+), 99 deletions(-)
+Merging fatfs/master
+$ git merge fatfs/master
+Merge made by recursive.
+ fs/fat/dir.c | 28 ++++++++++++----------------
+ fs/fat/fat.h | 4 ++--
+ fs/fat/file.c | 19 ++++++++++++++++---
+ fs/fat/inode.c | 6 ++----
+ 4 files changed, 32 insertions(+), 25 deletions(-)
+Merging fuse/for-next
+$ git merge fuse/for-next
+Already up-to-date.
+Merging gfs2/master
+$ git merge gfs2/master
+Auto-merging fs/gfs2/bmap.c
+Auto-merging fs/gfs2/export.c
+Auto-merging fs/gfs2/quota.c
+Auto-merging fs/gfs2/sys.c
+Merge made by recursive.
+ Documentation/filesystems/gfs2.txt | 12 ++--
+ fs/gfs2/aops.c | 8 +-
+ fs/gfs2/bmap.c | 17 +++--
+ fs/gfs2/dir.c | 2 +-
+ fs/gfs2/export.c | 2 +-
+ fs/gfs2/glock.c | 3 +
+ fs/gfs2/incore.h | 11 ++-
+ fs/gfs2/inode.c | 101 +++++++++++++++++++++--
+ fs/gfs2/inode.h | 5 +-
+ fs/gfs2/log.c | 158 ++++++++++++++++++++----------------
+ fs/gfs2/log.h | 1 -
+ fs/gfs2/lops.c | 2 +
+ fs/gfs2/main.c | 2 +-
+ fs/gfs2/meta_io.c | 5 +-
+ fs/gfs2/ops_fstype.c | 19 +++--
+ fs/gfs2/quota.c | 102 +++++++++++++++++-------
+ fs/gfs2/rgrp.c | 68 +++++++++-------
+ fs/gfs2/super.c | 11 ++-
+ fs/gfs2/sys.c | 6 +-
+ fs/gfs2/trans.c | 18 ++++
+ 20 files changed, 368 insertions(+), 185 deletions(-)
+Merging jfs/next
+$ git merge jfs/next
+Already up-to-date.
+Merging logfs/master
+$ git merge logfs/master
+Already up-to-date.
+Merging nfs/linux-next
+$ git merge nfs/linux-next
+Merge made by recursive.
+ fs/nfs/client.c | 55 ++-
+ fs/nfs/delegation.c | 2 +-
+ fs/nfs/dir.c | 143 ++++---
+ fs/nfs/file.c | 15 +-
+ fs/nfs/fscache.c | 3 +-
+ fs/nfs/getroot.c | 191 ++++------
+ fs/nfs/inode.c | 58 +++-
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/iostat.h | 6 +-
+ fs/nfs/namespace.c | 20 +-
+ fs/nfs/nfs3acl.c | 23 +-
+ fs/nfs/nfs3proc.c | 128 ++++---
+ fs/nfs/nfs3xdr.c | 2 +-
+ fs/nfs/nfs4_fs.h | 8 +-
+ fs/nfs/nfs4namespace.c | 12 +-
+ fs/nfs/nfs4proc.c | 172 +++++---
+ fs/nfs/nfs4state.c | 36 +-
+ fs/nfs/nfs4xdr.c | 22 +-
+ fs/nfs/nfsroot.c | 14 +-
+ fs/nfs/pagelist.c | 14 +-
+ fs/nfs/proc.c | 144 ++++---
+ fs/nfs/read.c | 4 +-
+ fs/nfs/super.c | 147 ++++++--
+ fs/nfs/unlink.c | 4 +-
+ include/linux/ktime.h | 10 +-
+ include/linux/nfs_fs.h | 14 +
+ include/linux/nfs_fs_sb.h | 1 -
+ include/linux/nfs_xdr.h | 7 +-
+ include/linux/sunrpc/auth.h | 1 +
+ include/linux/sunrpc/auth_gss.h | 1 +
+ include/linux/sunrpc/gss_api.h | 8 +-
+ include/linux/sunrpc/gss_krb5.h | 184 +++++++++-
+ include/linux/sunrpc/metrics.h | 7 +-
+ include/linux/sunrpc/sched.h | 20 +-
+ include/linux/sunrpc/xdr.h | 8 +-
+ include/linux/sunrpc/xprt.h | 13 +-
+ net/sunrpc/auth.c | 19 +-
+ net/sunrpc/auth_gss/Makefile | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 89 ++++-
+ net/sunrpc/auth_gss/gss_krb5_crypto.c | 697 ++++++++++++++++++++++++++++++++-
+ net/sunrpc/auth_gss/gss_krb5_keys.c | 336 ++++++++++++++++
+ net/sunrpc/auth_gss/gss_krb5_mech.c | 584 +++++++++++++++++++++++++--
+ net/sunrpc/auth_gss/gss_krb5_seal.c | 155 ++++++--
+ net/sunrpc/auth_gss/gss_krb5_seqnum.c | 83 ++++-
+ net/sunrpc/auth_gss/gss_krb5_unseal.c | 113 +++++-
+ net/sunrpc/auth_gss/gss_krb5_wrap.c | 404 ++++++++++++++++---
+ net/sunrpc/auth_gss/gss_mech_switch.c | 21 +-
+ net/sunrpc/auth_gss/gss_spkm3_mech.c | 5 +-
+ net/sunrpc/auth_gss/svcauth_gss.c | 17 +-
+ net/sunrpc/clnt.c | 19 +-
+ net/sunrpc/sched.c | 26 +-
+ net/sunrpc/stats.c | 29 +-
+ net/sunrpc/xdr.c | 1 +
+ net/sunrpc/xprt.c | 59 ++--
+ net/sunrpc/xprtrdma/transport.c | 31 +-
+ net/sunrpc/xprtsock.c | 40 +--
+ 56 files changed, 3378 insertions(+), 853 deletions(-)
+ create mode 100644 net/sunrpc/auth_gss/gss_krb5_keys.c
+Merging nfsd/nfsd-next
+$ git merge nfsd/nfsd-next
+Merge made by recursive.
+ Documentation/filesystems/nfs/nfs41-server.txt | 2 +-
+ fs/nfsd/export.c | 44 ++--
+ fs/nfsd/nfs4callback.c | 130 +++++++----
+ fs/nfsd/nfs4proc.c | 50 +++-
+ fs/nfsd/nfs4state.c | 316 ++++++++++++++----------
+ fs/nfsd/nfs4xdr.c | 27 ++-
+ fs/nfsd/nfsctl.c | 64 ++++--
+ fs/nfsd/nfsd.h | 6 +-
+ fs/nfsd/state.h | 47 +++-
+ fs/nfsd/vfs.c | 8 +-
+ fs/nfsd/vfs.h | 1 +
+ fs/nfsd/xdr4.h | 11 +-
+ include/linux/nfsd/nfsfh.h | 6 +-
+ net/sunrpc/cache.c | 45 +++--
+ net/sunrpc/svc_xprt.c | 6 +-
+ net/sunrpc/svcsock.c | 15 +-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 3 -
+ 17 files changed, 488 insertions(+), 293 deletions(-)
+Merging nilfs2/for-next
+$ git merge nilfs2/for-next
+Merge made by recursive.
+ Documentation/filesystems/nilfs2.txt | 4 +-
+ fs/nilfs2/alloc.c | 154 ++++++++++++++++++++++++-
+ fs/nilfs2/alloc.h | 7 +
+ fs/nilfs2/btree.c | 91 +++------------
+ fs/nilfs2/btree.h | 23 +++-
+ fs/nilfs2/inode.c | 4 +-
+ fs/nilfs2/recovery.c | 2 +
+ fs/nilfs2/segbuf.c | 70 ++++++-----
+ fs/nilfs2/segbuf.h | 10 +-
+ fs/nilfs2/segment.c | 157 ++++++------------------
+ fs/nilfs2/segment.h | 6 +-
+ fs/nilfs2/super.c | 218 ++++++++++++++++++----------------
+ fs/nilfs2/the_nilfs.c | 10 +-
+ include/linux/nilfs2_fs.h | 17 ++--
+ 14 files changed, 423 insertions(+), 350 deletions(-)
+Merging ocfs2/linux-next
+$ git merge ocfs2/linux-next
+Auto-merging fs/ocfs2/file.c
+Auto-merging fs/ocfs2/quota_global.c
+Auto-merging fs/ocfs2/quota_local.c
+Auto-merging fs/ocfs2/super.c
+Merge made by recursive.
+ Documentation/filesystems/ocfs2.txt | 7 +
+ fs/ocfs2/Makefile | 1 +
+ fs/ocfs2/alloc.c | 196 ++-------
+ fs/ocfs2/aops.c | 3 +
+ fs/ocfs2/cluster/masklog.c | 1 +
+ fs/ocfs2/cluster/masklog.h | 1 +
+ fs/ocfs2/cluster/tcp.c | 3 +
+ fs/ocfs2/dir.c | 53 +--
+ fs/ocfs2/dlm/dlmast.c | 4 +-
+ fs/ocfs2/dlm/dlmcommon.h | 2 +-
+ fs/ocfs2/dlm/dlmconvert.c | 4 +-
+ fs/ocfs2/dlm/dlmdomain.c | 25 +-
+ fs/ocfs2/dlm/dlmlock.c | 4 +-
+ fs/ocfs2/dlm/dlmmaster.c | 12 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 27 +-
+ fs/ocfs2/dlm/dlmunlock.c | 3 +-
+ fs/ocfs2/file.c | 22 +-
+ fs/ocfs2/inode.c | 36 +-
+ fs/ocfs2/inode.h | 2 +
+ fs/ocfs2/journal.c | 26 +-
+ fs/ocfs2/journal.h | 3 +-
+ fs/ocfs2/localalloc.c | 271 ++++++++----
+ fs/ocfs2/localalloc.h | 3 +
+ fs/ocfs2/mmap.c | 48 +--
+ fs/ocfs2/namei.c | 83 ++---
+ fs/ocfs2/ocfs2.h | 15 +
+ fs/ocfs2/ocfs2_fs.h | 8 -
+ fs/ocfs2/quota_global.c | 4 +-
+ fs/ocfs2/quota_local.c | 50 +--
+ fs/ocfs2/refcounttree.c | 22 +-
+ fs/ocfs2/reservations.c | 847 +++++++++++++++++++++++++++++++++++
+ fs/ocfs2/reservations.h | 159 +++++++
+ fs/ocfs2/resize.c | 13 +-
+ fs/ocfs2/suballoc.c | 75 +---
+ fs/ocfs2/suballoc.h | 2 +
+ fs/ocfs2/super.c | 85 ++++-
+ fs/ocfs2/super.h | 7 +
+ fs/ocfs2/xattr.c | 72 +--
+ 38 files changed, 1564 insertions(+), 635 deletions(-)
+ create mode 100644 fs/ocfs2/reservations.c
+ create mode 100644 fs/ocfs2/reservations.h
+$ git am -3 ../patches/ocfs2__update_gfp_slab.h_includes
+Applying: ocfs2: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/ocfs2/reservations.c
+$ git add .
+$ git commit -v -a --amend
+[master 2f4360f] Merge remote branch 'ocfs2/linux-next'
+Merging squashfs/master
+$ git merge squashfs/master
+Already up-to-date.
+Merging udf/for_next
+$ git merge udf/for_next
+Already up-to-date.
+Merging v9fs/for-next
+$ git merge v9fs/for-next
+Merge made by recursive.
+ fs/9p/v9fs_vfs.h | 2 +
+ fs/9p/vfs_dir.c | 8 +++++
+ fs/9p/vfs_file.c | 11 ++++++
+ fs/9p/vfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++++++------
+ fs/9p/vfs_super.c | 55 ++++++++++++++++++++++++++++++++-
+ include/net/9p/9p.h | 33 ++++++++++++++++++++
+ include/net/9p/client.h | 2 +
+ net/9p/client.c | 70 +++++++++++++++++++++++++++++++++++++++++-
+ net/9p/protocol.c | 6 ++-
+ 9 files changed, 249 insertions(+), 16 deletions(-)
+Merging ubifs/linux-next
+$ git merge ubifs/linux-next
+Merge made by recursive.
+ fs/ubifs/io.c | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+Merging xfs/master
+$ git merge xfs/master
+Auto-merging fs/xfs/linux-2.6/xfs_aops.c
+Auto-merging fs/xfs/linux-2.6/xfs_buf.c
+Auto-merging fs/xfs/linux-2.6/xfs_ioctl.c
+Auto-merging fs/xfs/linux-2.6/xfs_ioctl32.c
+Auto-merging fs/xfs/linux-2.6/xfs_iops.c
+Auto-merging fs/xfs/linux-2.6/xfs_super.c
+Auto-merging fs/xfs/linux-2.6/xfs_sync.c
+Auto-merging fs/xfs/quota/xfs_qm_syscalls.c
+Auto-merging fs/xfs/xfs_log.c
+Merge made by recursive.
+ fs/xfs/linux-2.6/xfs_aops.c | 231 +++++++-----
+ fs/xfs/linux-2.6/xfs_buf.c | 27 +-
+ fs/xfs/linux-2.6/xfs_buf.h | 2 +-
+ fs/xfs/linux-2.6/xfs_file.c | 2 +
+ fs/xfs/linux-2.6/xfs_ioctl.c | 4 +
+ fs/xfs/linux-2.6/xfs_ioctl32.c | 4 +
+ fs/xfs/linux-2.6/xfs_iops.c | 5 +-
+ fs/xfs/linux-2.6/xfs_super.c | 10 +-
+ fs/xfs/linux-2.6/xfs_sync.c | 91 ++----
+ fs/xfs/linux-2.6/xfs_trace.c | 4 +-
+ fs/xfs/linux-2.6/xfs_trace.h | 150 ++++++++-
+ fs/xfs/quota/xfs_dquot.c | 193 +++++------
+ fs/xfs/quota/xfs_dquot.h | 35 +--
+ fs/xfs/quota/xfs_dquot_item.c | 30 +-
+ fs/xfs/quota/xfs_qm.c | 609 ++++++++++++--------------------
+ fs/xfs/quota/xfs_qm.h | 23 +-
+ fs/xfs/quota/xfs_qm_stats.c | 2 +-
+ fs/xfs/quota/xfs_qm_syscalls.c | 152 ++++-----
+ fs/xfs/quota/xfs_quota_priv.h | 102 ------
+ fs/xfs/quota/xfs_trans_dquot.c | 29 +-
+ fs/xfs/xfs_bmap.c | 2 +-
+ fs/xfs/xfs_buf_item.c | 55 ++--
+ fs/xfs/xfs_buf_item.h | 2 +-
+ fs/xfs/xfs_error.c | 30 +-
+ fs/xfs/xfs_error.h | 9 +-
+ fs/xfs/xfs_extfree_item.c | 18 +-
+ fs/xfs/xfs_inode.c | 2 +
+ fs/xfs/xfs_inode_item.c | 21 +-
+ fs/xfs/xfs_iomap.c | 123 ++-----
+ fs/xfs/xfs_iomap.h | 47 +---
+ fs/xfs/xfs_log.c | 702 +++++++++++++++++++++++--------------
+ fs/xfs/xfs_log.h | 13 +
+ fs/xfs/xfs_log_priv.h | 12 +-
+ fs/xfs/xfs_log_recover.c | 311 ++++++++---------
+ fs/xfs/xfs_mount.c | 7 -
+ fs/xfs/xfs_quota.h | 3 -
+ fs/xfs/xfs_trans.c | 760 +++++++++++++++++++---------------------
+ fs/xfs/xfs_trans.h | 14 +-
+ fs/xfs/xfs_trans_buf.c | 187 +++--------
+ 39 files changed, 1905 insertions(+), 2118 deletions(-)
+Merging vfs/for-next
+$ git merge vfs/for-next
+Auto-merging fs/9p/vfs_inode.c
+Auto-merging fs/ceph/file.c
+Auto-merging fs/ceph/super.c
+Auto-merging fs/ext2/ialloc.c
+Auto-merging fs/ext2/xattr.c
+Auto-merging fs/ext4/ialloc.c
+Auto-merging fs/logfs/inode.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/nilfs2/inode.c
+Auto-merging fs/ocfs2/namei.c
+Auto-merging fs/ocfs2/xattr.c
+Auto-merging fs/quota/quota.c
+Merge made by recursive.
+ drivers/block/loop.c | 4 +-
+ drivers/md/bitmap.c | 2 +-
+ drivers/usb/gadget/storage_common.c | 2 +-
+ fs/9p/vfs_inode.c | 4 +-
+ fs/Makefile | 2 +-
+ fs/anon_inodes.c | 2 +-
+ fs/bfs/dir.c | 4 +-
+ fs/block_dev.c | 73 ++------
+ fs/btrfs/acl.c | 4 +-
+ fs/btrfs/inode.c | 11 +-
+ fs/btrfs/xattr.c | 2 +-
+ fs/btrfs/xattr.h | 6 +-
+ fs/buffer.c | 25 +--
+ fs/ceph/file.c | 3 +-
+ fs/ceph/super.c | 3 +-
+ fs/coda/file.c | 2 +-
+ fs/dcache.c | 19 +--
+ fs/devpts/inode.c | 9 +-
+ fs/drop_caches.c | 24 +---
+ fs/ecryptfs/file.c | 4 +-
+ fs/ecryptfs/main.c | 166 +++++++++---------
+ fs/ecryptfs/super.c | 22 ---
+ fs/exofs/inode.c | 11 +-
+ fs/ext2/acl.c | 4 +-
+ fs/ext2/ialloc.c | 12 +-
+ fs/ext2/xattr.c | 10 +-
+ fs/ext2/xattr.h | 12 +-
+ fs/ext2/xattr_security.c | 2 +-
+ fs/ext2/xattr_trusted.c | 2 +-
+ fs/ext2/xattr_user.c | 2 +-
+ fs/ext3/acl.c | 4 +-
+ fs/ext3/ialloc.c | 13 +-
+ fs/ext3/xattr.c | 10 +-
+ fs/ext3/xattr.h | 12 +-
+ fs/ext3/xattr_security.c | 2 +-
+ fs/ext3/xattr_trusted.c | 2 +-
+ fs/ext3/xattr_user.c | 2 +-
+ fs/ext4/acl.c | 4 +-
+ fs/ext4/ialloc.c | 12 +-
+ fs/ext4/xattr.c | 10 +-
+ fs/ext4/xattr.h | 12 +-
+ fs/ext4/xattr_security.c | 2 +-
+ fs/ext4/xattr_trusted.c | 2 +-
+ fs/ext4/xattr_user.c | 2 +-
+ fs/fs-writeback.c | 6 +-
+ fs/generic_acl.c | 4 +-
+ fs/gfs2/acl.c | 2 +-
+ fs/gfs2/acl.h | 2 +-
+ fs/gfs2/super.h | 2 +-
+ fs/gfs2/xattr.c | 6 +-
+ fs/inode.c | 26 +++-
+ fs/internal.h | 2 +
+ fs/ioctl.c | 15 +--
+ fs/jffs2/acl.c | 4 +-
+ fs/jffs2/acl.h | 4 +-
+ fs/jffs2/security.c | 2 +-
+ fs/jffs2/xattr.c | 8 +-
+ fs/jffs2/xattr.h | 8 +-
+ fs/jffs2/xattr_trusted.c | 2 +-
+ fs/jffs2/xattr_user.c | 2 +-
+ fs/jfs/jfs_inode.c | 12 +-
+ fs/logfs/inode.c | 9 +-
+ fs/minix/bitmap.c | 5 +-
+ fs/minix/minix.h | 2 +-
+ fs/minix/namei.c | 11 +-
+ fs/namei.c | 5 +-
+ fs/nfsd/nfs4recover.c | 87 +++++-----
+ fs/nfsd/vfs.c | 5 +-
+ fs/nilfs2/inode.c | 11 +-
+ fs/notify/inotify/inotify.c | 88 ++--------
+ fs/ocfs2/acl.c | 4 +-
+ fs/ocfs2/namei.c | 9 +-
+ fs/ocfs2/xattr.c | 12 +-
+ fs/ocfs2/xattr.h | 12 +-
+ fs/omfs/inode.c | 4 +-
+ fs/open.c | 166 ------------------
+ fs/partitions/efi.c | 2 +-
+ fs/partitions/mac.c | 2 +-
+ fs/partitions/msdos.c | 2 +-
+ fs/quota/quota.c | 32 +---
+ fs/ramfs/inode.c | 20 +--
+ fs/reiserfs/namei.c | 18 +--
+ fs/reiserfs/xattr.c | 16 +-
+ fs/reiserfs/xattr_acl.c | 4 +-
+ fs/reiserfs/xattr_security.c | 2 +-
+ fs/reiserfs/xattr_trusted.c | 2 +-
+ fs/reiserfs/xattr_user.c | 2 +-
+ fs/statfs.c | 196 +++++++++++++++++++++
+ fs/super.c | 321 ++++++++++++++++++++---------------
+ fs/sync.c | 86 ++--------
+ fs/sysv/ialloc.c | 11 +-
+ fs/ubifs/dir.c | 9 +-
+ fs/udf/ialloc.c | 11 +-
+ fs/udf/namei.c | 10 +-
+ fs/ufs/ialloc.c | 10 +-
+ fs/xattr.c | 14 +-
+ fs/xfs/linux-2.6/xfs_acl.c | 4 +-
+ fs/xfs/linux-2.6/xfs_super.h | 2 +-
+ fs/xfs/linux-2.6/xfs_xattr.c | 8 +-
+ fs/xfs/xfs_acl.h | 4 +-
+ include/linux/fs.h | 20 +-
+ include/linux/generic_acl.h | 4 +-
+ include/linux/ramfs.h | 3 +-
+ include/linux/reiserfs_acl.h | 4 +-
+ include/linux/reiserfs_xattr.h | 6 +-
+ include/linux/xattr.h | 2 +-
+ mm/msync.c | 2 +-
+ mm/shmem.c | 29 +--
+ security/selinux/hooks.c | 55 +-----
+ security/selinux/include/objsec.h | 1 -
+ 110 files changed, 828 insertions(+), 1160 deletions(-)
+ create mode 100644 fs/statfs.c
+Merging pci/linux-next
+$ git merge pci/linux-next
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-bus-pci | 40 +++
+ Documentation/PCI/pcieaer-howto.txt | 29 +-
+ arch/x86/include/asm/pci_x86.h | 2 +-
+ arch/x86/pci/common.c | 2 +-
+ arch/x86/pci/direct.c | 16 +-
+ arch/x86/pci/irq.c | 9 +-
+ arch/x86/pci/mmconfig_32.c | 8 +-
+ arch/x86/pci/numaq_32.c | 8 +-
+ arch/x86/pci/pcbios.c | 8 +-
+ drivers/pci/Kconfig | 2 +-
+ drivers/pci/access.c | 34 +-
+ drivers/pci/pci-sysfs.c | 44 +++-
+ drivers/pci/pci.c | 2 -
+ drivers/pci/pcie/aer/aer_inject.c | 2 +-
+ drivers/pci/pcie/aer/aerdrv.c | 179 ++++++++---
+ drivers/pci/pcie/aer/aerdrv.h | 6 +-
+ drivers/pci/pcie/aer/aerdrv_core.c | 558 +++++++++++++------------------
+ drivers/pci/slot.c | 48 +++
+ include/linux/ioport.h | 4 +-
+ include/linux/pci_ids.h | 4 +-
+ include/linux/pci_regs.h | 3 +-
+ kernel/resource.c | 16 +-
+ 22 files changed, 582 insertions(+), 442 deletions(-)
+Merging hid/for-next
+$ git merge hid/for-next
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-driver-hid-picolcd | 43 +
+ .../ABI/testing/sysfs-driver-hid-prodikeys | 29 +
+ .../ABI/testing/sysfs-driver-hid-roccat-kone | 111 +
+ Documentation/ABI/testing/sysfs-wacom | 10 +
+ drivers/hid/Kconfig | 110 +-
+ drivers/hid/Makefile | 6 +
+ drivers/hid/hid-3m-pct.c | 31 +-
+ drivers/hid/hid-cando.c | 272 ++
+ drivers/hid/hid-core.c | 53 +-
+ drivers/hid/hid-egalax.c | 281 +++
+ drivers/hid/hid-ids.h | 25 +
+ drivers/hid/hid-lg.c | 9 +
+ drivers/hid/hid-magicmouse.c | 5 +-
+ drivers/hid/hid-ntrig.c | 526 ++++-
+ drivers/hid/hid-picolcd.c | 2631 ++++++++++++++++++++
+ drivers/hid/hid-prodikeys.c | 910 +++++++
+ drivers/hid/hid-roccat-kone.c | 1007 ++++++++
+ drivers/hid/hid-roccat-kone.h | 214 ++
+ drivers/hid/hid-samsung.c | 102 +-
+ drivers/hid/hid-topseed.c | 38 +-
+ drivers/hid/hid-wacom.c | 229 ++-
+ drivers/hid/hid-zydacron.c | 237 ++
+ drivers/hid/hidraw.c | 50 +-
+ drivers/hid/usbhid/hid-core.c | 33 +-
+ drivers/hid/usbhid/hid-quirks.c | 1 +
+ drivers/hid/usbhid/hiddev.c | 19 +-
+ drivers/hid/usbhid/usbkbd.c | 1 +
+ include/linux/hid.h | 10 +
+ 28 files changed, 6874 insertions(+), 119 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-picolcd
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-prodikeys
+ create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kone
+ create mode 100644 Documentation/ABI/testing/sysfs-wacom
+ create mode 100644 drivers/hid/hid-cando.c
+ create mode 100644 drivers/hid/hid-egalax.c
+ create mode 100644 drivers/hid/hid-picolcd.c
+ create mode 100644 drivers/hid/hid-prodikeys.c
+ create mode 100644 drivers/hid/hid-roccat-kone.c
+ create mode 100644 drivers/hid/hid-roccat-kone.h
+ create mode 100644 drivers/hid/hid-zydacron.c
+Merging quilt/i2c
+$ git merge quilt/i2c
+Auto-merging drivers/i2c/busses/i2c-ibm_iic.c
+Merge made by recursive.
+ Documentation/i2c/busses/i2c-i801 | 8 +++-
+ drivers/i2c/algos/i2c-algo-pca.c | 36 ++++++------
+ drivers/i2c/busses/i2c-ali1535.c | 2 +-
+ drivers/i2c/busses/i2c-ali15x3.c | 2 +-
+ drivers/i2c/busses/i2c-amd756.c | 2 +-
+ drivers/i2c/busses/i2c-amd8111.c | 2 +-
+ drivers/i2c/busses/i2c-at91.c | 3 +-
+ drivers/i2c/busses/i2c-elektor.c | 2 +-
+ drivers/i2c/busses/i2c-gpio.c | 2 +-
+ drivers/i2c/busses/i2c-hydra.c | 2 +-
+ drivers/i2c/busses/i2c-i801.c | 59 +++++++++++++--------
+ drivers/i2c/busses/i2c-ibm_iic.c | 2 +-
+ drivers/i2c/busses/i2c-iop3xx.c | 3 +-
+ drivers/i2c/busses/i2c-mv64xxx.c | 3 +-
+ drivers/i2c/busses/i2c-nforce2.c | 2 +-
+ drivers/i2c/busses/i2c-ocores.c | 2 +-
+ drivers/i2c/busses/i2c-parport-light.c | 2 +-
+ drivers/i2c/busses/i2c-parport.c | 2 +-
+ drivers/i2c/busses/i2c-pasemi.c | 2 +-
+ drivers/i2c/busses/i2c-pca-isa.c | 2 +-
+ drivers/i2c/busses/i2c-pca-platform.c | 2 +-
+ drivers/i2c/busses/i2c-piix4.c | 2 +-
+ drivers/i2c/busses/i2c-pmcmsp.c | 2 +-
+ drivers/i2c/busses/i2c-pxa.c | 2 +-
+ drivers/i2c/busses/i2c-s3c2410.c | 2 +-
+ drivers/i2c/busses/i2c-s6000.c | 2 +-
+ drivers/i2c/busses/i2c-sh7760.c | 2 +-
+ drivers/i2c/busses/i2c-sibyte.c | 2 +-
+ drivers/i2c/busses/i2c-simtec.c | 3 +-
+ drivers/i2c/busses/i2c-sis5595.c | 2 +-
+ drivers/i2c/busses/i2c-sis630.c | 2 +-
+ drivers/i2c/busses/i2c-sis96x.c | 2 +-
+ drivers/i2c/busses/i2c-stub.c | 9 ++--
+ drivers/i2c/busses/i2c-versatile.c | 3 +-
+ drivers/i2c/busses/i2c-via.c | 2 +-
+ drivers/i2c/busses/i2c-viapro.c | 2 +-
+ drivers/i2c/busses/scx200_acb.c | 4 +-
+ drivers/i2c/busses/scx200_i2c.c | 2 +-
+ drivers/i2c/i2c-core.c | 90 ++++++++++++++++----------------
+ drivers/i2c/i2c-dev.c | 36 ++++++------
+ drivers/misc/eeprom/at24.c | 59 +++++++++++++++++----
+ 41 files changed, 212 insertions(+), 160 deletions(-)
+Merging bjdooks-i2c/next-i2c
+$ git merge bjdooks-i2c/next-i2c
+Auto-merging MAINTAINERS
+Auto-merging drivers/i2c/busses/i2c-ibm_iic.c
+Auto-merging drivers/i2c/busses/i2c-pxa.c
+Auto-merging drivers/i2c/busses/i2c-s3c2410.c
+Merge made by recursive.
+ MAINTAINERS | 1 +
+ arch/arm/plat-omap/i2c.c | 39 ++++--
+ drivers/i2c/busses/i2c-bfin-twi.c | 168 ++++++++++------------
+ drivers/i2c/busses/i2c-highlander.c | 5 +-
+ drivers/i2c/busses/i2c-nomadik.c | 6 +-
+ drivers/i2c/busses/i2c-omap.c | 265 +++++++++++++++++++++++++++-------
+ drivers/i2c/busses/i2c-pxa.c | 26 ++--
+ drivers/i2c/busses/i2c-s3c2410.c | 19 +++-
+ include/linux/i2c-omap.h | 9 ++
+ 9 files changed, 363 insertions(+), 175 deletions(-)
+ create mode 100644 include/linux/i2c-omap.h
+Merging quilt/jdelvare-hwmon
+$ git merge quilt/jdelvare-hwmon
+Merge made by recursive.
+ Documentation/hwmon/lm63 | 7 +
+ Documentation/hwmon/sysfs-interface | 13 +-
+ drivers/acpi/osl.c | 9 +
+ drivers/hwmon/Kconfig | 21 ++-
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/adm1031.c | 68 +++++++-
+ drivers/hwmon/applesmc.c | 186 +++++++++++++++++++-
+ drivers/hwmon/asus_atk0110.c | 7 +
+ drivers/hwmon/emc1403.c | 344 +++++++++++++++++++++++++++++++++++
+ drivers/hwmon/f71882fg.c | 170 +++++++++++++-----
+ drivers/hwmon/lm63.c | 16 ++-
+ drivers/hwmon/lm90.c | 3 +-
+ drivers/hwmon/tmp401.c | 255 +++++++++++++-------------
+ include/linux/acpi.h | 2 +
+ 14 files changed, 909 insertions(+), 193 deletions(-)
+ create mode 100644 drivers/hwmon/emc1403.c
+Merging quilt/kernel-doc
+$ git merge quilt/kernel-doc
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ .mailmap | 2 +-
+ Documentation/DocBook/mtdnand.tmpl | 2 +-
+ Documentation/DocBook/scsi.tmpl | 2 +-
+ Documentation/SubmitChecklist | 12 ++
+ Documentation/development-process/2.Process | 29 +++--
+ Documentation/development-process/7.AdvancedTopics | 2 +-
+ Documentation/scsi/scsi-generic.txt | 30 +++---
+ Documentation/scsi/scsi.txt | 22 ++--
+ Documentation/scsi/scsi_mid_low_api.txt | 130 ++++++++++----------
+ Documentation/sysrq.txt | 14 +-
+ Documentation/timers/hpet_example.c | 2 -
+ Documentation/vm/map_hugetlb.c | 2 +-
+ MAINTAINERS | 2 +-
+ drivers/message/fusion/mptscsih.c | 6 +-
+ drivers/scsi/Kconfig | 4 +-
+ drivers/scsi/scsi_debug.c | 2 +-
+ drivers/scsi/scsi_scan.c | 26 ++---
+ include/scsi/sg.h | 19 ++--
+ 18 files changed, 160 insertions(+), 148 deletions(-)
+Merging v4l-dvb/master
+$ git merge v4l-dvb/master
+Auto-merging MAINTAINERS
+Removing drivers/media/IR/ir-keymaps.c
+Removing drivers/media/video/font.h
+Merge made by recursive.
+ Documentation/DocBook/media-entities.tmpl | 11 +
+ Documentation/DocBook/v4l/compat.xml | 126 +-
+ Documentation/DocBook/v4l/controls.xml | 36 +-
+ Documentation/DocBook/v4l/dev-event.xml | 31 +
+ Documentation/DocBook/v4l/io.xml | 18 +-
+ Documentation/DocBook/v4l/pixfmt.xml | 12 +
+ Documentation/DocBook/v4l/v4l2.xml | 3 +
+ Documentation/DocBook/v4l/videodev2.h.xml | 10 +
+ Documentation/DocBook/v4l/vidioc-dqevent.xml | 131 +
+ Documentation/DocBook/v4l/vidioc-enuminput.xml | 2 +-
+ Documentation/DocBook/v4l/vidioc-qbuf.xml | 14 +-
+ Documentation/DocBook/v4l/vidioc-queryctrl.xml | 2 +-
+ Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +-
+ .../DocBook/v4l/vidioc-subscribe-event.xml | 133 +
+ Documentation/video4linux/CARDLIST.bttv | 2 +-
+ Documentation/video4linux/CARDLIST.cx88 | 1 +
+ Documentation/video4linux/CARDLIST.em28xx | 4 +-
+ Documentation/video4linux/CARDLIST.saa7134 | 3 +
+ Documentation/video4linux/extract_xc3028.pl | 817 +++++-
+ Documentation/video4linux/gspca.txt | 5 +
+ Documentation/video4linux/sh_mobile_ceu_camera.txt | 80 +-
+ Documentation/video4linux/v4l2-framework.txt | 143 +-
+ MAINTAINERS | 2 +-
+ drivers/input/evdev.c | 39 +
+ drivers/input/input.c | 264 ++-
+ drivers/media/IR/Kconfig | 59 +
+ drivers/media/IR/Makefile | 14 +-
+ drivers/media/IR/imon.c | 2396 ++++++++++++++
+ drivers/media/IR/ir-core-priv.h | 126 +
+ drivers/media/IR/ir-functions.c | 1 +
+ drivers/media/IR/ir-jvc-decoder.c | 320 ++
+ drivers/media/IR/ir-keymaps.c | 3494 --------------------
+ drivers/media/IR/ir-keytable.c | 687 ++--
+ drivers/media/IR/ir-nec-decoder.c | 328 ++
+ drivers/media/IR/ir-raw-event.c | 251 ++
+ drivers/media/IR/ir-rc5-decoder.c | 324 ++
+ drivers/media/IR/ir-rc6-decoder.c | 419 +++
+ drivers/media/IR/ir-sony-decoder.c | 312 ++
+ drivers/media/IR/ir-sysfs.c | 202 +-
+ drivers/media/IR/keymaps/Kconfig | 15 +
+ drivers/media/IR/keymaps/Makefile | 67 +
+ drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c | 89 +
+ drivers/media/IR/keymaps/rc-apac-viewcomp.c | 80 +
+ drivers/media/IR/keymaps/rc-asus-pc39.c | 91 +
+ drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c | 69 +
+ drivers/media/IR/keymaps/rc-avermedia-a16d.c | 75 +
+ drivers/media/IR/keymaps/rc-avermedia-cardbus.c | 97 +
+ drivers/media/IR/keymaps/rc-avermedia-dvbt.c | 78 +
+ .../media/IR/keymaps/rc-avermedia-m135a-rm-jx.c | 90 +
+ drivers/media/IR/keymaps/rc-avermedia.c | 86 +
+ drivers/media/IR/keymaps/rc-avertv-303.c | 85 +
+ drivers/media/IR/keymaps/rc-behold-columbus.c | 108 +
+ drivers/media/IR/keymaps/rc-behold.c | 141 +
+ drivers/media/IR/keymaps/rc-budget-ci-old.c | 92 +
+ drivers/media/IR/keymaps/rc-cinergy-1400.c | 84 +
+ drivers/media/IR/keymaps/rc-cinergy.c | 78 +
+ drivers/media/IR/keymaps/rc-dm1105-nec.c | 76 +
+ drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c | 78 +
+ drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c | 97 +
+ drivers/media/IR/keymaps/rc-em-terratec.c | 69 +
+ drivers/media/IR/keymaps/rc-empty.c | 44 +
+ drivers/media/IR/keymaps/rc-encore-enltv-fm53.c | 81 +
+ drivers/media/IR/keymaps/rc-encore-enltv.c | 112 +
+ drivers/media/IR/keymaps/rc-encore-enltv2.c | 90 +
+ drivers/media/IR/keymaps/rc-evga-indtube.c | 61 +
+ drivers/media/IR/keymaps/rc-eztv.c | 96 +
+ drivers/media/IR/keymaps/rc-flydvb.c | 77 +
+ drivers/media/IR/keymaps/rc-flyvideo.c | 70 +
+ drivers/media/IR/keymaps/rc-fusionhdtv-mce.c | 98 +
+ drivers/media/IR/keymaps/rc-gadmei-rm008z.c | 81 +
+ drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c | 84 +
+ drivers/media/IR/keymaps/rc-gotview7135.c | 79 +
+ drivers/media/IR/keymaps/rc-hauppauge-new.c | 100 +
+ drivers/media/IR/keymaps/rc-imon-mce.c | 142 +
+ drivers/media/IR/keymaps/rc-imon-pad.c | 156 +
+ drivers/media/IR/keymaps/rc-iodata-bctv7e.c | 88 +
+ drivers/media/IR/keymaps/rc-kaiomy.c | 87 +
+ drivers/media/IR/keymaps/rc-kworld-315u.c | 83 +
+ .../media/IR/keymaps/rc-kworld-plus-tv-analog.c | 99 +
+ drivers/media/IR/keymaps/rc-manli.c | 135 +
+ drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c | 123 +
+ drivers/media/IR/keymaps/rc-msi-tvanywhere.c | 69 +
+ drivers/media/IR/keymaps/rc-nebula.c | 96 +
+ .../media/IR/keymaps/rc-nec-terratec-cinergy-xs.c | 105 +
+ drivers/media/IR/keymaps/rc-norwood.c | 85 +
+ drivers/media/IR/keymaps/rc-npgtech.c | 80 +
+ drivers/media/IR/keymaps/rc-pctv-sedna.c | 80 +
+ drivers/media/IR/keymaps/rc-pinnacle-color.c | 94 +
+ drivers/media/IR/keymaps/rc-pinnacle-grey.c | 89 +
+ drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c | 73 +
+ drivers/media/IR/keymaps/rc-pixelview-mk12.c | 83 +
+ drivers/media/IR/keymaps/rc-pixelview-new.c | 83 +
+ drivers/media/IR/keymaps/rc-pixelview.c | 82 +
+ .../media/IR/keymaps/rc-powercolor-real-angel.c | 81 +
+ drivers/media/IR/keymaps/rc-proteus-2309.c | 69 +
+ drivers/media/IR/keymaps/rc-purpletv.c | 81 +
+ drivers/media/IR/keymaps/rc-pv951.c | 78 +
+ drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c | 103 +
+ drivers/media/IR/keymaps/rc-rc5-tv.c | 81 +
+ .../media/IR/keymaps/rc-real-audio-220-32-keys.c | 78 +
+ drivers/media/IR/keymaps/rc-tbs-nec.c | 73 +
+ drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c | 92 +
+ drivers/media/IR/keymaps/rc-tevii-nec.c | 88 +
+ drivers/media/IR/keymaps/rc-tt-1500.c | 82 +
+ drivers/media/IR/keymaps/rc-videomate-s350.c | 85 +
+ drivers/media/IR/keymaps/rc-videomate-tv-pvr.c | 87 +
+ drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c | 82 +
+ drivers/media/IR/keymaps/rc-winfast.c | 102 +
+ drivers/media/IR/rc-map.c | 84 +
+ drivers/media/common/tuners/tuner-xc2028.c | 25 +-
+ drivers/media/common/tuners/tuner-xc2028.h | 2 +
+ drivers/media/dvb/bt8xx/dst.c | 2 -
+ drivers/media/dvb/dm1105/dm1105.c | 25 +-
+ drivers/media/dvb/dvb-core/dvb_demux.c | 11 +-
+ drivers/media/dvb/dvb-core/dvb_frontend.c | 25 +-
+ drivers/media/dvb/dvb-usb/a800.c | 6 +-
+ drivers/media/dvb/dvb-usb/af9005-remote.c | 16 +-
+ drivers/media/dvb/dvb-usb/af9005.c | 8 +-
+ drivers/media/dvb/dvb-usb/af9005.h | 4 +-
+ drivers/media/dvb/dvb-usb/af9015.c | 43 +-
+ drivers/media/dvb/dvb-usb/af9015.h | 18 +-
+ drivers/media/dvb/dvb-usb/anysee.c | 6 +-
+ drivers/media/dvb/dvb-usb/az6027.c | 114 +-
+ drivers/media/dvb/dvb-usb/cinergyT2-core.c | 6 +-
+ drivers/media/dvb/dvb-usb/cxusb.c | 51 +-
+ drivers/media/dvb/dvb-usb/dib0700_devices.c | 100 +-
+ drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +-
+ drivers/media/dvb/dvb-usb/dibusb-mb.c | 8 +-
+ drivers/media/dvb/dvb-usb/dibusb-mc.c | 2 +-
+ drivers/media/dvb/dvb-usb/dibusb.h | 2 +-
+ drivers/media/dvb/dvb-usb/digitv.c | 6 +-
+ drivers/media/dvb/dvb-usb/dtt200u.c | 18 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 9 +-
+ drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 2 +
+ drivers/media/dvb/dvb-usb/dvb-usb.h | 7 +
+ drivers/media/dvb/dvb-usb/dw2102.c | 44 +-
+ drivers/media/dvb/dvb-usb/gp8psk.c | 4 +
+ drivers/media/dvb/dvb-usb/m920x.c | 18 +-
+ drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 +-
+ drivers/media/dvb/dvb-usb/opera1.c | 16 +-
+ drivers/media/dvb/dvb-usb/vp702x.c | 12 +-
+ drivers/media/dvb/dvb-usb/vp7045.c | 12 +-
+ drivers/media/dvb/firewire/firedtv-avc.c | 2 +-
+ drivers/media/dvb/frontends/atbm8830_priv.h | 2 +-
+ drivers/media/dvb/frontends/au8522_decoder.c | 7 +
+ drivers/media/dvb/frontends/au8522_dig.c | 26 +
+ drivers/media/dvb/frontends/au8522_priv.h | 5 +
+ drivers/media/dvb/frontends/dib3000mc.c | 35 +-
+ drivers/media/dvb/frontends/dib7000p.c | 36 +-
+ drivers/media/dvb/frontends/dib8000.h | 1 +
+ drivers/media/dvb/frontends/ds3000.c | 2 +-
+ drivers/media/dvb/frontends/stv0900_core.c | 16 +-
+ drivers/media/dvb/frontends/stv090x.c | 94 +-
+ drivers/media/dvb/frontends/stv090x.h | 1 +
+ drivers/media/dvb/frontends/stv6110x.c | 34 +-
+ drivers/media/dvb/frontends/stv6110x.h | 1 +
+ drivers/media/dvb/mantis/mantis_input.c | 4 +-
+ drivers/media/dvb/mantis/mantis_vp1041.c | 10 +-
+ drivers/media/dvb/ngene/Kconfig | 2 +
+ drivers/media/dvb/ngene/Makefile | 4 +-
+ drivers/media/dvb/ngene/ngene-cards.c | 328 ++
+ drivers/media/dvb/ngene/ngene-core.c | 518 +---
+ drivers/media/dvb/ngene/ngene-dvb.c | 172 +
+ drivers/media/dvb/ngene/ngene-i2c.c | 179 +
+ drivers/media/dvb/ngene/ngene.h | 30 +
+ drivers/media/dvb/pt1/pt1.c | 271 ++-
+ drivers/media/dvb/pt1/va1j5jf8007s.c | 32 +-
+ drivers/media/dvb/pt1/va1j5jf8007s.h | 8 +-
+ drivers/media/dvb/pt1/va1j5jf8007t.c | 31 +-
+ drivers/media/dvb/pt1/va1j5jf8007t.h | 8 +-
+ drivers/media/dvb/ttpci/budget-ci.c | 52 +-
+ drivers/media/dvb/ttpci/budget.c | 1 +
+ drivers/media/radio/radio-mr800.c | 19 +-
+ drivers/media/video/Kconfig | 52 +-
+ drivers/media/video/Makefile | 14 +-
+ drivers/media/video/ak881x.c | 368 ++
+ drivers/media/video/arv.c | 524 ++--
+ drivers/media/video/au0828/au0828-video.c | 2 +-
+ drivers/media/video/bt8xx/bttv-cards.c | 4 +
+ drivers/media/video/bt8xx/bttv-driver.c | 27 +-
+ drivers/media/video/bt8xx/bttv-input.c | 30 +-
+ drivers/media/video/bw-qcam.c | 452 ++--
+ drivers/media/video/c-qcam.c | 483 ++--
+ drivers/media/video/cpia2/cpia2_v4l.c | 4 +-
+ drivers/media/video/cx18/cx18-av-core.c | 54 +-
+ drivers/media/video/cx18/cx18-av-core.h | 24 +-
+ drivers/media/video/cx18/cx18-av-vbi.c | 42 +-
+ drivers/media/video/cx18/cx18-cards.c | 4 +-
+ drivers/media/video/cx18/cx18-cards.h | 4 +-
+ drivers/media/video/cx18/cx18-controls.c | 2 +-
+ drivers/media/video/cx18/cx18-fileops.c | 2 +-
+ drivers/media/video/cx18/cx18-i2c.c | 2 +-
+ drivers/media/video/cx18/cx18-ioctl.c | 22 +-
+ drivers/media/video/cx18/cx18-streams.c | 5 +-
+ drivers/media/video/cx18/cx18-vbi.c | 2 +-
+ drivers/media/video/cx231xx/cx231xx-audio.c | 2 +-
+ drivers/media/video/cx231xx/cx231xx-core.c | 13 +-
+ drivers/media/video/cx231xx/cx231xx-input.c | 52 +-
+ drivers/media/video/cx231xx/cx231xx-video.c | 9 +-
+ drivers/media/video/cx231xx/cx231xx.h | 2 +-
+ drivers/media/video/cx2341x.c | 14 -
+ drivers/media/video/cx23885/cimax2.c | 12 +-
+ drivers/media/video/cx23885/cx23885-417.c | 2 +-
+ drivers/media/video/cx23885/cx23885-dvb.c | 16 +
+ drivers/media/video/cx23885/cx23885-input.c | 8 +-
+ drivers/media/video/cx23885/cx23885-video.c | 4 +-
+ drivers/media/video/cx25840/cx25840-core.c | 17 +-
+ drivers/media/video/cx25840/cx25840-core.h | 5 +-
+ drivers/media/video/cx25840/cx25840-vbi.c | 40 +-
+ drivers/media/video/cx88/cx88-core.c | 3 +-
+ drivers/media/video/cx88/cx88-dvb.c | 2 +-
+ drivers/media/video/cx88/cx88-input.c | 149 +-
+ drivers/media/video/cx88/cx88-mpeg.c | 11 +-
+ drivers/media/video/cx88/cx88-video.c | 20 +-
+ drivers/media/video/cx88/cx88.h | 8 +-
+ drivers/media/video/davinci/dm644x_ccdc.c | 131 +-
+ drivers/media/video/davinci/dm644x_ccdc_regs.h | 10 +-
+ drivers/media/video/davinci/isif_regs.h | 2 +-
+ drivers/media/video/davinci/vpfe_capture.c | 83 +-
+ drivers/media/video/davinci/vpif_capture.c | 8 +-
+ drivers/media/video/davinci/vpif_display.c | 6 +-
+ drivers/media/video/em28xx/em28xx-audio.c | 2 +-
+ drivers/media/video/em28xx/em28xx-cards.c | 56 +-
+ drivers/media/video/em28xx/em28xx-core.c | 25 +-
+ drivers/media/video/em28xx/em28xx-dvb.c | 11 +-
+ drivers/media/video/em28xx/em28xx-input.c | 29 +-
+ drivers/media/video/em28xx/em28xx-video.c | 66 +-
+ drivers/media/video/em28xx/em28xx.h | 7 +-
+ drivers/media/video/et61x251/et61x251_core.c | 6 +-
+ drivers/media/video/font.h | 407 ---
+ drivers/media/video/gspca/Kconfig | 6 -
+ drivers/media/video/gspca/cpia1.c | 36 +-
+ drivers/media/video/gspca/gspca.c | 124 +-
+ drivers/media/video/gspca/gspca.h | 6 +-
+ drivers/media/video/gspca/ov534.c | 563 ++--
+ drivers/media/video/gspca/pac207.c | 4 +-
+ drivers/media/video/gspca/sn9c2028.c | 2 +-
+ drivers/media/video/gspca/sn9c20x.c | 278 +-
+ drivers/media/video/gspca/sonixj.c | 585 +++-
+ drivers/media/video/gspca/spca561.c | 58 +-
+ drivers/media/video/gspca/t613.c | 172 +-
+ drivers/media/video/gspca/vc032x.c | 747 +++--
+ drivers/media/video/gspca/zc3xx.c | 95 +-
+ drivers/media/video/hdpvr/hdpvr-core.c | 33 +-
+ drivers/media/video/hdpvr/hdpvr-video.c | 18 +
+ drivers/media/video/hdpvr/hdpvr.h | 5 +
+ drivers/media/video/ir-kbd-i2c.c | 28 +-
+ drivers/media/video/ivtv/ivtv-driver.c | 5 +-
+ drivers/media/video/ivtv/ivtv-driver.h | 10 +
+ drivers/media/video/ivtv/ivtv-fileops.c | 55 +-
+ drivers/media/video/ivtv/ivtv-i2c.c | 6 +-
+ drivers/media/video/ivtv/ivtv-ioctl.c | 119 +-
+ drivers/media/video/ivtv/ivtv-irq.c | 23 +-
+ drivers/media/video/ivtv/ivtv-streams.c | 17 +-
+ drivers/media/video/ivtv/ivtv-vbi.c | 18 +-
+ drivers/media/video/ivtv/ivtvfb.c | 2 +-
+ drivers/media/video/mem2mem_testdev.c | 1052 ++++++
+ drivers/media/video/meye.c | 78 +-
+ drivers/media/video/meye.h | 10 +-
+ drivers/media/video/mt9t031.c | 66 +-
+ drivers/media/video/mt9v022.c | 2 +-
+ drivers/media/video/mx1_camera.c | 4 +-
+ drivers/media/video/mx3_camera.c | 4 +-
+ drivers/media/video/omap/Kconfig | 11 +
+ drivers/media/video/omap/Makefile | 7 +
+ drivers/media/video/omap/omap_vout.c | 2643 +++++++++++++++
+ drivers/media/video/omap/omap_voutdef.h | 147 +
+ drivers/media/video/omap/omap_voutlib.c | 293 ++
+ drivers/media/video/omap/omap_voutlib.h | 34 +
+ drivers/media/video/omap24xxcam.c | 4 +-
+ drivers/media/video/ov511.c | 11 +-
+ drivers/media/video/ov7670.c | 286 ++-
+ drivers/media/video/ov9640.c | 6 +-
+ drivers/media/video/pms.c | 18 -
+ drivers/media/video/pvrusb2/pvrusb2-hdw.c | 2 +-
+ drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 28 +-
+ drivers/media/video/pwc/Kconfig | 2 +-
+ drivers/media/video/pxa_camera.c | 4 +-
+ drivers/media/video/rj54n1cb0c.c | 18 +-
+ drivers/media/video/s2255drv.c | 1161 ++++---
+ drivers/media/video/saa7115.c | 74 +-
+ drivers/media/video/saa7127.c | 31 +-
+ drivers/media/video/saa7134/saa7134-alsa.c | 2 -
+ drivers/media/video/saa7134/saa7134-cards.c | 111 +
+ drivers/media/video/saa7134/saa7134-core.c | 22 +-
+ drivers/media/video/saa7134/saa7134-dvb.c | 9 +
+ drivers/media/video/saa7134/saa7134-input.c | 283 ++-
+ drivers/media/video/saa7134/saa7134-reg.h | 24 +-
+ drivers/media/video/saa7134/saa7134-video.c | 25 +-
+ drivers/media/video/saa7134/saa7134.h | 7 +-
+ drivers/media/video/sh_mobile_ceu_camera.c | 613 ++--
+ drivers/media/video/sh_vou.c | 1476 +++++++++
+ drivers/media/video/sn9c102/sn9c102_core.c | 6 +-
+ drivers/media/video/sn9c102/sn9c102_devtable.h | 18 +-
+ drivers/media/video/sn9c102/sn9c102_hv7131d.c | 2 +-
+ drivers/media/video/soc_camera.c | 21 +-
+ drivers/media/video/tlg2300/pd-dvb.c | 6 +-
+ drivers/media/video/tlg2300/pd-main.c | 7 +-
+ drivers/media/video/tlg2300/pd-radio.c | 21 +-
+ drivers/media/video/tlg2300/pd-video.c | 18 +-
+ drivers/media/video/tvp514x.c | 13 +
+ drivers/media/video/tvp5150.c | 67 +-
+ drivers/media/video/tvp7002.c | 53 +-
+ drivers/media/video/usbvideo/quickcam_messenger.c | 3 +-
+ drivers/media/video/usbvision/usbvision-i2c.c | 3 +
+ drivers/media/video/usbvision/usbvision-video.c | 82 +-
+ drivers/media/video/usbvision/usbvision.h | 6 +-
+ drivers/media/video/uvc/uvc_ctrl.c | 50 +-
+ drivers/media/video/uvc/uvc_driver.c | 25 +-
+ drivers/media/video/uvc/uvc_queue.c | 8 +-
+ drivers/media/video/uvc/uvcvideo.h | 4 +-
+ drivers/media/video/v4l2-common.c | 101 +-
+ drivers/media/video/v4l2-compat-ioctl32.c | 3 +
+ drivers/media/video/v4l2-dev.c | 6 +-
+ drivers/media/video/v4l2-device.c | 11 +
+ drivers/media/video/v4l2-event.c | 292 ++
+ drivers/media/video/v4l2-fh.c | 79 +
+ drivers/media/video/v4l2-ioctl.c | 103 +-
+ drivers/media/video/v4l2-mem2mem.c | 633 ++++
+ drivers/media/video/videobuf-core.c | 244 +-
+ drivers/media/video/videobuf-dma-contig.c | 115 +-
+ drivers/media/video/videobuf-dma-sg.c | 383 +--
+ drivers/media/video/videobuf-dvb.c | 2 +-
+ drivers/media/video/videobuf-vmalloc.c | 183 +-
+ drivers/media/video/vivi.c | 806 ++---
+ drivers/media/video/w9966.c | 1149 ++++----
+ drivers/media/video/zc0301/zc0301_core.c | 6 +-
+ drivers/media/video/zc0301/zc0301_sensor.h | 2 +-
+ drivers/media/video/zoran/zoran.h | 24 +-
+ drivers/media/video/zoran/zoran_driver.c | 16 +-
+ drivers/media/video/zr364xx.c | 4 +-
+ drivers/staging/Kconfig | 2 +
+ drivers/staging/Makefile | 1 +
+ drivers/staging/cx25821/cx25821-alsa.c | 103 +-
+ drivers/staging/cx25821/cx25821-audio-upstream.c | 146 +-
+ drivers/staging/cx25821/cx25821-audups11.c | 85 +-
+ drivers/staging/cx25821/cx25821-cards.c | 4 +-
+ drivers/staging/cx25821/cx25821-core.c | 160 +-
+ drivers/staging/cx25821/cx25821-gpio.c | 25 +-
+ drivers/staging/cx25821/cx25821-i2c.c | 14 +-
+ drivers/staging/cx25821/cx25821-medusa-video.c | 260 +-
+ drivers/staging/cx25821/cx25821-video-upstream.c | 144 +-
+ drivers/staging/cx25821/cx25821-video.c | 145 +-
+ drivers/staging/cx25821/cx25821-video.h | 78 +-
+ drivers/staging/cx25821/cx25821-video0.c | 88 +-
+ drivers/staging/cx25821/cx25821-video1.c | 88 +-
+ drivers/staging/cx25821/cx25821-video2.c | 88 +-
+ drivers/staging/cx25821/cx25821-video3.c | 88 +-
+ drivers/staging/cx25821/cx25821-video4.c | 88 +-
+ drivers/staging/cx25821/cx25821-video5.c | 88 +-
+ drivers/staging/cx25821/cx25821-video6.c | 88 +-
+ drivers/staging/cx25821/cx25821-video7.c | 88 +-
+ drivers/staging/cx25821/cx25821-videoioctl.c | 84 +-
+ drivers/staging/cx25821/cx25821-vidups10.c | 84 +-
+ drivers/staging/cx25821/cx25821-vidups9.c | 84 +-
+ drivers/staging/tm6000/Kconfig | 32 +
+ drivers/staging/tm6000/Makefile | 17 +
+ drivers/staging/tm6000/README | 22 +
+ drivers/staging/tm6000/tm6000-alsa.c | 414 +++
+ drivers/staging/tm6000/tm6000-cards.c | 973 ++++++
+ drivers/staging/tm6000/tm6000-core.c | 602 ++++
+ drivers/staging/tm6000/tm6000-dvb.c | 346 ++
+ drivers/staging/tm6000/tm6000-i2c.c | 370 +++
+ drivers/staging/tm6000/tm6000-regs.h | 541 +++
+ drivers/staging/tm6000/tm6000-stds.c | 873 +++++
+ drivers/staging/tm6000/tm6000-usb-isoc.h | 53 +
+ drivers/staging/tm6000/tm6000-video.c | 1557 +++++++++
+ drivers/staging/tm6000/tm6000.h | 301 ++
+ include/linux/input.h | 40 +-
+ include/linux/meye.h | 12 +-
+ include/linux/videodev2.h | 75 +-
+ include/media/ak881x.h | 25 +
+ include/media/davinci/vpfe_capture.h | 2 +
+ include/media/ir-common.h | 74 +-
+ include/media/ir-core.h | 142 +-
+ include/media/ir-kbd-i2c.h | 6 +-
+ include/media/rc-map.h | 121 +
+ include/media/sh_vou.h | 34 +
+ include/media/soc_camera.h | 12 +-
+ include/media/v4l2-chip-ident.h | 127 +-
+ include/media/v4l2-common.h | 27 +-
+ include/media/v4l2-dev.h | 5 +
+ include/media/v4l2-event.h | 67 +
+ include/media/v4l2-fh.h | 65 +
+ include/media/v4l2-ioctl.h | 7 +
+ include/media/v4l2-mem2mem.h | 201 ++
+ include/media/v4l2-subdev.h | 70 +-
+ include/media/videobuf-core.h | 35 +-
+ include/media/videobuf-dma-sg.h | 26 +-
+ include/media/videobuf-vmalloc.h | 12 +-
+ 390 files changed, 36552 insertions(+), 11871 deletions(-)
+ create mode 100644 Documentation/DocBook/v4l/dev-event.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-dqevent.xml
+ create mode 100644 Documentation/DocBook/v4l/vidioc-subscribe-event.xml
+ create mode 100644 drivers/media/IR/imon.c
+ create mode 100644 drivers/media/IR/ir-core-priv.h
+ create mode 100644 drivers/media/IR/ir-jvc-decoder.c
+ delete mode 100644 drivers/media/IR/ir-keymaps.c
+ create mode 100644 drivers/media/IR/ir-nec-decoder.c
+ create mode 100644 drivers/media/IR/ir-raw-event.c
+ create mode 100644 drivers/media/IR/ir-rc5-decoder.c
+ create mode 100644 drivers/media/IR/ir-rc6-decoder.c
+ create mode 100644 drivers/media/IR/ir-sony-decoder.c
+ create mode 100644 drivers/media/IR/keymaps/Kconfig
+ create mode 100644 drivers/media/IR/keymaps/Makefile
+ create mode 100644 drivers/media/IR/keymaps/rc-adstech-dvb-t-pci.c
+ create mode 100644 drivers/media/IR/keymaps/rc-apac-viewcomp.c
+ create mode 100644 drivers/media/IR/keymaps/rc-asus-pc39.c
+ create mode 100644 drivers/media/IR/keymaps/rc-ati-tv-wonder-hd-600.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avermedia-a16d.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avermedia-cardbus.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avermedia-dvbt.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avermedia-m135a-rm-jx.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avermedia.c
+ create mode 100644 drivers/media/IR/keymaps/rc-avertv-303.c
+ create mode 100644 drivers/media/IR/keymaps/rc-behold-columbus.c
+ create mode 100644 drivers/media/IR/keymaps/rc-behold.c
+ create mode 100644 drivers/media/IR/keymaps/rc-budget-ci-old.c
+ create mode 100644 drivers/media/IR/keymaps/rc-cinergy-1400.c
+ create mode 100644 drivers/media/IR/keymaps/rc-cinergy.c
+ create mode 100644 drivers/media/IR/keymaps/rc-dm1105-nec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-dntv-live-dvb-t.c
+ create mode 100644 drivers/media/IR/keymaps/rc-dntv-live-dvbt-pro.c
+ create mode 100644 drivers/media/IR/keymaps/rc-em-terratec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-empty.c
+ create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv-fm53.c
+ create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv.c
+ create mode 100644 drivers/media/IR/keymaps/rc-encore-enltv2.c
+ create mode 100644 drivers/media/IR/keymaps/rc-evga-indtube.c
+ create mode 100644 drivers/media/IR/keymaps/rc-eztv.c
+ create mode 100644 drivers/media/IR/keymaps/rc-flydvb.c
+ create mode 100644 drivers/media/IR/keymaps/rc-flyvideo.c
+ create mode 100644 drivers/media/IR/keymaps/rc-fusionhdtv-mce.c
+ create mode 100644 drivers/media/IR/keymaps/rc-gadmei-rm008z.c
+ create mode 100644 drivers/media/IR/keymaps/rc-genius-tvgo-a11mce.c
+ create mode 100644 drivers/media/IR/keymaps/rc-gotview7135.c
+ create mode 100644 drivers/media/IR/keymaps/rc-hauppauge-new.c
+ create mode 100644 drivers/media/IR/keymaps/rc-imon-mce.c
+ create mode 100644 drivers/media/IR/keymaps/rc-imon-pad.c
+ create mode 100644 drivers/media/IR/keymaps/rc-iodata-bctv7e.c
+ create mode 100644 drivers/media/IR/keymaps/rc-kaiomy.c
+ create mode 100644 drivers/media/IR/keymaps/rc-kworld-315u.c
+ create mode 100644 drivers/media/IR/keymaps/rc-kworld-plus-tv-analog.c
+ create mode 100644 drivers/media/IR/keymaps/rc-manli.c
+ create mode 100644 drivers/media/IR/keymaps/rc-msi-tvanywhere-plus.c
+ create mode 100644 drivers/media/IR/keymaps/rc-msi-tvanywhere.c
+ create mode 100644 drivers/media/IR/keymaps/rc-nebula.c
+ create mode 100644 drivers/media/IR/keymaps/rc-nec-terratec-cinergy-xs.c
+ create mode 100644 drivers/media/IR/keymaps/rc-norwood.c
+ create mode 100644 drivers/media/IR/keymaps/rc-npgtech.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pctv-sedna.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-color.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-grey.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pinnacle-pctv-hd.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pixelview-mk12.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pixelview-new.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pixelview.c
+ create mode 100644 drivers/media/IR/keymaps/rc-powercolor-real-angel.c
+ create mode 100644 drivers/media/IR/keymaps/rc-proteus-2309.c
+ create mode 100644 drivers/media/IR/keymaps/rc-purpletv.c
+ create mode 100644 drivers/media/IR/keymaps/rc-pv951.c
+ create mode 100644 drivers/media/IR/keymaps/rc-rc5-hauppauge-new.c
+ create mode 100644 drivers/media/IR/keymaps/rc-rc5-tv.c
+ create mode 100644 drivers/media/IR/keymaps/rc-real-audio-220-32-keys.c
+ create mode 100644 drivers/media/IR/keymaps/rc-tbs-nec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-terratec-cinergy-xs.c
+ create mode 100644 drivers/media/IR/keymaps/rc-tevii-nec.c
+ create mode 100644 drivers/media/IR/keymaps/rc-tt-1500.c
+ create mode 100644 drivers/media/IR/keymaps/rc-videomate-s350.c
+ create mode 100644 drivers/media/IR/keymaps/rc-videomate-tv-pvr.c
+ create mode 100644 drivers/media/IR/keymaps/rc-winfast-usbii-deluxe.c
+ create mode 100644 drivers/media/IR/keymaps/rc-winfast.c
+ create mode 100644 drivers/media/IR/rc-map.c
+ create mode 100644 drivers/media/dvb/ngene/ngene-cards.c
+ create mode 100644 drivers/media/dvb/ngene/ngene-dvb.c
+ create mode 100644 drivers/media/dvb/ngene/ngene-i2c.c
+ create mode 100644 drivers/media/video/ak881x.c
+ delete mode 100644 drivers/media/video/font.h
+ create mode 100644 drivers/media/video/mem2mem_testdev.c
+ create mode 100644 drivers/media/video/omap/Kconfig
+ create mode 100644 drivers/media/video/omap/Makefile
+ create mode 100644 drivers/media/video/omap/omap_vout.c
+ create mode 100644 drivers/media/video/omap/omap_voutdef.h
+ create mode 100644 drivers/media/video/omap/omap_voutlib.c
+ create mode 100644 drivers/media/video/omap/omap_voutlib.h
+ create mode 100644 drivers/media/video/sh_vou.c
+ create mode 100644 drivers/media/video/v4l2-event.c
+ create mode 100644 drivers/media/video/v4l2-fh.c
+ create mode 100644 drivers/media/video/v4l2-mem2mem.c
+ create mode 100644 drivers/staging/tm6000/Kconfig
+ create mode 100644 drivers/staging/tm6000/Makefile
+ create mode 100644 drivers/staging/tm6000/README
+ create mode 100644 drivers/staging/tm6000/tm6000-alsa.c
+ create mode 100644 drivers/staging/tm6000/tm6000-cards.c
+ create mode 100644 drivers/staging/tm6000/tm6000-core.c
+ create mode 100644 drivers/staging/tm6000/tm6000-dvb.c
+ create mode 100644 drivers/staging/tm6000/tm6000-i2c.c
+ create mode 100644 drivers/staging/tm6000/tm6000-regs.h
+ create mode 100644 drivers/staging/tm6000/tm6000-stds.c
+ create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h
+ create mode 100644 drivers/staging/tm6000/tm6000-video.c
+ create mode 100644 drivers/staging/tm6000/tm6000.h
+ create mode 100644 include/media/ak881x.h
+ create mode 100644 include/media/rc-map.h
+ create mode 100644 include/media/sh_vou.h
+ create mode 100644 include/media/v4l2-event.h
+ create mode 100644 include/media/v4l2-fh.h
+ create mode 100644 include/media/v4l2-mem2mem.h
+$ git am -3 ../patches/v4l-dvb__update_gfp_slab.h_includes
+Applying: v4l-dvb: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/staging/tm6000/tm6000-alsa.c
+M drivers/staging/tm6000/tm6000-cards.c
+M drivers/staging/tm6000/tm6000-core.c
+M drivers/staging/tm6000/tm6000-dvb.c
+$ git add .
+$ git commit -v -a --amend
+[master 0566826] Merge remote branch 'v4l-dvb/master'
+Merging kbuild/for-next
+$ git merge kbuild/for-next
+Auto-merging .gitignore
+Auto-merging MAINTAINERS
+Auto-merging Makefile
+Auto-merging arch/ia64/include/asm/percpu.h
+Auto-merging arch/ia64/kernel/ivt.S
+Auto-merging arch/parisc/include/asm/system.h
+Auto-merging arch/powerpc/include/asm/cache.h
+Auto-merging arch/s390/kernel/swsusp_asm64.S
+Auto-merging arch/sh/include/asm/cache.h
+Auto-merging arch/x86/kernel/setup_percpu.c
+Auto-merging arch/x86/kernel/vmlinux.lds.S
+Auto-merging include/asm-generic/percpu.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/linux/percpu-defs.h
+Auto-merging include/linux/spinlock.h
+Auto-merging init/Kconfig
+Auto-merging kernel/module.c
+Auto-merging scripts/kconfig/Makefile
+Auto-merging scripts/markup_oops.pl
+Merge made by recursive.
+ .gitignore | 1 +
+ Documentation/.gitignore | 7 +
+ Documentation/kbuild/kbuild.txt | 6 +-
+ Documentation/kbuild/kconfig-language.txt | 2 +-
+ Documentation/kbuild/makefiles.txt | 2 +-
+ Documentation/mutex-design.txt | 4 +-
+ MAINTAINERS | 5 +-
+ Makefile | 65 +-
+ arch/frv/kernel/break.S | 4 +-
+ arch/frv/kernel/entry.S | 2 +-
+ arch/frv/kernel/head.S | 2 +-
+ arch/frv/kernel/vmlinux.lds.S | 10 +-
+ arch/frv/mm/tlb-miss.S | 2 +-
+ arch/h8300/boot/compressed/head.S | 2 +-
+ arch/h8300/boot/compressed/vmlinux.lds | 2 +-
+ arch/ia64/include/asm/asmmacro.h | 12 +-
+ arch/ia64/include/asm/cache.h | 2 +-
+ arch/ia64/include/asm/percpu.h | 2 +-
+ arch/ia64/kernel/Makefile.gate | 2 +-
+ arch/ia64/kernel/gate-data.S | 2 +-
+ arch/ia64/kernel/gate.S | 8 +-
+ arch/ia64/kernel/gate.lds.S | 10 +-
+ arch/ia64/kernel/init_task.c | 2 +-
+ arch/ia64/kernel/ivt.S | 2 +-
+ arch/ia64/kernel/minstate.h | 4 +-
+ arch/ia64/kernel/paravirtentry.S | 2 +-
+ arch/ia64/kernel/vmlinux.lds.S | 28 +-
+ arch/ia64/kvm/vmm_ivt.S | 2 +-
+ arch/ia64/scripts/unwcheck.py | 2 +-
+ arch/ia64/xen/gate-data.S | 2 +-
+ arch/ia64/xen/xensetup.S | 2 +-
+ arch/m68knommu/kernel/vmlinux.lds.S | 4 +-
+ arch/m68knommu/platform/68360/head-ram.S | 2 +-
+ arch/m68knommu/platform/68360/head-rom.S | 2 +-
+ arch/mips/lasat/image/head.S | 2 +-
+ arch/mips/lasat/image/romscript.normal | 2 +-
+ arch/parisc/include/asm/cache.h | 2 +-
+ arch/parisc/include/asm/system.h | 2 +-
+ arch/parisc/kernel/head.S | 2 +-
+ arch/parisc/kernel/init_task.c | 6 +-
+ arch/parisc/kernel/vmlinux.lds.S | 12 +-
+ arch/powerpc/Makefile | 5 +
+ arch/powerpc/include/asm/cache.h | 2 +-
+ arch/powerpc/include/asm/page_64.h | 8 -
+ arch/powerpc/kernel/vmlinux.lds.S | 10 +-
+ arch/s390/include/asm/cache.h | 2 +-
+ arch/s390/kernel/swsusp_asm64.S | 2 +-
+ arch/sh/boot/compressed/vmlinux.scr | 2 +-
+ arch/sh/include/asm/cache.h | 2 +-
+ arch/sparc/boot/btfixupprep.c | 2 +-
+ arch/sparc/include/asm/cache.h | 2 +-
+ arch/um/kernel/dyn.lds.S | 2 +-
+ arch/um/kernel/init_task.c | 2 +-
+ arch/um/kernel/uml.lds.S | 2 +-
+ arch/x86/.gitignore | 3 +
+ arch/x86/boot/compressed/mkpiggy.c | 2 +-
+ arch/x86/boot/compressed/vmlinux.lds.S | 4 +-
+ arch/x86/include/asm/cache.h | 2 +-
+ arch/x86/kernel/acpi/wakeup_32.S | 2 +-
+ arch/x86/kernel/init_task.c | 2 +-
+ arch/x86/kernel/setup_percpu.c | 2 +-
+ arch/x86/kernel/vmlinux.lds.S | 4 +-
+ include/asm-generic/percpu.h | 10 +-
+ include/asm-generic/vmlinux.lds.h | 38 +-
+ include/linux/cache.h | 2 +-
+ include/linux/init.h | 2 +-
+ include/linux/init_task.h | 2 +-
+ include/linux/linkage.h | 8 +-
+ include/linux/percpu-defs.h | 4 +-
+ include/linux/spinlock.h | 2 +-
+ init/Kconfig | 8 +
+ kernel/module.c | 2 +-
+ scripts/Makefile.build | 2 +-
+ scripts/Makefile.lib | 2 +-
+ scripts/checkincludes.pl | 24 +-
+ scripts/checkstack.pl | 16 +-
+ scripts/checkversion.pl | 23 +-
+ scripts/decodecode | 48 +-
+ scripts/export_report.pl | 37 +-
+ scripts/gen_initramfs_list.sh | 3 +-
+ scripts/genksyms/genksyms.c | 4 +-
+ scripts/headerdep.pl | 3 +-
+ scripts/headers_check.pl | 11 +-
+ scripts/headers_install.pl | 19 +-
+ scripts/kallsyms.c | 6 +-
+ scripts/kconfig/Makefile | 16 +-
+ scripts/kconfig/expr.c | 27 +-
+ scripts/kconfig/expr.h | 5 +-
+ scripts/kconfig/gconf.c | 113 +--
+ scripts/kconfig/gconf.glade | 26 +-
+ scripts/kconfig/lkc.h | 7 +-
+ scripts/kconfig/lkc_proto.h | 6 +-
+ scripts/kconfig/lxdialog/inputbox.c | 4 +-
+ scripts/kconfig/lxdialog/menubox.c | 22 +-
+ scripts/kconfig/mconf.c | 36 +-
+ scripts/kconfig/menu.c | 28 +-
+ scripts/kconfig/nconf.c | 1568 +++++++++++++++++++++++++++++
+ scripts/kconfig/nconf.gui.c | 617 ++++++++++++
+ scripts/kconfig/nconf.h | 95 ++
+ scripts/kconfig/symbol.c | 30 +-
+ scripts/kconfig/util.c | 2 +
+ scripts/kconfig/zconf.tab.c_shipped | 25 +-
+ scripts/kconfig/zconf.y | 25 +-
+ scripts/markup_oops.pl | 54 +-
+ scripts/mkcompile_h | 5 +-
+ scripts/mod/modpost.c | 152 ++--
+ scripts/namespace.pl | 65 +-
+ scripts/package/builddeb | 2 +
+ scripts/package/mkspec | 2 +-
+ scripts/profile2linkerlist.pl | 8 +-
+ scripts/rt-tester/rt-tester.py | 2 +-
+ scripts/show_delta | 2 +-
+ scripts/tags.sh | 45 +-
+ 113 files changed, 3025 insertions(+), 540 deletions(-)
+ create mode 100644 Documentation/.gitignore
+ create mode 100644 arch/x86/.gitignore
+ create mode 100644 scripts/kconfig/nconf.c
+ create mode 100644 scripts/kconfig/nconf.gui.c
+ create mode 100644 scripts/kconfig/nconf.h
+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-dma.c | 11 +++--------
+ 1 files changed, 3 insertions(+), 8 deletions(-)
+Merging libata/NEXT
+$ git merge libata/NEXT
+Merge made by recursive.
+ Documentation/DocBook/libata.tmpl | 18 +-
+ drivers/ata/Kconfig | 20 +-
+ drivers/ata/Makefile | 3 +-
+ drivers/ata/ahci.c | 2544 +++----------------------------------
+ drivers/ata/ahci.h | 343 +++++
+ drivers/ata/ahci_platform.c | 192 +++
+ drivers/ata/libahci.c | 2216 ++++++++++++++++++++++++++++++++
+ drivers/ata/libata-core.c | 37 +-
+ drivers/ata/libata-pmp.c | 32 +-
+ drivers/ata/libata-sff.c | 178 +--
+ drivers/ata/libata.h | 3 -
+ drivers/ata/pata_bf54x.c | 69 +-
+ drivers/ata/pata_cmd640.c | 3 -
+ drivers/ata/pata_mpc52xx.c | 78 +-
+ drivers/ata/pata_octeon_cf.c | 3 +-
+ drivers/ata/pata_scc.c | 69 +-
+ drivers/ata/pata_sch.c | 12 +-
+ drivers/ata/pata_sil680.c | 30 +-
+ drivers/ata/pata_via.c | 2 -
+ drivers/ata/sata_mv.c | 3 -
+ drivers/ata/sata_nv.c | 3 +-
+ include/linux/ahci_platform.h | 29 +
+ include/linux/libata.h | 17 +-
+ 23 files changed, 3182 insertions(+), 2722 deletions(-)
+ create mode 100644 drivers/ata/ahci.h
+ create mode 100644 drivers/ata/ahci_platform.c
+ create mode 100644 drivers/ata/libahci.c
+ create mode 100644 include/linux/ahci_platform.h
+Merging infiniband/for-next
+$ git merge infiniband/for-next
+Auto-merging MAINTAINERS
+Merge made by recursive.
+ MAINTAINERS | 14 +
+ drivers/infiniband/Kconfig | 1 +
+ drivers/infiniband/Makefile | 1 +
+ drivers/infiniband/core/cma.c | 74 +-
+ drivers/infiniband/core/mad.c | 4 +-
+ drivers/infiniband/core/ucm.c | 3 +-
+ drivers/infiniband/core/ucma.c | 4 +-
+ drivers/infiniband/core/user_mad.c | 12 +-
+ drivers/infiniband/core/uverbs_main.c | 11 +-
+ drivers/infiniband/hw/amso1100/c2.h | 2 +-
+ drivers/infiniband/hw/amso1100/c2_alloc.c | 4 +-
+ drivers/infiniband/hw/amso1100/c2_cq.c | 4 +-
+ drivers/infiniband/hw/amso1100/c2_mq.h | 2 +-
+ drivers/infiniband/hw/amso1100/c2_provider.h | 2 +-
+ drivers/infiniband/hw/amso1100/c2_rnic.c | 12 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 12 +-
+ drivers/infiniband/hw/cxgb3/cxio_hal.h | 2 +-
+ drivers/infiniband/hw/cxgb3/cxio_wr.h | 4 +-
+ drivers/infiniband/hw/cxgb3/iwch.c | 2 -
+ drivers/infiniband/hw/cxgb3/iwch_cm.c | 133 +-
+ drivers/infiniband/hw/cxgb4/Kconfig | 18 +
+ drivers/infiniband/hw/cxgb4/Makefile | 5 +
+ drivers/infiniband/hw/cxgb4/cm.c | 2374 +++++++++++++++++++++++++
+ drivers/infiniband/hw/cxgb4/cq.c | 882 +++++++++
+ drivers/infiniband/hw/cxgb4/device.c | 520 ++++++
+ drivers/infiniband/hw/cxgb4/ev.c | 193 ++
+ drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 745 ++++++++
+ drivers/infiniband/hw/cxgb4/mem.c | 811 +++++++++
+ drivers/infiniband/hw/cxgb4/provider.c | 518 ++++++
+ drivers/infiniband/hw/cxgb4/qp.c | 1577 ++++++++++++++++
+ drivers/infiniband/hw/cxgb4/resource.c | 417 +++++
+ drivers/infiniband/hw/cxgb4/t4.h | 550 ++++++
+ drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 829 +++++++++
+ drivers/infiniband/hw/cxgb4/user.h | 66 +
+ drivers/infiniband/hw/mlx4/cq.c | 8 +
+ drivers/infiniband/hw/mlx4/main.c | 1 +
+ drivers/infiniband/hw/mlx4/qp.c | 50 +-
+ drivers/infiniband/hw/mthca/mthca_allocator.c | 8 +-
+ drivers/infiniband/hw/mthca/mthca_eq.c | 6 +-
+ drivers/infiniband/hw/mthca/mthca_provider.h | 2 +-
+ drivers/infiniband/hw/nes/nes_hw.c | 12 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 16 +-
+ drivers/infiniband/hw/nes/nes_utils.c | 10 -
+ drivers/infiniband/hw/nes/nes_verbs.c | 2 +-
+ drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 20 +
+ drivers/infiniband/ulp/iser/iscsi_iser.c | 9 +-
+ drivers/infiniband/ulp/iser/iscsi_iser.h | 4 +-
+ drivers/infiniband/ulp/iser/iser_verbs.c | 115 +-
+ include/linux/mlx4/device.h | 4 +-
+ include/linux/mlx4/qp.h | 7 +
+ include/rdma/ib_verbs.h | 7 +
+ 51 files changed, 9838 insertions(+), 251 deletions(-)
+ create mode 100644 drivers/infiniband/hw/cxgb4/Kconfig
+ create mode 100644 drivers/infiniband/hw/cxgb4/Makefile
+ create mode 100644 drivers/infiniband/hw/cxgb4/cm.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/cq.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/device.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/ev.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+ create mode 100644 drivers/infiniband/hw/cxgb4/mem.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/provider.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/qp.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/resource.c
+ create mode 100644 drivers/infiniband/hw/cxgb4/t4.h
+ create mode 100644 drivers/infiniband/hw/cxgb4/t4fw_ri_api.h
+ create mode 100644 drivers/infiniband/hw/cxgb4/user.h
+Merging acpi/test
+$ git merge acpi/test
+Removing drivers/acpi/hest.c
+Auto-merging drivers/pci/pcie/aer/aerdrv.h
+Auto-merging drivers/pci/pcie/aer/aerdrv_core.c
+Removing include/acpi/acpi_hest.h
+Auto-merging include/linux/acpi.h
+Merge made by recursive.
+ Documentation/acpi/apei/einj.txt | 49 ++
+ Documentation/kernel-parameters.txt | 10 +
+ arch/ia64/pci/pci.c | 5 +-
+ arch/x86/include/asm/mce.h | 8 +
+ arch/x86/kernel/acpi/boot.c | 4 +
+ arch/x86/kernel/acpi/sleep.c | 2 -
+ arch/x86/kernel/cpu/mcheck/Makefile | 2 +
+ arch/x86/kernel/cpu/mcheck/mce-apei.c | 138 +++++
+ arch/x86/kernel/cpu/mcheck/mce-internal.h | 23 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 79 +++-
+ arch/x86/pci/acpi.c | 5 +-
+ drivers/acpi/Kconfig | 9 +
+ drivers/acpi/Makefile | 5 +-
+ drivers/acpi/acpica/Makefile | 4 +-
+ drivers/acpi/acpica/acevents.h | 51 ++-
+ drivers/acpi/acpica/acglobal.h | 25 +-
+ drivers/acpi/acpica/acinterp.h | 9 +-
+ drivers/acpi/acpica/aclocal.h | 19 +-
+ drivers/acpi/acpica/actables.h | 4 +
+ drivers/acpi/acpica/dsfield.c | 2 +-
+ drivers/acpi/acpica/dsmethod.c | 2 +-
+ drivers/acpi/acpica/dsmthdat.c | 10 +-
+ drivers/acpi/acpica/dsobject.c | 14 +-
+ drivers/acpi/acpica/dsopcode.c | 13 +-
+ drivers/acpi/acpica/dswexec.c | 6 +-
+ drivers/acpi/acpica/dswstate.c | 10 +-
+ drivers/acpi/acpica/evevent.c | 2 +-
+ drivers/acpi/acpica/evgpe.c | 167 ++++--
+ drivers/acpi/acpica/evgpeblk.c | 766 ++------------------------
+ drivers/acpi/acpica/evgpeinit.c | 653 ++++++++++++++++++++++
+ drivers/acpi/acpica/evgpeutil.c | 337 ++++++++++++
+ drivers/acpi/acpica/evmisc.c | 2 +-
+ drivers/acpi/acpica/evxface.c | 24 +-
+ drivers/acpi/acpica/evxfevnt.c | 224 +++++---
+ drivers/acpi/acpica/exconfig.c | 21 +-
+ drivers/acpi/acpica/exconvrt.c | 4 +-
+ drivers/acpi/acpica/excreate.c | 4 +-
+ drivers/acpi/acpica/exdebug.c | 261 +++++++++
+ drivers/acpi/acpica/exfield.c | 2 +-
+ drivers/acpi/acpica/exfldio.c | 16 +-
+ drivers/acpi/acpica/exmisc.c | 8 +-
+ drivers/acpi/acpica/exmutex.c | 46 +-
+ drivers/acpi/acpica/exnames.c | 4 +-
+ drivers/acpi/acpica/exoparg1.c | 18 +-
+ drivers/acpi/acpica/exoparg2.c | 37 +--
+ drivers/acpi/acpica/exoparg3.c | 4 +-
+ drivers/acpi/acpica/exoparg6.c | 4 +-
+ drivers/acpi/acpica/exprep.c | 4 +-
+ drivers/acpi/acpica/exregion.c | 17 +-
+ drivers/acpi/acpica/exresnte.c | 4 +-
+ drivers/acpi/acpica/exresolv.c | 11 +-
+ drivers/acpi/acpica/exresop.c | 8 +-
+ drivers/acpi/acpica/exstore.c | 218 +--------
+ drivers/acpi/acpica/exsystem.c | 10 +-
+ drivers/acpi/acpica/hwacpi.c | 20 +-
+ drivers/acpi/acpica/hwregs.c | 6 +-
+ drivers/acpi/acpica/hwsleep.c | 2 +-
+ drivers/acpi/acpica/hwvalid.c | 2 +-
+ drivers/acpi/acpica/nsaccess.c | 2 +-
+ drivers/acpi/acpica/nsdump.c | 4 +-
+ drivers/acpi/acpica/nsnames.c | 2 +-
+ drivers/acpi/acpica/nssearch.c | 2 +-
+ drivers/acpi/acpica/nsutils.c | 4 +-
+ drivers/acpi/acpica/psargs.c | 4 +-
+ drivers/acpi/acpica/psloop.c | 3 +-
+ drivers/acpi/acpica/psxface.c | 5 +
+ drivers/acpi/acpica/rscreate.c | 14 +-
+ drivers/acpi/acpica/rslist.c | 6 +-
+ drivers/acpi/acpica/rsmisc.c | 4 +-
+ drivers/acpi/acpica/tbfadt.c | 16 +-
+ drivers/acpi/acpica/tbfind.c | 2 +-
+ drivers/acpi/acpica/tbinstal.c | 69 ++--
+ drivers/acpi/acpica/tbutils.c | 101 +++-
+ drivers/acpi/acpica/tbxface.c | 80 ++-
+ drivers/acpi/acpica/tbxfroot.c | 6 +-
+ drivers/acpi/acpica/utalloc.c | 2 +-
+ drivers/acpi/acpica/utcopy.c | 14 +-
+ drivers/acpi/acpica/utdelete.c | 6 +-
+ drivers/acpi/acpica/uteval.c | 2 +-
+ drivers/acpi/acpica/utglobal.c | 1 +
+ drivers/acpi/acpica/utmisc.c | 6 +-
+ drivers/acpi/acpica/utmutex.c | 4 +-
+ drivers/acpi/acpica/utobject.c | 8 +-
+ drivers/acpi/apei/Kconfig | 30 +
+ drivers/acpi/apei/Makefile | 5 +
+ drivers/acpi/apei/apei-base.c | 593 ++++++++++++++++++++
+ drivers/acpi/apei/apei-internal.h | 114 ++++
+ drivers/acpi/apei/cper.c | 84 +++
+ drivers/acpi/apei/einj.c | 485 ++++++++++++++++
+ drivers/acpi/apei/erst.c | 852 +++++++++++++++++++++++++++++
+ drivers/acpi/apei/ghes.c | 425 ++++++++++++++
+ drivers/acpi/apei/hest.c | 173 ++++++
+ drivers/acpi/atomicio.c | 360 ++++++++++++
+ drivers/acpi/bus.c | 37 ++
+ drivers/acpi/hed.c | 113 ++++
+ drivers/acpi/hest.c | 139 -----
+ drivers/acpi/pci_root.c | 67 ++-
+ drivers/acpi/scan.c | 2 +-
+ drivers/acpi/sleep.c | 157 +------
+ drivers/acpi/system.c | 5 +-
+ drivers/acpi/video.c | 110 ++++-
+ drivers/pci/pcie/aer/aerdrv.h | 17 +
+ drivers/pci/pcie/aer/aerdrv_acpi.c | 77 +++
+ drivers/pci/pcie/aer/aerdrv_core.c | 8 +-
+ drivers/pci/probe.c | 8 -
+ include/acpi/acexcep.h | 2 +-
+ include/acpi/acoutput.h | 2 +
+ include/acpi/acpi_bus.h | 2 +-
+ include/acpi/acpi_drivers.h | 3 +-
+ include/acpi/acpi_hest.h | 12 -
+ include/acpi/acpiosxf.h | 4 +-
+ include/acpi/acpixf.h | 43 +-
+ include/acpi/actbl2.h | 27 +
+ include/acpi/actypes.h | 44 +-
+ include/acpi/apei.h | 34 ++
+ include/acpi/atomicio.h | 10 +
+ include/acpi/hed.h | 18 +
+ include/acpi/video.h | 16 +
+ include/linux/acpi.h | 1 -
+ include/linux/cper.h | 314 +++++++++++
+ include/linux/cpuidle.h | 6 +-
+ include/linux/pci.h | 3 +-
+ include/linux/uuid.h | 70 +++
+ lib/Makefile | 2 +-
+ lib/uuid.c | 53 ++
+ 125 files changed, 6475 insertions(+), 1833 deletions(-)
+ create mode 100644 Documentation/acpi/apei/einj.txt
+ create mode 100644 arch/x86/kernel/cpu/mcheck/mce-apei.c
+ create mode 100644 drivers/acpi/acpica/evgpeinit.c
+ create mode 100644 drivers/acpi/acpica/evgpeutil.c
+ create mode 100644 drivers/acpi/acpica/exdebug.c
+ create mode 100644 drivers/acpi/apei/Kconfig
+ create mode 100644 drivers/acpi/apei/Makefile
+ create mode 100644 drivers/acpi/apei/apei-base.c
+ create mode 100644 drivers/acpi/apei/apei-internal.h
+ create mode 100644 drivers/acpi/apei/cper.c
+ create mode 100644 drivers/acpi/apei/einj.c
+ create mode 100644 drivers/acpi/apei/erst.c
+ create mode 100644 drivers/acpi/apei/ghes.c
+ create mode 100644 drivers/acpi/apei/hest.c
+ create mode 100644 drivers/acpi/atomicio.c
+ create mode 100644 drivers/acpi/hed.c
+ delete mode 100644 drivers/acpi/hest.c
+ delete mode 100644 include/acpi/acpi_hest.h
+ create mode 100644 include/acpi/apei.h
+ create mode 100644 include/acpi/atomicio.h
+ create mode 100644 include/acpi/hed.h
+ create mode 100644 include/linux/cper.h
+ create mode 100644 include/linux/uuid.h
+ create mode 100644 lib/uuid.c
+$ git am -3 ../patches/acpi__update_gfp_slab.h_includes
+Applying: acpi: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/acpi/apei/apei-base.c
+M drivers/acpi/atomicio.c
+$ git add .
+$ git commit -v -a --amend
+[master 4d37939] Merge remote branch 'acpi/test'
+Merging ieee1394/for-next
+$ git merge ieee1394/for-next
+Auto-merging drivers/firewire/core-cdev.c
+Auto-merging drivers/firewire/ohci.c
+Merge made by recursive.
+ drivers/firewire/core-card.c | 11 +-
+ drivers/firewire/core-cdev.c | 8 +-
+ drivers/firewire/core-transaction.c | 26 ++++-
+ drivers/firewire/core.h | 5 +
+ drivers/firewire/ohci.c | 188 ++++++++++++++++++++++++++++-------
+ drivers/firewire/ohci.h | 10 ++-
+ drivers/ieee1394/dv1394.c | 11 +-
+ drivers/ieee1394/raw1394.c | 3 +-
+ drivers/ieee1394/video1394.c | 5 +-
+ include/linux/firewire.h | 2 -
+ 10 files changed, 209 insertions(+), 60 deletions(-)
+Merging ubi/linux-next
+$ git merge ubi/linux-next
+Merge made by recursive.
+ drivers/mtd/ubi/Kconfig | 2 +-
+ drivers/mtd/ubi/build.c | 60 ++++++++++++++++++-----------------------------
+ drivers/mtd/ubi/io.c | 6 ++--
+ drivers/mtd/ubi/kapi.c | 6 ++--
+ drivers/mtd/ubi/scan.c | 4 +-
+ drivers/mtd/ubi/ubi.h | 2 -
+ drivers/mtd/ubi/vtbl.c | 4 +-
+ drivers/mtd/ubi/wl.c | 2 +-
+ 8 files changed, 35 insertions(+), 51 deletions(-)
+Merging kvm/linux-next
+$ git merge kvm/linux-next
+Resolved 'kernel/fork.c' using previous resolution.
+Resolved 'tools/perf/builtin-record.c' using previous resolution.
+Auto-merging MAINTAINERS
+Auto-merging arch/powerpc/include/asm/reg.h
+Auto-merging arch/powerpc/kernel/asm-offsets.c
+Removing arch/powerpc/kvm/book3s_64_emulate.c
+Removing arch/x86/include/asm/ds.h
+Auto-merging arch/x86/kernel/cpu/intel.c
+Removing arch/x86/kernel/ds.c
+Removing arch/x86/kernel/ds_selftest.c
+Removing arch/x86/kernel/ds_selftest.h
+Auto-merging arch/x86/kernel/kprobes.c
+Auto-merging arch/x86/kernel/process.c
+Auto-merging arch/x86/kernel/process_64.c
+Auto-merging arch/x86/kvm/svm.c
+Auto-merging arch/x86/kvm/vmx.c
+Auto-merging arch/x86/kvm/x86.c
+Auto-merging include/linux/sched.h
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merging kernel/perf_event.c
+Auto-merging kernel/ptrace.c
+Auto-merging kernel/sched.c
+Removing kernel/trace/trace_hw_branches.c
+Auto-merging tools/perf/builtin-record.c
+CONFLICT (content): Merge conflict in tools/perf/builtin-record.c
+Removing tools/perf/util/string.h
+Auto-merging tools/perf/util/trace-event-parse.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 8926f65] Merge remote branch 'kvm/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kprobes.txt | 10 +-
+ Documentation/kvm/api.txt | 208 +++-
+ Documentation/kvm/cpuid.txt | 42 +
+ Documentation/kvm/mmu.txt | 304 ++++
+ Documentation/trace/kprobetrace.txt | 4 +-
+ MAINTAINERS | 10 +-
+ arch/Kconfig | 9 +-
+ arch/ia64/kvm/kvm-ia64.c | 8 +-
+ arch/ia64/kvm/vmm.c | 2 +-
+ arch/powerpc/include/asm/asm-compat.h | 2 +
+ arch/powerpc/include/asm/kvm.h | 10 +
+ arch/powerpc/include/asm/kvm_asm.h | 2 +
+ arch/powerpc/include/asm/kvm_book3s.h | 157 ++-
+ .../asm/kvm_book3s_32.h} | 36 +-
+ .../asm/kvm_book3s_64.h} | 22 +-
+ .../asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} | 25 +-
+ arch/powerpc/include/asm/kvm_booke.h | 96 ++
+ arch/powerpc/include/asm/kvm_fpu.h | 85 +
+ arch/powerpc/include/asm/kvm_host.h | 38 +-
+ arch/powerpc/include/asm/kvm_ppc.h | 97 +-
+ arch/powerpc/include/asm/mmu_context.h | 2 +
+ arch/powerpc/include/asm/paca.h | 10 +-
+ arch/powerpc/include/asm/processor.h | 3 +
+ arch/powerpc/include/asm/reg.h | 10 +
+ arch/powerpc/kernel/asm-offsets.c | 102 +-
+ arch/powerpc/kernel/head_32.S | 14 +
+ arch/powerpc/kernel/head_64.S | 4 +-
+ arch/powerpc/kernel/ppc_ksyms.c | 4 +
+ arch/powerpc/kvm/44x.c | 2 +-
+ arch/powerpc/kvm/Kconfig | 24 +-
+ arch/powerpc/kvm/Makefile | 20 +-
+ arch/powerpc/kvm/book3s.c | 503 +++++--
+ arch/powerpc/kvm/book3s_32_mmu.c | 54 +-
+ arch/powerpc/kvm/book3s_32_mmu_host.c | 483 ++++++
+ arch/powerpc/kvm/book3s_32_sr.S | 143 ++
+ arch/powerpc/kvm/book3s_64_emulate.c | 348 -----
+ arch/powerpc/kvm/book3s_64_mmu.c | 36 +-
+ arch/powerpc/kvm/book3s_64_mmu_host.c | 102 +-
+ arch/powerpc/kvm/book3s_64_slb.S | 183 +--
+ arch/powerpc/kvm/book3s_emulate.c | 573 +++++++
+ .../kvm/{book3s_64_exports.c => book3s_exports.c} | 0
+ ...{book3s_64_interrupts.S => book3s_interrupts.S} | 204 ++--
+ arch/powerpc/kvm/book3s_paired_singles.c | 1289 +++++++++++++++
+ ...{book3s_64_rmhandlers.S => book3s_rmhandlers.S} | 135 ++-
+ arch/powerpc/kvm/book3s_segment.S | 259 +++
+ arch/powerpc/kvm/booke.c | 21 +-
+ arch/powerpc/kvm/e500.c | 2 +-
+ arch/powerpc/kvm/emulate.c | 55 +-
+ arch/powerpc/kvm/fpu.S | 273 ++++
+ arch/powerpc/kvm/powerpc.c | 110 ++-
+ arch/powerpc/mm/mmu_context_hash32.c | 29 +-
+ arch/s390/kvm/kvm-s390.c | 6 +-
+ arch/s390/kvm/kvm-s390.h | 2 +-
+ arch/x86/Kconfig | 3 +
+ arch/x86/Kconfig.cpu | 20 -
+ arch/x86/Kconfig.debug | 9 -
+ arch/x86/include/asm/apic.h | 13 +-
+ arch/x86/include/asm/ds.h | 302 ----
+ arch/x86/include/asm/insn.h | 2 +
+ arch/x86/include/asm/kprobes.h | 2 +-
+ arch/x86/include/asm/kvm.h | 17 +-
+ arch/x86/include/asm/kvm_emulate.h | 46 +-
+ arch/x86/include/asm/kvm_host.h | 80 +-
+ arch/x86/include/asm/kvm_para.h | 13 +
+ arch/x86/include/asm/msr-index.h | 20 +-
+ arch/x86/include/asm/perf_event.h | 76 +-
+ arch/x86/include/asm/perf_event_p4.h | 794 ++++++++++
+ arch/x86/include/asm/processor.h | 35 +-
+ arch/x86/include/asm/ptrace-abi.h | 57 +-
+ arch/x86/include/asm/ptrace.h | 6 -
+ arch/x86/include/asm/pvclock-abi.h | 4 +-
+ arch/x86/include/asm/pvclock.h | 1 +
+ arch/x86/include/asm/svm.h | 9 +-
+ arch/x86/include/asm/thread_info.h | 8 +-
+ arch/x86/include/asm/vmx.h | 12 +-
+ arch/x86/kernel/Makefile | 2 -
+ arch/x86/kernel/cpu/intel.c | 2 -
+ arch/x86/kernel/cpu/perf_event.c | 560 ++++----
+ arch/x86/kernel/cpu/perf_event_amd.c | 46 +-
+ arch/x86/kernel/cpu/perf_event_intel.c | 354 +++--
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 664 ++++++++
+ arch/x86/kernel/cpu/perf_event_intel_lbr.c | 218 +++
+ arch/x86/kernel/cpu/perf_event_p4.c | 834 ++++++++++
+ arch/x86/kernel/cpu/perf_event_p6.c | 31 +-
+ arch/x86/kernel/ds.c | 1437 -----------------
+ arch/x86/kernel/ds_selftest.c | 408 -----
+ arch/x86/kernel/ds_selftest.h | 15 -
+ arch/x86/kernel/dumpstack.c | 5 -
+ arch/x86/kernel/kprobes.c | 16 +-
+ arch/x86/kernel/kvmclock.c | 56 +-
+ arch/x86/kernel/process.c | 18 +-
+ arch/x86/kernel/process_32.c | 8 -
+ arch/x86/kernel/process_64.c | 8 -
+ arch/x86/kernel/ptrace.c | 382 -----
+ arch/x86/kernel/pvclock.c | 37 +
+ arch/x86/kernel/step.c | 46 +-
+ arch/x86/kernel/tboot.c | 1 +
+ arch/x86/kernel/traps.c | 4 +-
+ arch/x86/kvm/emulate.c | 1247 +++++++++++----
+ arch/x86/kvm/i8259.c | 53 +-
+ arch/x86/kvm/irq.h | 1 +
+ arch/x86/kvm/kvm_timer.h | 4 +-
+ arch/x86/kvm/mmu.c | 225 ++--
+ arch/x86/kvm/mmutrace.h | 84 +-
+ arch/x86/kvm/paging_tmpl.h | 46 +-
+ arch/x86/kvm/svm.c | 944 ++++++++----
+ arch/x86/kvm/timer.c | 3 +-
+ arch/x86/kvm/trace.h | 165 ++-
+ arch/x86/kvm/vmx.c | 383 +++--
+ arch/x86/kvm/x86.c | 1649 ++++++++------------
+ arch/x86/kvm/x86.h | 10 +
+ arch/x86/lib/Makefile | 2 +-
+ arch/x86/oprofile/op_model_ppro.c | 4 +-
+ include/linux/ftrace.h | 12 -
+ include/linux/kvm.h | 26 +
+ include/linux/kvm_host.h | 16 +-
+ include/linux/mm.h | 4 -
+ include/linux/perf_event.h | 51 +-
+ include/linux/ptrace.h | 12 -
+ include/linux/sched.h | 9 -
+ include/linux/tboot.h | 1 +
+ include/trace/events/kvm.h | 1 -
+ include/trace/ftrace.h | 23 +-
+ kernel/fork.c | 2 -
+ kernel/perf_event.c | 283 +++-
+ kernel/ptrace.c | 1 -
+ kernel/sched.c | 43 -
+ kernel/trace/Kconfig | 11 -
+ kernel/trace/Makefile | 1 -
+ kernel/trace/trace.h | 20 +-
+ kernel/trace/trace_entries.h | 12 -
+ kernel/trace/trace_hw_branches.c | 312 ----
+ kernel/trace/trace_kprobe.c | 535 ++++---
+ kernel/trace/trace_selftest.c | 57 -
+ mm/mlock.c | 41 -
+ tools/perf/Documentation/perf-bench.txt | 6 +-
+ tools/perf/Documentation/perf-kvm.txt | 67 +
+ tools/perf/Documentation/perf-probe.txt | 18 +-
+ tools/perf/Documentation/perf-record.txt | 4 +-
+ tools/perf/Documentation/perf-sched.txt | 4 +-
+ tools/perf/Makefile | 340 +++--
+ tools/perf/bench/mem-memcpy.c | 3 +-
+ tools/perf/bench/sched-messaging.c | 4 +-
+ tools/perf/bench/sched-pipe.c | 2 +-
+ tools/perf/builtin-annotate.c | 57 +-
+ tools/perf/builtin-buildid-cache.c | 2 +-
+ tools/perf/builtin-buildid-list.c | 6 +-
+ tools/perf/builtin-diff.c | 10 +-
+ tools/perf/builtin-help.c | 2 +-
+ tools/perf/builtin-kmem.c | 16 +-
+ tools/perf/builtin-kvm.c | 144 ++
+ tools/perf/builtin-lock.c | 2 +-
+ tools/perf/builtin-probe.c | 279 ++---
+ tools/perf/builtin-record.c | 497 ++++--
+ tools/perf/builtin-report.c | 99 +-
+ tools/perf/builtin-sched.c | 8 +-
+ tools/perf/builtin-stat.c | 155 ++-
+ tools/perf/builtin-timechart.c | 5 +-
+ tools/perf/builtin-top.c | 290 +++-
+ tools/perf/builtin-trace.c | 77 +-
+ tools/perf/builtin.h | 1 +
+ tools/perf/command-list.txt | 1 +
+ tools/perf/perf-archive.sh | 3 +
+ tools/perf/perf.c | 6 +-
+ tools/perf/perf.h | 8 +-
+ .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 6 +
+ tools/perf/scripts/perl/bin/failed-syscalls-record | 2 +-
+ tools/perf/scripts/perl/bin/failed-syscalls-report | 8 +-
+ tools/perf/scripts/perl/bin/rw-by-file-record | 3 +-
+ tools/perf/scripts/perl/bin/rw-by-file-report | 8 +-
+ tools/perf/scripts/perl/bin/rw-by-pid-record | 2 +-
+ tools/perf/scripts/perl/bin/rw-by-pid-report | 2 +-
+ tools/perf/scripts/perl/bin/rwtop-record | 2 +
+ tools/perf/scripts/perl/bin/rwtop-report | 23 +
+ tools/perf/scripts/perl/bin/wakeup-latency-record | 2 +-
+ tools/perf/scripts/perl/bin/wakeup-latency-report | 2 +-
+ tools/perf/scripts/perl/bin/workqueue-stats-record | 2 +-
+ tools/perf/scripts/perl/bin/workqueue-stats-report | 2 +-
+ tools/perf/scripts/perl/rwtop.pl | 177 +++
+ .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 3 +
+ .../python/bin/failed-syscalls-by-pid-record | 2 +-
+ .../python/bin/failed-syscalls-by-pid-report | 8 +-
+ tools/perf/scripts/python/bin/sctop-record | 2 +
+ tools/perf/scripts/python/bin/sctop-report | 24 +
+ .../python/bin/syscall-counts-by-pid-record | 2 +-
+ .../python/bin/syscall-counts-by-pid-report | 8 +-
+ .../perf/scripts/python/bin/syscall-counts-record | 2 +-
+ .../perf/scripts/python/bin/syscall-counts-report | 8 +-
+ tools/perf/scripts/python/sctop.py | 78 +
+ tools/perf/util/PERF-VERSION-GEN | 6 +-
+ tools/perf/util/build-id.c | 2 +-
+ tools/perf/util/cache.h | 14 +
+ tools/perf/util/callchain.c | 110 +-
+ tools/perf/util/callchain.h | 6 +-
+ tools/perf/util/color.c | 48 +
+ tools/perf/util/color.h | 4 +
+ tools/perf/util/debug.c | 8 +-
+ tools/perf/util/debug.h | 30 +-
+ tools/perf/util/event.c | 324 +++--
+ tools/perf/util/event.h | 49 +-
+ tools/perf/util/header.c | 524 ++++++-
+ tools/perf/util/header.h | 41 +-
+ tools/perf/util/hist.c | 219 ++-
+ tools/perf/util/hist.h | 15 +-
+ tools/perf/util/include/linux/compiler.h | 2 +
+ tools/perf/util/include/linux/kernel.h | 9 +-
+ tools/perf/util/map.c | 426 +++++-
+ tools/perf/util/map.h | 121 ++-
+ tools/perf/util/newt.c | 725 +++++++++
+ tools/perf/util/parse-events.c | 21 +-
+ tools/perf/util/parse-options.c | 7 +
+ tools/perf/util/parse-options.h | 4 +-
+ tools/perf/util/probe-event.c | 1574 ++++++++++++++-----
+ tools/perf/util/probe-event.h | 130 ++-
+ tools/perf/util/probe-finder.c | 990 +++++++++---
+ tools/perf/util/probe-finder.h | 65 +-
+ tools/perf/util/session.c | 325 +++--
+ tools/perf/util/session.h | 50 +-
+ tools/perf/util/sort.c | 145 +-
+ tools/perf/util/sort.h | 30 +-
+ tools/perf/util/string.c | 45 +-
+ tools/perf/util/string.h | 18 -
+ tools/perf/util/symbol.c | 494 +++++--
+ tools/perf/util/symbol.h | 74 +-
+ tools/perf/util/thread.c | 242 +---
+ tools/perf/util/thread.h | 53 +-
+ tools/perf/util/trace-event-info.c | 24 +
+ tools/perf/util/trace-event-parse.c | 53 +-
+ tools/perf/util/trace-event-read.c | 89 +-
+ tools/perf/util/trace-event.h | 7 +-
+ tools/perf/util/util.h | 21 +
+ virt/kvm/assigned-dev.c | 8 +-
+ virt/kvm/coalesced_mmio.c | 6 +-
+ virt/kvm/iommu.c | 4 +-
+ virt/kvm/kvm_main.c | 63 +-
+ 235 files changed, 19195 insertions(+), 9670 deletions(-)
+ create mode 100644 Documentation/kvm/cpuid.txt
+ create mode 100644 Documentation/kvm/mmu.txt
+ copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_32.h} (53%)
+ copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_64.h} (64%)
+ rename arch/powerpc/include/asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} (82%)
+ create mode 100644 arch/powerpc/include/asm/kvm_booke.h
+ create mode 100644 arch/powerpc/include/asm/kvm_fpu.h
+ create mode 100644 arch/powerpc/kvm/book3s_32_mmu_host.c
+ create mode 100644 arch/powerpc/kvm/book3s_32_sr.S
+ delete mode 100644 arch/powerpc/kvm/book3s_64_emulate.c
+ create mode 100644 arch/powerpc/kvm/book3s_emulate.c
+ rename arch/powerpc/kvm/{book3s_64_exports.c => book3s_exports.c} (100%)
+ rename arch/powerpc/kvm/{book3s_64_interrupts.S => book3s_interrupts.S} (62%)
+ create mode 100644 arch/powerpc/kvm/book3s_paired_singles.c
+ rename arch/powerpc/kvm/{book3s_64_rmhandlers.S => book3s_rmhandlers.S} (62%)
+ create mode 100644 arch/powerpc/kvm/book3s_segment.S
+ create mode 100644 arch/powerpc/kvm/fpu.S
+ delete mode 100644 arch/x86/include/asm/ds.h
+ create mode 100644 arch/x86/include/asm/perf_event_p4.h
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_ds.c
+ create mode 100644 arch/x86/kernel/cpu/perf_event_intel_lbr.c
+ create mode 100644 arch/x86/kernel/cpu/perf_event_p4.c
+ delete mode 100644 arch/x86/kernel/ds.c
+ delete mode 100644 arch/x86/kernel/ds_selftest.c
+ delete mode 100644 arch/x86/kernel/ds_selftest.h
+ delete mode 100644 kernel/trace/trace_hw_branches.c
+ create mode 100644 tools/perf/Documentation/perf-kvm.txt
+ create mode 100644 tools/perf/builtin-kvm.c
+ create mode 100644 tools/perf/scripts/perl/bin/rwtop-record
+ create mode 100644 tools/perf/scripts/perl/bin/rwtop-report
+ create mode 100644 tools/perf/scripts/perl/rwtop.pl
+ create mode 100644 tools/perf/scripts/python/bin/sctop-record
+ create mode 100644 tools/perf/scripts/python/bin/sctop-report
+ create mode 100644 tools/perf/scripts/python/sctop.py
+ create mode 100644 tools/perf/util/newt.c
+ delete mode 100644 tools/perf/util/string.h
+Merging dlm/next
+$ git merge dlm/next
+Merge made by recursive.
+ fs/dlm/lock.c | 5 +--
+ fs/dlm/user.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++---------
+ 2 files changed, 75 insertions(+), 18 deletions(-)
+Merging ibft/master
+$ git merge ibft/master
+Merge made by recursive.
+ 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 +++-
+ include/linux/iscsi_boot_sysfs.h | 123 ++++++
+ include/linux/iscsi_ibft.h | 12 +-
+ 7 files changed, 924 insertions(+), 484 deletions(-)
+ create mode 100644 drivers/firmware/iscsi_boot_sysfs.c
+ create mode 100644 include/linux/iscsi_boot_sysfs.h
+Merging scsi/master
+$ git merge scsi/master
+Auto-merging MAINTAINERS
+Auto-merging drivers/message/fusion/mptscsih.c
+Auto-merging drivers/s390/scsi/zfcp_fsf.c
+Auto-merging drivers/scsi/bnx2i/bnx2i_init.c
+Auto-merging drivers/scsi/iscsi_tcp.c
+Auto-merging drivers/scsi/qla4xxx/ql4_mbx.c
+Auto-merging drivers/scsi/scsi_debug.c
+Auto-merging drivers/scsi/scsi_error.c
+Auto-merging drivers/scsi/scsi_scan.c
+Auto-merging drivers/scsi/sd.c
+Auto-merging include/trace/ftrace.h
+Merge made by recursive.
+ MAINTAINERS | 23 +-
+ drivers/message/fusion/mptbase.c | 177 ++-
+ drivers/message/fusion/mptbase.h | 5 +-
+ drivers/message/fusion/mptctl.c | 181 +-
+ drivers/message/fusion/mptfc.c | 22 +-
+ drivers/message/fusion/mptsas.c | 55 +-
+ drivers/message/fusion/mptsas.h | 2 +-
+ drivers/message/fusion/mptscsih.c | 27 +-
+ drivers/message/fusion/mptspi.c | 10 +
+ drivers/s390/scsi/zfcp_aux.c | 7 +-
+ drivers/s390/scsi/zfcp_def.h | 19 +-
+ drivers/s390/scsi/zfcp_erp.c | 2 +-
+ drivers/s390/scsi/zfcp_ext.h | 6 +-
+ drivers/s390/scsi/zfcp_fc.c | 4 +-
+ drivers/s390/scsi/zfcp_fsf.c | 246 +--
+ drivers/s390/scsi/zfcp_fsf.h | 11 +-
+ drivers/s390/scsi/zfcp_qdio.c | 108 +-
+ drivers/s390/scsi/zfcp_qdio.h | 104 +
+ drivers/s390/scsi/zfcp_scsi.c | 23 +-
+ drivers/scsi/3w-9xxx.c | 24 +-
+ drivers/scsi/3w-9xxx.h | 9 +-
+ drivers/scsi/3w-xxxx.c | 23 +-
+ drivers/scsi/3w-xxxx.h | 8 +-
+ drivers/scsi/Makefile | 1 +
+ drivers/scsi/a2091.c | 309 ++--
+ drivers/scsi/a2091.h | 42 +-
+ drivers/scsi/a3000.c | 285 ++--
+ drivers/scsi/a3000.h | 46 +-
+ drivers/scsi/aacraid/aachba.c | 67 +-
+ drivers/scsi/aacraid/aacraid.h | 4 +-
+ drivers/scsi/aacraid/commsup.c | 18 +
+ drivers/scsi/bfa/bfa_cb_ioim_macros.h | 29 -
+ drivers/scsi/bfa/bfa_ioim.c | 22 +-
+ drivers/scsi/bfa/bfa_os_inc.h | 23 +-
+ drivers/scsi/bfa/bfad.c | 21 +-
+ drivers/scsi/bfa/bfad_attr.c | 201 ++
+ drivers/scsi/bfa/bfad_drv.h | 4 +-
+ drivers/scsi/bfa/bfad_im.c | 67 +-
+ drivers/scsi/bfa/bfad_im.h | 6 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +-
+ drivers/scsi/bnx2i/bnx2i_init.c | 11 +-
+ drivers/scsi/cxgb3i/cxgb3i_init.c | 4 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c | 2 -
+ drivers/scsi/fcoe/fcoe.c | 194 +-
+ drivers/scsi/fcoe/libfcoe.c | 111 +-
+ drivers/scsi/fnic/fnic.h | 4 +-
+ drivers/scsi/fnic/fnic_fcs.c | 2 +-
+ drivers/scsi/fnic/fnic_main.c | 2 +-
+ drivers/scsi/gdth.c | 2 +-
+ drivers/scsi/gvp11.c | 565 +++---
+ drivers/scsi/gvp11.h | 36 +-
+ drivers/scsi/hpsa.c | 8 -
+ drivers/scsi/hpsa_cmd.h | 15 -
+ drivers/scsi/ibmvscsi/ibmvfc.c | 8 +-
+ drivers/scsi/ibmvscsi/ibmvfc.h | 1 +
+ drivers/scsi/iscsi_tcp.c | 6 +-
+ drivers/scsi/iscsi_tcp.h | 1 -
+ drivers/scsi/libfc/fc_disc.c | 8 +-
+ drivers/scsi/libfc/fc_elsct.c | 2 +-
+ drivers/scsi/libfc/fc_exch.c | 51 +-
+ drivers/scsi/libfc/fc_fcp.c | 103 +-
+ drivers/scsi/libfc/fc_libfc.h | 8 +-
+ drivers/scsi/libfc/fc_lport.c | 58 +-
+ drivers/scsi/libfc/fc_npiv.c | 7 +-
+ drivers/scsi/libfc/fc_rport.c | 195 +-
+ drivers/scsi/libiscsi_tcp.c | 2 +-
+ drivers/scsi/lpfc/lpfc.h | 4 +
+ drivers/scsi/lpfc/lpfc_attr.c | 20 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 498 ++++-
+ drivers/scsi/lpfc/lpfc_bsg.h | 3 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 1 +
+ drivers/scsi/lpfc/lpfc_disc.h | 1 +
+ drivers/scsi/lpfc/lpfc_els.c | 24 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 79 +-
+ drivers/scsi/lpfc/lpfc_hw.h | 190 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 60 +-
+ drivers/scsi/lpfc/lpfc_init.c | 213 ++-
+ drivers/scsi/lpfc/lpfc_mbox.c | 69 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 99 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 149 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 269 ++-
+ drivers/scsi/lpfc/lpfc_sli.h | 4 +
+ drivers/scsi/lpfc/lpfc_sli4.h | 5 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 4 +-
+ drivers/scsi/mpt2sas/Kconfig | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2.h | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 2 +-
+ drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.c | 90 +-
+ drivers/scsi/mpt2sas/mpt2sas_base.h | 36 +-
+ drivers/scsi/mpt2sas/mpt2sas_config.c | 8 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.c | 46 +-
+ drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +-
+ drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1055 +++++----
+ drivers/scsi/mpt2sas/mpt2sas_transport.c | 89 +-
+ drivers/scsi/mvme147.c | 169 +-
+ drivers/scsi/mvme147.h | 4 +-
+ drivers/scsi/mvsas/mv_64xx.c | 25 +-
+ drivers/scsi/mvsas/mv_94xx.c | 10 +
+ drivers/scsi/mvsas/mv_init.c | 19 +-
+ drivers/scsi/mvsas/mv_sas.c | 201 ++-
+ drivers/scsi/mvsas/mv_sas.h | 11 +-
+ drivers/scsi/pm8001/pm8001_hwi.c | 1 -
+ drivers/scsi/pm8001/pm8001_sas.c | 4 +-
+ drivers/scsi/pmcraid.c | 6 -
+ drivers/scsi/qla2xxx/Makefile | 3 +-
+ drivers/scsi/qla2xxx/qla_attr.c | 772 +------
+ drivers/scsi/qla2xxx/qla_bsg.c | 1212 ++++++++++
+ drivers/scsi/qla2xxx/qla_bsg.h | 135 ++
+ drivers/scsi/qla2xxx/qla_dbg.c | 61 +
+ drivers/scsi/qla2xxx/qla_dbg.h | 10 +
+ drivers/scsi/qla2xxx/qla_def.h | 343 ++--
+ drivers/scsi/qla2xxx/qla_fw.h | 106 +-
+ drivers/scsi/qla2xxx/qla_gbl.h | 126 +-
+ drivers/scsi/qla2xxx/qla_gs.c | 2 +-
+ drivers/scsi/qla2xxx/qla_init.c | 724 ++++++-
+ drivers/scsi/qla2xxx/qla_inline.h | 21 +-
+ drivers/scsi/qla2xxx/qla_iocb.c | 879 +++++++-
+ drivers/scsi/qla2xxx/qla_isr.c | 540 +++--
+ drivers/scsi/qla2xxx/qla_mbx.c | 266 ++-
+ drivers/scsi/qla2xxx/qla_nx.c | 3636 +++++++++++++++++++++++++++++
+ drivers/scsi/qla2xxx/qla_nx.h | 889 +++++++
+ drivers/scsi/qla2xxx/qla_os.c | 543 ++++-
+ drivers/scsi/qla2xxx/qla_sup.c | 149 ++-
+ drivers/scsi/qla4xxx/ql4_def.h | 48 +-
+ drivers/scsi/qla4xxx/ql4_fw.h | 46 +-
+ drivers/scsi/qla4xxx/ql4_glbl.h | 8 +-
+ drivers/scsi/qla4xxx/ql4_init.c | 374 +++-
+ drivers/scsi/qla4xxx/ql4_iocb.c | 2 +-
+ drivers/scsi/qla4xxx/ql4_isr.c | 23 +-
+ drivers/scsi/qla4xxx/ql4_mbx.c | 337 ++-
+ drivers/scsi/qla4xxx/ql4_os.c | 135 +-
+ drivers/scsi/qla4xxx/ql4_version.h | 3 +-
+ drivers/scsi/scsi.c | 6 +
+ drivers/scsi/scsi_debug.c | 87 +-
+ drivers/scsi/scsi_error.c | 19 +-
+ drivers/scsi/scsi_scan.c | 3 +-
+ drivers/scsi/scsi_sysfs.c | 7 +-
+ drivers/scsi/scsi_trace.c | 284 +++
+ drivers/scsi/scsi_transport_fc.c | 30 +-
+ drivers/scsi/sd.c | 25 +-
+ drivers/scsi/wd33c93.c | 6 -
+ drivers/scsi/wd33c93.h | 1 -
+ include/linux/ftrace_event.h | 3 +
+ include/scsi/Kbuild | 1 -
+ include/scsi/fc/fc_fcp.h | 1 +
+ include/scsi/fc_encode.h | 18 +-
+ include/scsi/libfc.h | 29 +-
+ include/scsi/libfcoe.h | 10 +-
+ include/scsi/scsi.h | 3 +
+ include/scsi/scsi_transport_fc.h | 2 +-
+ include/trace/events/scsi.h | 345 +++
+ include/trace/ftrace.h | 3 +
+ kernel/trace/trace_output.c | 16 +
+ 159 files changed, 15289 insertions(+), 4138 deletions(-)
+ create mode 100644 drivers/scsi/qla2xxx/qla_bsg.c
+ create mode 100644 drivers/scsi/qla2xxx/qla_bsg.h
+ create mode 100644 drivers/scsi/qla2xxx/qla_nx.c
+ create mode 100644 drivers/scsi/qla2xxx/qla_nx.h
+ create mode 100644 drivers/scsi/scsi_trace.c
+ create mode 100644 include/trace/events/scsi.h
+Merging async_tx/next
+$ git merge async_tx/next
+Auto-merging drivers/dma/Kconfig
+Auto-merging drivers/dma/shdma.c
+Auto-merging drivers/dma/txx9dmac.c
+Auto-merging drivers/mmc/host/atmel-mci.c
+Auto-merging drivers/serial/sh-sci.c
+Merge made by recursive.
+ arch/arm/mach-u300/include/mach/coh901318.h | 21 -
+ arch/arm/plat-nomadik/include/plat/ste_dma40.h | 239 +++
+ crypto/async_tx/async_tx.c | 46 +-
+ drivers/dma/Kconfig | 14 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/at_hdmac.c | 35 +-
+ drivers/dma/coh901318.c | 263 ++-
+ drivers/dma/dmaengine.c | 22 +-
+ drivers/dma/dw_dmac.c | 24 +-
+ drivers/dma/fsldma.c | 28 +-
+ drivers/dma/ioat/dma.c | 12 +-
+ drivers/dma/ioat/dma.h | 19 +-
+ drivers/dma/ioat/dma_v2.c | 186 +-
+ drivers/dma/ioat/dma_v2.h | 33 +-
+ drivers/dma/ioat/dma_v3.c | 143 +-
+ drivers/dma/ioat/pci.c | 7 +-
+ drivers/dma/iop-adma.c | 39 +-
+ drivers/dma/ipu/ipu_idmac.c | 34 +-
+ drivers/dma/mpc512x_dma.c | 15 +-
+ drivers/dma/mv_xor.c | 25 +-
+ drivers/dma/ppc4xx/adma.c | 19 +-
+ drivers/dma/shdma.c | 27 +-
+ drivers/dma/ste_dma40.c | 2657 ++++++++++++++++++++++++
+ drivers/dma/ste_dma40_ll.c | 454 ++++
+ drivers/dma/ste_dma40_ll.h | 354 ++++
+ drivers/dma/timb_dma.c | 860 ++++++++
+ drivers/dma/txx9dmac.c | 23 +-
+ drivers/mmc/host/atmel-mci.c | 2 +-
+ drivers/serial/sh-sci.c | 2 +-
+ drivers/video/mx3fb.c | 3 +-
+ include/linux/dmaengine.h | 127 ++-
+ include/linux/timb_dma.h | 55 +
+ sound/soc/txx9/txx9aclc.c | 7 +-
+ 33 files changed, 5286 insertions(+), 511 deletions(-)
+ create mode 100644 arch/arm/plat-nomadik/include/plat/ste_dma40.h
+ create mode 100644 drivers/dma/ste_dma40.c
+ create mode 100644 drivers/dma/ste_dma40_ll.c
+ create mode 100644 drivers/dma/ste_dma40_ll.h
+ create mode 100644 drivers/dma/timb_dma.c
+ create mode 100644 include/linux/timb_dma.h
+Merging net/master
+$ git merge net/master
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Resolved 'drivers/net/wireless/iwlwifi/iwl-dev.h' using previous resolution.
+Resolved 'include/linux/mod_devicetable.h' using previous resolution.
+Resolved 'scripts/mod/file2alias.c' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-pxa/zeus.c
+Auto-merging arch/microblaze/include/asm/system.h
+Auto-merging drivers/infiniband/hw/nes/nes_nic.c
+Auto-merging drivers/net/a2065.c
+Auto-merging drivers/net/ariadne.c
+Auto-merging drivers/net/mac8390.c
+Removing drivers/net/pppol2tp.c
+Removing drivers/net/stmmac/dwmac100.c
+Removing drivers/net/wireless/ath/ath9k/phy.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h
+CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-dev.h
+Removing drivers/net/wireless/wl12xx/wl1271_spi.h
+Auto-merging drivers/net/zorro8390.c
+Auto-merging drivers/s390/net/qeth_core_main.c
+Auto-merging drivers/scsi/fcoe/fcoe.c
+Auto-merging drivers/scsi/iscsi_tcp.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/mod_devicetable.h
+CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
+Auto-merging include/linux/pci_regs.h
+Auto-merging kernel/sysctl.c
+Removing net/core/dev_mcast.c
+Auto-merging net/mac80211/work.c
+Removing net/netfilter/xt_CONNMARK.c
+Removing net/netfilter/xt_MARK.c
+Auto-merging net/sunrpc/svcsock.c
+Auto-merging net/sunrpc/xprt.c
+Auto-merging scripts/mod/file2alias.c
+CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 92a17b7] Merge remote branch 'net/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-class-rfkill | 29 +
+ Documentation/ABI/stable/sysfs-class-rfkill | 67 +
+ Documentation/Changes | 2 +-
+ Documentation/feature-removal-schedule.txt | 57 +-
+ Documentation/networking/caif/Linux-CAIF.txt | 212 ++
+ Documentation/networking/caif/README | 109 +
+ Documentation/networking/ip-sysctl.txt | 31 +
+ Documentation/networking/l2tp.txt | 247 ++-
+ Documentation/networking/x25-iface.txt | 16 +-
+ Documentation/rfkill.txt | 44 +-
+ Documentation/sysctl/net.txt | 10 +
+ MAINTAINERS | 10 +-
+ arch/arm/mach-pxa/icontrol.c | 9 +-
+ arch/arm/mach-pxa/zeus.c | 4 +-
+ arch/microblaze/include/asm/system.h | 11 +
+ arch/mips/sibyte/swarm/platform.c | 54 +
+ drivers/atm/atmtcp.c | 6 +-
+ drivers/atm/eni.c | 2 +-
+ drivers/atm/he.c | 4 +-
+ drivers/bluetooth/btmrvl_drv.h | 8 +-
+ drivers/bluetooth/btmrvl_main.c | 92 +-
+ drivers/bluetooth/btmrvl_sdio.c | 7 +-
+ drivers/bluetooth/hci_h4.c | 2 +-
+ drivers/bluetooth/hci_ll.c | 8 +-
+ drivers/bluetooth/hci_vhci.c | 2 +-
+ drivers/infiniband/hw/nes/nes_nic.c | 7 +-
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +-
+ drivers/isdn/i4l/isdn_x25iface.c | 17 +-
+ drivers/media/dvb/dvb-core/dvb_net.c | 14 +-
+ drivers/net/3c501.c | 2 -
+ drivers/net/3c503.c | 44 +-
+ drivers/net/3c505.c | 14 +-
+ drivers/net/3c507.c | 5 +-
+ drivers/net/3c509.c | 4 +-
+ drivers/net/3c515.c | 6 +-
+ drivers/net/3c523.c | 11 +-
+ drivers/net/3c527.c | 6 +-
+ drivers/net/3c59x.c | 11 +-
+ drivers/net/7990.c | 12 +-
+ drivers/net/8139cp.c | 9 +-
+ drivers/net/8139too.c | 8 +-
+ drivers/net/82596.c | 9 +-
+ drivers/net/Kconfig | 39 +-
+ drivers/net/Makefile | 3 +-
+ drivers/net/a2065.c | 10 +-
+ drivers/net/ac3200.c | 2 -
+ drivers/net/acenic.c | 44 +-
+ drivers/net/acenic.h | 6 +-
+ drivers/net/amd8111e.c | 8 +-
+ drivers/net/apne.c | 1 -
+ drivers/net/appletalk/cops.c | 9 +-
+ drivers/net/appletalk/ltpc.c | 1 -
+ drivers/net/arcnet/arcnet.c | 1 -
+ drivers/net/ariadne.c | 2 -
+ drivers/net/arm/am79c961a.c | 7 +-
+ drivers/net/arm/at91_ether.c | 7 +-
+ drivers/net/arm/ep93xx_eth.c | 2 -
+ drivers/net/arm/ether1.c | 1 -
+ drivers/net/arm/ether3.c | 1 -
+ drivers/net/arm/ixp4xx_eth.c | 9 +-
+ drivers/net/arm/ks8695net.c | 13 +-
+ drivers/net/arm/w90p910_ether.c | 7 +-
+ drivers/net/at1700.c | 11 +-
+ drivers/net/atarilance.c | 5 +-
+ drivers/net/atl1c/atl1c_ethtool.c | 2 -
+ drivers/net/atl1c/atl1c_main.c | 9 +-
+ drivers/net/atl1e/atl1e_ethtool.c | 2 -
+ drivers/net/atl1e/atl1e_main.c | 16 +-
+ drivers/net/atlx/atl1.c | 7 +-
+ drivers/net/atlx/atl2.c | 8 +-
+ drivers/net/atlx/atlx.c | 6 +-
+ drivers/net/atp.c | 10 +-
+ drivers/net/au1000_eth.c | 262 +-
+ drivers/net/au1000_eth.h | 4 +-
+ drivers/net/ax88796.c | 1 -
+ drivers/net/b44.c | 8 +-
+ drivers/net/bcm63xx_enet.c | 14 +-
+ drivers/net/benet/be.h | 11 +-
+ drivers/net/benet/be_cmds.c | 14 +-
+ drivers/net/benet/be_cmds.h | 2 +-
+ drivers/net/benet/be_ethtool.c | 5 +-
+ drivers/net/benet/be_hw.h | 3 +
+ drivers/net/benet/be_main.c | 315 ++-
+ drivers/net/bfin_mac.c | 11 +-
+ drivers/net/bmac.c | 15 +-
+ drivers/net/bnx2.c | 67 +-
+ drivers/net/bnx2.h | 7 +-
+ drivers/net/bnx2x.h | 66 +-
+ drivers/net/bnx2x_link.c | 12 +-
+ drivers/net/bnx2x_main.c | 1874 +++++++++++---
+ drivers/net/bnx2x_reg.h | 27 +-
+ drivers/net/bonding/bond_ipv6.c | 9 +-
+ drivers/net/bonding/bond_main.c | 275 ++-
+ drivers/net/bonding/bonding.h | 2 +-
+ drivers/net/caif/Kconfig | 17 +
+ drivers/net/caif/Makefile | 12 +
+ drivers/net/caif/caif_serial.c | 449 ++++
+ drivers/net/can/at91_can.c | 4 -
+ drivers/net/can/bfin_can.c | 3 -
+ drivers/net/can/mcp251x.c | 16 +-
+ drivers/net/can/mscan/mpc5xxx_can.c | 1 -
+ drivers/net/can/mscan/mscan.c | 1 -
+ drivers/net/can/sja1000/Kconfig | 4 +-
+ drivers/net/can/sja1000/ems_pci.c | 1 -
+ drivers/net/can/sja1000/kvaser_pci.c | 1 -
+ drivers/net/can/sja1000/plx_pci.c | 154 ++-
+ drivers/net/can/sja1000/sja1000.c | 3 -
+ drivers/net/can/sja1000/sja1000_isa.c | 1 -
+ drivers/net/can/sja1000/sja1000_of_platform.c | 1 -
+ drivers/net/can/sja1000/sja1000_platform.c | 45 +-
+ drivers/net/can/ti_hecc.c | 1 -
+ drivers/net/can/usb/ems_usb.c | 4 -
+ drivers/net/cassini.c | 13 +-
+ drivers/net/chelsio/pm3393.c | 7 +-
+ drivers/net/chelsio/sge.c | 58 +-
+ drivers/net/cnic.c | 3 -
+ drivers/net/cpmac.c | 17 +-
+ drivers/net/cris/eth_v10.c | 8 +-
+ drivers/net/cs89x0.c | 3 -
+ drivers/net/cxgb3/l2t.c | 1 -
+ drivers/net/cxgb3/sge.c | 20 +-
+ drivers/net/cxgb3/xgmac.c | 8 +-
+ drivers/net/cxgb4/cxgb4.h | 8 +-
+ drivers/net/cxgb4/cxgb4_main.c | 48 +-
+ drivers/net/cxgb4/sge.c | 11 +-
+ drivers/net/cxgb4/t4_hw.c | 117 +-
+ drivers/net/cxgb4/t4_msg.h | 1 +
+ drivers/net/cxgb4/t4fw_api.h | 4 +-
+ drivers/net/davinci_emac.c | 8 +-
+ drivers/net/de600.c | 4 +-
+ drivers/net/de620.c | 1 -
+ drivers/net/declance.c | 10 +-
+ drivers/net/defxx.c | 6 +-
+ drivers/net/depca.c | 15 +-
+ drivers/net/dl2k.c | 8 +-
+ drivers/net/dm9000.c | 12 +-
+ drivers/net/dnet.c | 4 +-
+ drivers/net/e100.c | 190 +-
+ drivers/net/e1000/e1000.h | 37 +-
+ drivers/net/e1000/e1000_ethtool.c | 89 +-
+ drivers/net/e1000/e1000_hw.c | 356 ++--
+ drivers/net/e1000/e1000_hw.h | 1 +
+ drivers/net/e1000/e1000_main.c | 429 ++--
+ drivers/net/e1000/e1000_osdep.h | 14 -
+ drivers/net/e1000/e1000_param.c | 112 +-
+ drivers/net/e1000e/82571.c | 29 +-
+ drivers/net/e1000e/defines.h | 9 +
+ drivers/net/e1000e/e1000.h | 26 +-
+ drivers/net/e1000e/es2lan.c | 11 +-
+ drivers/net/e1000e/ethtool.c | 48 +-
+ drivers/net/e1000e/hw.h | 5 +
+ drivers/net/e1000e/ich8lan.c | 391 ++--
+ drivers/net/e1000e/lib.c | 60 +-
+ drivers/net/e1000e/netdev.c | 844 +++++--
+ drivers/net/e1000e/param.c | 25 +-
+ drivers/net/e1000e/phy.c | 21 +-
+ drivers/net/e2100.c | 1 -
+ drivers/net/eepro.c | 13 +-
+ drivers/net/eexpress.c | 11 +-
+ drivers/net/ehea/ehea.h | 2 +-
+ drivers/net/ehea/ehea_main.c | 72 +-
+ drivers/net/ehea/ehea_qmr.c | 43 +-
+ drivers/net/ehea/ehea_qmr.h | 14 +-
+ drivers/net/enc28j60.c | 2 -
+ drivers/net/enic/cq_enet_desc.h | 12 +-
+ drivers/net/enic/enic.h | 4 +-
+ drivers/net/enic/enic_main.c | 11 +-
+ drivers/net/enic/vnic_dev.c | 52 +-
+ drivers/net/enic/vnic_dev.h | 3 +
+ drivers/net/enic/vnic_rq.c | 4 +-
+ drivers/net/enic/vnic_wq.c | 4 +-
+ drivers/net/epic100.c | 13 +-
+ drivers/net/es3210.c | 2 -
+ drivers/net/eth16i.c | 5 +-
+ drivers/net/ethoc.c | 8 +-
+ drivers/net/ewrk3.c | 14 +-
+ drivers/net/fealnx.c | 9 +-
+ drivers/net/fec.c | 1140 ++-------
+ drivers/net/fec_mpc52xx.c | 8 +-
+ drivers/net/forcedeth.c | 251 +--
+ drivers/net/fs_enet/fs_enet-main.c | 2 -
+ drivers/net/fs_enet/mac-fcc.c | 6 +-
+ drivers/net/fs_enet/mac-fec.c | 6 +-
+ drivers/net/fs_enet/mac-scc.c | 6 +-
+ drivers/net/gianfar.c | 199 ++-
+ drivers/net/gianfar.h | 8 +-
+ drivers/net/greth.c | 7 +-
+ drivers/net/hamachi.c | 11 +-
+ drivers/net/hamradio/baycom_ser_fdx.c | 2 +-
+ drivers/net/hamradio/scc.c | 1 -
+ drivers/net/hp-plus.c | 4 -
+ drivers/net/hp.c | 3 -
+ drivers/net/hp100.c | 16 +-
+ drivers/net/ibm_newemac/core.c | 12 +-
+ drivers/net/ibmlana.c | 8 +-
+ drivers/net/ibmveth.c | 9 +-
+ drivers/net/ifb.c | 1 -
+ drivers/net/igb/e1000_82575.c | 35 +-
+ drivers/net/igb/e1000_82575.h | 9 +-
+ drivers/net/igb/e1000_defines.h | 5 +-
+ drivers/net/igb/e1000_hw.h | 17 +-
+ drivers/net/igb/e1000_mac.c | 27 +-
+ drivers/net/igb/igb.h | 9 +-
+ drivers/net/igb/igb_ethtool.c | 58 +-
+ drivers/net/igb/igb_main.c | 613 ++++-
+ drivers/net/igbvf/ethtool.c | 2 -
+ drivers/net/igbvf/netdev.c | 82 +-
+ drivers/net/ioc3-eth.c | 7 +-
+ drivers/net/ipg.c | 11 +-
+ drivers/net/ipg.h | 109 +-
+ drivers/net/irda/Kconfig | 6 +
+ drivers/net/irda/Makefile | 1 +
+ drivers/net/irda/ali-ircc.c | 32 +-
+ drivers/net/irda/au1k_ir.c | 1 -
+ drivers/net/irda/donauboe.c | 2 -
+ drivers/net/irda/irda-usb.c | 2 +-
+ drivers/net/irda/mcs7780.c | 4 -
+ drivers/net/irda/pxaficp_ir.c | 1 -
+ drivers/net/irda/sa1100_ir.c | 2 -
+ drivers/net/irda/sh_irda.c | 865 +++++++
+ drivers/net/irda/sh_sir.c | 12 +-
+ drivers/net/irda/sir_dev.c | 1 -
+ drivers/net/irda/smsc-ircc2.c | 3 +-
+ drivers/net/irda/vlsi_ir.c | 5 +-
+ drivers/net/irda/w83977af_ir.c | 2 -
+ drivers/net/iseries_veth.c | 6 +-
+ drivers/net/ixgb/ixgb.h | 8 +-
+ drivers/net/ixgb/ixgb_ee.c | 24 +-
+ drivers/net/ixgb/ixgb_hw.c | 164 +-
+ drivers/net/ixgb/ixgb_hw.h | 12 -
+ drivers/net/ixgb/ixgb_main.c | 159 +-
+ drivers/net/ixgb/ixgb_osdep.h | 16 +-
+ drivers/net/ixgb/ixgb_param.c | 31 +-
+ drivers/net/ixgbe/ixgbe.h | 3 +
+ drivers/net/ixgbe/ixgbe_82598.c | 8 +-
+ drivers/net/ixgbe/ixgbe_82599.c | 410 +---
+ drivers/net/ixgbe/ixgbe_common.c | 539 ++++-
+ drivers/net/ixgbe/ixgbe_common.h | 22 +-
+ drivers/net/ixgbe/ixgbe_dcb_nl.c | 1 -
+ drivers/net/ixgbe/ixgbe_ethtool.c | 142 +-
+ drivers/net/ixgbe/ixgbe_main.c | 626 ++++-
+ drivers/net/ixgbe/ixgbe_phy.c | 4 +-
+ drivers/net/ixgbe/ixgbe_sriov.c | 137 +-
+ drivers/net/ixgbe/ixgbe_sriov.h | 8 +-
+ drivers/net/ixgbe/ixgbe_type.h | 41 +-
+ drivers/net/ixgbevf/defines.h | 12 +-
+ drivers/net/ixgbevf/ixgbevf_main.c | 125 +-
+ drivers/net/ixgbevf/vf.c | 27 +-
+ drivers/net/ixgbevf/vf.h | 4 +-
+ drivers/net/ixp2000/ixpdev.c | 2 -
+ drivers/net/jme.c | 10 +-
+ drivers/net/korina.c | 12 +-
+ drivers/net/ks8842.c | 61 +-
+ drivers/net/ks8851.c | 448 +++-
+ drivers/net/ks8851.h | 14 +-
+ drivers/net/ks8851_mll.c | 63 +-
+ drivers/net/ksz884x.c | 83 +-
+ drivers/net/lance.c | 4 +-
+ drivers/net/lib82596.c | 9 +-
+ drivers/net/lib8390.c | 22 +-
+ drivers/net/ll_temac.h | 14 +-
+ drivers/net/ll_temac_main.c | 159 +-
+ drivers/net/lne390.c | 2 -
+ drivers/net/lp486e.c | 8 +-
+ drivers/net/mac8390.c | 2 -
+ drivers/net/mac89x0.c | 1 -
+ drivers/net/macb.c | 9 +-
+ drivers/net/mace.c | 6 +-
+ drivers/net/macmace.c | 7 +-
+ drivers/net/macvlan.c | 23 +-
+ drivers/net/macvtap.c | 46 +-
+ drivers/net/meth.c | 4 +-
+ drivers/net/mlx4/en_ethtool.c | 2 -
+ drivers/net/mlx4/en_netdev.c | 53 +-
+ drivers/net/mlx4/mlx4_en.h | 3 +-
+ drivers/net/mv643xx_eth.c | 7 +-
+ drivers/net/myri10ge/myri10ge.c | 54 +-
+ drivers/net/natsemi.c | 10 +-
+ drivers/net/ne-h8300.c | 1 -
+ drivers/net/ne.c | 1 -
+ drivers/net/ne2.c | 1 -
+ drivers/net/ne2k-pci.c | 1 -
+ drivers/net/ne3210.c | 2 -
+ drivers/net/netconsole.c | 15 +-
+ drivers/net/netx-eth.c | 1 -
+ drivers/net/netxen/netxen_nic.h | 6 +-
+ drivers/net/netxen/netxen_nic_ethtool.c | 9 +
+ drivers/net/netxen/netxen_nic_hdr.h | 8 -
+ drivers/net/netxen/netxen_nic_hw.c | 131 +-
+ drivers/net/netxen/netxen_nic_init.c | 169 ++-
+ drivers/net/netxen/netxen_nic_main.c | 74 +-
+ drivers/net/ni5010.c | 5 +-
+ drivers/net/ni52.c | 13 +-
+ drivers/net/ni65.c | 5 +-
+ drivers/net/niu.c | 57 +-
+ drivers/net/niu.h | 7 +-
+ drivers/net/octeon/octeon_mgmt.c | 66 +-
+ drivers/net/pasemi_mac.c | 2 -
+ drivers/net/pci-skeleton.c | 7 +-
+ drivers/net/pcmcia/3c574_cs.c | 6 +-
+ drivers/net/pcmcia/3c589_cs.c | 289 ++-
+ drivers/net/pcmcia/axnet_cs.c | 10 +-
+ drivers/net/pcmcia/fmvj18x_cs.c | 9 +-
+ drivers/net/pcmcia/ibmtr_cs.c | 2 -
+ drivers/net/pcmcia/nmclan_cs.c | 12 +-
+ drivers/net/pcmcia/smc91c92_cs.c | 14 +-
+ drivers/net/pcmcia/xirc2ps_cs.c | 9 +-
+ drivers/net/pcnet32.c | 15 +-
+ drivers/net/phy/bcm63xx.c | 8 +
+ drivers/net/phy/broadcom.c | 16 +
+ drivers/net/phy/cicada.c | 8 +
+ drivers/net/phy/davicom.c | 9 +
+ drivers/net/phy/et1011c.c | 7 +
+ drivers/net/phy/icplus.c | 7 +
+ drivers/net/phy/lxt.c | 8 +
+ drivers/net/phy/marvell.c | 13 +
+ drivers/net/phy/mdio-bitbang.c | 60 +-
+ drivers/net/phy/mdio_bus.c | 4 +-
+ drivers/net/phy/micrel.c | 9 +
+ drivers/net/phy/national.c | 10 +-
+ drivers/net/phy/phy_device.c | 12 +
+ drivers/net/phy/qsemi.c | 7 +
+ drivers/net/phy/realtek.c | 7 +
+ drivers/net/phy/smsc.c | 11 +
+ drivers/net/phy/ste10Xp.c | 8 +
+ drivers/net/phy/vitesse.c | 8 +
+ drivers/net/plip.c | 4 -
+ drivers/net/ppp_generic.c | 19 +
+ drivers/net/pppoe.c | 8 +-
+ drivers/net/pppol2tp.c | 2680 --------------------
+ drivers/net/ps3_gelic_net.c | 13 +-
+ drivers/net/ps3_gelic_wireless.c | 70 +-
+ drivers/net/qla3xxx.c | 72 +-
+ drivers/net/qla3xxx.h | 8 +-
+ drivers/net/qlcnic/qlcnic.h | 38 +-
+ drivers/net/qlcnic/qlcnic_ethtool.c | 34 +-
+ drivers/net/qlcnic/qlcnic_hdr.h | 44 +-
+ drivers/net/qlcnic/qlcnic_hw.c | 136 +-
+ drivers/net/qlcnic/qlcnic_init.c | 95 +-
+ drivers/net/qlcnic/qlcnic_main.c | 404 ++--
+ drivers/net/qlge/qlge.h | 8 +-
+ drivers/net/qlge/qlge_dbg.c | 4 +-
+ drivers/net/qlge/qlge_ethtool.c | 2 -
+ drivers/net/qlge/qlge_main.c | 64 +-
+ drivers/net/r6040.c | 38 +-
+ drivers/net/r8169.c | 158 +-
+ drivers/net/rrunner.c | 1 -
+ drivers/net/s2io.c | 15 +-
+ drivers/net/s6gmac.c | 3 +-
+ drivers/net/sb1000.c | 5 -
+ drivers/net/sb1250-mac.c | 275 +--
+ drivers/net/sc92031.c | 8 +-
+ drivers/net/seeq8005.c | 4 +-
+ drivers/net/sfc/efx.c | 137 +-
+ drivers/net/sfc/efx.h | 4 +-
+ drivers/net/sfc/ethtool.c | 6 +-
+ drivers/net/sfc/falcon.c | 16 +-
+ drivers/net/sfc/falcon_xmac.c | 22 +-
+ drivers/net/sfc/mcdi.c | 32 +-
+ drivers/net/sfc/mcdi_mac.c | 25 +-
+ drivers/net/sfc/mcdi_pcol.h | 71 +-
+ drivers/net/sfc/mcdi_phy.c | 152 ++-
+ drivers/net/sfc/net_driver.h | 76 +-
+ drivers/net/sfc/nic.c | 114 +-
+ drivers/net/sfc/nic.h | 3 +
+ drivers/net/sfc/selftest.c | 8 +-
+ drivers/net/sfc/selftest.h | 4 +-
+ drivers/net/sfc/siena.c | 19 +
+ drivers/net/sfc/tx.c | 61 +-
+ drivers/net/sfc/workarounds.h | 2 +-
+ drivers/net/sgiseeq.c | 6 +-
+ drivers/net/sh_eth.c | 2 -
+ drivers/net/sis190.c | 6 +-
+ drivers/net/sis900.c | 25 +-
+ drivers/net/skfp/fplustm.c | 2 +-
+ drivers/net/skfp/pcmplc.c | 4 +-
+ drivers/net/skfp/skfddi.c | 15 +-
+ drivers/net/skfp/srf.c | 2 +-
+ drivers/net/skge.c | 46 +-
+ drivers/net/skge.h | 4 +-
+ drivers/net/sky2.c | 215 ++-
+ drivers/net/sky2.h | 41 +-
+ drivers/net/slhc.c | 1 -
+ drivers/net/slip.c | 2 +-
+ drivers/net/smc-mca.c | 1 -
+ drivers/net/smc-ultra.c | 1 -
+ drivers/net/smc-ultra32.c | 1 -
+ drivers/net/smc911x.c | 21 +-
+ drivers/net/smc9194.c | 61 +-
+ drivers/net/smc91x.c | 12 +-
+ drivers/net/smsc911x.c | 7 +-
+ drivers/net/smsc9420.c | 8 +-
+ drivers/net/sonic.c | 10 +-
+ drivers/net/spider_net.c | 8 +-
+ drivers/net/starfire.c | 16 +-
+ drivers/net/stmmac/Makefile | 2 +-
+ drivers/net/stmmac/common.h | 21 +-
+ drivers/net/stmmac/dwmac100.c | 538 ----
+ drivers/net/stmmac/dwmac100.h | 5 +
+ drivers/net/stmmac/dwmac1000.h | 12 -
+ drivers/net/stmmac/dwmac1000_core.c | 41 +-
+ drivers/net/stmmac/dwmac1000_dma.c | 338 +---
+ drivers/net/stmmac/dwmac100_core.c | 196 ++
+ drivers/net/stmmac/dwmac100_dma.c | 134 +
+ drivers/net/stmmac/dwmac_dma.h | 1 +
+ drivers/net/stmmac/dwmac_lib.c | 19 +-
+ drivers/net/stmmac/enh_desc.c | 337 +++
+ drivers/net/stmmac/norm_desc.c | 236 ++
+ drivers/net/stmmac/stmmac.h | 10 +-
+ drivers/net/stmmac/stmmac_ethtool.c | 7 -
+ drivers/net/stmmac/stmmac_main.c | 32 +-
+ drivers/net/stmmac/stmmac_timer.c | 6 -
+ drivers/net/stnic.c | 1 -
+ drivers/net/sun3_82586.c | 13 +-
+ drivers/net/sun3lance.c | 8 +-
+ drivers/net/sunbmac.c | 8 +-
+ drivers/net/sundance.c | 14 +-
+ drivers/net/sungem.c | 9 +-
+ drivers/net/sunhme.c | 16 +-
+ drivers/net/sunlance.c | 9 +-
+ drivers/net/sunqe.c | 7 +-
+ drivers/net/sunvnet.c | 9 +-
+ drivers/net/tc35815.c | 8 +-
+ drivers/net/tehuti.c | 10 +-
+ drivers/net/tg3.c | 839 +++----
+ drivers/net/tg3.h | 17 +-
+ drivers/net/tlan.c | 13 +-
+ drivers/net/tokenring/3c359.c | 112 +-
+ drivers/net/tokenring/ibmtr.c | 13 +-
+ drivers/net/tokenring/lanstreamer.c | 58 +-
+ drivers/net/tokenring/madgemc.c | 12 -
+ drivers/net/tokenring/olympic.c | 74 +-
+ drivers/net/tokenring/smctr.c | 4 +-
+ drivers/net/tokenring/tms380tr.c | 65 +-
+ drivers/net/tsi108_eth.c | 16 +-
+ drivers/net/tulip/de2104x.c | 13 +-
+ drivers/net/tulip/de4x5.c | 87 +-
+ drivers/net/tulip/dmfe.c | 17 +-
+ drivers/net/tulip/media.c | 2 -
+ drivers/net/tulip/pnic.c | 2 +-
+ drivers/net/tulip/tulip_core.c | 31 +-
+ drivers/net/tulip/uli526x.c | 10 +-
+ drivers/net/tulip/winbond-840.c | 18 +-
+ drivers/net/tulip/xircom_cb.c | 6 +-
+ drivers/net/tun.c | 53 +-
+ drivers/net/typhoon.c | 8 +-
+ drivers/net/ucc_geth.c | 12 +-
+ drivers/net/usb/asix.c | 16 +-
+ drivers/net/usb/catc.c | 6 +-
+ drivers/net/usb/cdc_ether.c | 113 +-
+ drivers/net/usb/dm9601.c | 6 +-
+ drivers/net/usb/hso.c | 4 -
+ drivers/net/usb/kaweth.c | 1 -
+ drivers/net/usb/mcs7830.c | 6 +-
+ drivers/net/usb/pegasus.c | 3 +-
+ drivers/net/usb/rndis_host.c | 18 +-
+ drivers/net/usb/smsc75xx.c | 6 +-
+ drivers/net/usb/smsc95xx.c | 6 +-
+ drivers/net/usb/usbnet.c | 15 +-
+ drivers/net/via-rhine.c | 10 +-
+ drivers/net/via-velocity.c | 121 +-
+ drivers/net/via-velocity.h | 77 +-
+ drivers/net/virtio_net.c | 57 +-
+ drivers/net/vmxnet3/vmxnet3_drv.c | 8 +-
+ drivers/net/vxge/vxge-config.c | 41 +-
+ drivers/net/vxge/vxge-config.h | 34 +-
+ drivers/net/vxge/vxge-ethtool.c | 5 +-
+ drivers/net/vxge/vxge-main.c | 245 +-
+ drivers/net/vxge/vxge-main.h | 6 +
+ drivers/net/vxge/vxge-traffic.c | 79 +-
+ drivers/net/vxge/vxge-traffic.h | 50 +-
+ drivers/net/vxge/vxge-version.h | 4 +-
+ drivers/net/wan/cycx_x25.c | 13 +-
+ drivers/net/wan/dscc4.c | 2 -
+ drivers/net/wan/hd64570.c | 1 -
+ drivers/net/wan/hd64572.c | 1 -
+ drivers/net/wan/hdlc_x25.c | 12 +-
+ drivers/net/wan/ixp4xx_hss.c | 1 -
+ drivers/net/wan/lapbether.c | 12 +-
+ drivers/net/wan/lmc/lmc_main.c | 6 +-
+ drivers/net/wan/pc300_drv.c | 5 +-
+ drivers/net/wan/pc300_tty.c | 2 +-
+ drivers/net/wan/sdla.c | 2 +-
+ drivers/net/wan/wanxl.c | 1 -
+ drivers/net/wan/x25_asy.c | 12 +-
+ drivers/net/wd.c | 1 -
+ drivers/net/wimax/i2400m/control.c | 17 +-
+ drivers/net/wimax/i2400m/driver.c | 167 +-
+ drivers/net/wimax/i2400m/i2400m-sdio.h | 5 +-
+ drivers/net/wimax/i2400m/i2400m.h | 82 +-
+ drivers/net/wimax/i2400m/netdev.c | 14 +-
+ drivers/net/wimax/i2400m/rx.c | 116 +-
+ drivers/net/wimax/i2400m/sdio-rx.c | 2 -
+ drivers/net/wimax/i2400m/sdio-tx.c | 35 +-
+ drivers/net/wimax/i2400m/sdio.c | 7 +
+ drivers/net/wimax/i2400m/tx.c | 155 +-
+ drivers/net/wimax/i2400m/usb-notif.c | 1 -
+ drivers/net/wimax/i2400m/usb.c | 12 +-
+ drivers/net/wireless/Kconfig | 92 +-
+ drivers/net/wireless/adm8211.c | 12 +-
+ drivers/net/wireless/airo.c | 37 +-
+ drivers/net/wireless/at76c50x-usb.c | 2 +-
+ drivers/net/wireless/ath/Kconfig | 2 +-
+ drivers/net/wireless/ath/ar9170/ar9170.h | 52 +-
+ drivers/net/wireless/ath/ar9170/cmd.h | 2 +-
+ drivers/net/wireless/ath/ar9170/eeprom.h | 4 +-
+ drivers/net/wireless/ath/ar9170/hw.h | 1 +
+ drivers/net/wireless/ath/ar9170/main.c | 587 +-----
+ drivers/net/wireless/ath/ar9170/usb.c | 15 +-
+ drivers/net/wireless/ath/ath.h | 27 +-
+ drivers/net/wireless/ath/ath5k/Makefile | 1 +
+ drivers/net/wireless/ath/ath5k/ani.c | 744 ++++++
+ drivers/net/wireless/ath/ath5k/ani.h | 104 +
+ drivers/net/wireless/ath/ath5k/ath5k.h | 313 +--
+ drivers/net/wireless/ath/ath5k/attach.c | 7 +-
+ drivers/net/wireless/ath/ath5k/base.c | 321 ++-
+ drivers/net/wireless/ath/ath5k/base.h | 39 +-
+ drivers/net/wireless/ath/ath5k/caps.c | 9 +-
+ drivers/net/wireless/ath/ath5k/debug.c | 382 +++
+ drivers/net/wireless/ath/ath5k/debug.h | 4 +
+ drivers/net/wireless/ath/ath5k/desc.c | 19 +-
+ drivers/net/wireless/ath/ath5k/desc.h | 35 +-
+ drivers/net/wireless/ath/ath5k/eeprom.c | 4 +-
+ drivers/net/wireless/ath/ath5k/eeprom.h | 88 +-
+ drivers/net/wireless/ath/ath5k/pcu.c | 379 +---
+ drivers/net/wireless/ath/ath5k/phy.c | 77 +-
+ drivers/net/wireless/ath/ath5k/qcu.c | 17 -
+ drivers/net/wireless/ath/ath5k/reg.h | 42 +-
+ drivers/net/wireless/ath/ath5k/reset.c | 41 +-
+ drivers/net/wireless/ath/ath9k/Kconfig | 21 +
+ drivers/net/wireless/ath/ath9k/Makefile | 26 +-
+ drivers/net/wireless/ath/ath9k/ahb.c | 1 +
+ drivers/net/wireless/ath/ath9k/ani.c | 217 +--
+ drivers/net/wireless/ath/ath9k/ani.h | 1 -
+ drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 742 ++++++
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 1374 ++++++++++
+ drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 1254 +++++++++
+ drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1000 ++++++++
+ drivers/net/wireless/ath/ath9k/ar9002_hw.c | 598 +++++
+ .../ath/ath9k/{initvals.h => ar9002_initvals.h} | 2292 ++---------------
+ drivers/net/wireless/ath/ath9k/ar9002_mac.c | 480 ++++
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 535 ++++
+ drivers/net/wireless/ath/ath9k/ar9002_phy.h | 572 +++++
+ drivers/net/wireless/ath/ath9k/ar9003_calib.c | 802 ++++++
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 1860 ++++++++++++++
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 323 +++
+ drivers/net/wireless/ath/ath9k/ar9003_hw.c | 205 ++
+ drivers/net/wireless/ath/ath9k/ar9003_initvals.h | 1784 +++++++++++++
+ drivers/net/wireless/ath/ath9k/ar9003_mac.c | 614 +++++
+ drivers/net/wireless/ath/ath9k/ar9003_mac.h | 120 +
+ drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1134 +++++++++
+ drivers/net/wireless/ath/ath9k/ar9003_phy.h | 847 +++++++
+ drivers/net/wireless/ath/ath9k/ath9k.h | 28 +-
+ drivers/net/wireless/ath/ath9k/beacon.c | 40 +-
+ drivers/net/wireless/ath/ath9k/calib.c | 1024 +--------
+ drivers/net/wireless/ath/ath9k/calib.h | 19 +-
+ drivers/net/wireless/ath/ath9k/common.c | 392 +++-
+ drivers/net/wireless/ath/ath9k/common.h | 17 +-
+ drivers/net/wireless/ath/ath9k/debug.c | 61 +-
+ drivers/net/wireless/ath/ath9k/debug.h | 13 +-
+ drivers/net/wireless/ath/ath9k/eeprom.c | 11 +-
+ drivers/net/wireless/ath/ath9k/eeprom.h | 25 +-
+ drivers/net/wireless/ath/ath9k/eeprom_4k.c | 19 +-
+ drivers/net/wireless/ath/ath9k/eeprom_9287.c | 11 +-
+ drivers/net/wireless/ath/ath9k/eeprom_def.c | 18 +-
+ drivers/net/wireless/ath/ath9k/gpio.c | 17 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 1008 ++++++++
+ drivers/net/wireless/ath/ath9k/hif_usb.h | 104 +
+ drivers/net/wireless/ath/ath9k/htc.h | 464 ++++
+ drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 255 ++
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 827 ++++++
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1771 +++++++++++++
+ drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 707 ++++++
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 477 ++++
+ drivers/net/wireless/ath/ath9k/htc_hst.h | 246 ++
+ drivers/net/wireless/ath/ath9k/hw-ops.h | 280 ++
+ drivers/net/wireless/ath/ath9k/hw.c | 1913 ++++-----------
+ drivers/net/wireless/ath/ath9k/hw.h | 275 ++-
+ drivers/net/wireless/ath/ath9k/init.c | 86 +-
+ drivers/net/wireless/ath/ath9k/mac.c | 571 ++---
+ drivers/net/wireless/ath/ath9k/mac.h | 93 +-
+ drivers/net/wireless/ath/ath9k/main.c | 158 +-
+ drivers/net/wireless/ath/ath9k/pci.c | 2 +
+ drivers/net/wireless/ath/ath9k/phy.c | 978 -------
+ drivers/net/wireless/ath/ath9k/phy.h | 596 +-----
+ drivers/net/wireless/ath/ath9k/rc.c | 21 +-
+ drivers/net/wireless/ath/ath9k/rc.h | 11 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 534 +++-
+ drivers/net/wireless/ath/ath9k/reg.h | 183 ++-
+ drivers/net/wireless/ath/ath9k/virtual.c | 2 +-
+ drivers/net/wireless/ath/ath9k/wmi.c | 336 +++
+ drivers/net/wireless/ath/ath9k/wmi.h | 139 +
+ drivers/net/wireless/ath/ath9k/xmit.c | 591 +++--
+ drivers/net/wireless/ath/debug.h | 1 +
+ drivers/net/wireless/ath/hw.c | 4 +-
+ drivers/net/wireless/ath/regd.c | 4 +-
+ drivers/net/wireless/atmel.c | 1 -
+ drivers/net/wireless/b43/b43.h | 1 +
+ drivers/net/wireless/b43/main.c | 26 +-
+ drivers/net/wireless/b43/phy_n.c | 479 +++-
+ drivers/net/wireless/b43/phy_n.h | 21 +-
+ drivers/net/wireless/b43/tables_nphy.c | 20 +-
+ drivers/net/wireless/b43/tables_nphy.h | 37 +-
+ drivers/net/wireless/b43/xmit.c | 1 -
+ drivers/net/wireless/b43legacy/main.c | 21 +-
+ drivers/net/wireless/b43legacy/xmit.c | 1 -
+ drivers/net/wireless/ipw2x00/ipw2100.c | 49 +-
+ drivers/net/wireless/ipw2x00/ipw2200.c | 190 +-
+ drivers/net/wireless/ipw2x00/libipw.h | 14 +-
+ drivers/net/wireless/ipw2x00/libipw_module.c | 13 +-
+ drivers/net/wireless/ipw2x00/libipw_rx.c | 1 -
+ drivers/net/wireless/iwlwifi/Makefile | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 95 +-
+ drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 500 ++++
+ drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h | 60 +
+ drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 7 +-
+ drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 93 +-
+ drivers/net/wireless/iwlwifi/iwl-3945.c | 218 +-
+ drivers/net/wireless/iwlwifi/iwl-3945.h | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 24 -
+ drivers/net/wireless/iwlwifi/iwl-4965.c | 100 +-
+ drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 33 -
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 1470 ++----------
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 306 ++-
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 834 ++++++
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 56 +
+ drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 276 ++
+ drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 118 +
+ drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 307 +++
+ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1515 +++++++++++
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 208 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1343 ++++++++++
+ drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 416 +++
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 493 ++--
+ drivers/net/wireless/iwlwifi/iwl-agn.h | 177 ++
+ drivers/net/wireless/iwlwifi/iwl-calib.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-commands.h | 110 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 838 ++-----
+ drivers/net/wireless/iwlwifi/iwl-core.h | 78 +-
+ drivers/net/wireless/iwlwifi/iwl-csr.h | 1 +
+ drivers/net/wireless/iwlwifi/iwl-debug.h | 2 +
+ drivers/net/wireless/iwlwifi/iwl-debugfs.c | 846 +------
+ drivers/net/wireless/iwlwifi/iwl-dev.h | 201 +-
+ drivers/net/wireless/iwlwifi/iwl-devtrace.c | 1 +
+ drivers/net/wireless/iwlwifi/iwl-eeprom.h | 49 +-
+ drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 +-
+ drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 +
+ drivers/net/wireless/iwlwifi/iwl-io.h | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-led.c | 2 +-
+ drivers/net/wireless/iwlwifi/iwl-power.c | 10 +-
+ drivers/net/wireless/iwlwifi/iwl-prph.h | 94 +-
+ drivers/net/wireless/iwlwifi/iwl-rx.c | 823 +------
+ drivers/net/wireless/iwlwifi/iwl-scan.c | 524 +----
+ drivers/net/wireless/iwlwifi/iwl-sta.c | 691 +++---
+ drivers/net/wireless/iwlwifi/iwl-sta.h | 22 +-
+ drivers/net/wireless/iwlwifi/iwl-tx.c | 1074 +--------
+ drivers/net/wireless/iwlwifi/iwl3945-base.c | 267 +--
+ drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +-
+ drivers/net/wireless/iwmc3200wifi/Makefile | 5 +
+ drivers/net/wireless/iwmc3200wifi/bus.h | 2 +-
+ drivers/net/wireless/iwmc3200wifi/cfg80211.c | 17 +-
+ drivers/net/wireless/iwmc3200wifi/commands.c | 14 +-
+ drivers/net/wireless/iwmc3200wifi/commands.h | 1 +
+ drivers/net/wireless/iwmc3200wifi/debug.h | 7 +-
+ drivers/net/wireless/iwmc3200wifi/debugfs.c | 123 +-
+ drivers/net/wireless/iwmc3200wifi/hal.c | 15 +-
+ drivers/net/wireless/iwmc3200wifi/hal.h | 5 +-
+ drivers/net/wireless/iwmc3200wifi/iwm.h | 3 +
+ drivers/net/wireless/iwmc3200wifi/main.c | 9 +-
+ drivers/net/wireless/iwmc3200wifi/rx.c | 79 +-
+ drivers/net/wireless/iwmc3200wifi/sdio.c | 19 +-
+ drivers/net/wireless/iwmc3200wifi/trace.c | 3 +
+ drivers/net/wireless/iwmc3200wifi/trace.h | 283 +++
+ drivers/net/wireless/iwmc3200wifi/tx.c | 12 +-
+ drivers/net/wireless/iwmc3200wifi/umac.h | 2 +-
+ drivers/net/wireless/libertas/assoc.c | 22 +-
+ drivers/net/wireless/libertas/cfg.c | 1 +
+ drivers/net/wireless/libertas/debugfs.c | 5 +-
+ drivers/net/wireless/libertas/dev.h | 1 +
+ drivers/net/wireless/libertas/if_sdio.c | 127 +-
+ drivers/net/wireless/libertas/if_usb.c | 4 -
+ drivers/net/wireless/libertas/main.c | 15 +-
+ drivers/net/wireless/libertas/rx.c | 51 +-
+ drivers/net/wireless/libertas/tx.c | 2 -
+ drivers/net/wireless/libertas/wext.c | 4 +
+ drivers/net/wireless/libertas_tf/cmd.c | 203 ++-
+ drivers/net/wireless/libertas_tf/deb_defs.h | 104 +
+ drivers/net/wireless/libertas_tf/if_usb.c | 252 ++-
+ drivers/net/wireless/libertas_tf/libertas_tf.h | 2 +
+ drivers/net/wireless/libertas_tf/main.c | 106 +-
+ drivers/net/wireless/mac80211_hwsim.c | 96 +-
+ drivers/net/wireless/mwl8k.c | 30 +-
+ drivers/net/wireless/orinoco/Kconfig | 20 +-
+ drivers/net/wireless/orinoco/Makefile | 4 +
+ drivers/net/wireless/orinoco/airport.c | 8 +-
+ drivers/net/wireless/orinoco/cfg.c | 91 +-
+ drivers/net/wireless/orinoco/fw.c | 10 +-
+ drivers/net/wireless/orinoco/hermes.c | 286 ++-
+ drivers/net/wireless/orinoco/hermes.h | 62 +-
+ drivers/net/wireless/orinoco/hermes_dld.c | 243 +--
+ drivers/net/wireless/orinoco/hw.c | 102 +-
+ drivers/net/wireless/orinoco/hw.h | 1 -
+ drivers/net/wireless/orinoco/main.c | 307 ++-
+ drivers/net/wireless/orinoco/main.h | 12 -
+ drivers/net/wireless/orinoco/orinoco.h | 38 +-
+ drivers/net/wireless/orinoco/orinoco_cs.c | 85 +-
+ drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +-
+ drivers/net/wireless/orinoco/orinoco_pci.c | 2 +-
+ drivers/net/wireless/orinoco/orinoco_plx.c | 2 +-
+ drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +-
+ drivers/net/wireless/orinoco/orinoco_usb.c | 1795 +++++++++++++
+ drivers/net/wireless/orinoco/scan.c | 4 +-
+ drivers/net/wireless/orinoco/spectrum_cs.c | 7 +-
+ drivers/net/wireless/orinoco/wext.c | 273 +--
+ drivers/net/wireless/p54/main.c | 2 +-
+ drivers/net/wireless/p54/p54pci.c | 10 +-
+ drivers/net/wireless/p54/p54usb.c | 1 -
+ drivers/net/wireless/p54/txrx.c | 3 +-
+ drivers/net/wireless/prism54/isl_ioctl.c | 2 -
+ drivers/net/wireless/prism54/islpci_dev.c | 16 +-
+ drivers/net/wireless/prism54/islpci_eth.c | 10 +-
+ drivers/net/wireless/prism54/islpci_mgt.c | 8 +-
+ drivers/net/wireless/prism54/oid_mgt.c | 2 +-
+ drivers/net/wireless/ray_cs.c | 242 +-
+ drivers/net/wireless/rndis_wlan.c | 374 +++-
+ drivers/net/wireless/rt2x00/Kconfig | 4 +-
+ drivers/net/wireless/rt2x00/rt2400pci.c | 30 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 28 +-
+ drivers/net/wireless/rt2x00/rt2500usb.c | 77 +-
+ drivers/net/wireless/rt2x00/rt2800.h | 119 +-
+ drivers/net/wireless/rt2x00/rt2800lib.c | 676 ++++-
+ drivers/net/wireless/rt2x00/rt2800lib.h | 3 +
+ drivers/net/wireless/rt2x00/rt2800pci.c | 304 +--
+ drivers/net/wireless/rt2x00/rt2800usb.c | 289 +--
+ drivers/net/wireless/rt2x00/rt2800usb.h | 40 -
+ drivers/net/wireless/rt2x00/rt2x00.h | 35 +-
+ drivers/net/wireless/rt2x00/rt2x00crypto.c | 1 +
+ drivers/net/wireless/rt2x00/rt2x00debug.c | 2 -
+ drivers/net/wireless/rt2x00/rt2x00dev.c | 1 -
+ drivers/net/wireless/rt2x00/rt2x00ht.c | 17 +
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00pci.h | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 32 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 8 +-
+ drivers/net/wireless/rt2x00/rt2x00reg.h | 10 +
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 3 +-
+ drivers/net/wireless/rt2x00/rt2x00usb.h | 3 +-
+ drivers/net/wireless/rt2x00/rt61pci.c | 60 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 59 +-
+ drivers/net/wireless/rtl818x/Kconfig | 88 +
+ drivers/net/wireless/rtl818x/rtl8180.h | 11 +
+ drivers/net/wireless/rtl818x/rtl8180_dev.c | 115 +-
+ drivers/net/wireless/rtl818x/rtl8187_dev.c | 14 +-
+ drivers/net/wireless/wl12xx/Kconfig | 24 +
+ drivers/net/wireless/wl12xx/Makefile | 6 +-
+ drivers/net/wireless/wl12xx/wl1251.h | 2 +
+ drivers/net/wireless/wl12xx/wl1251_boot.c | 3 +-
+ drivers/net/wireless/wl12xx/wl1251_io.h | 20 +
+ drivers/net/wireless/wl12xx/wl1251_main.c | 73 +-
+ drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +-
+ drivers/net/wireless/wl12xx/wl1251_reg.h | 7 +
+ drivers/net/wireless/wl12xx/wl1251_rx.c | 8 -
+ drivers/net/wireless/wl12xx/wl1251_sdio.c | 144 +-
+ drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +-
+ drivers/net/wireless/wl12xx/wl1271.h | 63 +-
+ drivers/net/wireless/wl12xx/wl1271_acx.c | 179 ++-
+ drivers/net/wireless/wl12xx/wl1271_acx.h | 157 +-
+ drivers/net/wireless/wl12xx/wl1271_boot.c | 46 +-
+ drivers/net/wireless/wl12xx/wl1271_boot.h | 10 +-
+ drivers/net/wireless/wl12xx/wl1271_cmd.c | 337 ++--
+ drivers/net/wireless/wl12xx/wl1271_cmd.h | 27 +-
+ drivers/net/wireless/wl12xx/wl1271_conf.h | 488 +++-
+ drivers/net/wireless/wl12xx/wl1271_debugfs.c | 12 +-
+ drivers/net/wireless/wl12xx/wl1271_event.c | 69 +-
+ drivers/net/wireless/wl12xx/wl1271_event.h | 8 +
+ drivers/net/wireless/wl12xx/wl1271_init.c | 57 +-
+ drivers/net/wireless/wl12xx/wl1271_io.c | 87 +-
+ drivers/net/wireless/wl12xx/wl1271_io.h | 139 +-
+ drivers/net/wireless/wl12xx/wl1271_main.c | 1267 ++++++----
+ drivers/net/wireless/wl12xx/wl1271_ps.c | 7 +-
+ drivers/net/wireless/wl12xx/wl1271_rx.c | 94 +-
+ drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +-
+ drivers/net/wireless/wl12xx/wl1271_sdio.c | 291 +++
+ drivers/net/wireless/wl12xx/wl1271_spi.c | 315 ++-
+ drivers/net/wireless/wl12xx/wl1271_spi.h | 96 -
+ drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 -
+ drivers/net/wireless/wl12xx/wl1271_tx.c | 133 +-
+ drivers/net/wireless/wl12xx/wl1271_tx.h | 9 +-
+ drivers/net/wireless/wl3501_cs.c | 57 +-
+ drivers/net/wireless/zd1201.c | 12 +-
+ drivers/net/wireless/zd1211rw/zd_mac.c | 13 +-
+ drivers/net/xilinx_emaclite.c | 10 +-
+ drivers/net/yellowfin.c | 13 +-
+ drivers/net/znet.c | 2 -
+ drivers/net/zorro8390.c | 1 -
+ drivers/s390/net/qeth_core.h | 4 +-
+ drivers/s390/net/qeth_core_main.c | 11 +-
+ drivers/s390/net/qeth_core_sys.c | 148 +-
+ drivers/s390/net/qeth_l2_main.c | 13 +-
+ drivers/s390/net/qeth_l3_main.c | 102 +-
+ drivers/s390/net/qeth_l3_sys.c | 244 +-
+ drivers/scsi/fcoe/fcoe.c | 18 +-
+ drivers/scsi/iscsi_tcp.c | 4 +-
+ drivers/ssb/driver_chipcommon.c | 3 +
+ drivers/ssb/main.c | 3 +
+ drivers/ssb/pci.c | 14 +-
+ drivers/ssb/sprom.c | 14 +
+ drivers/staging/arlan/arlan-main.c | 9 +-
+ drivers/staging/et131x/et131x_netdev.c | 6 +-
+ drivers/staging/slicoss/slicoss.c | 6 +-
+ drivers/staging/vt6655/device_main.c | 6 +-
+ drivers/staging/vt6656/main_usb.c | 6 +-
+ drivers/staging/wavelan/wavelan.c | 10 +-
+ drivers/staging/wavelan/wavelan_cs.c | 12 +-
+ drivers/staging/winbond/wbusb.c | 6 +-
+ drivers/staging/wlags49_h2/wl_netdev.c | 12 +-
+ drivers/vhost/net.c | 4 +-
+ drivers/vhost/vhost.c | 11 +-
+ fs/fcntl.c | 66 +-
+ fs/sysfs/symlink.c | 1 +
+ include/linux/Kbuild | 1 +
+ include/linux/caif/caif_socket.h | 165 ++
+ include/linux/caif/if_caif.h | 34 +
+ include/linux/can/dev.h | 1 +
+ include/linux/can/platform/mcp251x.h | 4 +-
+ include/linux/dcbnl.h | 2 -
+ include/linux/ethtool.h | 116 +-
+ include/linux/filter.h | 3 +-
+ include/linux/fs.h | 12 +-
+ include/linux/genetlink.h | 8 +
+ include/linux/ieee80211.h | 4 +-
+ include/linux/if.h | 2 +
+ include/linux/if_arp.h | 1 +
+ include/linux/if_ether.h | 1 +
+ include/linux/if_link.h | 33 +
+ include/linux/if_macvlan.h | 3 +-
+ include/linux/if_packet.h | 1 +
+ include/linux/if_pppol2tp.h | 16 +-
+ include/linux/if_pppox.h | 9 +
+ include/linux/if_tun.h | 2 +
+ include/linux/if_x25.h | 26 +
+ include/linux/in6.h | 5 +-
+ include/linux/ipv6.h | 18 +-
+ include/linux/kernel.h | 6 +-
+ include/linux/ks8842.h | 34 +
+ include/linux/l2tp.h | 163 ++
+ include/linux/mmc/sdio.h | 2 +
+ include/linux/mod_devicetable.h | 26 +
+ include/linux/mroute.h | 20 +-
+ include/linux/mroute6.h | 35 +-
+ include/linux/net.h | 14 +-
+ include/linux/netdevice.h | 284 ++-
+ include/linux/netfilter/Kbuild | 1 +
+ include/linux/netfilter/nf_conntrack_common.h | 1 +
+ .../linux/netfilter/nf_conntrack_tuple_common.h | 3 +-
+ include/linux/netfilter/x_tables.h | 95 +-
+ include/linux/netfilter/xt_CONNMARK.h | 22 +-
+ include/linux/netfilter/xt_MARK.h | 6 +-
+ include/linux/netfilter/xt_TEE.h | 12 +
+ include/linux/netfilter/xt_connmark.h | 11 +
+ include/linux/netfilter/xt_mark.h | 4 +
+ include/linux/netfilter/xt_recent.h | 7 +
+ include/linux/netfilter_bridge.h | 29 +-
+ include/linux/netfilter_ipv6/ip6_tables.h | 4 -
+ include/linux/netpoll.h | 13 +-
+ include/linux/nl80211.h | 76 +
+ include/linux/notifier.h | 10 +-
+ include/linux/pci_regs.h | 3 +
+ include/linux/phy.h | 13 +-
+ include/linux/ppp_channel.h | 3 +
+ include/linux/rculist.h | 42 +
+ include/linux/rtnetlink.h | 7 +
+ include/linux/skbuff.h | 25 +-
+ include/linux/snmp.h | 2 +
+ include/linux/socket.h | 5 +-
+ include/linux/spi/wl12xx.h | 2 +
+ include/linux/ssb/ssb.h | 4 +
+ include/linux/ssb/ssb_driver_chipcommon.h | 15 +
+ include/linux/ssb/ssb_regs.h | 239 +-
+ include/linux/stmmac.h | 1 +
+ include/linux/sysctl.h | 2 +
+ include/linux/tipc.h | 36 +-
+ include/linux/tipc_config.h | 1 +
+ include/linux/tty.h | 4 +-
+ include/linux/wireless.h | 4 +-
+ include/net/af_unix.h | 20 +-
+ include/net/bluetooth/hci_core.h | 6 +-
+ include/net/bluetooth/l2cap.h | 41 +-
+ include/net/caif/caif_dev.h | 103 +
+ include/net/caif/caif_device.h | 55 +
+ include/net/caif/caif_layer.h | 283 +++
+ include/net/caif/cfcnfg.h | 140 +
+ include/net/caif/cfctrl.h | 139 +
+ include/net/caif/cffrml.h | 16 +
+ include/net/caif/cfmuxl.h | 22 +
+ include/net/caif/cfpkt.h | 274 ++
+ include/net/caif/cfserl.h | 12 +
+ include/net/caif/cfsrvl.h | 56 +
+ include/net/cfg80211.h | 47 +-
+ include/net/dn_fib.h | 4 -
+ include/net/dst.h | 15 -
+ include/net/fib_rules.h | 3 +-
+ include/net/flow.h | 23 +-
+ include/net/icmp.h | 11 -
+ include/net/if_inet6.h | 13 +-
+ include/net/inet6_connection_sock.h | 2 +-
+ include/net/inet_connection_sock.h | 5 +-
+ include/net/inet_sock.h | 1 +
+ include/net/inet_timewait_sock.h | 4 +-
+ include/net/ip.h | 9 +-
+ include/net/ip6_fib.h | 29 +-
+ include/net/ip6_route.h | 4 +-
+ include/net/ipv6.h | 10 +-
+ include/net/iw_handler.h | 2 +-
+ include/net/mac80211.h | 110 +-
+ include/net/mld.h | 75 +
+ include/net/neighbour.h | 14 +
+ include/net/netns/generic.h | 9 +-
+ include/net/netns/ipv4.h | 15 +-
+ include/net/netns/ipv6.h | 14 +-
+ include/net/pkt_sched.h | 2 +-
+ include/net/raw.h | 13 +
+ include/net/sch_generic.h | 1 +
+ include/net/sctp/sctp.h | 4 +-
+ include/net/sctp/sm.h | 2 +-
+ include/net/sctp/structs.h | 66 +-
+ include/net/snmp.h | 31 +-
+ include/net/sock.h | 179 +-
+ include/net/tcp.h | 13 +-
+ include/net/tipc/tipc.h | 16 +-
+ include/net/transp_v6.h | 3 +-
+ include/net/x25device.h | 1 +
+ include/net/xfrm.h | 19 +-
+ kernel/sysctl.c | 551 +++--
+ kernel/sysctl_binary.c | 1 -
+ net/802/garp.c | 4 +-
+ net/8021q/vlan.c | 8 +-
+ net/8021q/vlan_dev.c | 18 +-
+ net/Kconfig | 8 +
+ net/Makefile | 2 +
+ net/appletalk/ddp.c | 2 +-
+ net/atm/common.c | 30 +-
+ net/atm/proc.c | 10 +-
+ net/atm/signaling.c | 2 +-
+ net/atm/svc.c | 62 +-
+ net/ax25/af_ax25.c | 8 +-
+ net/bluetooth/Kconfig | 13 +
+ net/bluetooth/af_bluetooth.c | 6 +-
+ net/bluetooth/bnep/core.c | 8 +-
+ net/bluetooth/bnep/netdev.c | 20 +-
+ net/bluetooth/cmtp/cmtp.h | 2 +-
+ net/bluetooth/cmtp/core.c | 4 +-
+ net/bluetooth/hci_core.c | 27 +-
+ net/bluetooth/hci_sysfs.c | 34 +-
+ net/bluetooth/hidp/core.c | 10 +-
+ net/bluetooth/hidp/hidp.h | 4 +-
+ net/bluetooth/l2cap.c | 1112 +++++++--
+ net/bluetooth/rfcomm/sock.c | 8 +-
+ net/bluetooth/sco.c | 30 +-
+ net/bridge/Kconfig | 6 +-
+ net/bridge/br.c | 2 +-
+ net/bridge/br_device.c | 131 +-
+ net/bridge/br_fdb.c | 9 +-
+ net/bridge/br_forward.c | 51 +-
+ net/bridge/br_if.c | 14 +-
+ net/bridge/br_input.c | 12 +-
+ net/bridge/br_ioctl.c | 2 +-
+ net/bridge/br_multicast.c | 690 +++++-
+ net/bridge/br_netfilter.c | 263 +--
+ net/bridge/br_netlink.c | 8 +-
+ net/bridge/br_notify.c | 11 +
+ net/bridge/br_private.h | 57 +-
+ net/bridge/br_stp.c | 11 +-
+ net/bridge/br_stp_bpdu.c | 2 +-
+ net/bridge/br_stp_if.c | 16 +-
+ net/bridge/br_stp_timer.c | 24 +-
+ net/bridge/br_sysfs_if.c | 32 +-
+ net/bridge/netfilter/ebt_802_3.c | 8 +-
+ net/bridge/netfilter/ebt_among.c | 27 +-
+ net/bridge/netfilter/ebt_arp.c | 10 +-
+ net/bridge/netfilter/ebt_arpreply.c | 10 +-
+ net/bridge/netfilter/ebt_dnat.c | 12 +-
+ net/bridge/netfilter/ebt_ip.c | 18 +-
+ net/bridge/netfilter/ebt_ip6.c | 39 +-
+ net/bridge/netfilter/ebt_limit.c | 11 +-
+ net/bridge/netfilter/ebt_log.c | 10 +-
+ net/bridge/netfilter/ebt_mark.c | 12 +-
+ net/bridge/netfilter/ebt_mark_m.c | 12 +-
+ net/bridge/netfilter/ebt_nflog.c | 8 +-
+ net/bridge/netfilter/ebt_pkttype.c | 8 +-
+ net/bridge/netfilter/ebt_redirect.c | 12 +-
+ net/bridge/netfilter/ebt_snat.c | 12 +-
+ net/bridge/netfilter/ebt_stp.c | 10 +-
+ net/bridge/netfilter/ebt_ulog.c | 38 +-
+ net/bridge/netfilter/ebt_vlan.c | 54 +-
+ net/bridge/netfilter/ebtables.c | 56 +-
+ net/caif/Kconfig | 48 +
+ net/caif/Makefile | 26 +
+ net/caif/caif_config_util.c | 87 +
+ net/caif/caif_dev.c | 418 +++
+ net/caif/caif_socket.c | 1252 +++++++++
+ net/caif/cfcnfg.c | 471 ++++
+ net/caif/cfctrl.c | 693 +++++
+ net/caif/cfdbgl.c | 40 +
+ net/caif/cfdgml.c | 108 +
+ net/caif/cffrml.c | 151 ++
+ net/caif/cfmuxl.c | 251 ++
+ net/caif/cfpkt_skbuff.c | 571 +++++
+ net/caif/cfrfml.c | 108 +
+ net/caif/cfserl.c | 192 ++
+ net/caif/cfsrvl.c | 192 ++
+ net/caif/cfutill.c | 115 +
+ net/caif/cfveil.c | 107 +
+ net/caif/cfvidl.c | 65 +
+ net/caif/chnl_net.c | 467 ++++
+ net/core/Makefile | 2 +-
+ net/core/datagram.c | 21 +-
+ net/core/dev.c | 1358 +++++------
+ net/core/dev_addr_lists.c | 741 ++++++
+ net/core/dev_mcast.c | 232 --
+ net/core/dst.c | 45 +-
+ net/core/ethtool.c | 148 +-
+ net/core/fib_rules.c | 31 +-
+ net/core/filter.c | 7 +
+ net/core/flow.c | 405 ++--
+ net/core/net-sysfs.c | 318 +++-
+ net/core/net_namespace.c | 95 +-
+ net/core/netpoll.c | 26 +-
+ net/core/pktgen.c | 58 +-
+ net/core/rtnetlink.c | 69 +-
+ net/core/skbuff.c | 31 +-
+ net/core/sock.c | 72 +-
+ net/core/stream.c | 22 +-
+ net/core/sysctl_net_core.c | 75 +
+ net/dccp/ccids/ccid3.c | 2 +-
+ net/dccp/dccp.h | 4 +-
+ net/dccp/input.c | 2 +-
+ net/dccp/ipv4.c | 2 +-
+ net/dccp/ipv6.c | 7 +-
+ net/dccp/output.c | 18 +-
+ net/dccp/proto.c | 2 +-
+ net/dccp/timer.c | 4 +-
+ net/decnet/af_decnet.c | 32 +-
+ net/decnet/dn_dev.c | 12 +-
+ net/decnet/dn_neigh.c | 9 +-
+ net/decnet/dn_nsp_in.c | 3 +-
+ net/decnet/dn_route.c | 28 +-
+ net/decnet/dn_rules.c | 22 +-
+ net/dsa/slave.c | 14 +-
+ net/ethernet/eth.c | 4 +-
+ net/ipv4/Kconfig | 22 +
+ net/ipv4/af_inet.c | 57 +-
+ net/ipv4/devinet.c | 4 +-
+ net/ipv4/fib_rules.c | 22 +-
+ net/ipv4/icmp.c | 5 +-
+ net/ipv4/igmp.c | 4 +-
+ net/ipv4/inet_connection_sock.c | 10 +-
+ net/ipv4/inet_hashtables.c | 2 +
+ net/ipv4/ip_forward.c | 4 +-
+ net/ipv4/ip_input.c | 4 +-
+ net/ipv4/ip_output.c | 26 +-
+ net/ipv4/ip_sockglue.c | 20 +-
+ net/ipv4/ipconfig.c | 2 +-
+ net/ipv4/ipmr.c | 916 +++++--
+ net/ipv4/netfilter/arp_tables.c | 102 +-
+ net/ipv4/netfilter/arpt_mangle.c | 4 +-
+ net/ipv4/netfilter/ip_queue.c | 4 +-
+ net/ipv4/netfilter/ip_tables.c | 260 +--
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 77 +-
+ net/ipv4/netfilter/ipt_ECN.c | 23 +-
+ net/ipv4/netfilter/ipt_LOG.c | 19 +-
+ net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +-
+ net/ipv4/netfilter/ipt_NETMAP.c | 16 +-
+ net/ipv4/netfilter/ipt_REDIRECT.c | 16 +-
+ net/ipv4/netfilter/ipt_REJECT.c | 19 +-
+ net/ipv4/netfilter/ipt_ULOG.c | 47 +-
+ net/ipv4/netfilter/ipt_addrtype.c | 28 +-
+ net/ipv4/netfilter/ipt_ah.c | 28 +-
+ net/ipv4/netfilter/ipt_ecn.c | 19 +-
+ net/ipv4/netfilter/iptable_filter.c | 2 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +-
+ .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 7 +-
+ net/ipv4/netfilter/nf_nat_h323.c | 17 +-
+ net/ipv4/netfilter/nf_nat_rule.c | 21 +-
+ net/ipv4/netfilter/nf_nat_snmp_basic.c | 16 +-
+ net/ipv4/netfilter/nf_nat_standalone.c | 7 +-
+ net/ipv4/netfilter/nf_nat_tftp.c | 1 -
+ net/ipv4/proc.c | 1 +
+ net/ipv4/raw.c | 6 +-
+ net/ipv4/route.c | 137 +-
+ net/ipv4/sysctl_net_ipv4.c | 17 +
+ net/ipv4/tcp.c | 19 +-
+ net/ipv4/tcp_input.c | 7 +-
+ net/ipv4/tcp_ipv4.c | 43 +-
+ net/ipv4/tcp_minisocks.c | 1 +
+ net/ipv4/tcp_output.c | 16 +-
+ net/ipv4/tcp_timer.c | 8 +-
+ net/ipv4/udp.c | 34 +-
+ net/ipv4/xfrm4_input.c | 2 +-
+ net/ipv4/xfrm4_output.c | 2 +-
+ net/ipv4/xfrm4_policy.c | 22 -
+ net/ipv6/Kconfig | 14 +
+ net/ipv6/addrconf.c | 805 +++---
+ net/ipv6/af_inet6.c | 3 +
+ net/ipv6/datagram.c | 108 +-
+ net/ipv6/fib6_rules.c | 3 +-
+ net/ipv6/icmp.c | 7 +-
+ net/ipv6/inet6_connection_sock.c | 4 +-
+ net/ipv6/ip6_fib.c | 16 +-
+ net/ipv6/ip6_flowlabel.c | 3 +-
+ net/ipv6/ip6_input.c | 4 +-
+ net/ipv6/ip6_output.c | 103 +-
+ net/ipv6/ip6mr.c | 934 +++++--
+ net/ipv6/ipv6_sockglue.c | 86 +-
+ net/ipv6/mcast.c | 143 +-
+ net/ipv6/ndisc.c | 4 +-
+ net/ipv6/netfilter.c | 25 +-
+ net/ipv6/netfilter/ip6_queue.c | 4 +-
+ net/ipv6/netfilter/ip6_tables.c | 236 +-
+ net/ipv6/netfilter/ip6t_LOG.c | 20 +-
+ net/ipv6/netfilter/ip6t_REJECT.c | 32 +-
+ net/ipv6/netfilter/ip6t_ah.c | 18 +-
+ net/ipv6/netfilter/ip6t_eui64.c | 4 +-
+ net/ipv6/netfilter/ip6t_frag.c | 18 +-
+ net/ipv6/netfilter/ip6t_hbh.c | 33 +-
+ net/ipv6/netfilter/ip6t_ipv6header.c | 8 +-
+ net/ipv6/netfilter/ip6t_mh.c | 21 +-
+ net/ipv6/netfilter/ip6t_rt.c | 20 +-
+ net/ipv6/netfilter/ip6table_filter.c | 2 +-
+ net/ipv6/netfilter/ip6table_mangle.c | 2 +-
+ net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 14 +-
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +-
+ net/ipv6/proc.c | 1 +
+ net/ipv6/raw.c | 18 +-
+ net/ipv6/tcp_ipv6.c | 68 +-
+ net/ipv6/udp.c | 41 +-
+ net/ipv6/xfrm6_input.c | 2 +-
+ net/ipv6/xfrm6_output.c | 4 +-
+ net/ipv6/xfrm6_policy.c | 31 -
+ net/irda/af_irda.c | 14 +-
+ net/irda/ircomm/ircomm_param.c | 2 +-
+ net/iucv/af_iucv.c | 21 +-
+ net/l2tp/Kconfig | 107 +
+ net/l2tp/Makefile | 12 +
+ net/l2tp/l2tp_core.c | 1666 ++++++++++++
+ net/l2tp/l2tp_core.h | 304 +++
+ net/l2tp/l2tp_debugfs.c | 341 +++
+ net/l2tp/l2tp_eth.c | 334 +++
+ net/l2tp/l2tp_ip.c | 679 +++++
+ net/l2tp/l2tp_netlink.c | 840 ++++++
+ net/l2tp/l2tp_ppp.c | 1837 ++++++++++++++
+ net/llc/af_llc.c | 12 +-
+ net/llc/llc_core.c | 6 -
+ net/mac80211/Kconfig | 17 +-
+ net/mac80211/Makefile | 3 +-
+ net/mac80211/agg-rx.c | 80 +-
+ net/mac80211/agg-tx.c | 16 +-
+ net/mac80211/cfg.c | 122 +-
+ net/mac80211/chan.c | 127 +
+ net/mac80211/debugfs_netdev.c | 12 +
+ net/mac80211/debugfs_sta.c | 79 +-
+ net/mac80211/driver-ops.h | 22 +-
+ net/mac80211/driver-trace.h | 284 ++-
+ net/mac80211/ht.c | 3 +-
+ net/mac80211/ibss.c | 46 +-
+ net/mac80211/ieee80211_i.h | 48 +-
+ net/mac80211/iface.c | 124 +-
+ net/mac80211/key.c | 1 +
+ net/mac80211/main.c | 28 +-
+ net/mac80211/mesh.c | 4 +-
+ net/mac80211/mesh.h | 2 -
+ net/mac80211/mesh_hwmp.c | 4 +-
+ net/mac80211/mesh_plink.c | 2 +-
+ net/mac80211/mlme.c | 251 ++-
+ net/mac80211/pm.c | 2 +-
+ net/mac80211/rc80211_minstrel.c | 2 +-
+ net/mac80211/rc80211_minstrel.h | 11 +
+ net/mac80211/rc80211_minstrel_debugfs.c | 41 +-
+ net/mac80211/rx.c | 102 +-
+ net/mac80211/scan.c | 126 +-
+ net/mac80211/sta_info.c | 105 +-
+ net/mac80211/sta_info.h | 12 +-
+ net/mac80211/status.c | 21 +-
+ net/mac80211/tx.c | 26 +-
+ net/mac80211/util.c | 36 +-
+ net/mac80211/work.c | 35 +-
+ net/netfilter/Kconfig | 133 +-
+ net/netfilter/Makefile | 9 +-
+ net/netfilter/ipvs/ip_vs_ftp.c | 10 +-
+ net/netfilter/ipvs/ip_vs_proto.c | 28 +-
+ net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 14 +-
+ net/netfilter/ipvs/ip_vs_sync.c | 2 +-
+ net/netfilter/ipvs/ip_vs_xmit.c | 16 +-
+ net/netfilter/nf_conntrack_amanda.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 6 +-
+ net/netfilter/nf_conntrack_ecache.c | 12 +-
+ net/netfilter/nf_conntrack_ftp.c | 4 +-
+ net/netfilter/nf_conntrack_h323_main.c | 9 +-
+ net/netfilter/nf_conntrack_irc.c | 4 +-
+ net/netfilter/nf_conntrack_netlink.c | 30 +-
+ net/netfilter/nf_conntrack_proto.c | 8 +-
+ net/netfilter/nf_conntrack_proto_sctp.c | 4 +-
+ net/netfilter/nf_conntrack_sip.c | 4 +-
+ net/netfilter/nf_conntrack_standalone.c | 9 +-
+ net/netfilter/nf_conntrack_tftp.c | 4 +-
+ net/netfilter/nf_internals.h | 2 +-
+ net/netfilter/nf_log.c | 6 +-
+ net/netfilter/nf_queue.c | 1 -
+ net/netfilter/nfnetlink.c | 7 +-
+ net/netfilter/nfnetlink_log.c | 4 +-
+ net/netfilter/nfnetlink_queue.c | 3 +-
+ net/netfilter/x_tables.c | 128 +-
+ net/netfilter/xt_CLASSIFY.c | 2 +-
+ net/netfilter/xt_CONNMARK.c | 113 -
+ net/netfilter/xt_CONNSECMARK.c | 29 +-
+ net/netfilter/xt_CT.c | 25 +-
+ net/netfilter/xt_DSCP.c | 18 +-
+ net/netfilter/xt_HL.c | 30 +-
+ net/netfilter/xt_LED.c | 93 +-
+ net/netfilter/xt_MARK.c | 56 -
+ net/netfilter/xt_NFLOG.c | 10 +-
+ net/netfilter/xt_NFQUEUE.c | 50 +-
+ net/netfilter/xt_NOTRACK.c | 2 +-
+ net/netfilter/xt_RATEEST.c | 20 +-
+ net/netfilter/xt_SECMARK.c | 48 +-
+ net/netfilter/xt_TCPMSS.c | 41 +-
+ net/netfilter/xt_TCPOPTSTRIP.c | 7 +-
+ net/netfilter/xt_TEE.c | 309 +++
+ net/netfilter/xt_TPROXY.c | 12 +-
+ net/netfilter/xt_TRACE.c | 2 +-
+ net/netfilter/xt_cluster.c | 21 +-
+ net/netfilter/xt_comment.c | 2 +-
+ net/netfilter/xt_connbytes.c | 22 +-
+ net/netfilter/xt_connlimit.c | 24 +-
+ net/netfilter/xt_connmark.c | 104 +-
+ net/netfilter/xt_conntrack.c | 23 +-
+ net/netfilter/xt_dccp.c | 18 +-
+ net/netfilter/xt_dscp.c | 18 +-
+ net/netfilter/xt_esp.c | 28 +-
+ net/netfilter/xt_hashlimit.c | 346 +--
+ net/netfilter/xt_helper.c | 18 +-
+ net/netfilter/xt_hl.c | 16 +-
+ net/netfilter/xt_iprange.c | 5 +-
+ net/netfilter/xt_length.c | 4 +-
+ net/netfilter/xt_limit.c | 15 +-
+ net/netfilter/xt_mac.c | 23 +-
+ net/netfilter/xt_mark.c | 37 +-
+ net/netfilter/xt_multiport.c | 103 +-
+ net/netfilter/xt_osf.c | 12 +-
+ net/netfilter/xt_owner.c | 2 +-
+ net/netfilter/xt_physdev.c | 18 +-
+ net/netfilter/xt_pkttype.c | 2 +-
+ net/netfilter/xt_policy.c | 31 +-
+ net/netfilter/xt_quota.c | 10 +-
+ net/netfilter/xt_rateest.c | 10 +-
+ net/netfilter/xt_realm.c | 2 +-
+ net/netfilter/xt_recent.c | 189 +-
+ net/netfilter/xt_sctp.c | 57 +-
+ net/netfilter/xt_socket.c | 11 +-
+ net/netfilter/xt_state.c | 50 +-
+ net/netfilter/xt_statistic.c | 14 +-
+ net/netfilter/xt_string.c | 68 +-
+ net/netfilter/xt_tcpmss.c | 4 +-
+ net/netfilter/xt_tcpudp.c | 38 +-
+ net/netfilter/xt_time.c | 16 +-
+ net/netfilter/xt_u32.c | 5 +-
+ net/netlink/af_netlink.c | 2 +-
+ net/netlink/genetlink.c | 6 +-
+ net/netrom/af_netrom.c | 8 +-
+ net/packet/af_packet.c | 69 +-
+ net/phonet/pep.c | 8 +-
+ net/phonet/pn_dev.c | 23 +-
+ net/phonet/socket.c | 2 +-
+ net/rds/af_rds.c | 11 +-
+ net/rds/cong.c | 2 -
+ net/rds/ib_cm.c | 3 +-
+ net/rds/ib_rdma.c | 5 +-
+ net/rds/ib_recv.c | 4 +-
+ net/rds/ib_send.c | 20 +-
+ net/rds/iw_cm.c | 4 +-
+ net/rds/iw_recv.c | 4 +-
+ net/rds/iw_send.c | 3 +-
+ net/rds/loop.c | 7 -
+ net/rds/rdma.c | 4 +-
+ net/rds/rdma_transport.c | 5 +-
+ net/rds/rds.h | 4 +-
+ net/rds/recv.c | 2 +-
+ net/rds/send.c | 40 +-
+ net/rds/tcp_recv.c | 1 +
+ net/rds/tcp_send.c | 4 +-
+ net/rds/threads.c | 2 +-
+ net/rfkill/core.c | 53 +-
+ net/rose/af_rose.c | 8 +-
+ net/rxrpc/af_rxrpc.c | 12 +-
+ net/rxrpc/ar-recvmsg.c | 6 +-
+ net/sched/act_api.c | 45 +-
+ net/sched/act_ipt.c | 6 +-
+ net/sched/cls_api.c | 30 +-
+ net/sched/cls_u32.c | 4 +-
+ net/sched/sch_api.c | 112 +-
+ net/sched/sch_generic.c | 17 +-
+ net/sched/sch_sfq.c | 10 +-
+ net/sctp/Kconfig | 12 +
+ net/sctp/Makefile | 3 +
+ net/sctp/associola.c | 13 +-
+ net/sctp/chunk.c | 4 +-
+ net/sctp/endpointola.c | 2 -
+ net/sctp/ipv6.c | 27 +-
+ net/sctp/output.c | 27 +-
+ net/sctp/outqueue.c | 94 +-
+ net/sctp/probe.c | 214 ++
+ net/sctp/protocol.c | 9 +-
+ net/sctp/sm_make_chunk.c | 24 +-
+ net/sctp/sm_sideeffect.c | 8 +-
+ net/sctp/socket.c | 41 +-
+ net/sctp/transport.c | 61 +-
+ net/socket.c | 121 +-
+ net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +-
+ net/sunrpc/bc_svc.c | 2 +-
+ net/sunrpc/svcsock.c | 24 +-
+ net/sunrpc/xprt.c | 2 +-
+ net/tipc/addr.c | 32 +
+ net/tipc/addr.h | 37 +-
+ net/tipc/bcast.c | 149 +-
+ net/tipc/bcast.h | 117 +-
+ net/tipc/bearer.c | 16 +-
+ net/tipc/bearer.h | 16 +-
+ net/tipc/cluster.c | 2 +-
+ net/tipc/config.c | 68 +-
+ net/tipc/core.c | 26 +-
+ net/tipc/core.h | 27 +-
+ net/tipc/discover.c | 8 +-
+ net/tipc/link.c | 102 +-
+ net/tipc/link.h | 35 +
+ net/tipc/msg.c | 94 +
+ net/tipc/msg.h | 99 +-
+ net/tipc/name_distr.c | 2 +-
+ net/tipc/name_table.c | 2 +-
+ net/tipc/net.c | 8 +-
+ net/tipc/node.c | 14 +-
+ net/tipc/port.c | 27 +-
+ net/tipc/port.h | 2 -
+ net/tipc/socket.c | 26 +-
+ net/tipc/subscr.c | 15 +-
+ net/unix/af_unix.c | 25 +-
+ net/unix/garbage.c | 13 +-
+ net/wimax/op-reset.c | 2 -
+ net/wimax/op-state-get.c | 2 -
+ net/wimax/stack.c | 2 +-
+ net/wireless/chan.c | 56 +-
+ net/wireless/core.c | 3 +-
+ net/wireless/core.h | 27 +-
+ net/wireless/ibss.c | 5 -
+ net/wireless/mlme.c | 52 +-
+ net/wireless/nl80211.c | 328 +++-
+ net/wireless/nl80211.h | 6 +
+ net/wireless/reg.c | 6 +-
+ net/wireless/sme.c | 36 +-
+ net/wireless/util.c | 24 +-
+ net/wireless/wext-compat.c | 15 +-
+ net/wireless/wext-core.c | 134 +-
+ net/wireless/wext-sme.c | 2 +-
+ net/x25/af_x25.c | 8 +-
+ net/x25/x25_dev.c | 36 +-
+ net/xfrm/xfrm_hash.h | 3 +-
+ net/xfrm/xfrm_policy.c | 847 ++++---
+ net/xfrm/xfrm_state.c | 5 +-
+ net/xfrm/xfrm_user.c | 10 +-
+ scripts/mod/file2alias.c | 26 +
+ 1370 files changed, 85848 insertions(+), 40531 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill
+ create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill
+ create mode 100644 Documentation/networking/caif/Linux-CAIF.txt
+ create mode 100644 Documentation/networking/caif/README
+ create mode 100644 drivers/net/caif/Kconfig
+ create mode 100644 drivers/net/caif/Makefile
+ create mode 100644 drivers/net/caif/caif_serial.c
+ create mode 100644 drivers/net/irda/sh_irda.c
+ delete mode 100644 drivers/net/pppol2tp.c
+ delete mode 100644 drivers/net/stmmac/dwmac100.c
+ create mode 100644 drivers/net/stmmac/dwmac100_core.c
+ create mode 100644 drivers/net/stmmac/dwmac100_dma.c
+ create mode 100644 drivers/net/stmmac/enh_desc.c
+ create mode 100644 drivers/net/stmmac/norm_desc.c
+ create mode 100644 drivers/net/wireless/ath/ath5k/ani.c
+ create mode 100644 drivers/net/wireless/ath/ath5k/ani.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_phy.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9001_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_calib.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_hw.c
+ rename drivers/net/wireless/ath/ath9k/{initvals.h => ar9002_initvals.h} (77%)
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_mac.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_calib.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_hw.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_initvals.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_init.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_main.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.h
+ create mode 100644 drivers/net/wireless/ath/ath9k/hw-ops.h
+ delete mode 100644 drivers/net/wireless/ath/ath9k/phy.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/wmi.c
+ create mode 100644 drivers/net/wireless/ath/ath9k/wmi.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hw.h
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-lib.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tx.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+ create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn.h
+ create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.c
+ create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.h
+ create mode 100644 drivers/net/wireless/libertas_tf/deb_defs.h
+ create mode 100644 drivers/net/wireless/orinoco/orinoco_usb.c
+ create mode 100644 drivers/net/wireless/rtl818x/Kconfig
+ create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c
+ delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h
+ create mode 100644 include/linux/caif/caif_socket.h
+ create mode 100644 include/linux/caif/if_caif.h
+ create mode 100644 include/linux/if_x25.h
+ create mode 100644 include/linux/ks8842.h
+ create mode 100644 include/linux/l2tp.h
+ create mode 100644 include/linux/netfilter/xt_TEE.h
+ create mode 100644 include/net/caif/caif_dev.h
+ create mode 100644 include/net/caif/caif_device.h
+ create mode 100644 include/net/caif/caif_layer.h
+ create mode 100644 include/net/caif/cfcnfg.h
+ create mode 100644 include/net/caif/cfctrl.h
+ create mode 100644 include/net/caif/cffrml.h
+ create mode 100644 include/net/caif/cfmuxl.h
+ create mode 100644 include/net/caif/cfpkt.h
+ create mode 100644 include/net/caif/cfserl.h
+ create mode 100644 include/net/caif/cfsrvl.h
+ create mode 100644 include/net/mld.h
+ create mode 100644 net/caif/Kconfig
+ create mode 100644 net/caif/Makefile
+ create mode 100644 net/caif/caif_config_util.c
+ create mode 100644 net/caif/caif_dev.c
+ create mode 100644 net/caif/caif_socket.c
+ create mode 100644 net/caif/cfcnfg.c
+ create mode 100644 net/caif/cfctrl.c
+ create mode 100644 net/caif/cfdbgl.c
+ create mode 100644 net/caif/cfdgml.c
+ create mode 100644 net/caif/cffrml.c
+ create mode 100644 net/caif/cfmuxl.c
+ create mode 100644 net/caif/cfpkt_skbuff.c
+ create mode 100644 net/caif/cfrfml.c
+ create mode 100644 net/caif/cfserl.c
+ create mode 100644 net/caif/cfsrvl.c
+ create mode 100644 net/caif/cfutill.c
+ create mode 100644 net/caif/cfveil.c
+ create mode 100644 net/caif/cfvidl.c
+ create mode 100644 net/caif/chnl_net.c
+ create mode 100644 net/core/dev_addr_lists.c
+ delete mode 100644 net/core/dev_mcast.c
+ create mode 100644 net/l2tp/Kconfig
+ create mode 100644 net/l2tp/Makefile
+ create mode 100644 net/l2tp/l2tp_core.c
+ create mode 100644 net/l2tp/l2tp_core.h
+ create mode 100644 net/l2tp/l2tp_debugfs.c
+ create mode 100644 net/l2tp/l2tp_eth.c
+ create mode 100644 net/l2tp/l2tp_ip.c
+ create mode 100644 net/l2tp/l2tp_netlink.c
+ create mode 100644 net/l2tp/l2tp_ppp.c
+ create mode 100644 net/mac80211/chan.c
+ delete mode 100644 net/netfilter/xt_CONNMARK.c
+ delete mode 100644 net/netfilter/xt_MARK.c
+ create mode 100644 net/netfilter/xt_TEE.c
+ create mode 100644 net/sctp/probe.c
+Merging wireless/master
+$ git merge wireless/master
+Resolved 'drivers/net/wireless/iwlwifi/iwl-dev.h' using previous resolution.
+Auto-merging drivers/net/wireless/ath/ar9170/usb.c
+Auto-merging drivers/net/wireless/ath/ath5k/base.c
+Auto-merging drivers/net/wireless/ath/ath9k/debug.c
+Auto-merging drivers/net/wireless/hostap/hostap_80211_rx.c
+Auto-merging drivers/net/wireless/hostap/hostap_ioctl.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-debugfs.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-dev.h
+CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-dev.h
+Auto-merging drivers/net/wireless/iwlwifi/iwl-eeprom.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-power.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c
+Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c
+Auto-merging drivers/net/wireless/rt2x00/rt2400pci.c
+Auto-merging drivers/net/wireless/rt2x00/rt2500pci.c
+Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c
+Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c
+Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.c
+Auto-merging drivers/net/wireless/rt2x00/rt61pci.c
+Auto-merging drivers/net/wireless/rt2x00/rt73usb.c
+Auto-merging drivers/net/wireless/wl12xx/wl1271_main.c
+Auto-merging include/net/mac80211.h
+Auto-merging net/mac80211/driver-ops.h
+Auto-merging net/mac80211/ieee80211_i.h
+Auto-merging net/mac80211/mlme.c
+Auto-merging net/mac80211/rx.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9dc00e6] Merge remote branch 'wireless/master'
+$ git diff -M --stat --summary HEAD^..
+ drivers/net/wireless/ath/ar9170/usb.c | 2 +
+ drivers/net/wireless/ath/ath5k/base.c | 12 +-
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 174 +++----
+ drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 10 +-
+ drivers/net/wireless/ath/ath9k/ar9003_initvals.h | 268 ++++++------
+ drivers/net/wireless/ath/ath9k/debug.c | 236 ++++++++--
+ drivers/net/wireless/ath/ath9k/debug.h | 8 +-
+ drivers/net/wireless/ath/ath9k/hif_usb.c | 58 ++--
+ drivers/net/wireless/ath/ath9k/htc_drv_init.c | 7 +
+ drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 +
+ drivers/net/wireless/ath/ath9k/htc_hst.c | 51 +-
+ drivers/net/wireless/ath/ath9k/htc_hst.h | 15 +-
+ drivers/net/wireless/ath/ath9k/recv.c | 3 +-
+ drivers/net/wireless/hostap/hostap_80211_rx.c | 3 +-
+ drivers/net/wireless/hostap/hostap_ioctl.c | 3 +-
+ drivers/net/wireless/iwlwifi/iwl-1000.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-3945.c | 147 ++++--
+ drivers/net/wireless/iwlwifi/iwl-3945.h | 22 +-
+ drivers/net/wireless/iwlwifi/iwl-4965.c | 100 +++--
+ drivers/net/wireless/iwlwifi/iwl-5000.c | 27 +-
+ drivers/net/wireless/iwlwifi/iwl-6000.c | 51 ++-
+ drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 16 +
+ drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 31 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 29 +-
+ drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 109 +++--
+ drivers/net/wireless/iwlwifi/iwl-agn.c | 558 +++++++++++++++-------
+ drivers/net/wireless/iwlwifi/iwl-agn.h | 14 +-
+ drivers/net/wireless/iwlwifi/iwl-commands.h | 6 +-
+ drivers/net/wireless/iwlwifi/iwl-core.c | 199 +++-----
+ drivers/net/wireless/iwlwifi/iwl-core.h | 60 ++-
+ drivers/net/wireless/iwlwifi/iwl-debugfs.c | 66 +--
+ drivers/net/wireless/iwlwifi/iwl-dev.h | 91 +++-
+ drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 +
+ drivers/net/wireless/iwlwifi/iwl-power.c | 5 +-
+ drivers/net/wireless/iwlwifi/iwl-rx.c | 9 +-
+ drivers/net/wireless/iwlwifi/iwl-scan.c | 16 +-
+ drivers/net/wireless/iwlwifi/iwl-sta.c | 456 ++++++++----------
+ drivers/net/wireless/iwlwifi/iwl-sta.h | 60 ++-
+ drivers/net/wireless/iwlwifi/iwl3945-base.c | 163 ++++---
+ drivers/net/wireless/rt2x00/rt2400pci.c | 26 +-
+ drivers/net/wireless/rt2x00/rt2500pci.c | 26 +-
+ drivers/net/wireless/rt2x00/rt2500usb.c | 55 ++-
+ drivers/net/wireless/rt2x00/rt2800pci.c | 14 +-
+ drivers/net/wireless/rt2x00/rt2800usb.c | 8 +-
+ drivers/net/wireless/rt2x00/rt2x00debug.c | 21 +-
+ drivers/net/wireless/rt2x00/rt2x00dump.h | 3 +
+ drivers/net/wireless/rt2x00/rt2x00pci.c | 9 -
+ drivers/net/wireless/rt2x00/rt2x00queue.c | 15 +-
+ drivers/net/wireless/rt2x00/rt2x00queue.h | 3 +
+ drivers/net/wireless/rt2x00/rt2x00usb.c | 8 -
+ drivers/net/wireless/rt2x00/rt61pci.c | 35 +-
+ drivers/net/wireless/rt2x00/rt73usb.c | 71 ++--
+ drivers/net/wireless/wl12xx/wl1271_main.c | 5 +-
+ include/net/mac80211.h | 39 ++
+ net/mac80211/driver-ops.h | 11 +
+ net/mac80211/driver-trace.h | 49 ++
+ net/mac80211/ieee80211_i.h | 3 +-
+ net/mac80211/mlme.c | 59 ++-
+ net/mac80211/rx.c | 6 +
+ 59 files changed, 2125 insertions(+), 1446 deletions(-)
+$ git am -3 ../patches/wireless__update_gfp_slab.h_includes
+Applying: wireless: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/net/wireless/ath/ath9k/htc.h
+M drivers/net/wireless/iwlwifi/iwl-agn-ict.c
+$ git add .
+$ git commit -v -a --amend
+[master f823c5e] Merge remote branch 'wireless/master'
+Merging mtd/master
+$ git merge mtd/master
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-ep93xx/ts72xx.c
+Auto-merging drivers/mtd/nand/mxc_nand.c
+Removing drivers/mtd/nand/ts7250.c
+Merge made by recursive.
+ MAINTAINERS | 6 +
+ arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 -
+ arch/arm/mach-ep93xx/ts72xx.c | 190 ++-
+ arch/arm/mach-kirkwood/common.c | 9 +
+ arch/arm/mach-kirkwood/common.h | 2 +
+ arch/arm/plat-orion/include/plat/orion_nand.h | 1 +
+ drivers/mtd/Kconfig | 13 +
+ drivers/mtd/Makefile | 1 +
+ drivers/mtd/chips/cfi_cmdset_0001.c | 137 +-
+ drivers/mtd/chips/cfi_cmdset_0002.c | 338 ++--
+ drivers/mtd/chips/cfi_cmdset_0020.c | 136 +-
+ drivers/mtd/chips/cfi_probe.c | 56 +-
+ drivers/mtd/chips/cfi_util.c | 3 +-
+ drivers/mtd/chips/fwh_lock.h | 6 +-
+ drivers/mtd/chips/gen_probe.c | 14 +-
+ drivers/mtd/chips/jedec_probe.c | 288 ++--
+ drivers/mtd/devices/Makefile | 2 +-
+ drivers/mtd/devices/block2mtd.c | 4 +-
+ drivers/mtd/devices/pmc551.c | 4 +-
+ drivers/mtd/devices/sst25l.c | 68 +-
+ drivers/mtd/ftl.c | 1 -
+ drivers/mtd/inftlcore.c | 1 -
+ drivers/mtd/inftlmount.c | 7 +-
+ drivers/mtd/lpddr/lpddr_cmds.c | 79 +-
+ drivers/mtd/lpddr/qinfo_probe.c | 7 +-
+ drivers/mtd/maps/Kconfig | 2 +-
+ drivers/mtd/maps/bfin-async-flash.c | 16 +-
+ drivers/mtd/maps/ceiva.c | 2 +-
+ drivers/mtd/maps/ixp2000.c | 3 +-
+ drivers/mtd/maps/ixp4xx.c | 7 +-
+ drivers/mtd/maps/pcmciamtd.c | 88 +-
+ drivers/mtd/maps/physmap.c | 7 +-
+ drivers/mtd/maps/physmap_of.c | 55 +-
+ drivers/mtd/maps/pismo.c | 8 +-
+ drivers/mtd/maps/pxa2xx-flash.c | 3 +-
+ drivers/mtd/mtd_blkdevs.c | 335 ++--
+ drivers/mtd/mtdblock.c | 72 +-
+ drivers/mtd/mtdblock_ro.c | 4 +-
+ drivers/mtd/mtdchar.c | 12 +-
+ drivers/mtd/mtdconcat.c | 3 +-
+ drivers/mtd/mtdcore.c | 284 ++--
+ drivers/mtd/mtdcore.h | 7 +-
+ drivers/mtd/mtdoops.c | 5 -
+ drivers/mtd/mtdsuper.c | 18 +-
+ drivers/mtd/nand/Kconfig | 69 +-
+ drivers/mtd/nand/Makefile | 10 +-
+ drivers/mtd/nand/alauda.c | 2 +-
+ drivers/mtd/nand/atmel_nand.c | 2 +-
+ drivers/mtd/nand/au1550nd.c | 12 +-
+ drivers/mtd/nand/bcm_umi_nand.c | 3 +-
+ drivers/mtd/nand/bf5xx_nand.c | 29 +-
+ drivers/mtd/nand/cafe_nand.c | 4 +-
+ drivers/mtd/nand/davinci_nand.c | 6 +-
+ drivers/mtd/nand/denali.c | 2134 ++++++++++++++++++++
+ drivers/mtd/nand/denali.h | 816 ++++++++
+ drivers/mtd/nand/fsl_elbc_nand.c | 4 +-
+ drivers/mtd/nand/fsl_upm.c | 9 +-
+ drivers/mtd/nand/gpio.c | 12 +-
+ drivers/mtd/nand/mpc5121_nfc.c | 916 +++++++++
+ drivers/mtd/nand/mxc_nand.c | 22 +-
+ drivers/mtd/nand/nand_base.c | 387 +++-
+ drivers/mtd/nand/nand_bbt.c | 29 +-
+ drivers/mtd/nand/nand_bcm_umi.h | 71 +-
+ drivers/mtd/nand/nand_ids.c | 1 +
+ drivers/mtd/nand/nandsim.c | 17 +-
+ drivers/mtd/nand/nomadik_nand.c | 6 +-
+ drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 +-
+ drivers/mtd/nand/omap2.c | 16 +-
+ drivers/mtd/nand/orion_nand.c | 13 +-
+ drivers/mtd/nand/pasemi_nand.c | 2 +-
+ drivers/mtd/nand/pxa3xx_nand.c | 11 +
+ drivers/mtd/nand/r852.c | 1139 +++++++++++
+ drivers/mtd/nand/r852.h | 163 ++
+ drivers/mtd/nand/s3c2410.c | 12 +-
+ drivers/mtd/nand/sh_flctl.c | 2 +-
+ drivers/mtd/nand/sm_common.c | 148 ++
+ drivers/mtd/nand/sm_common.h | 61 +
+ drivers/mtd/nand/socrates_nand.c | 4 +-
+ drivers/mtd/nand/tmio_nand.c | 14 +-
+ drivers/mtd/nand/ts7250.c | 207 --
+ drivers/mtd/nand/txx9ndfmc.c | 2 +-
+ drivers/mtd/nftlcore.c | 1 -
+ drivers/mtd/onenand/Kconfig | 7 +
+ drivers/mtd/onenand/Makefile | 1 +
+ drivers/mtd/onenand/omap2.c | 12 +-
+ drivers/mtd/onenand/onenand_base.c | 63 +-
+ drivers/mtd/onenand/samsung.c | 1071 ++++++++++
+ drivers/mtd/rfd_ftl.c | 1 -
+ drivers/mtd/sm_ftl.c | 1284 ++++++++++++
+ drivers/mtd/sm_ftl.h | 94 +
+ drivers/mtd/ssfdc.c | 1 -
+ drivers/mtd/tests/mtd_pagetest.c | 3 +-
+ drivers/mtd/tests/mtd_readtest.c | 3 +-
+ drivers/mtd/tests/mtd_speedtest.c | 3 +-
+ drivers/mtd/tests/mtd_stresstest.c | 3 +-
+ drivers/mtd/tests/mtd_subpagetest.c | 3 +-
+ fs/jffs2/fs.c | 10 +-
+ fs/jffs2/nodelist.h | 8 +-
+ include/linux/jffs2.h | 4 +-
+ include/linux/mtd/blktrans.h | 15 +-
+ include/linux/mtd/cfi.h | 30 +-
+ include/linux/mtd/flashchip.h | 4 +-
+ include/linux/mtd/map.h | 3 +
+ include/linux/mtd/mtd.h | 8 +-
+ include/linux/mtd/mtdram.h | 2 +-
+ include/linux/mtd/nand.h | 25 +-
+ include/linux/mtd/onenand.h | 9 +
+ include/linux/mtd/sh_flctl.h | 7 +-
+ lib/idr.c | 2 +-
+ 109 files changed, 9936 insertions(+), 1563 deletions(-)
+ create mode 100644 drivers/mtd/nand/denali.c
+ create mode 100644 drivers/mtd/nand/denali.h
+ create mode 100644 drivers/mtd/nand/mpc5121_nfc.c
+ rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%)
+ create mode 100644 drivers/mtd/nand/r852.c
+ create mode 100644 drivers/mtd/nand/r852.h
+ create mode 100644 drivers/mtd/nand/sm_common.c
+ create mode 100644 drivers/mtd/nand/sm_common.h
+ delete mode 100644 drivers/mtd/nand/ts7250.c
+ create mode 100644 drivers/mtd/onenand/samsung.c
+ create mode 100644 drivers/mtd/sm_ftl.c
+ create mode 100644 drivers/mtd/sm_ftl.h
+$ git am -3 ../patches/mtd__update_gfp_slab.h_includes
+Applying: mtd: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/mtd/mtdcore.c
+M drivers/mtd/nand/mpc5121_nfc.c
+M drivers/mtd/nand/r852.c
+$ git add .
+$ git commit -v -a --amend
+[master b83bfe8] Merge remote branch 'mtd/master'
+Merging crypto/master
+$ git merge crypto/master
+Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution.
+Auto-merging arch/arm/mach-omap2/clock3xxx_data.c
+Auto-merging arch/arm/mach-omap2/devices.c
+CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master f19713e] Merge remote branch 'crypto/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-omap2/clock2420_data.c | 2 +-
+ arch/arm/mach-omap2/clock2430_data.c | 2 +-
+ arch/arm/mach-omap2/clock3xxx_data.c | 2 +-
+ arch/arm/mach-omap2/devices.c | 57 ++-
+ arch/arm/plat-omap/include/plat/omap34xx.h | 5 +
+ arch/x86/crypto/aesni-intel_asm.S | 115 +++
+ arch/x86/crypto/aesni-intel_glue.c | 130 +++-
+ arch/x86/include/asm/inst.h | 96 ++-
+ crypto/algapi.c | 2 +-
+ crypto/internal.h | 2 +-
+ crypto/pcrypt.c | 11 +-
+ crypto/tcrypt.c | 7 +
+ crypto/tcrypt.h | 29 +
+ crypto/testmgr.h | 64 ++-
+ crypto/vmac.c | 75 +-
+ drivers/crypto/Kconfig | 9 +
+ drivers/crypto/Makefile | 2 +
+ drivers/crypto/geode-aes.c | 36 +-
+ drivers/crypto/mv_cesa.c | 692 ++++++++++++++--
+ drivers/crypto/mv_cesa.h | 40 +-
+ drivers/crypto/omap-sham.c | 1259 ++++++++++++++++++++++++++++
+ kernel/padata.c | 56 +-
+ 22 files changed, 2497 insertions(+), 196 deletions(-)
+ create mode 100644 drivers/crypto/omap-sham.c
+Merging sound/for-next
+$ git merge sound/for-next
+Auto-merging arch/arm/mach-davinci/board-dm365-evm.c
+Removing arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h
+Removing sound/isa/sb/es968.c
+Removing sound/soc/codecs/ad1938.c
+Removing sound/soc/codecs/ad1938.h
+Auto-merging sound/soc/pxa/Kconfig
+Removing sound/usb/usbaudio.c
+Merge made by recursive.
+ Documentation/DocBook/writing-an-alsa-driver.tmpl | 27 +-
+ Documentation/sound/alsa/ALSA-Configuration.txt | 31 +-
+ Documentation/sound/alsa/HD-Audio.txt | 4 +-
+ arch/arm/mach-davinci/board-dm365-evm.c | 4 +
+ arch/arm/mach-s3c2412/dma.c | 3 -
+ arch/arm/plat-omap/include/plat/mcbsp.h | 6 +
+ arch/arm/plat-omap/mcbsp.c | 55 +
+ .../plat-samsung/include/plat/regs-s3c2412-iis.h | 82 -
+ drivers/gpio/wm8994-gpio.c | 12 +
+ drivers/mfd/Kconfig | 8 +-
+ drivers/mfd/Makefile | 3 +-
+ drivers/mfd/davinci_voicecodec.c | 190 +
+ drivers/mfd/twl-core.c | 4 +-
+ drivers/mfd/wm831x-irq.c | 30 +
+ drivers/mfd/wm8994-core.c | 43 +-
+ drivers/mfd/wm8994-irq.c | 310 ++
+ include/linux/i2c/twl.h | 6 +-
+ include/linux/mfd/davinci_voicecodec.h | 126 +
+ include/linux/mfd/wm8350/audio.h | 2 +
+ include/linux/mfd/wm8994/core.h | 53 +-
+ include/linux/mfd/wm8994/pdata.h | 1 +
+ include/linux/usb/audio-v2.h | 378 ++
+ include/linux/usb/audio.h | 227 +-
+ include/sound/asound.h | 20 +-
+ include/sound/es1688.h | 11 +-
+ include/sound/info.h | 24 +-
+ include/sound/jack.h | 8 +
+ include/sound/soc-dai.h | 7 +-
+ include/sound/soc-dapm.h | 8 +-
+ include/sound/soc.h | 61 +-
+ include/sound/tlv320aic3x.h | 17 +
+ include/sound/tlv320dac33-plat.h | 1 +
+ include/sound/uda134x.h | 1 +
+ include/sound/version.h | 2 +-
+ include/sound/wm8903.h | 249 ++
+ include/sound/wm8904.h | 110 +-
+ include/sound/wm8960.h | 24 +
+ include/sound/wm9090.h | 28 +
+ sound/atmel/Kconfig | 2 +-
+ sound/atmel/ac97c.c | 355 ++-
+ sound/core/control.c | 5 +
+ sound/core/info.c | 72 +-
+ sound/core/jack.c | 71 +-
+ sound/core/oss/mixer_oss.c | 5 +
+ sound/core/oss/pcm_oss.c | 5 +
+ sound/core/pcm_native.c | 49 +-
+ sound/core/rawmidi.c | 5 +
+ sound/core/seq/seq_clientmgr.c | 6 +
+ sound/core/sound.c | 73 +-
+ sound/core/timer.c | 6 +
+ sound/drivers/opl4/opl4_proc.c | 83 +-
+ sound/i2c/i2c.c | 18 +-
+ sound/isa/Kconfig | 16 +-
+ sound/isa/es1688/es1688.c | 225 +-
+ sound/isa/es1688/es1688_lib.c | 47 +-
+ sound/isa/gus/gus_mem_proc.c | 48 +-
+ sound/isa/gus/gusextreme.c | 26 +-
+ sound/isa/sb/Makefile | 2 -
+ sound/isa/sb/es968.c | 248 --
+ sound/pci/Kconfig | 32 +
+ sound/pci/Makefile | 1 +
+ sound/pci/asihpi/Makefile | 5 +
+ sound/pci/asihpi/asihpi.c | 3002 +++++++++++++++
+ sound/pci/asihpi/hpi.h | 2001 ++++++++++
+ sound/pci/asihpi/hpi6000.c | 1840 +++++++++
+ sound/pci/asihpi/hpi6000.h | 70 +
+ sound/pci/asihpi/hpi6205.c | 2331 +++++++++++
+ sound/pci/asihpi/hpi6205.h | 93 +
+ sound/pci/asihpi/hpi_internal.h | 1641 ++++++++
+ sound/pci/asihpi/hpicmn.c | 643 ++++
+ sound/pci/asihpi/hpicmn.h | 64 +
+ sound/pci/asihpi/hpidebug.c | 225 ++
+ sound/pci/asihpi/hpidebug.h | 385 ++
+ sound/pci/asihpi/hpidspcd.c | 172 +
+ sound/pci/asihpi/hpidspcd.h | 104 +
+ sound/pci/asihpi/hpifunc.c | 3864 +++++++++++++++++++
+ sound/pci/asihpi/hpimsginit.c | 130 +
+ sound/pci/asihpi/hpimsginit.h | 40 +
+ sound/pci/asihpi/hpimsgx.c | 907 +++++
+ sound/pci/asihpi/hpimsgx.h | 36 +
+ sound/pci/asihpi/hpioctl.c | 484 +++
+ sound/pci/asihpi/hpioctl.h | 38 +
+ sound/pci/asihpi/hpios.c | 114 +
+ sound/pci/asihpi/hpios.h | 178 +
+ sound/pci/asihpi/hpipcida.h | 37 +
+ sound/pci/cs4281.c | 40 +-
+ sound/pci/cs46xx/cs46xx_lib.c | 19 +-
+ sound/pci/emu10k1/emuproc.c | 51 +-
+ sound/pci/es1968.c | 129 +-
+ sound/pci/hda/Kconfig | 1 +
+ sound/pci/hda/hda_codec.c | 76 +-
+ sound/pci/hda/hda_codec.h | 3 +
+ sound/pci/hda/hda_intel.c | 109 +-
+ sound/pci/hda/patch_analog.c | 21 +-
+ sound/pci/hda/patch_conexant.c | 157 +-
+ sound/pci/hda/patch_hdmi.c | 10 +-
+ sound/pci/hda/patch_intelhdmi.c | 21 +-
+ sound/pci/hda/patch_realtek.c | 236 +-
+ sound/pci/ice1712/aureon.c | 89 +-
+ sound/pci/maestro3.c | 139 +-
+ sound/pci/mixart/mixart.c | 79 +-
+ sound/ppc/tumbler.c | 12 +-
+ sound/soc/atmel/atmel-pcm.c | 14 +-
+ sound/soc/blackfin/Kconfig | 9 +-
+ sound/soc/blackfin/Makefile | 4 +-
+ .../blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} | 66 +-
+ sound/soc/blackfin/bf5xx-sport.h | 28 +-
+ sound/soc/codecs/Kconfig | 16 +-
+ sound/soc/codecs/Makefile | 10 +-
+ sound/soc/codecs/ad1836.c | 2 +-
+ sound/soc/codecs/ad1938.c | 522 ---
+ sound/soc/codecs/ad1938.h | 100 -
+ sound/soc/codecs/ad193x.c | 547 +++
+ sound/soc/codecs/ad193x.h | 81 +
+ sound/soc/codecs/ak4104.c | 2 +-
+ sound/soc/codecs/ak4535.c | 11 +-
+ sound/soc/codecs/ak4642.c | 177 +-
+ sound/soc/codecs/ak4671.c | 2 +-
+ sound/soc/codecs/cq93vc.c | 299 ++
+ sound/soc/codecs/cq93vc.h | 29 +
+ sound/soc/codecs/cs4270.c | 20 +-
+ sound/soc/codecs/cx20442.c | 2 +-
+ sound/soc/codecs/da7210.c | 157 +-
+ sound/soc/codecs/ssm2602.c | 17 +-
+ sound/soc/codecs/stac9766.c | 5 +-
+ sound/soc/codecs/tlv320aic23.c | 1 -
+ sound/soc/codecs/tlv320aic26.c | 14 +-
+ sound/soc/codecs/tlv320aic3x.c | 118 +-
+ sound/soc/codecs/tlv320dac33.c | 540 ++-
+ sound/soc/codecs/tpa6130a2.c | 47 +-
+ sound/soc/codecs/twl4030.c | 191 +-
+ sound/soc/codecs/twl6040.c | 1227 ++++++
+ sound/soc/codecs/twl6040.h | 141 +
+ sound/soc/codecs/uda134x.c | 29 +-
+ sound/soc/codecs/uda1380.c | 5 +-
+ sound/soc/codecs/wm8350.c | 103 +-
+ sound/soc/codecs/wm8350.h | 3 +
+ sound/soc/codecs/wm8400.c | 16 +-
+ sound/soc/codecs/wm8510.c | 2 +-
+ sound/soc/codecs/wm8523.c | 10 +-
+ sound/soc/codecs/wm8580.c | 4 +-
+ sound/soc/codecs/wm8711.c | 8 +-
+ sound/soc/codecs/wm8728.c | 2 +-
+ sound/soc/codecs/wm8731.c | 66 +-
+ sound/soc/codecs/wm8750.c | 347 +-
+ sound/soc/codecs/wm8753.c | 8 +-
+ sound/soc/codecs/wm8776.c | 6 +-
+ sound/soc/codecs/wm8900.c | 10 +-
+ sound/soc/codecs/wm8903.c | 217 +-
+ sound/soc/codecs/wm8903.h | 221 +--
+ sound/soc/codecs/wm8904.c | 59 +-
+ sound/soc/codecs/wm8904.h | 97 -
+ sound/soc/codecs/wm8940.c | 5 +-
+ sound/soc/codecs/wm8955.c | 16 +-
+ sound/soc/codecs/wm8960.c | 215 +-
+ sound/soc/codecs/wm8960.h | 11 -
+ sound/soc/codecs/wm8961.c | 6 +-
+ sound/soc/codecs/wm8971.c | 12 +-
+ sound/soc/codecs/wm8974.c | 6 +-
+ sound/soc/codecs/wm8978.c | 12 +-
+ sound/soc/codecs/wm8988.c | 8 +-
+ sound/soc/codecs/wm8990.c | 8 +-
+ sound/soc/codecs/wm8993.c | 24 +-
+ sound/soc/codecs/wm8994.c | 264 ++-
+ sound/soc/codecs/wm8994.h | 8 +
+ sound/soc/codecs/wm9081.c | 18 +-
+ sound/soc/codecs/wm9090.c | 773 ++++
+ sound/soc/codecs/wm9090.h | 715 ++++
+ sound/soc/codecs/wm9712.c | 3 -
+ sound/soc/codecs/wm9713.c | 16 +-
+ sound/soc/codecs/wm_hubs.c | 18 +-
+ sound/soc/davinci/Kconfig | 27 +-
+ sound/soc/davinci/Makefile | 2 +
+ sound/soc/davinci/davinci-evm.c | 61 +-
+ sound/soc/davinci/davinci-vcif.c | 274 ++
+ sound/soc/davinci/davinci-vcif.h | 28 +
+ sound/soc/imx/Kconfig | 8 +
+ sound/soc/imx/Makefile | 3 +
+ sound/soc/imx/wm1133-ev1.c | 308 ++
+ sound/soc/omap/Kconfig | 10 +
+ sound/soc/omap/Makefile | 2 +
+ sound/soc/omap/mcpdm.c | 548 ++--
+ sound/soc/omap/omap-mcbsp.c | 38 +-
+ sound/soc/omap/omap3pandora.c | 2 -
+ sound/soc/omap/rx51.c | 294 ++
+ sound/soc/omap/zoom2.c | 3 -
+ sound/soc/pxa/Kconfig | 8 +
+ sound/soc/pxa/Makefile | 2 +
+ sound/soc/pxa/spitz.c | 43 +-
+ sound/soc/pxa/z2.c | 246 ++
+ sound/soc/s3c24xx/Kconfig | 12 +-
+ sound/soc/s3c24xx/Makefile | 2 +
+ sound/soc/s3c24xx/jive_wm8750.c | 7 +-
+ sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 8 +
+ sound/soc/s3c24xx/regs-i2s-v2.h | 115 +
+ sound/soc/s3c24xx/s3c-i2s-v2.c | 205 +-
+ sound/soc/s3c24xx/s3c-i2s-v2.h | 15 +-
+ sound/soc/s3c24xx/s3c2412-i2s.c | 77 +-
+ sound/soc/s3c24xx/s3c2412-i2s.h | 6 +-
+ sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 209 +
+ sound/soc/s3c24xx/s3c64xx-i2s.c | 69 +-
+ sound/soc/s3c24xx/s3c64xx-i2s.h | 18 +-
+ sound/soc/s3c24xx/smdk64xx_wm8580.c | 6 +-
+ sound/soc/sh/Kconfig | 3 +-
+ sound/soc/sh/fsi-ak4642.c | 14 +
+ sound/soc/sh/fsi.c | 191 +-
+ sound/soc/soc-cache.c | 134 +-
+ sound/soc/soc-core.c | 255 +-
+ sound/soc/soc-dapm.c | 217 +-
+ sound/soc/soc-jack.c | 43 +-
+ sound/usb/Kconfig | 4 +-
+ sound/usb/Makefile | 26 +-
+ sound/usb/caiaq/control.c | 99 +-
+ sound/usb/caiaq/device.c | 8 +-
+ sound/usb/caiaq/device.h | 24 +-
+ sound/usb/caiaq/input.c | 163 +-
+ sound/usb/card.c | 652 ++++
+ sound/usb/card.h | 105 +
+ sound/usb/debug.h | 15 +
+ sound/usb/endpoint.c | 362 ++
+ sound/usb/endpoint.h | 11 +
+ sound/usb/format.c | 432 +++
+ sound/usb/format.h | 8 +
+ sound/usb/helper.c | 113 +
+ sound/usb/helper.h | 32 +
+ sound/usb/{usbmidi.c => midi.c} | 3 +-
+ sound/usb/midi.h | 48 +
+ sound/usb/misc/Makefile | 2 +
+ sound/usb/{ => misc}/ua101.c | 3 +-
+ sound/usb/{usbmixer.c => mixer.c} | 933 ++---
+ sound/usb/mixer.h | 55 +
+ sound/usb/{usbmixer_maps.c => mixer_maps.c} | 4 +-
+ sound/usb/mixer_quirks.c | 412 ++
+ sound/usb/mixer_quirks.h | 13 +
+ sound/usb/pcm.c | 935 +++++
+ sound/usb/pcm.h | 14 +
+ sound/usb/proc.c | 168 +
+ sound/usb/proc.h | 8 +
+ sound/usb/{usbquirks.h => quirks-table.h} | 68 +-
+ sound/usb/quirks.c | 594 +++
+ sound/usb/quirks.h | 23 +
+ sound/usb/urb.c | 995 +++++
+ sound/usb/urb.h | 21 +
+ sound/usb/usbaudio.c | 4050 --------------------
+ sound/usb/usbaudio.h | 93 +-
+ sound/usb/usx2y/us122l.c | 1 +
+ sound/usb/usx2y/usbusx2y.h | 1 +
+ 247 files changed, 36402 insertions(+), 8531 deletions(-)
+ delete mode 100644 arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h
+ create mode 100644 drivers/mfd/davinci_voicecodec.c
+ create mode 100644 drivers/mfd/wm8994-irq.c
+ create mode 100644 include/linux/mfd/davinci_voicecodec.h
+ create mode 100644 include/linux/usb/audio-v2.h
+ create mode 100644 include/sound/tlv320aic3x.h
+ create mode 100644 include/sound/wm8903.h
+ create mode 100644 include/sound/wm8960.h
+ create mode 100644 include/sound/wm9090.h
+ delete mode 100644 sound/isa/sb/es968.c
+ create mode 100644 sound/pci/asihpi/Makefile
+ create mode 100644 sound/pci/asihpi/asihpi.c
+ create mode 100644 sound/pci/asihpi/hpi.h
+ create mode 100644 sound/pci/asihpi/hpi6000.c
+ create mode 100644 sound/pci/asihpi/hpi6000.h
+ create mode 100644 sound/pci/asihpi/hpi6205.c
+ create mode 100644 sound/pci/asihpi/hpi6205.h
+ create mode 100644 sound/pci/asihpi/hpi_internal.h
+ create mode 100644 sound/pci/asihpi/hpicmn.c
+ create mode 100644 sound/pci/asihpi/hpicmn.h
+ create mode 100644 sound/pci/asihpi/hpidebug.c
+ create mode 100644 sound/pci/asihpi/hpidebug.h
+ create mode 100644 sound/pci/asihpi/hpidspcd.c
+ create mode 100644 sound/pci/asihpi/hpidspcd.h
+ create mode 100644 sound/pci/asihpi/hpifunc.c
+ create mode 100644 sound/pci/asihpi/hpimsginit.c
+ create mode 100644 sound/pci/asihpi/hpimsginit.h
+ create mode 100644 sound/pci/asihpi/hpimsgx.c
+ create mode 100644 sound/pci/asihpi/hpimsgx.h
+ create mode 100644 sound/pci/asihpi/hpioctl.c
+ create mode 100644 sound/pci/asihpi/hpioctl.h
+ create mode 100644 sound/pci/asihpi/hpios.c
+ create mode 100644 sound/pci/asihpi/hpios.h
+ create mode 100644 sound/pci/asihpi/hpipcida.h
+ rename sound/soc/blackfin/{bf5xx-ad1938.c => bf5xx-ad193x.c} (65%)
+ delete mode 100644 sound/soc/codecs/ad1938.c
+ delete mode 100644 sound/soc/codecs/ad1938.h
+ create mode 100644 sound/soc/codecs/ad193x.c
+ create mode 100644 sound/soc/codecs/ad193x.h
+ create mode 100644 sound/soc/codecs/cq93vc.c
+ create mode 100644 sound/soc/codecs/cq93vc.h
+ create mode 100644 sound/soc/codecs/twl6040.c
+ create mode 100644 sound/soc/codecs/twl6040.h
+ create mode 100644 sound/soc/codecs/wm9090.c
+ create mode 100644 sound/soc/codecs/wm9090.h
+ create mode 100644 sound/soc/davinci/davinci-vcif.c
+ create mode 100644 sound/soc/davinci/davinci-vcif.h
+ create mode 100644 sound/soc/imx/wm1133-ev1.c
+ create mode 100644 sound/soc/omap/rx51.c
+ create mode 100644 sound/soc/pxa/z2.c
+ create mode 100644 sound/soc/s3c24xx/regs-i2s-v2.h
+ create mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c
+ create mode 100644 sound/usb/card.c
+ create mode 100644 sound/usb/card.h
+ create mode 100644 sound/usb/debug.h
+ create mode 100644 sound/usb/endpoint.c
+ create mode 100644 sound/usb/endpoint.h
+ create mode 100644 sound/usb/format.c
+ create mode 100644 sound/usb/format.h
+ create mode 100644 sound/usb/helper.c
+ create mode 100644 sound/usb/helper.h
+ rename sound/usb/{usbmidi.c => midi.c} (99%)
+ create mode 100644 sound/usb/midi.h
+ create mode 100644 sound/usb/misc/Makefile
+ rename sound/usb/{ => misc}/ua101.c (99%)
+ rename sound/usb/{usbmixer.c => mixer.c} (72%)
+ create mode 100644 sound/usb/mixer.h
+ rename sound/usb/{usbmixer_maps.c => mixer_maps.c} (98%)
+ create mode 100644 sound/usb/mixer_quirks.c
+ create mode 100644 sound/usb/mixer_quirks.h
+ create mode 100644 sound/usb/pcm.c
+ create mode 100644 sound/usb/pcm.h
+ create mode 100644 sound/usb/proc.c
+ create mode 100644 sound/usb/proc.h
+ rename sound/usb/{usbquirks.h => quirks-table.h} (97%)
+ create mode 100644 sound/usb/quirks.c
+ create mode 100644 sound/usb/quirks.h
+ create mode 100644 sound/usb/urb.c
+ create mode 100644 sound/usb/urb.h
+ delete mode 100644 sound/usb/usbaudio.c
+Merging cpufreq/next
+$ git merge cpufreq/next
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+Merge made by recursive.
+ Documentation/feature-removal-schedule.txt | 10 --------
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +
+ drivers/cpufreq/cpufreq.c | 10 ++------
+ drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------
+ include/linux/cpufreq.h | 5 ----
+ 5 files changed, 23 insertions(+), 37 deletions(-)
+Merging quilt/rr
+$ git merge quilt/rr
+Resolved 'drivers/net/virtio_net.c' using previous resolution.
+Resolved 'drivers/net/wireless/libertas_tf/if_usb.c' using previous resolution.
+Resolved 'include/linux/mod_devicetable.h' using previous resolution.
+Resolved 'scripts/mod/file2alias.c' using previous resolution.
+Auto-merging drivers/input/mouse/psmouse-base.c
+Auto-merging drivers/message/fusion/mptbase.c
+Auto-merging drivers/net/myri10ge/myri10ge.c
+Auto-merging drivers/net/virtio_net.c
+CONFLICT (content): Merge conflict in drivers/net/virtio_net.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
+CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/if_usb.c
+Auto-merging drivers/scsi/bfa/bfad.c
+Auto-merging include/linux/mod_devicetable.h
+CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h
+Auto-merging kernel/module.c
+Auto-merging net/sunrpc/xprtsock.c
+Auto-merging scripts/mod/file2alias.c
+CONFLICT (content): Merge conflict in scripts/mod/file2alias.c
+Auto-merging scripts/mod/modpost.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master fe7ab75] 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 | 46 ++-
+ drivers/char/hvc_iucv.c | 9 +-
+ drivers/char/hw_random/virtio-rng.c | 6 +-
+ drivers/char/ipmi/ipmi_watchdog.c | 42 ++-
+ drivers/char/virtio_console.c | 700 ++++++++++++++++-------------
+ drivers/ide/ide.c | 20 +-
+ drivers/input/misc/ati_remote2.c | 26 +-
+ drivers/input/mouse/psmouse-base.c | 14 +-
+ drivers/isdn/hisax/hisax_fcpcipnp.c | 3 +-
+ drivers/message/fusion/mptbase.c | 3 +-
+ drivers/misc/lkdtm.c | 4 +-
+ drivers/net/myri10ge/myri10ge.c | 54 ++-
+ drivers/net/virtio_net.c | 49 +-
+ 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 +
+ drivers/virtio/virtio_balloon.c | 17 +-
+ drivers/virtio/virtio_ring.c | 44 +-
+ fs/nfs/callback.c | 11 +-
+ include/linux/isapnp.h | 8 +-
+ include/linux/mod_devicetable.h | 7 +
+ include/linux/moduleparam.h | 282 +++++++++---
+ include/linux/virtio.h | 55 ++-
+ include/linux/virtio_blk.h | 5 +
+ include/linux/virtio_console.h | 25 +
+ init/main.c | 8 +-
+ kernel/module.c | 57 ++-
+ kernel/params.c | 233 +++++++---
+ net/9p/trans_virtio.c | 6 +-
+ net/mac80211/rate.c | 2 +
+ net/sunrpc/xprtsock.c | 26 +-
+ scripts/mod/file2alias.c | 17 +
+ scripts/mod/modpost.c | 13 +
+ 43 files changed, 1229 insertions(+), 676 deletions(-)
+Merging mmc/next
+$ git merge mmc/next
+Already up-to-date.
+Merging input/next
+$ git merge input/next
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Auto-merging drivers/input/keyboard/Kconfig
+Auto-merging drivers/input/keyboard/Makefile
+Auto-merging drivers/input/tablet/wacom_sys.c
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging include/linux/input.h
+Auto-merging kernel/sysctl.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 88c5302] Merge remote branch 'input/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/char/keyboard.c | 325 ++++----
+ drivers/char/sysrq.c | 243 +++++-
+ drivers/input/keyboard/Kconfig | 16 +
+ drivers/input/keyboard/Makefile | 1 +
+ drivers/input/keyboard/lm8323.c | 6 +-
+ drivers/input/keyboard/tca6416-keypad.c | 349 ++++++++
+ drivers/input/misc/Kconfig | 40 +
+ drivers/input/misc/Makefile | 4 +
+ drivers/input/misc/ad714x-i2c.c | 140 ++++
+ drivers/input/misc/ad714x-spi.c | 103 +++
+ drivers/input/misc/ad714x.c | 1347 +++++++++++++++++++++++++++++++
+ drivers/input/misc/ad714x.h | 26 +
+ drivers/input/misc/pcf8574_keypad.c | 227 ++++++
+ drivers/input/tablet/acecad.c | 86 +--
+ drivers/input/tablet/kbtab.c | 53 +-
+ drivers/input/tablet/wacom.h | 36 +-
+ drivers/input/tablet/wacom_sys.c | 316 +++-----
+ drivers/input/tablet/wacom_wac.c | 1168 +++++++++++++++------------
+ drivers/input/tablet/wacom_wac.h | 13 +-
+ drivers/input/touchscreen/Kconfig | 12 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/hampshire.c | 205 +++++
+ drivers/input/touchscreen/tsc2007.c | 2 +
+ include/linux/input.h | 1 +
+ include/linux/input/ad714x.h | 63 ++
+ include/linux/serio.h | 1 +
+ include/linux/sysrq.h | 23 +-
+ include/linux/tca6416_keypad.h | 34 +
+ kernel/sysctl.c | 23 +-
+ 29 files changed, 3789 insertions(+), 1075 deletions(-)
+ create mode 100644 drivers/input/keyboard/tca6416-keypad.c
+ create mode 100644 drivers/input/misc/ad714x-i2c.c
+ create mode 100644 drivers/input/misc/ad714x-spi.c
+ create mode 100644 drivers/input/misc/ad714x.c
+ create mode 100644 drivers/input/misc/ad714x.h
+ create mode 100644 drivers/input/misc/pcf8574_keypad.c
+ create mode 100644 drivers/input/touchscreen/hampshire.c
+ create mode 100644 include/linux/input/ad714x.h
+ create mode 100644 include/linux/tca6416_keypad.h
+Merging lsm/for-next
+$ git merge lsm/for-next
+Already up-to-date.
+Merging block/for-next
+$ git merge block/for-next
+Recorded preimage for 'fs/fs-writeback.c'
+Resolved 'fs/ext3/fsync.c' using previous resolution.
+Resolved 'fs/ext4/fsync.c' using previous resolution.
+Auto-merging block/blk-cgroup.c
+Auto-merging block/cfq-iosched.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/ext3/fsync.c
+CONFLICT (content): Merge conflict in fs/ext3/fsync.c
+Auto-merging fs/ext4/fsync.c
+CONFLICT (content): Merge conflict in fs/ext4/fsync.c
+Auto-merging fs/fs-writeback.c
+CONFLICT (content): Merge conflict in fs/fs-writeback.c
+Auto-merging fs/gfs2/rgrp.c
+Auto-merging fs/nilfs2/the_nilfs.c
+Auto-merging fs/sync.c
+Auto-merging fs/xfs/linux-2.6/xfs_super.c
+Auto-merging include/linux/fs.h
+Auto-merging init/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/fs-writeback.c'.
+[master 55c411c] Merge remote branch 'block/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroups/blkio-controller.txt | 151 +++++-
+ block/Kconfig | 23 -
+ block/Kconfig.iosched | 16 +-
+ block/Makefile | 2 +-
+ block/blk-barrier.c | 147 +-----
+ block/blk-cgroup.c | 791 +++++++++++++++++++++++++---
+ block/blk-cgroup.h | 178 ++++++-
+ block/blk-core.c | 46 ++-
+ block/blk-lib.c | 233 ++++++++
+ block/cfq-iosched.c | 80 +++-
+ block/elevator.c | 11 +
+ block/genhd.c | 1 +
+ block/ioctl.c | 2 +-
+ drivers/block/Kconfig | 22 +-
+ drivers/block/drbd/drbd_int.h | 3 +-
+ drivers/block/drbd/drbd_receiver.c | 3 +-
+ fs/block_dev.c | 257 ++++++++--
+ fs/btrfs/extent-tree.c | 2 +-
+ fs/ext3/fsync.c | 3 +-
+ fs/ext4/fsync.c | 6 +-
+ fs/fs-writeback.c | 77 +++-
+ fs/gfs2/rgrp.c | 5 +-
+ fs/jbd2/checkpoint.c | 3 +-
+ fs/jbd2/commit.c | 6 +-
+ fs/nilfs2/the_nilfs.c | 4 +-
+ fs/reiserfs/file.c | 3 +-
+ fs/sync.c | 2 +-
+ fs/xfs/linux-2.6/xfs_super.c | 3 +-
+ include/linux/backing-dev.h | 5 +-
+ include/linux/blkdev.h | 67 ++-
+ include/linux/elevator.h | 6 +
+ include/linux/fs.h | 1 +
+ include/linux/writeback.h | 13 +-
+ init/Kconfig | 27 +
+ kernel/sched_clock.c | 1 +
+ mm/page-writeback.c | 36 +-
+ mm/swapfile.c | 9 +-
+ 37 files changed, 1841 insertions(+), 404 deletions(-)
+ create mode 100644 block/blk-lib.c
+$ git reset --hard HEAD^
+HEAD is now at 88c5302 Merge remote branch 'input/next'
+Merging refs/next/20100517/block
+$ git merge refs/next/20100517/block
+Resolved 'fs/ext3/fsync.c' using previous resolution.
+Resolved 'fs/ext4/fsync.c' using previous resolution.
+Auto-merging block/blk-cgroup.c
+Auto-merging block/cfq-iosched.c
+Auto-merging fs/block_dev.c
+Auto-merging fs/ext3/fsync.c
+CONFLICT (content): Merge conflict in fs/ext3/fsync.c
+Auto-merging fs/ext4/fsync.c
+CONFLICT (content): Merge conflict in fs/ext4/fsync.c
+Auto-merging fs/gfs2/rgrp.c
+Auto-merging fs/nilfs2/the_nilfs.c
+Auto-merging fs/xfs/linux-2.6/xfs_super.c
+Auto-merging include/linux/fs.h
+Auto-merging init/Kconfig
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master e7a01e9] Merge commit 'refs/next/20100517/block'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/cgroups/blkio-controller.txt | 151 +++++-
+ block/Kconfig | 23 -
+ block/Kconfig.iosched | 16 +-
+ block/Makefile | 2 +-
+ block/blk-barrier.c | 147 +-----
+ block/blk-cgroup.c | 791 +++++++++++++++++++++++++---
+ block/blk-cgroup.h | 178 ++++++-
+ block/blk-core.c | 46 ++-
+ block/blk-lib.c | 233 ++++++++
+ block/cfq-iosched.c | 80 +++-
+ block/elevator.c | 11 +
+ block/genhd.c | 1 +
+ block/ioctl.c | 2 +-
+ drivers/block/Kconfig | 22 +-
+ drivers/block/drbd/drbd_int.h | 3 +-
+ drivers/block/drbd/drbd_receiver.c | 3 +-
+ fs/block_dev.c | 257 ++++++++--
+ fs/btrfs/extent-tree.c | 2 +-
+ fs/ext3/fsync.c | 3 +-
+ fs/ext4/fsync.c | 6 +-
+ fs/gfs2/rgrp.c | 5 +-
+ fs/jbd2/checkpoint.c | 3 +-
+ fs/jbd2/commit.c | 6 +-
+ fs/nilfs2/the_nilfs.c | 4 +-
+ fs/reiserfs/file.c | 3 +-
+ fs/xfs/linux-2.6/xfs_super.c | 3 +-
+ include/linux/backing-dev.h | 3 +
+ include/linux/blkdev.h | 67 ++-
+ include/linux/elevator.h | 6 +
+ include/linux/fs.h | 1 +
+ include/linux/writeback.h | 3 +-
+ init/Kconfig | 27 +
+ kernel/sched_clock.c | 1 +
+ mm/page-writeback.c | 34 +-
+ mm/swapfile.c | 9 +-
+ 35 files changed, 1768 insertions(+), 384 deletions(-)
+ create mode 100644 block/blk-lib.c
+Merging quilt/device-mapper
+$ git merge quilt/device-mapper
+Merge made by recursive.
+ Documentation/device-mapper/dm-flakey.txt | 18 +++
+ drivers/md/Kconfig | 6 +
+ drivers/md/Makefile | 1 +
+ drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++
+ drivers/md/dm-ioctl.c | 3 +-
+ 5 files changed, 240 insertions(+), 2 deletions(-)
+ create mode 100644 Documentation/device-mapper/dm-flakey.txt
+ create mode 100644 drivers/md/dm-flakey.c
+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
+Resolved 'drivers/mtd/maps/pcmciamtd.c' using previous resolution.
+Resolved 'drivers/net/pcmcia/3c589_cs.c' using previous resolution.
+Resolved 'drivers/net/wireless/orinoco/orinoco_cs.c' using previous resolution.
+Resolved 'drivers/net/wireless/orinoco/spectrum_cs.c' using previous resolution.
+Auto-merging drivers/mtd/maps/pcmciamtd.c
+CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
+Auto-merging drivers/net/pcmcia/3c574_cs.c
+Auto-merging drivers/net/pcmcia/3c589_cs.c
+CONFLICT (content): Merge conflict in drivers/net/pcmcia/3c589_cs.c
+Auto-merging drivers/net/pcmcia/axnet_cs.c
+Auto-merging drivers/net/pcmcia/fmvj18x_cs.c
+Auto-merging drivers/net/pcmcia/ibmtr_cs.c
+Auto-merging drivers/net/pcmcia/nmclan_cs.c
+Auto-merging drivers/net/pcmcia/smc91c92_cs.c
+Auto-merging drivers/net/pcmcia/xirc2ps_cs.c
+Auto-merging drivers/net/wireless/orinoco/orinoco_cs.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/orinoco_cs.c
+Auto-merging drivers/net/wireless/orinoco/spectrum_cs.c
+CONFLICT (content): Merge conflict in drivers/net/wireless/orinoco/spectrum_cs.c
+Auto-merging drivers/net/wireless/ray_cs.c
+Auto-merging drivers/net/wireless/wl3501_cs.c
+Auto-merging drivers/pcmcia/Kconfig
+Auto-merging drivers/pcmcia/Makefile
+Auto-merging drivers/ssb/main.c
+Auto-merging drivers/staging/wavelan/wavelan_cs.c
+Removing include/pcmcia/mem_op.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 965f6f6] Merge remote branch 'pcmcia/master'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/pcmcia/driver-changes.txt | 13 +
+ drivers/ata/pata_pcmcia.c | 47 +--
+ drivers/bluetooth/bluecard_cs.c | 11 +-
+ drivers/bluetooth/bt3c_cs.c | 11 +-
+ drivers/bluetooth/btuart_cs.c | 11 +-
+ drivers/bluetooth/dtl1_cs.c | 11 +-
+ drivers/char/pcmcia/cm4000_cs.c | 9 +-
+ drivers/char/pcmcia/cm4040_cs.c | 5 -
+ drivers/char/pcmcia/ipwireless/main.c | 19 +-
+ drivers/char/pcmcia/ipwireless/main.h | 1 -
+ drivers/char/pcmcia/ipwireless/tty.c | 19 +-
+ drivers/char/pcmcia/ipwireless/tty.h | 3 +-
+ drivers/char/pcmcia/synclink_cs.c | 22 +-
+ drivers/ide/ide-cs.c | 20 +-
+ drivers/isdn/hardware/avm/avm_cs.c | 76 +---
+ drivers/isdn/hisax/avma1_cs.c | 63 +--
+ drivers/isdn/hisax/elsa_cs.c | 40 +--
+ drivers/isdn/hisax/sedlbauer_cs.c | 60 +--
+ drivers/isdn/hisax/teles_cs.c | 50 +--
+ drivers/mtd/maps/pcmciamtd.c | 3 -
+ drivers/net/pcmcia/3c574_cs.c | 15 +-
+ drivers/net/pcmcia/3c589_cs.c | 16 +-
+ drivers/net/pcmcia/axnet_cs.c | 21 +-
+ drivers/net/pcmcia/com20020_cs.c | 29 +-
+ drivers/net/pcmcia/fmvj18x_cs.c | 18 +-
+ drivers/net/pcmcia/ibmtr_cs.c | 16 +-
+ drivers/net/pcmcia/nmclan_cs.c | 14 +-
+ drivers/net/pcmcia/pcnet_cs.c | 16 +-
+ drivers/net/pcmcia/smc91c92_cs.c | 17 +-
+ drivers/net/pcmcia/xirc2ps_cs.c | 36 +--
+ drivers/net/wireless/airo_cs.c | 72 +---
+ drivers/net/wireless/atmel_cs.c | 70 +---
+ drivers/net/wireless/b43/pcmcia.c | 5 +-
+ drivers/net/wireless/hostap/hostap_cs.c | 38 +-
+ drivers/net/wireless/libertas/if_cs.c | 21 +-
+ drivers/net/wireless/orinoco/orinoco_cs.c | 27 +-
+ drivers/net/wireless/orinoco/spectrum_cs.c | 27 +-
+ drivers/net/wireless/ray_cs.c | 15 +-
+ drivers/net/wireless/ray_cs.h | 1 -
+ drivers/net/wireless/wl3501.h | 1 -
+ drivers/net/wireless/wl3501_cs.c | 23 +-
+ drivers/parport/parport_cs.c | 13 +-
+ drivers/pcmcia/Kconfig | 22 +-
+ drivers/pcmcia/Makefile | 9 +-
+ drivers/pcmcia/bfin_cf_pcmcia.c | 2 +-
+ drivers/pcmcia/cardbus.c | 1 -
+ drivers/pcmcia/cistpl.c | 121 +----
+ drivers/pcmcia/cs.c | 1 -
+ drivers/pcmcia/cs_internal.h | 22 +-
+ drivers/pcmcia/ds.c | 34 +-
+ drivers/pcmcia/omap_cf.c | 2 +-
+ drivers/pcmcia/pcmcia_cis.c | 356 ++++++++++++
+ drivers/pcmcia/pcmcia_ioctl.c | 23 +-
+ drivers/pcmcia/pcmcia_resource.c | 634 ++++++----------------
+ drivers/pcmcia/rsrc_iodyn.c | 172 ++++++
+ drivers/pcmcia/rsrc_mgr.c | 112 +----
+ drivers/pcmcia/rsrc_nonstatic.c | 164 +++++--
+ drivers/pcmcia/yenta_socket.c | 7 -
+ drivers/scsi/pcmcia/aha152x_stub.c | 9 +-
+ drivers/scsi/pcmcia/fdomain_stub.c | 9 +-
+ drivers/scsi/pcmcia/nsp_cs.c | 23 +-
+ drivers/scsi/pcmcia/nsp_cs.h | 1 -
+ drivers/scsi/pcmcia/qlogic_stub.c | 13 +-
+ drivers/scsi/pcmcia/sym53c500_cs.c | 9 +-
+ drivers/serial/serial_cs.c | 36 +-
+ drivers/ssb/main.c | 2 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 45 +--
+ drivers/staging/comedi/drivers/das08_cs.c | 35 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 42 +--
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 42 +--
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 42 +--
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 19 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 45 +--
+ drivers/staging/netwave/netwave_cs.c | 9 +-
+ drivers/staging/wavelan/wavelan_cs.c | 15 +-
+ drivers/staging/wlags49_h2/wl_cs.c | 9 +-
+ drivers/telephony/ixj_pcmcia.c | 3 -
+ drivers/usb/host/sl811_cs.c | 28 +-
+ include/pcmcia/cs.h | 19 +-
+ include/pcmcia/ds.h | 29 +-
+ include/pcmcia/mem_op.h | 116 ----
+ include/pcmcia/ss.h | 7 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.c | 12 +-
+ sound/pcmcia/pdaudiocf/pdaudiocf.h | 1 -
+ sound/pcmcia/vx/vxpocket.c | 10 +-
+ sound/pcmcia/vx/vxpocket.h | 1 -
+ 86 files changed, 1179 insertions(+), 2139 deletions(-)
+ create mode 100644 drivers/pcmcia/pcmcia_cis.c
+ create mode 100644 drivers/pcmcia/rsrc_iodyn.c
+ delete mode 100644 include/pcmcia/mem_op.h
+Merging battery/master
+$ git merge battery/master
+Merge made by recursive.
+ drivers/power/Kconfig | 10 +-
+ drivers/power/Makefile | 1 +
+ drivers/power/ds2782_battery.c | 194 +++++++++++++++++-------
+ drivers/power/pda_power.c | 10 ++
+ drivers/power/tosa_battery.c | 4 +-
+ drivers/power/wm831x_power.c | 33 ++--
+ drivers/power/wm97xx_battery.c | 3 +
+ drivers/power/z2_battery.c | 328 ++++++++++++++++++++++++++++++++++++++++
+ include/linux/ds2782_battery.h | 8 +
+ include/linux/pda_power.h | 2 +
+ include/linux/z2_battery.h | 17 ++
+ 11 files changed, 537 insertions(+), 73 deletions(-)
+ create mode 100644 drivers/power/z2_battery.c
+ create mode 100644 include/linux/ds2782_battery.h
+ create mode 100644 include/linux/z2_battery.h
+Merging leds/for-mm
+$ git merge leds/for-mm
+Merge made by recursive.
+ drivers/leds/leds-88pm860x.c | 11 ++++++++---
+ 1 files changed, 8 insertions(+), 3 deletions(-)
+Merging backlight/for-mm
+$ git merge backlight/for-mm
+Merge made by recursive.
+ drivers/video/backlight/88pm860x_bl.c | 1 +
+ drivers/video/backlight/Kconfig | 101 +++--
+ drivers/video/backlight/Makefile | 2 +
+ drivers/video/backlight/adp8860_bl.c | 809 +++++++++++++++++++++++++++++++
+ drivers/video/backlight/adx_bl.c | 4 +-
+ drivers/video/backlight/ep93xx_bl.c | 160 ++++++
+ drivers/video/backlight/l4f00242t03.c | 4 +-
+ drivers/video/backlight/mbp_nvidia_bl.c | 92 ++++-
+ include/linux/i2c/adp8860.h | 137 ++++++
+ 9 files changed, 1261 insertions(+), 49 deletions(-)
+ create mode 100644 drivers/video/backlight/adp8860_bl.c
+ create mode 100644 drivers/video/backlight/ep93xx_bl.c
+ create mode 100644 include/linux/i2c/adp8860.h
+$ git reset --hard HEAD^
+HEAD is now at 2dc28ca Merge remote branch 'leds/for-mm'
+Merging refs/next/20100507/backlight
+$ git merge refs/next/20100507/backlight
+Merge made by recursive.
+ drivers/video/backlight/Kconfig | 79 ++++++++++++++-----------------
+ drivers/video/backlight/adx_bl.c | 4 +-
+ drivers/video/backlight/mbp_nvidia_bl.c | 45 +++++++++++++++++
+ 3 files changed, 82 insertions(+), 46 deletions(-)
+Merging kgdb/kgdb-next
+$ git merge kgdb/kgdb-next
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/include/asm/kmap_types.h
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/powerpc/kernel/traps.c
+Auto-merging arch/sparc/kernel/kgdb_64.c
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/kernel/kgdb.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/traps.c
+Auto-merging drivers/serial/8250.c
+Auto-merging drivers/serial/amba-pl011.c
+Auto-merging drivers/serial/sh-sci.c
+Auto-merging init/main.c
+Auto-merging kernel/kallsyms.c
+Removing kernel/kgdb.c
+Auto-merging kernel/module.c
+Auto-merging kernel/sched.c
+Merge made by recursive.
+ Documentation/DocBook/kgdb.tmpl | 692 ++++++--
+ Documentation/kernel-parameters.txt | 31 +-
+ MAINTAINERS | 6 +-
+ arch/arm/include/asm/kmap_types.h | 1 +
+ arch/arm/kernel/kgdb.c | 5 +
+ arch/blackfin/kernel/kgdb.c | 5 +
+ arch/mips/include/asm/kgdb.h | 2 +
+ arch/mips/kernel/kgdb.c | 27 +-
+ arch/mips/kernel/traps.c | 13 +
+ arch/powerpc/include/asm/kmap_types.h | 1 +
+ arch/powerpc/kernel/kgdb.c | 11 +-
+ arch/powerpc/kernel/traps.c | 7 +-
+ arch/sh/kernel/kgdb.c | 14 +-
+ arch/sparc/kernel/kgdb_32.c | 6 +
+ arch/sparc/kernel/kgdb_64.c | 6 +
+ arch/x86/include/asm/kgdb.h | 3 +
+ arch/x86/include/asm/processor.h | 2 +
+ arch/x86/kernel/cpu/common.c | 29 +-
+ arch/x86/kernel/early_printk.c | 8 +
+ arch/x86/kernel/kgdb.c | 103 +-
+ arch/x86/kernel/setup.c | 1 +
+ arch/x86/kernel/traps.c | 20 +-
+ drivers/serial/8250.c | 4 +-
+ drivers/serial/amba-pl011.c | 6 +-
+ drivers/serial/kgdboc.c | 94 +-
+ drivers/serial/sh-sci.c | 6 +-
+ drivers/serial/sunzilog.c | 50 +
+ drivers/usb/early/ehci-dbgp.c | 120 ++-
+ include/asm-generic/kmap_types.h | 3 +-
+ include/linux/kdb.h | 117 ++
+ include/linux/kgdb.h | 55 +-
+ include/linux/serial_core.h | 1 +
+ init/main.c | 2 +
+ kernel/Makefile | 2 +-
+ kernel/debug/Makefile | 6 +
+ kernel/debug/debug_core.c | 982 ++++++++++++
+ kernel/debug/debug_core.h | 81 +
+ kernel/debug/gdbstub.c | 1017 ++++++++++++
+ kernel/debug/kdb/.gitignore | 1 +
+ kernel/debug/kdb/Makefile | 25 +
+ kernel/debug/kdb/kdb_bp.c | 564 +++++++
+ kernel/debug/kdb/kdb_bt.c | 210 +++
+ kernel/debug/kdb/kdb_cmds | 35 +
+ kernel/debug/kdb/kdb_debugger.c | 169 ++
+ kernel/debug/kdb/kdb_io.c | 826 ++++++++++
+ kernel/debug/kdb/kdb_keyboard.c | 212 +++
+ kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++
+ kernel/debug/kdb/kdb_private.h | 300 ++++
+ kernel/debug/kdb/kdb_support.c | 927 +++++++++++
+ kernel/kallsyms.c | 21 +
+ kernel/kgdb.c | 1764 --------------------
+ kernel/module.c | 4 +
+ kernel/printk.c | 25 +
+ kernel/sched.c | 7 +-
+ kernel/signal.c | 40 +
+ lib/Kconfig.kgdb | 24 +-
+ 56 files changed, 9495 insertions(+), 2050 deletions(-)
+ create mode 100644 include/linux/kdb.h
+ create mode 100644 kernel/debug/Makefile
+ create mode 100644 kernel/debug/debug_core.c
+ create mode 100644 kernel/debug/debug_core.h
+ create mode 100644 kernel/debug/gdbstub.c
+ create mode 100644 kernel/debug/kdb/.gitignore
+ create mode 100644 kernel/debug/kdb/Makefile
+ create mode 100644 kernel/debug/kdb/kdb_bp.c
+ create mode 100644 kernel/debug/kdb/kdb_bt.c
+ create mode 100644 kernel/debug/kdb/kdb_cmds
+ create mode 100644 kernel/debug/kdb/kdb_debugger.c
+ create mode 100644 kernel/debug/kdb/kdb_io.c
+ create mode 100644 kernel/debug/kdb/kdb_keyboard.c
+ create mode 100644 kernel/debug/kdb/kdb_main.c
+ create mode 100644 kernel/debug/kdb/kdb_private.h
+ create mode 100644 kernel/debug/kdb/kdb_support.c
+ delete mode 100644 kernel/kgdb.c
+$ git am -3 ../patches/0001-kgdb-update-for-sysrq-handling-change.patch
+Applying: kgdb: update for sysrq handling change
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/debug/kdb/kdb_main.c
+$ git add .
+$ git commit -v -a --amend
+[master d4a8357] Merge remote branch 'kgdb/kgdb-next'
+$ git am -3 ../patches/kdb__update_gfp_slab.h_includes
+Applying: kdb: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/debug/kdb/kdb_main.c
+$ git add .
+$ git commit -v -a --amend
+[master c56b1bd] Merge remote branch 'kgdb/kgdb-next'
+Merging slab/for-next
+$ git merge slab/for-next
+Auto-merging mm/slub.c
+Merge made by recursive.
+ mm/slab.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++--------------
+ mm/slub.c | 38 +++++++++----
+ 2 files changed, 160 insertions(+), 52 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/Kconfig
+Auto-merging drivers/md/bitmap.c
+Auto-merging drivers/md/faulty.c
+Auto-merging drivers/md/linear.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/md/multipath.c
+Auto-merging drivers/md/raid0.c
+Auto-merging drivers/md/raid1.c
+Auto-merging drivers/md/raid10.c
+Auto-merging drivers/md/raid5.c
+Merge made by recursive.
+ drivers/md/Kconfig | 4 +-
+ drivers/md/bitmap.c | 41 ++++-
+ drivers/md/bitmap.h | 2 +
+ drivers/md/faulty.c | 9 +-
+ drivers/md/linear.c | 36 ++--
+ drivers/md/md.c | 492 ++++++++++++++++++++++++++++++------------------
+ drivers/md/md.h | 10 +-
+ drivers/md/multipath.c | 13 +-
+ drivers/md/raid0.c | 251 +++++++++++++++++++------
+ drivers/md/raid0.h | 3 +
+ drivers/md/raid1.c | 109 ++++++-----
+ drivers/md/raid10.c | 299 +++++++++++++++++++----------
+ drivers/md/raid10.h | 12 ++
+ drivers/md/raid5.c | 231 +++++++++++++----------
+ 14 files changed, 958 insertions(+), 554 deletions(-)
+Merging mfd/for-next
+$ git merge mfd/for-next
+Recorded preimage for 'drivers/dma/timb_dma.c'
+Resolved 'drivers/dma/Makefile' using previous resolution.
+Auto-merging arch/arm/mach-davinci/board-da850-evm.c
+Removing arch/x86/include/asm/rdc321x_defs.h
+Auto-merging drivers/dma/Kconfig
+Auto-merging drivers/dma/Makefile
+CONFLICT (content): Merge conflict in drivers/dma/Makefile
+Auto-merging drivers/dma/timb_dma.c
+CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c
+Auto-merging drivers/input/touchscreen/Kconfig
+Auto-merging drivers/input/touchscreen/Makefile
+Auto-merging drivers/mfd/Kconfig
+Auto-merging drivers/mfd/Makefile
+Auto-merging drivers/mfd/wm831x-irq.c
+Removing include/linux/mfd/ab3100.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/dma/timb_dma.c'.
+[master 76ae0c2] Merge remote branch 'mfd/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm/mach-davinci/board-da850-evm.c | 19 +-
+ arch/arm/mach-u300/i2c.c | 57 +-
+ arch/arm/mach-u300/include/mach/irqs.h | 7 +
+ arch/x86/include/asm/rdc321x_defs.h | 12 -
+ drivers/gpio/Kconfig | 26 +
+ drivers/gpio/Makefile | 5 +-
+ drivers/gpio/janz-ttl.c | 258 +++++
+ drivers/gpio/rdc321x-gpio.c | 246 +++++
+ drivers/gpio/tc35892-gpio.c | 381 +++++++
+ drivers/input/touchscreen/Kconfig | 13 +
+ drivers/input/touchscreen/Makefile | 1 +
+ drivers/input/touchscreen/tps6507x-ts.c | 400 +++++++
+ drivers/mfd/88pm860x-core.c | 42 +-
+ drivers/mfd/88pm860x-i2c.c | 1 +
+ drivers/mfd/Kconfig | 78 ++-
+ drivers/mfd/Makefile | 11 +-
+ drivers/mfd/ab3100-core.c | 99 ++-
+ drivers/mfd/ab3100-otp.c | 13 +-
+ drivers/mfd/ab3550-core.c | 1401 +++++++++++++++++++++++
+ drivers/mfd/abx500-core.c | 157 +++
+ drivers/mfd/da903x.c | 1 +
+ drivers/mfd/janz-cmodio.c | 304 +++++
+ drivers/mfd/max8925-core.c | 7 +-
+ drivers/mfd/menelaus.c | 3 +-
+ drivers/mfd/mfd-core.c | 2 +-
+ drivers/mfd/pcf50633-adc.c | 39 +-
+ drivers/mfd/pcf50633-core.c | 345 +------
+ drivers/mfd/pcf50633-irq.c | 318 ++++++
+ drivers/mfd/rdc321x-southbridge.c | 123 +++
+ drivers/mfd/t7l66xb.c | 3 +
+ drivers/mfd/tc35892.c | 347 ++++++
+ drivers/mfd/timberdale.c | 138 +++-
+ drivers/mfd/timberdale.h | 16 +-
+ drivers/mfd/tps65010.c | 2 +-
+ drivers/mfd/tps6507x.c | 159 +++
+ drivers/mfd/wm831x-core.c | 112 ++-
+ drivers/mfd/wm831x-irq.c | 18 +-
+ drivers/mfd/wm8350-i2c.c | 6 +-
+ drivers/mfd/wm8400-core.c | 4 +-
+ drivers/net/can/Kconfig | 10 +
+ drivers/net/can/Makefile | 1 +
+ drivers/net/can/janz-ican3.c | 1830 +++++++++++++++++++++++++++++++
+ drivers/regulator/88pm8607.c | 533 ++++-----
+ drivers/regulator/ab3100.c | 35 +-
+ drivers/regulator/tps6507x-regulator.c | 373 +++----
+ drivers/rtc/rtc-ab3100.c | 41 +-
+ drivers/watchdog/rdc321x_wdt.c | 53 +-
+ include/linux/input/tps6507x-ts.h | 24 +
+ include/linux/mfd/88pm860x.h | 7 +-
+ include/linux/mfd/ab3100.h | 129 ---
+ include/linux/mfd/abx500.h | 233 ++++
+ include/linux/mfd/janz.h | 54 +
+ include/linux/mfd/rdc321x.h | 26 +
+ include/linux/mfd/tc35892.h | 132 +++
+ include/linux/mfd/tps6507x.h | 169 +++
+ include/linux/mfd/wm831x/core.h | 5 +-
+ 56 files changed, 7637 insertions(+), 1192 deletions(-)
+ delete mode 100644 arch/x86/include/asm/rdc321x_defs.h
+ create mode 100644 drivers/gpio/janz-ttl.c
+ create mode 100644 drivers/gpio/rdc321x-gpio.c
+ create mode 100644 drivers/gpio/tc35892-gpio.c
+ create mode 100644 drivers/input/touchscreen/tps6507x-ts.c
+ create mode 100644 drivers/mfd/ab3550-core.c
+ create mode 100644 drivers/mfd/abx500-core.c
+ create mode 100644 drivers/mfd/janz-cmodio.c
+ create mode 100644 drivers/mfd/pcf50633-irq.c
+ create mode 100644 drivers/mfd/rdc321x-southbridge.c
+ create mode 100644 drivers/mfd/tc35892.c
+ create mode 100644 drivers/mfd/tps6507x.c
+ create mode 100644 drivers/net/can/janz-ican3.c
+ create mode 100644 include/linux/input/tps6507x-ts.h
+ delete mode 100644 include/linux/mfd/ab3100.h
+ create mode 100644 include/linux/mfd/abx500.h
+ create mode 100644 include/linux/mfd/janz.h
+ create mode 100644 include/linux/mfd/rdc321x.h
+ create mode 100644 include/linux/mfd/tc35892.h
+ create mode 100644 include/linux/mfd/tps6507x.h
+Merging hdlc/hdlc-next
+$ git merge hdlc/hdlc-next
+Already up-to-date.
+Merging drm/drm-next
+$ git merge drm/drm-next
+Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution.
+Resolved 'drivers/gpu/drm/radeon/r300.c' using previous resolution.
+Auto-merging drivers/gpu/drm/drm_sysfs.c
+Auto-merging drivers/gpu/drm/i915/i915_dma.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_reg.h
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/radeon/atombios.h
+Auto-merging drivers/gpu/drm/radeon/r100.c
+Auto-merging drivers/gpu/drm/radeon/r300.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r300.c
+Auto-merging drivers/gpu/drm/radeon/r420.c
+Auto-merging drivers/gpu/drm/radeon/radeon_atombios.c
+Auto-merging drivers/gpu/drm/radeon/radeon_connectors.c
+Auto-merging drivers/gpu/drm/radeon/radeon_display.c
+Auto-merging drivers/gpu/drm/radeon/radeon_encoders.c
+Auto-merging drivers/gpu/drm/radeon/radeon_mode.h
+Auto-merging drivers/gpu/drm/ttm/ttm_bo.c
+Auto-merging include/drm/ttm/ttm_bo_driver.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 0e04be0] Merge remote branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/DocBook/Makefile | 2 +-
+ Documentation/DocBook/drm.tmpl | 839 +++++++++++++
+ arch/x86/include/asm/cacheflush.h | 2 +
+ arch/x86/mm/pageattr.c | 53 +-
+ drivers/char/agp/agp.h | 80 --
+ drivers/char/agp/ali-agp.c | 1 +
+ drivers/char/agp/amd-k7-agp.c | 9 +
+ drivers/char/agp/amd64-agp.c | 1 +
+ drivers/char/agp/ati-agp.c | 8 +
+ drivers/char/agp/efficeon-agp.c | 1 +
+ drivers/char/agp/intel-agp.c | 1883 ++--------------------------
+ drivers/char/agp/intel-agp.h | 239 ++++
+ drivers/char/agp/intel-gtt.c | 1516 ++++++++++++++++++++++
+ drivers/char/agp/nvidia-agp.c | 1 +
+ drivers/char/agp/sis-agp.c | 1 +
+ drivers/char/agp/uninorth-agp.c | 16 +-
+ drivers/char/agp/via-agp.c | 2 +
+ drivers/gpu/drm/Kconfig | 1 +
+ drivers/gpu/drm/drm_crtc.c | 9 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 395 +------
+ drivers/gpu/drm/drm_edid.c | 789 ++++++++----
+ drivers/gpu/drm/drm_fb_helper.c | 913 ++++++++++----
+ drivers/gpu/drm/drm_gem.c | 49 +-
+ drivers/gpu/drm/drm_modes.c | 105 +-
+ drivers/gpu/drm/drm_sysfs.c | 2 +-
+ drivers/gpu/drm/i915/dvo.h | 10 -
+ drivers/gpu/drm/i915/dvo_ch7017.c | 46 +-
+ drivers/gpu/drm/i915/dvo_ch7xxx.c | 44 +-
+ drivers/gpu/drm/i915/dvo_ivch.c | 21 -
+ drivers/gpu/drm/i915/dvo_sil164.c | 38 -
+ drivers/gpu/drm/i915/dvo_tfp410.c | 32 -
+ drivers/gpu/drm/i915/i915_debugfs.c | 15 +-
+ drivers/gpu/drm/i915/i915_dma.c | 6 +-
+ drivers/gpu/drm/i915/i915_drv.c | 29 +
+ drivers/gpu/drm/i915/i915_drv.h | 28 +-
+ drivers/gpu/drm/i915/i915_gem.c | 80 +-
+ drivers/gpu/drm/i915/i915_gem_debug.c | 2 +-
+ drivers/gpu/drm/i915/i915_irq.c | 22 +-
+ drivers/gpu/drm/i915/i915_reg.h | 138 ++
+ drivers/gpu/drm/i915/i915_suspend.c | 41 +-
+ drivers/gpu/drm/i915/i915_trace.h | 86 +-
+ drivers/gpu/drm/i915/intel_crt.c | 88 +-
+ drivers/gpu/drm/i915/intel_display.c | 986 +++++++++++-----
+ drivers/gpu/drm/i915/intel_dp.c | 254 +++--
+ drivers/gpu/drm/i915/intel_drv.h | 31 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 103 +-
+ drivers/gpu/drm/i915/intel_fb.c | 204 ++--
+ drivers/gpu/drm/i915/intel_hdmi.c | 70 +-
+ drivers/gpu/drm/i915/intel_lvds.c | 111 +--
+ drivers/gpu/drm/i915/intel_modes.c | 21 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 8 +-
+ drivers/gpu/drm/i915/intel_sdvo.c | 933 +++++++-------
+ drivers/gpu/drm/i915/intel_tv.c | 185 +---
+ drivers/gpu/drm/nouveau/nouveau_bo.c | 114 ++-
+ drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 +
+ drivers/gpu/drm/nouveau/nouveau_display.c | 41 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.c | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +
+ drivers/gpu/drm/nouveau/nouveau_fb.h | 6 +-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 198 ++-
+ drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19 +-
+ drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +-
+ drivers/gpu/drm/nouveau/nouveau_irq.c | 10 +-
+ drivers/gpu/drm/nouveau/nouveau_state.c | 5 +-
+ drivers/gpu/drm/nouveau/nv04_fbcon.c | 16 +-
+ drivers/gpu/drm/nouveau/nv50_display.c | 3 +
+ drivers/gpu/drm/nouveau/nv50_fbcon.c | 16 +-
+ drivers/gpu/drm/radeon/atombios.h | 76 ++-
+ drivers/gpu/drm/radeon/atombios_crtc.c | 8 +-
+ drivers/gpu/drm/radeon/evergreen.c | 1494 +++++++++++++++++++++-
+ drivers/gpu/drm/radeon/evergreend.h | 556 ++++++++
+ drivers/gpu/drm/radeon/r100.c | 253 +++--
+ drivers/gpu/drm/radeon/r100d.h | 128 ++
+ drivers/gpu/drm/radeon/r300.c | 148 ++--
+ drivers/gpu/drm/radeon/r300d.h | 47 +-
+ drivers/gpu/drm/radeon/r420.c | 4 +-
+ drivers/gpu/drm/radeon/r520.c | 5 +-
+ drivers/gpu/drm/radeon/r600.c | 192 ++-
+ drivers/gpu/drm/radeon/r600_audio.c | 58 +-
+ drivers/gpu/drm/radeon/r600_blit_kms.c | 3 +
+ drivers/gpu/drm/radeon/r600_hdmi.c | 65 +-
+ drivers/gpu/drm/radeon/r600_reg.h | 57 +-
+ drivers/gpu/drm/radeon/radeon.h | 128 ++-
+ drivers/gpu/drm/radeon/radeon_asic.c | 56 +-
+ drivers/gpu/drm/radeon/radeon_asic.h | 26 +-
+ drivers/gpu/drm/radeon/radeon_atombios.c | 44 +-
+ drivers/gpu/drm/radeon/radeon_combios.c | 8 +-
+ drivers/gpu/drm/radeon/radeon_connectors.c | 50 +-
+ drivers/gpu/drm/radeon/radeon_cs.c | 4 -
+ drivers/gpu/drm/radeon/radeon_device.c | 33 +-
+ drivers/gpu/drm/radeon/radeon_display.c | 42 +-
+ drivers/gpu/drm/radeon/radeon_encoders.c | 39 +
+ drivers/gpu/drm/radeon/radeon_fb.c | 352 +++---
+ drivers/gpu/drm/radeon/radeon_fence.c | 107 +-
+ drivers/gpu/drm/radeon/radeon_gart.c | 2 +-
+ drivers/gpu/drm/radeon/radeon_gem.c | 6 +-
+ drivers/gpu/drm/radeon/radeon_irq_kms.c | 2 +
+ drivers/gpu/drm/radeon/radeon_mode.h | 24 +-
+ drivers/gpu/drm/radeon/radeon_object.c | 32 +-
+ drivers/gpu/drm/radeon/radeon_object.h | 2 +-
+ drivers/gpu/drm/radeon/radeon_ttm.c | 116 ++-
+ drivers/gpu/drm/radeon/rs400.c | 6 +-
+ drivers/gpu/drm/radeon/rs600.c | 77 ++-
+ drivers/gpu/drm/radeon/rs600d.h | 46 +
+ drivers/gpu/drm/radeon/rs690.c | 6 +-
+ drivers/gpu/drm/radeon/rv515.c | 96 +--
+ drivers/gpu/drm/radeon/rv515d.h | 46 +
+ drivers/gpu/drm/radeon/rv770.c | 21 +-
+ drivers/gpu/drm/ttm/Makefile | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 84 +-
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 122 +-
+ drivers/gpu/drm/ttm/ttm_bo_vm.c | 41 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 7 +-
+ drivers/gpu/drm/ttm/ttm_page_alloc.c | 845 +++++++++++++
+ drivers/gpu/drm/ttm/ttm_tt.c | 44 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 50 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +-
+ include/drm/drmP.h | 3 +
+ include/drm/drm_crtc.h | 24 +-
+ include/drm/drm_crtc_helper.h | 6 +-
+ include/drm/drm_edid.h | 3 -
+ include/drm/drm_fb_helper.h | 76 +-
+ include/drm/ttm/ttm_bo_api.h | 29 +-
+ include/drm/ttm/ttm_bo_driver.h | 57 +-
+ include/drm/ttm/ttm_page_alloc.h | 74 ++
+ 128 files changed, 11125 insertions(+), 5830 deletions(-)
+ create mode 100644 Documentation/DocBook/drm.tmpl
+ create mode 100644 drivers/char/agp/intel-agp.h
+ create mode 100644 drivers/char/agp/intel-gtt.c
+ create mode 100644 drivers/gpu/drm/radeon/evergreend.h
+ create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c
+ create mode 100644 include/drm/ttm/ttm_page_alloc.h
+Merging viafb/viafb-next
+$ git merge viafb/viafb-next
+Auto-merging drivers/video/Kconfig
+Auto-merging drivers/video/via/viafbdev.c
+Merge made by recursive.
+ drivers/video/Kconfig | 16 +
+ drivers/video/via/Makefile | 4 +-
+ drivers/video/via/accel.c | 137 +++--
+ drivers/video/via/accel.h | 40 ++
+ drivers/video/via/chip.h | 8 +
+ drivers/video/via/dvi.c | 37 +-
+ drivers/video/via/global.h | 1 -
+ drivers/video/via/hw.c | 307 ++--------
+ drivers/video/via/hw.h | 20 +-
+ drivers/video/via/ioctl.h | 2 +-
+ drivers/video/via/lcd.c | 31 +-
+ drivers/video/via/lcd.h | 2 +
+ drivers/video/via/share.h | 20 +-
+ drivers/video/via/via-core.c | 668 ++++++++++++++++++++
+ drivers/video/via/via-gpio.c | 285 +++++++++
+ drivers/video/via/via_i2c.c | 232 +++++--
+ drivers/video/via/via_modesetting.c | 126 ++++
+ drivers/video/via/{via_i2c.h => via_modesetting.h} | 42 +-
+ drivers/video/via/via_utility.c | 1 +
+ drivers/video/via/viafbdev.c | 181 +++---
+ drivers/video/via/viafbdev.h | 14 +-
+ drivers/video/via/viamode.c | 15 +
+ drivers/video/via/vt1636.c | 34 +-
+ drivers/video/via/vt1636.h | 2 +-
+ include/linux/via-core.h | 219 +++++++
+ include/linux/via-gpio.h | 14 +
+ {drivers/video/via => include/linux}/via_i2c.h | 24 +-
+ 27 files changed, 1884 insertions(+), 598 deletions(-)
+ create mode 100644 drivers/video/via/via-core.c
+ create mode 100644 drivers/video/via/via-gpio.c
+ create mode 100644 drivers/video/via/via_modesetting.c
+ copy drivers/video/via/{via_i2c.h => via_modesetting.h} (53%)
+ create mode 100644 include/linux/via-core.h
+ create mode 100644 include/linux/via-gpio.h
+ rename {drivers/video/via => include/linux}/via_i2c.h (65%)
+Merging voltage/for-next
+$ git merge voltage/for-next
+Auto-merging drivers/mfd/88pm860x-core.c
+Auto-merging drivers/regulator/ab3100.c
+Auto-merging drivers/regulator/mc13783-regulator.c
+Auto-merging include/linux/mfd/88pm860x.h
+Merge made by recursive.
+ drivers/regulator/ab3100.c | 10 +++
+ drivers/regulator/bq24022.c | 1 +
+ drivers/regulator/core.c | 83 ++++++++++++--------
+ drivers/regulator/mc13783-regulator.c | 6 +-
+ drivers/regulator/twl-regulator.c | 138 ++++++++++++++++++++++-----------
+ include/linux/regulator/machine.h | 9 ++-
+ 6 files changed, 163 insertions(+), 84 deletions(-)
+Merging security-testing/next
+$ git merge security-testing/next
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging fs/inode.c
+Auto-merging fs/namespace.c
+Auto-merging kernel/acct.c
+Auto-merging security/selinux/hooks.c
+Merge made by recursive.
+ Documentation/credentials.txt | 14 +-
+ Documentation/kernel-parameters.txt | 10 +
+ drivers/char/tpm/Kconfig | 6 +-
+ drivers/char/tpm/tpm.c | 47 ++++-
+ drivers/char/tpm/tpm_tis.c | 40 ++--
+ fs/inode.c | 2 -
+ fs/namespace.c | 13 -
+ include/linux/lsm_audit.h | 2 +-
+ include/linux/security.h | 180 --------------
+ kernel/acct.c | 20 +--
+ kernel/cred.c | 2 -
+ kernel/groups.c | 6 -
+ kernel/sys.c | 31 ---
+ scripts/selinux/genheaders/genheaders.c | 2 +-
+ security/capability.c | 76 +------
+ security/commoncap.c | 6 +-
+ security/device_cgroup.c | 2 +-
+ security/integrity/ima/Kconfig | 5 +-
+ security/integrity/ima/ima.h | 2 +-
+ security/integrity/ima/ima_audit.c | 2 +-
+ security/integrity/ima/ima_crypto.c | 4 +-
+ security/integrity/ima/ima_fs.c | 38 ++--
+ security/integrity/ima/ima_iint.c | 6 +-
+ security/integrity/ima/ima_init.c | 2 +-
+ security/integrity/ima/ima_main.c | 2 +-
+ security/integrity/ima/ima_policy.c | 107 +++++++---
+ security/integrity/ima/ima_queue.c | 4 +-
+ security/keys/internal.h | 11 +-
+ security/keys/key.c | 47 +++--
+ security/keys/keyctl.c | 65 +++---
+ security/keys/keyring.c | 273 +++++++++++++---------
+ security/keys/permission.c | 2 +-
+ security/keys/proc.c | 2 +-
+ security/keys/process_keys.c | 6 +-
+ security/keys/request_key.c | 55 ++++-
+ security/lsm_audit.c | 2 +-
+ security/security.c | 75 +------
+ security/selinux/avc.c | 3 +-
+ security/selinux/hooks.c | 66 +++---
+ security/selinux/include/initial_sid_to_string.h | 2 +-
+ security/selinux/include/netlabel.h | 8 +-
+ security/selinux/netlabel.c | 14 +-
+ security/selinux/netlink.c | 1 -
+ security/selinux/nlmsgtab.c | 1 -
+ security/selinux/selinuxfs.c | 44 ++--
+ security/selinux/ss/mls.c | 2 +-
+ security/selinux/ss/policydb.c | 7 +-
+ security/selinux/ss/services.c | 49 +++--
+ security/smack/smack_lsm.c | 11 -
+ security/tomoyo/Makefile | 2 +-
+ security/tomoyo/common.c | 157 +++++++++----
+ security/tomoyo/common.h | 121 +++++++++-
+ security/tomoyo/domain.c | 143 +++++-------
+ security/tomoyo/file.c | 250 ++++++++++----------
+ security/tomoyo/gc.c | 55 ++++-
+ security/tomoyo/path_group.c | 172 ++++++++++++++
+ security/tomoyo/realpath.c | 30 ++-
+ 57 files changed, 1246 insertions(+), 1061 deletions(-)
+ create mode 100644 security/tomoyo/path_group.c
+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
+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 Documentation/kernel-parameters.txt
+Merge made by recursive.
+ Documentation/kernel-parameters.txt | 15 +-
+ Documentation/watchdog/00-INDEX | 5 +
+ Documentation/watchdog/watchdog-parameters.txt | 390 ++++++++++++++++++++++++
+ Documentation/watchdog/wdt.txt | 15 +-
+ drivers/watchdog/bfin_wdt.c | 19 +--
+ drivers/watchdog/booke_wdt.c | 6 +-
+ drivers/watchdog/eurotechwdt.c | 1 -
+ drivers/watchdog/mpc8xxx_wdt.c | 2 +-
+ drivers/watchdog/pc87413_wdt.c | 9 +-
+ drivers/watchdog/pnx833x_wdt.c | 11 +-
+ drivers/watchdog/s3c2410_wdt.c | 6 +-
+ drivers/watchdog/shwdt.c | 2 +-
+ drivers/watchdog/twl4030_wdt.c | 2 +
+ drivers/watchdog/wdt.c | 2 +-
+ drivers/watchdog/wdt977.c | 2 +-
+ 15 files changed, 436 insertions(+), 51 deletions(-)
+ create mode 100644 Documentation/watchdog/watchdog-parameters.txt
+Merging bdev/master
+$ git merge bdev/master
+Already up-to-date.
+Merging dwmw2-iommu/master
+$ git merge dwmw2-iommu/master
+Auto-merging drivers/pci/dmar.c
+Auto-merging drivers/pci/intr_remapping.c
+Auto-merging include/linux/pci.h
+Merge made by recursive.
+ drivers/pci/dmar.c | 18 +++++++---
+ drivers/pci/intel-iommu.c | 80 +++++++++++++++++++-----------------------
+ drivers/pci/intr_remapping.c | 6 ++--
+ include/linux/pci.h | 10 +++++
+ 4 files changed, 62 insertions(+), 52 deletions(-)
+Merging cputime/cputime
+$ git merge cputime/cputime
+Already up-to-date.
+Merging osd/linux-next
+$ git merge osd/linux-next
+Auto-merging fs/exofs/inode.c
+Merge made by recursive.
+ fs/exofs/dir.c | 2 +-
+ fs/exofs/inode.c | 30 ++++++++++++++++++++++++++++++
+ 2 files changed, 31 insertions(+), 1 deletions(-)
+Merging jc_docs/docs-next
+$ git merge jc_docs/docs-next
+Merge made by recursive.
+ Documentation/00-INDEX | 2 +
+ Documentation/padata.txt | 107 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 109 insertions(+), 0 deletions(-)
+ create mode 100644 Documentation/padata.txt
+Merging nommu/master
+$ git merge nommu/master
+Already up-to-date.
+Merging trivial/for-next
+$ git merge trivial/for-next
+Auto-merging Documentation/DocBook/libata.tmpl
+Auto-merging Documentation/cgroups/cgroups.txt
+Auto-merging Documentation/filesystems/proc.txt
+Auto-merging Documentation/kprobes.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/arm/mach-s3c2443/clock.c
+Auto-merging arch/arm/plat-samsung/include/plat/gpio-core.h
+Auto-merging arch/s390/include/asm/thread_info.h
+Auto-merging arch/um/drivers/line.c
+Auto-merging arch/x86/include/asm/thread_info.h
+Auto-merging drivers/acpi/osl.c
+Auto-merging drivers/firewire/ohci.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/radeon/atombios.h
+Auto-merging drivers/macintosh/windfarm_pm81.c
+Auto-merging drivers/net/ps3_gelic_wireless.c
+Auto-merging drivers/net/smsc911x.c
+Auto-merging drivers/pci/pci.c
+Auto-merging drivers/regulator/core.c
+Auto-merging drivers/usb/host/ehci-omap.c
+Auto-merging fs/logfs/logfs.h
+Auto-merging fs/omfs/inode.c
+Auto-merging include/linux/i2c/twl.h
+Auto-merging kernel/cgroup.c
+Auto-merging mm/memcontrol.c
+Auto-merging net/ipv4/ipmr.c
+Auto-merging scripts/kconfig/util.c
+Auto-merging scripts/package/mkspec
+Merge made by recursive.
+ Documentation/ABI/testing/sysfs-devices-memory | 2 +-
+ Documentation/DMA-API-HOWTO.txt | 2 +-
+ Documentation/DocBook/libata.tmpl | 2 +-
+ Documentation/PCI/pci-error-recovery.txt | 4 +-
+ Documentation/Smack.txt | 2 +-
+ Documentation/arm/SA1100/ADSBitsy | 2 +-
+ Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | 2 +-
+ Documentation/atomic_ops.txt | 2 +-
+ Documentation/blackfin/bfin-gpio-notes.txt | 2 +-
+ Documentation/cachetlb.txt | 6 +-
+ Documentation/cgroups/cgroups.txt | 2 +-
+ Documentation/cgroups/cpusets.txt | 38 +++++++-------
+ Documentation/cgroups/memcg_test.txt | 2 +-
+ Documentation/cgroups/memory.txt | 2 +-
+ Documentation/connector/connector.txt | 2 +-
+ Documentation/dvb/ci.txt | 2 +-
+ Documentation/dvb/contributors.txt | 2 +-
+ Documentation/filesystems/Locking | 4 +-
+ .../filesystems/autofs4-mount-control.txt | 2 +-
+ Documentation/filesystems/ceph.txt | 2 +-
+ Documentation/filesystems/dlmfs.txt | 2 +-
+ Documentation/filesystems/fiemap.txt | 12 ++--
+ Documentation/filesystems/fuse.txt | 4 +-
+ Documentation/filesystems/hpfs.txt | 2 +-
+ Documentation/filesystems/logfs.txt | 8 ++--
+ Documentation/filesystems/nfs/rpc-cache.txt | 2 +-
+ Documentation/filesystems/proc.txt | 6 +-
+ Documentation/filesystems/smbfs.txt | 2 +-
+ Documentation/filesystems/vfs.txt | 2 +-
+ Documentation/hwmon/lm85 | 2 +-
+ Documentation/input/joystick.txt | 2 +-
+ Documentation/intel_txt.txt | 2 +-
+ Documentation/kbuild/kconfig.txt | 2 +-
+ Documentation/kernel-docs.txt | 10 ++--
+ Documentation/kprobes.txt | 2 +-
+ Documentation/laptops/laptop-mode.txt | 2 +-
+ Documentation/lguest/lguest.c | 2 +-
+ Documentation/md.txt | 2 +-
+ Documentation/netlabel/lsm_interface.txt | 2 +-
+ Documentation/networking/ifenslave.c | 2 +-
+ Documentation/networking/packet_mmap.txt | 4 +-
+ Documentation/power/regulator/consumer.txt | 10 ++--
+ Documentation/power/regulator/machine.txt | 2 +-
+ Documentation/power/regulator/overview.txt | 6 +-
+ Documentation/powerpc/booting-without-of.txt | 2 +-
+ Documentation/powerpc/dts-bindings/xilinx.txt | 2 +-
+ Documentation/powerpc/phyp-assisted-dump.txt | 2 +-
+ Documentation/rt-mutex-design.txt | 2 +-
+ Documentation/scsi/ChangeLog.lpfc | 4 +-
+ Documentation/scsi/FlashPoint.txt | 2 +-
+ Documentation/scsi/dtc3x80.txt | 2 +-
+ Documentation/scsi/ncr53c8xx.txt | 2 +-
+ Documentation/scsi/osst.txt | 2 +-
+ Documentation/scsi/scsi_fc_transport.txt | 4 +-
+ Documentation/scsi/sym53c8xx_2.txt | 2 +-
+ Documentation/sound/alsa/soc/dapm.txt | 4 +-
+ Documentation/sound/alsa/soc/machine.txt | 2 +-
+ Documentation/sound/alsa/soc/overview.txt | 2 +-
+ Documentation/sparse.txt | 4 +-
+ Documentation/sysfs-rules.txt | 2 +-
+ Documentation/trace/events.txt | 8 ++--
+ Documentation/usb/WUSB-Design-overview.txt | 2 +-
+ Documentation/vm/numa_memory_policy.txt | 4 +-
+ Documentation/w1/w1.generic | 2 +-
+ MAINTAINERS | 8 +--
+ arch/alpha/include/asm/thread_info.h | 2 +-
+ arch/arm/include/asm/thread_info.h | 2 +-
+ arch/arm/mach-s3c2443/clock.c | 2 +-
+ arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +-
+ arch/avr32/include/asm/thread_info.h | 2 +-
+ arch/blackfin/include/asm/thread_info.h | 2 +-
+ arch/cris/include/asm/thread_info.h | 2 +-
+ arch/frv/include/asm/thread_info.h | 2 +-
+ arch/h8300/include/asm/thread_info.h | 2 +-
+ arch/ia64/include/asm/thread_info.h | 2 +-
+ arch/m32r/include/asm/thread_info.h | 2 +-
+ arch/m68k/include/asm/thread_info_mm.h | 2 +-
+ arch/m68k/include/asm/thread_info_no.h | 2 +-
+ arch/microblaze/include/asm/thread_info.h | 2 +-
+ arch/mips/include/asm/thread_info.h | 2 +-
+ arch/mips/sibyte/bcm1480/irq.c | 2 +-
+ arch/mips/sibyte/sb1250/irq.c | 2 +-
+ arch/mn10300/include/asm/thread_info.h | 2 +-
+ arch/parisc/include/asm/thread_info.h | 2 +-
+ arch/powerpc/include/asm/thread_info.h | 2 +-
+ arch/powerpc/platforms/embedded6xx/wii.c | 4 +-
+ arch/s390/include/asm/thread_info.h | 2 +-
+ arch/score/include/asm/thread_info.h | 2 +-
+ arch/sh/include/asm/thread_info.h | 2 +-
+ arch/sparc/include/asm/thread_info_32.h | 2 +-
+ arch/sparc/include/asm/thread_info_64.h | 2 +-
+ arch/um/drivers/line.c | 1 -
+ arch/um/include/asm/system.h | 3 -
+ arch/um/include/asm/thread_info.h | 7 +--
+ arch/um/kernel/skas/syscall.c | 4 +-
+ arch/um/sys-i386/asm/elf.h | 2 +
+ arch/um/sys-x86_64/asm/elf.h | 2 +
+ arch/um/sys-x86_64/signal.c | 3 +-
+ arch/x86/include/asm/percpu.h | 2 +-
+ arch/x86/include/asm/thread_info.h | 2 +-
+ arch/xtensa/include/asm/thread_info.h | 2 +-
+ crypto/Kconfig | 2 +-
+ drivers/acpi/osl.c | 4 +-
+ drivers/acpi/power.c | 1 -
+ drivers/ata/ata_piix.c | 2 +-
+ drivers/block/cciss.c | 3 +-
+ drivers/char/agp/generic.c | 2 +-
+ drivers/char/bsr.c | 2 +-
+ drivers/firewire/ohci.c | 2 +-
+ drivers/gpu/drm/drm_bufs.c | 2 +-
+ drivers/gpu/drm/i915/intel_display.c | 4 +-
+ drivers/gpu/drm/radeon/atombios.h | 4 +-
+ drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +-
+ drivers/infiniband/hw/ipath/ipath_iba6120.c | 4 +-
+ drivers/infiniband/hw/ipath/ipath_iba7220.c | 2 +-
+ drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +-
+ drivers/isdn/hisax/hfc4s8s_l1.c | 2 +-
+ drivers/macintosh/windfarm_pm81.c | 2 +-
+ drivers/media/dvb/dvb-usb/friio-fe.c | 2 +-
+ drivers/message/i2o/i2o_config.c | 16 ++----
+ drivers/misc/eeprom/eeprom.c | 36 ++++++--------
+ drivers/misc/eeprom/eeprom_93cx6.c | 39 ++++++---------
+ drivers/misc/eeprom/max6875.c | 52 ++++++++++----------
+ drivers/net/bnx2x_hsi.h | 2 +-
+ drivers/net/ps3_gelic_wireless.c | 2 +-
+ drivers/net/smsc911x.c | 4 +-
+ drivers/pci/hotplug/cpqphp_core.c | 2 +-
+ drivers/pci/pci.c | 2 +-
+ drivers/pci/pci.h | 2 +-
+ drivers/ps3/ps3-sys-manager.c | 2 +-
+ drivers/regulator/core.c | 2 +-
+ drivers/rtc/rtc-rx8581.c | 6 +-
+ drivers/rtc/rtc-stk17ta8.c | 4 +-
+ drivers/s390/char/sclp_cpi_sys.c | 2 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 +-
+ drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 +-
+ drivers/spi/spi_mpc8xxx.c | 2 +-
+ drivers/staging/vt6655/rxtx.c | 14 +++---
+ drivers/staging/vt6656/rxtx.c | 6 +-
+ drivers/usb/host/ehci-omap.c | 2 +-
+ drivers/usb/wusbcore/wa-xfer.c | 2 +-
+ drivers/video/cobalt_lcdfb.c | 2 +-
+ drivers/virtio/virtio_pci.c | 2 +-
+ drivers/vlynq/Kconfig | 2 +-
+ fs/jbd2/journal.c | 2 +-
+ fs/jfs/jfs_dmap.c | 2 +-
+ fs/logfs/dir.c | 2 +-
+ fs/logfs/logfs.h | 2 +-
+ fs/logfs/logfs_abi.h | 10 ++--
+ fs/omfs/inode.c | 1 -
+ include/linux/i2c/twl.h | 8 ++--
+ include/linux/kfifo.h | 4 +-
+ include/linux/kobj_map.h | 9 +++
+ include/linux/kref.h | 2 +-
+ include/linux/rtc-v3020.h | 2 +-
+ kernel/cgroup.c | 2 +-
+ mm/memcontrol.c | 2 +-
+ mm/page_alloc.c | 2 +-
+ net/ipv4/ipmr.c | 2 +-
+ net/wimax/op-rfkill.c | 2 +-
+ scripts/kconfig/util.c | 2 +-
+ scripts/package/mkspec | 2 +-
+ sound/pci/emu10k1/emu10k1_main.c | 2 +-
+ sound/pci/hda/hda_local.h | 2 +-
+ 164 files changed, 312 insertions(+), 327 deletions(-)
+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
+Auto-merging drivers/base/platform.c
+Auto-merging drivers/i2c/i2c-core.c
+Auto-merging drivers/net/e1000e/netdev.c
+Auto-merging drivers/net/igbvf/netdev.c
+Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/netdevice.h
+Auto-merging net/mac80211/mlme.c
+Auto-merging sound/core/pcm_native.c
+Merge made by recursive.
+ Documentation/power/devices.txt | 847 +++++++++++++++++-------------
+ Documentation/power/pm_qos_interface.txt | 48 +-
+ Documentation/power/userland-swsusp.txt | 4 +
+ drivers/acpi/processor_idle.c | 2 +-
+ drivers/base/platform.c | 6 +-
+ drivers/base/power/runtime.c | 10 +-
+ drivers/base/power/sysfs.c | 65 +++-
+ drivers/cpuidle/governors/ladder.c | 2 +-
+ drivers/cpuidle/governors/menu.c | 2 +-
+ drivers/i2c/i2c-core.c | 166 ++++---
+ drivers/net/e1000e/netdev.c | 22 +-
+ drivers/net/igbvf/netdev.c | 6 +-
+ drivers/net/wireless/ipw2x00/ipw2100.c | 11 +-
+ fs/libfs.c | 35 ++
+ include/linux/fs.h | 2 +
+ include/linux/netdevice.h | 4 +
+ include/linux/pm_qos_params.h | 14 +-
+ include/linux/pm_runtime.h | 7 +
+ include/linux/pm_wakeup.h | 38 +-
+ include/sound/pcm.h | 3 +-
+ kernel/cgroup_freezer.c | 21 +-
+ kernel/pm_qos_params.c | 218 ++++----
+ kernel/power/Makefile | 3 +-
+ kernel/power/block_io.c | 103 ++++
+ kernel/power/power.h | 27 +-
+ kernel/power/snapshot.c | 145 ++----
+ kernel/power/swap.c | 333 +++++-------
+ kernel/power/user.c | 37 +-
+ net/mac80211/mlme.c | 2 +-
+ sound/core/pcm.c | 3 -
+ sound/core/pcm_native.c | 14 +-
+ 31 files changed, 1251 insertions(+), 949 deletions(-)
+ create mode 100644 kernel/power/block_io.c
+$ git am -3 ../patches/0001-wireless-update-for-pm_qos_requirement-to-pm_qos_req.patch
+Applying: wireless: update for pm_qos_requirement to pm_qos_request rename
+$ git reset HEAD^
+Unstaged changes after reset:
+M net/mac80211/scan.c
+$ git add .
+$ git commit -v -a --amend
+[master 3a42240] Merge remote branch 'suspend/linux-next'
+Merging bluetooth/master
+$ git merge bluetooth/master
+Already up-to-date.
+Merging fsnotify/for-next
+$ git merge fsnotify/for-next
+Auto-merging Documentation/feature-removal-schedule.txt
+Auto-merging fs/inode.c
+Auto-merging fs/namei.c
+Auto-merging fs/namespace.c
+Auto-merging fs/nfsd/vfs.c
+Auto-merging fs/notify/inotify/Kconfig
+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 init/Kconfig
+Auto-merging kernel/Makefile
+Auto-merging kernel/sysctl.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 8373d63] 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/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 | 198 +++----
+ fs/notify/fanotify/Kconfig | 26 +
+ fs/notify/fanotify/Makefile | 1 +
+ fs/notify/fanotify/fanotify.c | 255 ++++++++
+ fs/notify/fanotify/fanotify_user.c | 776 ++++++++++++++++++++++++
+ fs/notify/fsnotify.c | 141 ++++-
+ fs/notify/fsnotify.h | 33 +-
+ fs/notify/group.c | 178 +++---
+ fs/notify/inode_mark.c | 309 +++-------
+ fs/notify/inotify/Kconfig | 15 -
+ fs/notify/inotify/Makefile | 1 -
+ fs/notify/inotify/inotify.c | 873 ----------------------------
+ fs/notify/inotify/inotify.h | 7 +-
+ fs/notify/inotify/inotify_fsnotify.c | 114 +++-
+ fs/notify/inotify/inotify_user.c | 305 ++++++----
+ fs/notify/mark.c | 325 +++++++++++
+ fs/notify/notification.c | 180 ++++---
+ fs/notify/vfsmount_mark.c | 176 ++++++
+ 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 | 166 +++---
+ include/linux/fsnotify_backend.h | 169 ++++--
+ include/linux/inotify.h | 175 +------
+ include/linux/mount.h | 6 +-
+ include/linux/security.h | 1 +
+ include/linux/syscalls.h | 5 +
+ init/Kconfig | 10 +-
+ kernel/Makefile | 5 +-
+ kernel/audit.c | 1 -
+ kernel/audit.h | 26 +-
+ kernel/audit_tree.c | 233 ++++----
+ kernel/audit_watch.c | 295 ++++++----
+ kernel/auditfilter.c | 39 +-
+ kernel/auditsc.c | 10 +-
+ kernel/sys_ni.c | 4 +
+ kernel/sysctl.c | 7 +-
+ security/security.c | 16 +-
+ 57 files changed, 3099 insertions(+), 2189 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
+$ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes
+Applying: fsnotify: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/notify/fanotify/fanotify_user.c
+M fs/notify/vfsmount_mark.c
+$ git add .
+$ git commit -v -a --amend
+[master 4a2a3f3] Merge remote branch 'fsnotify/for-next'
+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 b8010df] 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 drbd/for-jens
+$ git merge drbd/for-jens
+Recorded preimage for 'mm/page-writeback.c'
+Resolved 'fs/fs-writeback.c' using previous resolution.
+Auto-merging drivers/block/drbd/drbd_worker.c
+Auto-merging fs/fs-writeback.c
+CONFLICT (content): Merge conflict in fs/fs-writeback.c
+Auto-merging fs/sync.c
+Auto-merging include/linux/writeback.h
+Auto-merging mm/page-writeback.c
+CONFLICT (content): Merge conflict in mm/page-writeback.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'mm/page-writeback.c'.
+[master bd2b3bd] Merge remote branch 'drbd/for-jens'
+$ git diff -M --stat --summary HEAD^..
+ drivers/block/drbd/drbd_bitmap.c | 21 +-
+ drivers/block/drbd/drbd_int.h | 148 +++++++--
+ drivers/block/drbd/drbd_main.c | 147 +++++++-
+ drivers/block/drbd/drbd_nl.c | 52 ++--
+ drivers/block/drbd/drbd_proc.c | 19 +-
+ drivers/block/drbd/drbd_receiver.c | 659 +++++++++++++++++++++++-------------
+ drivers/block/drbd/drbd_req.c | 40 ++-
+ drivers/block/drbd/drbd_strings.c | 2 +-
+ drivers/block/drbd/drbd_worker.c | 206 +++++++-----
+ drivers/block/drbd/drbd_wrappers.h | 16 +-
+ fs/fs-writeback.c | 77 ++++-
+ fs/sync.c | 2 +-
+ include/linux/backing-dev.h | 2 +-
+ include/linux/drbd.h | 3 +-
+ include/linux/drbd_limits.h | 16 +
+ include/linux/drbd_nl.h | 5 +
+ include/linux/writeback.h | 10 +
+ mm/page-writeback.c | 2 +-
+ 18 files changed, 983 insertions(+), 444 deletions(-)
+$ git reset --hard HEAD^
+HEAD is now at b8010df Merge remote branch 'irda/for-next'
+Merging refs/next/20100517/drbd
+$ git merge refs/next/20100517/drbd
+Already up-to-date.
+Merging catalin/for-next
+$ git merge catalin/for-next
+Already up-to-date.
+Merging alacrity/linux-next
+$ git merge alacrity/linux-next
+Resolved 'include/linux/Kbuild' using previous resolution.
+Resolved 'lib/Kconfig' using previous resolution.
+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
+CONFLICT (content): Merge conflict in include/linux/Kbuild
+Auto-merging lib/Kconfig
+CONFLICT (content): Merge conflict in lib/Kconfig
+Auto-merging lib/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 1911765] Merge remote branch 'alacrity/linux-next'
+$ git diff -M --stat --summary HEAD^..
+ 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 | 247 +++++++
+ drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++
+ 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, 4387 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
+$ git am -3 ../patches/0001-vbus-use-of-kzalloc-kfree-requires-the-include-of-sl.patch
+Applying: vbus: use of kzalloc/kfree requires the include of slab.h
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/vbus/bus-proxy.c
+$ git add .
+$ git commit -v -a --amend
+[master 9cfcdf1] Merge remote branch 'alacrity/linux-next'
+$ git am -3 ../patches/vbus__update_gfp_slab.h_includes
+Applying: vbus: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/vbus/pci-bridge.c
+$ git add .
+$ git commit -v -a --amend
+[master b1030e4] Merge remote branch 'alacrity/linux-next'
+Merging i7core_edac/linux_next
+$ git merge i7core_edac/linux_next
+Auto-merging arch/x86/include/asm/pci_x86.h
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Auto-merging include/linux/pci.h
+Auto-merging include/linux/pci_ids.h
+Merge made by recursive.
+ Documentation/edac.txt | 152 +++
+ arch/x86/include/asm/pci_x86.h | 2 +
+ arch/x86/kernel/cpu/mcheck/mce.c | 10 +
+ arch/x86/pci/legacy.c | 42 +-
+ drivers/edac/Kconfig | 13 +
+ drivers/edac/Makefile | 2 +
+ drivers/edac/edac_core.h | 23 +-
+ drivers/edac/edac_mc_sysfs.c | 175 +++-
+ drivers/edac/edac_mce.c | 61 ++
+ drivers/edac/i7core_edac.c | 2021 ++++++++++++++++++++++++++++++++++++++
+ include/linux/edac_mce.h | 31 +
+ include/linux/pci.h | 1 +
+ include/linux/pci_ids.h | 35 +
+ 13 files changed, 2524 insertions(+), 44 deletions(-)
+ create mode 100644 drivers/edac/edac_mce.c
+ create mode 100644 drivers/edac/i7core_edac.c
+ create mode 100644 include/linux/edac_mce.h
+Merging devicetree/next-devicetree
+$ git merge devicetree/next-devicetree
+Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution.
+Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution.
+Resolved 'drivers/serial/mpc52xx_uart.c' using previous resolution.
+Auto-merging arch/powerpc/kernel/vio.c
+Auto-merging drivers/ata/pata_mpc52xx.c
+Auto-merging drivers/dma/fsldma.c
+Auto-merging drivers/dma/ppc4xx/adma.c
+Auto-merging drivers/gpio/pca953x.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/i2c-core.c
+Auto-merging drivers/macintosh/smu.c
+Auto-merging drivers/mtd/maps/physmap_of.c
+Auto-merging drivers/mtd/nand/fsl_elbc_nand.c
+Auto-merging drivers/mtd/nand/fsl_upm.c
+Auto-merging drivers/mtd/nand/pasemi_nand.c
+Auto-merging drivers/mtd/nand/socrates_nand.c
+Auto-merging drivers/net/can/mscan/mpc5xxx_can.c
+Auto-merging drivers/net/can/sja1000/sja1000_of_platform.c
+Auto-merging drivers/net/ehea/ehea_main.c
+Auto-merging drivers/net/fec_mpc52xx.c
+Auto-merging drivers/net/fs_enet/fs_enet-main.c
+Auto-merging drivers/net/fs_enet/mac-fec.c
+Auto-merging drivers/net/fsl_pq_mdio.c
+Auto-merging drivers/net/gianfar.c
+Auto-merging drivers/net/greth.c
+Auto-merging drivers/net/ibm_newemac/core.c
+Auto-merging drivers/net/ll_temac_main.c
+Auto-merging drivers/net/niu.c
+Auto-merging drivers/net/sunbmac.c
+Auto-merging drivers/net/sunhme.c
+Auto-merging drivers/net/sunlance.c
+Auto-merging drivers/net/sunqe.c
+Auto-merging drivers/net/ucc_geth.c
+Auto-merging drivers/net/xilinx_emaclite.c
+Auto-merging drivers/of/of_mdio.c
+Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c
+Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c
+Auto-merging drivers/serial/mpc52xx_uart.c
+CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
+Auto-merging drivers/serial/pmac_zilog.c
+Auto-merging drivers/serial/sunzilog.c
+Auto-merging drivers/spi/spi_mpc8xxx.c
+Auto-merging drivers/watchdog/mpc8xxx_wdt.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/i2c.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master cfc1493] Merge remote branch 'devicetree/next-devicetree'
+$ git diff -M --stat --summary HEAD^..
+ arch/microblaze/include/asm/device.h | 16 +----------
+ arch/microblaze/include/asm/of_device.h | 3 +-
+ arch/microblaze/kernel/of_device.c | 13 ++++-----
+ arch/microblaze/kernel/of_platform.c | 6 ++--
+ arch/powerpc/include/asm/device.h | 16 +----------
+ arch/powerpc/include/asm/macio.h | 2 +-
+ arch/powerpc/include/asm/of_device.h | 3 +-
+ arch/powerpc/kernel/ibmebus.c | 6 ++--
+ arch/powerpc/kernel/of_device.c | 13 ++++-----
+ arch/powerpc/kernel/of_platform.c | 21 +++++++-------
+ arch/powerpc/kernel/pci-common.c | 4 +-
+ arch/powerpc/kernel/vio.c | 18 ++++++------
+ arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 18 ++++++++----
+ arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 23 +++++++++-------
+ arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 14 +++++----
+ arch/powerpc/platforms/82xx/ep8248e.c | 9 +++---
+ arch/powerpc/platforms/83xx/suspend.c | 9 ++++--
+ arch/powerpc/platforms/cell/axon_msi.c | 9 +++---
+ arch/powerpc/platforms/cell/iommu.c | 5 +--
+ arch/powerpc/platforms/pasemi/gpio_mdio.c | 9 +++---
+ arch/powerpc/platforms/pasemi/setup.c | 4 +-
+ arch/powerpc/platforms/ps3/system-bus.c | 2 +-
+ arch/powerpc/platforms/pseries/iommu.c | 2 +-
+ arch/powerpc/sysdev/axonram.c | 14 +++++-----
+ arch/powerpc/sysdev/bestcomm/bestcomm.c | 18 +++++-------
+ arch/powerpc/sysdev/fsl_msi.c | 21 ++++++++------
+ arch/powerpc/sysdev/fsl_pmc.c | 9 ++++--
+ arch/powerpc/sysdev/fsl_rio.c | 37 +++++++++++++-----------
+ arch/powerpc/sysdev/pmi.c | 9 +++---
+ arch/powerpc/sysdev/qe_lib/qe.c | 7 +++-
+ arch/sparc/include/asm/device.h | 15 ----------
+ arch/sparc/include/asm/fb.h | 2 +-
+ arch/sparc/include/asm/floppy_64.h | 4 +-
+ arch/sparc/include/asm/of_device.h | 1 -
+ arch/sparc/include/asm/parport.h | 9 ++++--
+ arch/sparc/kernel/apc.c | 7 +++-
+ arch/sparc/kernel/auxio_64.c | 9 +++---
+ arch/sparc/kernel/central.c | 18 +++++++-----
+ arch/sparc/kernel/chmc.c | 17 +++++++-----
+ arch/sparc/kernel/ioport.c | 2 +-
+ arch/sparc/kernel/of_device_32.c | 17 +++++------
+ arch/sparc/kernel/of_device_64.c | 29 +++++++++----------
+ arch/sparc/kernel/of_device_common.c | 4 +-
+ arch/sparc/kernel/pci.c | 14 ++++-----
+ arch/sparc/kernel/pci_common.c | 9 +++---
+ arch/sparc/kernel/pci_fire.c | 11 +++++---
+ arch/sparc/kernel/pci_msi.c | 18 ++++++------
+ arch/sparc/kernel/pci_psycho.c | 11 +++++---
+ arch/sparc/kernel/pci_sabre.c | 11 +++++---
+ arch/sparc/kernel/pci_schizo.c | 21 ++++++++------
+ arch/sparc/kernel/pci_sun4v.c | 15 ++++++----
+ arch/sparc/kernel/pmc.c | 7 +++-
+ arch/sparc/kernel/power.c | 11 ++++---
+ arch/sparc/kernel/psycho_common.c | 2 +-
+ arch/sparc/kernel/sbus.c | 16 +++++-----
+ arch/sparc/kernel/time_32.c | 9 +++---
+ arch/sparc/kernel/time_64.c | 27 ++++++++++--------
+ drivers/ata/pata_macio.c | 2 +-
+ drivers/ata/pata_mpc52xx.c | 14 ++++-----
+ drivers/ata/pata_of_platform.c | 9 ++++--
+ drivers/ata/sata_fsl.c | 11 +++++---
+ drivers/atm/fore200e.c | 23 +++++++++------
+ drivers/block/swim3.c | 2 +-
+ drivers/block/xsysace.c | 13 ++++-----
+ drivers/cdrom/viocd.c | 2 +-
+ drivers/char/hw_random/n2-drv.c | 9 ++++--
+ drivers/char/hw_random/pasemi-rng.c | 9 ++++--
+ drivers/char/ipmi/ipmi_si_intf.c | 11 +++++---
+ drivers/char/viotape.c | 2 +-
+ drivers/char/xilinx_hwicap/xilinx_hwicap.c | 11 +++----
+ drivers/crypto/amcc/crypto4xx_core.c | 7 +++-
+ drivers/crypto/talitos.c | 9 ++++--
+ drivers/dma/fsldma.c | 13 +++++---
+ drivers/dma/ppc4xx/adma.c | 2 +-
+ drivers/edac/mpc85xx_edac.c | 30 ++++++++------------
+ drivers/edac/ppc4xx_edac.c | 10 +++---
+ drivers/gpio/pca953x.c | 2 +-
+ drivers/hwmon/ultra45_env.c | 7 +++-
+ drivers/i2c/busses/i2c-cpm.c | 30 ++++++++++----------
+ drivers/i2c/busses/i2c-ibm_iic.c | 11 +++++---
+ drivers/i2c/busses/i2c-mpc.c | 25 +++++++++--------
+ drivers/i2c/i2c-core.c | 3 ++
+ drivers/ide/pmac.c | 10 +++---
+ drivers/infiniband/hw/ehca/ehca_main.c | 18 +++++++-----
+ drivers/input/misc/sparcspkr.c | 14 +++++++---
+ drivers/input/serio/i8042-sparcio.h | 9 ++++--
+ drivers/input/serio/xilinx_ps2.c | 15 ++++++----
+ drivers/leds/leds-gpio.c | 4 +-
+ drivers/macintosh/macio_asic.c | 28 +++++++++----------
+ drivers/macintosh/macio_sysfs.c | 6 ++--
+ drivers/macintosh/mediabay.c | 2 +-
+ drivers/macintosh/rack-meter.c | 4 +-
+ drivers/macintosh/smu.c | 7 +++-
+ drivers/macintosh/therm_pm72.c | 9 ++++--
+ drivers/macintosh/therm_windtunnel.c | 7 +++-
+ drivers/mmc/host/of_mmc_spi.c | 4 +-
+ drivers/mmc/host/sdhci-of-core.c | 9 ++++--
+ drivers/mtd/maps/physmap_of.c | 13 +++++---
+ drivers/mtd/maps/sun_uflash.c | 9 ++++--
+ drivers/mtd/nand/fsl_elbc_nand.c | 11 ++++---
+ drivers/mtd/nand/fsl_upm.c | 7 +++-
+ drivers/mtd/nand/ndfc.c | 15 +++++-----
+ drivers/mtd/nand/pasemi_nand.c | 9 ++++--
+ drivers/mtd/nand/socrates_nand.c | 7 +++-
+ drivers/net/can/mscan/mpc5xxx_can.c | 8 +++--
+ drivers/net/can/sja1000/sja1000_of_platform.c | 12 +++++---
+ drivers/net/ehea/ehea_main.c | 21 ++++++++------
+ drivers/net/fec_mpc52xx.c | 20 +++++++------
+ drivers/net/fec_mpc52xx_phy.c | 11 +++++---
+ drivers/net/fs_enet/fs_enet-main.c | 15 ++++++----
+ drivers/net/fs_enet/mac-fec.c | 4 +-
+ drivers/net/fs_enet/mii-bitbang.c | 7 +++-
+ drivers/net/fs_enet/mii-fec.c | 13 +++++---
+ drivers/net/fsl_pq_mdio.c | 9 ++++--
+ drivers/net/gianfar.c | 16 ++++++-----
+ drivers/net/greth.c | 3 +-
+ drivers/net/ibm_newemac/core.c | 21 ++++++++------
+ drivers/net/ibm_newemac/debug.c | 9 +++---
+ drivers/net/ibm_newemac/debug.h | 4 +-
+ drivers/net/ibm_newemac/mal.c | 36 +++++++++++++-----------
+ drivers/net/ibm_newemac/rgmii.c | 20 +++++++------
+ drivers/net/ibm_newemac/tah.c | 15 ++++++----
+ drivers/net/ibm_newemac/zmii.c | 17 +++++++-----
+ drivers/net/ll_temac_main.c | 12 ++++----
+ drivers/net/myri_sbus.c | 9 ++++--
+ drivers/net/niu.c | 17 +++++++-----
+ drivers/net/phy/mdio-gpio.c | 13 +++++---
+ drivers/net/sunbmac.c | 13 +++++---
+ drivers/net/sunhme.c | 15 ++++++----
+ drivers/net/sunlance.c | 13 +++++---
+ drivers/net/sunqe.c | 13 +++++---
+ drivers/net/ucc_geth.c | 9 ++++--
+ drivers/net/xilinx_emaclite.c | 17 +++++++-----
+ drivers/of/device.c | 25 ++++++++---------
+ drivers/of/fdt.c | 15 ++++++++++
+ drivers/of/of_i2c.c | 4 +-
+ drivers/of/of_mdio.c | 6 ++--
+ drivers/of/of_spi.c | 2 +-
+ drivers/of/platform.c | 13 ++-------
+ drivers/parport/parport_sunbpp.c | 7 +++-
+ drivers/pcmcia/electra_cf.c | 9 ++++--
+ drivers/pcmcia/m8xx_pcmcia.c | 7 +++-
+ drivers/sbus/char/bbc_envctrl.c | 4 +-
+ drivers/sbus/char/bbc_i2c.c | 11 +++++---
+ drivers/sbus/char/display7seg.c | 9 ++++--
+ drivers/sbus/char/envctrl.c | 9 ++++--
+ drivers/sbus/char/flash.c | 11 +++++---
+ drivers/sbus/char/uctrl.c | 9 ++++--
+ drivers/scsi/ibmvscsi/ibmvfc.c | 2 +-
+ drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +-
+ drivers/scsi/qlogicpti.c | 17 +++++++-----
+ drivers/scsi/sun_esp.c | 23 +++++++++-------
+ drivers/serial/apbuart.c | 10 +++---
+ drivers/serial/cpm_uart/cpm_uart_core.c | 9 ++++--
+ drivers/serial/mpc52xx_uart.c | 15 +++++-----
+ drivers/serial/nwpserial.c | 2 +-
+ drivers/serial/of_serial.c | 12 +++++---
+ drivers/serial/pmac_zilog.c | 2 +-
+ drivers/serial/sunhv.c | 9 ++++--
+ drivers/serial/sunsab.c | 13 +++++---
+ drivers/serial/sunsu.c | 13 +++++---
+ drivers/serial/sunzilog.c | 15 ++++++----
+ drivers/serial/uartlite.c | 11 +++----
+ drivers/serial/ucc_uart.c | 8 +++--
+ drivers/spi/mpc52xx_psc_spi.c | 15 +++++-----
+ drivers/spi/mpc52xx_spi.c | 22 ++++++++-------
+ drivers/spi/spi_mpc8xxx.c | 15 ++++++----
+ drivers/spi/spi_ppc4xx.c | 2 +-
+ drivers/spi/xilinx_spi_of.c | 2 +-
+ drivers/usb/gadget/fsl_qe_udc.c | 7 +++-
+ drivers/usb/host/ehci-ppc-of.c | 11 +++----
+ drivers/usb/host/ehci-xilinx-of.c | 9 +++---
+ drivers/usb/host/fhci-hcd.c | 7 +++-
+ drivers/usb/host/isp1760-if.c | 9 ++++--
+ drivers/usb/host/ohci-ppc-of.c | 15 +++-------
+ drivers/video/bw2.c | 7 +++-
+ drivers/video/cg14.c | 7 +++-
+ drivers/video/cg3.c | 7 +++-
+ drivers/video/cg6.c | 9 ++++--
+ drivers/video/ffb.c | 9 ++++--
+ drivers/video/fsl-diu-fb.c | 10 ++++---
+ drivers/video/leo.c | 7 +++-
+ drivers/video/mb862xx/mb862xxfb.c | 8 +++--
+ drivers/video/p9100.c | 7 +++-
+ drivers/video/platinumfb.c | 9 ++++--
+ drivers/video/sunxvr1000.c | 9 ++++--
+ drivers/video/tcx.c | 7 +++-
+ drivers/video/xilinxfb.c | 23 +++++++--------
+ drivers/watchdog/cpwd.c | 9 ++++--
+ drivers/watchdog/gef_wdt.c | 8 +++--
+ drivers/watchdog/mpc8xxx_wdt.c | 8 +++---
+ drivers/watchdog/riowd.c | 7 +++-
+ include/linux/device.h | 8 +++++
+ include/linux/i2c.h | 4 +++
+ include/linux/of_device.h | 4 ++-
+ include/linux/of_fdt.h | 4 +++
+ include/linux/of_platform.h | 6 +---
+ sound/aoa/fabrics/layout.c | 2 +-
+ sound/aoa/soundbus/core.c | 8 +++---
+ sound/aoa/soundbus/i2sbus/control.c | 2 +-
+ sound/aoa/soundbus/i2sbus/core.c | 8 +++---
+ sound/aoa/soundbus/sysfs.c | 4 +-
+ sound/soc/fsl/mpc5200_dma.c | 6 ++--
+ sound/soc/fsl/mpc5200_psc_ac97.c | 2 +-
+ sound/soc/fsl/mpc5200_psc_i2s.c | 4 +-
+ sound/soc/fsl/mpc8610_hpcd.c | 10 ++++---
+ sound/sparc/amd7930.c | 7 +++-
+ sound/sparc/cs4231.c | 13 +++++---
+ sound/sparc/dbri.c | 9 ++++--
+ 209 files changed, 1241 insertions(+), 961 deletions(-)
+$ git am -3 ../patches/0002-fixup-arch-powerpc-kernel-vio.c.patch
+Applying: fixup arch/powerpc/kernel/vio.c
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/kernel/vio.c
+$ git add .
+$ git commit -v -a --amend
+[master 0e60767] Merge remote branch 'devicetree/next-devicetree'
+Merging spi/next-spi
+$ git merge spi/next-spi
+Auto-merging drivers/spi/spi_mpc8xxx.c
+Merge made by recursive.
+ drivers/spi/spi_mpc8xxx.c | 7 +++----
+ 1 files changed, 3 insertions(+), 4 deletions(-)
+Merging omap_dss2/for-next
+$ git merge omap_dss2/for-next
+Auto-merging arch/arm/configs/am3517_evm_defconfig
+Auto-merging arch/arm/configs/rx51_defconfig
+Auto-merging arch/arm/mach-omap2/Makefile
+Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c
+Merge made by recursive.
+ arch/arm/configs/am3517_evm_defconfig | 52 ++-
+ arch/arm/configs/omap3_evm_defconfig | 51 ++-
+ arch/arm/configs/rx51_defconfig | 39 +-
+ arch/arm/mach-omap2/Makefile | 1 +
+ arch/arm/mach-omap2/board-omap3beagle.c | 101 ++-
+ arch/arm/mach-omap2/board-rx51-peripherals.c | 28 +
+ arch/arm/mach-omap2/board-rx51-video.c | 109 +++
+ arch/arm/mach-omap2/board-rx51.c | 2 +
+ drivers/video/omap2/displays/Kconfig | 8 +-
+ drivers/video/omap2/displays/Makefile | 1 +
+ drivers/video/omap2/displays/panel-acx565akm.c | 819 ++++++++++++++++++++
+ .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 78 ++
+ drivers/video/omap2/displays/panel-taal.c | 143 +++-
+ drivers/video/omap2/dss/Kconfig | 6 +
+ drivers/video/omap2/dss/Makefile | 3 +-
+ drivers/video/omap2/dss/core.c | 85 ++-
+ drivers/video/omap2/dss/display.c | 9 +-
+ drivers/video/omap2/dss/dss.c | 24 +-
+ drivers/video/omap2/dss/dss.h | 50 ++
+ drivers/video/omap2/dss/manager.c | 21 +
+ drivers/video/omap2/dss/sdi.c | 26 +-
+ drivers/video/omap2/dss/venc.c | 15 +-
+ drivers/video/omap2/omapfb/omapfb-ioctl.c | 5 +-
+ drivers/video/omap2/omapfb/omapfb-sysfs.c | 25 +-
+ 24 files changed, 1572 insertions(+), 129 deletions(-)
+ create mode 100644 arch/arm/mach-omap2/board-rx51-video.c
+ create mode 100644 drivers/video/omap2/displays/panel-acx565akm.c
+Merging tip/auto-latest
+$ git merge tip/auto-latest
+Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution.
+Resolved 'kernel/Makefile' using previous resolution.
+Resolved 'tools/perf/builtin-record.c' using previous resolution.
+Auto-merging Documentation/feature-removal-schedule.txt
+CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
+Auto-merging Documentation/filesystems/proc.txt
+Auto-merging Documentation/intel_txt.txt
+Auto-merging Documentation/kernel-parameters.txt
+Auto-merging Documentation/trace/events.txt
+Auto-merging MAINTAINERS
+Auto-merging arch/sh/Kconfig
+Auto-merging arch/sh/include/asm/hw_breakpoint.h
+Auto-merging arch/sh/kernel/hw_breakpoint.c
+Auto-merging arch/sparc/kernel/time_32.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/x86/include/asm/atomic.h
+Auto-merging arch/x86/include/asm/atomic64_64.h
+Auto-merging arch/x86/include/asm/cacheflush.h
+Auto-merging arch/x86/include/asm/percpu.h
+Auto-merging arch/x86/include/asm/processor.h
+Auto-merging arch/x86/include/asm/thread_info.h
+Removing arch/x86/include/asm/vmware.h
+Auto-merging arch/x86/kernel/acpi/boot.c
+Auto-merging arch/x86/kernel/cpu/common.c
+Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c
+Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
+Auto-merging arch/x86/kernel/tboot.c
+Auto-merging arch/x86/kernel/traps.c
+Auto-merging arch/xtensa/kernel/time.c
+Auto-merging drivers/char/sysrq.c
+Auto-merging drivers/cpufreq/cpufreq.c
+Auto-merging drivers/cpufreq/cpufreq_ondemand.c
+Auto-merging drivers/pci/intel-iommu.c
+Auto-merging include/linux/acpi.h
+Auto-merging include/linux/cpufreq.h
+Auto-merging include/linux/ftrace_event.h
+Auto-merging include/linux/init_task.h
+Auto-merging include/linux/kernel.h
+Auto-merging include/trace/ftrace.h
+Auto-merging init/Kconfig
+Auto-merging kernel/Makefile
+CONFLICT (content): Merge conflict in kernel/Makefile
+Auto-merging kernel/cgroup.c
+Removing kernel/cred-internals.h
+Auto-merging kernel/cred.c
+Auto-merging kernel/fork.c
+CONFLICT (content): Merge conflict in kernel/fork.c
+Auto-merging kernel/module.c
+Auto-merging kernel/sched.c
+Removing kernel/softlockup.c
+Auto-merging kernel/sysctl.c
+Auto-merging kernel/trace/trace_output.c
+Auto-merging lib/Makefile
+Auto-merging scripts/Makefile.lib
+Auto-merging tools/perf/builtin-record.c
+CONFLICT (content): Merge conflict in tools/perf/builtin-record.c
+Removing tools/perf/util/include/asm/bitops.h
+Auto-merging virt/kvm/iommu.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'kernel/fork.c'.
+[master e6e00b3] Merge remote branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/RCU/stallwarn.txt | 94 ++-
+ Documentation/RCU/torture.txt | 10 -
+ Documentation/RCU/trace.txt | 35 +-
+ Documentation/feature-removal-schedule.txt | 17 +
+ Documentation/filesystems/proc.txt | 4 +
+ Documentation/intel_txt.txt | 16 +-
+ Documentation/kernel-parameters.txt | 10 +-
+ Documentation/rbtree.txt | 58 +
+ Documentation/scheduler/sched-design-CFS.txt | 54 +-
+ Documentation/scheduler/sched-rt-group.txt | 20 +-
+ Documentation/trace/events.txt | 3 +-
+ Documentation/trace/ftrace.txt | 50 +-
+ MAINTAINERS | 12 +
+ arch/Kconfig | 18 +
+ arch/alpha/Kconfig | 3 +
+ arch/alpha/include/asm/bitops.h | 18 +-
+ arch/alpha/kernel/time.c | 101 +-
+ arch/avr32/kernel/time.c | 12 +-
+ arch/blackfin/kernel/time-ts.c | 13 +-
+ arch/blackfin/kernel/time.c | 39 +-
+ arch/cris/Kconfig | 3 +
+ arch/cris/arch-v10/kernel/time.c | 37 +-
+ arch/cris/arch-v32/kernel/time.c | 40 +-
+ arch/cris/kernel/time.c | 20 +-
+ arch/frv/kernel/time.c | 34 +-
+ arch/h8300/kernel/time.c | 10 +-
+ arch/ia64/include/asm/bitops.h | 11 +-
+ arch/ia64/kernel/acpi.c | 8 +
+ arch/ia64/kernel/time.c | 12 +-
+ arch/m32r/kernel/time.c | 47 +-
+ arch/m68k/kernel/time.c | 11 +-
+ arch/mips/include/asm/i8253.h | 2 +-
+ arch/mips/kernel/i8253.c | 14 +-
+ arch/mn10300/Kconfig | 3 +
+ arch/mn10300/kernel/rtc.c | 27 +-
+ arch/mn10300/kernel/time.c | 4 -
+ arch/powerpc/kernel/perf_event.c | 129 +-
+ arch/s390/kernel/time.c | 1 -
+ arch/sh/Kconfig | 1 +
+ arch/sh/include/asm/hw_breakpoint.h | 10 +-
+ arch/sh/kernel/hw_breakpoint.c | 34 +-
+ arch/sh/kernel/ptrace_32.c | 2 +-
+ arch/sparc/Kconfig | 2 +-
+ arch/sparc/include/asm/bitops_64.h | 11 +-
+ arch/sparc/kernel/time_32.c | 18 +-
+ arch/x86/Kconfig | 56 +-
+ arch/x86/Kconfig.cpu | 4 +
+ arch/x86/Kconfig.debug | 2 -
+ arch/x86/Makefile | 5 +-
+ arch/x86/include/asm/alternative-asm.h | 4 +-
+ arch/x86/include/asm/alternative.h | 20 +-
+ arch/x86/include/asm/amd_iommu_types.h | 34 +
+ arch/x86/include/asm/arch_hweight.h | 61 +
+ arch/x86/include/asm/atomic.h | 23 +
+ arch/x86/include/asm/atomic64_32.h | 278 ++++-
+ arch/x86/include/asm/atomic64_64.h | 23 +
+ arch/x86/include/asm/bitops.h | 4 +-
+ arch/x86/include/asm/boot.h | 2 +-
+ arch/x86/include/asm/cacheflush.h | 44 +-
+ arch/x86/include/asm/cmpxchg_32.h | 3 +-
+ arch/x86/include/asm/cpufeature.h | 58 +
+ arch/x86/include/asm/dwarf2.h | 12 +
+ arch/x86/include/asm/e820.h | 7 +-
+ arch/x86/include/asm/hardirq.h | 2 +-
+ arch/x86/include/asm/hpet.h | 1 +
+ arch/x86/include/asm/hw_breakpoint.h | 10 +-
+ arch/x86/include/asm/hyperv.h | 11 +-
+ arch/x86/include/asm/hypervisor.h | 27 +-
+ arch/x86/include/asm/i387.h | 129 ++-
+ arch/x86/include/asm/i8253.h | 2 +-
+ arch/x86/include/asm/io_apic.h | 13 +-
+ arch/x86/include/asm/mpspec.h | 10 -
+ arch/x86/include/asm/mshyperv.h | 14 +
+ arch/x86/include/asm/nmi.h | 2 +
+ arch/x86/include/asm/percpu.h | 24 +
+ arch/x86/include/asm/processor.h | 10 +-
+ arch/x86/include/asm/thread_info.h | 1 -
+ arch/x86/include/asm/traps.h | 2 +-
+ arch/x86/include/asm/uv/uv_bau.h | 247 +++--
+ arch/x86/include/asm/uv/uv_hub.h | 2 +-
+ arch/x86/include/asm/uv/uv_mmrs.h | 528 ++-------
+ arch/x86/include/asm/vmware.h | 27 -
+ arch/x86/include/asm/xsave.h | 7 +-
+ arch/x86/kernel/acpi/boot.c | 133 ++-
+ arch/x86/kernel/alternative.c | 47 +-
+ arch/x86/kernel/amd_iommu.c | 197 ++--
+ arch/x86/kernel/amd_iommu_init.c | 6 +
+ arch/x86/kernel/apic/Makefile | 7 +-
+ arch/x86/kernel/apic/es7000_32.c | 19 -
+ arch/x86/kernel/apic/hw_nmi.c | 107 ++
+ arch/x86/kernel/apic/io_apic.c | 99 +-
+ arch/x86/kernel/apic/nmi.c | 7 -
+ arch/x86/kernel/apic/x2apic_uv_x.c | 3 -
+ arch/x86/kernel/apm_32.c | 4 +-
+ arch/x86/kernel/cpu/Makefile | 2 +-
+ arch/x86/kernel/cpu/addon_cpuid_features.c | 14 +-
+ arch/x86/kernel/cpu/bugs.c | 2 +-
+ arch/x86/kernel/cpu/common.c | 5 +-
+ arch/x86/kernel/cpu/cpufreq/Makefile | 4 +-
+ arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 44 +-
+ arch/x86/kernel/cpu/cpufreq/mperf.c | 51 +
+ arch/x86/kernel/cpu/cpufreq/mperf.h | 9 +
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 169 +++-
+ arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 -
+ arch/x86/kernel/cpu/hypervisor.c | 52 +-
+ arch/x86/kernel/cpu/intel.c | 6 -
+ arch/x86/kernel/cpu/intel_cacheinfo.c | 177 ++-
+ arch/x86/kernel/cpu/mcheck/mce.c | 4 +-
+ arch/x86/kernel/cpu/mshyperv.c | 55 +
+ arch/x86/kernel/cpu/perf_event.c | 329 +++---
+ arch/x86/kernel/cpu/perf_event_intel.c | 9 +-
+ arch/x86/kernel/cpu/perf_event_intel_ds.c | 121 +--
+ arch/x86/kernel/cpu/perf_event_p4.c | 183 ++--
+ arch/x86/kernel/cpu/vmware.c | 38 +-
+ arch/x86/kernel/entry_32.S | 19 +
+ arch/x86/kernel/hpet.c | 29 +-
+ arch/x86/kernel/hw_breakpoint.c | 41 +-
+ arch/x86/kernel/i387.c | 107 +-
+ arch/x86/kernel/i8253.c | 14 +-
+ arch/x86/kernel/irqinit.c | 2 +-
+ arch/x86/kernel/microcode_core.c | 4 +-
+ arch/x86/kernel/microcode_intel.c | 22 +-
+ arch/x86/kernel/mpparse.c | 25 +-
+ arch/x86/kernel/mrst.c | 5 +
+ arch/x86/kernel/process.c | 21 +-
+ arch/x86/kernel/process_32.c | 2 +-
+ arch/x86/kernel/process_64.c | 2 +-
+ arch/x86/kernel/ptrace.c | 2 +-
+ arch/x86/kernel/quirks.c | 8 +
+ arch/x86/kernel/sfi.c | 4 +-
+ arch/x86/kernel/tboot.c | 20 +-
+ arch/x86/kernel/tlb_uv.c | 1280 ++++++++++++++------
+ arch/x86/kernel/traps.c | 180 +--
+ arch/x86/kernel/uv_irq.c | 12 +-
+ arch/x86/kernel/x8664_ksyms_64.c | 1 -
+ arch/x86/kernel/xsave.c | 8 +-
+ arch/x86/lib/Makefile | 3 +-
+ arch/x86/lib/atomic64_32.c | 273 +----
+ arch/x86/lib/atomic64_386_32.S | 174 +++
+ arch/x86/lib/atomic64_cx8_32.S | 224 ++++
+ arch/x86/math-emu/fpu_aux.c | 6 +-
+ arch/x86/math-emu/fpu_entry.c | 4 +-
+ arch/x86/math-emu/fpu_system.h | 2 +-
+ arch/x86/mm/Makefile | 1 +
+ arch/x86/mm/pat.c | 239 +----
+ arch/x86/mm/pat_internal.h | 46 +
+ arch/x86/mm/pat_rbtree.c | 273 +++++
+ arch/x86/mm/srat_64.c | 48 +
+ arch/x86/oprofile/nmi_int.c | 199 ++--
+ arch/x86/oprofile/op_model_amd.c | 280 ++---
+ arch/x86/oprofile/op_model_p4.c | 52 +-
+ arch/x86/oprofile/op_model_ppro.c | 77 +-
+ arch/x86/oprofile/op_x86_model.h | 4 +-
+ arch/x86/pci/mrst.c | 2 +-
+ arch/x86/xen/time.c | 6 +-
+ arch/xtensa/kernel/time.c | 5 -
+ drivers/acpi/pci_irq.c | 8 +-
+ drivers/base/iommu.c | 43 +-
+ drivers/block/hd.c | 4 +-
+ drivers/char/sysrq.c | 2 +-
+ drivers/clocksource/cs5535-clockevt.c | 8 +-
+ drivers/cpufreq/cpufreq.c | 40 +-
+ drivers/cpufreq/cpufreq_conservative.c | 48 +-
+ drivers/cpufreq/cpufreq_ondemand.c | 115 ++-
+ drivers/input/gameport/gameport.c | 4 +-
+ drivers/input/joystick/analog.c | 4 +-
+ drivers/input/misc/pcspkr.c | 6 +-
+ drivers/misc/vmware_balloon.c | 4 +-
+ drivers/oprofile/cpu_buffer.c | 75 +-
+ drivers/oprofile/oprof.c | 12 +-
+ drivers/oprofile/oprof.h | 3 +-
+ drivers/oprofile/timer_int.c | 78 ++-
+ drivers/pci/intel-iommu.c | 22 +-
+ drivers/xen/manage.c | 14 +-
+ fs/eventpoll.c | 3 +-
+ include/asm-generic/bitops/arch_hweight.h | 25 +
+ include/asm-generic/bitops/const_hweight.h | 42 +
+ include/asm-generic/bitops/hweight.h | 8 +-
+ include/linux/acpi.h | 5 +-
+ include/linux/bitops.h | 30 +-
+ include/linux/clocksource.h | 19 +-
+ include/linux/cpufreq.h | 30 +
+ include/linux/cpuset.h | 16 +-
+ include/linux/debugobjects.h | 11 +
+ include/linux/ftrace.h | 49 +-
+ include/linux/ftrace_event.h | 1 +
+ include/linux/hrtimer.h | 2 +
+ include/linux/hw_breakpoint.h | 25 +-
+ include/linux/init_task.h | 1 -
+ include/linux/interrupt.h | 32 +-
+ include/linux/iommu.h | 24 +-
+ include/linux/irq.h | 1 +
+ include/linux/kernel.h | 11 +-
+ include/linux/module.h | 6 +-
+ include/linux/nmi.h | 13 +
+ include/linux/perf_event.h | 38 +-
+ include/linux/rbtree.h | 5 +-
+ include/linux/rcupdate.h | 50 +-
+ include/linux/rcutiny.h | 31 +-
+ include/linux/rcutree.h | 7 +-
+ include/linux/ring_buffer.h | 10 +-
+ include/linux/sched.h | 85 +-
+ include/linux/srcu.h | 6 +-
+ include/linux/stop_machine.h | 122 ++-
+ include/linux/tick.h | 5 +-
+ include/linux/time.h | 1 -
+ include/linux/timer.h | 10 +-
+ include/linux/timex.h | 5 -
+ include/linux/tracepoint.h | 114 +-
+ include/linux/wait.h | 35 +-
+ include/trace/define_trace.h | 5 +
+ include/trace/events/lock.h | 55 +-
+ include/trace/events/module.h | 18 +-
+ include/trace/events/napi.h | 10 +-
+ include/trace/events/sched.h | 32 +-
+ include/trace/events/signal.h | 52 +-
+ include/trace/ftrace.h | 33 +-
+ init/Kconfig | 3 +-
+ ipc/mqueue.c | 74 +-
+ kernel/Makefile | 4 +-
+ kernel/capability.c | 1 -
+ kernel/cgroup.c | 2 +-
+ kernel/cpu.c | 26 +-
+ kernel/cpuset.c | 67 +-
+ kernel/cred-internals.h | 21 -
+ kernel/cred.c | 3 -
+ kernel/exit.c | 1 -
+ kernel/fork.c | 1 -
+ kernel/hrtimer.c | 67 +-
+ kernel/hw_breakpoint.c | 196 +++-
+ kernel/irq/handle.c | 3 -
+ kernel/irq/manage.c | 89 +-
+ kernel/irq/proc.c | 60 +
+ kernel/kprobes.c | 132 +-
+ kernel/lockdep.c | 88 +-
+ kernel/lockdep_internals.h | 72 +-
+ kernel/lockdep_proc.c | 58 +-
+ kernel/module.c | 22 +-
+ kernel/mutex.c | 12 +-
+ kernel/perf_event.c | 94 +-
+ kernel/posix-cpu-timers.c | 298 ++---
+ kernel/rcupdate.c | 19 -
+ kernel/rcutiny.c | 35 +-
+ kernel/rcutiny_plugin.h | 39 +
+ kernel/rcutorture.c | 4 +-
+ kernel/rcutree.c | 131 ++-
+ kernel/rcutree.h | 2 +
+ kernel/rcutree_plugin.h | 69 +-
+ kernel/rcutree_trace.c | 4 +-
+ kernel/sched.c | 733 ++++-------
+ kernel/sched_debug.c | 108 +--
+ kernel/sched_fair.c | 350 +++---
+ kernel/sched_features.h | 55 -
+ kernel/sched_idletask.c | 8 +-
+ kernel/sched_rt.c | 15 +-
+ kernel/softirq.c | 2 +-
+ kernel/softlockup.c | 293 -----
+ kernel/stop_machine.c | 537 +++++++--
+ kernel/sysctl.c | 55 +-
+ kernel/time.c | 11 +-
+ kernel/time/clocksource.c | 48 +
+ kernel/time/ntp.c | 2 +-
+ kernel/time/tick-sched.c | 84 ++-
+ kernel/time/timekeeping.c | 35 +-
+ kernel/time/timer_list.c | 1 +
+ kernel/timer.c | 138 ++-
+ kernel/trace/ftrace.c | 33 +-
+ kernel/trace/ring_buffer.c | 179 +++-
+ kernel/trace/ring_buffer_benchmark.c | 5 +-
+ kernel/trace/trace.c | 127 ++-
+ kernel/trace/trace.h | 27 +-
+ kernel/trace/trace_events_filter.c | 2 +-
+ kernel/trace/trace_functions_graph.c | 169 ++-
+ kernel/trace/trace_irqsoff.c | 271 ++++-
+ kernel/trace/trace_ksym.c | 26 +-
+ kernel/trace/trace_output.c | 2 +-
+ kernel/trace/trace_sched_switch.c | 5 +-
+ kernel/trace/trace_sched_wakeup.c | 5 +-
+ kernel/trace/trace_selftest.c | 7 +-
+ kernel/user.c | 11 -
+ kernel/watchdog.c | 568 +++++++++
+ lib/Kconfig.debug | 55 +-
+ lib/Makefile | 5 +
+ lib/atomic64.c | 4 +-
+ lib/atomic64_test.c | 164 +++
+ lib/debugobjects.c | 63 +-
+ lib/hweight.c | 19 +-
+ lib/rbtree.c | 48 +-
+ scripts/Makefile.lib | 4 +
+ sound/drivers/pcsp/pcsp.h | 2 +-
+ sound/drivers/pcsp/pcsp_input.c | 4 +-
+ sound/drivers/pcsp/pcsp_lib.c | 12 +-
+ tools/perf/Documentation/perf-annotate.txt | 2 +-
+ tools/perf/Documentation/perf-bench.txt | 2 +-
+ tools/perf/Documentation/perf-buildid-cache.txt | 4 +-
+ tools/perf/Documentation/perf-diff.txt | 2 +-
+ tools/perf/Documentation/perf-inject.txt | 35 +
+ tools/perf/Documentation/perf-kmem.txt | 2 +-
+ tools/perf/Documentation/perf-kvm.txt | 9 +-
+ tools/perf/Documentation/perf-list.txt | 33 +-
+ tools/perf/Documentation/perf-probe.txt | 3 +
+ tools/perf/Documentation/perf-record.txt | 4 +-
+ tools/perf/Documentation/perf-stat.txt | 4 +-
+ tools/perf/Documentation/perf-test.txt | 22 +
+ tools/perf/Documentation/perf-trace-perl.txt | 6 +-
+ tools/perf/Documentation/perf-trace-python.txt | 16 +-
+ tools/perf/Documentation/perf-trace.txt | 2 +-
+ tools/perf/Makefile | 72 +-
+ tools/perf/arch/powerpc/Makefile | 4 +
+ tools/perf/arch/powerpc/util/dwarf-regs.c | 88 ++
+ tools/perf/arch/x86/Makefile | 4 +
+ tools/perf/arch/x86/util/dwarf-regs.c | 75 ++
+ tools/perf/bench/sched-messaging.c | 6 +-
+ tools/perf/builtin-annotate.c | 224 +----
+ tools/perf/builtin-bench.c | 4 +-
+ tools/perf/builtin-buildid-list.c | 4 +-
+ tools/perf/builtin-diff.c | 68 +-
+ tools/perf/builtin-help.c | 6 +-
+ tools/perf/builtin-inject.c | 228 ++++
+ tools/perf/builtin-kmem.c | 18 +-
+ tools/perf/builtin-kvm.c | 6 +-
+ tools/perf/builtin-lock.c | 691 +++++++----
+ tools/perf/builtin-probe.c | 9 +-
+ tools/perf/builtin-record.c | 147 ++--
+ tools/perf/builtin-report.c | 173 ++--
+ tools/perf/builtin-sched.c | 33 +-
+ tools/perf/builtin-stat.c | 10 +-
+ tools/perf/builtin-test.c | 281 +++++
+ tools/perf/builtin-timechart.c | 114 +--
+ tools/perf/builtin-top.c | 26 +-
+ tools/perf/builtin-trace.c | 20 +-
+ tools/perf/builtin.h | 2 +
+ tools/perf/command-list.txt | 2 +
+ tools/perf/perf.c | 2 +
+ tools/perf/perf.h | 3 +-
+ .../perf/scripts/perl/bin/check-perf-trace-record | 2 +-
+ tools/perf/scripts/perl/bin/failed-syscalls-record | 2 +-
+ tools/perf/scripts/perl/bin/failed-syscalls-report | 2 +-
+ tools/perf/scripts/perl/bin/rw-by-file-record | 2 +-
+ tools/perf/scripts/perl/bin/rw-by-pid-record | 2 +-
+ tools/perf/scripts/perl/bin/rwtop-record | 2 +-
+ tools/perf/scripts/perl/bin/wakeup-latency-record | 2 +-
+ tools/perf/scripts/perl/bin/workqueue-stats-record | 2 +-
+ tools/perf/scripts/perl/failed-syscalls.pl | 6 +-
+ tools/perf/scripts/perl/rw-by-pid.pl | 60 +-
+ tools/perf/scripts/perl/rwtop.pl | 48 +-
+ tools/perf/scripts/perl/wakeup-latency.pl | 12 +-
+ tools/perf/scripts/perl/workqueue-stats.pl | 12 +-
+ .../python/bin/failed-syscalls-by-pid-record | 2 +-
+ .../python/bin/failed-syscalls-by-pid-report | 2 +-
+ tools/perf/scripts/python/bin/sctop-record | 2 +-
+ .../python/bin/syscall-counts-by-pid-record | 2 +-
+ .../python/bin/syscall-counts-by-pid-report | 2 +-
+ .../perf/scripts/python/bin/syscall-counts-record | 2 +-
+ .../perf/scripts/python/bin/syscall-counts-report | 2 +-
+ tools/perf/util/bitmap.c | 21 +
+ tools/perf/util/callchain.c | 13 +-
+ tools/perf/util/callchain.h | 4 +
+ tools/perf/util/event.c | 138 ++-
+ tools/perf/util/event.h | 23 +-
+ tools/perf/util/header.c | 151 +--
+ tools/perf/util/header.h | 4 +-
+ tools/perf/util/hist.c | 486 ++++++--
+ tools/perf/util/hist.h | 115 ++-
+ tools/perf/util/hweight.c | 31 +
+ tools/perf/util/include/asm/bitops.h | 18 -
+ tools/perf/util/include/asm/hweight.h | 8 +
+ tools/perf/util/include/dwarf-regs.h | 8 +
+ tools/perf/util/include/linux/bitmap.h | 38 +-
+ tools/perf/util/include/linux/bitops.h | 20 +-
+ tools/perf/util/include/linux/kernel.h | 2 +
+ tools/perf/util/map.c | 125 +--
+ tools/perf/util/map.h | 86 +-
+ tools/perf/util/newt.c | 645 ++++++++---
+ tools/perf/util/parse-events.c | 41 +-
+ tools/perf/util/parse-events.h | 1 +
+ tools/perf/util/parse-options.c | 48 +-
+ tools/perf/util/parse-options.h | 27 +-
+ tools/perf/util/probe-event.c | 54 +-
+ tools/perf/util/probe-event.h | 4 +-
+ tools/perf/util/probe-finder.c | 70 +-
+ tools/perf/util/probe-finder.h | 6 +-
+ tools/perf/util/pstack.c | 75 ++
+ tools/perf/util/pstack.h | 12 +
+ .../perf/util/scripting-engines/trace-event-perl.c | 3 -
+ .../util/scripting-engines/trace-event-python.c | 4 -
+ tools/perf/util/session.c | 299 ++++-
+ tools/perf/util/session.h | 116 ++-
+ tools/perf/util/sort.c | 8 +-
+ tools/perf/util/sort.h | 25 +-
+ tools/perf/util/symbol.c | 244 ++--
+ tools/perf/util/symbol.h | 28 +-
+ tools/perf/util/trace-event-info.c | 11 +
+ tools/perf/util/trace-event-parse.c | 89 --
+ tools/perf/util/trace-event-read.c | 31 +-
+ tools/perf/util/trace-event.h | 3 +-
+ tools/perf/util/util.c | 22 +
+ tools/perf/util/util.h | 1 +
+ virt/kvm/iommu.c | 113 ++-
+ 399 files changed, 13590 insertions(+), 8295 deletions(-)
+ create mode 100644 arch/x86/include/asm/arch_hweight.h
+ create mode 100644 arch/x86/include/asm/mshyperv.h
+ delete mode 100644 arch/x86/include/asm/vmware.h
+ create mode 100644 arch/x86/kernel/apic/hw_nmi.c
+ create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.c
+ create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.h
+ create mode 100644 arch/x86/kernel/cpu/mshyperv.c
+ create mode 100644 arch/x86/lib/atomic64_386_32.S
+ create mode 100644 arch/x86/lib/atomic64_cx8_32.S
+ create mode 100644 arch/x86/mm/pat_internal.h
+ create mode 100644 arch/x86/mm/pat_rbtree.c
+ create mode 100644 include/asm-generic/bitops/arch_hweight.h
+ create mode 100644 include/asm-generic/bitops/const_hweight.h
+ delete mode 100644 kernel/cred-internals.h
+ create mode 100644 kernel/rcutiny_plugin.h
+ delete mode 100644 kernel/softlockup.c
+ create mode 100644 kernel/watchdog.c
+ create mode 100644 lib/atomic64_test.c
+ create mode 100644 tools/perf/Documentation/perf-inject.txt
+ create mode 100644 tools/perf/Documentation/perf-test.txt
+ create mode 100644 tools/perf/arch/powerpc/Makefile
+ create mode 100644 tools/perf/arch/powerpc/util/dwarf-regs.c
+ create mode 100644 tools/perf/arch/x86/Makefile
+ create mode 100644 tools/perf/arch/x86/util/dwarf-regs.c
+ create mode 100644 tools/perf/builtin-inject.c
+ create mode 100644 tools/perf/builtin-test.c
+ create mode 100644 tools/perf/util/bitmap.c
+ create mode 100644 tools/perf/util/hweight.c
+ delete mode 100644 tools/perf/util/include/asm/bitops.h
+ create mode 100644 tools/perf/util/include/asm/hweight.h
+ create mode 100644 tools/perf/util/include/dwarf-regs.h
+ create mode 100644 tools/perf/util/pstack.c
+ create mode 100644 tools/perf/util/pstack.h
+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 ++++++++++++++--
+ 1 files changed, 14 insertions(+), 2 deletions(-)
+Merging percpu/for-next
+$ git merge percpu/for-next
+Auto-merging arch/ia64/include/asm/percpu.h
+Merge made by recursive.
+ arch/ia64/include/asm/percpu.h | 5 +-
+ mm/percpu-km.c | 104 +++++++
+ mm/percpu-vm.c | 451 +++++++++++++++++++++++++++++++
+ mm/percpu.c | 585 ++++++++--------------------------------
+ 4 files changed, 671 insertions(+), 474 deletions(-)
+ create mode 100644 mm/percpu-km.c
+ create mode 100644 mm/percpu-vm.c
+Merging workqueues/for-next
+$ git merge workqueues/for-next
+Merge made by recursive.
+ kernel/workqueue.c | 36 +++++++++++++++++++++++++++++++++++-
+ 1 files changed, 35 insertions(+), 1 deletions(-)
+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 hwpoison/hwpoison
+$ git merge hwpoison/hwpoison
+Already up-to-date.
+Merging sysctl/master
+$ git merge sysctl/master
+Already up-to-date.
+Merging bkl-core/bkl/core
+$ git merge bkl-core/bkl/core
+Already up-to-date.
+Merging bkl-procfs/bkl/procfs
+$ git merge bkl-procfs/bkl/procfs
+Auto-merging drivers/isdn/divert/divert_procfs.c
+Auto-merging fs/proc/base.c
+Auto-merging fs/proc/inode.c
+Auto-merging fs/proc/kcore.c
+Auto-merging fs/proc/vmcore.c
+Auto-merging net/sunrpc/cache.c
+Merge made by recursive.
+ drivers/char/i8k.c | 21 ++++++++++++++++-----
+ drivers/isdn/divert/divert_procfs.c | 18 ++++++++++++++----
+ fs/proc/base.c | 10 +++++++++-
+ fs/proc/inode.c | 4 ++--
+ fs/proc/kcore.c | 1 +
+ fs/proc/kmsg.c | 1 +
+ fs/proc/vmcore.c | 1 +
+ net/sunrpc/cache.c | 15 +++++++++++----
+ 8 files changed, 55 insertions(+), 16 deletions(-)
+Merging bkl-ioctl/bkl/ioctl
+$ git merge bkl-ioctl/bkl/ioctl
+Auto-merging arch/ia64/sn/kernel/sn2/sn_hwperf.c
+Auto-merging arch/um/drivers/hostaudio_kern.c
+Auto-merging drivers/char/ipmi/ipmi_watchdog.c
+Auto-merging drivers/media/dvb/dvb-core/dvb_frontend.c
+Auto-merging drivers/media/dvb/dvb-core/dvb_net.c
+Auto-merging drivers/mtd/mtdchar.c
+Auto-merging drivers/pcmcia/pcmcia_ioctl.c
+Auto-merging drivers/scsi/3w-9xxx.c
+Auto-merging drivers/scsi/3w-xxxx.c
+Auto-merging drivers/scsi/gdth.c
+Merge made by recursive.
+ arch/ia64/sn/kernel/sn2/sn_hwperf.c | 9 +---
+ arch/um/drivers/hostaudio_kern.c | 8 ++--
+ arch/um/drivers/mmapper_kern.c | 5 +-
+ drivers/char/apm-emulation.c | 8 ++-
+ drivers/char/applicom.c | 13 +++--
+ drivers/char/ds1620.c | 16 +++++-
+ drivers/char/dtlk.c | 15 +++---
+ drivers/char/generic_nvram.c | 17 +++++-
+ drivers/char/genrtc.c | 16 +++++-
+ drivers/char/hpet.c | 14 +++--
+ drivers/char/ipmi/ipmi_devintf.c | 26 +++++++--
+ drivers/char/ipmi/ipmi_watchdog.c | 17 +++++-
+ drivers/char/nvram.c | 10 +++-
+ drivers/char/nwflash.c | 7 ++-
+ drivers/char/raw.c | 42 ++++++++------
+ drivers/hwmon/fschmd.c | 9 ++--
+ drivers/hwmon/w83793.c | 10 ++--
+ drivers/input/misc/hp_sdc_rtc.c | 34 ++++++++----
+ drivers/isdn/capi/capi.c | 17 +++++-
+ drivers/isdn/i4l/isdn_common.c | 18 +++++-
+ drivers/isdn/mISDN/timerdev.c | 10 ++--
+ drivers/macintosh/nvram.c | 2 +-
+ drivers/macintosh/via-pmu.c | 17 +++++-
+ drivers/media/dvb/dvb-core/dmxdev.c | 31 ++++++++---
+ drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 17 ++++--
+ drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +++++-----
+ drivers/media/dvb/dvb-core/dvb_net.c | 15 ++++--
+ drivers/media/dvb/dvb-core/dvbdev.c | 17 ++++--
+ drivers/media/dvb/dvb-core/dvbdev.h | 11 ++---
+ drivers/media/dvb/firewire/firedtv-ci.c | 5 +-
+ drivers/media/dvb/ttpci/av7110.c | 4 +-
+ drivers/media/dvb/ttpci/av7110_av.c | 8 ++--
+ drivers/media/dvb/ttpci/av7110_ca.c | 5 +-
+ drivers/mtd/mtdchar.c | 19 +++++--
+ drivers/pcmcia/pcmcia_ioctl.c | 17 +++++-
+ drivers/rtc/rtc-m41t80.c | 16 +++++-
+ drivers/sbus/char/openprom.c | 44 +++++++++-------
+ drivers/scsi/3w-9xxx.c | 10 +++-
+ drivers/scsi/3w-sas.c | 8 ++-
+ drivers/scsi/3w-xxxx.c | 11 +++-
+ drivers/scsi/aacraid/linit.c | 11 +++-
+ drivers/scsi/dpt_i2o.c | 20 ++++++-
+ drivers/scsi/gdth.c | 20 +++++--
+ drivers/scsi/megaraid.c | 20 ++++++-
+ drivers/scsi/megaraid.h | 3 +-
+ drivers/scsi/megaraid/megaraid_mm.c | 22 ++++++--
+ drivers/scsi/osst.c | 14 ++++--
+ drivers/scsi/sg.c | 17 +++++-
+ drivers/usb/mon/mon_bin.c | 23 ++++++--
+ drivers/usb/mon/mon_stat.c | 3 +-
+ fs/coda/pioctl.c | 76 ++++++++++++++------------
+ fs/coda/psdev.c | 5 +-
+ fs/hfsplus/dir.c | 2 +-
+ fs/hfsplus/hfsplus_fs.h | 3 +-
+ fs/hfsplus/inode.c | 2 +-
+ fs/hfsplus/ioctl.c | 12 +++-
+ fs/ncpfs/dir.c | 2 +-
+ fs/ncpfs/file.c | 2 +-
+ fs/ncpfs/ioctl.c | 27 ++++++----
+ fs/smbfs/dir.c | 2 +-
+ fs/smbfs/file.c | 2 +-
+ fs/smbfs/ioctl.c | 10 ++--
+ fs/smbfs/proto.h | 2 +-
+ include/linux/ncp_fs.h | 2 +-
+ 64 files changed, 611 insertions(+), 299 deletions(-)
+Merging quilt/driver-core
+$ git merge quilt/driver-core
+Resolved 'drivers/base/platform.c' using previous resolution.
+Auto-merging drivers/acpi/system.c
+Auto-merging drivers/base/platform.c
+CONFLICT (content): Merge conflict in drivers/base/platform.c
+Auto-merging drivers/block/loop.c
+Auto-merging drivers/gpu/drm/drm_sysfs.c
+Auto-merging drivers/md/bitmap.c
+Auto-merging drivers/md/md.c
+Auto-merging drivers/misc/eeprom/at24.c
+Auto-merging drivers/misc/eeprom/eeprom.c
+Auto-merging drivers/misc/eeprom/max6875.c
+Auto-merging drivers/net/netxen/netxen_nic_main.c
+Auto-merging drivers/net/qlcnic/qlcnic_main.c
+Auto-merging drivers/pci/pci-sysfs.c
+Auto-merging drivers/pcmcia/cistpl.c
+Auto-merging drivers/rtc/rtc-cmos.c
+Auto-merging drivers/rtc/rtc-stk17ta8.c
+Auto-merging drivers/scsi/3w-sas.c
+Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c
+Auto-merging drivers/scsi/lpfc/lpfc_attr.c
+Auto-merging drivers/scsi/qla2xxx/qla_attr.c
+Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c
+Auto-merging drivers/zorro/zorro-sysfs.c
+Auto-merging fs/ramfs/inode.c
+Auto-merging fs/sysfs/symlink.c
+Auto-merging include/linux/device.h
+Auto-merging include/linux/kref.h
+Auto-merging include/linux/ramfs.h
+Auto-merging kernel/lockdep.c
+Auto-merging kernel/module.c
+Auto-merging security/integrity/ima/ima_iint.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 86ab95b] Merge branch 'quilt/driver-core'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/sysfs-tagging.txt | 42 +++++
+ arch/alpha/kernel/pci-sysfs.c | 8 +-
+ arch/mips/txx9/generic/setup.c | 4 +-
+ arch/powerpc/sysdev/mv64x60_pci.c | 4 +-
+ arch/s390/kernel/ipl.c | 14 +-
+ drivers/acpi/system.c | 2 +-
+ drivers/base/Kconfig | 7 +-
+ drivers/base/class.c | 9 +
+ drivers/base/core.c | 130 ++++++++++++----
+ drivers/base/dd.c | 4 +-
+ drivers/base/devtmpfs.c | 5 +
+ drivers/base/firmware_class.c | 182 ++++++++++++----------
+ drivers/base/module.c | 4 +-
+ drivers/base/platform.c | 8 +-
+ drivers/block/loop.c | 10 +-
+ drivers/firmware/dcdbas.c | 4 +-
+ drivers/firmware/dell_rbu.c | 10 +-
+ drivers/firmware/efivars.c | 4 +-
+ drivers/gpio/gpiolib.c | 2 +-
+ drivers/gpu/drm/drm_sysfs.c | 5 +-
+ drivers/md/bitmap.c | 4 +-
+ drivers/md/md.c | 6 +-
+ drivers/misc/c2port/core.c | 4 +-
+ drivers/misc/ds1682.c | 6 +-
+ drivers/misc/eeprom/at24.c | 6 +-
+ drivers/misc/eeprom/at25.c | 6 +-
+ drivers/misc/eeprom/eeprom.c | 3 +-
+ drivers/misc/eeprom/max6875.c | 2 +-
+ drivers/net/mlx4/mlx4.h | 1 +
+ drivers/net/netxen/netxen_nic_main.c | 11 +-
+ drivers/net/qlcnic/qlcnic_main.c | 12 +-
+ drivers/pci/hotplug/acpiphp_ibm.c | 5 +-
+ drivers/pci/pci-sysfs.c | 45 ++++--
+ drivers/pcmcia/cistpl.c | 4 +-
+ drivers/power/olpc_battery.c | 2 +-
+ drivers/rapidio/rio-sysfs.c | 6 +-
+ drivers/rtc/rtc-cmos.c | 6 +-
+ drivers/rtc/rtc-ds1305.c | 6 +-
+ drivers/rtc/rtc-ds1307.c | 6 +-
+ drivers/rtc/rtc-ds1511.c | 10 +-
+ drivers/rtc/rtc-ds1553.c | 4 +-
+ drivers/rtc/rtc-ds1742.c | 4 +-
+ drivers/rtc/rtc-m48t59.c | 4 +-
+ drivers/rtc/rtc-stk17ta8.c | 4 +-
+ drivers/rtc/rtc-tx4939.c | 4 +-
+ drivers/s390/cio/chp.c | 5 +-
+ drivers/scsi/3w-sas.c | 4 +-
+ drivers/scsi/arcmsr/arcmsr_attr.c | 9 +-
+ drivers/scsi/ibmvscsi/ibmvfc.c | 3 +-
+ drivers/scsi/ipr.c | 9 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 20 ++-
+ drivers/scsi/qla2xxx/qla_attr.c | 32 ++--
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 +
+ drivers/staging/udlfb/udlfb.c | 3 +-
+ drivers/usb/core/sysfs.c | 3 +-
+ drivers/usb/core/usb.c | 2 +-
+ drivers/video/aty/radeon_base.c | 4 +-
+ drivers/w1/slaves/w1_ds2431.c | 4 +-
+ drivers/w1/slaves/w1_ds2433.c | 4 +-
+ drivers/w1/slaves/w1_ds2760.c | 2 +-
+ drivers/w1/w1.c | 4 +-
+ drivers/zorro/zorro-sysfs.c | 2 +-
+ fs/ramfs/inode.c | 2 +-
+ fs/sysfs/bin.c | 26 ++--
+ fs/sysfs/dir.c | 114 +++++++++++---
+ fs/sysfs/file.c | 17 ++-
+ fs/sysfs/group.c | 6 +-
+ fs/sysfs/inode.c | 6 +-
+ fs/sysfs/mount.c | 90 ++++++++++-
+ fs/sysfs/symlink.c | 35 ++++-
+ fs/sysfs/sysfs.h | 34 ++++-
+ include/linux/device.h | 12 +-
+ include/linux/kobject.h | 37 +++++
+ include/linux/kref.h | 1 -
+ include/linux/lockdep.h | 8 +
+ include/linux/ramfs.h | 2 +
+ include/linux/sysfs.h | 25 +++-
+ kernel/ksysfs.c | 3 +-
+ kernel/lockdep.c | 5 +
+ kernel/module.c | 2 +-
+ kernel/user_namespace.c | 4 +-
+ lib/kobject.c | 115 ++++++++++++++
+ lib/kref.c | 15 +--
+ net/bridge/br_sysfs_br.c | 2 +-
+ scripts/checkpatch.pl | 11 ++
+ security/integrity/ima/ima_iint.c | 4 +-
+ 86 files changed, 965 insertions(+), 351 deletions(-)
+ create mode 100644 Documentation/filesystems/sysfs-tagging.txt
+$ git am -3 ../patches/0001-md-fixup-for-sysfs_get_dirent-API-change.patch
+Applying: md: fixup for sysfs_get_dirent API change
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/md/md.c
+$ git add .
+$ git commit -v -a --amend
+[master a9f070d] Merge branch 'quilt/driver-core'
+Merging quilt/tty
+$ git merge quilt/tty
+Resolved 'include/linux/tty.h' using previous resolution.
+Auto-merging drivers/char/serial167.c
+Auto-merging drivers/serial/Kconfig
+Auto-merging drivers/serial/apbuart.c
+Auto-merging drivers/serial/uartlite.c
+Auto-merging include/linux/serial_core.h
+Auto-merging include/linux/tty.h
+CONFLICT (content): Merge conflict in include/linux/tty.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 3cd7b91] Merge branch 'quilt/tty'
+$ git diff -M --stat --summary HEAD^..
+ drivers/char/Kconfig | 10 +-
+ drivers/char/Makefile | 1 +
+ drivers/char/isicom.c | 8 +-
+ drivers/char/n_gsm.c | 2763 ++++++++++++++++++++++++++++++++++++++
+ drivers/char/serial167.c | 223 +---
+ drivers/char/tty_buffer.c | 2 +-
+ drivers/serial/Kconfig | 82 ++-
+ drivers/serial/Makefile | 2 +
+ drivers/serial/altera_jtaguart.c | 504 +++++++
+ drivers/serial/altera_uart.c | 570 ++++++++
+ drivers/serial/apbuart.c | 19 +-
+ drivers/serial/bfin_sport_uart.c | 209 ++-
+ drivers/serial/bfin_sport_uart.h | 27 +-
+ drivers/serial/timbuart.c | 25 +-
+ drivers/serial/uartlite.c | 32 +-
+ include/linux/altera_jtaguart.h | 16 +
+ include/linux/altera_uart.h | 14 +
+ include/linux/gsmmux.h | 25 +
+ include/linux/serial_core.h | 4 +
+ include/linux/tty.h | 3 +-
+ 20 files changed, 4210 insertions(+), 329 deletions(-)
+ create mode 100644 drivers/char/n_gsm.c
+ create mode 100644 drivers/serial/altera_jtaguart.c
+ create mode 100644 drivers/serial/altera_uart.c
+ create mode 100644 include/linux/altera_jtaguart.h
+ create mode 100644 include/linux/altera_uart.h
+ create mode 100644 include/linux/gsmmux.h
+Merging quilt/usb
+$ git merge quilt/usb
+Resolved 'drivers/input/tablet/acecad.c' using previous resolution.
+Resolved 'drivers/input/tablet/kbtab.c' using previous resolution.
+Resolved 'drivers/input/tablet/wacom_sys.c' using previous resolution.
+Resolved 'drivers/media/video/gspca/gspca.c' using previous resolution.
+Renaming sound/usb/ua101.c => sound/usb/misc/ua101.c
+Auto-merging sound/usb/misc/ua101.c
+Renaming sound/usb/usbmidi.c => sound/usb/midi.c
+Auto-merging sound/usb/midi.c
+Auto-merging arch/arm/mach-omap2/board-omap3evm.c
+Auto-merging drivers/hid/usbhid/hid-core.c
+Auto-merging drivers/hid/usbhid/usbkbd.c
+Auto-merging drivers/input/misc/ati_remote2.c
+Auto-merging drivers/input/tablet/acecad.c
+CONFLICT (content): Merge conflict in drivers/input/tablet/acecad.c
+Auto-merging drivers/input/tablet/kbtab.c
+CONFLICT (content): Merge conflict in drivers/input/tablet/kbtab.c
+Auto-merging drivers/input/tablet/wacom_sys.c
+CONFLICT (content): Merge conflict in drivers/input/tablet/wacom_sys.c
+Auto-merging drivers/media/video/au0828/au0828-video.c
+Auto-merging drivers/media/video/cx231xx/cx231xx-core.c
+Auto-merging drivers/media/video/em28xx/em28xx-core.c
+Auto-merging drivers/media/video/gspca/gspca.c
+CONFLICT (content): Merge conflict in drivers/media/video/gspca/gspca.c
+Auto-merging drivers/media/video/hdpvr/hdpvr-video.c
+Auto-merging drivers/media/video/tlg2300/pd-main.c
+Auto-merging drivers/media/video/tlg2300/pd-video.c
+Auto-merging drivers/net/can/usb/ems_usb.c
+Auto-merging drivers/net/usb/kaweth.c
+Auto-merging drivers/net/wimax/i2400m/usb.c
+Auto-merging drivers/net/wireless/ath/ar9170/usb.c
+Auto-merging drivers/usb/atm/ueagle-atm.c
+Auto-merging drivers/usb/host/ehci-omap.c
+Auto-merging drivers/usb/host/fhci-hcd.c
+Auto-merging drivers/usb/host/isp1760-if.c
+Auto-merging drivers/usb/mon/mon_bin.c
+Removing drivers/usb/serial/ipaq.h
+Auto-merging drivers/usb/wusbcore/wa-xfer.c
+Auto-merging include/linux/usb/audio.h
+Auto-merging include/linux/wait.h
+Auto-merging kernel/sched.c
+CONFLICT (delete/modify): sound/usb/usbaudio.c deleted in HEAD and modified in quilt/usb. Version quilt/usb of sound/usb/usbaudio.c left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f sound/usb/usbaudio.c
+drivers/input/tablet/acecad.c: needs merge
+drivers/input/tablet/kbtab.c: needs merge
+drivers/input/tablet/wacom_sys.c: needs merge
+drivers/media/video/gspca/gspca.c: needs merge
+sound/usb/usbaudio.c: needs merge
+rm 'sound/usb/usbaudio.c'
+$ git commit -v -a
+[master 99b7f83] Merge branch 'quilt/usb'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/obsolete/sysfs-bus-usb | 31 +
+ Documentation/ABI/testing/sysfs-bus-usb | 28 -
+ .../testing/sysfs-devices-platform-_UDC_-gadget | 9 +
+ Documentation/DocBook/writing_usb_driver.tmpl | 2 +-
+ Documentation/usb/bulk-streams.txt | 78 +
+ Documentation/usb/dma.txt | 22 +-
+ Documentation/usb/gadget_hid.txt | 445 ++++
+ Documentation/usb/power-management.txt | 19 +-
+ Documentation/usb/usb-serial.txt | 29 +-
+ arch/arm/mach-omap2/board-omap3evm.c | 3 +
+ arch/arm/mach-omap2/usb-ehci.c | 155 ++
+ arch/arm/mach-omap2/usb-musb.c | 1 +
+ arch/arm/plat-omap/include/plat/usb.h | 24 +
+ drivers/hid/usbhid/hid-core.c | 20 +-
+ drivers/hid/usbhid/usbhid.h | 1 -
+ drivers/hid/usbhid/usbkbd.c | 16 +-
+ drivers/hid/usbhid/usbmouse.c | 6 +-
+ drivers/input/joystick/xpad.c | 16 +-
+ drivers/input/misc/ati_remote.c | 12 +-
+ drivers/input/misc/ati_remote2.c | 4 +-
+ drivers/input/misc/cm109.c | 28 +-
+ drivers/input/misc/keyspan_remote.c | 6 +-
+ drivers/input/misc/powermate.c | 17 +-
+ drivers/input/misc/yealink.c | 25 +-
+ drivers/input/mouse/appletouch.c | 12 +-
+ drivers/input/mouse/bcm5974.c | 24 +-
+ drivers/input/tablet/acecad.c | 6 +-
+ drivers/input/tablet/aiptek.c | 14 +-
+ drivers/input/tablet/gtco.c | 12 +-
+ drivers/input/tablet/kbtab.c | 6 +-
+ drivers/input/tablet/wacom_sys.c | 8 +-
+ drivers/input/touchscreen/usbtouchscreen.c | 8 +-
+ drivers/media/dvb/dvb-usb/usb-urb.c | 7 +-
+ drivers/media/dvb/ttusb-dec/ttusb_dec.c | 6 +-
+ drivers/media/video/au0828/au0828-video.c | 4 +-
+ drivers/media/video/cx231xx/cx231xx-core.c | 14 +-
+ drivers/media/video/em28xx/em28xx-core.c | 4 +-
+ drivers/media/video/gspca/benq.c | 4 +-
+ drivers/media/video/gspca/gspca.c | 30 +-
+ drivers/media/video/hdpvr/hdpvr-video.c | 8 +-
+ drivers/media/video/tlg2300/pd-main.c | 2 +-
+ drivers/media/video/tlg2300/pd-video.c | 14 +-
+ drivers/media/video/usbvision/usbvision-core.c | 16 +-
+ drivers/media/video/uvc/uvc_video.c | 4 +-
+ drivers/net/can/usb/ems_usb.c | 18 +-
+ drivers/net/usb/ipheth.c | 24 +-
+ drivers/net/usb/kaweth.c | 12 +-
+ drivers/net/wimax/i2400m/usb.c | 2 +-
+ drivers/net/wireless/ath/ar9170/usb.c | 8 +-
+ drivers/net/wireless/zd1211rw/zd_usb.c | 10 +-
+ drivers/staging/rt2860/iface/rtmp_usb.h | 4 +-
+ drivers/staging/udlfb/udlfb.c | 8 +-
+ drivers/staging/usbip/stub_rx.c | 2 +-
+ drivers/staging/usbip/usbip_common.c | 2 +-
+ drivers/staging/usbip/vhci.h | 2 +-
+ drivers/usb/atm/ueagle-atm.c | 347 ++--
+ drivers/usb/c67x00/c67x00-hcd.h | 2 +-
+ drivers/usb/class/cdc-acm.c | 22 +-
+ drivers/usb/class/cdc-acm.h | 4 +-
+ drivers/usb/class/cdc-wdm.c | 38 +-
+ drivers/usb/class/usblp.c | 2 +-
+ drivers/usb/core/buffer.c | 2 +-
+ drivers/usb/core/config.c | 214 +--
+ drivers/usb/core/devices.c | 19 +-
+ drivers/usb/core/devio.c | 3 +-
+ drivers/usb/core/driver.c | 60 +-
+ drivers/usb/core/generic.c | 2 +-
+ drivers/usb/core/hcd-pci.c | 2 +-
+ drivers/usb/core/hcd.c | 246 ++-
+ drivers/usb/core/hub.c | 30 +-
+ drivers/usb/core/inode.c | 2 +-
+ drivers/usb/core/message.c | 133 +-
+ drivers/usb/core/quirks.c | 4 +
+ drivers/usb/core/sysfs.c | 22 +-
+ drivers/usb/core/urb.c | 18 +-
+ drivers/usb/core/usb.c | 94 +-
+ drivers/usb/gadget/Kconfig | 58 +-
+ drivers/usb/gadget/Makefile | 8 +-
+ drivers/usb/gadget/atmel_usba_udc.c | 3 +-
+ drivers/usb/gadget/composite.c | 60 +-
+ drivers/usb/gadget/config.c | 4 +-
+ drivers/usb/gadget/dummy_hcd.c | 4 +-
+ drivers/usb/gadget/epautoconf.c | 12 +-
+ drivers/usb/gadget/f_acm.c | 32 +-
+ drivers/usb/gadget/f_ecm.c | 33 +-
+ drivers/usb/gadget/f_fs.c | 2442 ++++++++++++++++++++
+ drivers/usb/gadget/f_hid.c | 673 ++++++
+ drivers/usb/gadget/f_mass_storage.c | 138 +-
+ drivers/usb/gadget/f_rndis.c | 33 +-
+ drivers/usb/gadget/f_uvc.c | 661 ++++++
+ drivers/usb/gadget/f_uvc.h | 376 +++
+ .../usb/gadget/{fsl_mx3_udc.c => fsl_mxc_udc.c} | 14 +-
+ drivers/usb/gadget/fsl_udc_core.c | 2 +-
+ drivers/usb/gadget/g_ffs.c | 426 ++++
+ drivers/usb/gadget/hid.c | 298 +++
+ drivers/usb/gadget/pxa27x_udc.h | 2 +-
+ drivers/usb/gadget/u_ether.c | 4 +-
+ drivers/usb/gadget/uvc.h | 241 ++
+ drivers/usb/gadget/uvc_queue.c | 583 +++++
+ drivers/usb/gadget/uvc_queue.h | 89 +
+ drivers/usb/gadget/uvc_v4l2.c | 374 +++
+ drivers/usb/gadget/uvc_video.c | 386 +++
+ drivers/usb/gadget/webcam.c | 399 ++++
+ drivers/usb/host/Kconfig | 15 +
+ drivers/usb/host/ehci-au1xxx.c | 27 +-
+ drivers/usb/host/ehci-fsl.c | 2 +
+ drivers/usb/host/ehci-hcd.c | 3 +-
+ drivers/usb/host/ehci-hub.c | 182 ++-
+ drivers/usb/host/ehci-omap.c | 21 +-
+ drivers/usb/host/ehci-pci.c | 18 +-
+ drivers/usb/host/ehci-q.c | 2 +-
+ drivers/usb/host/ehci.h | 18 +-
+ drivers/usb/host/fhci-dbg.c | 2 +-
+ drivers/usb/host/fhci-hcd.c | 2 +-
+ drivers/usb/host/fhci-hub.c | 2 +-
+ drivers/usb/host/fhci-mem.c | 2 +-
+ drivers/usb/host/fhci-q.c | 2 +-
+ drivers/usb/host/fhci-sched.c | 2 +-
+ drivers/usb/host/fhci-tds.c | 2 +-
+ drivers/usb/host/fhci.h | 11 +-
+ drivers/usb/host/imx21-hcd.c | 2 +-
+ drivers/usb/host/isp116x-hcd.c | 2 +-
+ drivers/usb/host/isp1362-hcd.c | 6 +-
+ drivers/usb/host/isp1760-hcd.c | 29 +-
+ drivers/usb/host/isp1760-if.c | 13 +-
+ drivers/usb/host/ohci-hcd.c | 33 +-
+ drivers/usb/host/ohci-omap3.c | 735 ++++++
+ drivers/usb/host/oxu210hp-hcd.c | 31 +-
+ drivers/usb/host/r8a66597-hcd.c | 39 +-
+ drivers/usb/host/sl811-hcd.c | 60 +-
+ drivers/usb/host/u132-hcd.c | 6 +-
+ drivers/usb/host/uhci-hcd.c | 2 +-
+ drivers/usb/host/whci/debug.c | 2 +-
+ drivers/usb/host/whci/qset.c | 6 +-
+ drivers/usb/host/xhci-dbg.c | 24 +
+ drivers/usb/host/xhci-hub.c | 39 +-
+ drivers/usb/host/xhci-mem.c | 489 ++++-
+ drivers/usb/host/xhci-pci.c | 6 +-
+ drivers/usb/host/xhci-ring.c | 310 ++-
+ drivers/usb/host/xhci.c | 416 ++++-
+ drivers/usb/host/xhci.h | 112 +-
+ drivers/usb/misc/appledisplay.c | 6 +-
+ drivers/usb/misc/ftdi-elan.c | 20 +-
+ drivers/usb/misc/iowarrior.c | 12 +-
+ drivers/usb/misc/sisusbvga/sisusb.c | 13 +-
+ drivers/usb/misc/sisusbvga/sisusb_con.c | 8 +-
+ drivers/usb/misc/usblcd.c | 8 +-
+ drivers/usb/misc/usbtest.c | 17 +-
+ drivers/usb/mon/mon_bin.c | 4 +-
+ drivers/usb/mon/mon_main.c | 3 +-
+ drivers/usb/mon/mon_text.c | 6 +-
+ drivers/usb/musb/Kconfig | 6 +-
+ drivers/usb/musb/Makefile | 14 +-
+ drivers/usb/musb/blackfin.c | 96 +-
+ drivers/usb/musb/davinci.c | 2 +-
+ drivers/usb/musb/musb_core.c | 147 +-
+ drivers/usb/musb/musb_core.h | 10 +-
+ drivers/usb/musb/musb_debug.h | 13 +
+ drivers/usb/musb/musb_debugfs.c | 295 +++
+ drivers/usb/musb/musb_gadget_ep0.c | 25 +
+ drivers/usb/musb/musb_regs.h | 10 +
+ drivers/usb/musb/musb_virthub.c | 4 +-
+ drivers/usb/musb/musbhsdma.h | 16 +-
+ drivers/usb/musb/omap2430.c | 29 +-
+ drivers/usb/musb/tusb6010.c | 2 +-
+ drivers/usb/otg/isp1301_omap.c | 2 +-
+ drivers/usb/otg/twl4030-usb.c | 108 +-
+ drivers/usb/otg/ulpi.c | 50 +-
+ drivers/usb/serial/Kconfig | 23 +
+ drivers/usb/serial/Makefile | 2 +
+ drivers/usb/serial/aircable.c | 499 +----
+ drivers/usb/serial/ark3116.c | 111 +-
+ drivers/usb/serial/belkin_sa.c | 130 +-
+ drivers/usb/serial/belkin_sa.h | 10 +-
+ drivers/usb/serial/ch341.c | 5 +-
+ drivers/usb/serial/console.c | 27 +-
+ drivers/usb/serial/cp210x.c | 63 +-
+ drivers/usb/serial/cypress_m8.c | 242 +--
+ drivers/usb/serial/cypress_m8.h | 53 +-
+ drivers/usb/serial/digi_acceleport.c | 4 +-
+ drivers/usb/serial/empeg.c | 401 +----
+ drivers/usb/serial/ftdi_sio.c | 457 +----
+ drivers/usb/serial/ftdi_sio.h | 126 +-
+ drivers/usb/serial/ftdi_sio_ids.h | 42 +-
+ drivers/usb/serial/generic.c | 330 +--
+ drivers/usb/serial/io_edgeport.c | 3 +-
+ drivers/usb/serial/io_edgeport.h | 16 +-
+ drivers/usb/serial/io_ionsp.h | 95 +-
+ drivers/usb/serial/io_ti.h | 92 +-
+ drivers/usb/serial/io_usbvend.h | 87 +-
+ drivers/usb/serial/ipaq.c | 357 +---
+ drivers/usb/serial/ipaq.h | 54 -
+ drivers/usb/serial/ipw.c | 184 +--
+ drivers/usb/serial/ir-usb.c | 270 +--
+ drivers/usb/serial/iuu_phoenix.c | 30 +-
+ drivers/usb/serial/kl5kusb105.h | 47 +-
+ drivers/usb/serial/kobil_sct.c | 3 +-
+ drivers/usb/serial/kobil_sct.h | 75 +-
+ drivers/usb/serial/mct_u232.c | 7 +-
+ drivers/usb/serial/mct_u232.h | 254 ++-
+ drivers/usb/serial/mos7720.c | 1130 +++++++---
+ drivers/usb/serial/mos7840.c | 1 -
+ drivers/usb/serial/option.c | 841 ++-----
+ drivers/usb/serial/oti6858.c | 254 +--
+ drivers/usb/serial/pl2303.c | 430 +----
+ drivers/usb/serial/pl2303.h | 6 +-
+ drivers/usb/serial/qcaux.c | 5 +
+ drivers/usb/serial/qcserial.c | 64 +-
+ drivers/usb/serial/spcp8x5.c | 407 +---
+ drivers/usb/serial/usb-serial.c | 47 +-
+ drivers/usb/serial/usb-wwan.h | 67 +
+ drivers/usb/serial/usb_debug.c | 12 +-
+ drivers/usb/serial/usb_wwan.c | 665 ++++++
+ drivers/usb/serial/visor.c | 344 +---
+ drivers/usb/serial/visor.h | 9 +-
+ drivers/usb/serial/zio.c | 64 +
+ drivers/usb/storage/isd200.c | 4 +-
+ drivers/usb/storage/onetouch.c | 12 +-
+ drivers/usb/storage/transport.c | 2 -
+ drivers/usb/storage/unusual_devs.h | 24 +-
+ drivers/usb/storage/usb.c | 87 +-
+ drivers/usb/storage/usb.h | 3 +-
+ drivers/usb/usb-skeleton.c | 10 +-
+ drivers/usb/wusbcore/wa-xfer.c | 2 -
+ drivers/usb/wusbcore/wusbhc.h | 4 +-
+ drivers/watchdog/pcwd_usb.c | 6 +-
+ fs/timerfd.c | 25 +-
+ include/linux/usb.h | 137 +-
+ include/linux/usb/Kbuild | 1 +
+ include/linux/usb/atmel_usba_udc.h | 2 +-
+ include/linux/usb/audio.h | 6 +-
+ include/linux/usb/cdc.h | 94 +
+ drivers/usb/core/hub.h => include/linux/usb/ch11.h | 60 +-
+ include/linux/usb/ch9.h | 16 +-
+ include/linux/usb/composite.h | 1 +
+ include/linux/usb/ehci_def.h | 6 +-
+ include/linux/usb/functionfs.h | 199 ++
+ include/linux/usb/g_hid.h | 32 +
+ include/linux/usb/gadget.h | 6 +-
+ include/linux/usb/gadgetfs.h | 2 +-
+ {drivers/usb/core => include/linux/usb}/hcd.h | 75 +-
+ include/linux/usb/langwell_udc.h | 2 +-
+ include/linux/usb/musb.h | 40 +-
+ include/linux/usb/ncm.h | 114 +
+ include/linux/usb/net2280.h | 6 +-
+ include/linux/usb/quirks.h | 4 +
+ include/linux/usb/rndis_host.h | 70 +-
+ include/linux/usb/serial.h | 36 +-
+ include/linux/usb/ulpi.h | 140 ++
+ include/linux/usb/usbnet.h | 40 +-
+ include/linux/usb/wusb-wa.h | 2 +-
+ include/linux/wait.h | 149 ++
+ kernel/sched.c | 1 +
+ sound/usb/midi.c | 14 +-
+ sound/usb/misc/ua101.c | 16 +-
+ tools/usb/ffs-test.c | 554 +++++
+ tools/usb/testusb.c | 547 +++++
+ 257 files changed, 17068 insertions(+), 7442 deletions(-)
+ create mode 100644 Documentation/ABI/obsolete/sysfs-bus-usb
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget
+ create mode 100644 Documentation/usb/bulk-streams.txt
+ create mode 100644 Documentation/usb/gadget_hid.txt
+ create mode 100644 drivers/usb/gadget/f_fs.c
+ create mode 100644 drivers/usb/gadget/f_hid.c
+ create mode 100644 drivers/usb/gadget/f_uvc.c
+ create mode 100644 drivers/usb/gadget/f_uvc.h
+ rename drivers/usb/gadget/{fsl_mx3_udc.c => fsl_mxc_udc.c} (89%)
+ create mode 100644 drivers/usb/gadget/g_ffs.c
+ create mode 100644 drivers/usb/gadget/hid.c
+ create mode 100644 drivers/usb/gadget/uvc.h
+ create mode 100644 drivers/usb/gadget/uvc_queue.c
+ create mode 100644 drivers/usb/gadget/uvc_queue.h
+ create mode 100644 drivers/usb/gadget/uvc_v4l2.c
+ create mode 100644 drivers/usb/gadget/uvc_video.c
+ create mode 100644 drivers/usb/gadget/webcam.c
+ create mode 100644 drivers/usb/host/ohci-omap3.c
+ create mode 100644 drivers/usb/musb/musb_debugfs.c
+ delete mode 100644 drivers/usb/serial/ipaq.h
+ create mode 100644 drivers/usb/serial/usb-wwan.h
+ create mode 100644 drivers/usb/serial/usb_wwan.c
+ create mode 100644 drivers/usb/serial/zio.c
+ rename drivers/usb/core/hub.h => include/linux/usb/ch11.h (72%)
+ create mode 100644 include/linux/usb/functionfs.h
+ create mode 100644 include/linux/usb/g_hid.h
+ rename {drivers/usb/core => include/linux/usb}/hcd.h (89%)
+ create mode 100644 include/linux/usb/ncm.h
+ create mode 100644 tools/usb/ffs-test.c
+ create mode 100644 tools/usb/testusb.c
+$ git am -3 ../patches/usb__update_gfp_slab.h_includes
+Applying: usb: update gfp/slab.h includes
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/usb/musb/musb_debugfs.c
+$ git add .
+$ git commit -v -a --amend
+[master e6cb17a] Merge branch 'quilt/usb'
+$ git am -3 ../patches/0001-sound-fixup-for-usb_buffer_alloc-free-rename.patch
+Applying: sound: fixup for usb_buffer_alloc/free rename
+$ git reset HEAD^
+Unstaged changes after reset:
+M sound/usb/urb.c
+$ git add .
+$ git commit -v -a --amend
+[master 4ab5cf2] Merge branch 'quilt/usb'
+Merging staging-next/staging-next
+$ git merge staging-next/staging-next
+Renaming drivers/staging/hv/Hv.c => drivers/staging/hv/hv.c
+Auto-merging drivers/staging/hv/hv.c
+CONFLICT (rename/modify): Merge conflict in drivers/staging/hv/hv.c
+Renaming drivers/staging/hv/RndisFilter.c => drivers/staging/hv/rndis_filter.c
+Auto-merging drivers/staging/hv/rndis_filter.c
+Auto-merging drivers/staging/Kconfig
+Auto-merging drivers/staging/Makefile
+Removing drivers/staging/arlan/Kconfig
+Removing drivers/staging/arlan/Makefile
+Removing drivers/staging/arlan/TODO
+CONFLICT (delete/modify): drivers/staging/arlan/arlan-main.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/arlan/arlan-main.c left in tree.
+Removing drivers/staging/arlan/arlan-proc.c
+Removing drivers/staging/arlan/arlan.h
+Removing drivers/staging/batman-adv/proc.c
+Removing drivers/staging/batman-adv/proc.h
+Removing drivers/staging/comedi/comedi_ksyms.c
+Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c
+CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.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/ni_labpc_cs.c
+Auto-merging drivers/staging/comedi/drivers/ni_mio_cs.c
+Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c
+Removing drivers/staging/comedi/kcomedilib/data.c
+Removing drivers/staging/comedi/kcomedilib/dio.c
+Removing drivers/staging/comedi/kcomedilib/get.c
+Removing drivers/staging/comedi/kcomedilib/ksyms.c
+Removing drivers/staging/comedi/pci_ids.h
+Removing drivers/staging/comedi/wrapper.h
+Auto-merging drivers/staging/cx25821/cx25821-alsa.c
+CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-alsa.c
+Auto-merging drivers/staging/cx25821/cx25821-audio-upstream.c
+Auto-merging drivers/staging/cx25821/cx25821-core.c
+Auto-merging drivers/staging/cx25821/cx25821-video-upstream.c
+Removing drivers/staging/dream/smd/Kconfig
+Removing drivers/staging/dream/smd/Makefile
+Removing drivers/staging/dream/smd/rpc_server_dog_keepalive.c
+Removing drivers/staging/dream/smd/rpc_server_time_remote.c
+Removing drivers/staging/dream/smd/smd.c
+Removing drivers/staging/dream/smd/smd_private.h
+Removing drivers/staging/dream/smd/smd_qmi.c
+Removing drivers/staging/dream/smd/smd_rpcrouter.c
+Removing drivers/staging/dream/smd/smd_rpcrouter.h
+Removing drivers/staging/dream/smd/smd_rpcrouter_device.c
+Removing drivers/staging/dream/smd/smd_rpcrouter_servers.c
+Removing drivers/staging/dream/smd/smd_tty.c
+Auto-merging drivers/staging/dt3155/dt3155_drv.c
+CONFLICT (content): Merge conflict in drivers/staging/dt3155/dt3155_drv.c
+Auto-merging drivers/staging/et131x/et131x_netdev.c
+Auto-merging drivers/staging/hv/netvsc_drv.c
+Auto-merging drivers/staging/iio/accel/lis3l02dq_core.c
+Auto-merging drivers/staging/iio/accel/lis3l02dq_ring.c
+Auto-merging drivers/staging/iio/adc/max1363_core.c
+Auto-merging drivers/staging/iio/industrialio-core.c
+Auto-merging drivers/staging/iio/light/tsl2563.c
+Auto-merging drivers/staging/iio/ring_sw.c
+Removing drivers/staging/netwave/Kconfig
+Removing drivers/staging/netwave/Makefile
+Removing drivers/staging/netwave/TODO
+CONFLICT (delete/modify): drivers/staging/netwave/netwave_cs.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/netwave/netwave_cs.c left in tree.
+Removing drivers/staging/poch/Kconfig
+Removing drivers/staging/poch/Makefile
+Removing drivers/staging/poch/README
+Removing drivers/staging/poch/poch.c
+Removing drivers/staging/poch/poch.h
+Auto-merging drivers/staging/rt2860/usb_main_dev.c
+Auto-merging drivers/staging/rtl8187se/r8180_core.c
+CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/r8180_core.c
+Auto-merging drivers/staging/rtl8192e/r8192E_core.c
+Removing drivers/staging/rtl8192su/r8180_93cx6.c
+Removing drivers/staging/rtl8192su/r8180_93cx6.h
+Auto-merging drivers/staging/rtl8192su/r8192U_core.c
+Removing drivers/staging/strip/Kconfig
+Removing drivers/staging/strip/Makefile
+Removing drivers/staging/strip/TODO
+RemovResolved 'drivers/staging/comedi/drivers/cb_das16_cs.c' using previous resolution.
+Resolved 'drivers/staging/cx25821/cx25821-alsa.c' using previous resolution.
+Resolved 'drivers/staging/dt3155/dt3155_drv.c' using previous resolution.
+Resolved 'drivers/staging/hv/hv.c' using previous resolution.
+Resolved 'drivers/staging/rtl8187se/r8180_core.c' using previous resolution.
+Resolved 'drivers/staging/wlags49_h2/wl_cs.c' using previous resolution.
+ing drivers/staging/strip/strip.c
+Auto-merging drivers/staging/udlfb/udlfb.c
+Auto-merging drivers/staging/usbip/stub_rx.c
+Auto-merging drivers/staging/vme/bridges/vme_tsi148.c
+Auto-merging drivers/staging/vt6655/device_main.c
+Auto-merging drivers/staging/vt6655/rxtx.c
+Auto-merging drivers/staging/vt6656/main_usb.c
+Auto-merging drivers/staging/vt6656/rxtx.c
+Removing drivers/staging/wavelan/Kconfig
+Removing drivers/staging/wavelan/Makefile
+Removing drivers/staging/wavelan/TODO
+Removing drivers/staging/wavelan/i82586.h
+CONFLICT (delete/modify): drivers/staging/wavelan/wavelan.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/wavelan/wavelan.c left in tree.
+Removing drivers/staging/wavelan/wavelan.h
+Removing drivers/staging/wavelan/wavelan.p.h
+CONFLICT (delete/modify): drivers/staging/wavelan/wavelan_cs.c deleted in staging-next/staging-next and modified in HEAD. Version HEAD of drivers/staging/wavelan/wavelan_cs.c left in tree.
+Removing drivers/staging/wavelan/wavelan_cs.h
+Removing drivers/staging/wavelan/wavelan_cs.p.h
+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
+Auto-merging drivers/staging/wlags49_h2/wl_netdev.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f drivers/staging/arlan/arlan-main.c drivers/staging/netwave/netwave_cs.c drivers/staging/wavelan/wavelan.c drivers/staging/wavelan/wavelan_cs.c
+drivers/staging/arlan/arlan-main.c: needs merge
+drivers/staging/comedi/drivers/cb_das16_cs.c: needs merge
+drivers/staging/cx25821/cx25821-alsa.c: needs merge
+drivers/staging/dt3155/dt3155_drv.c: needs merge
+drivers/staging/hv/hv.c: needs merge
+drivers/staging/netwave/netwave_cs.c: needs merge
+drivers/staging/rtl8187se/r8180_core.c: needs merge
+drivers/staging/wavelan/wavelan.c: needs merge
+drivers/staging/wavelan/wavelan_cs.c: needs merge
+drivers/staging/wlags49_h2/wl_cs.c: needs merge
+rm 'drivers/staging/arlan/arlan-main.c'
+rm 'drivers/staging/netwave/netwave_cs.c'
+rm 'drivers/staging/wavelan/wavelan.c'
+rm 'drivers/staging/wavelan/wavelan_cs.c'
+$ git commit -v -a
+[master 51e32a3] Merge remote branch 'staging-next/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/staging/Kconfig | 18 +-
+ drivers/staging/Makefile | 11 +-
+ drivers/staging/adis16255/Kconfig | 11 +
+ drivers/staging/adis16255/Makefile | 1 +
+ drivers/staging/adis16255/adis16255.c | 466 ++
+ drivers/staging/adis16255/adis16255.h | 12 +
+ drivers/staging/arlan/Kconfig | 15 -
+ drivers/staging/arlan/Makefile | 3 -
+ drivers/staging/arlan/TODO | 7 -
+ drivers/staging/arlan/arlan-main.c | 1883 --------
+ drivers/staging/arlan/arlan-proc.c | 1210 -----
+ drivers/staging/arlan/arlan.h | 535 ---
+ drivers/staging/asus_oled/asus_oled.c | 2 +-
+ drivers/staging/batman-adv/CHANGELOG | 14 +
+ drivers/staging/batman-adv/Makefile | 4 +-
+ drivers/staging/batman-adv/README | 255 +-
+ drivers/staging/batman-adv/TODO | 23 +-
+ drivers/staging/batman-adv/aggregation.c | 45 +-
+ drivers/staging/batman-adv/aggregation.h | 7 +-
+ drivers/staging/batman-adv/bat_sysfs.c | 484 ++
+ drivers/staging/batman-adv/bat_sysfs.h | 29 +
+ drivers/staging/batman-adv/bitarray.c | 76 +-
+ drivers/staging/batman-adv/bitarray.h | 2 +-
+ drivers/staging/batman-adv/device.c | 37 +-
+ drivers/staging/batman-adv/device.h | 2 +-
+ drivers/staging/batman-adv/hard-interface.c | 530 ++--
+ drivers/staging/batman-adv/hard-interface.h | 20 +-
+ drivers/staging/batman-adv/hash.c | 2 +-
+ drivers/staging/batman-adv/hash.h | 2 +-
+ drivers/staging/batman-adv/main.c | 60 +-
+ drivers/staging/batman-adv/main.h | 23 +-
+ drivers/staging/batman-adv/originator.c | 295 ++-
+ drivers/staging/batman-adv/originator.h | 7 +-
+ drivers/staging/batman-adv/packet.h | 2 +-
+ drivers/staging/batman-adv/proc.c | 670 ---
+ drivers/staging/batman-adv/proc.h | 40 -
+ drivers/staging/batman-adv/ring_buffer.c | 2 +-
+ drivers/staging/batman-adv/ring_buffer.h | 2 +-
+ drivers/staging/batman-adv/routing.c | 221 +-
+ drivers/staging/batman-adv/routing.h | 2 +-
+ drivers/staging/batman-adv/send.c | 149 +-
+ drivers/staging/batman-adv/send.h | 6 +-
+ drivers/staging/batman-adv/soft-interface.c | 30 +-
+ drivers/staging/batman-adv/soft-interface.h | 2 +-
+ drivers/staging/batman-adv/translation-table.c | 92 +-
+ drivers/staging/batman-adv/translation-table.h | 8 +-
+ drivers/staging/batman-adv/types.h | 54 +-
+ drivers/staging/batman-adv/vis.c | 353 ++-
+ drivers/staging/batman-adv/vis.h | 19 +-
+ drivers/staging/comedi/Makefile | 1 -
+ drivers/staging/comedi/comedi.h | 202 +-
+ drivers/staging/comedi/comedi_compat32.c | 3 +-
+ drivers/staging/comedi/comedi_fops.c | 242 +-
+ drivers/staging/comedi/comedi_fops.h | 1 +
+ drivers/staging/comedi/comedi_ksyms.c | 69 -
+ drivers/staging/comedi/comedidev.h | 34 +-
+ drivers/staging/comedi/comedilib.h | 170 +-
+ drivers/staging/comedi/drivers.c | 112 +-
+ drivers/staging/comedi/drivers/8253.h | 3 +-
+ drivers/staging/comedi/drivers/8255.c | 1 +
+ drivers/staging/comedi/drivers/8255.h | 22 -
+ drivers/staging/comedi/drivers/Makefile | 1 +
+ .../comedi/drivers/addi-data/addi_amcc_s5933.h | 6 +-
+ .../staging/comedi/drivers/addi-data/addi_common.c | 13 +-
+ .../staging/comedi/drivers/addi-data/addi_common.h | 2 +-
+ .../comedi/drivers/addi-data/amcc_s5933_58.h | 4 +-
+ .../comedi/drivers/addi-data/hwdrv_apci035.c | 6 +-
+ .../comedi/drivers/addi-data/hwdrv_apci035.h | 16 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1032.c | 4 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1500.c | 94 +-
+ .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 +-
+ .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3501.h | 2 +-
+ .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 191 +-
+ drivers/staging/comedi/drivers/adl_pci6208.c | 10 +-
+ drivers/staging/comedi/drivers/adl_pci7230.c | 206 +
+ drivers/staging/comedi/drivers/adl_pci9111.c | 41 +-
+ drivers/staging/comedi/drivers/adl_pci9118.c | 857 +++--
+ drivers/staging/comedi/drivers/adv_pci1710.c | 27 +-
+ drivers/staging/comedi/drivers/adv_pci1723.c | 153 +-
+ drivers/staging/comedi/drivers/adv_pci_dio.c | 36 +-
+ drivers/staging/comedi/drivers/aio_aio12_8.c | 4 +-
+ drivers/staging/comedi/drivers/amplc_dio200.c | 6 +-
+ drivers/staging/comedi/drivers/amplc_pci224.c | 116 +-
+ drivers/staging/comedi/drivers/amplc_pci230.c | 132 +-
+ drivers/staging/comedi/drivers/cb_das16_cs.c | 15 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 94 +-
+ drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +
+ drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +-
+ drivers/staging/comedi/drivers/comedi_bond.c | 13 +-
+ drivers/staging/comedi/drivers/comedi_parport.c | 10 +-
+ drivers/staging/comedi/drivers/das08.c | 156 +-
+ drivers/staging/comedi/drivers/das08.h | 2 +-
+ drivers/staging/comedi/drivers/das08_cs.c | 5 +-
+ drivers/staging/comedi/drivers/das16.c | 159 +-
+ drivers/staging/comedi/drivers/das1800.c | 10 +-
+ drivers/staging/comedi/drivers/dt2801.c | 2 +-
+ drivers/staging/comedi/drivers/dt2811.c | 191 +-
+ drivers/staging/comedi/drivers/dt2814.c | 38 +-
+ drivers/staging/comedi/drivers/dt282x.c | 225 +-
+ drivers/staging/comedi/drivers/dt3000.c | 21 +-
+ drivers/staging/comedi/drivers/icp_multi.h | 3 +-
+ drivers/staging/comedi/drivers/me_daq.c | 1 +
+ drivers/staging/comedi/drivers/mite.c | 2 +-
+ drivers/staging/comedi/drivers/mite.h | 2 -
+ drivers/staging/comedi/drivers/mpc624.c | 185 +-
+ drivers/staging/comedi/drivers/ni_6527.c | 7 +-
+ drivers/staging/comedi/drivers/ni_65xx.c | 47 +-
+ drivers/staging/comedi/drivers/ni_660x.c | 11 +-
+ drivers/staging/comedi/drivers/ni_670x.c | 11 +-
+ drivers/staging/comedi/drivers/ni_at_ao.c | 6 +-
+ drivers/staging/comedi/drivers/ni_daq_700.c | 13 +-
+ drivers/staging/comedi/drivers/ni_daq_dio24.c | 4 +
+ drivers/staging/comedi/drivers/ni_labpc.c | 7 +-
+ drivers/staging/comedi/drivers/ni_labpc_cs.c | 4 +-
+ drivers/staging/comedi/drivers/ni_mio_cs.c | 5 +-
+ drivers/staging/comedi/drivers/ni_pcidio.c | 25 +-
+ drivers/staging/comedi/drivers/ni_pcimio.c | 107 +-
+ drivers/staging/comedi/drivers/plx9080.h | 4 +-
+ drivers/staging/comedi/drivers/quatech_daqp_cs.c | 27 +-
+ drivers/staging/comedi/drivers/skel.c | 21 +-
+ drivers/staging/comedi/drivers/ssv_dnp.c | 86 +-
+ drivers/staging/comedi/drivers/unioxx5.c | 2 +-
+ drivers/staging/comedi/drivers/usbdux.c | 13 +-
+ drivers/staging/comedi/drivers/usbduxfast.c | 49 +-
+ drivers/staging/comedi/internal.h | 12 +
+ drivers/staging/comedi/kcomedilib/Makefile | 7 +-
+ drivers/staging/comedi/kcomedilib/data.c | 92 -
+ drivers/staging/comedi/kcomedilib/dio.c | 95 -
+ drivers/staging/comedi/kcomedilib/get.c | 293 --
+ .../staging/comedi/kcomedilib/kcomedilib_main.c | 523 +--
+ drivers/staging/comedi/kcomedilib/ksyms.c | 146 -
+ drivers/staging/comedi/pci_ids.h | 31 -
+ drivers/staging/comedi/proc.c | 23 +-
+ drivers/staging/comedi/range.c | 36 +-
+ drivers/staging/comedi/wrapper.h | 25 -
+ drivers/staging/crystalhd/TODO | 1 -
+ drivers/staging/crystalhd/bc_dts_defs.h | 4 +-
+ drivers/staging/crystalhd/bc_dts_glob_lnx.h | 2 +-
+ drivers/staging/crystalhd/bc_dts_types.h | 25 +-
+ drivers/staging/crystalhd/bcm_70012_regs.h | 24 +-
+ drivers/staging/crystalhd/crystalhd_cmds.c | 18 +-
+ drivers/staging/crystalhd/crystalhd_cmds.h | 2 +-
+ drivers/staging/crystalhd/crystalhd_hw.c | 29 +-
+ drivers/staging/crystalhd/crystalhd_lnx.c | 42 +-
+ drivers/staging/crystalhd/crystalhd_lnx.h | 4 +-
+ drivers/staging/crystalhd/crystalhd_misc.c | 20 +-
+ drivers/staging/crystalhd/crystalhd_misc.h | 1 -
+ drivers/staging/cx25821/cx25821-alsa.c | 2 +-
+ drivers/staging/cx25821/cx25821-audio-upstream.c | 6 +-
+ .../staging/cx25821/cx25821-video-upstream-ch2.c | 6 +-
+ drivers/staging/cx25821/cx25821-video-upstream.c | 4 +-
+ drivers/staging/cxt1e1/Kconfig | 22 +
+ drivers/staging/cxt1e1/Makefile | 19 +
+ drivers/staging/cxt1e1/comet.c | 568 +++
+ drivers/staging/cxt1e1/comet.h | 366 ++
+ drivers/staging/cxt1e1/comet_tables.c | 561 +++
+ drivers/staging/cxt1e1/comet_tables.h | 85 +
+ drivers/staging/cxt1e1/functions.c | 368 ++
+ drivers/staging/cxt1e1/hwprobe.c | 402 ++
+ drivers/staging/cxt1e1/libsbew.h | 581 +++
+ drivers/staging/cxt1e1/linux.c | 1356 ++++++
+ drivers/staging/cxt1e1/musycc.c | 2185 ++++++++++
+ drivers/staging/cxt1e1/musycc.h | 460 ++
+ drivers/staging/cxt1e1/ossiRelease.c | 39 +
+ drivers/staging/cxt1e1/pmc93x6_eeprom.c | 561 +++
+ drivers/staging/cxt1e1/pmc93x6_eeprom.h | 60 +
+ drivers/staging/cxt1e1/pmcc4.h | 155 +
+ drivers/staging/cxt1e1/pmcc4_cpld.h | 124 +
+ drivers/staging/cxt1e1/pmcc4_defs.h | 82 +
+ drivers/staging/cxt1e1/pmcc4_drv.c | 1860 ++++++++
+ drivers/staging/cxt1e1/pmcc4_ioctls.h | 81 +
+ drivers/staging/cxt1e1/pmcc4_private.h | 296 ++
+ drivers/staging/cxt1e1/pmcc4_sysdep.h | 62 +
+ drivers/staging/cxt1e1/sbe_bid.h | 61 +
+ drivers/staging/cxt1e1/sbe_promformat.h | 157 +
+ drivers/staging/cxt1e1/sbecom_inline_linux.h | 310 ++
+ drivers/staging/cxt1e1/sbecrc.c | 137 +
+ drivers/staging/cxt1e1/sbeid.c | 217 +
+ drivers/staging/cxt1e1/sbeproc.c | 358 ++
+ drivers/staging/cxt1e1/sbeproc.h | 52 +
+ drivers/staging/cxt1e1/sbew_ioc.h | 136 +
+ drivers/staging/dream/Kconfig | 11 +-
+ drivers/staging/dream/Makefile | 3 +-
+ drivers/staging/dream/TODO | 1 -
+ drivers/staging/dream/camera/msm_vfe8x_proc.c | 2 +-
+ drivers/staging/dream/pmem.c | 27 +-
+ drivers/staging/dream/qdsp5/audio_out.c | 9 -
+ drivers/staging/dream/smd/Kconfig | 26 -
+ drivers/staging/dream/smd/Makefile | 7 -
+ .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 -
+ drivers/staging/dream/smd/rpc_server_time_remote.c | 77 -
+ drivers/staging/dream/smd/smd.c | 1330 ------
+ drivers/staging/dream/smd/smd_private.h | 171 -
+ drivers/staging/dream/smd/smd_qmi.c | 855 ----
+ drivers/staging/dream/smd/smd_rpcrouter.c | 1261 ------
+ drivers/staging/dream/smd/smd_rpcrouter.h | 193 -
+ drivers/staging/dream/smd/smd_rpcrouter_device.c | 377 --
+ drivers/staging/dream/smd/smd_rpcrouter_servers.c | 230 -
+ drivers/staging/dream/smd/smd_tty.c | 208 -
+ drivers/staging/dream/synaptics_i2c_rmi.c | 28 +-
+ drivers/staging/dt3155/allocator.c | 16 +-
+ drivers/staging/dt3155/allocator.h | 4 +-
+ drivers/staging/dt3155/dt3155.h | 44 +-
+ drivers/staging/dt3155/dt3155_drv.c | 380 +-
+ drivers/staging/dt3155/dt3155_io.c | 24 +-
+ drivers/staging/dt3155/dt3155_isr.c | 297 +-
+ drivers/staging/dt3155/dt3155_isr.h | 2 +-
+ drivers/staging/dt3155v4l/Kconfig | 20 +
+ drivers/staging/dt3155v4l/Makefile | 4 +
+ drivers/staging/dt3155v4l/dt3155-bufs.c | 256 ++
+ drivers/staging/dt3155v4l/dt3155-bufs.h | 88 +
+ drivers/staging/dt3155v4l/dt3155v4l.c | 1597 +++++++
+ drivers/staging/dt3155v4l/dt3155v4l.h | 224 +
+ drivers/staging/echo/echo.c | 2 +-
+ drivers/staging/et131x/et1310_address_map.h | 7 +-
+ drivers/staging/et131x/et1310_eeprom.c | 8 +-
+ drivers/staging/et131x/et1310_phy.c | 2 +-
+ drivers/staging/et131x/et1310_rx.c | 55 +-
+ drivers/staging/et131x/et1310_rx.h | 5 +-
+ drivers/staging/et131x/et1310_tx.c | 2 +-
+ drivers/staging/et131x/et131x_initpci.c | 12 +-
+ drivers/staging/et131x/et131x_isr.c | 6 +-
+ drivers/staging/et131x/et131x_netdev.c | 14 +-
+ drivers/staging/frontier/alphatrack.c | 34 +-
+ drivers/staging/frontier/tranzport.c | 36 +-
+ drivers/staging/go7007/go7007-fw.c | 12 +-
+ drivers/staging/go7007/go7007-usb.c | 3 +-
+ drivers/staging/go7007/go7007-v4l2.c | 4 +-
+ drivers/staging/go7007/saa7134-go7007.c | 3 +-
+ drivers/staging/go7007/wis-saa7113.c | 1 +
+ drivers/staging/go7007/wis-saa7115.c | 1 +
+ drivers/staging/go7007/wis-tw9903.c | 1 +
+ drivers/staging/hv/Kconfig | 8 +-
+ drivers/staging/hv/Makefile | 11 +-
+ drivers/staging/hv/TODO | 3 -
+ drivers/staging/hv/{BlkVsc.c => blkvsc.c} | 4 +-
+ drivers/staging/hv/blkvsc_drv.c | 45 +-
+ drivers/staging/hv/{Channel.c => channel.c} | 195 +-
+ drivers/staging/hv/{Channel.h => channel.h} | 2 +-
+ .../hv/{ChannelInterface.c => channel_interface.c} | 2 +-
+ .../hv/{ChannelInterface.h => channel_interface.h} | 2 +-
+ .../staging/hv/{ChannelMgmt.c => channel_mgmt.c} | 228 +-
+ .../staging/hv/{ChannelMgmt.h => channel_mgmt.h} | 6 +-
+ drivers/staging/hv/{Connection.c => connection.c} | 31 +-
+ drivers/staging/hv/{Hv.c => hv.c} | 28 +-
+ drivers/staging/hv/{Hv.h => hv.h} | 0
+ drivers/staging/hv/hv_utils.c | 295 ++
+ drivers/staging/hv/logging.h | 7 -
+ drivers/staging/hv/{NetVsc.c => netvsc.c} | 104 +-
+ drivers/staging/hv/{NetVsc.h => netvsc.h} | 7 +-
+ drivers/staging/hv/{NetVscApi.h => netvsc_api.h} | 9 +-
+ drivers/staging/hv/netvsc_drv.c | 243 +-
+ drivers/staging/hv/osd.c | 70 +
+ drivers/staging/hv/{RingBuffer.c => ring_buffer.c} | 16 +-
+ drivers/staging/hv/{RingBuffer.h => ring_buffer.h} | 0
+ drivers/staging/hv/rndis.h | 2 +-
+ .../staging/hv/{RndisFilter.c => rndis_filter.c} | 56 +-
+ .../staging/hv/{RndisFilter.h => rndis_filter.h} | 2 +-
+ drivers/staging/hv/{StorVsc.c => storvsc.c} | 54 +-
+ drivers/staging/hv/{StorVscApi.h => storvsc_api.h} | 2 +-
+ drivers/staging/hv/storvsc_drv.c | 54 +-
+ drivers/staging/hv/utils.h | 119 +
+ .../staging/hv/{VersionInfo.h => version_info.h} | 7 +-
+ drivers/staging/hv/{Vmbus.c => vmbus.c} | 33 +-
+ drivers/staging/hv/vmbus.h | 2 +-
+ drivers/staging/hv/{VmbusApi.h => vmbus_api.h} | 18 +
+ ...hannelInterface.h => vmbus_channel_interface.h} | 0
+ drivers/staging/hv/vmbus_drv.c | 96 +-
+ .../{VmbusPacketFormat.h => vmbus_packet_format.h} | 1 +
+ .../staging/hv/{VmbusPrivate.h => vmbus_private.h} | 12 +-
+ drivers/staging/hv/vstorage.h | 2 +-
+ drivers/staging/iio/Documentation/iio_utils.h | 266 +-
+ .../iio/Documentation/lis3l02dqbuffersimple.c | 237 +-
+ drivers/staging/iio/Documentation/sysfs-class-iio | 294 ++
+ drivers/staging/iio/Documentation/userspace.txt | 2 +-
+ drivers/staging/iio/Kconfig | 2 +
+ drivers/staging/iio/Makefile | 2 +
+ drivers/staging/iio/accel/Kconfig | 18 +
+ drivers/staging/iio/accel/Makefile | 8 +
+ drivers/staging/iio/accel/accel.h | 8 +-
+ drivers/staging/iio/accel/adis16209.h | 193 +
+ drivers/staging/iio/accel/adis16209_core.c | 615 +++
+ drivers/staging/iio/accel/adis16209_ring.c | 266 ++
+ drivers/staging/iio/accel/adis16209_trigger.c | 124 +
+ drivers/staging/iio/accel/adis16240.h | 218 +
+ drivers/staging/iio/accel/adis16240_core.c | 599 +++
+ drivers/staging/iio/accel/adis16240_ring.c | 254 ++
+ drivers/staging/iio/accel/adis16240_trigger.c | 124 +
+ drivers/staging/iio/accel/inclinometer.h | 23 +
+ drivers/staging/iio/accel/kxsd9.c | 88 +-
+ drivers/staging/iio/accel/lis3l02dq.h | 4 -
+ drivers/staging/iio/accel/lis3l02dq_core.c | 173 +-
+ drivers/staging/iio/accel/lis3l02dq_ring.c | 24 +-
+ drivers/staging/iio/accel/sca3000.h | 2 +
+ drivers/staging/iio/accel/sca3000_core.c | 178 +-
+ drivers/staging/iio/accel/sca3000_ring.c | 35 +-
+ drivers/staging/iio/adc/Kconfig | 11 +-
+ drivers/staging/iio/adc/Makefile | 2 +-
+ drivers/staging/iio/adc/adc.h | 15 +
+ drivers/staging/iio/adc/max1363.h | 122 +-
+ drivers/staging/iio/adc/max1363_core.c | 1107 ++++--
+ drivers/staging/iio/adc/max1363_ring.c | 82 +-
+ drivers/staging/iio/chrdev.h | 2 +-
+ drivers/staging/iio/gyro/Kconfig | 13 +
+ drivers/staging/iio/gyro/Makefile | 7 +
+ drivers/staging/iio/gyro/adis16260.h | 175 +
+ drivers/staging/iio/gyro/adis16260_core.c | 661 +++
+ drivers/staging/iio/gyro/adis16260_ring.c | 256 ++
+ drivers/staging/iio/gyro/adis16260_trigger.c | 124 +
+ drivers/staging/iio/gyro/gyro.h | 43 +
+ drivers/staging/iio/iio.h | 47 +-
+ drivers/staging/iio/imu/Kconfig | 24 +
+ drivers/staging/iio/imu/Makefile | 10 +
+ drivers/staging/iio/imu/adis16300.h | 194 +
+ drivers/staging/iio/imu/adis16300_core.c | 768 ++++
+ drivers/staging/iio/imu/adis16300_ring.c | 233 +
+ drivers/staging/iio/imu/adis16300_trigger.c | 127 +
+ drivers/staging/iio/imu/adis16400.h | 229 +
+ drivers/staging/iio/imu/adis16400_core.c | 800 ++++
+ drivers/staging/iio/imu/adis16400_ring.c | 245 ++
+ drivers/staging/iio/imu/adis16400_trigger.c | 127 +
+ drivers/staging/iio/industrialio-core.c | 60 +-
+ drivers/staging/iio/industrialio-ring.c | 75 +-
+ drivers/staging/iio/industrialio-trigger.c | 20 +-
+ drivers/staging/iio/light/tsl2563.c | 18 +-
+ drivers/staging/iio/magnetometer/magnet.h | 31 +
+ drivers/staging/iio/ring_generic.h | 50 +-
+ drivers/staging/iio/ring_sw.c | 50 +-
+ drivers/staging/iio/sysfs.h | 15 +-
+ drivers/staging/iio/trigger/iio-trig-gpio.c | 131 +-
+ .../staging/iio/trigger/iio-trig-periodic-rtc.c | 4 +-
+ drivers/staging/line6/control.h | 166 +-
+ drivers/staging/line6/driver.c | 10 +-
+ drivers/staging/line6/dumprequest.c | 3 +-
+ drivers/staging/line6/pod.c | 6 +-
+ drivers/staging/line6/variax.c | 5 +-
+ drivers/staging/memrar/Kconfig | 15 +
+ drivers/staging/memrar/Makefile | 2 +
+ drivers/staging/memrar/TODO | 43 +
+ drivers/staging/memrar/memrar-abi | 89 +
+ drivers/staging/memrar/memrar.h | 155 +
+ drivers/staging/memrar/memrar_allocator.c | 432 ++
+ drivers/staging/memrar/memrar_allocator.h | 149 +
+ drivers/staging/memrar/memrar_handler.c | 996 +++++
+ drivers/staging/netwave/Kconfig | 11 -
+ drivers/staging/netwave/Makefile | 1 -
+ drivers/staging/netwave/TODO | 7 -
+ drivers/staging/netwave/netwave_cs.c | 1364 ------
+ drivers/staging/otus/80211core/cagg.c | 34 +-
+ drivers/staging/otus/80211core/ccmd.c | 3 +-
+ drivers/staging/otus/80211core/cfunc.c | 3 +-
+ drivers/staging/otus/80211core/cic.c | 9 +-
+ drivers/staging/otus/80211core/cinit.c | 3 +-
+ drivers/staging/otus/80211core/cmm.c | 144 +-
+ drivers/staging/otus/80211core/cmmap.c | 103 +-
+ drivers/staging/otus/80211core/cmmsta.c | 123 +-
+ drivers/staging/otus/80211core/coid.c | 3 +-
+ drivers/staging/otus/80211core/cpsmgr.c | 3 +-
+ drivers/staging/otus/80211core/ctxrx.c | 81 +-
+ drivers/staging/otus/80211core/queue.c | 5 +-
+ drivers/staging/otus/80211core/ratectrl.c | 3 +-
+ drivers/staging/otus/hal/hpani.c | 33 +-
+ drivers/staging/otus/hal/hpani.h | 7 +-
+ drivers/staging/otus/hal/hpfw2.c | 2 +-
+ drivers/staging/otus/hal/hpfwu.c | 2 +-
+ drivers/staging/otus/hal/hpfwu_2k.c | 2 +-
+ drivers/staging/otus/hal/hpfwu_BA.c | 2 +-
+ drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 2 +-
+ drivers/staging/otus/hal/hpfwuinit.c | 2 +-
+ drivers/staging/otus/hal/hpmain.c | 30 +-
+ drivers/staging/otus/hal/hpreg.c | 1586 ++++----
+ drivers/staging/otus/ioctl.c | 37 +-
+ drivers/staging/otus/usbdrv.c | 6 +-
+ drivers/staging/otus/wwrap.c | 1 -
+ drivers/staging/otus/zdusb.c | 6 +-
+ drivers/staging/panel/panel.c | 5 +-
+ drivers/staging/phison/phison.c | 4 +-
+ drivers/staging/poch/Kconfig | 6 -
+ drivers/staging/poch/Makefile | 1 -
+ drivers/staging/poch/README | 136 -
+ drivers/staging/poch/poch.c | 1443 ------
+ drivers/staging/poch/poch.h | 35 -
+ drivers/staging/pohmelfs/config.c | 41 +-
+ drivers/staging/pohmelfs/crypto.c | 38 +-
+ drivers/staging/pohmelfs/dir.c | 14 +-
+ drivers/staging/pohmelfs/inode.c | 64 +-
+ drivers/staging/pohmelfs/net.c | 38 +-
+ drivers/staging/pohmelfs/netfs.h | 17 +-
+ drivers/staging/quatech_usb2/quatech_usb2.c | 12 +-
+ drivers/staging/ramzswap/ramzswap_drv.c | 645 +---
+ drivers/staging/ramzswap/ramzswap_drv.h | 51 +-
+ drivers/staging/ramzswap/ramzswap_ioctl.h | 14 +-
+ drivers/staging/rar_register/Kconfig | 28 +-
+ drivers/staging/rar_register/rar_register.c | 610 ++--
+ drivers/staging/rar_register/rar_register.h | 62 +-
+ drivers/staging/rt2860/chip/mac_pci.h | 41 +-
+ drivers/staging/rt2860/chip/mac_usb.h | 55 +-
+ drivers/staging/rt2860/chip/rtmp_mac.h | 52 +-
+ drivers/staging/rt2860/chip/rtmp_phy.h | 338 +-
+ drivers/staging/rt2860/chips/rt3070.c | 4 +-
+ drivers/staging/rt2860/chips/rt3090.c | 4 +-
+ drivers/staging/rt2860/chips/rt30xx.c | 9 +-
+ drivers/staging/rt2860/common/cmm_aes.c | 2 +-
+ drivers/staging/rt2860/common/cmm_data.c | 8 +-
+ drivers/staging/rt2860/common/cmm_mac_pci.c | 2 +-
+ drivers/staging/rt2860/common/cmm_mac_usb.c | 2 +-
+ drivers/staging/rt2860/common/cmm_wpa.c | 18 +-
+ drivers/staging/rt2860/common/spectrum.c | 7 +-
+ drivers/staging/rt2860/mlme.h | 2 +-
+ drivers/staging/rt2860/pci_main_dev.c | 37 +-
+ drivers/staging/rt2860/rt_linux.c | 51 +-
+ drivers/staging/rt2860/rt_linux.h | 14 +-
+ drivers/staging/rt2860/rt_main_dev.c | 20 +-
+ drivers/staging/rt2860/rt_pci_rbus.c | 24 +-
+ drivers/staging/rt2860/rt_usb.c | 20 +-
+ drivers/staging/rt2860/rtmp.h | 410 +-
+ drivers/staging/rt2860/sta/assoc.c | 1 -
+ drivers/staging/rt2860/sta_ioctl.c | 15 +-
+ drivers/staging/rt2860/usb_main_dev.c | 5 +-
+ drivers/staging/rt2870/Kconfig | 2 +-
+ drivers/staging/rt2870/common/rtusb_bulk.c | 42 +-
+ drivers/staging/rt2870/common/rtusb_data.c | 8 +-
+ drivers/staging/rt2870/common/rtusb_io.c | 39 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 6 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 3 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 3 +-
+ .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 3 +-
+ .../staging/rtl8187se/ieee80211/ieee80211_module.c | 7 +-
+ drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 4 -
+ .../rtl8187se/ieee80211/ieee80211_softmac.c | 20 +-
+ .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 4 -
+ drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 6 +-
+ drivers/staging/rtl8187se/r8180_core.c | 2072 +++++-----
+ drivers/staging/rtl8187se/r8180_rtl8225z2.c | 129 +-
+ drivers/staging/rtl8192e/Makefile | 1 +
+ drivers/staging/rtl8192e/ieee80211.h | 2 +-
+ drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 6 +-
+ .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 3 +-
+ .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 3 +-
+ .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 3 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_module.c | 9 +-
+ drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +-
+ .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 17 +-
+ drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 +-
+ drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 168 +-
+ .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 38 +-
+ drivers/staging/rtl8192e/r8190_rtl8256.c | 4 +-
+ drivers/staging/rtl8192e/r8192E_core.c | 14 +-
+ drivers/staging/rtl8192e/r8192_pm.c | 6 +-
+ drivers/staging/rtl8192e/r8192_pm.h | 4 -
+ drivers/staging/rtl8192su/Kconfig | 1 +
+ drivers/staging/rtl8192su/Makefile | 2 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 6 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 3 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 3 +-
+ .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 3 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_module.c | 9 +-
+ .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 24 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2 +-
+ .../rtl8192su/ieee80211/ieee80211_softmac.c | 17 +-
+ drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 6 +-
+ drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 1 -
+ .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 12 +-
+ drivers/staging/rtl8192su/r8180_93cx6.c | 146 -
+ drivers/staging/rtl8192su/r8180_93cx6.h | 40 -
+ drivers/staging/rtl8192su/r8192SU_led.c | 2347 ++++++++++
+ drivers/staging/rtl8192su/r8192SU_led.h | 93 +
+ drivers/staging/rtl8192su/r8192S_firmware.c | 503 ++--
+ drivers/staging/rtl8192su/r8192S_phy.c | 194 +-
+ drivers/staging/rtl8192su/r8192U.h | 41 +-
+ drivers/staging/rtl8192su/r8192U_core.c | 626 ++--
+ drivers/staging/rtl8192su/r819xU_cmdpkt.c | 663 +--
+ drivers/staging/rtl8192su/r819xU_cmdpkt.h | 366 +-
+ drivers/staging/rtl8192u/dot11d.h | 52 +-
+ drivers/staging/rtl8192u/ieee80211.h | 548 ++--
+ drivers/staging/rtl8192u/ieee80211/api.c | 4 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 6 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 3 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 3 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_module.c | 9 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +-
+ .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 20 +-
+ drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 1 -
+ drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 7 +-
+ drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 3 +-
+ .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 9 +-
+ drivers/staging/rtl8192u/ieee80211_crypt.h | 2 +-
+ drivers/staging/rtl8192u/r8192U_core.c | 12 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 1 -
+ drivers/staging/sep/sep_driver.c | 1 -
+ drivers/staging/serqt_usb2/serqt_usb2.c | 26 +-
+ drivers/staging/sm7xx/smtcfb.c | 18 +-
+ drivers/staging/sm7xx/smtcfb.h | 2 +-
+ drivers/staging/strip/Kconfig | 22 -
+ drivers/staging/strip/Makefile | 1 -
+ drivers/staging/strip/TODO | 7 -
+ drivers/staging/strip/strip.c | 2823 ------------
+ drivers/staging/ti-st/Kconfig | 25 +
+ drivers/staging/ti-st/Makefile | 7 +
+ drivers/staging/ti-st/TODO | 19 +
+ drivers/staging/ti-st/bt_drv.c | 502 +++
+ drivers/staging/ti-st/bt_drv.h | 61 +
+ drivers/staging/ti-st/fm.h | 13 +
+ drivers/staging/ti-st/st.h | 90 +
+ drivers/staging/ti-st/st_core.c | 1062 +++++
+ drivers/staging/ti-st/st_core.h | 98 +
+ drivers/staging/ti-st/st_kim.c | 754 ++++
+ drivers/staging/ti-st/st_kim.h | 150 +
+ drivers/staging/ti-st/st_ll.c | 147 +
+ drivers/staging/ti-st/st_ll.h | 62 +
+ drivers/staging/ti-st/sysfs-uim | 16 +
+ drivers/staging/udlfb/udlfb.c | 62 +-
+ drivers/staging/usbip/stub_rx.c | 4 +-
+ drivers/staging/usbip/usbip_common.h | 2 +-
+ drivers/staging/usbip/vhci_hcd.c | 2 +-
+ drivers/staging/usbip/vhci_tx.c | 2 +-
+ drivers/staging/vme/boards/vme_vmivme7805.c | 1 -
+ drivers/staging/vme/bridges/vme_ca91cx42.c | 115 +-
+ drivers/staging/vme/bridges/vme_tsi148.c | 396 +-
+ drivers/staging/vme/bridges/vme_tsi148.h | 26 +-
+ drivers/staging/vme/devices/vme_user.c | 18 +-
+ drivers/staging/vme/vme.c | 4 +-
+ drivers/staging/vt6655/80211hdr.h | 46 +-
+ drivers/staging/vt6655/80211mgr.c | 88 +-
+ drivers/staging/vt6655/80211mgr.h | 88 +-
+ drivers/staging/vt6655/IEEE11h.c | 6 +-
+ drivers/staging/vt6655/IEEE11h.h | 2 +-
+ drivers/staging/vt6655/aes_ccmp.c | 10 +-
+ drivers/staging/vt6655/baseband.c | 64 +-
+ drivers/staging/vt6655/baseband.h | 52 +-
+ drivers/staging/vt6655/bssdb.c | 214 +-
+ drivers/staging/vt6655/bssdb.h | 148 +-
+ drivers/staging/vt6655/card.c | 214 +-
+ drivers/staging/vt6655/card.h | 158 +-
+ drivers/staging/vt6655/datarate.c | 52 +-
+ drivers/staging/vt6655/datarate.h | 36 +-
+ drivers/staging/vt6655/desc.h | 12 +-
+ drivers/staging/vt6655/device.h | 28 +-
+ drivers/staging/vt6655/device_main.c | 89 +-
+ drivers/staging/vt6655/dpc.c | 182 +-
+ drivers/staging/vt6655/dpc.h | 6 +-
+ drivers/staging/vt6655/hostap.c | 13 +-
+ drivers/staging/vt6655/hostap.h | 4 +-
+ drivers/staging/vt6655/ioctl.c | 32 +-
+ drivers/staging/vt6655/ioctl.h | 10 +-
+ drivers/staging/vt6655/iwctl.c | 31 +-
+ drivers/staging/vt6655/key.c | 36 +-
+ drivers/staging/vt6655/key.h | 30 +-
+ drivers/staging/vt6655/mac.c | 8 +-
+ drivers/staging/vt6655/mac.h | 52 +-
+ drivers/staging/vt6655/mib.c | 2 +-
+ drivers/staging/vt6655/mib.h | 2 +-
+ drivers/staging/vt6655/michael.c | 24 +-
+ drivers/staging/vt6655/michael.h | 8 +-
+ drivers/staging/vt6655/power.c | 26 +-
+ drivers/staging/vt6655/power.h | 28 +-
+ drivers/staging/vt6655/rc4.c | 4 +-
+ drivers/staging/vt6655/rc4.h | 2 +-
+ drivers/staging/vt6655/rf.c | 22 +-
+ drivers/staging/vt6655/rf.h | 14 +-
+ drivers/staging/vt6655/rxtx.c | 506 ++--
+ drivers/staging/vt6655/rxtx.h | 84 +-
+ drivers/staging/vt6655/srom.c | 54 +-
+ drivers/staging/vt6655/srom.h | 2 +-
+ drivers/staging/vt6655/tether.c | 2 +-
+ drivers/staging/vt6655/tether.h | 26 +-
+ drivers/staging/vt6655/tkip.c | 2 +-
+ drivers/staging/vt6655/tkip.h | 2 +-
+ drivers/staging/vt6655/ttype.h | 22 -
+ drivers/staging/vt6655/vntwifi.c | 142 +-
+ drivers/staging/vt6655/vntwifi.h | 142 +-
+ drivers/staging/vt6655/wcmd.c | 104 +-
+ drivers/staging/vt6655/wcmd.h | 26 +-
+ drivers/staging/vt6655/wctl.c | 4 +-
+ drivers/staging/vt6655/wmgr.c | 672 ++--
+ drivers/staging/vt6655/wmgr.h | 96 +-
+ drivers/staging/vt6655/wpa.c | 14 +-
+ drivers/staging/vt6655/wpa.h | 14 +-
+ drivers/staging/vt6655/wpa2.c | 16 +-
+ drivers/staging/vt6655/wpa2.h | 14 +-
+ drivers/staging/vt6655/wpactl.c | 19 +-
+ drivers/staging/vt6655/wroute.c | 4 +-
+ drivers/staging/vt6656/80211hdr.h | 83 +-
+ drivers/staging/vt6656/80211mgr.c | 88 +-
+ drivers/staging/vt6656/80211mgr.h | 88 +-
+ drivers/staging/vt6656/aes_ccmp.c | 564 ++--
+ drivers/staging/vt6656/aes_ccmp.h | 2 +-
+ drivers/staging/vt6656/baseband.c | 66 +-
+ drivers/staging/vt6656/baseband.h | 57 +-
+ drivers/staging/vt6656/bssdb.c | 293 +-
+ drivers/staging/vt6656/bssdb.h | 206 +-
+ drivers/staging/vt6656/card.c | 56 +-
+ drivers/staging/vt6656/card.h | 61 +-
+ drivers/staging/vt6656/channel.c | 6 +-
+ drivers/staging/vt6656/channel.h | 6 +-
+ drivers/staging/vt6656/control.c | 87 +-
+ drivers/staging/vt6656/control.h | 31 +-
+ drivers/staging/vt6656/datarate.c | 59 +-
+ drivers/staging/vt6656/datarate.h | 39 +-
+ drivers/staging/vt6656/desc.h | 12 +-
+ drivers/staging/vt6656/device.h | 38 +-
+ drivers/staging/vt6656/dpc.c | 274 +-
+ drivers/staging/vt6656/dpc.h | 27 +-
+ drivers/staging/vt6656/firmware.c | 6 +-
+ drivers/staging/vt6656/firmware.h | 9 +-
+ drivers/staging/vt6656/hostap.c | 13 +-
+ drivers/staging/vt6656/hostap.h | 9 +-
+ drivers/staging/vt6656/int.c | 251 +-
+ drivers/staging/vt6656/int.h | 12 +-
+ drivers/staging/vt6656/iocmd.h | 353 +-
+ drivers/staging/vt6656/ioctl.c | 39 +-
+ drivers/staging/vt6656/ioctl.h | 15 +-
+ drivers/staging/vt6656/iowpa.h | 4 +-
+ drivers/staging/vt6656/iwctl.c | 44 +-
+ drivers/staging/vt6656/iwctl.h | 5 +-
+ drivers/staging/vt6656/key.c | 65 +-
+ drivers/staging/vt6656/key.h | 54 +-
+ drivers/staging/vt6656/mac.c | 2 +-
+ drivers/staging/vt6656/mac.h | 4 +-
+ drivers/staging/vt6656/main_usb.c | 173 +-
+ drivers/staging/vt6656/mib.c | 19 +-
+ drivers/staging/vt6656/mib.h | 9 +-
+ drivers/staging/vt6656/michael.c | 181 +-
+ drivers/staging/vt6656/michael.h | 12 +-
+ drivers/staging/vt6656/power.c | 58 +-
+ drivers/staging/vt6656/power.h | 45 +-
+ drivers/staging/vt6656/rc4.c | 82 +-
+ drivers/staging/vt6656/rc4.h | 4 +-
+ drivers/staging/vt6656/rf.c | 28 +-
+ drivers/staging/vt6656/rf.h | 33 +-
+ drivers/staging/vt6656/rndis.h | 3 +-
+ drivers/staging/vt6656/rxtx.c | 706 ++--
+ drivers/staging/vt6656/rxtx.h | 39 +-
+ drivers/staging/vt6656/srom.h | 2 +-
+ drivers/staging/vt6656/tcrc.c | 21 +-
+ drivers/staging/vt6656/tcrc.h | 5 +-
+ drivers/staging/vt6656/tether.c | 45 +-
+ drivers/staging/vt6656/tether.h | 27 +-
+ drivers/staging/vt6656/tkip.c | 2 +-
+ drivers/staging/vt6656/tkip.h | 7 +-
+ drivers/staging/vt6656/tmacro.h | 4 +-
+ drivers/staging/vt6656/ttype.h | 46 +-
+ drivers/staging/vt6656/upc.h | 6 +-
+ drivers/staging/vt6656/usbpipe.c | 123 +-
+ drivers/staging/vt6656/usbpipe.h | 51 +-
+ drivers/staging/vt6656/wcmd.c | 156 +-
+ drivers/staging/vt6656/wcmd.h | 36 +-
+ drivers/staging/vt6656/wctl.c | 6 +-
+ drivers/staging/vt6656/wctl.h | 5 +-
+ drivers/staging/vt6656/wmgr.c | 909 ++--
+ drivers/staging/vt6656/wmgr.h | 118 +-
+ drivers/staging/vt6656/wpa.c | 14 +-
+ drivers/staging/vt6656/wpa.h | 16 +-
+ drivers/staging/vt6656/wpa2.c | 46 +-
+ drivers/staging/vt6656/wpa2.h | 16 +-
+ drivers/staging/vt6656/wpactl.c | 25 +-
+ drivers/staging/vt6656/wpactl.h | 5 +-
+ drivers/staging/wavelan/Kconfig | 38 -
+ drivers/staging/wavelan/Makefile | 2 -
+ drivers/staging/wavelan/TODO | 7 -
+ drivers/staging/wavelan/i82586.h | 413 --
+ drivers/staging/wavelan/wavelan.c | 4383 -------------------
+ drivers/staging/wavelan/wavelan.h | 370 --
+ drivers/staging/wavelan/wavelan.p.h | 696 ---
+ drivers/staging/wavelan/wavelan_cs.c | 4601 --------------------
+ drivers/staging/wavelan/wavelan_cs.h | 386 --
+ drivers/staging/wavelan/wavelan_cs.p.h | 766 ----
+ drivers/staging/winbond/{README => TODO} | 3 +-
+ drivers/staging/winbond/core.h | 14 +-
+ drivers/staging/winbond/localpara.h | 452 +-
+ drivers/staging/winbond/mac_structures.h | 342 +-
+ drivers/staging/winbond/mds.c | 310 +-
+ drivers/staging/winbond/mds_f.h | 20 +-
+ drivers/staging/winbond/mds_s.h | 173 +-
+ drivers/staging/winbond/mlme_s.h | 288 +-
+ drivers/staging/winbond/mlmetxrx.c | 62 +-
+ drivers/staging/winbond/mlmetxrx_f.h | 6 +-
+ drivers/staging/winbond/mto.c | 299 +-
+ drivers/staging/winbond/mto.h | 179 +-
+ drivers/staging/winbond/phy_calibration.c | 9 +-
+ drivers/staging/winbond/phy_calibration.h | 177 +-
+ drivers/staging/winbond/reg.c | 3985 ++++++++---------
+ drivers/staging/winbond/scan_s.h | 152 +-
+ drivers/staging/winbond/sme_api.h | 211 +-
+ drivers/staging/winbond/sysdef.h | 18 +-
+ drivers/staging/winbond/wb35reg.c | 618 ++--
+ drivers/staging/winbond/wb35reg_f.h | 104 +-
+ drivers/staging/winbond/wb35reg_s.h | 221 +-
+ drivers/staging/winbond/wb35rx.c | 258 +-
+ drivers/staging/winbond/wb35tx_f.h | 18 +-
+ drivers/staging/winbond/wbhal_f.h | 137 +-
+ drivers/staging/winbond/wbhal_s.h | 502 +--
+ drivers/staging/winbond/wblinux_f.h | 19 +-
+ drivers/staging/winbond/wbusb.c | 187 +-
+ drivers/staging/winbond/wbusb_s.h | 23 +-
+ drivers/staging/wlags49_h2/Kconfig | 2 +-
+ drivers/staging/wlags49_h2/README.wlags49 | 2 +-
+ drivers/staging/wlags49_h2/ap_h2.c | 80 +-
+ drivers/staging/wlags49_h2/debug.h | 104 +-
+ drivers/staging/wlags49_h2/dhf.c | 143 +-
+ drivers/staging/wlags49_h2/dhf.h | 56 +-
+ drivers/staging/wlags49_h2/dhfcfg.h | 118 +-
+ drivers/staging/wlags49_h2/hcf.c | 15 +-
+ drivers/staging/wlags49_h2/wl_cs.c | 32 +-
+ drivers/staging/wlags49_h2/wl_cs.h | 4 -
+ drivers/staging/wlags49_h2/wl_internal.h | 8 +-
+ drivers/staging/wlags49_h2/wl_main.c | 3 +-
+ drivers/staging/wlags49_h2/wl_netdev.c | 39 +-
+ drivers/staging/wlags49_h2/wl_priv.c | 11 +-
+ drivers/staging/wlags49_h2/wl_profile.c | 957 ++---
+ drivers/staging/wlags49_h2/wl_sysfs.c | 3 +-
+ drivers/staging/wlags49_h2/wl_wext.c | 9 +-
+ drivers/staging/wlags49_h25/Kconfig | 2 +-
+ drivers/staging/wlan-ng/hfa384x_usb.c | 154 +-
+ drivers/staging/wlan-ng/p80211conv.c | 5 +-
+ drivers/staging/wlan-ng/p80211req.c | 5 +-
+ drivers/staging/wlan-ng/p80211wext.c | 399 +-
+ drivers/staging/wlan-ng/prism2fw.c | 36 +-
+ drivers/staging/wlan-ng/prism2sta.c | 71 +-
+ drivers/staging/wlan-ng/prism2usb.c | 65 +
+ 725 files changed, 52074 insertions(+), 50461 deletions(-)
+ create mode 100644 drivers/staging/adis16255/Kconfig
+ create mode 100644 drivers/staging/adis16255/Makefile
+ create mode 100644 drivers/staging/adis16255/adis16255.c
+ create mode 100644 drivers/staging/adis16255/adis16255.h
+ delete mode 100644 drivers/staging/arlan/Kconfig
+ delete mode 100644 drivers/staging/arlan/Makefile
+ delete mode 100644 drivers/staging/arlan/TODO
+ delete mode 100644 drivers/staging/arlan/arlan-main.c
+ delete mode 100644 drivers/staging/arlan/arlan-proc.c
+ delete mode 100644 drivers/staging/arlan/arlan.h
+ create mode 100644 drivers/staging/batman-adv/bat_sysfs.c
+ create mode 100644 drivers/staging/batman-adv/bat_sysfs.h
+ delete mode 100644 drivers/staging/batman-adv/proc.c
+ delete mode 100644 drivers/staging/batman-adv/proc.h
+ delete mode 100644 drivers/staging/comedi/comedi_ksyms.c
+ create mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c
+ create mode 100644 drivers/staging/comedi/internal.h
+ delete mode 100644 drivers/staging/comedi/kcomedilib/data.c
+ delete mode 100644 drivers/staging/comedi/kcomedilib/dio.c
+ delete mode 100644 drivers/staging/comedi/kcomedilib/get.c
+ delete mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c
+ delete mode 100644 drivers/staging/comedi/pci_ids.h
+ delete mode 100644 drivers/staging/comedi/wrapper.h
+ create mode 100644 drivers/staging/cxt1e1/Kconfig
+ create mode 100644 drivers/staging/cxt1e1/Makefile
+ create mode 100644 drivers/staging/cxt1e1/comet.c
+ create mode 100644 drivers/staging/cxt1e1/comet.h
+ create mode 100644 drivers/staging/cxt1e1/comet_tables.c
+ create mode 100644 drivers/staging/cxt1e1/comet_tables.h
+ create mode 100644 drivers/staging/cxt1e1/functions.c
+ create mode 100644 drivers/staging/cxt1e1/hwprobe.c
+ create mode 100644 drivers/staging/cxt1e1/libsbew.h
+ create mode 100644 drivers/staging/cxt1e1/linux.c
+ create mode 100644 drivers/staging/cxt1e1/musycc.c
+ create mode 100644 drivers/staging/cxt1e1/musycc.h
+ create mode 100644 drivers/staging/cxt1e1/ossiRelease.c
+ create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c
+ create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_private.h
+ create mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h
+ create mode 100644 drivers/staging/cxt1e1/sbe_bid.h
+ create mode 100644 drivers/staging/cxt1e1/sbe_promformat.h
+ create mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h
+ create mode 100644 drivers/staging/cxt1e1/sbecrc.c
+ create mode 100644 drivers/staging/cxt1e1/sbeid.c
+ create mode 100644 drivers/staging/cxt1e1/sbeproc.c
+ create mode 100644 drivers/staging/cxt1e1/sbeproc.h
+ create mode 100644 drivers/staging/cxt1e1/sbew_ioc.h
+ delete mode 100644 drivers/staging/dream/smd/Kconfig
+ delete mode 100644 drivers/staging/dream/smd/Makefile
+ delete mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c
+ delete mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c
+ delete mode 100644 drivers/staging/dream/smd/smd.c
+ delete mode 100644 drivers/staging/dream/smd/smd_private.h
+ delete mode 100644 drivers/staging/dream/smd/smd_qmi.c
+ delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c
+ delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h
+ delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c
+ delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c
+ delete mode 100644 drivers/staging/dream/smd/smd_tty.c
+ create mode 100644 drivers/staging/dt3155v4l/Kconfig
+ create mode 100644 drivers/staging/dt3155v4l/Makefile
+ create mode 100644 drivers/staging/dt3155v4l/dt3155-bufs.c
+ create mode 100644 drivers/staging/dt3155v4l/dt3155-bufs.h
+ create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.c
+ create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.h
+ rename drivers/staging/hv/{BlkVsc.c => blkvsc.c} (97%)
+ rename drivers/staging/hv/{Channel.c => channel.c} (88%)
+ rename drivers/staging/hv/{Channel.h => channel.h} (99%)
+ rename drivers/staging/hv/{ChannelInterface.c => channel_interface.c} (99%)
+ rename drivers/staging/hv/{ChannelInterface.h => channel_interface.h} (97%)
+ rename drivers/staging/hv/{ChannelMgmt.c => channel_mgmt.c} (79%)
+ rename drivers/staging/hv/{ChannelMgmt.h => channel_mgmt.h} (98%)
+ rename drivers/staging/hv/{Connection.c => connection.c} (97%)
+ rename drivers/staging/hv/{Hv.c => hv.c} (98%)
+ rename drivers/staging/hv/{Hv.h => hv.h} (100%)
+ create mode 100644 drivers/staging/hv/hv_utils.c
+ rename drivers/staging/hv/{NetVsc.c => netvsc.c} (95%)
+ rename drivers/staging/hv/{NetVsc.h => netvsc.h} (98%)
+ rename drivers/staging/hv/{NetVscApi.h => netvsc_api.h} (93%)
+ rename drivers/staging/hv/{RingBuffer.c => ring_buffer.c} (97%)
+ rename drivers/staging/hv/{RingBuffer.h => ring_buffer.h} (100%)
+ rename drivers/staging/hv/{RndisFilter.c => rndis_filter.c} (96%)
+ rename drivers/staging/hv/{RndisFilter.h => rndis_filter.h} (98%)
+ rename drivers/staging/hv/{StorVsc.c => storvsc.c} (96%)
+ rename drivers/staging/hv/{StorVscApi.h => storvsc_api.h} (99%)
+ create mode 100644 drivers/staging/hv/utils.h
+ rename drivers/staging/hv/{VersionInfo.h => version_info.h} (88%)
+ rename drivers/staging/hv/{Vmbus.c => vmbus.c} (97%)
+ rename drivers/staging/hv/{VmbusApi.h => vmbus_api.h} (86%)
+ rename drivers/staging/hv/{VmbusChannelInterface.h => vmbus_channel_interface.h} (100%)
+ rename drivers/staging/hv/{VmbusPacketFormat.h => vmbus_packet_format.h} (99%)
+ rename drivers/staging/hv/{VmbusPrivate.h => vmbus_private.h} (95%)
+ create mode 100644 drivers/staging/iio/Documentation/sysfs-class-iio
+ create mode 100644 drivers/staging/iio/accel/adis16209.h
+ create mode 100644 drivers/staging/iio/accel/adis16209_core.c
+ create mode 100644 drivers/staging/iio/accel/adis16209_ring.c
+ create mode 100644 drivers/staging/iio/accel/adis16209_trigger.c
+ create mode 100644 drivers/staging/iio/accel/adis16240.h
+ create mode 100644 drivers/staging/iio/accel/adis16240_core.c
+ create mode 100644 drivers/staging/iio/accel/adis16240_ring.c
+ create mode 100644 drivers/staging/iio/accel/adis16240_trigger.c
+ create mode 100644 drivers/staging/iio/accel/inclinometer.h
+ create mode 100644 drivers/staging/iio/gyro/Kconfig
+ create mode 100644 drivers/staging/iio/gyro/Makefile
+ create mode 100644 drivers/staging/iio/gyro/adis16260.h
+ create mode 100644 drivers/staging/iio/gyro/adis16260_core.c
+ create mode 100644 drivers/staging/iio/gyro/adis16260_ring.c
+ create mode 100644 drivers/staging/iio/gyro/adis16260_trigger.c
+ create mode 100644 drivers/staging/iio/gyro/gyro.h
+ create mode 100644 drivers/staging/iio/imu/Kconfig
+ create mode 100644 drivers/staging/iio/imu/Makefile
+ create mode 100644 drivers/staging/iio/imu/adis16300.h
+ create mode 100644 drivers/staging/iio/imu/adis16300_core.c
+ create mode 100644 drivers/staging/iio/imu/adis16300_ring.c
+ create mode 100644 drivers/staging/iio/imu/adis16300_trigger.c
+ create mode 100644 drivers/staging/iio/imu/adis16400.h
+ create mode 100644 drivers/staging/iio/imu/adis16400_core.c
+ create mode 100644 drivers/staging/iio/imu/adis16400_ring.c
+ create mode 100644 drivers/staging/iio/imu/adis16400_trigger.c
+ create mode 100644 drivers/staging/iio/magnetometer/magnet.h
+ create mode 100644 drivers/staging/memrar/Kconfig
+ create mode 100644 drivers/staging/memrar/Makefile
+ create mode 100644 drivers/staging/memrar/TODO
+ create mode 100644 drivers/staging/memrar/memrar-abi
+ create mode 100644 drivers/staging/memrar/memrar.h
+ create mode 100644 drivers/staging/memrar/memrar_allocator.c
+ create mode 100644 drivers/staging/memrar/memrar_allocator.h
+ create mode 100644 drivers/staging/memrar/memrar_handler.c
+ delete mode 100644 drivers/staging/netwave/Kconfig
+ delete mode 100644 drivers/staging/netwave/Makefile
+ delete mode 100644 drivers/staging/netwave/TODO
+ delete mode 100644 drivers/staging/netwave/netwave_cs.c
+ delete mode 100644 drivers/staging/poch/Kconfig
+ delete mode 100644 drivers/staging/poch/Makefile
+ delete mode 100644 drivers/staging/poch/README
+ delete mode 100644 drivers/staging/poch/poch.c
+ delete mode 100644 drivers/staging/poch/poch.h
+ delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c
+ delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h
+ create mode 100644 drivers/staging/rtl8192su/r8192SU_led.c
+ create mode 100644 drivers/staging/rtl8192su/r8192SU_led.h
+ delete mode 100644 drivers/staging/strip/Kconfig
+ delete mode 100644 drivers/staging/strip/Makefile
+ delete mode 100644 drivers/staging/strip/TODO
+ delete mode 100644 drivers/staging/strip/strip.c
+ create mode 100644 drivers/staging/ti-st/Kconfig
+ create mode 100644 drivers/staging/ti-st/Makefile
+ create mode 100644 drivers/staging/ti-st/TODO
+ create mode 100644 drivers/staging/ti-st/bt_drv.c
+ create mode 100644 drivers/staging/ti-st/bt_drv.h
+ create mode 100644 drivers/staging/ti-st/fm.h
+ create mode 100644 drivers/staging/ti-st/st.h
+ create mode 100644 drivers/staging/ti-st/st_core.c
+ create mode 100644 drivers/staging/ti-st/st_core.h
+ create mode 100644 drivers/staging/ti-st/st_kim.c
+ create mode 100644 drivers/staging/ti-st/st_kim.h
+ create mode 100644 drivers/staging/ti-st/st_ll.c
+ create mode 100644 drivers/staging/ti-st/st_ll.h
+ create mode 100644 drivers/staging/ti-st/sysfs-uim
+ delete mode 100644 drivers/staging/wavelan/Kconfig
+ delete mode 100644 drivers/staging/wavelan/Makefile
+ delete mode 100644 drivers/staging/wavelan/TODO
+ delete mode 100644 drivers/staging/wavelan/i82586.h
+ delete mode 100644 drivers/staging/wavelan/wavelan.c
+ delete mode 100644 drivers/staging/wavelan/wavelan.h
+ delete mode 100644 drivers/staging/wavelan/wavelan.p.h
+ delete mode 100644 drivers/staging/wavelan/wavelan_cs.c
+ delete mode 100644 drivers/staging/wavelan/wavelan_cs.h
+ delete mode 100644 drivers/staging/wavelan/wavelan_cs.p.h
+ rename drivers/staging/winbond/{README => TODO} (79%)
+$ git revert 44e425ab9f887ec6d3a7a4481f3b0c99f120de19
+Finished one revert.
+[master a206ae9] Revert "pci: check caps from sysfs file open to read device dependent config space"
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+$ git revert f8e898186196a22756b50b908ecd92123265f8a2
+Finished one revert.
+[master e4d97cf] Revert "sysfs: add struct file* to bin_attr callbacks"
+ 52 files changed, 149 insertions(+), 219 deletions(-)
+$ git am -3 ../patches/0001-sysfs-fix-for-S_BIAS-going-away.patch
+Applying: sysfs: fix for S_BIAS going away
+Merging slabh/slabh
+$ git merge slabh/slabh
+Already up-to-date.
+Merging scsi-post-merge/master
+$ git merge scsi-post-merge/master
+Already up-to-date.
diff --git a/Next/quilt-import.log b/Next/quilt-import.log
new file mode 100644
index 0000000..645b5c1
--- /dev/null
+++ b/Next/quilt-import.log
@@ -0,0 +1,370 @@
+Importing driver-core.current based on 2.6.34
+$ git clone -s -l -n -q . ../quilt-tmp
+$ cd ../quilt-tmp
+$ git reset --hard e40152ee1e1c7a63f4777791863215e3faa37a86
+HEAD is now at e40152e Linus 2.6.34
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current
+drivers-base-cpu.c-fix-the-output-from-sys-devices-system-cpu-offline.patch
+firmware_class-fix-memory-leak-free-allocated-pages.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/driver-core.current
+From ../quilt-tmp
+ + 57f7bd8...a45b31e master -> quilt/driver-core.current (forced update)
+Importing tty.current based on quilt/driver-core.current
+ quilt series is empty
+$ git update-ref refs/heads/quilt/tty.current a45b31e4aa15c05767bfb208e6724ee458d83578
+Importing usb.current based on quilt/tty.current
+ quilt series is empty
+$ git update-ref refs/heads/quilt/usb.current a45b31e4aa15c05767bfb208e6724ee458d83578
+Importing staging.current based on quilt/usb.current
+ quilt series is empty
+$ git update-ref refs/heads/quilt/staging.current a45b31e4aa15c05767bfb208e6724ee458d83578
+Importing i2c based on 2.6.34-rc7-git5
+Unchanged quilt series i2c
+Importing jdelvare-hwmon based on 2.6.34-rc7-git3
+Unchanged quilt series jdelvare-hwmon
+Importing kernel-doc based on 2.6.34
+$ cd ../quilt-tmp
+$ git reset --hard e40152ee1e1c7a63f4777791863215e3faa37a86
+HEAD is now at e40152e Linus 2.6.34
+$ git quiltimport --author Randy Dunlap <randy.dunlap@oracle.com> --patches ../quilt/kernel-doc
+docbook-mtdnand-modinit-static.patch
+docum-develprocess-maint.patch
+docum-develprocess-staging.patch
+docum-sysrq-bindings.patch
+docs-hpet-example-headers.patch
+docum-map-hugetlb-value.patch
+scsi-update-urls.patch
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:65: space before tab in indent.
+ http://sg.danny.cz/sg/p/scsi-generic_v3.txt
+warning: 1 line adds whitespace errors.
+scsi-kerndoc-221.patch
+drv-fusion-kerndoc1.patch
+docum-checklist-builddir.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/kernel-doc
+From ../quilt-tmp
+ + 649bebc...a18764a master -> quilt/kernel-doc (forced update)
+Importing rr based on v2.6.34-rc7
+Unchanged quilt series rr
+Importing device-mapper based on v2.6.34-rc7
+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
+$ cd ../quilt-tmp
+$ git reset --hard a45b31e4aa15c05767bfb208e6724ee458d83578
+HEAD is now at a45b31e firmware_class: fix memory leak - free allocated pages
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core
+kref-remove-kref_set.patch
+driver-core-reduce-the-level-of-request_firmware-messages.patch
+driver-core-fix-potential-race-condition-in-drivers-base-dd.c.patch
+driver-core-don-t-initialize-wakeup-flags.patch
+driver-core-early-dev_name-support.patch
+driver-core-module.c-use-kasprintf.patch
+devtmpfs-support-config_tmpfs.patch
+platform_bus-allow-custom-extensions-to-system-pm-methods.patch
+drivers-base-convert-sema.patch
+lockdep-add-novalidate-class-for-dev-mutex-conversion.patch
+firmware-class-export-nowait-to-userspace.patch
+firmware-loader-rely-on-driver-core-to-create-class-attribute.patch
+firmware-loader-split-out-builtin-firmware-handling.patch
+firmware-loader-do-not-allocate-firmare-id-separately.patch
+driver-core-protect-device-shutdown-from-hot-unplug-events.patch
+generate-change-uevent-for-loop-device.patch
+sysfs-basic-support-for-multiple-super-blocks.patch
+sysfs-remove-double-free-sysfs_get_sb.patch
+kobj-add-basic-infrastructure-for-dealing-with-namespaces.patch
+sysfs-implement-sysfs-tagged-directory-support.patch
+sysfs-add-support-for-tagged-directories-with-untagged-members.patch
+sysfs-implement-sysfs_delete_link.patch
+driver-core-implement-ns-directory-support-for-device-classes.patch
+sysfs-comment-sysfs-directory-tagging-logic.patch
+sysfs-namespaces-add-a-high-level-documentation-file.patch
+sysfs-don-t-use-enums-in-inline-function-declaration.patch
+sysfs-add-struct-file-to-bin_attr-callbacks.patch
+pci-check-caps-from-sysfs-file-open-to-read-device-dependent-config-space.patch
+driver-core-fix-typo-in-drivers-base-core.c-for-config_module.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/driver-core
+From ../quilt-tmp
+ + 9268499...47207fd master -> quilt/driver-core (forced update)
+Importing tty based on quilt/driver-core
+$ cd ../quilt-tmp
+$ git reset --hard 47207fd900f4aeb48e0c2e75343deb52ec5fb104
+HEAD is now at 47207fd driver-core: fix Typo in drivers/base/core.c for CONFIG_MODULE
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty
+serial-bfin_sport_uart-work-around-anomaly-05000473-make-32bit-fifo-read-atomic.patch
+serial-bfin_sport_uart-shorten-the-sport-tx-waiting-loop.patch
+serial-bfin_sport_uart-remove-unused-peripheral-pin-lists.patch
+serial-bfin_sport_uart-add-missing-mapbase-initialization.patch
+serial-bfin_sport_uart-rename-early-platform-driver-class-string.patch
+serial-bfin_sport_uart-add-support-for-cts-rts-via-gpios.patch
+serial-bfin_sport_uart-protect-changes-to-uart_port.patch
+serial-bfin_sport_uart-zero-sport_uart_port-if-allocated-dynamically.patch
+serial-bfin_sport_uart-drop-useless-status-masks.patch
+serial-bfin_sport_uart-only-enable-sport-tx-if-data-is-to-be-sent.patch
+serial-bfin_sport_uart-pull-in-bfin_sport.h-for-sport-defines.patch
+serial-bfin_sport_uart-drop-the-experimental-markings.patch
+serial-bfin_sport_uart-drop-redundant-cpu-depends.patch
+serial-tty-new-ldiscs-for-staging.patch
+tty-n_gsm-line-discipline.patch
+tty-n_gsm-depends-on-net.patch
+serial-uartlite-move-from-byte-accesses-to-word-accesses.patch
+serial-two-branches-the-same-in-timbuart_set_mctrl.patch
+serial-timbuart-make-sure-last-byte-is-sent-when-port-is-closed.patch
+serial167-kill-unused-variables.patch
+serial-add-driver-for-the-altera-jtag-uart.patch
+serial-add-driver-for-the-altera-uart.patch
+tty-fix-obsolete-comment-on-tty_insert_flip_string_fixed_flag.patch
+serial-bfin_sport_uart-use-resource-size-to-fix-off-by-one-error.patch
+serial-isicomm-handle-running-out-of-slots.patch
+serial-apbuart-let-boards-without-apbuart-boot.patch
+serial-tidy-remote_debug.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/tty
+From ../quilt-tmp
+ + 9ff22fe...97c1de4 master -> quilt/tty (forced update)
+Importing usb based on quilt/tty
+$ cd ../quilt-tmp
+$ git reset --hard 97c1de418e0589115593419e720bbcacce6e3414
+HEAD is now at 97c1de4 serial: Tidy REMOTE_DEBUG
+$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb
+usb-xhci-fix-issue-with-set-interface-after-stall.patch
+usb-make-hcd.h-public-drivers-dependency.patch
+usb-make-hub.h-public-drivers-dependency.patch
+usb-split-hub.h-into-ch11.h-and-merge-in-hcd.h.patch
+usb-sisusbvga-remove-the-bkl-from-ioctl.patch
+usb-cdc-acm-make-bitfields-unsigned.patch
+usb-remove-large-struct-from-the-stack-in-usb-storage-isd200-driver.patch
+usb-remove-duplicated-include.patch
+usb-remove-bogus-usb_port_feat_-_speed-symbols.patch
+usb-straighten-out-port-feature-vs.-port-status-usage.patch
+usb-remove-uses-of-urb_no_setup_dma_map.patch
+usb-ehci-au1xxx-does-not-need-ehci-io-watchdog.patch
+usb-serial-use-tty_port-version-console-instead-of-usb_serial_port.patch
+usb-musb-allow-board-to-pass-down-fifo-mode.patch
+usb-musb-set-transceiver-interface-type.patch
+usb-musb-build-musb-driver-for-omap4.patch
+usb-musb-add-omap4-support-in-musb-driver.patch
+usb-musb-allow-the-blackfin-vrsel-gpio-to-be-active-low.patch
+usb-musb-add-debugfs-support.patch
+usb-musb-gadget-support-musb-specific-test-modes.patch
+usb-musb-hsdma-use-musb_read-writel.patch
+usb-f_mass_storage-dynamic-buffers-for-better-alignment.patch
+usb-console-pass-baud-from-console-to-the-initial-tty-open.patch
+usb-serial-driver-zio-motherboard.patch
+usb-fix-serial-build-when-sysrq-is-disabled.patch
+usb-add-a-new-quirk-usb_quirk_honor_bnuminterfaces.patch
+usb-serial-allow-drivers-to-define-bulk-buffer-sizes.patch
+usb-cp210x-increase-the-bulk-out-buffer-size-to-256-byte.patch
+usb-cp210x-increase-bulk-in-buffer-size-to-256-byte.patch
+usb-pl2303-increase-the-bulk-out-buffer-size-to-256-byte.patch
+usb-pl2303-increase-bulk-in-buffer-size-to-256-byte.patch
+usb-serial-fix-generic-chars_in_buffer.patch
+usb-serial-fix-missing-locking-on-fifo-in-write-callback.patch
+usb-serial-clear-fifo-on-close.patch
+usb-serial-refactor-generic-close.patch
+usb-serial-refactor-read-urb-submission-in-generic-driver.patch
+usb-serial-remove-unnecessary-re-initialisation-of-generic-urbs.patch
+usb-cp210x-use-generic-submit_read_urb-at-open.patch
+usb-serial-clean-up-read-processing-in-generic-driver.patch
+usb-serial-generalise-generic-read-implementation.patch
+usb-pl2303-switch-to-generic-read-implementation.patch
+usb-serial-export-generic-throttle-and-unthrottle.patch
+usb-ftdi_sio-switch-to-generic-read-implementation.patch
+usb-serial-clean-up-some-error-and-debug-messages-in-generic-driver.patch
+usb-serial-clean-up-generic-write-start-busy-test.patch
+usb-pl2303-switch-to-generic-write-implementation.patch
+usb-pl2303-use-generic-close.patch
+usb-usb_debug-use-the-generic-kfifo-based-write-implementation.patch
+usb-serial-allow-custom-multi-urb-write-bulk-callbacks.patch
+usb-serial-re-implement-multi-urb-writes-in-generic-driver.patch
+usb-serial-generalise-write-buffer-preparation.patch
+usb-ftdi_sio-fix-some-coding-style-issues.patch
+usb-gadget-add-hid-gadget-driver.patch
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:96: space before tab in indent.
+ gadget driver. To use, point it at a hidg device and set the
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:97: space before tab in indent.
+ device type (keyboard / mouse / joystick) - E.G.:
+warning: 2 lines add whitespace errors.
+usb-option.c-option_indat_callback-resubmit-some-unsuccessful-urbs.patch
+usb-musb-debugfs-musb_exit_debugfs-can-be-called-on-probe.patch
+usb-musb-support-host-gadget-role-switching-on-blackfin-parts.patch
+musb-omap-remove-omap_vbus_power.patch
+musb-blackfin-remove-bfin_vbus_power.patch
+musb-omap-make-musb_platform_suspend-static.patch
+musb-blackfin-remove-musb_platform_-suspend-resume.patch
+usb-musb-omap2430-remove-unused-define.patch
+usb-musb-omap2430.c-remove-unnecessary-includes.patch
+usb-musb-makefile-remove-unexistent-config-option.patch
+usb-musb-add-extvbus-in-musb_board_data.patch
+usb-musb-add-ulpi-access-operations.patch
+usb-gadget-allow-larger-configuration-descriptors.patch
+usb-gadget-f_mass_storage-per-function.patch
+usb-otg-add-global-ulpi-register-definitions.patch
+usb-otg-ulpi-use-the-global-ulpi-register-definitions.patch
+usb-otg-twl4030-use-the-global-ulpi-register-definitions.patch
+usb-pxa27x_udc-use-four-bits-to-store-endpoint-addresses.patch
+usb-fix-usbmon-and-dma-mapping-for-scatter-gather-urbs.patch
+usb-improve-runtime-remote-wakeup-settings.patch
+usb-don-t-enable-remote-wakeup-by-default.patch
+usb-use-pm-core-routines-to-enable-disable-autosuspend.patch
+usb-deprecate-the-power-level-sysfs-attribute.patch
+usb-serial-add-generic-usb-wwan-support.patch
+usb-option-use-generic-usb-wwan-code.patch
+usb-qcserial-use-generic-usb-wwan-code.patch
+usb-qcserial-add-support-for-qualcomm-gobi-2000-devices.patch
+usb-add-parsing-of-superspeed-endpoint-companion-descriptor.patch
+usb-add-stream-id-field-to-struct-urb.patch
+xhci-add-memory-allocation-for-usb3-bulk-streams.patch
+usb-xhci-correct-assumptions-about-number-of-rings-per-endpoint.patch
+usb-support-for-allocating-usb-3.0-streams.patch
+usb-storage-remove-unneeded-sl11r-unusual_devs-entry.patch
+usb-ehci-elide-i-o-watchdog-on-nec-parts.patch
+usb-omap-switch-to-subsys_initcall-for-isp1301-transceiver.patch
+usb-ueagle-fix-coding-styles.patch
+devices-fix-coding-styles.patch
+short-new-graph-for-usb-serial.txt.patch
+usb-rename-usb_buffer_alloc-and-usb_buffer_free-users.patch
+usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch
+usb-usbserial-mos7720-add-support-for-parallel-port-on-moschip-7715.patch
+usb-usbserial-mos7720-cleanup-consolidation-replace-send_mos_cmd-with-read-write-_mos_reg.patch
+usb-usbserial-fix-mos7720-dependencies.patch
+usb-cdc-ncm-constants-and-structures-added.patch
+usb-ncm-added-ncm.h-with-auxiliary-definitions.patch
+usb-core-config.c-usb_get_configuration-simplified.patch
+usb-clean-up-some-host-controller-sparse-warnings.patch
+usb-composite-framework-add-suspended-sysfs-entry.patch
+usb-mass-storage-gadget-handle-eject-request.patch
+usb-sisusbvga-remove-the-bkl-from-open.patch
+usb-mos7840-cleanup-useless-header.patch
+usb-g_hid-unregister-platform-driver-on-probe-usb_composite_register-errors.patch
+usb-remove-leftover-references-to-udev-autosuspend_disabled.patch
+usb-export-the-new-ch11.h-file-to-userspce.patch
+usb-remove-the-usb_host_ss_ep_comp-structure.patch
+usb-remove-urb_no_setup_dma_map.patch
+usb-xhci-avoid-double-free-after-streams-are-disabled.patch
+usb-option-add-pid-for-zte-product.patch
+usb-qcaux-add-samsung-u520-device-id.patch
+usb-ehci-omap-fix-compilation-warning.patch
+usb-ehci-omap-fix-si-version-related-programming.patch
+usb-mxc-gadget-fix-bitfield-for-calculating-maximum-packet-size.patch
+usb-unusual-dev-add-bad-sense-flag-for-appotech-ax203-based-picture-frames.patch
+usb-whci-declare-functions-as-static.patch
+usb-oti6858-declare-send_data-as-static.patch
+usb-sisusb_con.c-fix-shadows-sparse-warning.patch
+usb-u132-hcd.c-fix-shadows-sparse-warning.patch
+usb-add-definition-for-the-pipe-usage-descriptor.patch
+usb-add-a-usb_pipe_endpoint-convenience-function.patch
+usb-turn-interface_to_usbdev-into-an-inline-function.patch
+usb-change-the-scatterlist-type-in-struct-urb.patch
+usb-gadget-video-class-function-driver.patch
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:13: new blank line at EOF.
++
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:677: new blank line at EOF.
++
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1056: new blank line at EOF.
++
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1300: new blank line at EOF.
++
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1886: new blank line at EOF.
++
+warning: squelched 2 whitespace errors
+warning: 7 lines add whitespace errors.
+usb-gadget-webcam-device.patch
+/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:44: new blank line at EOF.
++
+warning: 1 line adds whitespace errors.
+usb-simplify-usb_sg_init.patch
+usb-isp1760-use-resource_size.patch
+usb-ftdi_sio-switch-to-generic-write-implementation.patch
+usb-ftdi_sio-clean-up-sio-write-support.patch
+usb-aircable-rewrite-using-generic-read-and-write-implementations.patch
+usb-serial-reimplement-generic-fifo-based-writes.patch
+usb-serial-remove-multi-urb-write-from-generic-driver.patch
+usb-gadget-webcam-depends-on-video_dev.patch
+wait_event_interruptible_locked-interface.patch
+fs-timerfd.c-make-use-of-wait_event_interruptible_locked_irq.patch
+usb-gadget-__init-and-__exit-tags-removed.patch
+usb-f_fs-the-functionfs-driver.patch
+usb-g_ffs-the-functionfs-gadget-driver.patch
+usb-ffs-test-functionfs-testing-program.patch
+usb-testusb-an-usb-testing-application.patch
+usb-testusb-testusb-compatibility-with-functionfs-gadget.patch
+usb-xhci-set-stream-id-to-0-after-cleaning-up-stalls.patch
+usb-fix-u132-hcd-code-data-warning.patch
+usb-gadget-allow-function-access-to-device-id-data-during-bind.patch
+usb-tty-fix-incorrect-use-of-tty_insert_flip_string_fixed_flag.patch
+usb-ark3116-reimplement-read-processing.patch
+usb-usbcore-do-not-disable-usb3-protocol-ports-in-hub_activate.patch
+usb-isp1760-soften-dw3-x-transaction-error-bit-handling.patch
+usb-ftdi_sio-use-tty_insert_flip_string_fixed_flag.patch
+usb-pl2303-use-tty_insert_flip_string_fixed_flag.patch
+usb-ftdi_sio-clean-up-line-status-handling.patch
+usb-mxc-gadget-remove-60mhz-clock-requirement-for-freescale-mx51-usb-core.patch
+usb-omap3-add-platform-init-code-for-ohci-driver.patch
+usb-ohci-introduce-omap3-ohci-hcd-driver.patch
+usb-ohci-add-kconfig-entries-for-ohci-omap3.patch
+usb-gadget-f_fs.c-needs-to-include-pagemap.h.patch
+usb-xhci-transfer-ring-link-trb-activation-change.patch
+usb-xhci-fix-wrong-usage-of-macro-trb_type.patch
+usb-fix-interface-runtime-pm-settings.patch
+usb-ehci-omap-fix-resume-failures-after-bus-suspend.patch
+usb-add-missing-in-map_urb_for_dma.patch
+usb-gadget-f_mass_storage-fix-in-error-recovery.patch
+usb-remove-usb_find_device.patch
+usb-xhci-remove-the-arbitrary-limit-of-15-xhci-ports.patch
+usb-fix-functionfs-for-config_net-disabled.patch
+usb-ehci-clear-phcd-before-resuming.patch
+usb-ehci-fix-controller-wakeup-flag-settings-during-suspend.patch
+usb-ir-usb-fix-double-free.patch
+usb-ir-usb-allow-custom-bulk-buffer-size-without-reallocation.patch
+usb-ir-usb-fix-set_termios-race.patch
+usb-ir-usb-reimplement-using-generic-framework.patch
+usb-ipw-clean-up-dtr-rts-handling.patch
+usb-ipw-remove-dummy-port_probe-and-port_remove.patch
+usb-ipw-reimplement-using-generic-framework.patch
+usb-io_edgeport-use-kzalloc.patch
+usb-cp210x-remove-redundant-disconnect.patch
+usb-fhci-cq_get-should-check-kfifo_out-s-return-value.patch
+usb-mct_u232.h-checkpatch-cleanups.patch
+usb-belkin_sa.h-checkpatch-cleanups.patch
+usb-cypress_m8.h-checkpatch-cleanups.patch
+usb-ftdi_sio-checkpatch-cleanups.patch
+usb-io_edgeport-checkpatch-cleanups.patch
+usb-kl5kusb105.h-checkpatch-cleanups.patch
+usb-kobil_sct.h-checkpatch-cleanups.patch
+usb-pl2303.h-checkpatch-cleanups.patch
+usb-visor.h-checkpatch-cleanups.patch
+usb-usb.h-checkpatch-cleanups.patch
+usb-include-usb-.h-checkpatch-cleanup.patch
+usb-remove-match_device.patch
+usb-xhci-fix-compiler-warning.patch
+usb-option.c-olivetti-olicard100-support.patch
+usb-kobil-fix-memory-leak.patch
+usb-serial-add-special-case-for-processing-of-empty-read-urbs.patch
+usb-empeg-reimplement-using-generic-framework.patch
+usb-ipaq-reimplement-using-generic-framework.patch
+usb-spcp8x5-reimplement-using-generic-framework.patch
+usb-visor-fix-memory-leak.patch
+usb-visor-reimplement-using-generic-framework.patch
+usb-cp210x-use-generic-open-to-start-reading-from-device.patch
+usb-belkin_sa-minor-clean-ups.patch
+usb-belkin_sa-clean-up-open.patch
+usb-belkin_sa-implement-line-status-handling.patch
+usb-visor-increase-bulk-out-buffer-size.patch
+usb-cp210x-new-device-ids-11-new-device-ids.patch
+usb-gadget-use-kmemdup.patch
+usb-usb_debug-set-bulk-out-size-at-probe.patch
+usb-cypress_m8-remove-unused-drain-define.patch
+usb-cypress_m8-use-kfifo-to-implement-write-buffering.patch
+usb-oti6858-use-kfifo-to-implement-write-buffering.patch
+usb-oti6858-use-port-write-fifo.patch
+usb-usb-storage-trivial-debug-improvements.patch
+usb-storage-always-print-quirks.patch
+usb-remove-unused-usb_buffer_alloc-and-usb_buffer_free-macros.patch
+$ cd ../next
+$ git fetch -f ../quilt-tmp master:quilt/usb
+From ../quilt-tmp
+ + b4cd4f9...9f50507 master -> quilt/usb (forced update)
diff --git a/localversion-next b/localversion-next
new file mode 100644
index 0000000..a0210aa
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20100518
