diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-31 17:08:40 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-31 17:08:40 +1100 |
| commit | bbb47e76593695b347e6bbac57f186124b30cac8 (patch) | |
| tree | d3164b9bfb3b6837bf1d4a4d78636a60f129d3e7 | |
| parent | 6a2358fa57437acef7d7cbb969fc5a2b04169671 (diff) | |
Add linux-next specific files for 20100331next-20100331
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 160 | ||||
| -rw-r--r-- | Next/Trees | 162 | ||||
| -rw-r--r-- | Next/merge.log | 7982 | ||||
| -rw-r--r-- | Next/quilt-import.log | 58 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8363 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..16c7aa2344ed --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,160 @@ +Name SHA1 +---- ---- +origin 2eaa9cfdf33b8d7fb7aff27792192e0019ae8fc6 +fixes 34bfa815637f096f07d3b94090912fc0c91a9a6b +arm-current c6c352371c1ce486a62f4eb92e545b05cfcef76b +m68k-current a7594af2f3ab27f6c2b1f2b36fc79b49eb7902ec +powerpc-merge 191aee58b6568cf8143901bfa3f57a9b8faa6f1c +sparc-current 9e8307ecaf9f8c8b5b3b22145021204c4e73114a +scsi-rc-fixes 421e33d0045ac0aa119c033b78742e0fbf4c3b21 +net-current baff42ab1494528907bf4d5870359e31711746ae +sound-current 85255c0e078158ede61ff8bd296e306db6f7ed19 +pci-current b72c40949b0f04728f2993a1434598d3bad094ea +wireless-current 7371400431389e1df6a2a05ab9882055b8a6ff2c +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +tty.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +usb.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +staging.current 220bf991b0366cc50a94feede3d7341fa5710ee4 +cpufreq-current 0917863013a92ac41c48ae4f1d95743c71c04ace +input-current 2e2e3b96d98d5c17e9c09bc6088df3e182a71814 +md-current 627a2d3c29427637f4c5d31ccc7fcbd8d312cd71 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 74781387822cd7a549123ae2b35862bf802689be +ide-curent 9ce41aed0d392246eb788786253f242e829fd5e1 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current ed01f64b831481762437c8eedddcca8481dc7f67 +arm 0cd9f6f697786b0ae3e72830f7a29fca608b3165 +davinci 5ee7303cc81694d65502412f7b8a272fa024ac36 +i.MX 69583b3eb7db0eacfc16a4ddab7d98ba237d6251 +msm 38e7ca452fa7b9dd20fdd49b0599404262118890 +omap cef9f7db2d0000f03ab35094f14816b4bdbf29f1 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 3b05007e43ea629394e89ea0b023d7b15375a2bb +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 39710479303fd3affb3e204e9a7a75cc676977b5 +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 da0528828dcdb32328aeeaa411aa5be38db2f8ff +m68k a7594af2f3ab27f6c2b1f2b36fc79b49eb7902ec +m68knommu 59c7835794c222023567fec13bb2a427190e34e6 +microblaze 077ddba320220abe04ecadc896777f1c624dbbe7 +mips 522b119682125a99796e0a1a672b4eb92b69366f +parisc 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +powerpc bca14dd14f3b0c5e3e2d1d314679f85b67871365 +4xx 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +52xx-and-virtex 220bf991b0366cc50a94feede3d7341fa5710ee4 +galak a11106544f33c104706ae42d27219a409b67478e +s390 a45bb5034eb604caa9298a1d960dbacac286b9fd +sh 720fcb36ac1aa2df2c54c170253b6b29600cbefc +genesis 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 +sparc 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph 725e99e56bd78d55ca8f68b55338c79c4376f790 +cifs 85a788419a46f57eda3272df6ad1923bad3fd609 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs d23d960f5c8560ce182c69a31a6e8707c05c947d +ext3 efd8f0e6f6c1faa041f228d7113bd3a9db802d49 +ext4 496dc4b0bea0a5dcfdcc96a0ec465efc826d83d5 +fatfs 1bdb6f9199def1c3538c18089e499f5df5ff1747 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 602c89d2e3e8652f94a697c9a919be739b9bcdd5 +jfs d7eecb483cc29e929bbc5515b8def830d7fc6ad2 +logfs 6be7fa06eb4d721df734bd0946b5e63b27c0589b +nfs ff333d3b36348fcf3c8e2960037ba4eb1b300129 +nfsd a5990ea1254cd186b38744507aeec3136a0c1c95 +nilfs2 d067633b4483f3c7d971d8f889f35340a8635bb5 +ocfs2 bbc6168191b25dfc768f56ead22e2cb009a8d9b3 +squashfs 06862f884d9c2453daaf0c1d070c69cf444f10b1 +udf 3a065fcf9efed42ba736da7be528f2d3dec4965a +v9fs 4665c7a2333c442ec9ce69b48a72707767d898de +ubifs 57d54889cd00db2752994b389ba714138652e60c +xfs 68a2ac777cca40ccc993512bcf457999be71cc36 +reiserfs-bkl b7b7fa43103a9fb30dbcc60cbd5161fdfc25f904 +vfs 9f009a78fb3b54976cfe8173d05ef483dbda4571 +pci 316607809324cc796c0809630b6ae8a768404296 +hid be5d5e0e2dfbecad39478161c34bc45a259c762b +i2c b10ff4664c1ed8ad9dedbfb89957b2268f5282cd +bjdooks-i2c 3f4ae8605261e6f71e721e026bc18cb1851a7276 +jdelvare-hwmon 3934565536e2974534bc5608400dd0556a6f362d +kernel-doc 05240ad14424a627f0cb6b6d13347619f1758b05 +v4l-dvb 309abc44f44915938bcc70522f06f13b02fae94d +kbuild b83419363eff1535309df97a4bf319c42d900a9c +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide b72c40949b0f04728f2993a1434598d3bad094ea +libata ed89848bdd75d0b18fc59be3bd9331fdd964f705 +infiniband 0636b33c5f2fac4e274464ae6867805f080fc433 +acpi 22ef99c516ec973955bc36174cb534558ded3b72 +ieee1394 fe43d6d9cf59d8f8cbfdcde2018de13ffd1285c7 +ubi 57d54889cd00db2752994b389ba714138652e60c +kvm ae6be51ed01d6c4aaf249a207b4434bc7785853b +dlm b6fa8796b2da0390e9f4115e8789a01004fc1c9b +ibft c4d1409bbed8cf2a11b48ce3a075e142f686a588 +scsi b72c40949b0f04728f2993a1434598d3bad094ea +async_tx 6a3cd3ea48584d14f60dce0b3c4e9e4428beb0fe +net 36c0d8cca3283c235c9af1954de641df84c80f0f +wireless 76232ebf898c4d5e657f2b663fbf7108bca80ded +mtd 8da552f26107f55186346cff280ec9d53cc42add +crypto 975d260355fca4734b545a0e3366672af0356905 +sound 648cf71bfed0c16ad1a3c2654b73892aa19c0d8a +cpufreq 225a4ad3dee86669bf552eb43d2ec4dee0b8b74a +rr 1161b00a7e1f2b5a338b89453bcea2a81385d183 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input d3ba5ae224e87089823623cc656ae79f27b3b75f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 97031ddfe32bb4d5f1a371e069865ab3ce46a0f5 +device-mapper 1ef37bd7422348e6171d6be208e04a79db0ccf2f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia f0abd82f2c1230ae9bea250bddc9a94b8af56104 +battery afbc74fdc5b96552c384e57119b3cc13c840bf06 +leds 14b5d6dd40b3091cb5f566568baa4a74dc619286 +backlight ec57af9c2ece22ae6234189972105d777ff5f939 +kgdb 2b904d9a08163209c04034a9b82f8a2641992df5 +slab de3a00c8163ed06e8efe6c537402986379e1a3ac +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 113b4e570a4e2953a227330f33deddc0f21300d6 +mfd e3591080cd685837a45e0bebd30e3b932be5f78d +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 663980cda6aadcf51e24b8ecc1822aafc0d0c868 +voltage 1b060f0a7ebac0b76bf652b242b3a47b397de09a +security-testing d25d6fa1a95f465ff1ec4458ca15e30b2c8dffec +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 +watchdog 522dba7134d6b2e5821d3457f7941ec34f668e6d +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b8973a81876d90f916507ac40d1381068dc986a +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 220bf991b0366cc50a94feede3d7341fa5710ee4 +jc_docs 724e6d3fe8003c3f60bf404bf22e4e331327c596 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial f77f13e22df4a40d237697df496152c8c37f3f2b +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 2cbeb09026d9e3a77873b672369f1695786258cb +bluetooth 3e81c6da39a265e11ef48f52bd15bf7ca0068c75 +fsnotify 48db02f1d87c626f274766edd6aef311aff1f93b +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +drbd 39ad2bbb5900d1bc9ae8f06cebb4cb2529d9e42e +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree 9cbbd9e33e2441bb109224c6f5f53ee5ae52a391 +spi 4f4517c45f325ba511458465430a52864a5d0d30 +limits 57158a0fd4c9e29b403d422ac820cf238066cedf +omap_dss2 8871d54b5e1558bd59baad02eb7a80f86d49f4a1 +tip 2f53e02daa18a423a785eb936d782f881ebae670 +edac-amd 5b89d2f9ace1970324facc68ca9b8fae19ce8096 +oprofile bb1165d6882f423f90fc7007a88c6c993b7c2ac4 +percpu 10fad5e46f6c7bdfb01b1a012380a38e3c6ab346 +workqueues 5ab0fec5e715dd22e9d30d9f2eb1f0bbb05fb001 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 832d72674364863496fee86a1dfd7c38b0a5c333 +tty 832d72674364863496fee86a1dfd7c38b0a5c333 +usb 50be717773eb1d77d0a02f1b307cfe7b36121d03 +staging 50be717773eb1d77d0a02f1b307cfe7b36121d03 +slabh de380b55f92986c1a84198149cb71b7228d15fbd +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..724b813dd2e8 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,162 @@ +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 +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl +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 +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 +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +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 +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 quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-08-staging/ +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 000000000000..3752724080c0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7982 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9623e5a Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 +Merging origin/master +$ git merge origin/master +Updating 9623e5a..2eaa9cf +Fast-forward + MAINTAINERS | 10 +++++++ + Makefile | 2 +- + arch/x86/kernel/head32.c | 4 ++- + arch/x86/kernel/head64.c | 3 +- + arch/x86/kernel/setup.c | 10 ++++--- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/x86/mm/init.c | 32 +++++++++++++++++++---- + fs/logfs/dev_bdev.c | 9 +++++- + fs/logfs/dir.c | 4 +- + fs/logfs/journal.c | 7 +++++ + fs/logfs/logfs.h | 1 + + fs/logfs/readwrite.c | 13 +++++++++- + fs/logfs/segment.c | 54 +++++++++++++++++++++++----------------- + fs/logfs/super.c | 15 +++++------ + kernel/cred.c | 6 ++++- + kernel/early_res.c | 6 ++++ + 16 files changed, 127 insertions(+), 51 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + drivers/block/pktcdvd.c | 17 ++++++++++++++--- + drivers/char/hvc_console.c | 31 ++++++++++--------------------- + fs/compat_ioctl.c | 3 --- + 3 files changed, 24 insertions(+), 27 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/include/asm/cacheflush.h | 38 +------------------ + arch/arm/include/asm/clkdev.h | 1 + + arch/arm/include/asm/irq.h | 1 + + arch/arm/include/asm/outercache.h | 75 +++++++++++++++++++++++++++++++++++++ + arch/arm/include/asm/system.h | 16 +++++--- + arch/arm/kernel/kprobes.c | 10 ++++- + arch/arm/lib/memmove.S | 4 +- + arch/arm/mm/Kconfig | 13 ++++++ + arch/arm/mm/cache-l2x0.c | 10 +++++ + arch/arm/vfp/vfpmodule.c | 2 +- + drivers/usb/gadget/at91_udc.c | 9 ++++ + include/linux/amba/bus.h | 3 + + include/linux/amba/pl061.h | 2 + + 13 files changed, 137 insertions(+), 47 deletions(-) + create mode 100644 arch/arm/include/asm/outercache.h +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/atomic_mm.h | 8 ++++++-- + arch/m68k/include/asm/sigcontext.h | 4 +--- + 2 files changed, 7 insertions(+), 5 deletions(-) +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/base/attribute_container.c | 1 + + drivers/scsi/advansys.c | 8 ++ + drivers/scsi/libiscsi.c | 5 +- + drivers/scsi/qla1280.c | 161 ++++++++++++++++++++++++------------ + drivers/scsi/qla2xxx/qla_attr.c | 6 +- + drivers/scsi/qla2xxx/qla_fw.h | 18 ++++- + drivers/scsi/qla2xxx/qla_isr.c | 37 ++++----- + drivers/scsi/qla2xxx/qla_mbx.c | 8 ++- + drivers/scsi/qla2xxx/qla_os.c | 4 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/scsi_transport_fc.c | 4 +- + 11 files changed, 172 insertions(+), 84 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + net/ipv4/tcp.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +$ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch +Applying: ar9170: fix for driver-core ABI change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ar9170/usb.c +$ git add . +$ git commit -v -a --amend +[master d8544ee] Merge remote branch 'net-current/master' +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/ath/ar9170/usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Merge made by recursive. + drivers/net/wireless/ath/ar9170/usb.c | 4 +++- + drivers/net/wireless/iwlwifi/iwl-4965.c | 6 ++---- + drivers/net/wireless/iwlwifi/iwl-agn.c | 12 ++++++++++-- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 ++-- + drivers/net/wireless/libertas/cfg.c | 8 ++++++-- + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/mwl8k.c | 1 + + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rt2x00/rt2500usb.c | 5 +++++ + drivers/net/wireless/rt2x00/rt2800lib.c | 4 ++-- + net/mac80211/mesh_hwmp.c | 4 ++-- + net/mac80211/tx.c | 6 ++++++ + net/mac80211/util.c | 18 +++++++++--------- + net/wireless/reg.c | 12 +++++------- + 14 files changed, 55 insertions(+), 31 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 +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 19 ++++++++++++++----- + drivers/cpufreq/cpufreq_conservative.c | 8 ++++++-- + 2 files changed, 20 insertions(+), 7 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + Documentation/input/multi-touch-protocol.txt | 23 ++++++++--- + drivers/input/input.c | 9 ++++- + drivers/input/mouse/bcm5974.c | 1 - + drivers/input/sparse-keymap.c | 52 ++++++++++++++++--------- + 4 files changed, 58 insertions(+), 27 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 +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Merge made by recursive. + .../powerpc/dts-bindings/fsl/cpm_qe/qe.txt | 54 ++++++++++++++++++++ + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 2 + + drivers/of/fdt.c | 7 ++- + 3 files changed, 61 insertions(+), 2 deletions(-) +Merging arm/devel +$ git merge arm/devel +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-realview/clock.c +Removing arch/arm/mach-realview/clock.h +Removing arch/arm/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 78 +++- + arch/arm/Makefile | 2 + + arch/arm/common/Kconfig | 6 +- + arch/arm/common/Makefile | 3 +- + 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/include/asm/hardware/arm_timer.h | 39 +- + 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/mach/time.h | 2 +- + arch/arm/kernel/time.c | 70 +--- + arch/arm/mach-at91/Kconfig | 1 + + 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-nomadik/Kconfig | 1 + + arch/arm/mach-nomadik/Makefile | 2 +- + arch/arm/mach-nomadik/cpu-8815.c | 83 ++-- + arch/arm/mach-nomadik/include/mach/gpio.h | 67 +--- + 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/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 | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-realview/realview_pba8.c | 2 - + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm/mach-ux500/board-mop500.c | 20 +- + arch/arm/mach-ux500/clock.c | 491 ++++++++++++++++++-- + arch/arm/mach-ux500/clock.h | 125 +++++ + arch/arm/mach-ux500/cpu-u8500.c | 126 +++++- + arch/arm/mach-ux500/include/mach/gpio.h | 12 + + arch/arm/mach-ux500/include/mach/hardware.h | 41 ++- + arch/arm/mach-ux500/include/mach/irqs.h | 8 +- + arch/arm/mach-ux500/include/mach/setup.h | 3 + + 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 | 215 +++++++++ + 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 | 43 ++ + 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 | 3 +- + arch/arm/plat-nomadik/Kconfig | 5 + + arch/arm/plat-nomadik/Makefile | 1 + + arch/arm/{mach-nomadik => plat-nomadik}/gpio.c | 93 +++-- + arch/arm/plat-nomadik/include/plat/gpio.h | 70 +++ + arch/arm/plat-nomadik/timer.c | 125 +++--- + 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 +- + 99 files changed, 3271 insertions(+), 1629 deletions(-) + 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/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 + delete mode 100644 arch/arm/mach-integrator/common.h + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + create mode 100644 arch/arm/mach-ux500/clock.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 + rename arch/arm/{mach-nomadik => plat-nomadik}/gpio.c (86%) + create mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h + 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 +$ 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 f2ad97e] Merge remote branch 'arm/devel' +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/board-da830-evm.c | 17 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/board-sffsdr.c | 2 +- + arch/arm/mach-davinci/cdce949.c | 1 + + arch/arm/mach-davinci/clock.c | 1 + + arch/arm/mach-davinci/devices.c | 2 + + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 3 +- + arch/arm/mach-davinci/dm644x.c | 4 +- + arch/arm/mach-davinci/dm646x.c | 6 +- + arch/arm/mach-davinci/dma.c | 14 +- + arch/arm/mach-davinci/gpio.c | 41 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 4 + + arch/arm/mach-davinci/include/mach/gpio.h | 8 +- + arch/arm/mach-davinci/mux.c | 1 + + arch/arm/mach-davinci/time.c | 6 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-davinci.c | 673 ++++++++++++++++++++++++++++ + drivers/rtc/rtc-omap.c | 12 +- + 21 files changed, 768 insertions(+), 44 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 9049edb] Merge remote branch 'davinci/davinci-next' +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-mx3/Kconfig | 9 ++ + arch/arm/mach-mx3/clock-imx31.c | 5 +- + arch/arm/mach-mx3/devices.c | 38 ++++++- + arch/arm/mach-mx3/devices.h | 4 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 116 ++++++++++++++++--- + arch/arm/mach-mx3/mx31lite-db.c | 2 + + arch/arm/mach-mx5/clock-mx51.c | 2 +- + arch/arm/mach-mx5/cpu.c | 53 +++++++++ + arch/arm/mach-mx5/mm.c | 32 ++--- + .../mach/{board-mx31pdk.h => board-mx31_3ds.h} | 6 +- + arch/arm/plat-mxc/include/mach/mx51.h | 33 ++---- + arch/arm/plat-mxc/include/mach/uncompress.h | 4 + + 12 files changed, 236 insertions(+), 68 deletions(-) + rename arch/arm/plat-mxc/include/mach/{board-mx31pdk.h => board-mx31_3ds.h} (93%) +Merging msm/for-next +$ git merge msm/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + arch/arm/mach-msm/Makefile | 3 +- + arch/arm/mach-msm/acpuclock-arm11.c | 526 ++++++++++++++++++++ + arch/arm/mach-msm/acpuclock.h | 32 ++ + arch/arm/mach-msm/board-halibut.c | 15 + + arch/arm/mach-msm/board-mahimahi.c | 87 ++++ + arch/arm/mach-msm/board-msm7x27.c | 179 +++++++ + arch/arm/mach-msm/board-msm7x30.c | 196 ++++++++ + arch/arm/mach-msm/board-qsd8x50.c | 176 +++++++ + arch/arm/mach-msm/board-sapphire.c | 118 +++++ + arch/arm/mach-msm/{board-dream.c => board-trout.c} | 4 +- + arch/arm/mach-msm/{board-dream.h => board-trout.h} | 0 + arch/arm/mach-msm/devices.c | 78 +++ + arch/arm/mach-msm/dma.c | 28 +- + arch/arm/mach-msm/include/mach/board.h | 11 + + arch/arm/mach-msm/include/mach/dma.h | 2 + + arch/arm/mach-msm/include/mach/vreg.h | 2 +- + arch/arm/mach-msm/irq.c | 4 +- + arch/arm/mach-msm/proc_comm.h | 102 ++++- + arch/arm/mach-msm/vreg.c | 154 +++++-- + drivers/mmc/host/msm_sdcc.c | 472 +++++++++++------- + drivers/mmc/host/msm_sdcc.h | 15 +- + 22 files changed, 1966 insertions(+), 239 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} (97%) + rename arch/arm/mach-msm/{board-dream.h => board-trout.h} (100%) +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap_zoom2_defconfig | 2 +- + arch/arm/configs/omap_zoom3_defconfig | 2 +- + arch/arm/mach-omap2/board-3630sdp.c | 1 + + arch/arm/mach-omap2/board-n8x0.c | 18 ++++++------ + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 1 - + arch/arm/mach-omap2/include/mach/entry-macro.S | 2 +- + arch/arm/mach-omap2/serial.c | 35 ++++++++++++----------- + 8 files changed, 32 insertions(+), 31 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging 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 +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Auto-merging arch/m68knommu/kernel/ptrace.c +Auto-merging arch/m68knommu/kernel/sys_m68k.c +Auto-merging arch/m68knommu/kernel/syscalltable.S +Auto-merging fs/binfmt_flat.c +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/Makefile | 2 +- + arch/m68knommu/kernel/entry.S | 2 +- + 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 ++++++++- + fs/binfmt_flat.c | 2 +- + 23 files changed, 1252 insertions(+), 105 deletions(-) + create mode 100644 arch/m68k/include/asm/mcfqspi.h +Merging microblaze/next +$ git merge microblaze/next +Removing arch/microblaze/include/asm/segment.h +Removing arch/microblaze/lib/uaccess.c +Merge made by recursive. + arch/microblaze/Kconfig | 3 - + arch/microblaze/Makefile | 4 +- + arch/microblaze/boot/Makefile | 6 +- + arch/microblaze/include/asm/processor.h | 1 - + arch/microblaze/include/asm/segment.h | 49 --- + arch/microblaze/include/asm/thread_info.h | 5 +- + arch/microblaze/include/asm/tlbflush.h | 3 +- + arch/microblaze/include/asm/uaccess.h | 447 ++++++++++++++----------- + arch/microblaze/kernel/dma.c | 2 +- + arch/microblaze/kernel/head.S | 12 +- + arch/microblaze/kernel/hw_exception_handler.S | 112 +++---- + arch/microblaze/kernel/misc.S | 15 +- + arch/microblaze/kernel/process.c | 10 +- + arch/microblaze/kernel/setup.c | 24 +- + arch/microblaze/kernel/traps.c | 6 +- + arch/microblaze/lib/Makefile | 3 +- + arch/microblaze/lib/fastcopy.S | 6 +- + arch/microblaze/lib/memcpy.c | 2 +- + arch/microblaze/lib/memset.c | 15 +- + arch/microblaze/lib/uaccess.c | 48 --- + arch/microblaze/lib/uaccess_old.S | 45 ++- + arch/microblaze/mm/fault.c | 24 +- + arch/microblaze/mm/init.c | 9 - + arch/microblaze/mm/pgtable.c | 2 +- + 24 files changed, 407 insertions(+), 446 deletions(-) + delete mode 100644 arch/microblaze/include/asm/segment.h + delete mode 100644 arch/microblaze/lib/uaccess.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + drivers/video/tdfxfb.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/lowcore.h | 48 ++++++++++++++++++-------------------- + arch/s390/kernel/asm-offsets.c | 1 - + arch/s390/kernel/head.S | 4 +- + arch/s390/kernel/processor.c | 37 +++++++++++++++++++---------- + arch/s390/kernel/setup.c | 20 ++------------- + drivers/s390/char/Kconfig | 3 +- + drivers/s390/char/vmcp.c | 38 ++++++------------------------ + drivers/s390/cio/css.c | 7 ++++- + 8 files changed, 66 insertions(+), 92 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/configs/ecovec24_defconfig | 236 +++++++++++++++++++++++------ + arch/sh/include/asm/clkdev.h | 35 +++++ + arch/sh/include/asm/clock.h | 7 - + arch/sh/include/asm/dmaengine.h | 63 +-------- + arch/sh/include/asm/elf.h | 6 +- + arch/sh/include/asm/siu.h | 8 +- + arch/sh/include/cpu-sh4/cpu/mmu_context.h | 9 + + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/clkdev.c | 169 +++++++++++++++++++++ + arch/sh/kernel/cpu/clock-cpg.c | 5 + + arch/sh/kernel/cpu/clock.c | 55 +------- + arch/sh/kernel/cpu/sh2/setup-sh7619.c | 6 - + 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/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/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 | 12 +- + arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 10 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 10 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 58 ++++++-- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 56 ++++++- + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 51 ++++++- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 80 +++++++++- + 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 | 15 -- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 27 ---- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 27 ---- + 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 | 18 --- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 24 --- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 36 ----- + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 --- + arch/sh/kernel/cpu/sh5/setup-sh5.c | 9 - + arch/sh/kernel/cpufreq.c | 4 +- + arch/sh/kernel/smp.c | 1 + + arch/sh/mm/Makefile | 8 +- + arch/sh/mm/tlb-debugfs.c | 179 ++++++++++++++++++++++ + arch/sh/mm/tlb-urb.c | 22 ++- + drivers/base/platform.c | 20 +++ + drivers/clocksource/sh_cmt.c | 42 +++--- + drivers/clocksource/sh_mtu2.c | 34 +++-- + drivers/clocksource/sh_tmu.c | 38 +++--- + drivers/dma/shdma.c | 13 +- + drivers/dma/shdma.h | 4 +- + drivers/serial/sh-sci.c | 189 +++++++++++++++-------- + drivers/sh/intc.c | 95 +++++++++++- + drivers/usb/gadget/r8a66597-udc.c | 1 - + include/linux/device.h | 4 + + include/linux/serial_sci.h | 4 +- + include/linux/sh_dma.h | 101 ++++++++++++ + include/linux/sh_intc.h | 6 +- + 61 files changed, 1270 insertions(+), 756 deletions(-) + create mode 100644 arch/sh/include/asm/clkdev.h + create mode 100644 arch/sh/kernel/clkdev.c + create mode 100644 arch/sh/mm/tlb-debugfs.c + create mode 100644 include/linux/sh_dma.h +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'fs/ceph/auth_x.c' using previous resolution. +Resolved 'fs/ceph/mds_client.c' using previous resolution. +Auto-merging Documentation/filesystems/ceph.txt +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/auth_x.c +CONFLICT (content): Merge conflict in fs/ceph/auth_x.c +Auto-merging fs/ceph/mds_client.c +CONFLICT (content): Merge conflict in fs/ceph/mds_client.c +Auto-merging fs/ceph/messenger.c +Auto-merging fs/ceph/osd_client.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 11d56c7] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/ceph/addr.c | 9 +------ + fs/ceph/file.c | 2 +- + fs/ceph/messenger.c | 2 +- + fs/ceph/msgpool.c | 2 +- + fs/ceph/osd_client.c | 56 ++++++++++--------------------------------------- + fs/ceph/pagelist.c | 2 +- + fs/ceph/xattr.c | 8 +------ + 7 files changed, 19 insertions(+), 62 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifssmb.c | 3 ++- + 2 files changed, 3 insertions(+), 1 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/crypto.c | 37 ++++++------ + fs/ecryptfs/ecryptfs_kernel.h | 13 ++++- + fs/ecryptfs/inode.c | 129 +++++++++++++++++++++-------------------- + fs/ecryptfs/mmap.c | 38 +++++++------ + fs/ecryptfs/super.c | 1 - + 5 files changed, 118 insertions(+), 100 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/extents.c | 15 ++++++++------- + fs/ext4/fsync.c | 2 +- + fs/ext4/move_extent.c | 1 + + 3 files changed, 10 insertions(+), 8 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/dir.c | 17 ++++++----------- + fs/fat/inode.c | 6 ++---- + 2 files changed, 8 insertions(+), 15 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + Documentation/filesystems/gfs2.txt | 12 ++++++------ + fs/gfs2/aops.c | 8 +++++--- + fs/gfs2/bmap.c | 17 ++++++++++------- + fs/gfs2/main.c | 2 +- + 4 files changed, 22 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_dmap.c | 16 ++++++++-------- + fs/jfs/jfs_dmap.h | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) +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/dir.c | 2 +- + fs/nfs/inode.c | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by recursive. + fs/nfsd/export.c | 40 +++++++++++++++++------------ + fs/nfsd/nfs4callback.c | 2 +- + fs/nfsd/nfs4state.c | 58 +++++++++++-------------------------------- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 64 +++++++++++++++++++++++++++++++++++------------ + fs/nfsd/nfsd.h | 6 ++-- + fs/nfsd/vfs.c | 8 +++-- + fs/nfsd/vfs.h | 1 + + net/sunrpc/cache.c | 45 +++++++++++++++++++++------------ + 9 files changed, 125 insertions(+), 101 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Merge made by recursive. + Documentation/filesystems/ocfs2.txt | 3 + + fs/ocfs2/Makefile | 1 + + fs/ocfs2/alloc.c | 166 ++------ + fs/ocfs2/aops.c | 3 + + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 51 +-- + fs/ocfs2/file.c | 22 +- + fs/ocfs2/inode.c | 22 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 11 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/localalloc.c | 136 +++---- + fs/ocfs2/namei.c | 62 +--- + fs/ocfs2/ocfs2.h | 5 + + fs/ocfs2/quota_global.c | 4 +- + fs/ocfs2/quota_local.c | 50 +-- + fs/ocfs2/refcounttree.c | 20 +- + fs/ocfs2/reservations.c | 853 +++++++++++++++++++++++++++++++++++ + fs/ocfs2/reservations.h | 156 +++++++ + fs/ocfs2/resize.c | 13 +- + fs/ocfs2/suballoc.c | 75 +--- + fs/ocfs2/suballoc.h | 2 + + fs/ocfs2/super.c | 27 ++ + fs/ocfs2/xattr.c | 38 +-- + 25 files changed, 1229 insertions(+), 498 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 2ad0262] 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. + Documentation/filesystems/9p.txt | 18 +++++++- + fs/9p/fid.c | 12 ++++- + fs/9p/v9fs.c | 21 ++++++++- + fs/9p/v9fs.h | 1 + + fs/9p/v9fs_vfs.h | 2 + + fs/9p/vfs_dir.c | 8 +++ + fs/9p/vfs_file.c | 11 +++++ + fs/9p/vfs_inode.c | 87 ++++++++++++++++++++++++++++++++----- + fs/9p/vfs_super.c | 58 +++++++++++++++++++++++- + include/net/9p/9p.h | 33 ++++++++++++++ + include/net/9p/client.h | 4 ++ + net/9p/client.c | 88 ++++++++++++++++++++++++++++++++++++- + net/9p/protocol.c | 6 ++- + 13 files changed, 322 insertions(+), 27 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 10 +- + fs/xfs/linux-2.6/xfs_buf.h | 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_super.c | 9 +- + fs/xfs/linux-2.6/xfs_sync.c | 2 +- + fs/xfs/linux-2.6/xfs_trace.h | 9 +- + fs/xfs/quota/xfs_dquot_item.c | 28 +- + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_buf_item.c | 55 ++-- + fs/xfs/xfs_extfree_item.c | 18 +- + fs/xfs/xfs_inode.c | 2 + + fs/xfs/xfs_inode_item.c | 21 +- + fs/xfs/xfs_log.c | 668 ++++++++++++++++++++++------------- + fs/xfs/xfs_log.h | 13 + + fs/xfs/xfs_log_priv.h | 8 + + fs/xfs/xfs_trans.c | 760 +++++++++++++++++++--------------------- + fs/xfs/xfs_trans.h | 5 +- + fs/xfs/xfs_trans_buf.c | 3 +- + 19 files changed, 888 insertions(+), 735 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Merge made by recursive. + fs/reiserfs/super.c | 10 ++++------ + 1 files changed, 4 insertions(+), 6 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/nfs/inode.c' using previous resolution. +Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. +Resolved 'fs/nfsd/vfs.c' using previous resolution. +Resolved 'fs/ufs/inode.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging drivers/infiniband/core/uverbs.h +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/usb/gadget/f_mass_storage.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging fs/autofs4/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/dcache.c +Auto-merging fs/exofs/exofs.h +Auto-merging fs/exofs/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/fat/inode.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/jfs/jfs_inode.h +Auto-merging fs/locks.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/inode.c +CONFLICT (content): Merge conflict in fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/nfs4xdr.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +CONFLICT (content): Merge conflict in fs/nfsd/vfs.c +Auto-merging fs/nilfs2/dir.c +Auto-merging fs/ntfs/super.c +Auto-merging fs/open.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/generic.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/udf/balloc.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/namei.c +Auto-merging fs/ufs/inode.c +CONFLICT (content): Merge conflict in fs/ufs/inode.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/ext3_fs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mount.h +Auto-merging mm/filemap.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0fd290b] Merge remote branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/uverbs_main.c | 1 + + fs/namei.c | 63 +++++++++++++++++---------------- + 2 files changed, 33 insertions(+), 31 deletions(-) +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + Documentation/ABI/testing/sysfs-bus-pci | 40 +++++++++++++++++++++++++ + arch/x86/include/asm/pci_x86.h | 2 +- + arch/x86/pci/common.c | 2 +- + arch/x86/pci/direct.c | 16 +++++----- + arch/x86/pci/mmconfig_32.c | 8 ++-- + arch/x86/pci/numaq_32.c | 8 ++-- + arch/x86/pci/pcbios.c | 8 ++-- + drivers/pci/access.c | 34 +++++++++++----------- + drivers/pci/pci-sysfs.c | 37 +++++++++++++++++++++++ + drivers/pci/pci.c | 2 - + drivers/pci/slot.c | 48 +++++++++++++++++++++++++++++++ + include/linux/ioport.h | 4 ++- + kernel/resource.c | 16 +++++++++- + 13 files changed, 182 insertions(+), 43 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-kone | 111 +++ + drivers/hid/Kconfig | 14 + + drivers/hid/Makefile | 1 + + drivers/hid/hid-core.c | 29 +- + drivers/hid/hid-gyration.c | 5 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-roccat-kone.c | 1007 ++++++++++++++++++++ + drivers/hid/hid-roccat-kone.h | 214 +++++ + drivers/hid/hid-wacom.c | 227 ++++- + drivers/hid/hidraw.c | 48 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 19 +- + 12 files changed, 1613 insertions(+), 66 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kone + create mode 100644 drivers/hid/hid-roccat-kone.c + create mode 100644 drivers/hid/hid-roccat-kone.h +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 8 ++- + drivers/i2c/busses/i2c-i801.c | 59 ++++++++----- + drivers/i2c/busses/i2c-parport.c | 2 +- + drivers/i2c/busses/i2c-stub.c | 9 +- + drivers/i2c/busses/scx200_acb.c | 2 +- + drivers/i2c/i2c-core.c | 166 +++++++++++++++++++++--------------- + drivers/i2c/i2c-dev.c | 6 +- + drivers/misc/eeprom/at24.c | 59 +++++++++++--- + include/linux/pm_runtime.h | 7 ++ + 9 files changed, 205 insertions(+), 113 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/lm63 | 7 ++ + drivers/acpi/osl.c | 9 ++ + drivers/hwmon/Kconfig | 11 ++- + drivers/hwmon/asus_atk0110.c | 7 ++ + drivers/hwmon/f71882fg.c | 170 ++++++++++++++++++++++++++++++------------ + drivers/hwmon/lm63.c | 16 +++- + include/linux/acpi.h | 2 + + 7 files changed, 166 insertions(+), 56 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/DocBook/kernel-hacking.tmpl | 350 ++++++++++++++++++++++++----- + 1 files changed, 290 insertions(+), 60 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging drivers/media/IR/ir-keytable.c +Merge made by recursive. + Documentation/DocBook/v4l/controls.xml | 6 + + Documentation/DocBook/v4l/vidioc-reqbufs.xml | 2 +- + Documentation/video4linux/CARDLIST.cx88 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 4 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/gspca.txt | 5 + + drivers/media/IR/ir-keymaps.c | 455 ++----- + drivers/media/IR/ir-keytable.c | 18 +- + drivers/media/IR/ir-sysfs.c | 99 +- + 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 | 4 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 11 +- + drivers/media/dvb/dvb-usb/af9015.c | 13 +- + drivers/media/dvb/dvb-usb/az6027.c | 53 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 8 +- + drivers/media/dvb/dvb-usb/dvb-usb-urb.c | 2 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 7 + + 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/stv0900_core.c | 16 +- + drivers/media/dvb/frontends/stv090x.c | 94 +- + drivers/media/dvb/frontends/stv090x.h | 1 + + drivers/media/dvb/frontends/stv6110x.c | 24 +- + 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/ngene-core.c | 52 +- + drivers/media/dvb/ttpci/budget-ci.c | 4 +- + drivers/media/dvb/ttpci/budget.c | 8 + + drivers/media/video/bt8xx/bttv-input.c | 4 +- + drivers/media/video/cx18/cx18-av-core.c | 33 +- + drivers/media/video/cx18/cx18-av-core.h | 19 + + drivers/media/video/cx18/cx18-cards.c | 4 +- + drivers/media/video/cx18/cx18-cards.h | 4 +- + drivers/media/video/cx231xx/cx231xx-audio.c | 2 +- + drivers/media/video/cx231xx/cx231xx-input.c | 5 +- + drivers/media/video/cx2341x.c | 14 - + drivers/media/video/cx23885/cimax2.c | 12 +- + drivers/media/video/cx23885/cx23885-input.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 4 +- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/davinci/isif_regs.h | 2 +- + drivers/media/video/davinci/vpif_display.c | 2 +- + drivers/media/video/em28xx/em28xx-audio.c | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 24 +- + drivers/media/video/em28xx/em28xx-core.c | 12 +- + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/em28xx/em28xx-input.c | 4 +- + drivers/media/video/em28xx/em28xx-video.c | 61 +- + drivers/media/video/em28xx/em28xx.h | 5 +- + drivers/media/video/gspca/Kconfig | 6 - + drivers/media/video/gspca/cpia1.c | 34 +- + drivers/media/video/gspca/gspca.c | 11 +- + 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 | 319 ++--- + drivers/media/video/gspca/sonixj.c | 433 +++++- + drivers/media/video/gspca/spca561.c | 58 +- + drivers/media/video/gspca/t613.c | 13 +- + drivers/media/video/ir-kbd-i2c.c | 8 +- + drivers/media/video/ivtv/ivtv-driver.c | 5 +- + drivers/media/video/ivtv/ivtv-driver.h | 3 + + drivers/media/video/ivtv/ivtv-ioctl.c | 21 + + drivers/media/video/ivtv/ivtv-irq.c | 8 +- + drivers/media/video/ivtv/ivtv-streams.c | 7 +- + drivers/media/video/ivtv/ivtv-vbi.c | 2 +- + drivers/media/video/ivtv/ivtvfb.c | 2 +- + drivers/media/video/mt9t031.c | 66 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mx3_camera.c | 4 +- + drivers/media/video/ov7670.c | 286 ++++- + drivers/media/video/ov9640.c | 6 +- + drivers/media/video/rj54n1cb0c.c | 18 +- + drivers/media/video/s2255drv.c | 555 ++++++--- + drivers/media/video/saa7115.c | 31 +- + drivers/media/video/saa7134/saa7134-alsa.c | 2 - + drivers/media/video/saa7134/saa7134-cards.c | 22 + + drivers/media/video/saa7134/saa7134-input.c | 6 +- + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- + drivers/media/video/sn9c102/sn9c102_hv7131d.c | 2 +- + drivers/media/video/soc_camera.c | 18 +- + 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/usbvideo/quickcam_messenger.c | 3 +- + drivers/media/video/v4l2-common.c | 69 +- + drivers/media/video/v4l2-device.c | 11 + + drivers/media/video/videobuf-core.c | 118 +- + drivers/media/video/videobuf-dma-sg.c | 276 ++-- + drivers/media/video/videobuf-vmalloc.c | 112 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cx25821/cx25821-alsa.c | 102 +- + drivers/staging/cx25821/cx25821-audio-upstream.c | 146 +- + drivers/staging/cx25821/cx25821-audups11.c | 78 +- + drivers/staging/cx25821/cx25821-core.c | 160 ++-- + drivers/staging/cx25821/cx25821-gpio.c | 25 +- + drivers/staging/cx25821/cx25821-i2c.c | 12 +- + drivers/staging/cx25821/cx25821-medusa-video.c | 207 ++-- + drivers/staging/cx25821/cx25821-video.c | 130 +- + drivers/staging/cx25821/cx25821-video.h | 78 +- + drivers/staging/cx25821/cx25821-video0.c | 82 +- + drivers/staging/cx25821/cx25821-video1.c | 82 +- + drivers/staging/cx25821/cx25821-video2.c | 82 +- + drivers/staging/cx25821/cx25821-video3.c | 82 +- + drivers/staging/cx25821/cx25821-video4.c | 82 +- + drivers/staging/cx25821/cx25821-video5.c | 82 +- + drivers/staging/cx25821/cx25821-video6.c | 82 +- + drivers/staging/cx25821/cx25821-video7.c | 82 +- + drivers/staging/cx25821/cx25821-videoioctl.c | 78 +- + drivers/staging/cx25821/cx25821-vidups10.c | 78 +- + drivers/staging/cx25821/cx25821-vidups9.c | 78 +- + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 17 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/tm6000-alsa.c | 414 ++++++ + drivers/staging/tm6000/tm6000-cards.c | 826 +++++++++++ + drivers/staging/tm6000/tm6000-core.c | 494 +++++++ + drivers/staging/tm6000/tm6000-dvb.c | 346 +++++ + drivers/staging/tm6000/tm6000-i2c.c | 297 ++++ + 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 | 1550 +++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 283 ++++ + include/linux/videodev2.h | 6 +- + include/media/ir-core.h | 11 +- + include/media/soc_camera.h | 12 +- + include/media/v4l2-chip-ident.h | 120 +- + include/media/v4l2-common.h | 19 + + include/media/v4l2-subdev.h | 2 + + include/media/videobuf-core.h | 10 +- + include/media/videobuf-dma-sg.h | 27 +- + include/media/videobuf-vmalloc.h | 12 +- + 142 files changed, 9475 insertions(+), 2673 deletions(-) + 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 +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/s390/kernel/swsusp_asm64.S +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/kbuild/kbuild.txt | 6 +- + 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/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/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 3 +- + scripts/kconfig/mconf.c | 14 +- + scripts/kconfig/menu.c | 16 +- + 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 | 4 +- + scripts/kconfig/zconf.y | 4 +- + 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 +- + 106 files changed, 2879 insertions(+), 430 deletions(-) + 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 +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/Kconfig | 8 + + drivers/ata/Makefile | 3 +- + drivers/ata/ahci.c | 2542 +++-------------------------------------- + drivers/ata/ahci.h | 333 ++++++ + drivers/ata/ahci_platform.c | 192 ++++ + drivers/ata/libahci.c | 2110 ++++++++++++++++++++++++++++++++++ + drivers/ata/pata_mpc52xx.c | 78 +- + include/linux/ahci_platform.h | 29 + + 8 files changed, 2879 insertions(+), 2416 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 +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merging drivers/acpi/osl.c +Merge made by recursive. + Documentation/acpi/apei/einj.txt | 49 +++ + Documentation/kernel-parameters.txt | 8 +- + arch/ia64/include/asm/acpi.h | 1 - + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/emergency-restart.h | 1 + + arch/x86/kernel/acpi/boot.c | 19 +- + arch/x86/kernel/reboot.c | 71 +++- + arch/x86/lguest/boot.c | 1 - + drivers/acpi/Kconfig | 2 + + drivers/acpi/Makefile | 3 + + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acglobal.h | 5 + + drivers/acpi/acpica/acinterp.h | 7 + + 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 | 31 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evxface.c | 4 +- + 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 | 25 +- + drivers/acpi/acpica/exnames.c | 4 +- + drivers/acpi/acpica/exoparg1.c | 16 +- + drivers/acpi/acpica/exoparg2.c | 10 +- + drivers/acpi/acpica/exoparg3.c | 4 +- + drivers/acpi/acpica/exoparg6.c | 4 +- + drivers/acpi/acpica/exprep.c | 16 +- + drivers/acpi/acpica/exregion.c | 4 +- + 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 | 2 +- + 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/rscreate.c | 14 +- + drivers/acpi/acpica/rslist.c | 6 +- + drivers/acpi/acpica/rsmisc.c | 4 +- + drivers/acpi/acpica/tbfadt.c | 16 +- + drivers/acpi/acpica/tbutils.c | 4 +- + drivers/acpi/acpica/tbxfroot.c | 6 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utdelete.c | 6 +- + drivers/acpi/acpica/uteval.c | 2 +- + drivers/acpi/acpica/utmisc.c | 6 +- + drivers/acpi/acpica/utmutex.c | 4 +- + drivers/acpi/acpica/utobject.c | 8 +- + drivers/acpi/apei/Kconfig | 16 + + drivers/acpi/apei/Makefile | 4 + + drivers/acpi/apei/apei-base.c | 589 ++++++++++++++++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 97 +++++ + drivers/acpi/apei/einj.c | 471 ++++++++++++++++++++++++ + drivers/acpi/apei/hest.c | 147 ++++++++ + drivers/acpi/atomicio.c | 360 ++++++++++++++++++ + drivers/acpi/dock.c | 7 +- + drivers/acpi/ec.c | 35 +-- + drivers/acpi/osl.c | 9 +- + drivers/acpi/tables.c | 4 +- + drivers/acpi/video.c | 31 ++- + include/acpi/acoutput.h | 2 + + include/acpi/acpixf.h | 3 +- + include/acpi/actbl2.h | 27 ++ + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + 83 files changed, 2359 insertions(+), 467 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + 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/einj.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h +$ 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 7f1157d] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/shdma.c +Auto-merging drivers/serial/sh-sci.c +Merge made by recursive. + arch/arm/mach-u300/include/mach/coh901318.h | 21 - + drivers/dma/Kconfig | 7 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 34 +- + drivers/dma/coh901318.c | 262 ++++++--- + drivers/dma/dmaengine.c | 4 +- + drivers/dma/dw_dmac.c | 23 +- + drivers/dma/fsldma.c | 28 +- + drivers/dma/ioat/dma.c | 12 +- + drivers/dma/ioat/dma.h | 18 +- + drivers/dma/ioat/dma_v2.c | 2 +- + drivers/dma/ioat/dma_v3.c | 20 +- + drivers/dma/iop-adma.c | 39 +- + drivers/dma/ipu/ipu_idmac.c | 32 +- + drivers/dma/mpc512x_dma.c | 13 +- + drivers/dma/mv_xor.c | 25 +- + drivers/dma/ppc4xx/adma.c | 19 +- + drivers/dma/shdma.c | 26 +- + drivers/dma/timb_dma.c | 859 +++++++++++++++++++++++++++ + drivers/dma/txx9dmac.c | 22 +- + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/serial/sh-sci.c | 2 +- + drivers/video/mx3fb.c | 3 +- + include/linux/dmaengine.h | 66 ++- + include/linux/timb_dma.h | 55 ++ + sound/soc/txx9/txx9aclc.c | 6 +- + 26 files changed, 1329 insertions(+), 272 deletions(-) + create mode 100644 drivers/dma/timb_dma.c + create mode 100644 include/linux/timb_dma.h +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/iwlwifi/iwl-agn.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/benet/be_ethtool.c +Auto-merging drivers/net/bonding/bond_main.c +Auto-merging drivers/net/e1000e/e1000.h +Auto-merging drivers/net/e1000e/netdev.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ixgbe/ixgbe_type.h +Auto-merging drivers/net/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/ksz884x.c +Auto-merging drivers/net/netxen/netxen_nic.h +Auto-merging drivers/net/netxen/netxen_nic_init.c +Auto-merging drivers/net/netxen/netxen_nic_main.c +Auto-merging drivers/net/r8169.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/libertas/dev.h +Removing drivers/net/wireless/wl12xx/wl1271_spi.h +Auto-merging include/linux/skbuff.h +Auto-merging net/8021q/vlan.c +Auto-merging net/ipv4/devinet.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/mac80211/tx.c +Auto-merging net/sunrpc/bc_svc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b2606cc] 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/feature-removal-schedule.txt | 19 + + Documentation/rfkill.txt | 44 +- + MAINTAINERS | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 6 +- + drivers/media/dvb/dvb-core/dvb_net.c | 6 +- + drivers/net/Kconfig | 11 +- + drivers/net/benet/be_ethtool.c | 2 +- + drivers/net/benet/be_main.c | 76 +- + drivers/net/bnx2x_link.c | 12 +- + drivers/net/bonding/bond_ipv6.c | 9 +- + drivers/net/bonding/bond_main.c | 21 +- + drivers/net/can/sja1000/sja1000_platform.c | 44 +- + drivers/net/dnet.c | 2 +- + drivers/net/e100.c | 183 ++-- + drivers/net/e1000/e1000_hw.c | 4 +- + drivers/net/e1000e/e1000.h | 24 +- + drivers/net/e1000e/netdev.c | 191 +++- + drivers/net/eepro.c | 4 +- + drivers/net/enic/cq_enet_desc.h | 12 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_main.c | 5 +- + 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/ewrk3.c | 3 +- + drivers/net/hamradio/baycom_ser_fdx.c | 2 +- + drivers/net/igb/e1000_82575.c | 33 +- + drivers/net/igb/e1000_82575.h | 7 +- + drivers/net/igb/e1000_defines.h | 1 + + drivers/net/igb/e1000_hw.h | 5 + + drivers/net/igb/igb_ethtool.c | 50 + + drivers/net/igb/igb_main.c | 40 +- + drivers/net/irda/ali-ircc.c | 32 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/vlsi_ir.c | 4 +- + drivers/net/ixgbe/ixgbe_82599.c | 2 +- + drivers/net/ixgbe/ixgbe_common.c | 16 +- + drivers/net/ixgbe/ixgbe_common.h | 5 +- + drivers/net/ixgbe/ixgbe_main.c | 30 +- + drivers/net/ixgbe/ixgbe_phy.c | 4 +- + drivers/net/ixgbe/ixgbe_type.h | 3 +- + drivers/net/ixgbevf/ixgbevf_main.c | 32 +- + drivers/net/ixgbevf/vf.c | 24 +- + drivers/net/ixgbevf/vf.h | 4 +- + drivers/net/korina.c | 6 +- + drivers/net/ks8842.c | 8 +- + drivers/net/ks8851.c | 88 +- + drivers/net/ks8851_mll.c | 50 +- + drivers/net/ksz884x.c | 66 +- + drivers/net/macvlan.c | 3 + + drivers/net/mlx4/en_netdev.c | 51 +- + drivers/net/mlx4/mlx4_en.h | 3 +- + drivers/net/netxen/netxen_nic.h | 1 - + drivers/net/netxen/netxen_nic_ethtool.c | 6 + + drivers/net/netxen/netxen_nic_init.c | 164 +++- + drivers/net/netxen/netxen_nic_main.c | 29 +- + drivers/net/phy/mdio-bitbang.c | 60 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/ps3_gelic_net.c | 4 +- + drivers/net/ps3_gelic_wireless.c | 69 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/qlge/qlge_dbg.c | 4 +- + drivers/net/r8169.c | 152 ++- + drivers/net/sis900.c | 4 +- + drivers/net/skfp/fplustm.c | 2 +- + drivers/net/skfp/pcmplc.c | 4 +- + drivers/net/skfp/srf.c | 2 +- + drivers/net/skge.c | 2 +- + drivers/net/smc911x.c | 6 +- + drivers/net/smc9194.c | 40 +- + drivers/net/smc91x.c | 2 +- + drivers/net/stmmac/dwmac100.c | 2 +- + drivers/net/stmmac/stmmac_main.c | 13 +- + drivers/net/tlan.c | 2 +- + drivers/net/tokenring/3c359.c | 100 +- + drivers/net/tokenring/lanstreamer.c | 46 +- + drivers/net/tokenring/olympic.c | 62 +- + drivers/net/tokenring/tms380tr.c | 4 +- + drivers/net/tsi108_eth.c | 6 +- + drivers/net/tulip/de4x5.c | 4 +- + drivers/net/tulip/xircom_cb.c | 6 +- + drivers/net/ucc_geth.c | 2 +- + drivers/net/vxge/vxge-config.c | 20 +- + drivers/net/vxge/vxge-config.h | 20 +- + drivers/net/vxge/vxge-ethtool.c | 5 +- + drivers/net/vxge/vxge-main.c | 167 +-- + drivers/net/vxge/vxge-main.h | 1 + + drivers/net/vxge/vxge-traffic.c | 53 +- + drivers/net/vxge/vxge-traffic.h | 50 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/pc300_drv.c | 2 +- + drivers/net/wan/pc300_tty.c | 2 +- + drivers/net/wan/sdla.c | 2 +- + drivers/net/wimax/i2400m/tx.c | 2 +- + drivers/net/wireless/airo.c | 37 +- + drivers/net/wireless/ath/Kconfig | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 257 ++--- + drivers/net/wireless/ath/ath5k/attach.c | 5 +- + drivers/net/wireless/ath/ath5k/base.c | 150 ++- + drivers/net/wireless/ath/ath5k/base.h | 20 + + drivers/net/wireless/ath/ath5k/caps.c | 3 - + drivers/net/wireless/ath/ath5k/debug.c | 212 +++ + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/desc.c | 18 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 88 +- + drivers/net/wireless/ath/ath5k/pcu.c | 306 +---- + drivers/net/wireless/ath/ath5k/phy.c | 38 +- + drivers/net/wireless/ath/ath5k/qcu.c | 17 - + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 38 +- + drivers/net/wireless/ath/ath9k/Kconfig | 21 + + drivers/net/wireless/ath/ath9k/Makefile | 10 + + drivers/net/wireless/ath/ath9k/calib.c | 25 +- + drivers/net/wireless/ath/ath9k/common.c | 421 ++++++ + drivers/net/wireless/ath/ath9k/common.h | 17 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 993 ++++++++++++++ + drivers/net/wireless/ath/ath9k/hif_usb.h | 105 ++ + drivers/net/wireless/ath/ath9k/htc.h | 441 ++++++ + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 260 ++++ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 713 ++++++++++ + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1626 +++++++++++++++++++++++ + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 604 +++++++++ + drivers/net/wireless/ath/ath9k/htc_hst.c | 463 +++++++ + drivers/net/wireless/ath/ath9k/htc_hst.h | 246 ++++ + drivers/net/wireless/ath/ath9k/hw.c | 150 ++-- + drivers/net/wireless/ath/ath9k/hw.h | 9 + + drivers/net/wireless/ath/ath9k/init.c | 3 + + drivers/net/wireless/ath/ath9k/initvals.h | 141 ++- + drivers/net/wireless/ath/ath9k/mac.c | 8 +- + drivers/net/wireless/ath/ath9k/mac.h | 26 + + drivers/net/wireless/ath/ath9k/rc.c | 8 +- + drivers/net/wireless/ath/ath9k/rc.h | 5 +- + drivers/net/wireless/ath/ath9k/reg.h | 3 + + drivers/net/wireless/ath/ath9k/wmi.c | 319 +++++ + drivers/net/wireless/ath/ath9k/wmi.h | 126 ++ + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/ath/debug.h | 1 + + drivers/net/wireless/b43/b43.h | 1 + + drivers/net/wireless/b43/main.c | 5 +- + drivers/net/wireless/b43/phy_n.c | 463 +++++-- + drivers/net/wireless/b43/phy_n.h | 21 +- + drivers/net/wireless/b43/tables_nphy.h | 9 + + drivers/net/wireless/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 101 +- + drivers/net/wireless/ipw2x00/libipw.h | 14 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 13 +- + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 2 + + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 89 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 1 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 68 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 305 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 137 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 262 ++--- + drivers/net/wireless/iwlwifi/iwl-agn.h | 74 + + drivers/net/wireless/iwlwifi/iwl-core.c | 520 ++------ + drivers/net/wireless/iwlwifi/iwl-core.h | 27 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 82 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 113 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 179 ++- + drivers/net/wireless/iwlwifi/iwl-scan.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 648 ++++++---- + drivers/net/wireless/iwlwifi/iwl-sta.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 117 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 150 ++- + drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- + drivers/net/wireless/iwmc3200wifi/Makefile | 3 + + 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/debugfs.c | 13 +- + 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 | 76 +- + drivers/net/wireless/iwmc3200wifi/trace.c | 3 + + drivers/net/wireless/iwmc3200wifi/trace.h | 283 ++++ + drivers/net/wireless/iwmc3200wifi/tx.c | 8 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- + drivers/net/wireless/libertas/assoc.c | 22 +- + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/main.c | 1 + + drivers/net/wireless/libertas/rx.c | 50 +- + drivers/net/wireless/libertas/wext.c | 4 + + drivers/net/wireless/orinoco/Kconfig | 13 +- + drivers/net/wireless/orinoco/hw.c | 7 + + drivers/net/wireless/orinoco/orinoco_cs.c | 79 +- + drivers/net/wireless/orinoco/wext.c | 94 +- + drivers/net/wireless/p54/main.c | 1 + + drivers/net/wireless/ray_cs.c | 212 ++-- + drivers/net/wireless/rndis_wlan.c | 364 +++++- + drivers/net/wireless/rt2x00/rt2800pci.c | 93 +- + 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 | 4 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +- + drivers/net/wireless/wl12xx/wl1251_sdio.c | 52 +- + drivers/net/wireless/wl12xx/wl1271.h | 40 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 33 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 68 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 226 ++-- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 14 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 330 ++++- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 12 +- + drivers/net/wireless/wl12xx/wl1271_event.c | 3 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_io.c | 87 +- + drivers/net/wireless/wl12xx/wl1271_io.h | 135 ++- + drivers/net/wireless/wl12xx/wl1271_main.c | 830 ++++++------ + drivers/net/wireless/wl12xx/wl1271_ps.c | 1 - + drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 291 ++++ + drivers/net/wireless/wl12xx/wl1271_spi.c | 250 ++++- + drivers/net/wireless/wl12xx/wl1271_spi.h | 96 -- + drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - + drivers/net/wireless/wl12xx/wl1271_tx.c | 94 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 7 +- + drivers/net/wireless/wl3501_cs.c | 52 +- + drivers/s390/net/qeth_l2_main.c | 2 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/ssb/driver_chipcommon.c | 1 + + include/linux/if_link.h | 33 + + include/linux/netdevice.h | 42 +- + include/linux/nl80211.h | 50 + + include/linux/notifier.h | 9 +- + include/linux/phy.h | 12 +- + include/linux/rculist.h | 13 + + include/linux/skbuff.h | 3 + + include/linux/snmp.h | 1 + + include/linux/wireless.h | 4 +- + include/net/cfg80211.h | 19 + + include/net/dn_fib.h | 4 - + include/net/if_inet6.h | 13 +- + include/net/mac80211.h | 58 +- + include/net/sctp/sctp.h | 2 +- + include/net/snmp.h | 29 +- + net/8021q/vlan.c | 4 + + net/Kconfig | 5 + + net/atm/proc.c | 10 +- + net/bluetooth/bnep/netdev.c | 10 +- + net/bridge/br_device.c | 43 +- + net/bridge/br_if.c | 6 + + net/bridge/br_input.c | 6 +- + net/bridge/br_multicast.c | 2 - + net/bridge/br_notify.c | 4 + + net/bridge/br_private.h | 8 + + net/core/dev.c | 414 +++++-- + net/core/fib_rules.c | 10 +- + net/core/net-sysfs.c | 230 ++++- + net/core/pktgen.c | 58 +- + net/core/rtnetlink.c | 44 +- + net/core/skbuff.c | 2 + + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/dccp.h | 2 +- + net/dccp/input.c | 2 +- + net/ipv4/Kconfig | 8 + + net/ipv4/af_inet.c | 4 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/ipconfig.c | 2 +- + net/ipv4/proc.c | 1 + + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv6/addrconf.c | 795 ++++++------ + net/ipv6/netfilter/ip6t_hbh.c | 4 +- + net/irda/ircomm/ircomm_param.c | 2 +- + net/llc/llc_core.c | 6 - + net/mac80211/Kconfig | 9 + + net/mac80211/cfg.c | 27 + + net/mac80211/debugfs_sta.c | 2 - + net/mac80211/ibss.c | 16 +- + net/mac80211/ieee80211_i.h | 5 +- + net/mac80211/iface.c | 118 ++- + net/mac80211/mlme.c | 79 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel.h | 11 + + net/mac80211/rc80211_minstrel_debugfs.c | 41 +- + net/mac80211/rx.c | 9 - + net/mac80211/scan.c | 71 +- + net/mac80211/sta_info.h | 2 - + net/mac80211/status.c | 14 +- + net/mac80211/tx.c | 2 - + net/netlink/af_netlink.c | 2 +- + net/rds/af_rds.c | 9 +- + 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 | 2 + + net/rds/send.c | 38 +- + net/rds/tcp_recv.c | 1 + + net/rds/tcp_send.c | 4 +- + net/rds/threads.c | 2 +- + net/rfkill/core.c | 53 +- + net/sched/act_api.c | 45 +- + net/sched/cls_api.c | 30 +- + net/sched/cls_u32.c | 4 +- + net/sched/sch_api.c | 112 +- + net/sctp/ipv6.c | 2 +- + net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +- + net/sunrpc/bc_svc.c | 2 +- + net/tipc/bcast.c | 35 +- + net/tipc/link.c | 19 +- + net/tipc/net.c | 2 +- + net/tipc/node.c | 2 +- + net/wimax/op-reset.c | 2 - + net/wimax/op-state-get.c | 2 - + net/wireless/mlme.c | 13 + + net/wireless/nl80211.c | 131 ++ + net/wireless/nl80211.h | 6 + + net/wireless/wext-core.c | 134 +- + 333 files changed, 15835 insertions(+), 5481 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill + create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill + 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/wmi.c + create mode 100644 drivers/net/wireless/ath/ath9k/wmi.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.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/wl12xx/wl1271_sdio.c + delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +$ 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 51912a2] Merge remote branch 'net/master' +Merging mtd/master +$ git merge mtd/master +Auto-merging MAINTAINERS +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 ++- + drivers/mtd/Kconfig | 13 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- + drivers/mtd/devices/Makefile | 2 +- + drivers/mtd/devices/block2mtd.c | 4 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/ftl.c | 1 - + drivers/mtd/inftlcore.c | 1 - + drivers/mtd/inftlmount.c | 7 +- + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 4 +- + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/maps/pismo.c | 8 +- + drivers/mtd/mtd_blkdevs.c | 335 ++++-- + drivers/mtd/mtdblock.c | 72 +- + drivers/mtd/mtdblock_ro.c | 4 +- + drivers/mtd/mtdchar.c | 12 +- + drivers/mtd/mtdcore.c | 284 +++-- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdoops.c | 5 - + drivers/mtd/mtdsuper.c | 18 +- + drivers/mtd/nand/Kconfig | 50 +- + drivers/mtd/nand/Makefile | 9 +- + 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 | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 4 +- + 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 | 312 ++++- + drivers/mtd/nand/nand_bbt.c | 26 +- + drivers/mtd/nand/nand_bcm_umi.h | 71 +- + drivers/mtd/nand/nandsim.c | 11 +- + 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 | 10 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/r852.c | 1139 +++++++++++++++++ + drivers/mtd/nand/r852.h | 163 +++ + drivers/mtd/nand/s3c2410.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 143 +++ + 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/omap2.c | 4 +- + drivers/mtd/rfd_ftl.c | 1 - + drivers/mtd/sm_ftl.c | 1284 ++++++++++++++++++++ + drivers/mtd/sm_ftl.h | 94 ++ + drivers/mtd/ssfdc.c | 1 - + 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 | 14 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 21 +- + lib/idr.c | 2 +- + 72 files changed, 4953 insertions(+), 940 deletions(-) + 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/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 a4541e4] Merge remote branch 'mtd/master' +Merging crypto/master +$ git merge crypto/master +Auto-merging kernel/padata.c +Merge made by recursive. + arch/x86/crypto/aesni-intel_asm.S | 115 +++++++++++++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 130 ++++++++++++++++++++++++++++++++++-- + arch/x86/include/asm/inst.h | 96 +++++++++++++++++++++++++- + crypto/internal.h | 2 +- + crypto/pcrypt.c | 11 +-- + crypto/tcrypt.c | 7 ++ + crypto/tcrypt.h | 29 ++++++++ + crypto/testmgr.h | 64 +++++++++++++++++- + crypto/vmac.c | 75 ++++++++++----------- + kernel/padata.c | 4 +- + 10 files changed, 470 insertions(+), 63 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Removing sound/soc/codecs/ad1938.c +Removing sound/soc/codecs/ad1938.h +Removing sound/usb/usbaudio.c +Merge made by recursive. + Documentation/sound/alsa/HD-Audio.txt | 4 +- + arch/arm/mach-davinci/board-dm365-evm.c | 4 + + arch/arm/plat-omap/include/plat/mcbsp.h | 6 + + arch/arm/plat-omap/mcbsp.c | 55 + + drivers/mfd/Kconfig | 4 + + drivers/mfd/Makefile | 1 + + drivers/mfd/davinci_voicecodec.c | 189 + + drivers/mfd/twl-core.c | 4 +- + include/linux/i2c/twl.h | 6 +- + include/linux/mfd/davinci_voicecodec.h | 126 + + include/linux/mfd/wm8350/audio.h | 2 + + include/linux/usb/audio-v2.h | 366 ++ + include/linux/usb/audio.h | 210 +- + include/sound/jack.h | 8 + + include/sound/soc-dai.h | 25 +- + include/sound/soc-dapm.h | 5 +- + include/sound/soc.h | 21 +- + include/sound/tlv320dac33-plat.h | 1 + + include/sound/wm8903.h | 249 ++ + include/sound/wm8904.h | 110 +- + include/sound/wm8960.h | 24 + + sound/atmel/Kconfig | 2 +- + sound/atmel/ac97c.c | 355 ++- + sound/core/jack.c | 71 +- + sound/core/pcm_native.c | 30 +- + sound/pci/hda/hda_codec.c | 8 +- + sound/pci/hda/hda_intel.c | 24 +- + sound/pci/hda/patch_analog.c | 21 +- + sound/pci/hda/patch_realtek.c | 298 ++- + sound/pci/ice1712/aureon.c | 89 +- + sound/soc/atmel/atmel-pcm.c | 16 +- + sound/soc/atmel/atmel_ssc_dai.c | 6 +- + 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 | 12 +- + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/ac97.c | 15 +- + sound/soc/codecs/ad1938.c | 521 --- + sound/soc/codecs/ad1938.h | 100 - + sound/soc/codecs/ad193x.c | 545 +++ + sound/soc/codecs/ad193x.h | 81 + + sound/soc/codecs/ak4642.c | 175 +- + sound/soc/codecs/cq93vc.c | 299 ++ + sound/soc/codecs/cq93vc.h | 29 + + sound/soc/codecs/da7210.c | 153 +- + sound/soc/codecs/ssm2602.c | 4 +- + sound/soc/codecs/tlv320dac33.c | 38 +- + sound/soc/codecs/twl4030.c | 72 +- + sound/soc/codecs/twl6040.c | 1228 ++++++ + sound/soc/codecs/twl6040.h | 141 + + sound/soc/codecs/wm8350.c | 74 +- + sound/soc/codecs/wm8350.h | 3 + + sound/soc/codecs/wm8750.c | 53 +- + sound/soc/codecs/wm8903.c | 202 +- + sound/soc/codecs/wm8903.h | 221 +-- + sound/soc/codecs/wm8904.c | 17 + + sound/soc/codecs/wm8904.h | 97 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 10 - + sound/soc/codecs/wm8994.c | 40 +- + sound/soc/davinci/Kconfig | 27 +- + sound/soc/davinci/Makefile | 2 + + sound/soc/davinci/davinci-evm.c | 61 +- + sound/soc/davinci/davinci-i2s.c | 3 +- + sound/soc/davinci/davinci-mcasp.c | 3 +- + sound/soc/davinci/davinci-pcm.c | 4 +- + 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/imx-pcm-dma-mx2.c | 8 +- + sound/soc/imx/imx-ssi.c | 7 +- + sound/soc/imx/wm1133-ev1.c | 308 ++ + sound/soc/omap/mcpdm.c | 548 ++-- + sound/soc/omap/omap-mcbsp.c | 42 +- + sound/soc/omap/omap-mcpdm.c | 3 +- + sound/soc/omap/omap-pcm.c | 4 +- + sound/soc/pxa/pxa-ssp.c | 23 +- + sound/soc/pxa/pxa2xx-ac97.c | 17 +- + sound/soc/pxa/pxa2xx-i2s.c | 7 +- + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/s3c24xx/s3c-ac97.c | 21 +- + sound/soc/s3c24xx/s3c-dma.c | 4 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 133 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 4 + + sound/soc/s3c24xx/s3c-pcm.c | 7 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 40 + + sound/soc/s3c24xx/s3c2412-i2s.h | 4 +- + sound/soc/s3c24xx/s3c24xx-i2s.c | 19 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 12 - + sound/soc/s3c24xx/s3c64xx-i2s.h | 15 +- + sound/soc/s6000/s6000-i2s.c | 3 +- + sound/soc/s6000/s6000-pcm.c | 40 +- + sound/soc/sh/Kconfig | 3 +- + sound/soc/sh/fsi-ak4642.c | 14 + + sound/soc/sh/fsi.c | 191 +- + sound/soc/soc-cache.c | 122 +- + sound/soc/soc-core.c | 118 +- + sound/soc/soc-dapm.c | 135 +- + sound/soc/soc-jack.c | 38 + + 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} | 847 ++--- + 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 + + 139 files changed, 12645 insertions(+), 6868 deletions(-) + create mode 100644 drivers/mfd/davinci_voicecodec.c + create mode 100644 include/linux/mfd/davinci_voicecodec.h + create mode 100644 include/linux/usb/audio-v2.h + create mode 100644 include/sound/wm8903.h + create mode 100644 include/sound/wm8960.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/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/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 +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 -- + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/kernel/cpu/addon_cpuid_features.c | 13 +++- + arch/x86/kernel/cpu/cpufreq/Makefile | 4 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 44 +---------- + arch/x86/kernel/cpu/cpufreq/mperf.c | 50 +++++++++++ + arch/x86/kernel/cpu/cpufreq/mperf.h | 9 ++ + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 123 +++++++++++++++++++++++++--- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 - + arch/x86/kernel/cpu/intel.c | 6 -- + drivers/cpufreq/cpufreq.c | 50 ++++-------- + drivers/cpufreq/cpufreq_conservative.c | 48 ++++------- + drivers/cpufreq/cpufreq_ondemand.c | 73 +++++++---------- + include/linux/cpufreq.h | 35 +++++++- + 14 files changed, 280 insertions(+), 188 deletions(-) + create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.c + create mode 100644 arch/x86/kernel/cpu/cpufreq/mperf.h +Merging quilt/rr +$ git merge quilt/rr +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/char/hvc_console.c' using previous resolution. +Resolved 'drivers/char/hvc_console.h' using previous resolution. +Resolved 'drivers/char/virtio_console.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/char/hvc_beat.c +Auto-merging drivers/char/hvc_console.c +CONFLICT (content): Merge conflict in drivers/char/hvc_console.c +Auto-merging drivers/char/hvc_console.h +CONFLICT (content): Merge conflict in drivers/char/hvc_console.h +Auto-merging drivers/char/hvc_iseries.c +Auto-merging drivers/char/hvc_iucv.c +Auto-merging drivers/char/virtio_console.c +CONFLICT (content): Merge conflict in drivers/char/virtio_console.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging include/linux/gfp.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/virtio.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 74802b0] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 82 +++++++++++++++++++++++++---------------- + include/linux/kmemcheck.h | 2 +- + include/linux/virtio_config.h | 5 ++- + 5 files changed, 57 insertions(+), 36 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Removing drivers/input/touchscreen/corgi_ts.c +Merge made by recursive. + drivers/char/keyboard.c | 325 ++++----- + drivers/char/sysrq.c | 243 ++++++- + drivers/input/keyboard/lm8323.c | 6 +- + 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 | 1346 ++++++++++++++++++++++++++++++++++ + drivers/input/misc/ad714x.h | 26 + + drivers/input/misc/pcf8574_keypad.c | 226 ++++++ + drivers/input/tablet/wacom.h | 36 +- + drivers/input/tablet/wacom_sys.c | 316 +++------ + drivers/input/tablet/wacom_wac.c | 991 ++++++++++++++----------- + drivers/input/tablet/wacom_wac.h | 8 + + drivers/input/touchscreen/Kconfig | 16 - + drivers/input/touchscreen/Makefile | 1 - + drivers/input/touchscreen/corgi_ts.c | 385 ---------- + drivers/input/touchscreen/tsc2007.c | 2 + + include/linux/input.h | 1 + + include/linux/input/ad714x.h | 63 ++ + include/linux/sysrq.h | 23 +- + kernel/sysctl.c | 23 +- + 22 files changed, 3034 insertions(+), 1290 deletions(-) + 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 + delete mode 100644 drivers/input/touchscreen/corgi_ts.c + create mode 100644 include/linux/input/ad714x.h +$ git am -3 ../patches/0001-Input-ad714x-use-of-kzalloc-kfree-requires-the-inclu.patch +Applying: Input: ad714x: use of kzalloc/kfree requires the include of slab.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/input/misc/ad714x.c +$ git add . +$ git commit -v -a --amend +[master 3ae0673] Merge remote branch 'input/next' +$ git am -3 ../patches/0001-input-pcf8574_keypad-use-of-kzalloc-kfree-requires-t.patch +Applying: input: pcf8574_keypad: use of kzalloc/kfree requires the include of slab.h +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/input/misc/pcf8574_keypad.c +$ git add . +$ git commit -v -a --amend +[master aac047b] Merge remote branch 'input/next' +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/scsi/sd.c +Merge made by recursive. + Documentation/DocBook/tracepoint.tmpl | 13 +++ + Documentation/block/biodoc.txt | 4 +- + block/Kconfig | 3 +- + block/blk-settings.c | 11 +-- + block/blk-sysfs.c | 25 +++++ + block/cfq-iosched.c | 29 ++++-- + drivers/block/DAC960.c | 1 - + drivers/block/drbd/drbd_actlog.c | 17 +++- + drivers/block/drbd/drbd_bitmap.c | 10 +- + drivers/block/drbd/drbd_int.h | 12 ++- + drivers/block/drbd/drbd_main.c | 20 ++++- + drivers/block/drbd/drbd_nl.c | 44 +++++----- + drivers/block/drbd/drbd_receiver.c | 34 ++++++- + drivers/block/drbd/drbd_worker.c | 18 +++- + drivers/block/paride/pcd.c | 4 +- + drivers/block/paride/pf.c | 4 +- + drivers/block/paride/pt.c | 4 +- + drivers/block/virtio_blk.c | 5 +- + drivers/scsi/sd.c | 2 +- + fs/bio.c | 4 +- + fs/fs-writeback.c | 133 +++++++++++++++------------ + include/linux/blkdev.h | 35 +------ + include/linux/drbd.h | 2 +- + include/linux/drbd_nl.h | 3 +- + include/linux/genhd.h | 2 +- + include/linux/i2o.h | 1 - + include/linux/lcm.h | 8 ++ + include/linux/writeback.h | 3 + + include/trace/events/block.h | 164 +++++++++++++++++++++++++++++++++ + lib/Makefile | 2 +- + lib/lcm.c | 15 +++ + 31 files changed, 458 insertions(+), 174 deletions(-) + create mode 100644 include/linux/lcm.h + create mode 100644 lib/lcm.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 +++++++++++++++++++++++++++++ + 4 files changed, 239 insertions(+), 0 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 +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/wireless/orinoco/orinoco_cs.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/wl3501_cs.c +Auto-merging drivers/serial/serial_cs.c +Removing include/pcmcia/mem_op.h +Merge made by recursive. + 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 | 100 ---- + drivers/pcmcia/cs.c | 1 - + drivers/pcmcia/cs_internal.h | 22 +- + drivers/pcmcia/db1xxx_ss.c | 4 +- + drivers/pcmcia/ds.c | 34 +- + drivers/pcmcia/omap_cf.c | 2 +- + drivers/pcmcia/pcmcia_cis.c | 356 +++++++++++++ + drivers/pcmcia/pcmcia_ioctl.c | 19 +- + drivers/pcmcia/pcmcia_resource.c | 621 ++++++---------------- + drivers/pcmcia/rsrc_iodyn.c | 172 ++++++ + drivers/pcmcia/rsrc_mgr.c | 112 +---- + drivers/pcmcia/rsrc_nonstatic.c | 164 +++++-- + 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 | 26 +- + drivers/staging/comedi/drivers/das08_cs.c | 16 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 23 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 23 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 23 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 22 +- + 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 | 6 +- + 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, 1142 insertions(+), 2006 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 +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Already up-to-date. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/serial/sh-sci.c +Removing kernel/kgdb.c +Auto-merging kernel/module.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/misc/kgdbts.c | 6 + + 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 | 7 + + 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 | 1763 -------------------- + kernel/module.c | 4 + + kernel/printk.c | 25 + + kernel/sched.c | 7 +- + kernel/signal.c | 40 + + lib/Kconfig.kgdb | 24 +- + 57 files changed, 9502 insertions(+), 2049 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 1b01f5f] 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 97021f8] Merge remote branch 'kgdb/kgdb-next' +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + mm/slab.c | 9 +++++---- + mm/slub.c | 25 ++++++++++++++++--------- + 2 files changed, 21 insertions(+), 13 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid10.c +Merge made by recursive. + drivers/md/bitmap.c | 37 ++++++++++++++++++++++++++++++++----- + drivers/md/bitmap.h | 1 + + drivers/md/faulty.c | 6 +++--- + drivers/md/md.h | 3 --- + drivers/md/multipath.c | 2 +- + drivers/md/raid1.c | 8 ++++---- + drivers/md/raid10.c | 8 ++++---- + drivers/md/raid5.c | 10 +++++----- + 8 files changed, 50 insertions(+), 25 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Removing arch/x86/include/asm/rdc321x_defs.h +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Merge made by recursive. + arch/x86/include/asm/rdc321x_defs.h | 12 -- + drivers/gpio/Kconfig | 8 + + drivers/gpio/Makefile | 3 +- + drivers/gpio/rdc321x-gpio.c | 245 +++++++++++++++++++++++++++++++++++ + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/88pm860x-i2c.c | 1 + + drivers/mfd/Kconfig | 9 ++ + drivers/mfd/Makefile | 3 +- + drivers/mfd/ab3100-core.c | 2 + + drivers/mfd/da903x.c | 1 + + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/pcf50633-core.c | 1 + + drivers/mfd/rdc321x-southbridge.c | 123 ++++++++++++++++++ + drivers/mfd/t7l66xb.c | 3 + + drivers/mfd/timberdale.c | 138 ++++++++++++++++++-- + drivers/mfd/timberdale.h | 16 ++- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/wm831x-irq.c | 2 - + drivers/mfd/wm8350-i2c.c | 2 + + drivers/watchdog/rdc321x_wdt.c | 53 ++++++-- + include/linux/mfd/88pm860x.h | 4 +- + include/linux/mfd/rdc321x.h | 26 ++++ + 23 files changed, 612 insertions(+), 53 deletions(-) + delete mode 100644 arch/x86/include/asm/rdc321x_defs.h + create mode 100644 drivers/gpio/rdc321x-gpio.c + create mode 100644 drivers/mfd/rdc321x-southbridge.c + create mode 100644 include/linux/mfd/rdc321x.h +$ git am -3 ../patches/mfd__update_gfp_slab.h_includes +Applying: mfd: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpio/rdc321x-gpio.c +M drivers/mfd/davinci_voicecodec.c +$ git add . +$ git commit -v -a --amend +[master 15426a6] Merge remote branch 'mfd/for-next' +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/radeon/radeon_irq_kms.c +Merge made by recursive. + drivers/gpu/drm/drm_crtc_helper.c | 1 + + drivers/gpu/drm/drm_edid.c | 9 - + drivers/gpu/drm/i915/i915_trace.h | 86 +-- + drivers/gpu/drm/nouveau/Makefile | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 28 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 5 + + drivers/gpu/drm/nouveau/nouveau_dp.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 10 + + drivers/gpu/drm/nouveau/nouveau_drv.h | 6 + + drivers/gpu/drm/nouveau/nouveau_irq.c | 609 +++++++++++++++++++-- + drivers/gpu/drm/nouveau/nouveau_mem.c | 28 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 18 + + drivers/gpu/drm/nouveau/nouveau_state.c | 5 +- + drivers/gpu/drm/nouveau/nv04_crtc.c | 6 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nv50_display.c | 4 +- + drivers/gpu/drm/nouveau/nv50_fb.c | 32 ++ + drivers/gpu/drm/nouveau/nv50_fbcon.c | 15 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 22 +- + drivers/gpu/drm/nouveau/nv50_grctx.c | 19 +- + drivers/gpu/drm/radeon/Makefile | 2 +- + drivers/gpu/drm/radeon/atom.c | 91 +++- + drivers/gpu/drm/radeon/atom.h | 8 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 85 +++- + drivers/gpu/drm/radeon/evergreen.c | 19 +- + drivers/gpu/drm/radeon/r100.c | 262 +++++---- + drivers/gpu/drm/radeon/r100d.h | 128 +++++ + drivers/gpu/drm/radeon/r200.c | 1 + + drivers/gpu/drm/radeon/r300.c | 161 +++--- + drivers/gpu/drm/radeon/r300d.h | 47 ++- + drivers/gpu/drm/radeon/r420.c | 6 +- + drivers/gpu/drm/radeon/r520.c | 14 +- + drivers/gpu/drm/radeon/r600.c | 99 ++-- + drivers/gpu/drm/radeon/r600_audio.c | 52 +-- + drivers/gpu/drm/radeon/r600_blit_kms.c | 3 + + drivers/gpu/drm/radeon/r600_blit_shaders.c | 35 ++ + drivers/gpu/drm/radeon/r600_cp.c | 3 + + drivers/gpu/drm/radeon/r600_hdmi.c | 191 ++++--- + drivers/gpu/drm/radeon/r600_reg.h | 10 +- + drivers/gpu/drm/radeon/radeon.h | 177 +++---- + drivers/gpu/drm/radeon/radeon_asic.c | 786 +++++++++++++++++++++++++++ + drivers/gpu/drm/radeon/radeon_asic.h | 562 ++----------------- + drivers/gpu/drm/radeon/radeon_atombios.c | 459 +++++++++------- + drivers/gpu/drm/radeon/radeon_combios.c | 7 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 7 +- + drivers/gpu/drm/radeon/radeon_device.c | 261 ++------- + drivers/gpu/drm/radeon/radeon_display.c | 51 ++- + drivers/gpu/drm/radeon/radeon_drv.c | 4 + + drivers/gpu/drm/radeon/radeon_encoders.c | 50 +- + drivers/gpu/drm/radeon/radeon_fence.c | 107 ++-- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 153 +++--- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 14 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 8 + + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 29 +- + drivers/gpu/drm/radeon/radeon_mode.h | 12 +- + drivers/gpu/drm/radeon/radeon_object.c | 10 +- + drivers/gpu/drm/radeon/radeon_pm.c | 46 ++- + drivers/gpu/drm/radeon/rs400.c | 11 +- + drivers/gpu/drm/radeon/rs600.c | 85 +++- + drivers/gpu/drm/radeon/rs600d.h | 46 ++ + drivers/gpu/drm/radeon/rs690.c | 93 ++-- + drivers/gpu/drm/radeon/rv515.c | 106 +---- + drivers/gpu/drm/radeon/rv515d.h | 46 ++ + drivers/gpu/drm/radeon/rv770.c | 37 +- + drivers/gpu/drm/ttm/ttm_bo.c | 4 +- + drivers/gpu/drm/ttm/ttm_memory.c | 18 +- + drivers/gpu/drm/ttm/ttm_tt.c | 23 +- + drivers/gpu/drm/vmwgfx/Kconfig | 2 +- + include/drm/drmP.h | 34 +-- + include/drm/drm_mem_util.h | 65 +++ + include/drm/drm_pciids.h | 1 + + include/drm/ttm/ttm_bo_driver.h | 1 - + 77 files changed, 3424 insertions(+), 2039 deletions(-) + create mode 100644 drivers/gpu/drm/nouveau/nv50_fb.c + create mode 100644 drivers/gpu/drm/radeon/radeon_asic.c + create mode 100644 include/drm/drm_mem_util.h +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Auto-merging Documentation/kernel-parameters.txt +Merge made by recursive. + Documentation/kernel-parameters.txt | 10 +++++ + drivers/char/tpm/tpm.c | 47 ++++++++++++++++++--- + scripts/selinux/genheaders/genheaders.c | 2 +- + security/integrity/ima/ima_iint.c | 6 +- + security/integrity/ima/ima_main.c | 2 +- + security/keys/keyring.c | 13 ++---- + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + security/selinux/include/initial_sid_to_string.h | 2 +- + security/selinux/netlink.c | 1 - + security/selinux/nlmsgtab.c | 1 - + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/symtab.c | 1 - + security/tomoyo/common.c | 10 +--- + 15 files changed, 68 insertions(+), 35 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/firewire/ohci.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/isdn/hardware/mISDN/hfcmulti.c +Auto-merging drivers/net/ps3_gelic_wireless.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/scsi/bfa/include/defs/bfa_defs_cee.h +Auto-merging drivers/scsi/bfa/include/defs/bfa_defs_status.h +Auto-merging fs/jfs/jfs_dmap.c +Auto-merging include/linux/i2c/twl.h +Auto-merging include/linux/kfifo.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/cgroups/cgroups.txt | 2 +- + Documentation/cgroups/cpusets.txt | 38 +++++++++++----------- + Documentation/filesystems/proc.txt | 2 +- + Documentation/kbuild/kconfig.txt | 2 +- + Documentation/powerpc/dts-bindings/xilinx.txt | 2 +- + Documentation/sysfs-rules.txt | 2 +- + Documentation/trace/events.txt | 8 ++-- + MAINTAINERS | 8 +--- + arch/mips/sibyte/bcm1480/irq.c | 2 +- + arch/mips/sibyte/sb1250/irq.c | 2 +- + crypto/Kconfig | 2 +- + drivers/acpi/osl.c | 4 +- + drivers/ata/ata_piix.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/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/ps3/ps3-sys-manager.c | 2 +- + drivers/regulator/core.c | 2 +- + 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/wusbcore/wa-xfer.c | 2 +- + drivers/virtio/virtio_pci.c | 2 +- + fs/jfs/jfs_dmap.c | 2 +- + 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 +- + 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 +- + 55 files changed, 102 insertions(+), 98 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 +Merge made by recursive. + Documentation/power/devices.txt | 847 ++++++++++++++++++++++----------------- + drivers/base/power/runtime.c | 10 +- + include/linux/freezer.h | 7 +- + include/linux/pm_wakeup.h | 38 ++- + kernel/cgroup_freezer.c | 9 +- + kernel/power/process.c | 5 +- + 6 files changed, 525 insertions(+), 391 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. +Resolved 'include/linux/fsnotify.h' using previous resolution. +Resolved 'kernel/audit_tree.c' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/ia32/sys_ia32.c +Auto-merging arch/x86/include/asm/sys_ia32.h +Auto-merging arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +Auto-merging fs/compat.c +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Removing fs/notify/inotify/inotify.c +Auto-merging fs/notify/inotify/inotify_user.c +CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c +Auto-merging fs/open.c +Auto-merging fs/read_write.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fsnotify.h +CONFLICT (content): Merge conflict in include/linux/fsnotify.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/sys_ni.c +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f62c683] 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 | 933 ---------------------------- + 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 | 164 +++--- + 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 | 232 ++++--- + kernel/audit_watch.c | 295 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 8 +- + security/security.c | 16 +- + 57 files changed, 3097 insertions(+), 2249 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/mark.c +M fs/notify/vfsmount_mark.c +$ git add . +$ git commit -v -a --amend +[master 2bce71c] 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 159cda0] 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 +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 8ce59f8] 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 7e1961d] 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 1686400] Merge remote branch 'alacrity/linux-next' +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging Documentation/edac.txt +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/pci/legacy.c +Auto-merging drivers/edac/edac_core.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + 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 | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2465 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 +Auto-merging drivers/of/fdt.c +Merge made by recursive. + drivers/of/fdt.c | 15 +++++++++++++++ + include/linux/of_device.h | 2 ++ + include/linux/of_fdt.h | 4 ++++ + include/linux/of_platform.h | 2 ++ + 4 files changed, 23 insertions(+), 0 deletions(-) +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Auto-merging Documentation/filesystems/proc.txt +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging fs/proc/base.c +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging kernel/posix-cpu-timers.c +Auto-merging kernel/sys.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0764f81] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 11 +++ + arch/x86/ia32/ia32entry.S | 2 + + 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/proc/base.c | 101 ++++++++++++++++++++++-- + include/asm-generic/unistd.h | 6 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 ++- + include/linux/syscalls.h | 4 + + kernel/compat.c | 98 +++++++++++++++++------- + kernel/posix-cpu-timers.c | 10 +- + kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 10 ++- + 17 files changed, 346 insertions(+), 78 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Already uptodate! +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging kernel/module.c +Merge made by recursive. + include/linux/module.h | 6 ++- + include/linux/percpu.h | 7 +++ + kernel/lockdep.c | 21 ++------- + kernel/module.c | 104 +++++++++++++++++++++++++++++++++-------------- + mm/percpu.c | 26 ++++++++++++ + 5 files changed, 116 insertions(+), 48 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 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 quilt/driver-core +$ git merge quilt/driver-core +Recorded preimage for 'drivers/base/platform.c' +Auto-merging drivers/base/platform.c +CONFLICT (content): Merge conflict in drivers/base/platform.c +Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c +Auto-merging include/linux/device.h +Auto-merging include/linux/kref.h +Auto-merging security/integrity/ima/ima_iint.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/base/platform.c'. +[master de6be03] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + drivers/base/Kconfig | 7 +++++-- + drivers/base/core.c | 4 +--- + drivers/base/dd.c | 4 ++-- + drivers/base/devtmpfs.c | 5 +++++ + drivers/base/firmware_class.c | 5 ++--- + drivers/base/module.c | 4 +--- + drivers/base/platform.c | 8 ++++---- + drivers/net/mlx4/mlx4.h | 1 + + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + drivers/usb/core/usb.c | 2 +- + fs/ramfs/inode.c | 2 +- + include/linux/device.h | 9 ++++----- + include/linux/kref.h | 1 - + include/linux/ramfs.h | 2 ++ + kernel/user_namespace.c | 4 ++-- + lib/kref.c | 15 ++------------- + security/integrity/ima/ima_iint.c | 4 ++-- + 17 files changed, 36 insertions(+), 42 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Auto-merging drivers/usb/wusbcore/wa-xfer.c +Merge made by recursive. + drivers/hid/usbhid/hid-core.c | 8 +- + drivers/hid/usbhid/usbhid.h | 1 - + drivers/hid/usbhid/usbkbd.c | 8 +- + drivers/input/misc/cm109.c | 12 +- + drivers/input/misc/powermate.c | 9 +- + drivers/input/misc/yealink.c | 11 +- + drivers/usb/class/cdc-acm.h | 4 +- + drivers/usb/core/hcd.c | 1 - + drivers/usb/core/hub.c | 10 +- + drivers/usb/core/hub.h | 7 +- + drivers/usb/core/urb.c | 4 +- + drivers/usb/core/usb.c | 18 +-- + drivers/usb/gadget/f_mass_storage.c | 23 ++- + drivers/usb/host/ehci-au1xxx.c | 11 ++- + drivers/usb/host/ehci-hub.c | 24 ++-- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 20 ++-- + drivers/usb/host/oxu210hp-hcd.c | 28 ++-- + drivers/usb/host/r8a66597-hcd.c | 37 ++--- + drivers/usb/host/sl811-hcd.c | 58 ++++---- + drivers/usb/host/xhci-hub.c | 24 ++-- + drivers/usb/misc/sisusbvga/sisusb.c | 4 +- + drivers/usb/misc/usbtest.c | 9 +- + drivers/usb/musb/Kconfig | 6 +- + drivers/usb/musb/Makefile | 8 + + drivers/usb/musb/blackfin.c | 10 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_core.c | 56 ++++---- + drivers/usb/musb/musb_core.h | 8 +- + 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_virthub.c | 4 +- + drivers/usb/musb/musbhsdma.h | 16 +-- + drivers/usb/musb/omap2430.c | 13 ++- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/serial/console.c | 27 ++-- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/generic.c | 4 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/usb-serial.c | 4 +- + drivers/usb/storage/isd200.c | 4 +- + drivers/usb/storage/transport.c | 2 - + drivers/usb/storage/usb.c | 15 +-- + drivers/usb/storage/usb.h | 3 +- + drivers/usb/wusbcore/wa-xfer.c | 2 - + include/linux/usb/musb.h | 36 +++++ + include/linux/usb/serial.h | 2 - + 49 files changed, 624 insertions(+), 278 deletions(-) + create mode 100644 drivers/usb/musb/musb_debugfs.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 538c94b] Merge branch 'quilt/usb' +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +$ git am -3 ../patches/staging__update_gfp_slab.h_includes +Applying: staging: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/comedi/drivers/quatech_daqp_cs.c +M drivers/staging/otus/usbdrv.h +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 7d04c6c] Merge branch 'quilt/usb' +Merging slabh/slabh +$ git merge slabh/slabh +Renaming arch/arm/mach-nomadik/gpio.c => arch/arm/plat-nomadik/gpio.c +Auto-merging arch/arm/plat-nomadik/gpio.c +Auto-merging arch/arm/common/clkdev.c +Auto-merging arch/arm/kernel/kprobes.c +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/dma.c +Auto-merging arch/arm/mach-integrator/cpu.c +Auto-merging arch/arm/mach-integrator/impd1.c +Auto-merging arch/arm/mach-integrator/integrator_cp.c +Auto-merging arch/arm/mach-integrator/pci_v3.c +Auto-merging arch/arm/mach-realview/core.c +Auto-merging arch/arm/mach-versatile/core.c +Auto-merging arch/arm/plat-omap/mcbsp.c +Auto-merging arch/microblaze/kernel/dma.c +Auto-merging arch/microblaze/mm/init.c +Auto-merging arch/mips/sibyte/bcm1480/irq.c +Auto-merging arch/mips/sibyte/sb1250/irq.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/x86/ia32/sys_ia32.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/mm/init.c +Auto-merging arch/x86/pci/common.c +Auto-merging arch/x86/pci/pcbios.c +Auto-merging block/blk-settings.c +Auto-merging block/blk-sysfs.c +Auto-merging block/cfq-iosched.c +Auto-merging crypto/tcrypt.c +Auto-merging drivers/acpi/dock.c +Auto-merging drivers/acpi/ec.c +Auto-merging drivers/acpi/video.c +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/ata/ata_piix.c +Auto-merging drivers/ata/pata_mpc52xx.c +Auto-merging drivers/ata/pata_pcmcia.c +Auto-merging drivers/base/devtmpfs.c +Auto-merging drivers/base/firmware_class.c +Auto-merging drivers/base/module.c +Auto-merging drivers/block/aoe/aoecmd.c +Auto-merging drivers/block/drbd/drbd_bitmap.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/char/bsr.c +Auto-merging drivers/char/hvc_console.c +Auto-merging drivers/char/sysrq.c +CONFLICT (content): Merge conflict in drivers/char/sysrq.c +Auto-merging drivers/char/tpm/tpm.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/clocksource/sh_mtu2.c +Auto-merging drivers/clocksource/sh_tmu.c +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/fsldma.c +Auto-merging drivers/dma/ioat/dma.c +Auto-merging drivers/dma/ioat/dma_v2.c +Auto-merging drivers/dma/ioat/dma_v3.c +Auto-merging drivers/dma/iop-adma.c +Auto-merging drivers/dma/mpc512x_dma.c +Auto-merging drivers/dma/mv_xor.c +Auto-merging drivers/dma/ppc4xx/adma.c +Auto-merging drivers/dma/shdma.c +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging drivers/firewire/ohci.c +Auto-merging drivers/gpu/drm/drm_bufs.c +Auto-merging drivers/gpu/drm/drm_edid.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_sgdma.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_state.c +Auto-merging drivers/gpu/drm/radeon/atom.c +Auto-merging drivers/gpu/drm/radeon/evergreen.c +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/r600.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_fence.c +Auto-merging drivers/gpu/drm/radeon/radeon_object.c +Auto-merging drivers/gpu/drm/radeon/rs400.c +Auto-merging drivers/gpu/drm/radeon/rv515.c +Auto-merging drivers/gpu/drm/radeon/rv770.c +Auto-merging drivers/gpu/drm/ttm/ttm_memory.c +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/hid/hid-wacom.c +CONFLICT (content): Merge conflict in drivers/hid/hid-wacom.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hid-quirks.c +Auto-merging drivers/hwmon/asus_atk0110.c +Auto-merging drivers/i2c/busses/i2c-parport.c +Auto-merging drivers/i2c/busses/scx200_acb.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_multicast.c +Auto-merging drivers/input/input.c +Auto-merging drivers/input/keyboard/lm8323.c +Auto-merging drivers/input/sparse-keymap.c +Auto-merging drivers/isdn/hardware/mISDN/hfcmulti.c +Auto-merging drivers/isdn/hisax/hfc4s8s_l1.c +Auto-merging drivers/md/faulty.c +Auto-merging drivers/md/multipath.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/media/IR/ir-keytable.c +Auto-merging drivers/media/IR/ir-sysfs.c +Auto-merging drivers/media/common/tuners/tuner-xc2028.c +Auto-merging drivers/media/dvb/dm1105/dm1105.c +Auto-merging drivers/media/dvb/dvb-usb/af9015.c +Auto-merging drivers/media/dvb/frontends/au8522_dig.c +Auto-merging drivers/media/dvb/frontends/stv090x.c +Auto-merging drivers/media/dvb/frontends/stv6110x.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/video/bt8xx/bttv-input.c +Auto-merging drivers/media/video/cx231xx/cx231xx-input.c +Auto-merging drivers/media/video/cx23885/cx23885-input.c +Auto-merging drivers/media/video/cx88/cx88-input.c +Auto-merging drivers/media/video/davinci/vpif_display.c +Auto-merging drivers/media/video/em28xx/em28xx-cards.c +Auto-merging drivers/media/video/em28xx/em28xx-core.c +Auto-merging drivers/media/video/em28xx/em28xx-dvb.c +Auto-merging drivers/media/video/em28xx/em28xx-input.c +Auto-merging drivers/media/video/em28xx/em28xx-video.c +Auto-merging drivers/media/video/gspca/sn9c20x.c +Auto-merging drivers/media/video/gspca/sonixj.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtvfb.c +Auto-merging drivers/media/video/ov7670.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-input.c +Auto-merging drivers/media/video/sh_mobile_ceu_camera.c +Auto-merging drivers/media/video/soc_camera.c +CONFLICT (content): Merge conflict in drivers/media/video/soc_camera.c +Auto-merging drivers/media/video/tlg2300/pd-dvb.c +Auto-merging drivers/media/video/tlg2300/pd-video.c +Auto-merging drivers/media/video/usbvideo/quickcam_messenger.c +Auto-merging drivers/mfd/88pm860x-i2c.c +Auto-merging drivers/mfd/ab3100-core.c +Auto-merging drivers/mfd/da903x.c +Auto-merging drivers/mfd/menelaus.c +Auto-merging drivers/mfd/mfd-core.c +Auto-merging drivers/mfd/pcf50633-core.c +Auto-merging drivers/mfd/t7l66xb.c +Auto-merging drivers/mfd/timberdale.c +Auto-merging drivers/mfd/wm8350-i2c.c +Auto-merging drivers/mmc/host/atmel-mci.c +Auto-merging drivers/mmc/host/msm_sdcc.c +Auto-merging drivers/mtd/devices/block2mtd.c +Auto-merging drivers/mtd/maps/bfin-async-flash.c +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/mtd/maps/pismo.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Auto-merging drivers/mtd/nand/cafe_nand.c +Auto-merging drivers/mtd/nand/davinci_nand.c +Auto-merging drivers/mtd/nand/fsl_upm.c +Auto-merging drivers/mtd/nand/nomadik_nand.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/sh_flctl.c +Auto-merging drivers/mtd/nand/tmio_nand.c +Auto-merging drivers/mtd/onenand/omap2.c +Auto-merging drivers/net/e1000e/netdev.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/enic/vnic_dev.c +Auto-merging drivers/net/enic/vnic_rq.c +Auto-merging drivers/net/enic/vnic_wq.c +Auto-merging drivers/net/igb/e1000_82575.c +Auto-merging drivers/net/igb/igb_ethtool.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/irda/ali-ircc.c +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ixgbevf/ixgbevf_main.c +Auto-merging drivers/net/ks8851_mll.c +Auto-merging drivers/net/ksz884x.c +Auto-merging drivers/net/mlx4/en_netdev.c +Auto-merging drivers/net/netxen/netxen_nic_init.c +Auto-merging drivers/net/netxen/netxen_nic_main.c +Auto-merging drivers/net/pcmcia/axnet_cs.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/phy/mdio-bitbang.c +Auto-merging drivers/net/ps3_gelic_net.c +Auto-merging drivers/net/ps3_gelic_wireless.c +Auto-merging drivers/net/qlge/qlge_dbg.c +Auto-merging drivers/net/skge.c +Auto-merging drivers/net/smc911x.c +Auto-merging drivers/net/smc9194.c +Auto-merging drivers/net/smc91x.c +Auto-merging drivers/net/smsc911x.c +Auto-merging drivers/net/stmmac/dwmac100.c +Auto-merging drivers/net/stmmac/stmmac_main.c +Auto-merging drivers/net/tokenring/3c359.c +Auto-merging drivers/net/tokenring/lanstreamer.c +Auto-merging drivers/net/tokenring/tms380tr.c +Auto-merging drivers/net/tsi108_eth.c +Auto-merging drivers/net/tulip/de4x5.c +Auto-merging drivers/net/vxge/vxge-config.c +Auto-merging drivers/net/vxge/vxge-config.h +Auto-merging drivers/net/vxge/vxge-ethtool.c +Auto-merging drivers/net/vxge/vxge-main.c +Auto-merging drivers/net/wan/pc300_drv.c +Auto-merging drivers/net/wimax/i2400m/tx.c +Auto-merging drivers/net/wireless/ath/ar9170/usb.c +Auto-merging drivers/net/wireless/ath/ath5k/attach.c +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath5k/eeprom.c +Auto-merging drivers/net/wireless/ath/ath5k/phy.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43/pcmcia.c +Auto-merging drivers/net/wireless/b43/phy_n.c +Auto-merging drivers/net/wireless/hostap/hostap_cs.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945-rs.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rs.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-rx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/cfg80211.c +Auto-merging drivers/net/wireless/iwmc3200wifi/commands.c +Auto-merging drivers/net/wireless/iwmc3200wifi/debugfs.c +Auto-merging drivers/net/wireless/iwmc3200wifi/hal.c +Auto-merging drivers/net/wireless/iwmc3200wifi/main.c +Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c +Auto-merging drivers/net/wireless/iwmc3200wifi/tx.c +Auto-merging drivers/net/wireless/libertas/assoc.c +Auto-merging drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/libertas/main.c +Auto-merging drivers/net/wireless/libertas/rx.c +Auto-merging drivers/net/wireless/libertas/wext.c +Auto-merging drivers/net/wireless/mwl8k.c +Auto-merging drivers/net/wireless/orinoco/wext.c +Auto-merging drivers/net/wireless/p54/main.c +Auto-merging drivers/net/wireless/p54/p54usb.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rndis_wlan.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_boot.c +Auto-merging drivers/net/wireless/wl12xx/wl1251_main.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_acx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_boot.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_cmd.c +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_debugfs.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_init.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_main.c +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_main.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_rx.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_spi.c +CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_spi.c +Auto-merging drivers/net/wireless/wl12xx/wl1271_testmode.c +Auto-merging drivers/pci/access.c +Auto-merging drivers/pci/dmar.c +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/slot.c +Auto-merging drivers/pcmcia/bfin_cf_pcmcia.c +Auto-merging drivers/pcmcia/db1xxx_ss.c +Auto-merging drivers/pcmcia/ds.c +Auto-merging drivers/pcmcia/omap_cf.c +Auto-merging drivers/pcmcia/pcmcia_ioctl.c +Auto-merging drivers/pcmcia/pcmcia_resource.c +CONFLICT (content): Merge conflict in drivers/pcmcia/pcmcia_resource.c +Auto-merging drivers/pcmcia/rsrc_mgr.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/s390/char/vmcp.c +CONFLICT (content): Merge conflict in drivers/s390/char/vmcp.c +Auto-merging drivers/s390/net/qeth_l2_main.c +Auto-merging drivers/s390/net/qeth_l3_main.c +Auto-merging drivers/scsi/libiscsi.c +Auto-merging drivers/scsi/qla1280.c +Auto-merging drivers/scsi/qla2xxx/qla_attr.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging drivers/scsi/qla2xxx/qla_mbx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/serial/8250.c +Auto-merging drivers/serial/amba-pl011.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging drivers/sh/intc.c +Auto-merging drivers/spi/spi_mpc8xxx.c +Auto-merging drivers/ssb/main.c +Auto-merging 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/cx25821/cx25821-alsa.c +Auto-merging drivers/staging/cx25821/cx25821-audio-upstream.c +CONFLICT (content): Merge conflict in drivers/staging/cx25821/cx25821-audio-upstream.c +Auto-merging drivers/staging/cx25821/cx25821-audups11.c +Auto-merging drivers/staging/cx25821/cx25821-core.c +Auto-merging drivers/staging/netwave/netwave_cs.c +Auto-merging drivers/staging/wlags49_h2/wl_cs.c +Auto-merging drivers/usb/gadget/r8a66597-udc.c +Auto-merging drivers/usb/host/r8a66597-hcd.c +Auto-merging drivers/usb/musb/blackfin.c +Auto-merging drivers/usb/musb/davinci.c +Auto-merging drivers/usb/musb/musb_virthub.c +Auto-merging drivers/usb/musb/omap2430.c +Auto-merging drivers/usb/storage/transport.c +Auto-merging drivers/usb/wusbcore/wa-xfer.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging fs/9p/fid.c +Auto-merging fs/9p/v9fs.c +Auto-merging fs/9p/vfs_dir.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_super.c +CONFLICT (content): Merge conflict in fs/9p/vfs_super.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/messenger.c +Auto-merging fs/ceph/pagelist.c +Auto-merging fs/ceph/xattr.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/compat.c +Auto-merging fs/compat_ioctl.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/mmap.c +Auto-merging fs/ecryptfs/super.c +Auto-merging fs/ext4/move_extent.c +Auto-merging fs/fs-writeback.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/jfs/jfs_dmap.c +Auto-merging fs/logfs/dev_bdev.c +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/journal.c +Auto-merging fs/logfs/readwrite.c +Auto-merging fs/logfs/segment.c +Auto-merging fs/logfs/super.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfsd/export.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fsnotify.c +Auto-merging fs/notify/inode_mark.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/quota_local.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/omfs/inode.c +Auto-merging fs/open.c +Auto-merging fs/proc/base.c +Auto-merging fs/ramfs/inode.c +Auto-merging fs/reiserfs/super.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_super.c +Auto-merging include/drm/drmP.h +Auto-merging include/linux/fsnotify.h +Auto-merging include/linux/percpu.h +CONFLICT (content): Merge conflict in include/linux/percpu.h +Auto-merging include/linux/security.h +Auto-merging init/main.c +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +Auto-merging kernel/audit_watch.c +CONFLICT (content): Merge conflict in kernel/audit_watch.c +Auto-merging kernel/auditfilter.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/cgroup_freezer.c +Auto-merging kernel/compat.c +Auto-merging kernel/crRecorded preimage for 'drivers/char/sysrq.c' +Resolved 'drivers/gpu/drm/radeon/r300.c' using previous resolution. +Resolved 'drivers/hid/hid-wacom.c' using previous resolution. +Resolved 'drivers/media/video/soc_camera.c' using previous resolution. +Resolved 'drivers/net/wireless/wl12xx/wl1271_cmd.c' using previous resolution. +Resolved 'drivers/net/wireless/wl12xx/wl1271_main.c' using previous resolution. +Resolved 'drivers/net/wireless/wl12xx/wl1271_spi.c' using previous resolution. +Resolved 'drivers/pcmcia/pcmcia_resource.c' using previous resolution. +Resolved 'drivers/s390/char/vmcp.c' using previous resolution. +Resolved 'drivers/staging/cx25821/cx25821-audio-upstream.c' using previous resolution. +Resolved 'fs/9p/vfs_super.c' using previous resolution. +Resolved 'include/linux/percpu.h' using previous resolution. +Resolved 'kernel/audit_watch.c' using previous resolution. +Resolved 'net/mac80211/scan.c' using previous resolution. +ed.c +Auto-merging kernel/kallsyms.c +Auto-merging kernel/lockdep.c +Auto-merging kernel/padata.c +Auto-merging kernel/sched.c +Auto-merging kernel/sys.c +Auto-merging lib/kref.c +Auto-merging net/8021q/vlan.c +Auto-merging net/9p/client.c +Auto-merging net/9p/protocol.c +Auto-merging net/atm/proc.c +Auto-merging net/bluetooth/bnep/netdev.c +Auto-merging net/bridge/br_if.c +Auto-merging net/bridge/br_input.c +Auto-merging net/core/dev.c +Auto-merging net/core/fib_rules.c +Auto-merging net/core/net-sysfs.c +Auto-merging net/dccp/input.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/ipv4/devinet.c +Auto-merging net/ipv4/ipconfig.c +Auto-merging net/ipv4/ipmr.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/tcp_minisocks.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/irda/ircomm/ircomm_param.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/ibss.c +Auto-merging net/mac80211/iface.c +Auto-merging net/mac80211/mesh_hwmp.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/rc80211_minstrel.c +Auto-merging net/mac80211/rc80211_minstrel_debugfs.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/scan.c +CONFLICT (content): Merge conflict in net/mac80211/scan.c +Auto-merging net/rds/af_rds.c +Auto-merging net/rds/cong.c +Auto-merging net/rds/ib_cm.c +Auto-merging net/rds/ib_rdma.c +Auto-merging net/rds/ib_recv.c +Auto-merging net/rds/iw_cm.c +Auto-merging net/rds/iw_recv.c +Auto-merging net/rds/loop.c +Auto-merging net/rds/rdma.c +Auto-merging net/rds/send.c +Auto-merging net/rds/tcp_recv.c +Auto-merging net/rfkill/core.c +Auto-merging net/sched/act_api.c +Auto-merging net/sched/cls_api.c +Auto-merging net/sched/cls_u32.c +Auto-merging net/sched/sch_api.c +Auto-merging net/sctp/ipv6.c +Auto-merging net/wireless/mlme.c +Auto-merging net/wireless/nl80211.c +Auto-merging net/wireless/reg.c +Auto-merging net/wireless/wext-core.c +Auto-merging security/integrity/ima/ima_iint.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/selinux/netlink.c +Auto-merging security/tomoyo/common.c +Auto-merging sound/core/jack.c +Auto-merging sound/pcmcia/vx/vxpocket.c +Auto-merging sound/soc/codecs/ac97.c +CONFLICT (delete/modify): sound/soc/codecs/ad1938.c deleted in HEAD and modified in slabh/slabh. Version slabh/slabh of sound/soc/codecs/ad1938.c left in tree. +Auto-merging sound/soc/codecs/ak4642.c +Auto-merging sound/soc/codecs/da7210.c +Auto-merging sound/soc/codecs/ssm2602.c +Auto-merging sound/soc/codecs/tlv320dac33.c +Auto-merging sound/soc/codecs/twl4030.c +Auto-merging sound/soc/codecs/wm8350.c +Auto-merging sound/soc/codecs/wm8750.c +Auto-merging sound/soc/codecs/wm8903.c +Auto-merging sound/soc/codecs/wm8904.c +Auto-merging sound/soc/codecs/wm8960.c +Auto-merging sound/soc/codecs/wm8994.c +Auto-merging sound/soc/davinci/davinci-i2s.c +Auto-merging sound/soc/davinci/davinci-mcasp.c +Auto-merging sound/soc/imx/imx-pcm-dma-mx2.c +Auto-merging sound/soc/imx/imx-ssi.c +Auto-merging sound/soc/omap/mcpdm.c +Auto-merging sound/soc/omap/omap-pcm.c +Auto-merging sound/soc/pxa/pxa-ssp.c +Auto-merging sound/soc/s6000/s6000-i2s.c +Auto-merging sound/soc/sh/fsi.c +Auto-merging sound/soc/soc-core.c +Auto-merging sound/soc/soc-dapm.c +Auto-merging sound/soc/txx9/txx9aclc.c +Auto-merging sound/usb/caiaq/device.c +Auto-merging sound/usb/usx2y/us122l.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f sound/soc/codecs/ad1938.c +drivers/char/sysrq.c: needs merge +drivers/gpu/drm/radeon/r300.c: needs merge +drivers/hid/hid-wacom.c: needs merge +drivers/media/video/soc_camera.c: needs merge +drivers/net/wireless/wl12xx/wl1271_cmd.c: needs merge +drivers/net/wireless/wl12xx/wl1271_main.c: needs merge +drivers/net/wireless/wl12xx/wl1271_spi.c: needs merge +drivers/pcmcia/pcmcia_resource.c: needs merge +drivers/s390/char/vmcp.c: needs merge +drivers/staging/cx25821/cx25821-audio-upstream.c: needs merge +fs/9p/vfs_super.c: needs merge +include/linux/percpu.h: needs merge +kernel/audit_watch.c: needs merge +net/mac80211/scan.c: needs merge +sound/soc/codecs/ad1938.c: needs merge +rm 'sound/soc/codecs/ad1938.c' +$ git commit -v -a +Recorded resolution for 'drivers/char/sysrq.c'. +[master 6a2358f] Merge remote branch 'slabh/slabh' +$ git diff -M --stat --summary HEAD^.. + Documentation/connector/cn_test.c | 1 + + arch/alpha/boot/bootp.c | 1 + + arch/alpha/boot/bootpz.c | 1 + + arch/alpha/boot/main.c | 1 + + arch/alpha/boot/misc.c | 1 + + arch/alpha/kernel/irq.c | 1 - + arch/alpha/kernel/osf_sys.c | 2 +- + arch/alpha/kernel/pci-noop.c | 1 + + arch/alpha/kernel/pci-sysfs.c | 1 + + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/ptrace.c | 1 - + arch/alpha/kernel/smc37c669.c | 1 - + arch/alpha/kernel/smc37c93x.c | 1 - + arch/alpha/kernel/srm_env.c | 1 + + arch/alpha/mm/init.c | 1 + + arch/arm/common/clkdev.c | 1 + + arch/arm/common/it8152.c | 1 - + arch/arm/kernel/irq.c | 1 - + arch/arm/kernel/kprobes.c | 1 + + arch/arm/kernel/module.c | 2 +- + arch/arm/kernel/process.c | 1 - + arch/arm/kernel/sys_arm.c | 2 +- + arch/arm/lib/uaccess_with_memcpy.c | 1 + + arch/arm/mach-aaec2000/core.c | 1 + + arch/arm/mach-bcmring/dma.c | 1 + + arch/arm/mach-davinci/board-dm365-evm.c | 1 + + arch/arm/mach-davinci/dma.c | 1 + + arch/arm/mach-h720x/common.c | 1 - + arch/arm/mach-integrator/cpu.c | 1 - + arch/arm/mach-integrator/impd1.c | 1 + + arch/arm/mach-integrator/integrator_cp.c | 2 +- + arch/arm/mach-integrator/pci_v3.c | 1 - + arch/arm/mach-iop13xx/pci.c | 1 + + arch/arm/mach-iop32x/glantank.c | 1 - + arch/arm/mach-iop32x/iq31244.c | 1 - + arch/arm/mach-iop32x/iq80321.c | 1 - + arch/arm/mach-iop32x/n2100.c | 1 - + arch/arm/mach-iop33x/iq80331.c | 1 - + arch/arm/mach-iop33x/iq80332.c | 1 - + arch/arm/mach-ixp2000/enp2611.c | 1 - + arch/arm/mach-ixp2000/ixdp2400.c | 1 - + arch/arm/mach-ixp2000/ixdp2800.c | 1 - + arch/arm/mach-ixp2000/ixdp2x00.c | 1 - + arch/arm/mach-ixp2000/ixdp2x01.c | 1 - + arch/arm/mach-ixp2000/pci.c | 1 - + arch/arm/mach-ixp23xx/pci.c | 1 - + arch/arm/mach-ixp4xx/avila-setup.c | 1 - + arch/arm/mach-ixp4xx/coyote-setup.c | 1 - + arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 - + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 - + arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 - + arch/arm/mach-ixp4xx/ixp4xx_npe.c | 1 - + arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 - + arch/arm/mach-kirkwood/pcie.c | 1 + + arch/arm/mach-lh7a40x/clcd.c | 1 + + arch/arm/mach-mx3/mach-mx31moboard.c | 1 + + arch/arm/mach-mx3/mach-pcm037.c | 1 + + arch/arm/mach-mx3/mx31moboard-devboard.c | 1 + + arch/arm/mach-mx3/mx31moboard-marxbot.c | 1 + + arch/arm/mach-netx/fb.c | 1 + + arch/arm/mach-netx/xc.c | 1 + + arch/arm/mach-ns9xxx/plat-serial8250.c | 1 + + arch/arm/mach-ns9xxx/processor-ns9360.c | 1 - + arch/arm/mach-omap1/mcbsp.c | 1 + + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 1 + + arch/arm/mach-omap2/iommu2.c | 1 + + arch/arm/mach-omap2/mcbsp.c | 1 + + arch/arm/mach-omap2/mux.c | 1 + + arch/arm/mach-omap2/pm-debug.c | 1 + + arch/arm/mach-omap2/pm34xx.c | 1 + + arch/arm/mach-orion5x/pci.c | 1 + + arch/arm/mach-pnx4008/dma.c | 1 + + arch/arm/mach-pnx4008/pm.c | 1 + + arch/arm/mach-pxa/corgi_ssp.c | 1 - + arch/arm/mach-pxa/cpufreq-pxa3xx.c | 1 + + arch/arm/mach-pxa/mioa701.c | 1 + + arch/arm/mach-pxa/pm.c | 1 + + arch/arm/mach-pxa/viper.c | 1 + + arch/arm/mach-realview/core.c | 1 + + arch/arm/mach-rpc/dma.c | 1 - + arch/arm/mach-s3c64xx/dma.c | 1 + + arch/arm/mach-sa1100/jornada720_ssp.c | 1 - + arch/arm/mach-sa1100/neponset.c | 1 - + arch/arm/mach-u300/dummyspichip.c | 1 + + arch/arm/mach-u300/mmc.c | 1 + + arch/arm/mach-versatile/core.c | 1 + + arch/arm/mach-versatile/pci.c | 1 - + arch/arm/mach-w90x900/dev.c | 1 + + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/fault-armv.c | 1 + + arch/arm/mm/init.c | 1 + + arch/arm/mm/pgd.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 1 + + arch/arm/plat-mxc/pwm.c | 1 + + arch/arm/plat-nomadik/gpio.c | 1 + + arch/arm/plat-omap/devices.c | 1 + + arch/arm/plat-omap/dma.c | 1 + + arch/arm/plat-omap/iommu-debug.c | 1 + + arch/arm/plat-omap/iommu.c | 1 + + arch/arm/plat-omap/iovmm.c | 1 + + arch/arm/plat-omap/mailbox.c | 1 + + arch/arm/plat-omap/mcbsp.c | 1 + + arch/arm/plat-omap/omap_device.c | 1 + + arch/arm/plat-pxa/dma.c | 1 + + arch/arm/plat-pxa/pwm.c | 1 + + arch/arm/plat-s3c24xx/cpu-freq.c | 1 + + arch/arm/plat-s3c24xx/devs.c | 1 + + arch/arm/plat-s3c24xx/s3c2410-iotiming.c | 1 + + arch/arm/plat-s3c24xx/s3c2412-iotiming.c | 1 + + arch/arm/plat-samsung/adc.c | 1 + + arch/arm/plat-samsung/dev-fb.c | 1 + + arch/arm/plat-samsung/dev-i2c0.c | 1 + + arch/arm/plat-samsung/dev-i2c1.c | 1 + + arch/arm/plat-samsung/dev-nand.c | 1 + + arch/arm/plat-samsung/dev-usb.c | 1 + + arch/arm/plat-samsung/pm-check.c | 1 + + arch/arm/plat-samsung/pwm.c | 1 + + arch/arm/plat-stmp3xxx/dma.c | 1 + + arch/avr32/kernel/process.c | 1 + + arch/avr32/mach-at32ap/at32ap700x.c | 1 + + arch/avr32/mach-at32ap/extint.c | 1 + + arch/avr32/mach-at32ap/hsmc.c | 1 + + arch/avr32/mm/dma-coherent.c | 1 + + arch/avr32/mm/init.c | 1 + + arch/avr32/mm/ioremap.c | 1 + + arch/blackfin/include/asm/mmu_context.h | 2 +- + arch/blackfin/kernel/ipipe.c | 1 - + arch/blackfin/kernel/process.c | 1 + + arch/blackfin/mach-common/pm.c | 1 + + arch/blackfin/mach-common/smp.c | 1 + + arch/blackfin/mm/init.c | 1 + + arch/blackfin/mm/isram-driver.c | 1 + + arch/blackfin/mm/sram-alloc.c | 1 + + arch/cris/arch-v10/drivers/i2c.c | 1 - + arch/cris/arch-v10/drivers/sync_serial.c | 1 - + arch/cris/arch-v10/kernel/process.c | 2 +- + arch/cris/arch-v32/drivers/i2c.c | 1 - + arch/cris/arch-v32/drivers/pci/dma.c | 1 + + arch/cris/arch-v32/drivers/sync_serial.c | 1 - + arch/cris/arch-v32/kernel/process.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 1 + + arch/cris/kernel/irq.c | 1 - + arch/cris/kernel/module.c | 1 + + arch/cris/kernel/profile.c | 1 + + arch/cris/mm/init.c | 1 + + arch/frv/kernel/irq.c | 1 - + arch/frv/kernel/sysctl.c | 1 - + arch/frv/mb93090-mb00/pci-dma.c | 1 - + arch/frv/mb93090-mb00/pci-irq.c | 1 - + arch/frv/mb93090-mb00/pci-vdk.c | 1 - + arch/frv/mm/dma-alloc.c | 1 + + arch/frv/mm/init.c | 1 + + arch/frv/mm/pgalloc.c | 2 +- + arch/h8300/kernel/process.c | 2 +- + arch/h8300/mm/init.c | 2 +- + arch/h8300/mm/kmap.c | 1 - + arch/h8300/mm/memory.c | 1 - + arch/ia64/include/asm/dmi.h | 1 + + arch/ia64/kernel/acpi-ext.c | 1 + + arch/ia64/kernel/acpi.c | 1 + + arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 1 + + arch/ia64/kernel/efi.c | 1 + + arch/ia64/kernel/iosapic.c | 1 + + arch/ia64/kernel/irq_ia64.c | 1 - + arch/ia64/kernel/mca.c | 1 + + arch/ia64/kernel/mca_drv.c | 1 + + arch/ia64/kernel/pci-swiotlb.c | 1 + + arch/ia64/kernel/perfmon.c | 1 + + arch/ia64/kernel/process.c | 2 +- + arch/ia64/kernel/ptrace.c | 1 - + arch/ia64/kernel/topology.c | 1 + + arch/ia64/kernel/uncached.c | 2 +- + arch/ia64/kvm/kvm-ia64.c | 2 +- + arch/ia64/mm/discontig.c | 1 + + arch/ia64/mm/hugetlbpage.c | 1 - + arch/ia64/mm/tlb.c | 1 + + arch/ia64/sn/kernel/bte.c | 1 + + arch/ia64/sn/kernel/io_acpi_init.c | 1 + + arch/ia64/sn/kernel/io_common.c | 1 + + arch/ia64/sn/kernel/io_init.c | 1 + + arch/ia64/sn/kernel/irq.c | 1 + + arch/ia64/sn/kernel/msi_sn.c | 1 + + arch/ia64/sn/pci/pci_dma.c | 1 + + arch/ia64/sn/pci/pcibr/pcibr_provider.c | 1 + + arch/ia64/sn/pci/tioca_provider.c | 1 + + arch/ia64/sn/pci/tioce_provider.c | 1 + + arch/ia64/xen/grant-table.c | 1 + + arch/m32r/kernel/process.c | 2 +- + arch/m32r/mm/init.c | 1 + + arch/m68k/bvme6000/rtc.c | 1 - + arch/m68k/kernel/dma.c | 1 + + arch/m68k/kernel/process.c | 2 +- + arch/m68k/mac/misc.c | 1 - + arch/m68k/mm/init.c | 1 + + arch/m68k/mm/memory.c | 2 +- + arch/m68k/mm/motorola.c | 1 + + arch/m68k/mvme16x/rtc.c | 1 - + arch/m68k/sun3/sun3dvma.c | 1 + + arch/m68k/sun3x/dvma.c | 1 - + arch/m68knommu/kernel/dma.c | 1 + + arch/m68knommu/kernel/process.c | 2 +- + arch/m68knommu/mm/init.c | 2 +- + arch/m68knommu/mm/kmap.c | 1 - + arch/m68knommu/mm/memory.c | 1 - + arch/microblaze/kernel/cpu/cpuinfo.c | 1 - + arch/microblaze/kernel/dma.c | 1 + + arch/microblaze/kernel/module.c | 1 - + arch/microblaze/kernel/of_platform.c | 1 - + arch/microblaze/kernel/sys_microblaze.c | 1 + + arch/microblaze/mm/consistent.c | 1 + + arch/microblaze/mm/init.c | 1 + + arch/microblaze/pci/pci-common.c | 1 + + arch/microblaze/pci/pci_32.c | 1 + + arch/mips/jazz/jazzdma.c | 1 + + arch/mips/kernel/irq.c | 1 - + arch/mips/kernel/linux32.c | 2 +- + arch/mips/kernel/process.c | 1 - + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/smtc.c | 1 + + arch/mips/kernel/syscall.c | 2 +- + arch/mips/mipssim/sim_int.c | 1 - + arch/mips/mm/dma-default.c | 1 + + arch/mips/mm/hugetlbpage.c | 1 - + arch/mips/mm/init.c | 1 + + arch/mips/mm/ioremap.c | 1 + + arch/mips/mti-malta/malta-int.c | 1 - + arch/mips/nxp/pnx833x/common/reset.c | 1 - + arch/mips/nxp/pnx8550/common/int.c | 1 - + arch/mips/nxp/pnx8550/common/proc.c | 1 - + arch/mips/nxp/pnx8550/common/reset.c | 1 - + arch/mips/pci/ops-titan-ht.c | 1 - + arch/mips/pmc-sierra/msp71xx/msp_prom.c | 1 + + arch/mips/pmc-sierra/yosemite/ht.c | 1 - + arch/mips/pmc-sierra/yosemite/irq.c | 1 - + arch/mips/powertv/asic/asic_devices.c | 1 + + arch/mips/powertv/asic/asic_int.c | 1 - + arch/mips/rb532/irq.c | 1 - + arch/mips/sgi-ip27/ip27-irq.c | 1 - + arch/mips/sgi-ip32/ip32-irq.c | 1 - + arch/mips/sibyte/bcm1480/irq.c | 1 - + arch/mips/sibyte/common/sb_tbprof.c | 1 - + arch/mips/sibyte/sb1250/irq.c | 1 - + arch/mips/txx9/generic/pci.c | 1 + + arch/mips/txx9/generic/setup.c | 1 + + arch/mips/txx9/generic/spi_eeprom.c | 1 + + arch/mips/txx9/rbtx4939/setup.c | 1 + + arch/mn10300/kernel/process.c | 2 +- + arch/mn10300/kernel/setup.c | 1 - + arch/mn10300/mm/dma-alloc.c | 1 + + arch/mn10300/mm/init.c | 2 +- + arch/mn10300/mm/pgtable.c | 2 +- + arch/mn10300/unit-asb2305/pci-irq.c | 1 - + arch/parisc/hpux/fs.c | 2 +- + arch/parisc/kernel/module.c | 1 + + arch/parisc/kernel/pci-dma.c | 2 +- + arch/parisc/kernel/pci.c | 1 - + arch/parisc/kernel/process.c | 1 + + arch/parisc/kernel/signal32.c | 1 - + arch/parisc/kernel/smp.c | 1 - + arch/parisc/mm/init.c | 1 + + arch/powerpc/kernel/cacheinfo.c | 1 + + arch/powerpc/kernel/dma.c | 1 + + arch/powerpc/kernel/ibmebus.c | 1 + + arch/powerpc/kernel/kprobes.c | 1 + + arch/powerpc/kernel/lparcfg.c | 1 + + arch/powerpc/kernel/of_platform.c | 1 - + arch/powerpc/kernel/pci-common.c | 1 + + arch/powerpc/kernel/pci_32.c | 1 + + arch/powerpc/kernel/pci_dn.c | 1 + + arch/powerpc/kernel/proc_powerpc.c | 1 - + arch/powerpc/kernel/rtas.c | 1 + + arch/powerpc/kernel/rtas_flash.c | 1 + + arch/powerpc/kernel/rtasd.c | 1 + + arch/powerpc/kernel/smp-tbsync.c | 1 + + arch/powerpc/kernel/softemu8xx.c | 1 - + arch/powerpc/kernel/sys_ppc32.c | 1 + + arch/powerpc/kernel/traps.c | 1 - + arch/powerpc/kernel/vio.c | 1 + + arch/powerpc/kvm/44x.c | 1 + + arch/powerpc/kvm/book3s.c | 1 + + arch/powerpc/kvm/booke.c | 1 + + arch/powerpc/kvm/e500.c | 1 + + arch/powerpc/kvm/e500_tlb.c | 1 + + arch/powerpc/kvm/powerpc.c | 1 + + arch/powerpc/lib/devres.c | 1 + + arch/powerpc/mm/dma-noncoherent.c | 1 + + arch/powerpc/mm/hugetlbpage.c | 1 + + arch/powerpc/mm/init_32.c | 1 + + arch/powerpc/mm/init_64.c | 1 + + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/mmu_context_hash64.c | 1 + + arch/powerpc/mm/mmu_context_nohash.c | 1 + + arch/powerpc/mm/pgtable.c | 1 + + arch/powerpc/mm/pgtable_32.c | 1 + + arch/powerpc/mm/pgtable_64.c | 1 + + arch/powerpc/mm/subpage-prot.c | 1 - + arch/powerpc/oprofile/cell/spu_task_sync.c | 1 + + arch/powerpc/oprofile/cell/vma_map.c | 1 + + arch/powerpc/platforms/44x/warp.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 + + arch/powerpc/platforms/82xx/ep8248e.c | 1 + + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 1 + + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 1 + + arch/powerpc/platforms/86xx/gef_gpio.c | 1 + + arch/powerpc/platforms/8xx/m8xx_setup.c | 1 - + arch/powerpc/platforms/cell/axon_msi.c | 1 + + arch/powerpc/platforms/cell/celleb_pci.c | 1 + + arch/powerpc/platforms/cell/celleb_scc_pciex.c | 1 + + arch/powerpc/platforms/cell/iommu.c | 1 + + arch/powerpc/platforms/cell/ras.c | 1 + + arch/powerpc/platforms/cell/setup.c | 1 - + arch/powerpc/platforms/cell/spider-pci.c | 1 + + arch/powerpc/platforms/cell/spu_manage.c | 1 - + arch/powerpc/platforms/cell/spu_priv1_mmio.c | 1 - + arch/powerpc/platforms/cell/spufs/coredump.c | 1 + + arch/powerpc/platforms/cell/spufs/file.c | 1 + + arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 1 + + arch/powerpc/platforms/cell/spufs/sched.c | 1 + + arch/powerpc/platforms/cell/spufs/syscalls.c | 1 + + arch/powerpc/platforms/chrp/nvram.c | 1 - + arch/powerpc/platforms/chrp/setup.c | 1 - + arch/powerpc/platforms/iseries/iommu.c | 1 + + arch/powerpc/platforms/iseries/mf.c | 1 + + arch/powerpc/platforms/iseries/pci.c | 1 + + arch/powerpc/platforms/iseries/vio.c | 2 +- + arch/powerpc/platforms/iseries/viopath.c | 1 + + arch/powerpc/platforms/maple/setup.c | 1 - + arch/powerpc/platforms/pasemi/dma_lib.c | 1 + + arch/powerpc/platforms/pasemi/gpio_mdio.c | 1 + + arch/powerpc/platforms/pasemi/setup.c | 1 + + arch/powerpc/platforms/powermac/cpufreq_32.c | 1 - + arch/powerpc/platforms/powermac/cpufreq_64.c | 1 - + arch/powerpc/platforms/powermac/low_i2c.c | 1 + + arch/powerpc/platforms/powermac/nvram.c | 1 - + arch/powerpc/platforms/powermac/pfunc_core.c | 1 + + arch/powerpc/platforms/powermac/setup.c | 1 - + arch/powerpc/platforms/ps3/device-init.c | 1 + + arch/powerpc/platforms/ps3/mm.c | 1 + + arch/powerpc/platforms/ps3/os-area.c | 1 + + arch/powerpc/platforms/ps3/spu.c | 1 + + arch/powerpc/platforms/ps3/system-bus.c | 1 + + arch/powerpc/platforms/pseries/cmm.c | 1 + + arch/powerpc/platforms/pseries/dlpar.c | 1 + + arch/powerpc/platforms/pseries/dtl.c | 1 + + arch/powerpc/platforms/pseries/eeh_cache.c | 1 + + arch/powerpc/platforms/pseries/eeh_event.c | 1 + + arch/powerpc/platforms/pseries/nvram.c | 1 - + arch/powerpc/platforms/pseries/phyp_dump.c | 1 + + arch/powerpc/platforms/pseries/ras.c | 1 - + arch/powerpc/platforms/pseries/reconfig.c | 1 + + arch/powerpc/platforms/pseries/scanlog.c | 1 + + arch/powerpc/platforms/pseries/setup.c | 1 - + arch/powerpc/sysdev/cpm1.c | 1 + + arch/powerpc/sysdev/cpm_common.c | 1 + + arch/powerpc/sysdev/dart_iommu.c | 2 +- + arch/powerpc/sysdev/fsl_gtm.c | 1 + + arch/powerpc/sysdev/fsl_msi.c | 1 + + arch/powerpc/sysdev/fsl_pci.c | 1 + + arch/powerpc/sysdev/fsl_rio.c | 1 + + arch/powerpc/sysdev/mpc8xxx_gpio.c | 1 + + arch/powerpc/sysdev/mpic.c | 1 + + arch/powerpc/sysdev/msi_bitmap.c | 1 + + arch/powerpc/sysdev/of_rtc.c | 1 + + arch/powerpc/sysdev/pmi.c | 1 + + arch/powerpc/sysdev/ppc4xx_gpio.c | 1 + + arch/powerpc/sysdev/ppc4xx_pci.c | 1 + + arch/powerpc/sysdev/qe_lib/gpio.c | 1 + + arch/powerpc/sysdev/qe_lib/ucc.c | 1 - + arch/powerpc/sysdev/simple_gpio.c | 1 + + arch/powerpc/sysdev/tsi108_pci.c | 1 - + arch/s390/appldata/appldata_mem.c | 1 - + arch/s390/appldata/appldata_net_sum.c | 1 - + arch/s390/crypto/prng.c | 1 + + arch/s390/hypfs/hypfs_diag.c | 1 - + arch/s390/hypfs/inode.c | 2 +- + arch/s390/kernel/compat_linux.c | 2 +- + arch/s390/kernel/ipl.c | 1 + + arch/s390/kernel/kprobes.c | 1 + + arch/s390/kernel/process.c | 2 +- + arch/s390/kernel/setup.c | 1 - + arch/s390/kernel/smp.c | 1 + + arch/s390/kernel/sysinfo.c | 1 + + arch/s390/kernel/time.c | 1 + + arch/s390/kvm/interrupt.c | 1 + + arch/s390/kvm/priv.c | 1 + + arch/s390/kvm/sigp.c | 1 + + arch/s390/mm/cmm.c | 1 + + arch/s390/mm/init.c | 1 + + arch/s390/mm/page-states.c | 1 + + arch/s390/mm/pgtable.c | 2 +- + arch/s390/mm/vmem.c | 1 + + arch/score/kernel/sys_score.c | 1 + + arch/score/mm/init.c | 1 + + arch/sh/drivers/dma/dma-api.c | 1 + + arch/sh/drivers/dma/dmabrg.c | 1 + + arch/sh/drivers/heartbeat.c | 1 + + arch/sh/drivers/pci/pcie-sh7786.c | 1 + + arch/sh/drivers/push-switch.c | 1 + + arch/sh/kernel/cpu/fpu.c | 1 + + arch/sh/kernel/cpu/hwblk.c | 1 - + arch/sh/kernel/dwarf.c | 1 + + arch/sh/kernel/kprobes.c | 1 + + arch/sh/kernel/process.c | 1 + + arch/sh/kernel/process_32.c | 1 + + arch/sh/kernel/process_64.c | 1 + + arch/sh/kernel/ptrace_32.c | 1 - + arch/sh/kernel/vsyscall/vsyscall.c | 1 - + arch/sh/mm/consistent.c | 1 + + arch/sh/mm/hugetlbpage.c | 1 - + arch/sh/mm/init.c | 1 + + arch/sh/mm/ioremap.c | 1 + + arch/sh/mm/ioremap_fixed.c | 1 - + arch/sh/mm/pgtable.c | 1 + + arch/sh/mm/pmb.c | 1 - + arch/sparc/kernel/central.c | 1 + + arch/sparc/kernel/cpumap.c | 1 + + arch/sparc/kernel/hvapi.c | 1 - + arch/sparc/kernel/iommu.c | 1 + + arch/sparc/kernel/kprobes.c | 1 + + arch/sparc/kernel/led.c | 1 + + arch/sparc/kernel/leon_kernel.c | 1 - + arch/sparc/kernel/leon_smp.c | 1 + + arch/sparc/kernel/module.c | 2 +- + arch/sparc/kernel/of_device_common.c | 1 - + arch/sparc/kernel/pci_msi.c | 1 + + arch/sparc/kernel/process_32.c | 2 +- + arch/sparc/kernel/setup_64.c | 1 - + arch/sparc/kernel/smp_64.c | 1 + + arch/sparc/kernel/sun4c_irq.c | 1 - + arch/sparc/kernel/sun4m_irq.c | 1 - + arch/sparc/kernel/sys_sparc32.c | 2 +- + arch/sparc/kernel/traps_64.c | 1 + + arch/sparc/kernel/vio.c | 1 + + arch/sparc/mm/hugetlbpage.c | 1 - + arch/sparc/mm/init_32.c | 1 + + arch/sparc/mm/init_64.c | 2 +- + arch/sparc/mm/srmmu.c | 2 +- + arch/sparc/mm/sun4c.c | 1 + + arch/sparc/mm/tsb.c | 1 + + arch/um/drivers/net_kern.c | 1 + + arch/um/drivers/port_kern.c | 1 + + arch/um/drivers/ubd_kern.c | 1 + + arch/um/kernel/exec.c | 1 + + arch/um/kernel/irq.c | 1 + + arch/um/kernel/mem.c | 2 +- + arch/um/kernel/process.c | 2 +- + arch/um/kernel/reboot.c | 1 + + arch/um/kernel/skas/mmu.c | 1 + + arch/um/os-Linux/helper.c | 1 + + arch/um/sys-i386/ldt.c | 1 + + arch/x86/crypto/fpu.c | 1 + + arch/x86/ia32/ia32_aout.c | 1 - + arch/x86/ia32/sys_ia32.c | 1 + + arch/x86/include/asm/pgtable_32.h | 1 - + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/alternative.c | 1 + + arch/x86/kernel/amd_iommu.c | 2 +- + arch/x86/kernel/amd_iommu_init.c | 2 +- + arch/x86/kernel/apb_timer.c | 1 + + arch/x86/kernel/apic/es7000_32.c | 1 + + arch/x86/kernel/apic/io_apic.c | 1 + + arch/x86/kernel/apic/nmi.c | 1 + + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/bootflag.c | 1 - + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 1 + + arch/x86/kernel/cpu/cpufreq/elanfreq.c | 1 - + arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 1 + + arch/x86/kernel/cpu/cpufreq/longrun.c | 1 - + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 1 - + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 1 + + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 1 - + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 1 + + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 1 - + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 1 - + arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 1 - + arch/x86/kernel/cpu/mcheck/mce-inject.c | 1 + + arch/x86/kernel/cpu/mcheck/mce.c | 1 + + arch/x86/kernel/cpu/mcheck/mce_amd.c | 1 + + arch/x86/kernel/cpu/mcheck/mce_intel.c | 1 + + arch/x86/kernel/cpu/mtrr/generic.c | 1 - + arch/x86/kernel/cpu/mtrr/if.c | 1 + + arch/x86/kernel/cpu/perf_event.c | 1 + + arch/x86/kernel/cpuid.c | 1 + + arch/x86/kernel/crash_dump_32.c | 1 + + arch/x86/kernel/hpet.c | 1 + + arch/x86/kernel/i387.c | 1 + + arch/x86/kernel/i8259.c | 1 - + arch/x86/kernel/irqinit.c | 1 - + arch/x86/kernel/k8.c | 2 +- + arch/x86/kernel/kdebugfs.c | 1 + + arch/x86/kernel/ldt.c | 1 + + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/mca_32.c | 1 + + arch/x86/kernel/module.c | 1 + + arch/x86/kernel/msr.c | 1 + + arch/x86/kernel/pci-dma.c | 1 + + arch/x86/kernel/pci-gart_64.c | 1 + + arch/x86/kernel/pci-nommu.c | 1 + + arch/x86/kernel/ptrace.c | 1 + + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/smp.c | 1 + + arch/x86/kernel/smpboot.c | 1 + + arch/x86/kernel/tlb_uv.c | 1 + + arch/x86/kernel/uv_irq.c | 1 + + arch/x86/kernel/uv_time.c | 1 + + arch/x86/kernel/vmi_32.c | 1 + + arch/x86/kvm/i8254.c | 1 + + arch/x86/kvm/i8259.c | 1 + + arch/x86/kvm/lapic.c | 1 + + arch/x86/kvm/mmu.c | 1 + + arch/x86/kvm/svm.c | 1 + + arch/x86/kvm/vmx.c | 1 + + arch/x86/kvm/x86.c | 1 + + arch/x86/mm/hugetlbpage.c | 1 - + arch/x86/mm/init.c | 1 + + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 1 + + arch/x86/mm/kmmio.c | 1 + + arch/x86/mm/mmio-mod.c | 1 + + arch/x86/mm/pageattr.c | 2 +- + arch/x86/mm/pat.c | 2 +- + arch/x86/mm/pgtable.c | 1 + + arch/x86/mm/pgtable_32.c | 1 - + arch/x86/pci/acpi.c | 1 + + arch/x86/pci/common.c | 1 + + arch/x86/pci/irq.c | 1 - + arch/x86/pci/mmconfig-shared.c | 1 + + arch/x86/pci/pcbios.c | 1 + + arch/x86/power/hibernate_32.c | 1 + + arch/x86/power/hibernate_64.c | 1 + + arch/x86/vdso/vma.c | 1 + + arch/x86/xen/debugfs.c | 1 + + arch/x86/xen/enlighten.c | 1 + + arch/x86/xen/mmu.c | 1 + + arch/x86/xen/smp.c | 1 + + arch/x86/xen/spinlock.c | 1 + + arch/x86/xen/time.c | 1 + + arch/xtensa/kernel/pci-dma.c | 1 + + arch/xtensa/kernel/process.c | 2 +- + arch/xtensa/mm/init.c | 2 +- + arch/xtensa/platforms/iss/console.c | 1 - + block/blk-barrier.c | 1 + + block/blk-cgroup.c | 1 + + block/blk-integrity.c | 1 + + block/blk-ioc.c | 1 + + block/blk-settings.c | 1 + + block/blk-sysfs.c | 1 + + block/blk-tag.c | 1 + + block/bsg.c | 1 + + block/cfq-iosched.c | 1 + + block/compat_ioctl.c | 1 + + block/ioctl.c | 1 + + block/noop-iosched.c | 1 + + crypto/algapi.c | 1 + + crypto/algboss.c | 1 + + crypto/async_tx/async_pq.c | 1 + + crypto/async_tx/raid6test.c | 1 + + crypto/hmac.c | 1 - + crypto/rng.c | 1 + + crypto/seqiv.c | 1 + + crypto/tcrypt.c | 2 +- + crypto/xor.c | 1 + + drivers/acpi/ac.c | 1 + + drivers/acpi/acpi_memhotplug.c | 1 + + drivers/acpi/acpi_pad.c | 1 + + drivers/acpi/battery.c | 1 + + drivers/acpi/bus.c | 1 + + drivers/acpi/button.c | 1 + + drivers/acpi/container.c | 1 + + drivers/acpi/debug.c | 1 + + drivers/acpi/dock.c | 1 + + drivers/acpi/ec.c | 1 + + drivers/acpi/event.c | 1 + + drivers/acpi/glue.c | 1 + + drivers/acpi/pci_irq.c | 1 + + drivers/acpi/pci_link.c | 1 + + drivers/acpi/pci_root.c | 1 + + drivers/acpi/pci_slot.c | 1 + + drivers/acpi/power.c | 1 + + drivers/acpi/power_meter.c | 1 + + drivers/acpi/processor_core.c | 1 + + drivers/acpi/processor_driver.c | 1 + + drivers/acpi/processor_idle.c | 1 + + drivers/acpi/processor_perflib.c | 1 + + drivers/acpi/processor_throttling.c | 1 + + drivers/acpi/sbs.c | 1 + + drivers/acpi/sbshc.c | 1 + + drivers/acpi/scan.c | 1 + + drivers/acpi/system.c | 1 + + drivers/acpi/thermal.c | 1 + + drivers/acpi/utils.c | 1 + + drivers/acpi/video.c | 1 + + drivers/ata/ahci.c | 1 + + drivers/ata/ata_piix.c | 1 + + drivers/ata/libata-acpi.c | 1 + + drivers/ata/libata-core.c | 1 + + drivers/ata/libata-pmp.c | 1 + + drivers/ata/libata-scsi.c | 1 + + drivers/ata/libata-sff.c | 1 + + drivers/ata/pata_acpi.c | 1 + + drivers/ata/pata_at32.c | 1 + + drivers/ata/pata_at91.c | 1 + + drivers/ata/pata_atp867x.c | 1 + + drivers/ata/pata_cmd640.c | 1 + + drivers/ata/pata_icside.c | 1 + + drivers/ata/pata_it821x.c | 1 + + drivers/ata/pata_macio.c | 1 + + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_octeon_cf.c | 1 + + drivers/ata/pata_pcmcia.c | 1 + + drivers/ata/pata_rb532_cf.c | 1 + + drivers/ata/pata_rdc.c | 1 + + drivers/ata/pata_via.c | 1 + + drivers/ata/pdc_adma.c | 1 + + drivers/ata/sata_fsl.c | 1 + + drivers/ata/sata_inic162x.c | 1 + + drivers/ata/sata_mv.c | 1 + + drivers/ata/sata_nv.c | 1 + + drivers/ata/sata_promise.c | 1 + + drivers/ata/sata_qstor.c | 1 + + drivers/ata/sata_sil24.c | 1 + + drivers/ata/sata_sx4.c | 1 + + drivers/ata/sata_uli.c | 1 + + drivers/atm/adummy.c | 1 + + drivers/atm/ambassador.c | 1 + + drivers/atm/atmtcp.c | 1 + + drivers/atm/eni.c | 1 + + drivers/atm/firestream.c | 1 + + drivers/atm/he.c | 1 + + drivers/atm/horizon.c | 1 + + drivers/atm/idt77105.c | 1 + + drivers/atm/idt77252.c | 1 + + drivers/atm/iphase.c | 1 + + drivers/atm/lanai.c | 1 + + drivers/atm/nicstar.c | 1 + + drivers/atm/solos-pci.c | 1 + + drivers/atm/suni.c | 1 + + drivers/atm/uPD98402.c | 1 + + drivers/atm/zatm.c | 1 + + drivers/auxdisplay/cfag12864b.c | 1 + + drivers/auxdisplay/cfag12864bfb.c | 1 - + drivers/base/bus.c | 1 + + drivers/base/cpu.c | 1 + + drivers/base/devres.c | 1 + + drivers/base/devtmpfs.c | 1 + + drivers/base/dma-coherent.c | 1 + + drivers/base/dma-mapping.c | 1 + + drivers/base/driver.c | 1 + + drivers/base/firmware_class.c | 1 + + drivers/base/memory.c | 1 + + drivers/base/module.c | 1 + + drivers/base/node.c | 1 + + drivers/base/sys.c | 1 - + drivers/block/amiflop.c | 1 + + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/aoe/aoechr.c | 1 + + drivers/block/aoe/aoecmd.c | 1 + + drivers/block/aoe/aoedev.c | 1 + + drivers/block/aoe/aoenet.c | 1 + + drivers/block/brd.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 1 + + drivers/block/drbd/drbd_proc.c | 1 - + drivers/block/hd.c | 1 - + drivers/block/loop.c | 1 - + drivers/block/mg_disk.c | 1 + + drivers/block/nbd.c | 1 + + drivers/block/osdblk.c | 1 + + drivers/block/paride/pd.c | 1 + + drivers/block/pktcdvd.c | 1 + + drivers/block/ps3disk.c | 1 + + drivers/block/ps3vram.c | 1 + + drivers/block/swim.c | 1 + + drivers/block/ub.c | 1 + + drivers/block/umem.c | 2 +- + drivers/block/virtio_blk.c | 1 + + drivers/block/xd.c | 1 + + drivers/block/xen-blkfront.c | 1 + + drivers/block/z2ram.c | 1 + + drivers/bluetooth/btmrvl_debugfs.c | 1 + + drivers/bluetooth/btmrvl_drv.h | 1 + + drivers/bluetooth/btmrvl_sdio.c | 1 + + drivers/char/agp/amd-k7-agp.c | 2 +- + drivers/char/agp/backend.c | 1 + + drivers/char/agp/compat_ioctl.c | 1 + + drivers/char/agp/generic.c | 1 + + drivers/char/agp/hp-agp.c | 1 + + drivers/char/agp/intel-agp.c | 1 + + drivers/char/agp/nvidia-agp.c | 1 - + drivers/char/agp/sgi-agp.c | 1 + + drivers/char/agp/uninorth-agp.c | 1 + + drivers/char/bfin_jtag_comm.c | 1 + + drivers/char/briq_panel.c | 1 - + drivers/char/bsr.c | 1 + + drivers/char/cyclades.c | 1 + + drivers/char/dsp56k.c | 1 - + drivers/char/epca.c | 1 - + drivers/char/generic_serial.c | 1 + + drivers/char/hpet.c | 1 + + drivers/char/hvc_console.c | 1 + + drivers/char/hvc_iucv.c | 1 + + drivers/char/hvcs.c | 1 + + drivers/char/hw_random/intel-rng.c | 1 + + drivers/char/hw_random/octeon-rng.c | 1 + + drivers/char/hw_random/tx4939-rng.c | 1 + + drivers/char/isicom.c | 1 + + drivers/char/mbcs.c | 1 + + drivers/char/misc.c | 2 +- + drivers/char/mmtimer.c | 1 + + drivers/char/moxa.c | 1 + + drivers/char/mxser.c | 2 +- + drivers/char/nozomi.c | 1 + + drivers/char/nvram.c | 1 - + drivers/char/pcmcia/ipwireless/network.c | 1 + + drivers/char/ppdev.c | 1 + + drivers/char/ps3flash.c | 1 + + drivers/char/pty.c | 1 + + drivers/char/raw.c | 1 + + drivers/char/rio/rioinit.c | 1 - + drivers/char/rio/riointr.c | 1 - + drivers/char/rio/rioparam.c | 1 - + drivers/char/rio/rioroute.c | 1 - + drivers/char/rio/riotty.c | 1 - + drivers/char/serial167.c | 1 + + drivers/char/snsc_event.c | 1 + + drivers/char/sonypi.c | 1 + + drivers/char/specialix.c | 1 + + drivers/char/sysrq.c | 1 + + drivers/char/tpm/tpm.c | 1 + + drivers/char/tpm/tpm_bios.c | 1 + + drivers/char/tpm/tpm_nsc.c | 1 + + drivers/char/tpm/tpm_tis.c | 1 + + drivers/char/tty_audit.c | 1 + + drivers/char/viotape.c | 1 + + drivers/char/virtio_console.c | 1 + + drivers/char/vme_scc.c | 1 - + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 1 + + drivers/clocksource/sh_cmt.c | 1 + + drivers/clocksource/sh_mtu2.c | 1 + + drivers/clocksource/sh_tmu.c | 1 + + drivers/connector/cn_proc.c | 1 + + drivers/connector/connector.c | 1 + + drivers/cpufreq/cpufreq_stats.c | 1 + + drivers/cpuidle/sysfs.c | 1 + + drivers/crypto/amcc/crypto4xx_core.c | 1 + + drivers/crypto/ixp4xx_crypto.c | 1 + + drivers/crypto/mv_cesa.c | 1 + + drivers/crypto/padlock-aes.c | 1 + + drivers/crypto/talitos.c | 1 + + drivers/dca/dca-core.c | 1 + + drivers/dca/dca-sysfs.c | 1 + + drivers/dma/at_hdmac.c | 1 + + drivers/dma/coh901318_lli.c | 1 + + drivers/dma/dmaengine.c | 1 + + drivers/dma/dmatest.c | 1 + + drivers/dma/fsldma.c | 1 + + drivers/dma/ioat/dma.c | 1 + + drivers/dma/ioat/dma_v2.c | 1 + + drivers/dma/ioat/dma_v3.c | 1 + + drivers/dma/ioat/pci.c | 1 + + drivers/dma/iop-adma.c | 1 + + drivers/dma/iovlock.c | 1 + + drivers/dma/mpc512x_dma.c | 1 + + drivers/dma/mv_xor.c | 1 + + drivers/dma/ppc4xx/adma.c | 1 + + drivers/dma/shdma.c | 1 + + drivers/edac/amd76x_edac.c | 1 - + drivers/edac/cpc925_edac.c | 1 + + drivers/edac/e752x_edac.c | 1 - + drivers/edac/e7xxx_edac.c | 1 - + drivers/edac/edac_device_sysfs.c | 1 + + drivers/edac/edac_mc_sysfs.c | 1 + + drivers/edac/edac_pci_sysfs.c | 1 + + drivers/edac/i3000_edac.c | 1 - + drivers/edac/i3200_edac.c | 1 - + drivers/edac/i5100_edac.c | 1 - + drivers/edac/i82443bxgx_edac.c | 1 - + drivers/edac/i82860_edac.c | 1 - + drivers/edac/i82875p_edac.c | 1 - + drivers/edac/i82975x_edac.c | 1 - + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mv64x60_edac.c | 2 +- + drivers/edac/pasemi_edac.c | 1 - + drivers/edac/r82600_edac.c | 1 - + drivers/edac/x38_edac.c | 1 - + drivers/firewire/core-cdev.c | 1 + + drivers/firewire/core-device.c | 1 + + drivers/firewire/core-iso.c | 1 + + drivers/firewire/net.c | 1 + + drivers/firewire/ohci.c | 2 +- + drivers/firmware/dcdbas.c | 1 + + drivers/firmware/dell_rbu.c | 1 + + drivers/firmware/dmi-id.c | 1 + + drivers/firmware/dmi_scan.c | 1 - + drivers/firmware/efivars.c | 1 + + drivers/firmware/iscsi_ibft_find.c | 1 - + drivers/firmware/memmap.c | 1 + + drivers/gpio/adp5520-gpio.c | 1 + + drivers/gpio/adp5588-gpio.c | 1 + + drivers/gpio/bt8xxgpio.c | 1 + + drivers/gpio/gpiolib.c | 1 + + drivers/gpio/langwell_gpio.c | 1 + + drivers/gpio/max7300.c | 1 + + drivers/gpio/max7301.c | 1 + + drivers/gpio/max730x.c | 1 + + drivers/gpio/mc33880.c | 1 + + drivers/gpio/mcp23s08.c | 1 + + drivers/gpio/pca953x.c | 1 + + drivers/gpio/pl061.c | 1 + + drivers/gpio/timbgpio.c | 1 + + drivers/gpio/twl4030-gpio.c | 1 - + drivers/gpio/wm831x-gpio.c | 1 + + drivers/gpio/wm8350-gpiolib.c | 1 + + drivers/gpio/wm8994-gpio.c | 1 + + drivers/gpio/xilinx_gpio.c | 1 + + drivers/gpu/drm/drm_agpsupport.c | 1 + + drivers/gpu/drm/drm_bufs.c | 1 + + drivers/gpu/drm/drm_crtc.c | 1 + + drivers/gpu/drm/drm_debugfs.c | 1 + + drivers/gpu/drm/drm_dp_i2c_helper.c | 1 - + drivers/gpu/drm/drm_drv.c | 1 + + drivers/gpu/drm/drm_edid.c | 1 + + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_fops.c | 1 + + drivers/gpu/drm/drm_hashtab.c | 1 + + drivers/gpu/drm/drm_irq.c | 1 + + drivers/gpu/drm/drm_pci.c | 1 + + drivers/gpu/drm/drm_proc.c | 1 + + drivers/gpu/drm/drm_scatter.c | 1 + + drivers/gpu/drm/drm_stub.c | 1 + + drivers/gpu/drm/drm_sysfs.c | 1 + + drivers/gpu/drm/drm_vm.c | 1 + + drivers/gpu/drm/i810/i810_dma.c | 1 + + drivers/gpu/drm/i830/i830_dma.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 1 + + drivers/gpu/drm/i915/i915_dma.c | 1 + + drivers/gpu/drm/i915/i915_gem.c | 1 + + drivers/gpu/drm/i915/i915_irq.c | 1 + + drivers/gpu/drm/i915/intel_crt.c | 1 + + drivers/gpu/drm/i915/intel_display.c | 1 + + drivers/gpu/drm/i915/intel_dp.c | 1 + + drivers/gpu/drm/i915/intel_dvo.c | 1 + + drivers/gpu/drm/i915/intel_fb.c | 1 - + drivers/gpu/drm/i915/intel_hdmi.c | 1 + + drivers/gpu/drm/i915/intel_i2c.c | 1 + + drivers/gpu/drm/i915/intel_lvds.c | 1 + + drivers/gpu/drm/i915/intel_modes.c | 1 + + drivers/gpu/drm/i915/intel_sdvo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/nouveau/nouveau_grctx.c | 1 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 + + drivers/gpu/drm/nouveau/nouveau_state.c | 1 + + drivers/gpu/drm/r128/r128_cce.c | 1 + + drivers/gpu/drm/radeon/atom.c | 1 + + drivers/gpu/drm/radeon/evergreen.c | 1 + + drivers/gpu/drm/radeon/r100.c | 1 + + drivers/gpu/drm/radeon/r300.c | 1 + + drivers/gpu/drm/radeon/r420.c | 1 + + drivers/gpu/drm/radeon/r600.c | 1 + + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 1 + + drivers/gpu/drm/radeon/radeon_bios.c | 1 + + drivers/gpu/drm/radeon/radeon_device.c | 1 + + drivers/gpu/drm/radeon/radeon_fb.c | 1 + + drivers/gpu/drm/radeon/radeon_fence.c | 1 + + drivers/gpu/drm/radeon/radeon_kms.c | 1 + + drivers/gpu/drm/radeon/radeon_object.c | 1 + + drivers/gpu/drm/radeon/radeon_ring.c | 1 + + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/radeon/rs400.c | 1 + + drivers/gpu/drm/radeon/rv515.c | 1 + + drivers/gpu/drm/radeon/rv770.c | 1 + + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + + drivers/gpu/drm/ttm/ttm_bo_util.c | 1 + + drivers/gpu/drm/ttm/ttm_memory.c | 1 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 + + drivers/gpu/drm/via/via_dmablit.c | 1 + + drivers/gpu/vga/vgaarb.c | 1 + + drivers/hid/hid-3m-pct.c | 1 + + drivers/hid/hid-a4tech.c | 1 + + drivers/hid/hid-apple.c | 1 + + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-drff.c | 1 + + drivers/hid/hid-gaff.c | 1 + + drivers/hid/hid-lg2ff.c | 1 + + drivers/hid/hid-magicmouse.c | 1 + + drivers/hid/hid-mosart.c | 1 + + drivers/hid/hid-ntrig.c | 1 + + drivers/hid/hid-pl.c | 1 + + drivers/hid/hid-quanta.c | 1 + + drivers/hid/hid-sjoy.c | 1 + + drivers/hid/hid-sony.c | 1 + + drivers/hid/hid-stantum.c | 1 + + drivers/hid/hid-tmff.c | 1 + + drivers/hid/hid-wacom.c | 1 + + drivers/hid/hid-zpff.c | 1 + + drivers/hid/hidraw.c | 1 + + drivers/hid/usbhid/hid-pidff.c | 1 + + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hwmon/ad7414.c | 1 + + drivers/hwmon/ad7418.c | 1 + + drivers/hwmon/adcxx.c | 1 + + drivers/hwmon/adt7411.c | 1 + + drivers/hwmon/adt7462.c | 1 + + drivers/hwmon/adt7470.c | 1 + + drivers/hwmon/asus_atk0110.c | 1 + + drivers/hwmon/atxp1.c | 1 + + drivers/hwmon/f75375s.c | 1 + + drivers/hwmon/i5k_amb.c | 1 + + drivers/hwmon/ibmaem.c | 1 + + drivers/hwmon/ibmpex.c | 1 + + drivers/hwmon/lm70.c | 1 + + drivers/hwmon/lm73.c | 1 - + drivers/hwmon/max1111.c | 1 + + drivers/hwmon/mc13783-adc.c | 1 + + drivers/hwmon/sht15.c | 1 + + drivers/hwmon/wm831x-hwmon.c | 1 + + drivers/i2c/algos/i2c-algo-bit.c | 1 - + drivers/i2c/algos/i2c-algo-pcf.c | 1 - + drivers/i2c/busses/i2c-amd8111.c | 1 + + drivers/i2c/busses/i2c-bfin-twi.c | 1 + + drivers/i2c/busses/i2c-davinci.c | 1 + + drivers/i2c/busses/i2c-designware.c | 1 + + drivers/i2c/busses/i2c-elektor.c | 1 - + drivers/i2c/busses/i2c-gpio.c | 1 + + drivers/i2c/busses/i2c-highlander.c | 1 + + drivers/i2c/busses/i2c-imx.c | 1 + + drivers/i2c/busses/i2c-ixp2000.c | 1 + + drivers/i2c/busses/i2c-mpc.c | 1 + + drivers/i2c/busses/i2c-mv64xxx.c | 1 + + drivers/i2c/busses/i2c-nforce2.c | 1 + + drivers/i2c/busses/i2c-nomadik.c | 1 + + drivers/i2c/busses/i2c-ocores.c | 1 + + drivers/i2c/busses/i2c-octeon.c | 1 + + drivers/i2c/busses/i2c-omap.c | 1 + + drivers/i2c/busses/i2c-parport.c | 1 + + drivers/i2c/busses/i2c-pasemi.c | 1 + + drivers/i2c/busses/i2c-pnx.c | 1 + + drivers/i2c/busses/i2c-pxa.c | 1 + + drivers/i2c/busses/i2c-s3c2410.c | 1 + + drivers/i2c/busses/i2c-sh_mobile.c | 1 + + drivers/i2c/busses/i2c-simtec.c | 1 + + drivers/i2c/busses/i2c-stu300.c | 1 + + drivers/i2c/busses/i2c-tiny-usb.c | 1 + + drivers/i2c/busses/i2c-versatile.c | 1 + + drivers/i2c/busses/i2c-xiic.c | 1 + + drivers/i2c/busses/scx200_acb.c | 1 + + drivers/i2c/i2c-boardinfo.c | 1 + + drivers/i2c/i2c-smbus.c | 1 + + drivers/ide/hpt366.c | 1 + + drivers/ide/ide-acpi.c | 1 + + drivers/ide/ide-atapi.c | 1 + + drivers/ide/ide-cd_ioctl.c | 1 + + drivers/ide/ide-devsets.c | 1 + + drivers/ide/ide-disk_proc.c | 1 + + drivers/ide/ide-dma.c | 1 + + drivers/ide/ide-floppy.c | 1 - + drivers/ide/ide-gd.c | 1 + + drivers/ide/ide-ioctls.c | 1 + + drivers/ide/ide-park.c | 1 + + drivers/ide/ide-pm.c | 1 + + drivers/ide/ide-proc.c | 1 + + drivers/ide/ide.c | 1 - + drivers/ide/it821x.c | 1 + + drivers/ide/pmac.c | 1 + + drivers/ide/rapide.c | 1 - + drivers/ide/sc1200.c | 1 + + drivers/ide/via82cxxx.c | 1 + + drivers/idle/i7300_idle.c | 1 + + drivers/ieee1394/dma.c | 1 - + drivers/ieee1394/sbp2.c | 1 - + drivers/infiniband/core/addr.c | 1 + + drivers/infiniband/core/cm.c | 1 + + drivers/infiniband/core/cma.c | 1 + + drivers/infiniband/core/iwcm.c | 1 + + drivers/infiniband/core/mad.c | 1 + + drivers/infiniband/core/mad_rmpp.c | 2 + + drivers/infiniband/core/multicast.c | 1 + + drivers/infiniband/core/ucm.c | 1 + + drivers/infiniband/core/ucma.c | 1 + + drivers/infiniband/core/umem.c | 1 + + drivers/infiniband/core/user_mad.c | 1 + + drivers/infiniband/core/uverbs_cmd.c | 1 + + drivers/infiniband/core/uverbs_main.c | 1 + + drivers/infiniband/hw/amso1100/c2.c | 1 + + drivers/infiniband/hw/amso1100/c2_alloc.c | 1 - + drivers/infiniband/hw/amso1100/c2_cm.c | 2 + + drivers/infiniband/hw/amso1100/c2_cq.c | 2 + + drivers/infiniband/hw/amso1100/c2_mm.c | 2 + + drivers/infiniband/hw/amso1100/c2_pd.c | 1 + + drivers/infiniband/hw/amso1100/c2_provider.c | 1 + + drivers/infiniband/hw/amso1100/c2_qp.c | 1 + + drivers/infiniband/hw/amso1100/c2_rnic.c | 1 + + drivers/infiniband/hw/cxgb3/cxio_dbg.c | 1 + + drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_cm.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_ev.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_provider.c | 1 + + drivers/infiniband/hw/cxgb3/iwch_qp.c | 1 + + drivers/infiniband/hw/ehca/ehca_av.c | 2 + + drivers/infiniband/hw/ehca/ehca_cq.c | 2 + + drivers/infiniband/hw/ehca/ehca_hca.c | 2 + + drivers/infiniband/hw/ehca/ehca_irq.c | 2 + + drivers/infiniband/hw/ehca/ehca_mrmw.c | 1 + + drivers/infiniband/hw/ehca/ehca_pd.c | 2 + + drivers/infiniband/hw/ehca/ehca_qp.c | 2 + + drivers/infiniband/hw/ehca/ehca_uverbs.c | 2 + + drivers/infiniband/hw/ehca/ipz_pt_fn.c | 2 + + drivers/infiniband/hw/ipath/ipath_cq.c | 1 + + drivers/infiniband/hw/ipath/ipath_dma.c | 1 + + drivers/infiniband/hw/ipath/ipath_driver.c | 1 + + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + + drivers/infiniband/hw/ipath/ipath_fs.c | 1 + + drivers/infiniband/hw/ipath/ipath_init_chip.c | 1 + + drivers/infiniband/hw/ipath/ipath_mmap.c | 1 + + drivers/infiniband/hw/ipath/ipath_mr.c | 2 + + drivers/infiniband/hw/ipath/ipath_qp.c | 1 + + drivers/infiniband/hw/ipath/ipath_sdma.c | 1 + + drivers/infiniband/hw/ipath/ipath_srq.c | 1 + + drivers/infiniband/hw/ipath/ipath_user_pages.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs.c | 1 + + drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | 1 + + drivers/infiniband/hw/mlx4/ah.c | 2 + + drivers/infiniband/hw/mlx4/cq.c | 1 + + drivers/infiniband/hw/mlx4/mad.c | 1 + + drivers/infiniband/hw/mlx4/main.c | 1 + + drivers/infiniband/hw/mlx4/mr.c | 2 + + drivers/infiniband/hw/mlx4/qp.c | 1 + + drivers/infiniband/hw/mlx4/srq.c | 1 + + drivers/infiniband/hw/mthca/mthca_cmd.c | 1 + + drivers/infiniband/hw/mthca/mthca_cq.c | 1 + + drivers/infiniband/hw/mthca/mthca_eq.c | 1 + + drivers/infiniband/hw/mthca/mthca_main.c | 1 + + drivers/infiniband/hw/mthca/mthca_mcg.c | 2 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 1 + + drivers/infiniband/hw/mthca/mthca_provider.c | 1 + + drivers/infiniband/hw/nes/nes.c | 1 + + drivers/infiniband/hw/nes/nes_cm.c | 1 + + drivers/infiniband/hw/nes/nes_hw.c | 1 + + drivers/infiniband/hw/nes/nes_nic.c | 1 + + drivers/infiniband/hw/nes/nes_utils.c | 1 + + drivers/infiniband/hw/nes/nes_verbs.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_fs.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 2 + + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 1 - + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 + + drivers/infiniband/ulp/iser/iser_verbs.c | 1 + + drivers/input/ff-core.c | 1 + + drivers/input/ff-memless.c | 1 + + drivers/input/gameport/lightning.c | 1 - + drivers/input/input-polldev.c | 1 + + drivers/input/input.c | 1 + + drivers/input/joystick/db9.c | 1 + + drivers/input/joystick/gamecon.c | 1 + + drivers/input/joystick/turbografx.c | 1 + + drivers/input/keyboard/adp5520-keys.c | 1 + + drivers/input/keyboard/adp5588-keys.c | 1 + + drivers/input/keyboard/bf54x-keys.c | 1 + + drivers/input/keyboard/davinci_keyscan.c | 1 + + drivers/input/keyboard/ep93xx_keypad.c | 1 + + drivers/input/keyboard/gpio_keys.c | 1 + + drivers/input/keyboard/imx_keypad.c | 1 + + drivers/input/keyboard/jornada680_kbd.c | 1 + + drivers/input/keyboard/jornada720_kbd.c | 1 + + drivers/input/keyboard/lm8323.c | 1 + + drivers/input/keyboard/matrix_keypad.c | 1 + + drivers/input/keyboard/max7359_keypad.c | 1 + + drivers/input/keyboard/omap-keypad.c | 1 + + drivers/input/keyboard/opencores-kbd.c | 1 + + drivers/input/keyboard/pxa27x_keypad.c | 1 + + drivers/input/keyboard/pxa930_rotary.c | 1 + + drivers/input/keyboard/sh_keysc.c | 1 + + drivers/input/keyboard/tosakbd.c | 1 + + drivers/input/keyboard/twl4030_keypad.c | 1 + + drivers/input/keyboard/w90p910_keypad.c | 1 + + drivers/input/misc/88pm860x_onkey.c | 1 + + drivers/input/misc/ati_remote2.c | 1 + + drivers/input/misc/bfin_rotary.c | 1 + + drivers/input/misc/cobalt_btns.c | 1 + + drivers/input/misc/dm355evm_keys.c | 1 + + drivers/input/misc/pcap_keys.c | 1 + + drivers/input/misc/pcf50633-input.c | 1 + + drivers/input/misc/rotary_encoder.c | 1 + + drivers/input/misc/sgi_btns.c | 1 + + drivers/input/misc/sparcspkr.c | 1 + + drivers/input/misc/twl4030-vibra.c | 1 + + drivers/input/misc/winbond-cir.c | 1 + + drivers/input/misc/wistron_btns.c | 1 + + drivers/input/misc/wm831x-on.c | 1 + + drivers/input/mouse/alps.c | 1 + + drivers/input/mouse/elantech.c | 1 + + drivers/input/mouse/hgpk.c | 1 + + drivers/input/mouse/lifebook.c | 1 + + drivers/input/mouse/pxa930_trkball.c | 1 + + drivers/input/mouse/sentelic.c | 1 + + drivers/input/mouse/synaptics.c | 1 + + drivers/input/mouse/synaptics_i2c.c | 1 + + drivers/input/mouse/touchkit_ps2.c | 1 - + drivers/input/mouse/trackpoint.c | 1 + + drivers/input/serio/altera_ps2.c | 1 + + drivers/input/serio/at32psif.c | 1 + + drivers/input/serio/ct82c710.c | 1 + + drivers/input/serio/gscps2.c | 1 + + drivers/input/serio/hil_mlc.c | 1 + + drivers/input/serio/i8042.c | 1 + + drivers/input/serio/libps2.c | 1 - + drivers/input/serio/parkbd.c | 1 + + drivers/input/serio/pcips2.c | 1 + + drivers/input/serio/q40kbd.c | 1 + + drivers/input/serio/rpckbd.c | 1 + + drivers/input/serio/xilinx_ps2.c | 1 + + drivers/input/sparse-keymap.c | 1 + + drivers/input/touchscreen/88pm860x-ts.c | 1 + + drivers/input/touchscreen/atmel-wm97xx.c | 1 + + drivers/input/touchscreen/da9034-ts.c | 1 + + drivers/input/touchscreen/eeti_ts.c | 1 + + drivers/input/touchscreen/jornada720_ts.c | 1 + + drivers/input/touchscreen/mc13783_ts.c | 1 + + drivers/input/touchscreen/mcs5000_ts.c | 1 + + drivers/input/touchscreen/migor_ts.c | 1 + + drivers/input/touchscreen/pcap_ts.c | 1 + + drivers/input/touchscreen/s3c2410_ts.c | 1 - + drivers/input/touchscreen/ucb1400_ts.c | 1 - + drivers/input/touchscreen/w90p910_ts.c | 1 + + drivers/input/touchscreen/wm97xx-core.c | 1 + + drivers/input/xen-kbdfront.c | 1 + + drivers/isdn/act2000/module.c | 1 + + drivers/isdn/capi/capifs.c | 1 + + drivers/isdn/capi/capilib.c | 1 + + drivers/isdn/capi/capiutil.c | 1 + + drivers/isdn/capi/kcapi.c | 1 + + drivers/isdn/divert/divert_procfs.c | 1 + + drivers/isdn/divert/isdn_divert.c | 1 + + drivers/isdn/gigaset/capi.c | 1 + + drivers/isdn/gigaset/common.c | 1 + + drivers/isdn/gigaset/gigaset.h | 1 + + drivers/isdn/gigaset/i4l.c | 1 + + drivers/isdn/gigaset/ser-gigaset.c | 1 + + drivers/isdn/hardware/avm/b1.c | 1 + + drivers/isdn/hardware/avm/b1dma.c | 1 + + drivers/isdn/hardware/avm/c4.c | 1 + + drivers/isdn/hardware/avm/t1isa.c | 1 + + drivers/isdn/hardware/eicon/capimain.c | 1 + + drivers/isdn/hardware/mISDN/avmfritz.c | 1 + + drivers/isdn/hardware/mISDN/hfcmulti.c | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 1 + + drivers/isdn/hardware/mISDN/hfcsusb.c | 1 + + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 + + drivers/isdn/hardware/mISDN/mISDNipac.c | 1 + + drivers/isdn/hardware/mISDN/mISDNisar.c | 1 + + drivers/isdn/hardware/mISDN/netjet.c | 1 + + drivers/isdn/hardware/mISDN/speedfax.c | 1 + + drivers/isdn/hardware/mISDN/w6692.c | 1 + + drivers/isdn/hisax/amd7930_fn.c | 1 + + drivers/isdn/hisax/avm_pci.c | 1 + + drivers/isdn/hisax/callc.c | 1 + + drivers/isdn/hisax/config.c | 1 + + drivers/isdn/hisax/elsa.c | 1 + + drivers/isdn/hisax/elsa_ser.c | 1 + + drivers/isdn/hisax/fsm.c | 1 + + drivers/isdn/hisax/hfc4s8s_l1.c | 1 + + drivers/isdn/hisax/hfc_2bds0.c | 1 + + drivers/isdn/hisax/hfc_2bs0.c | 1 + + drivers/isdn/hisax/hfc_sx.c | 1 + + drivers/isdn/hisax/hfc_usb.c | 1 + + drivers/isdn/hisax/hisax_isac.c | 1 + + drivers/isdn/hisax/hscx.c | 1 + + drivers/isdn/hisax/icc.c | 1 + + drivers/isdn/hisax/ipacx.c | 1 + + drivers/isdn/hisax/isac.c | 1 + + drivers/isdn/hisax/isar.c | 1 + + drivers/isdn/hisax/isdnl1.c | 1 + + drivers/isdn/hisax/isdnl2.c | 1 + + drivers/isdn/hisax/isdnl3.c | 1 + + drivers/isdn/hisax/jade.c | 1 + + drivers/isdn/hisax/l3dss1.c | 1 + + drivers/isdn/hisax/l3ni1.c | 1 + + drivers/isdn/hisax/netjet.c | 1 + + drivers/isdn/hisax/st5481_b.c | 2 +- + drivers/isdn/hisax/st5481_d.c | 2 +- + drivers/isdn/hisax/tei.c | 1 + + drivers/isdn/hisax/w6692.c | 1 + + drivers/isdn/hysdn/hycapi.c | 1 + + drivers/isdn/hysdn/hysdn_procconf.c | 1 + + drivers/isdn/hysdn/hysdn_proclog.c | 1 + + drivers/isdn/i4l/isdn_audio.c | 1 + + drivers/isdn/i4l/isdn_common.c | 1 + + drivers/isdn/i4l/isdn_net.c | 1 + + drivers/isdn/i4l/isdn_ppp.c | 1 + + drivers/isdn/i4l/isdn_tty.c | 1 + + drivers/isdn/i4l/isdn_x25iface.c | 1 + + drivers/isdn/icn/icn.c | 1 + + drivers/isdn/isdnloop/isdnloop.c | 1 + + drivers/isdn/mISDN/clock.c | 1 + + drivers/isdn/mISDN/core.c | 1 + + drivers/isdn/mISDN/dsp_cmx.c | 1 + + drivers/isdn/mISDN/dsp_core.c | 1 + + drivers/isdn/mISDN/dsp_pipeline.c | 1 + + drivers/isdn/mISDN/dsp_tones.c | 1 + + drivers/isdn/mISDN/hwchannel.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 1 + + drivers/isdn/mISDN/layer1.c | 1 + + drivers/isdn/mISDN/layer2.c | 1 + + drivers/isdn/mISDN/socket.c | 1 + + drivers/isdn/mISDN/stack.c | 1 + + drivers/isdn/mISDN/tei.c | 1 + + drivers/isdn/mISDN/timerdev.c | 1 + + drivers/isdn/pcbit/callbacks.c | 1 - + drivers/isdn/pcbit/edss1.c | 1 - + drivers/isdn/sc/init.c | 1 + + drivers/leds/dell-led.c | 1 + + drivers/leds/led-triggers.c | 1 + + drivers/leds/leds-88pm860x.c | 1 + + drivers/leds/leds-adp5520.c | 1 + + drivers/leds/leds-atmel-pwm.c | 1 + + drivers/leds/leds-bd2802.c | 1 + + drivers/leds/leds-da903x.c | 1 + + drivers/leds/leds-dac124s085.c | 1 - + drivers/leds/leds-gpio.c | 1 + + drivers/leds/leds-lp3944.c | 1 + + drivers/leds/leds-lt3593.c | 1 + + drivers/leds/leds-pca9532.c | 1 + + drivers/leds/leds-pca955x.c | 1 + + drivers/leds/leds-pwm.c | 1 + + drivers/leds/leds-regulator.c | 1 + + drivers/leds/leds-s3c24xx.c | 1 + + drivers/leds/leds-sunfire.c | 1 + + drivers/leds/leds-wm831x-status.c | 1 + + drivers/leds/leds-wm8350.c | 1 + + drivers/leds/ledtrig-backlight.c | 1 + + drivers/leds/ledtrig-gpio.c | 1 + + drivers/leds/ledtrig-heartbeat.c | 1 + + drivers/leds/ledtrig-timer.c | 1 + + drivers/lguest/core.c | 1 + + drivers/lguest/lg.h | 1 + + drivers/lguest/lguest_device.c | 1 + + drivers/lguest/lguest_user.c | 1 + + drivers/lguest/page_tables.c | 1 + + drivers/macintosh/mac_hid.c | 1 + + drivers/macintosh/rack-meter.c | 1 + + drivers/macintosh/smu.c | 1 + + drivers/macintosh/therm_pm72.c | 1 - + drivers/macintosh/therm_windtunnel.c | 1 - + drivers/macintosh/via-pmu68k.c | 1 - + drivers/macintosh/windfarm_core.c | 1 + + drivers/md/dm-log-userspace-base.c | 1 + + drivers/md/dm-log-userspace-transfer.c | 1 + + drivers/md/dm-region-hash.c | 1 + + drivers/md/dm-service-time.c | 2 + + drivers/md/dm-target.c | 1 - + drivers/md/faulty.c | 1 + + drivers/md/linear.c | 1 + + drivers/md/md.c | 1 + + drivers/md/multipath.c | 1 + + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 1 + + drivers/md/raid10.c | 1 + + drivers/md/raid5.c | 1 + + drivers/md/raid6algos.c | 1 + + drivers/media/IR/ir-keytable.c | 1 + + drivers/media/IR/ir-sysfs.c | 1 + + drivers/media/common/tuners/max2165.c | 1 + + drivers/media/common/tuners/mc44s803.c | 1 + + drivers/media/common/tuners/mt2060.c | 1 + + drivers/media/common/tuners/mt20xx.c | 1 + + drivers/media/common/tuners/mt2131.c | 1 + + drivers/media/common/tuners/mt2266.c | 1 + + drivers/media/common/tuners/tda827x.c | 1 + + drivers/media/common/tuners/tda8290.c | 1 + + drivers/media/common/tuners/tda9887.c | 1 - + drivers/media/common/tuners/tea5761.c | 1 + + drivers/media/common/tuners/tea5767.c | 1 + + drivers/media/common/tuners/tuner-i2c.h | 1 + + drivers/media/common/tuners/tuner-xc2028.c | 1 + + drivers/media/dvb/bt8xx/dst_ca.c | 1 + + drivers/media/dvb/dm1105/dm1105.c | 1 + + drivers/media/dvb/dvb-core/dmxdev.h | 1 + + drivers/media/dvb/dvb-core/dvb_frontend.h | 1 + + drivers/media/dvb/dvb-usb/af9015.c | 1 + + drivers/media/dvb/dvb-usb/cxusb.c | 1 + + drivers/media/dvb/firewire/firedtv-1394.c | 1 + + drivers/media/dvb/firewire/firedtv-rc.c | 1 + + drivers/media/dvb/frontends/au8522_dig.c | 1 - + drivers/media/dvb/frontends/dib0070.c | 1 + + drivers/media/dvb/frontends/dib0090.c | 1 + + drivers/media/dvb/frontends/dib3000mc.c | 1 + + drivers/media/dvb/frontends/dib7000m.c | 1 + + drivers/media/dvb/frontends/dib7000p.c | 1 + + drivers/media/dvb/frontends/dib8000.c | 1 + + drivers/media/dvb/frontends/drx397xD.c | 1 + + drivers/media/dvb/frontends/dvb-pll.c | 1 + + drivers/media/dvb/frontends/itd1000.c | 1 + + drivers/media/dvb/frontends/lgdt3304.c | 1 + + drivers/media/dvb/frontends/lgdt3305.c | 1 + + drivers/media/dvb/frontends/mb86a16.c | 1 + + drivers/media/dvb/frontends/s921_module.c | 1 + + drivers/media/dvb/frontends/stb0899_drv.c | 1 + + drivers/media/dvb/frontends/stb6000.c | 1 + + drivers/media/dvb/frontends/stb6100.c | 1 + + drivers/media/dvb/frontends/stv090x.c | 1 + + drivers/media/dvb/frontends/stv6110.c | 1 + + drivers/media/dvb/frontends/stv6110x.c | 1 + + drivers/media/dvb/frontends/tda665x.c | 1 + + drivers/media/dvb/frontends/tda8261.c | 1 + + drivers/media/dvb/frontends/tda826x.c | 1 + + drivers/media/dvb/frontends/tua6100.c | 1 + + drivers/media/dvb/frontends/zl10036.c | 1 + + drivers/media/dvb/mantis/hopper_cards.c | 1 + + drivers/media/dvb/mantis/mantis_ca.c | 1 + + drivers/media/dvb/mantis/mantis_cards.c | 1 + + drivers/media/dvb/ngene/ngene-core.c | 1 - + drivers/media/dvb/pluto2/pluto2.c | 1 + + drivers/media/dvb/pt1/pt1.c | 1 + + drivers/media/dvb/siano/smscoreapi.c | 1 + + drivers/media/dvb/siano/smsdvb.c | 1 + + drivers/media/dvb/siano/smssdio.c | 1 + + drivers/media/dvb/siano/smsusb.c | 1 + + drivers/media/dvb/ttpci/av7110.c | 1 + + drivers/media/dvb/ttpci/av7110_ca.c | 1 + + drivers/media/radio/radio-gemtek-pci.c | 1 + + drivers/media/radio/radio-maestro.c | 1 + + drivers/media/radio/radio-maxiradio.c | 1 + + drivers/media/radio/radio-si4713.c | 1 + + drivers/media/radio/radio-tea5764.c | 1 + + drivers/media/radio/radio-timb.c | 1 + + drivers/media/radio/saa7706h.c | 1 + + drivers/media/radio/si470x/radio-si470x-i2c.c | 1 + + drivers/media/radio/si470x/radio-si470x-usb.c | 1 + + drivers/media/radio/si4713-i2c.c | 1 + + drivers/media/radio/tef6862.c | 1 + + drivers/media/video/adv7170.c | 1 + + drivers/media/video/adv7175.c | 1 + + drivers/media/video/adv7180.c | 1 + + drivers/media/video/adv7343.c | 1 + + drivers/media/video/au0828/au0828-core.c | 1 + + drivers/media/video/au0828/au0828-dvb.c | 1 + + drivers/media/video/au0828/au0828-video.c | 1 + + drivers/media/video/bt819.c | 1 + + drivers/media/video/bt856.c | 1 + + drivers/media/video/bt866.c | 1 + + drivers/media/video/bt8xx/bttv-driver.c | 1 + + drivers/media/video/bt8xx/bttv-gpio.c | 1 + + drivers/media/video/bt8xx/bttv-input.c | 1 + + drivers/media/video/bt8xx/bttv-risc.c | 1 + + drivers/media/video/cafe_ccic.c | 1 + + drivers/media/video/cpia_pp.c | 1 + + drivers/media/video/cs5345.c | 1 + + drivers/media/video/cs53l32a.c | 1 + + drivers/media/video/cx18/cx18-alsa-main.c | 1 + + drivers/media/video/cx18/cx18-controls.c | 1 + + drivers/media/video/cx18/cx18-driver.h | 1 + + drivers/media/video/cx231xx/cx231xx-cards.c | 1 + + drivers/media/video/cx231xx/cx231xx-core.c | 1 + + drivers/media/video/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/video/cx231xx/cx231xx-input.c | 1 + + drivers/media/video/cx231xx/cx231xx-vbi.c | 1 + + drivers/media/video/cx231xx/cx231xx-video.c | 1 + + drivers/media/video/cx23885/cx23885-417.c | 1 + + drivers/media/video/cx23885/cx23885-input.c | 1 + + drivers/media/video/cx23885/cx23885-vbi.c | 1 - + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx23885/cx23888-ir.c | 1 + + drivers/media/video/cx88/cx88-alsa.c | 1 + + drivers/media/video/cx88/cx88-blackbird.c | 1 + + drivers/media/video/cx88/cx88-cards.c | 1 + + drivers/media/video/cx88/cx88-dsp.c | 1 + + drivers/media/video/cx88/cx88-input.c | 1 + + drivers/media/video/cx88/cx88-mpeg.c | 1 + + drivers/media/video/cx88/cx88-tvaudio.c | 1 - + drivers/media/video/cx88/cx88-vbi.c | 1 - + drivers/media/video/cx88/cx88-vp3054-i2c.c | 1 + + drivers/media/video/davinci/dm644x_ccdc.c | 1 + + drivers/media/video/davinci/vpfe_capture.c | 1 + + drivers/media/video/davinci/vpif_capture.c | 1 + + drivers/media/video/davinci/vpif_display.c | 1 + + drivers/media/video/em28xx/em28xx-cards.c | 1 + + drivers/media/video/em28xx/em28xx-core.c | 1 + + drivers/media/video/em28xx/em28xx-dvb.c | 1 + + drivers/media/video/em28xx/em28xx-input.c | 1 + + drivers/media/video/em28xx/em28xx-vbi.c | 1 - + drivers/media/video/em28xx/em28xx-video.c | 1 + + drivers/media/video/gspca/gspca.h | 1 + + drivers/media/video/gspca/jeilinj.c | 1 + + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 1 + + drivers/media/video/gspca/sn9c20x.c | 1 + + drivers/media/video/gspca/sonixj.c | 1 + + drivers/media/video/gspca/sq905.c | 1 + + drivers/media/video/gspca/sq905c.c | 1 + + drivers/media/video/gspca/zc3xx.c | 1 + + drivers/media/video/hdpvr/hdpvr-i2c.c | 1 + + drivers/media/video/ivtv/ivtv-controls.c | 1 + + drivers/media/video/ivtv/ivtv-driver.h | 1 + + drivers/media/video/ivtv/ivtvfb.c | 1 + + drivers/media/video/ks0127.c | 1 + + drivers/media/video/m52790.c | 1 + + drivers/media/video/meye.c | 1 + + drivers/media/video/msp3400-kthreads.c | 1 - + drivers/media/video/mt9v011.c | 1 + + drivers/media/video/mx1_camera.c | 1 + + drivers/media/video/omap24xxcam.c | 1 + + drivers/media/video/ov7670.c | 1 + + drivers/media/video/pms.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-dvb.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-eeprom.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-main.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 1 - + drivers/media/video/pvrusb2/pvrusb2-wm8775.c | 1 - + drivers/media/video/pwc/pwc-dec23.c | 1 + + drivers/media/video/pwc/pwc-v4l.c | 1 - + drivers/media/video/pwc/pwc.h | 1 + + drivers/media/video/pxa_camera.c | 1 + + drivers/media/video/s2255drv.c | 1 + + drivers/media/video/saa5246a.c | 1 + + drivers/media/video/saa5249.c | 1 + + drivers/media/video/saa7134/saa7134-dvb.c | 1 - + drivers/media/video/saa7134/saa7134-empress.c | 1 - + drivers/media/video/saa7134/saa7134-i2c.c | 1 - + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134-ts.c | 1 - + drivers/media/video/saa7134/saa7134-tvaudio.c | 1 - + drivers/media/video/saa7134/saa7134-vbi.c | 1 - + drivers/media/video/saa7164/saa7164-api.c | 1 + + drivers/media/video/saa7164/saa7164-buffer.c | 2 + + drivers/media/video/saa7164/saa7164-fw.c | 1 + + drivers/media/video/saa717x.c | 1 + + drivers/media/video/saa7185.c | 1 + + drivers/media/video/sh_mobile_ceu_camera.c | 1 + + drivers/media/video/soc_camera.c | 1 + + drivers/media/video/tda9840.c | 1 + + drivers/media/video/tea6415c.c | 1 + + drivers/media/video/tea6420.c | 1 + + drivers/media/video/ths7303.c | 1 + + drivers/media/video/tlg2300/pd-alsa.c | 2 +- + drivers/media/video/tlg2300/pd-dvb.c | 1 + + drivers/media/video/tlg2300/pd-video.c | 1 + + drivers/media/video/tlv320aic23b.c | 1 + + drivers/media/video/tvp514x.c | 1 + + drivers/media/video/tvp5150.c | 1 + + drivers/media/video/tvp7002.c | 1 + + drivers/media/video/upd64031a.c | 1 + + drivers/media/video/upd64083.c | 1 + + drivers/media/video/usbvideo/konicawc.c | 1 + + drivers/media/video/usbvideo/quickcam_messenger.c | 1 + + drivers/media/video/usbvision/usbvision-core.c | 2 +- + drivers/media/video/usbvision/usbvision-i2c.c | 1 - + drivers/media/video/uvc/uvc_ctrl.c | 1 + + drivers/media/video/uvc/uvc_driver.c | 1 + + drivers/media/video/uvc/uvc_status.c | 1 + + drivers/media/video/uvc/uvc_v4l2.c | 1 + + drivers/media/video/uvc/uvc_video.c | 1 + + drivers/media/video/v4l2-ioctl.c | 1 + + drivers/media/video/videobuf-dma-contig.c | 1 + + drivers/media/video/videobuf-dvb.c | 1 + + drivers/media/video/vino.c | 1 + + drivers/media/video/vp27smpx.c | 1 + + drivers/media/video/vpx3220.c | 1 + + drivers/media/video/w9966.c | 1 + + drivers/media/video/wm8739.c | 1 + + drivers/media/video/wm8775.c | 1 + + drivers/media/video/zoran/zoran_card.c | 1 + + drivers/memstick/core/memstick.c | 1 + + drivers/memstick/core/mspro_block.c | 1 + + drivers/memstick/host/jmb38x_ms.c | 1 + + drivers/message/fusion/mptfc.c | 1 + + drivers/message/fusion/mptlan.c | 1 + + drivers/message/fusion/mptsas.c | 1 + + drivers/message/fusion/mptscsih.c | 1 + + drivers/message/fusion/mptspi.c | 1 + + drivers/message/i2o/i2o_block.c | 1 + + drivers/message/i2o/i2o_config.c | 1 + + drivers/message/i2o/i2o_proc.c | 1 + + drivers/message/i2o/iop.c | 1 + + drivers/message/i2o/pci.c | 1 + + drivers/mfd/88pm860x-i2c.c | 1 + + drivers/mfd/ab3100-core.c | 1 + + drivers/mfd/ab3100-otp.c | 1 + + drivers/mfd/ab4500-core.c | 1 + + drivers/mfd/adp5520.c | 1 + + drivers/mfd/asic3.c | 1 + + drivers/mfd/da903x.c | 1 + + drivers/mfd/ezx-pcap.c | 1 + + drivers/mfd/htc-egpio.c | 1 + + drivers/mfd/htc-i2cpld.c | 1 + + drivers/mfd/htc-pasic3.c | 1 + + drivers/mfd/max8925-i2c.c | 1 + + drivers/mfd/mc13783-core.c | 1 + + drivers/mfd/mcp-sa11x0.c | 1 - + drivers/mfd/menelaus.c | 1 + + drivers/mfd/mfd-core.c | 1 + + drivers/mfd/pcf50633-adc.c | 1 + + drivers/mfd/pcf50633-core.c | 1 + + drivers/mfd/sh_mobile_sdhi.c | 1 + + drivers/mfd/sm501.c | 1 + + drivers/mfd/t7l66xb.c | 1 + + drivers/mfd/tc6387xb.c | 1 + + drivers/mfd/tc6393xb.c | 1 + + drivers/mfd/timberdale.c | 1 + + drivers/mfd/twl4030-codec.c | 1 + + drivers/mfd/twl4030-irq.c | 1 + + drivers/mfd/ucb1400_core.c | 1 + + drivers/mfd/wm831x-core.c | 1 + + drivers/mfd/wm8350-core.c | 1 + + drivers/mfd/wm8350-i2c.c | 1 + + drivers/mfd/wm8400-core.c | 1 + + drivers/mfd/wm8994-core.c | 1 + + drivers/misc/atmel-ssc.c | 1 + + drivers/misc/atmel_pwm.c | 1 + + drivers/misc/atmel_tclib.c | 1 + + drivers/misc/c2port/core.c | 1 + + drivers/misc/cb710/core.c | 2 +- + drivers/misc/cb710/debug.c | 1 - + drivers/misc/cs5535-mfgpt.c | 1 + + drivers/misc/ds1682.c | 1 - + drivers/misc/enclosure.c | 1 + + drivers/misc/ep93xx_pwm.c | 1 + + drivers/misc/hpilo.c | 1 + + drivers/misc/ibmasm/command.c | 1 + + drivers/misc/ibmasm/event.c | 1 + + drivers/misc/ibmasm/ibmasmfs.c | 1 + + drivers/misc/ibmasm/module.c | 1 + + drivers/misc/ics932s401.c | 1 + + drivers/misc/ioc4.c | 1 + + drivers/misc/iwmc3200top/debugfs.c | 1 + + drivers/misc/iwmc3200top/fw-download.c | 1 + + drivers/misc/iwmc3200top/log.c | 1 + + drivers/misc/iwmc3200top/main.c | 1 + + drivers/misc/lkdtm.c | 1 + + drivers/misc/phantom.c | 1 + + drivers/misc/sgi-xp/xpc_main.c | 1 + + drivers/misc/sgi-xp/xpc_partition.c | 1 + + drivers/misc/sgi-xp/xpc_sn2.c | 1 + + drivers/misc/sgi-xp/xpc_uv.c | 1 + + drivers/misc/sgi-xp/xpnet.c | 1 + + drivers/misc/tifm_core.c | 1 + + drivers/mmc/card/block.c | 1 + + drivers/mmc/card/mmc_test.c | 1 + + drivers/mmc/card/queue.c | 1 + + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/mmc/core/bus.c | 1 + + drivers/mmc/core/debugfs.c | 1 + + drivers/mmc/core/host.c | 1 + + drivers/mmc/core/mmc.c | 1 + + drivers/mmc/core/mmc_ops.c | 1 + + drivers/mmc/core/sd.c | 1 + + drivers/mmc/core/sdio_bus.c | 1 + + drivers/mmc/core/sdio_cis.c | 1 + + drivers/mmc/host/at91_mci.c | 1 + + drivers/mmc/host/atmel-mci.c | 1 + + drivers/mmc/host/au1xmmc.c | 1 + + drivers/mmc/host/bfin_sdh.c | 1 + + drivers/mmc/host/cb710-mmc.c | 1 - + drivers/mmc/host/mmc_spi.c | 1 + + drivers/mmc/host/msm_sdcc.c | 1 + + drivers/mmc/host/of_mmc_spi.c | 1 + + drivers/mmc/host/omap.c | 1 + + drivers/mmc/host/pxamci.c | 1 + + drivers/mmc/host/sdhci-pci.c | 1 + + drivers/mmc/host/sdhci-s3c.c | 1 + + drivers/mmc/host/sdhci.c | 1 + + drivers/mmc/host/wbsd.c | 1 + + drivers/mtd/devices/block2mtd.c | 1 + + drivers/mtd/devices/m25p80.c | 1 + + drivers/mtd/devices/sst25l.c | 1 + + drivers/mtd/lpddr/lpddr_cmds.c | 1 + + drivers/mtd/maps/amd76xrom.c | 1 + + drivers/mtd/maps/bfin-async-flash.c | 1 + + drivers/mtd/maps/ck804xrom.c | 1 + + drivers/mtd/maps/esb2rom.c | 1 + + drivers/mtd/maps/gpio-addr-flash.c | 1 + + drivers/mtd/maps/ichxrom.c | 1 + + drivers/mtd/maps/intel_vr_nor.c | 1 + + drivers/mtd/maps/octagon-5066.c | 1 - + drivers/mtd/maps/physmap_of.c | 1 + + drivers/mtd/maps/pismo.c | 1 + + drivers/mtd/maps/pmcmsp-flash.c | 1 + + drivers/mtd/maps/pxa2xx-flash.c | 1 + + drivers/mtd/maps/sbc_gxx.c | 1 - + drivers/mtd/maps/sun_uflash.c | 1 + + drivers/mtd/maps/vmax301.c | 1 - + drivers/mtd/maps/vmu-flash.c | 1 + + drivers/mtd/mtdcore.c | 1 - + drivers/mtd/nand/bcm_umi_nand.c | 1 + + drivers/mtd/nand/cafe_nand.c | 1 + + drivers/mtd/nand/cmx270_nand.c | 1 + + drivers/mtd/nand/davinci_nand.c | 1 + + drivers/mtd/nand/diskonchip.c | 1 + + drivers/mtd/nand/fsl_upm.c | 1 + + drivers/mtd/nand/ndfc.c | 1 + + drivers/mtd/nand/nomadik_nand.c | 1 + + drivers/mtd/nand/omap2.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 1 + + drivers/mtd/nand/sh_flctl.c | 1 + + drivers/mtd/nand/tmio_nand.c | 1 + + drivers/mtd/ofpart.c | 1 + + drivers/mtd/onenand/omap2.c | 1 + + drivers/mtd/onenand/onenand_base.c | 1 + + drivers/mtd/onenand/onenand_sim.c | 1 + + drivers/mtd/tests/mtd_nandecctest.c | 1 - + drivers/mtd/tests/mtd_oobtest.c | 1 + + drivers/mtd/tests/mtd_pagetest.c | 1 + + drivers/mtd/tests/mtd_readtest.c | 1 + + drivers/mtd/tests/mtd_speedtest.c | 1 + + drivers/mtd/tests/mtd_stresstest.c | 1 + + drivers/mtd/tests/mtd_subpagetest.c | 1 + + drivers/mtd/tests/mtd_torturetest.c | 1 + + drivers/mtd/ubi/build.c | 1 + + drivers/mtd/ubi/cdev.c | 1 + + drivers/mtd/ubi/gluebi.c | 1 + + drivers/mtd/ubi/io.c | 1 + + drivers/mtd/ubi/kapi.c | 1 + + drivers/mtd/ubi/scan.c | 1 + + drivers/mtd/ubi/ubi.h | 1 + + drivers/mtd/ubi/vmt.c | 1 + + drivers/mtd/ubi/vtbl.c | 1 + + drivers/net/3c501.c | 1 - + drivers/net/3c505.c | 2 +- + drivers/net/3c507.c | 1 - + drivers/net/3c509.c | 1 - + drivers/net/3c515.c | 1 - + drivers/net/3c523.c | 1 - + drivers/net/3c59x.c | 2 +- + drivers/net/7990.c | 1 - + drivers/net/8139cp.c | 1 + + drivers/net/8139too.c | 1 + + drivers/net/82596.c | 2 +- + drivers/net/a2065.c | 1 - + drivers/net/acenic.c | 1 + + drivers/net/amd8111e.c | 1 - + drivers/net/appletalk/cops.c | 1 - + drivers/net/appletalk/ipddp.c | 1 + + drivers/net/appletalk/ltpc.c | 2 +- + drivers/net/arcnet/arc-rawmode.c | 1 + + drivers/net/arcnet/arc-rimi.c | 1 - + drivers/net/arcnet/capmode.c | 1 + + drivers/net/arcnet/com20020-isa.c | 1 - + drivers/net/arcnet/com20020-pci.c | 1 - + drivers/net/arcnet/com20020.c | 1 - + drivers/net/arcnet/com90io.c | 1 - + drivers/net/arcnet/com90xx.c | 1 + + drivers/net/arcnet/rfc1051.c | 1 + + drivers/net/arcnet/rfc1201.c | 1 + + drivers/net/ariadne.c | 1 - + drivers/net/arm/at91_ether.c | 1 + + drivers/net/arm/ep93xx_eth.c | 1 + + drivers/net/arm/etherh.c | 1 - + drivers/net/arm/ixp4xx_eth.c | 1 + + drivers/net/arm/ks8695net.c | 1 + + drivers/net/arm/w90p910_ether.c | 1 + + drivers/net/at1700.c | 1 - + drivers/net/atarilance.c | 1 - + drivers/net/atl1c/atl1c_ethtool.c | 1 + + drivers/net/atl1e/atl1e_ethtool.c | 1 + + drivers/net/atlx/atl2.c | 1 + + drivers/net/atp.c | 1 - + drivers/net/ax88796.c | 1 + + drivers/net/b44.c | 1 + + drivers/net/bcm63xx_enet.c | 1 + + drivers/net/benet/be.h | 1 + + drivers/net/bmac.c | 1 + + drivers/net/can/dev.c | 1 + + drivers/net/can/mcp251x.c | 1 + + drivers/net/can/sja1000/ems_pci.c | 1 + + drivers/net/can/sja1000/plx_pci.c | 1 + + drivers/net/can/vcan.c | 1 + + drivers/net/chelsio/common.h | 1 + + drivers/net/chelsio/pm3393.c | 1 + + drivers/net/chelsio/sge.c | 1 + + drivers/net/cris/eth_v10.c | 1 - + drivers/net/cs89x0.c | 2 +- + drivers/net/cxgb3/cxgb3_main.c | 1 + + drivers/net/cxgb3/cxgb3_offload.c | 1 + + drivers/net/cxgb3/l2t.c | 1 + + drivers/net/cxgb3/sge.c | 1 + + drivers/net/dm9000.c | 1 + + drivers/net/e1000e/ethtool.c | 1 + + drivers/net/e1000e/netdev.c | 1 + + drivers/net/eepro.c | 1 - + drivers/net/eexpress.c | 1 - + drivers/net/ehea/ehea_main.c | 1 + + drivers/net/ehea/ehea_qmr.c | 1 + + drivers/net/enc28j60.c | 1 - + drivers/net/enic/vnic_dev.c | 1 + + drivers/net/enic/vnic_rq.c | 1 + + drivers/net/enic/vnic_wq.c | 1 + + drivers/net/epic100.c | 1 - + drivers/net/eql.c | 1 + + drivers/net/eth16i.c | 1 - + drivers/net/ethoc.c | 1 + + drivers/net/fealnx.c | 1 - + drivers/net/fec_mpc52xx.c | 1 + + drivers/net/fec_mpc52xx_phy.c | 1 + + drivers/net/forcedeth.c | 1 + + drivers/net/fs_enet/mac-fcc.c | 2 +- + drivers/net/fs_enet/mac-fec.c | 2 +- + drivers/net/fs_enet/mac-scc.c | 1 - + drivers/net/gianfar_ethtool.c | 1 - + drivers/net/gianfar_sysfs.c | 1 - + drivers/net/greth.c | 1 + + drivers/net/hamachi.c | 1 - + drivers/net/hamradio/6pack.c | 1 + + drivers/net/hamradio/bpqether.c | 1 + + drivers/net/hamradio/dmascc.c | 1 + + drivers/net/hamradio/hdlcdrv.c | 1 - + drivers/net/hamradio/mkiss.c | 1 + + drivers/net/hamradio/scc.c | 1 - + drivers/net/hp100.c | 1 - + drivers/net/hplance.c | 1 - + drivers/net/hydra.c | 1 - + drivers/net/ibm_newemac/core.c | 1 + + drivers/net/ibm_newemac/core.h | 1 + + drivers/net/ibm_newemac/mal.c | 1 + + drivers/net/ibm_newemac/rgmii.c | 1 + + drivers/net/ibm_newemac/zmii.c | 1 + + drivers/net/ibmlana.c | 1 - + drivers/net/ibmveth.c | 1 + + drivers/net/igb/e1000_82575.c | 1 - + drivers/net/igb/igb_ethtool.c | 1 + + drivers/net/igb/igb_main.c | 1 + + drivers/net/igbvf/netdev.c | 1 + + drivers/net/ioc3-eth.c | 1 + + drivers/net/ipg.c | 1 + + drivers/net/irda/ali-ircc.c | 2 +- + drivers/net/irda/bfin_sir.h | 1 + + drivers/net/irda/irtty-sir.c | 1 + + drivers/net/irda/nsc-ircc.c | 2 +- + drivers/net/irda/pxaficp_ir.c | 1 + + drivers/net/irda/sh_sir.c | 1 + + drivers/net/irda/sir_dev.c | 1 + + drivers/net/irda/smsc-ircc2.c | 2 +- + drivers/net/irda/via-ircc.c | 2 +- + drivers/net/irda/w83977af_ir.c | 2 +- + drivers/net/iseries_veth.c | 1 + + drivers/net/ixgbe/ixgbe_ethtool.c | 1 + + drivers/net/ixgbe/ixgbe_fcoe.c | 1 + + drivers/net/ixgbe/ixgbe_main.c | 1 + + drivers/net/ixgbevf/ethtool.c | 1 + + drivers/net/ixgbevf/ixgbevf_main.c | 1 + + drivers/net/ixp2000/ixpdev.c | 1 + + drivers/net/jazzsonic.c | 3 +- + drivers/net/jme.c | 1 + + drivers/net/ks8851_mll.c | 1 + + drivers/net/ksz884x.c | 1 + + drivers/net/lasi_82596.c | 1 - + drivers/net/lib82596.c | 2 +- + drivers/net/ll_temac_main.c | 1 + + drivers/net/ll_temac_mdio.c | 1 + + drivers/net/mac8390.c | 1 - + drivers/net/mac89x0.c | 2 +- + drivers/net/mace.c | 1 + + drivers/net/macmace.c | 1 + + drivers/net/macsonic.c | 3 +- + drivers/net/macvtap.c | 1 + + drivers/net/mlx4/cmd.c | 1 + + drivers/net/mlx4/cq.c | 1 + + drivers/net/mlx4/en_main.c | 1 + + drivers/net/mlx4/en_netdev.c | 1 + + drivers/net/mlx4/en_resources.c | 1 + + drivers/net/mlx4/en_rx.c | 1 + + drivers/net/mlx4/en_tx.c | 1 + + drivers/net/mlx4/eq.c | 1 + + drivers/net/mlx4/icm.c | 1 + + drivers/net/mlx4/intf.c | 2 + + drivers/net/mlx4/main.c | 1 + + drivers/net/mlx4/mcg.c | 1 - + drivers/net/mlx4/mr.c | 1 + + drivers/net/mlx4/profile.c | 2 + + drivers/net/mlx4/qp.c | 1 + + drivers/net/mlx4/srq.c | 1 + + drivers/net/mv643xx_eth.c | 1 + + drivers/net/mvme147.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 1 + + drivers/net/myri_sbus.c | 2 +- + drivers/net/ne2.c | 1 - + drivers/net/netconsole.c | 1 + + drivers/net/netxen/netxen_nic_hw.c | 1 + + drivers/net/netxen/netxen_nic_init.c | 1 + + drivers/net/netxen/netxen_nic_main.c | 1 + + drivers/net/ni5010.c | 1 - + drivers/net/ni52.c | 1 - + drivers/net/niu.c | 1 + + drivers/net/ns83820.c | 1 + + drivers/net/octeon/octeon_mgmt.c | 1 + + drivers/net/pasemi_mac.c | 1 + + drivers/net/pcmcia/axnet_cs.c | 1 - + drivers/net/pcmcia/pcnet_cs.c | 1 - + drivers/net/phy/cicada.c | 1 - + drivers/net/phy/davicom.c | 1 - + drivers/net/phy/et1011c.c | 1 - + drivers/net/phy/fixed.c | 1 + + drivers/net/phy/icplus.c | 1 - + drivers/net/phy/lxt.c | 1 - + drivers/net/phy/marvell.c | 1 - + drivers/net/phy/mdio-bitbang.c | 1 - + drivers/net/phy/mdio-octeon.c | 1 + + drivers/net/phy/phy.c | 1 - + drivers/net/phy/qsemi.c | 1 - + drivers/net/plip.c | 1 + + drivers/net/ppp_async.c | 1 + + drivers/net/ppp_generic.c | 1 + + drivers/net/ppp_synctty.c | 1 + + drivers/net/pppox.c | 1 - + drivers/net/ps3_gelic_net.c | 1 + + drivers/net/ps3_gelic_wireless.c | 1 + + drivers/net/qlcnic/qlcnic_hw.c | 1 + + drivers/net/qlcnic/qlcnic_init.c | 1 + + drivers/net/qlcnic/qlcnic_main.c | 1 + + drivers/net/qlge/qlge_dbg.c | 2 + + drivers/net/qlge/qlge_ethtool.c | 1 - + drivers/net/r6040.c | 1 - + drivers/net/rionet.c | 1 + + drivers/net/rrunner.c | 1 + + drivers/net/s2io.c | 1 + + drivers/net/sb1000.c | 2 +- + drivers/net/seeq8005.c | 1 - + drivers/net/sfc/efx.c | 1 + + drivers/net/sfc/falcon.c | 1 + + drivers/net/sfc/mcdi_phy.c | 1 + + drivers/net/sfc/mtd.c | 1 + + drivers/net/sfc/qt202x_phy.c | 1 + + drivers/net/sfc/rx.c | 1 + + drivers/net/sfc/selftest.c | 1 + + drivers/net/sfc/siena.c | 1 + + drivers/net/sfc/tenxpress.c | 1 + + drivers/net/sfc/tx.c | 1 + + drivers/net/sgiseeq.c | 1 + + drivers/net/sh_eth.c | 1 + + drivers/net/sis190.c | 1 + + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/skge.c | 1 + + drivers/net/sky2.c | 1 + + drivers/net/slhc.c | 1 + + drivers/net/slip.c | 1 + + drivers/net/smc911x.c | 1 - + drivers/net/smc9194.c | 1 - + drivers/net/smc91x.c | 1 - + drivers/net/smsc911x.c | 1 - + drivers/net/smsc9420.c | 1 + + drivers/net/sni_82596.c | 1 - + drivers/net/spider_net.c | 2 +- + drivers/net/stmmac/dwmac100.c | 1 + + drivers/net/stmmac/dwmac1000_core.c | 1 + + drivers/net/stmmac/stmmac_main.c | 1 + + drivers/net/stmmac/stmmac_mdio.c | 1 + + drivers/net/sun3_82586.c | 1 - + drivers/net/sun3lance.c | 1 - + drivers/net/sunbmac.c | 2 +- + drivers/net/sundance.c | 1 - + drivers/net/sungem.c | 2 +- + drivers/net/sunlance.c | 2 +- + drivers/net/tehuti.h | 1 + + drivers/net/tokenring/3c359.c | 1 + + drivers/net/tokenring/lanstreamer.c | 1 + + drivers/net/tokenring/madgemc.c | 1 + + drivers/net/tokenring/smctr.c | 1 - + drivers/net/tokenring/tms380tr.c | 1 - + drivers/net/tsi108_eth.c | 2 +- + drivers/net/tulip/de2104x.c | 1 + + drivers/net/tulip/de4x5.c | 2 +- + drivers/net/tulip/dmfe.c | 1 - + drivers/net/tulip/eeprom.c | 1 + + drivers/net/tulip/tulip_core.c | 1 + + drivers/net/tulip/uli526x.c | 1 - + drivers/net/tulip/winbond-840.c | 1 - + drivers/net/typhoon.c | 1 - + drivers/net/ucc_geth_ethtool.c | 1 - + drivers/net/usb/asix.c | 1 + + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/cdc-phonet.c | 1 + + drivers/net/usb/cdc_eem.c | 1 + + drivers/net/usb/dm9601.c | 1 + + drivers/net/usb/gl620a.c | 1 + + drivers/net/usb/int51x1.c | 1 + + drivers/net/usb/mcs7830.c | 1 + + drivers/net/usb/net1080.c | 1 + + drivers/net/usb/rndis_host.c | 1 + + drivers/net/usb/smsc75xx.c | 1 + + drivers/net/usb/smsc95xx.c | 1 + + drivers/net/usb/usbnet.c | 1 + + drivers/net/veth.c | 1 + + drivers/net/via-rhine.c | 1 - + drivers/net/virtio_net.c | 1 + + drivers/net/vxge/vxge-config.c | 1 + + drivers/net/vxge/vxge-config.h | 1 + + drivers/net/vxge/vxge-ethtool.c | 1 + + drivers/net/vxge/vxge-main.c | 1 + + drivers/net/wan/dscc4.c | 1 + + drivers/net/wan/farsync.c | 1 + + drivers/net/wan/hd64570.c | 1 - + drivers/net/wan/hd64572.c | 1 - + drivers/net/wan/hdlc_cisco.c | 1 - + drivers/net/wan/hdlc_raw.c | 1 - + drivers/net/wan/hdlc_raw_eth.c | 2 +- + drivers/net/wan/hdlc_x25.c | 2 +- + drivers/net/wan/hostess_sv11.c | 1 + + drivers/net/wan/ixp4xx_hss.c | 1 + + drivers/net/wan/lapbether.c | 1 + + drivers/net/wan/lmc/lmc_media.c | 1 - + drivers/net/wan/lmc/lmc_proto.c | 1 - + drivers/net/wan/pc300_drv.c | 1 + + drivers/net/wan/sbni.c | 1 - + drivers/net/wan/sealevel.c | 1 + + drivers/net/wan/x25_asy.c | 1 + + drivers/net/wan/z85230.c | 1 + + drivers/net/wimax/i2400m/control.c | 1 + + drivers/net/wimax/i2400m/driver.c | 1 + + drivers/net/wimax/i2400m/fw.c | 1 + + drivers/net/wimax/i2400m/netdev.c | 1 + + drivers/net/wimax/i2400m/op-rfkill.c | 1 + + drivers/net/wimax/i2400m/rx.c | 1 + + drivers/net/wimax/i2400m/sdio-rx.c | 1 + + drivers/net/wimax/i2400m/sdio.c | 1 + + drivers/net/wimax/i2400m/tx.c | 1 + + drivers/net/wimax/i2400m/usb-fw.c | 1 + + drivers/net/wimax/i2400m/usb-notif.c | 1 + + drivers/net/wimax/i2400m/usb-rx.c | 1 + + drivers/net/wimax/i2400m/usb.c | 1 + + drivers/net/wireless/adm8211.c | 1 + + drivers/net/wireless/ath/ar9170/main.c | 1 + + drivers/net/wireless/ath/ar9170/usb.c | 1 + + drivers/net/wireless/ath/ath5k/attach.c | 1 + + drivers/net/wireless/ath/ath5k/base.c | 1 + + drivers/net/wireless/ath/ath5k/eeprom.c | 2 + + drivers/net/wireless/ath/ath5k/phy.c | 1 + + drivers/net/wireless/ath/ath9k/debug.c | 1 + + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/ath9k/phy.c | 2 + + drivers/net/wireless/ath/ath9k/rc.c | 2 + + drivers/net/wireless/ath/ath9k/virtual.c | 2 + + drivers/net/wireless/ath/regd.c | 1 - + drivers/net/wireless/b43/dma.c | 1 + + drivers/net/wireless/b43/lo.c | 1 + + drivers/net/wireless/b43/main.c | 1 + + drivers/net/wireless/b43/pcmcia.c | 1 + + drivers/net/wireless/b43/phy_a.c | 2 + + drivers/net/wireless/b43/phy_g.c | 1 + + drivers/net/wireless/b43/phy_lp.c | 2 + + drivers/net/wireless/b43/phy_n.c | 1 + + drivers/net/wireless/b43/pio.c | 1 + + drivers/net/wireless/b43/sdio.c | 1 + + drivers/net/wireless/b43legacy/dma.c | 1 + + drivers/net/wireless/b43legacy/main.c | 1 + + drivers/net/wireless/b43legacy/phy.c | 1 + + drivers/net/wireless/b43legacy/pio.c | 1 + + drivers/net/wireless/hostap/hostap_80211_rx.c | 1 + + drivers/net/wireless/hostap/hostap_80211_tx.c | 2 + + drivers/net/wireless/hostap/hostap_ap.c | 1 + + drivers/net/wireless/hostap/hostap_cs.c | 1 + + drivers/net/wireless/hostap/hostap_info.c | 1 + + drivers/net/wireless/hostap/hostap_ioctl.c | 1 + + drivers/net/wireless/hostap/hostap_pci.c | 1 + + drivers/net/wireless/hostap/hostap_plx.c | 1 + + drivers/net/wireless/ipw2x00/ipw2200.c | 1 + + drivers/net/wireless/ipw2x00/libipw_geo.c | 1 - + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +- + drivers/net/wireless/ipw2x00/libipw_wx.c | 1 + + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 1 + + drivers/net/wireless/iwlwifi/iwl-3945.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 1 + + drivers/net/wireless/iwlwifi/iwl-calib.c | 1 + + drivers/net/wireless/iwlwifi/iwl-core.c | 1 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1 + + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 1 - + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 1 + + drivers/net/wireless/iwlwifi/iwl-io.h | 1 + + drivers/net/wireless/iwlwifi/iwl-power.c | 1 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 1 + + drivers/net/wireless/iwlwifi/iwl-scan.c | 1 + + drivers/net/wireless/iwlwifi/iwl-tx.c | 1 + + drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 + + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 1 + + drivers/net/wireless/iwmc3200wifi/commands.c | 1 + + drivers/net/wireless/iwmc3200wifi/debugfs.c | 1 + + drivers/net/wireless/iwmc3200wifi/eeprom.c | 1 + + drivers/net/wireless/iwmc3200wifi/hal.c | 1 + + drivers/net/wireless/iwmc3200wifi/main.c | 1 + + drivers/net/wireless/iwmc3200wifi/netdev.c | 1 + + drivers/net/wireless/iwmc3200wifi/rx.c | 1 + + drivers/net/wireless/iwmc3200wifi/sdio.c | 1 + + drivers/net/wireless/iwmc3200wifi/tx.c | 1 + + drivers/net/wireless/libertas/assoc.c | 1 + + drivers/net/wireless/libertas/cfg.c | 1 + + drivers/net/wireless/libertas/cmd.c | 1 + + drivers/net/wireless/libertas/cmdresp.c | 1 + + drivers/net/wireless/libertas/debugfs.c | 1 + + drivers/net/wireless/libertas/if_cs.c | 1 + + drivers/net/wireless/libertas/if_sdio.c | 1 + + drivers/net/wireless/libertas/if_spi.c | 1 + + drivers/net/wireless/libertas/if_usb.c | 1 + + drivers/net/wireless/libertas/main.c | 1 + + drivers/net/wireless/libertas/rx.c | 1 + + drivers/net/wireless/libertas/scan.c | 1 + + drivers/net/wireless/libertas/wext.c | 1 + + drivers/net/wireless/libertas_tf/cmd.c | 2 + + drivers/net/wireless/libertas_tf/if_usb.c | 1 + + drivers/net/wireless/libertas_tf/main.c | 2 + + drivers/net/wireless/mac80211_hwsim.c | 1 + + drivers/net/wireless/mwl8k.c | 1 + + drivers/net/wireless/orinoco/fw.c | 1 + + drivers/net/wireless/orinoco/main.c | 1 + + drivers/net/wireless/orinoco/scan.c | 1 + + drivers/net/wireless/orinoco/wext.c | 1 + + drivers/net/wireless/p54/eeprom.c | 1 + + drivers/net/wireless/p54/fwio.c | 1 + + drivers/net/wireless/p54/main.c | 1 + + drivers/net/wireless/p54/p54pci.c | 1 + + drivers/net/wireless/p54/p54spi.c | 1 + + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/prism54/isl_ioctl.c | 1 + + drivers/net/wireless/prism54/islpci_dev.c | 1 + + drivers/net/wireless/prism54/islpci_eth.c | 1 + + drivers/net/wireless/prism54/islpci_mgt.c | 1 + + drivers/net/wireless/prism54/islpci_mgt.h | 1 + + drivers/net/wireless/prism54/oid_mgt.c | 1 + + drivers/net/wireless/ray_cs.c | 1 - + drivers/net/wireless/rndis_wlan.c | 1 + + drivers/net/wireless/rt2x00/rt2400pci.c | 1 + + drivers/net/wireless/rt2x00/rt2500pci.c | 1 + + drivers/net/wireless/rt2x00/rt2500usb.c | 1 + + drivers/net/wireless/rt2x00/rt2800lib.c | 1 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 1 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 1 + + drivers/net/wireless/rt2x00/rt2x00pci.c | 1 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 1 + + drivers/net/wireless/rt2x00/rt2x00soc.c | 1 + + drivers/net/wireless/rt2x00/rt2x00usb.c | 1 + + drivers/net/wireless/rt2x00/rt61pci.c | 1 + + drivers/net/wireless/rt2x00/rt73usb.c | 1 + + drivers/net/wireless/rtl818x/rtl8180_dev.c | 1 + + drivers/net/wireless/rtl818x/rtl8187_dev.c | 1 + + drivers/net/wireless/wl12xx/wl1251_acx.c | 1 + + drivers/net/wireless/wl12xx/wl1251_boot.c | 1 + + drivers/net/wireless/wl12xx/wl1251_cmd.c | 1 + + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 1 + + drivers/net/wireless/wl12xx/wl1251_init.c | 1 + + drivers/net/wireless/wl12xx/wl1251_main.c | 1 + + drivers/net/wireless/wl12xx/wl1251_rx.c | 1 + + drivers/net/wireless/wl12xx/wl1251_spi.c | 1 + + drivers/net/wireless/wl12xx/wl1271_acx.c | 1 + + drivers/net/wireless/wl12xx/wl1271_boot.c | 1 + + drivers/net/wireless/wl12xx/wl1271_cmd.c | 1 + + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 1 + + drivers/net/wireless/wl12xx/wl1271_init.c | 1 + + drivers/net/wireless/wl12xx/wl1271_main.c | 1 + + drivers/net/wireless/wl12xx/wl1271_rx.c | 2 + + drivers/net/wireless/wl12xx/wl1271_spi.c | 1 + + drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 + + drivers/net/wireless/zd1201.c | 1 + + drivers/net/wireless/zd1211rw/zd_chip.c | 1 + + drivers/net/wireless/zd1211rw/zd_mac.c | 1 + + drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 1 + + drivers/net/wireless/zd1211rw/zd_usb.c | 1 + + drivers/net/xen-netfront.c | 1 + + drivers/net/xilinx_emaclite.c | 1 + + drivers/net/xtsonic.c | 3 +- + drivers/net/yellowfin.c | 1 - + drivers/net/znet.c | 1 + + drivers/nubus/nubus.c | 1 + + drivers/of/base.c | 1 + + drivers/of/gpio.c | 1 + + drivers/oprofile/buffer_sync.c | 1 + + drivers/parisc/asp.c | 1 - + drivers/parisc/ccio-rm-dma.c | 1 + + drivers/parisc/gsc.c | 1 - + drivers/parport/daisy.c | 1 + + drivers/parport/parport_ax88796.c | 1 + + drivers/parport/parport_ip32.c | 1 + + drivers/parport/parport_serial.c | 1 + + drivers/parport/probe.c | 1 + + drivers/pci/access.c | 1 + + drivers/pci/bus.c | 1 + + drivers/pci/dmar.c | 1 + + drivers/pci/hotplug/acpi_pcihp.c | 1 + + drivers/pci/hotplug/acpiphp_glue.c | 1 + + drivers/pci/hotplug/acpiphp_ibm.c | 1 + + drivers/pci/hotplug/cpqphp_sysfs.c | 1 + + drivers/pci/hotplug/fakephp.c | 1 + + drivers/pci/hotplug/pci_hotplug_core.c | 1 - + drivers/pci/hotplug/pciehp_acpi.c | 1 + + drivers/pci/hotplug/pciehp_core.c | 1 + + drivers/pci/hotplug/pciehp_ctrl.c | 1 + + drivers/pci/hotplug/pciehp_hpc.c | 1 + + drivers/pci/hotplug/rpaphp_core.c | 1 - + drivers/pci/hotplug/sgi_hotplug.c | 1 + + drivers/pci/hotplug/shpchp_core.c | 1 + + drivers/pci/hotplug/shpchp_ctrl.c | 1 + + drivers/pci/htirq.c | 1 - + drivers/pci/intr_remapping.c | 1 + + drivers/pci/ioapic.c | 1 + + drivers/pci/iov.c | 1 + + drivers/pci/msi.c | 1 + + drivers/pci/pci-sysfs.c | 1 + + drivers/pci/pci.c | 1 + + drivers/pci/pcie/aer/aer_inject.c | 1 + + drivers/pci/pcie/aer/aerdrv.c | 1 + + drivers/pci/pcie/aer/aerdrv_core.c | 1 + + drivers/pci/pcie/pme/pcie_pme.c | 1 + + drivers/pci/pcie/portdrv_pci.c | 1 - + drivers/pci/proc.c | 1 + + drivers/pci/search.c | 1 + + drivers/pci/slot.c | 1 + + drivers/pcmcia/at91_cf.c | 1 + + drivers/pcmcia/au1000_generic.c | 1 + + drivers/pcmcia/bcm63xx_pcmcia.c | 1 + + drivers/pcmcia/bfin_cf_pcmcia.c | 1 + + drivers/pcmcia/db1xxx_ss.c | 1 + + drivers/pcmcia/ds.c | 1 + + drivers/pcmcia/electra_cf.c | 1 + + drivers/pcmcia/i82365.c | 1 - + drivers/pcmcia/m32r_cfc.c | 1 - + drivers/pcmcia/m32r_pcc.c | 1 - + drivers/pcmcia/m8xx_pcmcia.c | 1 - + drivers/pcmcia/omap_cf.c | 1 + + drivers/pcmcia/pcmcia_ioctl.c | 1 + + drivers/pcmcia/pcmcia_resource.c | 1 + + drivers/pcmcia/pd6729.c | 1 + + drivers/pcmcia/pxa2xx_base.c | 1 + + drivers/pcmcia/rsrc_mgr.c | 1 + + drivers/pcmcia/sa1100_generic.c | 1 + + drivers/pcmcia/sa1111_generic.c | 1 + + drivers/pcmcia/sa11xx_base.c | 1 + + drivers/pcmcia/socket_sysfs.c | 1 - + drivers/pcmcia/tcic.c | 1 - + drivers/pcmcia/xxs1500_ss.c | 1 + + drivers/pcmcia/yenta_socket.c | 1 + + drivers/platform/x86/acer-wmi.c | 1 + + drivers/platform/x86/asus-laptop.c | 1 + + drivers/platform/x86/asus_acpi.c | 1 + + drivers/platform/x86/classmate-laptop.c | 1 + + drivers/platform/x86/dell-laptop.c | 1 + + drivers/platform/x86/dell-wmi.c | 1 + + drivers/platform/x86/eeepc-laptop.c | 1 + + drivers/platform/x86/fujitsu-laptop.c | 1 + + drivers/platform/x86/hp-wmi.c | 1 + + drivers/platform/x86/intel_menlow.c | 1 + + drivers/platform/x86/msi-wmi.c | 1 + + drivers/platform/x86/panasonic-laptop.c | 1 + + drivers/platform/x86/sony-laptop.c | 1 + + drivers/platform/x86/tc1100-wmi.c | 1 + + drivers/platform/x86/thinkpad_acpi.c | 1 + + drivers/platform/x86/topstar-laptop.c | 1 + + drivers/platform/x86/toshiba_acpi.c | 1 + + drivers/platform/x86/wmi.c | 1 + + drivers/pnp/isapnp/core.c | 1 - + drivers/pnp/manager.c | 1 - + drivers/pnp/pnpacpi/core.c | 1 + + drivers/pnp/pnpacpi/rsparser.c | 1 + + drivers/pnp/pnpbios/bioscalls.c | 1 - + drivers/pnp/pnpbios/rsparser.c | 1 - + drivers/pnp/resource.c | 1 + + drivers/power/bq27x00_battery.c | 1 + + drivers/power/da9030_battery.c | 1 + + drivers/power/ds2760_battery.c | 1 + + drivers/power/ds2782_battery.c | 1 + + drivers/power/max17040_battery.c | 1 + + drivers/power/max8925_power.c | 1 + + drivers/power/pcf50633-charger.c | 1 + + drivers/power/pmu_battery.c | 1 + + drivers/power/power_supply_leds.c | 1 + + drivers/power/power_supply_sysfs.c | 1 + + drivers/power/wm831x_backup.c | 1 + + drivers/power/wm831x_power.c | 1 + + drivers/power/wm97xx_battery.c | 1 + + drivers/pps/kapi.c | 1 + + drivers/ps3/ps3-lpm.c | 1 + + drivers/ps3/ps3-vuart.c | 1 + + drivers/ps3/ps3av.c | 1 + + drivers/regulator/core.c | 1 + + drivers/regulator/fixed.c | 1 + + drivers/regulator/lp3971.c | 1 + + drivers/regulator/max1586.c | 1 + + drivers/regulator/max8649.c | 1 + + drivers/regulator/max8660.c | 1 + + drivers/regulator/mc13783-regulator.c | 1 + + drivers/regulator/tps65023-regulator.c | 1 + + drivers/regulator/tps6507x-regulator.c | 1 + + drivers/regulator/userspace-consumer.c | 1 + + drivers/regulator/virtual.c | 1 + + drivers/regulator/wm831x-dcdc.c | 1 + + drivers/regulator/wm831x-isink.c | 1 + + drivers/regulator/wm831x-ldo.c | 1 + + drivers/regulator/wm8994-regulator.c | 1 + + drivers/rtc/class.c | 1 + + drivers/rtc/rtc-at32ap700x.c | 1 + + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-bfin.c | 1 + + drivers/rtc/rtc-bq4802.c | 1 + + drivers/rtc/rtc-coh901331.c | 1 + + drivers/rtc/rtc-ds1216.c | 1 + + drivers/rtc/rtc-ds1286.c | 1 + + drivers/rtc/rtc-ds1305.c | 1 + + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-ds1390.c | 1 + + drivers/rtc/rtc-ds1511.c | 1 + + drivers/rtc/rtc-ds1553.c | 1 + + drivers/rtc/rtc-ds1742.c | 1 + + drivers/rtc/rtc-ep93xx.c | 1 + + drivers/rtc/rtc-fm3130.c | 1 + + drivers/rtc/rtc-m48t35.c | 1 + + drivers/rtc/rtc-m48t59.c | 1 + + drivers/rtc/rtc-max8925.c | 1 + + drivers/rtc/rtc-mc13783.c | 1 + + drivers/rtc/rtc-mpc5121.c | 1 + + drivers/rtc/rtc-msm6242.c | 1 + + drivers/rtc/rtc-mv.c | 1 + + drivers/rtc/rtc-mxc.c | 1 + + drivers/rtc/rtc-nuc900.c | 1 + + drivers/rtc/rtc-pcap.c | 1 + + drivers/rtc/rtc-pcf2123.c | 1 + + drivers/rtc/rtc-pcf50633.c | 1 + + drivers/rtc/rtc-pcf8563.c | 1 + + drivers/rtc/rtc-pl030.c | 1 + + drivers/rtc/rtc-pl031.c | 1 + + drivers/rtc/rtc-pxa.c | 1 + + drivers/rtc/rtc-rp5c01.c | 1 + + drivers/rtc/rtc-rs5c348.c | 1 + + drivers/rtc/rtc-rs5c372.c | 1 + + drivers/rtc/rtc-rx8025.c | 1 + + drivers/rtc/rtc-s3c.c | 1 + + drivers/rtc/rtc-sh.c | 1 + + drivers/rtc/rtc-stk17ta8.c | 1 + + drivers/rtc/rtc-stmp3xxx.c | 1 + + drivers/rtc/rtc-tx4939.c | 1 + + drivers/rtc/rtc-v3020.c | 1 + + drivers/rtc/rtc-wm831x.c | 1 + + drivers/s390/block/dasd_3990_erp.c | 1 - + drivers/s390/block/dasd_alias.c | 1 + + drivers/s390/block/dasd_devmap.c | 1 + + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/block/dasd_ioctl.c | 1 + + drivers/s390/block/dasd_proc.c | 1 + + drivers/s390/block/xpram.c | 2 +- + drivers/s390/char/con3270.c | 1 + + drivers/s390/char/fs3270.c | 1 + + drivers/s390/char/keyboard.c | 1 + + drivers/s390/char/monreader.c | 1 + + drivers/s390/char/monwriter.c | 1 + + drivers/s390/char/sclp_async.c | 1 + + drivers/s390/char/sclp_con.c | 1 + + drivers/s390/char/sclp_tty.c | 2 +- + drivers/s390/char/sclp_vt220.c | 1 + + drivers/s390/char/tape_34xx.c | 1 + + drivers/s390/char/tape_3590.c | 1 + + drivers/s390/char/tape_class.c | 2 + + drivers/s390/char/tape_core.c | 1 + + drivers/s390/char/vmcp.c | 1 + + drivers/s390/char/vmlogrdr.c | 1 + + drivers/s390/char/vmur.c | 1 + + drivers/s390/char/vmwatchdog.c | 1 + + drivers/s390/char/zcore.c | 1 + + drivers/s390/cio/blacklist.c | 1 - + drivers/s390/cio/chp.c | 1 + + drivers/s390/cio/chsc_sch.c | 1 + + drivers/s390/cio/qdio_main.c | 1 + + drivers/s390/cio/qdio_thinint.c | 1 + + drivers/s390/crypto/ap_bus.c | 1 + + drivers/s390/crypto/zcrypt_api.c | 1 + + drivers/s390/crypto/zcrypt_cex2a.c | 1 + + drivers/s390/crypto/zcrypt_pcica.c | 1 + + drivers/s390/crypto/zcrypt_pcicc.c | 1 + + drivers/s390/crypto/zcrypt_pcixcc.c | 1 + + drivers/s390/kvm/kvm_virtio.c | 1 + + drivers/s390/net/ctcm_dbug.c | 1 - + drivers/s390/net/ctcm_sysfs.c | 1 + + drivers/s390/net/fsm.c | 1 + + drivers/s390/net/lcs.c | 1 + + drivers/s390/net/qeth_core_main.c | 1 + + drivers/s390/net/qeth_l2_main.c | 1 + + drivers/s390/net/qeth_l3_main.c | 1 + + drivers/s390/net/qeth_l3_sys.c | 2 + + drivers/s390/net/smsgiucv.c | 1 + + drivers/s390/net/smsgiucv_app.c | 1 + + drivers/s390/scsi/zfcp_aux.c | 1 + + drivers/s390/scsi/zfcp_cfdc.c | 1 + + drivers/s390/scsi/zfcp_dbf.c | 1 + + drivers/s390/scsi/zfcp_fc.c | 1 + + drivers/s390/scsi/zfcp_fsf.c | 1 + + drivers/s390/scsi/zfcp_qdio.c | 1 + + drivers/s390/scsi/zfcp_scsi.c | 1 + + drivers/s390/scsi/zfcp_sysfs.c | 1 + + drivers/sbus/char/bbc_envctrl.c | 1 + + drivers/sbus/char/display7seg.c | 1 + + drivers/sbus/char/envctrl.c | 1 + + drivers/sbus/char/flash.c | 1 - + drivers/sbus/char/jsflash.c | 1 - + drivers/scsi/3w-9xxx.c | 1 + + drivers/scsi/3w-sas.c | 1 + + drivers/scsi/3w-xxxx.c | 1 + + drivers/scsi/53c700.c | 1 + + drivers/scsi/BusLogic.c | 1 + + drivers/scsi/NCR_D700.c | 1 + + drivers/scsi/NCR_Q720.c | 1 + + drivers/scsi/a100u2w.c | 1 - + drivers/scsi/a2091.c | 1 + + drivers/scsi/a3000.c | 1 + + drivers/scsi/a4000t.c | 1 + + drivers/scsi/aacraid/rx.c | 1 - + drivers/scsi/aacraid/sa.c | 1 - + drivers/scsi/aha152x.c | 1 + + drivers/scsi/aha1542.c | 1 + + drivers/scsi/aha1740.c | 1 + + drivers/scsi/aic7xxx/aic79xx_osm.c | 1 + + drivers/scsi/aic7xxx/aic7xxx_osm.c | 1 + + drivers/scsi/aic94xx/aic94xx_hwi.c | 1 + + drivers/scsi/aic94xx/aic94xx_init.c | 1 + + drivers/scsi/aic94xx/aic94xx_scb.c | 1 + + drivers/scsi/aic94xx/aic94xx_sds.c | 1 + + drivers/scsi/aic94xx/aic94xx_seq.c | 1 + + drivers/scsi/aic94xx/aic94xx_tmf.c | 1 + + drivers/scsi/arcmsr/arcmsr_hba.c | 1 + + drivers/scsi/atari_NCR5380.c | 1 + + drivers/scsi/atp870u.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 1 + + drivers/scsi/bfa/bfad.c | 1 + + drivers/scsi/bfa/bfad_attr.c | 1 + + drivers/scsi/bfa/bfad_im.c | 1 + + drivers/scsi/bfa/rport.c | 1 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 1 + + drivers/scsi/bnx2i/bnx2i_iscsi.c | 1 + + drivers/scsi/bvme6000_scsi.c | 1 + + drivers/scsi/ch.c | 1 + + drivers/scsi/cxgb3i/cxgb3i_ddp.c | 1 + + drivers/scsi/cxgb3i/cxgb3i_ddp.h | 1 + + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 1 + + drivers/scsi/cxgb3i/cxgb3i_offload.c | 1 + + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 1 + + drivers/scsi/dc395x.c | 1 + + drivers/scsi/device_handler/scsi_dh.c | 1 + + drivers/scsi/device_handler/scsi_dh_alua.c | 1 + + drivers/scsi/device_handler/scsi_dh_emc.c | 1 + + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 1 + + drivers/scsi/device_handler/scsi_dh_rdac.c | 1 + + drivers/scsi/eata.c | 1 + + drivers/scsi/eata_pio.c | 1 - + drivers/scsi/fcoe/fcoe.c | 1 + + drivers/scsi/fcoe/libfcoe.c | 1 + + drivers/scsi/fd_mcs.c | 1 + + drivers/scsi/fdomain.c | 1 + + drivers/scsi/fnic/fnic_fcs.c | 1 + + drivers/scsi/fnic/fnic_main.c | 1 + + drivers/scsi/fnic/fnic_scsi.c | 1 + + drivers/scsi/fnic/vnic_dev.c | 1 + + drivers/scsi/fnic/vnic_rq.c | 1 + + drivers/scsi/fnic/vnic_wq.c | 1 + + drivers/scsi/gdth.c | 1 + + drivers/scsi/gdth_proc.c | 1 + + drivers/scsi/gvp11.c | 1 + + drivers/scsi/hosts.c | 1 + + drivers/scsi/hptiop.c | 1 + + drivers/scsi/ibmvscsi/ibmvfc.c | 1 + + drivers/scsi/ibmvscsi/ibmvscsi.c | 1 + + drivers/scsi/ibmvscsi/ibmvstgt.c | 1 + + drivers/scsi/ibmvscsi/rpa_vscsi.c | 1 + + drivers/scsi/imm.c | 1 + + drivers/scsi/ipr.c | 1 + + drivers/scsi/iscsi_tcp.c | 1 + + drivers/scsi/jazz_esp.c | 1 + + drivers/scsi/lasi700.c | 1 + + drivers/scsi/libfc/fc_disc.c | 1 + + drivers/scsi/libfc/fc_exch.c | 2 +- + drivers/scsi/libfc/fc_fcp.c | 1 + + drivers/scsi/libfc/fc_frame.c | 1 + + drivers/scsi/libfc/fc_lport.c | 1 + + drivers/scsi/libfc/fc_rport.c | 1 + + drivers/scsi/libiscsi.c | 1 + + drivers/scsi/libiscsi_tcp.c | 1 + + drivers/scsi/libsas/sas_ata.c | 1 + + drivers/scsi/libsas/sas_discover.c | 1 + + drivers/scsi/libsas/sas_expander.c | 1 + + drivers/scsi/libsas/sas_host_smp.c | 1 + + drivers/scsi/libsas/sas_init.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 1 + + drivers/scsi/libsrp.c | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 1 + + drivers/scsi/lpfc/lpfc_bsg.c | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 1 + + drivers/scsi/lpfc/lpfc_debugfs.c | 1 + + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 1 + + drivers/scsi/lpfc/lpfc_init.c | 1 + + drivers/scsi/lpfc/lpfc_mbox.c | 1 + + drivers/scsi/lpfc/lpfc_mem.c | 1 + + drivers/scsi/lpfc/lpfc_nportdisc.c | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 1 + + drivers/scsi/lpfc/lpfc_sli.c | 1 + + drivers/scsi/lpfc/lpfc_vport.c | 1 + + drivers/scsi/mac_esp.c | 1 + + drivers/scsi/megaraid.c | 1 + + drivers/scsi/megaraid/megaraid_mbox.c | 1 + + drivers/scsi/megaraid/megaraid_mm.c | 1 + + drivers/scsi/megaraid/megaraid_sas.c | 1 + + drivers/scsi/mesh.c | 1 - + drivers/scsi/mpt2sas/mpt2sas_config.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1 + + drivers/scsi/mpt2sas/mpt2sas_transport.c | 1 + + drivers/scsi/mvme16x_scsi.c | 1 + + drivers/scsi/mvsas/mv_sas.h | 1 + + drivers/scsi/ncr53c8xx.c | 1 + + drivers/scsi/nsp32.c | 1 - + drivers/scsi/osd/osd_initiator.c | 2 + + drivers/scsi/osd/osd_uld.c | 1 + + drivers/scsi/osst.c | 1 + + drivers/scsi/pm8001/pm8001_ctl.c | 1 + + drivers/scsi/pm8001/pm8001_hwi.c | 1 + + drivers/scsi/pm8001/pm8001_init.c | 1 + + drivers/scsi/pm8001/pm8001_sas.c | 1 + + drivers/scsi/pmcraid.c | 1 + + drivers/scsi/ppa.c | 1 + + drivers/scsi/ps3rom.c | 1 + + drivers/scsi/qla1280.c | 1 - + drivers/scsi/qla2xxx/qla_attr.c | 1 + + drivers/scsi/qla2xxx/qla_init.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 1 + + drivers/scsi/qla2xxx/qla_mbx.c | 1 + + drivers/scsi/qla2xxx/qla_mid.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 1 + + drivers/scsi/qla2xxx/qla_sup.c | 1 + + drivers/scsi/qla4xxx/ql4_os.c | 1 + + drivers/scsi/qlogicpti.c | 2 +- + drivers/scsi/scsi_debug.c | 1 + + drivers/scsi/scsi_devinfo.c | 1 + + drivers/scsi/scsi_error.c | 1 + + drivers/scsi/scsi_netlink.c | 1 + + drivers/scsi/scsi_proc.c | 2 +- + drivers/scsi/scsi_scan.c | 1 + + drivers/scsi/scsi_sysfs.c | 1 + + drivers/scsi/scsi_tgt_if.c | 1 + + drivers/scsi/scsi_tgt_lib.c | 1 + + drivers/scsi/scsi_transport_fc.c | 1 + + drivers/scsi/scsi_transport_iscsi.c | 1 + + drivers/scsi/scsi_transport_spi.c | 1 + + drivers/scsi/scsicam.c | 1 + + drivers/scsi/sd.c | 1 + + drivers/scsi/ses.c | 1 + + drivers/scsi/sg.c | 1 + + drivers/scsi/sim710.c | 1 + + drivers/scsi/sni_53c710.c | 1 + + drivers/scsi/sr.c | 1 + + drivers/scsi/sr_ioctl.c | 1 + + drivers/scsi/sr_vendor.c | 1 + + drivers/scsi/st.c | 1 + + drivers/scsi/stex.c | 1 + + drivers/scsi/sun3_NCR5380.c | 1 + + drivers/scsi/sun3x_esp.c | 1 + + drivers/scsi/sun_esp.c | 1 + + drivers/scsi/tmscsim.c | 1 + + drivers/scsi/u14-34f.c | 1 + + drivers/scsi/vmw_pvscsi.c | 1 + + drivers/scsi/wd7000.c | 1 - + drivers/scsi/zorro7xx.c | 1 + + drivers/serial/68328serial.c | 1 + + drivers/serial/8250.c | 1 + + drivers/serial/8250_gsc.c | 1 - + drivers/serial/8250_hp300.c | 1 + + drivers/serial/amba-pl010.c | 1 + + drivers/serial/amba-pl011.c | 1 + + drivers/serial/bfin_5xx.c | 1 + + drivers/serial/bfin_sport_uart.c | 1 + + drivers/serial/cpm_uart/cpm_uart_cpm1.c | 1 + + drivers/serial/cpm_uart/cpm_uart_cpm2.c | 1 + + drivers/serial/imx.c | 1 + + drivers/serial/ioc3_serial.c | 1 + + drivers/serial/ioc4_serial.c | 1 + + drivers/serial/jsm/jsm_driver.c | 1 + + drivers/serial/jsm/jsm_tty.c | 1 + + drivers/serial/max3100.c | 1 + + drivers/serial/mpsc.c | 1 + + drivers/serial/mux.c | 1 - + drivers/serial/of_serial.c | 1 + + drivers/serial/pmac_zilog.c | 1 - + drivers/serial/pxa.c | 1 + + drivers/serial/sh-sci.c | 1 + + drivers/serial/sunsu.c | 1 + + drivers/serial/timbuart.c | 1 + + drivers/serial/ucc_uart.c | 1 + + drivers/sh/intc.c | 1 + + drivers/sn/ioc3.c | 1 + + drivers/spi/amba-pl022.c | 1 + + drivers/spi/atmel_spi.c | 1 + + drivers/spi/au1550_spi.c | 1 + + drivers/spi/davinci_spi.c | 1 + + drivers/spi/dw_spi.c | 1 + + drivers/spi/dw_spi_mmio.c | 1 + + drivers/spi/dw_spi_pci.c | 1 + + drivers/spi/mpc52xx_psc_spi.c | 1 + + drivers/spi/mpc52xx_spi.c | 1 + + drivers/spi/omap2_mcspi.c | 1 + + drivers/spi/omap_spi_100k.c | 1 + + drivers/spi/omap_uwire.c | 1 + + drivers/spi/pxa2xx_spi.c | 1 + + drivers/spi/spi.c | 1 + + drivers/spi/spi_bfin5xx.c | 1 + + drivers/spi/spi_bitbang.c | 1 + + drivers/spi/spi_imx.c | 1 + + drivers/spi/spi_mpc8xxx.c | 1 + + drivers/spi/spi_nuc900.c | 1 + + drivers/spi/spi_ppc4xx.c | 1 + + drivers/spi/spi_s3c24xx.c | 1 + + drivers/spi/tle62x0.c | 1 + + drivers/spi/xilinx_spi_of.c | 1 + + drivers/ssb/driver_gige.c | 1 + + drivers/ssb/main.c | 1 + + drivers/ssb/pci.c | 1 + + drivers/ssb/pcihost_wrapper.c | 1 + + drivers/ssb/sprom.c | 1 + + drivers/staging/batman-adv/device.c | 1 + + drivers/staging/batman-adv/main.h | 1 + + drivers/staging/batman-adv/soft-interface.c | 1 + + drivers/staging/comedi/drivers/8255.c | 1 + + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 1 + + drivers/staging/comedi/drivers/amplc_dio200.c | 1 + + drivers/staging/comedi/drivers/amplc_pci224.c | 1 + + drivers/staging/comedi/drivers/cb_das16_cs.c | 1 + + drivers/staging/comedi/drivers/comedi_bond.c | 1 + + drivers/staging/comedi/drivers/das08_cs.c | 1 + + drivers/staging/comedi/drivers/das16.c | 1 + + drivers/staging/comedi/drivers/das1800.c | 1 + + drivers/staging/comedi/drivers/dt282x.c | 1 + + drivers/staging/comedi/drivers/jr3_pci.c | 1 + + drivers/staging/comedi/drivers/ni_65xx.c | 1 + + drivers/staging/comedi/drivers/ni_670x.c | 1 + + drivers/staging/comedi/drivers/ni_at_a2150.c | 1 + + drivers/staging/comedi/drivers/ni_daq_700.c | 1 + + drivers/staging/comedi/drivers/ni_daq_dio24.c | 1 + + drivers/staging/comedi/drivers/ni_labpc.c | 1 + + drivers/staging/comedi/drivers/ni_labpc_cs.c | 1 + + drivers/staging/comedi/drivers/pcl812.c | 1 + + drivers/staging/comedi/drivers/pcl816.c | 1 + + drivers/staging/comedi/drivers/pcl818.c | 1 + + drivers/staging/comedi/drivers/pcmmio.c | 1 + + drivers/staging/comedi/drivers/pcmuio.c | 1 + + drivers/staging/comedi/drivers/serial2002.c | 1 + + drivers/staging/comedi/drivers/unioxx5.c | 1 + + .../staging/comedi/kcomedilib/kcomedilib_main.c | 1 - + drivers/staging/comedi/kcomedilib/ksyms.c | 1 - + drivers/staging/crystalhd/crystalhd_hw.c | 1 + + drivers/staging/crystalhd/crystalhd_lnx.c | 1 + + drivers/staging/crystalhd/crystalhd_misc.c | 2 + + drivers/staging/cx25821/cx25821-alsa.c | 1 + + drivers/staging/cx25821/cx25821-audio-upstream.c | 1 + + drivers/staging/cx25821/cx25821-audups11.c | 2 + + drivers/staging/cx25821/cx25821-core.c | 1 + + .../staging/cx25821/cx25821-video-upstream-ch2.c | 1 + + drivers/staging/cx25821/cx25821-video-upstream.c | 1 + + drivers/staging/dream/camera/msm_camera.c | 1 + + drivers/staging/dream/camera/msm_v4l2.c | 1 + + drivers/staging/dream/camera/msm_vfe7x.c | 1 + + drivers/staging/dream/camera/msm_vfe8x.c | 1 + + drivers/staging/dream/camera/mt9d112.c | 1 + + drivers/staging/dream/camera/mt9p012_fox.c | 1 + + drivers/staging/dream/camera/mt9t013.c | 1 + + drivers/staging/dream/camera/s5k3e2fx.c | 1 + + drivers/staging/dream/gpio_axis.c | 1 + + drivers/staging/dream/gpio_event.c | 1 + + drivers/staging/dream/gpio_input.c | 1 + + drivers/staging/dream/gpio_matrix.c | 1 + + drivers/staging/dream/pmem.c | 1 + + drivers/staging/dream/qdsp5/adsp.c | 1 + + drivers/staging/dream/qdsp5/adsp_driver.c | 1 + + drivers/staging/dream/qdsp5/audio_aac.c | 1 + + drivers/staging/dream/qdsp5/audio_amrnb.c | 1 + + drivers/staging/dream/qdsp5/audio_evrc.c | 1 + + drivers/staging/dream/qdsp5/audio_in.c | 1 + + drivers/staging/dream/qdsp5/audio_mp3.c | 1 + + drivers/staging/dream/qdsp5/audio_out.c | 1 + + drivers/staging/dream/qdsp5/audio_qcelp.c | 1 + + drivers/staging/dream/qdsp5/audmgr.c | 1 + + drivers/staging/dream/smd/smd_rpcrouter.c | 1 + + drivers/staging/dream/smd/smd_rpcrouter_device.c | 1 + + drivers/staging/dream/smd/smd_rpcrouter_servers.c | 1 + + drivers/staging/dream/synaptics_i2c_rmi.c | 1 + + drivers/staging/dt3155/allocator.c | 1 + + drivers/staging/dt3155/dt3155_isr.c | 2 +- + drivers/staging/et131x/et1310_eeprom.c | 1 - + drivers/staging/et131x/et1310_mac.c | 1 - + drivers/staging/et131x/et1310_phy.c | 1 - + drivers/staging/et131x/et1310_pm.c | 1 - + drivers/staging/et131x/et131x_initpci.c | 1 - + drivers/staging/et131x/et131x_isr.c | 1 - + drivers/staging/et131x/et131x_netdev.c | 1 - + drivers/staging/go7007/go7007-driver.c | 1 + + drivers/staging/go7007/go7007-fw.c | 1 + + drivers/staging/go7007/go7007-v4l2.c | 1 + + drivers/staging/go7007/s2250-board.c | 1 + + drivers/staging/go7007/s2250-loader.c | 1 + + drivers/staging/go7007/snd-go7007.c | 1 + + drivers/staging/go7007/wis-saa7113.c | 1 + + drivers/staging/go7007/wis-saa7115.c | 1 + + drivers/staging/go7007/wis-sony-tuner.c | 1 + + drivers/staging/go7007/wis-tw2804.c | 1 + + drivers/staging/go7007/wis-tw9903.c | 1 + + drivers/staging/hv/Channel.c | 1 + + drivers/staging/hv/ChannelMgmt.c | 1 + + drivers/staging/hv/Connection.c | 1 + + drivers/staging/hv/Hv.c | 1 + + drivers/staging/hv/NetVsc.c | 1 + + drivers/staging/hv/RndisFilter.c | 1 + + drivers/staging/hv/StorVsc.c | 1 + + drivers/staging/hv/Vmbus.c | 1 + + drivers/staging/hv/blkvsc_drv.c | 1 + + drivers/staging/hv/netvsc_drv.c | 1 + + drivers/staging/hv/osd.c | 1 + + drivers/staging/hv/storvsc_drv.c | 1 + + drivers/staging/hv/vmbus_drv.c | 1 + + drivers/staging/iio/accel/kxsd9.c | 1 + + drivers/staging/iio/accel/lis3l02dq_core.c | 1 + + drivers/staging/iio/accel/lis3l02dq_ring.c | 1 + + drivers/staging/iio/accel/sca3000_core.c | 1 + + drivers/staging/iio/accel/sca3000_ring.c | 1 + + drivers/staging/iio/adc/max1363_core.c | 1 + + drivers/staging/iio/adc/max1363_ring.c | 1 + + drivers/staging/iio/industrialio-core.c | 1 + + drivers/staging/iio/industrialio-ring.c | 1 + + drivers/staging/iio/industrialio-trigger.c | 1 + + drivers/staging/iio/light/tsl2563.c | 1 + + drivers/staging/iio/ring_sw.c | 1 + + drivers/staging/iio/trigger/iio-trig-gpio.c | 1 + + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 1 + + drivers/staging/line6/capture.c | 2 + + drivers/staging/line6/driver.c | 1 + + drivers/staging/line6/dumprequest.c | 3 ++ + drivers/staging/line6/midi.c | 1 + + drivers/staging/line6/pcm.c | 2 + + drivers/staging/line6/playback.c | 2 + + drivers/staging/line6/pod.c | 2 + + drivers/staging/line6/variax.c | 2 + + drivers/staging/netwave/netwave_cs.c | 1 - + drivers/staging/octeon/ethernet-mem.c | 1 + + drivers/staging/octeon/ethernet.c | 1 + + drivers/staging/otus/ioctl.c | 1 + + drivers/staging/otus/usbdrv.c | 1 + + drivers/staging/otus/wrap_mem.c | 1 + + drivers/staging/otus/wrap_pkt.c | 1 + + drivers/staging/otus/wrap_usb.c | 1 + + drivers/staging/otus/wwrap.c | 1 + + drivers/staging/otus/zdusb.c | 1 + + drivers/staging/poch/poch.c | 1 + + drivers/staging/pohmelfs/config.c | 1 + + drivers/staging/pohmelfs/dir.c | 1 + + drivers/staging/pohmelfs/lock.c | 1 - + drivers/staging/pohmelfs/net.c | 1 + + drivers/staging/pohmelfs/path_entry.c | 1 - + drivers/staging/ramzswap/ramzswap_drv.c | 1 + + drivers/staging/rt2860/pci_main_dev.c | 1 + + drivers/staging/rt2860/rt_linux.c | 1 + + .../rtl8187se/ieee80211/ieee80211_softmac.c | 1 + + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 1 + + drivers/staging/rtl8187se/r8180_core.c | 1 + + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 1 + + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 1 + + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 1 + + drivers/staging/rtl8192e/r8192E_core.c | 1 + + .../rtl8192su/ieee80211/ieee80211_softmac.c | 1 + + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1 + + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 1 + + drivers/staging/rtl8192su/r8192U_core.c | 1 + + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 1 + + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 1 + + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 1 + + drivers/staging/rtl8192u/r8192U_core.c | 1 + + drivers/staging/sep/sep_driver.c | 1 + + drivers/staging/sm7xx/smtcfb.c | 1 + + drivers/staging/strip/strip.c | 1 + + drivers/staging/udlfb/udlfb.c | 1 + + drivers/staging/usbip/stub_dev.c | 2 + + drivers/staging/usbip/stub_main.c | 1 + + drivers/staging/usbip/stub_rx.c | 2 + + drivers/staging/usbip/stub_tx.c | 2 + + drivers/staging/usbip/usbip_common.c | 1 + + drivers/staging/usbip/vhci_hcd.c | 1 + + drivers/staging/usbip/vhci_rx.c | 2 + + drivers/staging/usbip/vhci_tx.c | 2 + + drivers/staging/vme/bridges/vme_ca91cx42.c | 1 + + drivers/staging/vme/bridges/vme_tsi148.c | 1 + + drivers/staging/vme/devices/vme_user.c | 1 + + drivers/staging/vme/vme.c | 1 + + drivers/staging/vt6655/device_main.c | 1 + + drivers/staging/winbond/wb35reg.c | 1 + + drivers/staging/winbond/wb35rx.c | 1 + + drivers/staging/winbond/wb35tx.c | 1 + + drivers/staging/wlags49_h2/wl_cs.c | 1 - + drivers/staging/wlags49_h2/wl_netdev.c | 1 + + drivers/staging/wlags49_h2/wl_pci.c | 1 - + drivers/staging/wlags49_h2/wl_priv.c | 1 + + drivers/staging/wlan-ng/p80211req.c | 1 - + drivers/staging/wlan-ng/p80211wep.c | 1 - + drivers/staging/wlan-ng/p80211wext.c | 1 - + drivers/staging/wlan-ng/prism2fw.c | 1 + + drivers/staging/wlan-ng/prism2mgmt.c | 1 - + drivers/staging/wlan-ng/prism2mib.c | 1 - + drivers/tc/tc.c | 1 + + drivers/thermal/thermal_sys.c | 1 + + drivers/uio/uio.c | 1 + + drivers/uio/uio_aec.c | 1 + + drivers/uio/uio_cif.c | 1 + + drivers/uio/uio_netx.c | 1 + + drivers/uio/uio_pci_generic.c | 1 + + drivers/uio/uio_pdrv.c | 1 + + drivers/uio/uio_pdrv_genirq.c | 1 + + drivers/uio/uio_sercos3.c | 1 + + drivers/usb/atm/speedtch.c | 1 - + drivers/usb/atm/ueagle-atm.c | 1 + + drivers/usb/c67x00/c67x00-drv.c | 1 + + drivers/usb/c67x00/c67x00-sched.c | 1 + + drivers/usb/class/usbtmc.c | 1 + + drivers/usb/core/devices.c | 2 +- + drivers/usb/core/driver.c | 1 + + drivers/usb/core/endpoint.c | 1 + + drivers/usb/core/file.c | 1 + + drivers/usb/gadget/atmel_usba_udc.c | 1 + + drivers/usb/gadget/ci13xxx_udc.c | 1 + + drivers/usb/gadget/config.c | 1 + + drivers/usb/gadget/f_acm.c | 1 + + drivers/usb/gadget/f_audio.c | 1 + + drivers/usb/gadget/f_ecm.c | 1 + + drivers/usb/gadget/f_eem.c | 1 + + drivers/usb/gadget/f_loopback.c | 1 + + drivers/usb/gadget/f_obex.c | 1 + + drivers/usb/gadget/f_phonet.c | 1 + + drivers/usb/gadget/f_rndis.c | 1 + + drivers/usb/gadget/f_serial.c | 1 + + drivers/usb/gadget/f_sourcesink.c | 1 + + drivers/usb/gadget/f_subset.c | 1 + + drivers/usb/gadget/gmidi.c | 1 + + drivers/usb/gadget/imx_udc.c | 1 + + drivers/usb/gadget/lh7a40x_udc.c | 1 + + drivers/usb/gadget/m66592-udc.c | 1 + + drivers/usb/gadget/pxa27x_udc.c | 1 + + drivers/usb/gadget/r8a66597-udc.c | 1 + + drivers/usb/gadget/rndis.c | 1 + + drivers/usb/gadget/s3c-hsotg.c | 1 + + drivers/usb/gadget/u_audio.c | 1 + + drivers/usb/gadget/u_ether.c | 1 + + drivers/usb/gadget/u_serial.c | 1 + + drivers/usb/gadget/zero.c | 1 + + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mxc.c | 1 + + drivers/usb/host/ehci-omap.c | 1 + + drivers/usb/host/fhci-hcd.c | 1 + + drivers/usb/host/fhci-mem.c | 1 + + drivers/usb/host/fhci-q.c | 1 + + drivers/usb/host/fhci-tds.c | 1 + + drivers/usb/host/hwa-hc.c | 1 + + drivers/usb/host/imx21-hcd.c | 1 + + drivers/usb/host/isp116x-hcd.c | 1 + + drivers/usb/host/ohci-q.c | 1 + + drivers/usb/host/r8a66597-hcd.c | 1 + + drivers/usb/host/uhci-debug.c | 1 + + drivers/usb/host/whci/asl.c | 1 + + drivers/usb/host/whci/debug.c | 1 + + drivers/usb/host/whci/init.c | 1 + + drivers/usb/host/whci/pzl.c | 1 + + drivers/usb/host/whci/qset.c | 1 + + drivers/usb/host/xhci-mem.c | 1 + + drivers/usb/host/xhci-ring.c | 1 + + drivers/usb/host/xhci.c | 1 + + drivers/usb/misc/appledisplay.c | 1 + + drivers/usb/misc/cypress_cy7c63.c | 1 + + drivers/usb/misc/cytherm.c | 1 + + drivers/usb/misc/isight_firmware.c | 1 + + drivers/usb/misc/sisusbvga/sisusb_con.c | 1 - + drivers/usb/misc/sisusbvga/sisusb_init.c | 1 - + drivers/usb/misc/trancevibrator.c | 1 + + drivers/usb/misc/uss720.c | 1 + + drivers/usb/mon/mon_bin.c | 1 + + drivers/usb/mon/mon_main.c | 1 + + drivers/usb/mon/mon_stat.c | 1 + + drivers/usb/mon/mon_text.c | 1 + + drivers/usb/musb/blackfin.c | 1 - + drivers/usb/musb/cppi_dma.c | 1 + + drivers/usb/musb/davinci.c | 1 - + drivers/usb/musb/musb_gadget.c | 1 + + drivers/usb/musb/musb_virthub.c | 1 - + drivers/usb/musb/musbhsdma.c | 1 + + drivers/usb/musb/omap2430.c | 1 - + drivers/usb/musb/tusb6010_omap.c | 1 + + drivers/usb/otg/gpio_vbus.c | 1 + + drivers/usb/otg/nop-usb-xceiv.c | 1 + + drivers/usb/otg/twl4030-usb.c | 1 + + drivers/usb/otg/ulpi.c | 1 + + drivers/usb/serial/aircable.c | 1 + + drivers/usb/serial/ark3116.c | 1 + + drivers/usb/serial/bus.c | 1 + + drivers/usb/serial/ch341.c | 1 + + drivers/usb/serial/navman.c | 1 + + drivers/usb/serial/opticon.c | 1 + + drivers/usb/serial/option.c | 1 + + drivers/usb/serial/safe_serial.c | 2 +- + drivers/usb/serial/sierra.c | 1 + + drivers/usb/serial/symbolserial.c | 1 + + drivers/usb/serial/usb_debug.c | 1 + + drivers/usb/storage/alauda.c | 1 + + drivers/usb/storage/karma.c | 1 + + drivers/usb/storage/option_ms.c | 1 + + drivers/usb/storage/scsiglue.c | 1 - + drivers/usb/storage/sierra_ms.c | 1 + + drivers/usb/storage/transport.c | 2 +- + drivers/usb/wusbcore/cbaf.c | 1 + + drivers/usb/wusbcore/crypto.c | 1 + + drivers/usb/wusbcore/devconnect.c | 1 + + drivers/usb/wusbcore/mmc.c | 1 + + drivers/usb/wusbcore/rh.c | 1 + + drivers/usb/wusbcore/security.c | 1 + + drivers/usb/wusbcore/wa-hc.c | 1 + + drivers/usb/wusbcore/wa-nep.c | 1 + + drivers/usb/wusbcore/wa-rpipe.c | 1 + + drivers/usb/wusbcore/wa-xfer.c | 1 + + drivers/uwb/address.c | 1 + + drivers/uwb/allocator.c | 1 + + drivers/uwb/beacon.c | 1 + + drivers/uwb/drp-ie.c | 1 + + drivers/uwb/drp.c | 1 + + drivers/uwb/est.c | 1 + + drivers/uwb/hwa-rc.c | 1 + + drivers/uwb/i1480/dfu/mac.c | 1 + + drivers/uwb/i1480/dfu/usb.c | 1 + + drivers/uwb/i1480/i1480u-wlp/lc.c | 1 + + drivers/uwb/i1480/i1480u-wlp/netdev.c | 1 + + drivers/uwb/i1480/i1480u-wlp/rx.c | 1 + + drivers/uwb/i1480/i1480u-wlp/tx.c | 1 + + drivers/uwb/ie.c | 1 + + drivers/uwb/lc-dev.c | 1 + + drivers/uwb/lc-rc.c | 1 + + drivers/uwb/neh.c | 1 + + drivers/uwb/reset.c | 1 + + drivers/uwb/rsv.c | 1 + + drivers/uwb/scan.c | 1 + + drivers/uwb/umc-dev.c | 1 + + drivers/uwb/uwbd.c | 1 + + drivers/uwb/whc-rc.c | 1 + + drivers/uwb/whci.c | 1 + + drivers/uwb/wlp/eda.c | 1 + + drivers/uwb/wlp/messages.c | 1 + + drivers/uwb/wlp/txrx.c | 1 + + drivers/uwb/wlp/wlp-lc.c | 1 + + drivers/uwb/wlp/wss-lc.c | 1 + + drivers/vhost/net.c | 1 + + drivers/vhost/vhost.c | 1 + + drivers/video/68328fb.c | 1 - + drivers/video/acornfb.c | 2 +- + drivers/video/amifb.c | 1 - + drivers/video/arcfb.c | 1 - + drivers/video/asiliantfb.c | 1 - + drivers/video/atafb.c | 1 - + drivers/video/atmel_lcdfb.c | 1 + + drivers/video/aty/aty128fb.c | 1 - + drivers/video/aty/mach64_cursor.c | 1 - + drivers/video/aty/radeon_backlight.c | 1 + + drivers/video/aty/radeon_monitor.c | 3 ++ + drivers/video/au1100fb.c | 1 + + drivers/video/au1200fb.c | 1 + + drivers/video/backlight/88pm860x_bl.c | 1 + + drivers/video/backlight/adp5520_bl.c | 1 + + drivers/video/backlight/adx_bl.c | 1 + + drivers/video/backlight/atmel-pwm-bl.c | 1 + + drivers/video/backlight/backlight.c | 1 + + drivers/video/backlight/corgi_lcd.c | 1 + + drivers/video/backlight/cr_bllcd.c | 1 + + drivers/video/backlight/da903x_bl.c | 1 + + drivers/video/backlight/ili9320.c | 1 + + drivers/video/backlight/l4f00242t03.c | 1 + + drivers/video/backlight/lcd.c | 1 + + drivers/video/backlight/lms283gf05.c | 1 + + drivers/video/backlight/ltv350qv.c | 1 + + drivers/video/backlight/max8925_bl.c | 1 + + drivers/video/backlight/omap1_bl.c | 1 + + drivers/video/backlight/platform_lcd.c | 1 + + drivers/video/backlight/pwm_bl.c | 1 + + drivers/video/backlight/tdo24m.c | 1 + + drivers/video/backlight/tosa_bl.c | 1 + + drivers/video/backlight/tosa_lcd.c | 1 + + drivers/video/backlight/wm831x_bl.c | 1 + + drivers/video/bfin-lq035q1-fb.c | 1 + + drivers/video/bfin-t350mcqb-fb.c | 1 + + drivers/video/bw2.c | 1 - + drivers/video/carminefb.c | 1 + + drivers/video/cfbcopyarea.c | 1 - + drivers/video/cg14.c | 1 - + drivers/video/cg3.c | 1 - + drivers/video/cg6.c | 1 - + drivers/video/chipsfb.c | 1 - + drivers/video/cirrusfb.c | 1 - + drivers/video/console/bitblit.c | 1 + + drivers/video/console/fbcon_ccw.c | 1 + + drivers/video/console/fbcon_cw.c | 1 + + drivers/video/console/fbcon_rotate.c | 1 + + drivers/video/console/fbcon_ud.c | 1 + + drivers/video/console/mdacon.c | 1 - + drivers/video/da8xx-fb.c | 1 + + drivers/video/display/display-sysfs.c | 1 + + drivers/video/dnfb.c | 1 - + drivers/video/ep93xx-fb.c | 1 + + drivers/video/epson1355fb.c | 1 - + drivers/video/fb_ddc.c | 1 + + drivers/video/fb_defio.c | 1 - + drivers/video/fbcvt.c | 1 + + drivers/video/fbmon.c | 1 + + drivers/video/fbsysfs.c | 1 + + drivers/video/ffb.c | 1 - + drivers/video/g364fb.c | 1 - + drivers/video/gbefb.c | 1 + + drivers/video/geode/gx1fb_core.c | 1 - + drivers/video/geode/gxfb_core.c | 1 - + drivers/video/geode/lxfb_core.c | 1 - + drivers/video/hecubafb.c | 1 - + drivers/video/hgafb.c | 1 - + drivers/video/hitfb.c | 1 - + drivers/video/hpfb.c | 1 - + drivers/video/i810/i810-i2c.c | 1 + + drivers/video/imsttfb.c | 1 - + drivers/video/intelfb/intelfbhw.c | 1 - + drivers/video/leo.c | 1 - + drivers/video/matrox/i2c-matroxfb.c | 1 + + drivers/video/matrox/matroxfb_base.c | 1 + + drivers/video/matrox/matroxfb_crtc2.c | 1 + + drivers/video/matrox/matroxfb_maven.c | 1 + + drivers/video/maxinefb.c | 1 - + drivers/video/mb862xx/mb862xxfb_accel.c | 1 + + drivers/video/mbx/mbxdebugfs.c | 1 + + drivers/video/metronomefb.c | 1 - + drivers/video/modedb.c | 1 + + drivers/video/msm/mddi.c | 1 + + drivers/video/msm/mddi_client_dummy.c | 1 + + drivers/video/msm/mddi_client_nt35399.c | 1 + + drivers/video/msm/mddi_client_toshiba.c | 1 + + drivers/video/msm/mdp.c | 1 + + drivers/video/msm/msm_fb.c | 1 + + drivers/video/nvidia/nv_i2c.c | 1 + + drivers/video/nvidia/nv_of.c | 1 + + drivers/video/nvidia/nv_setup.c | 1 + + drivers/video/offb.c | 1 - + drivers/video/omap/dispc.c | 1 + + drivers/video/omap/lcd_mipid.c | 1 + + drivers/video/omap/lcdc.c | 1 + + drivers/video/omap/omapfb_main.c | 1 + + drivers/video/omap2/displays/panel-taal.c | 1 + + .../video/omap2/displays/panel-tpo-td043mtea1.c | 1 + + drivers/video/omap2/dss/manager.c | 1 + + drivers/video/omap2/dss/overlay.c | 1 + + drivers/video/omap2/omapfb/omapfb-main.c | 1 + + drivers/video/omap2/vram.c | 1 + + drivers/video/output.c | 1 + + drivers/video/p9100.c | 1 - + drivers/video/platinumfb.c | 1 - + drivers/video/pmag-aa-fb.c | 1 - + drivers/video/pnx4008/pnxrgbfb.c | 1 - + drivers/video/pnx4008/sdum.c | 2 +- + drivers/video/q40fb.c | 1 - + drivers/video/s1d13xxxfb.c | 1 + + drivers/video/s3c-fb.c | 2 +- + drivers/video/s3fb.c | 1 - + drivers/video/savage/savagefb-i2c.c | 1 + + drivers/video/sh7760fb.c | 1 + + drivers/video/sh_mobile_lcdcfb.c | 1 + + drivers/video/sstfb.c | 1 - + drivers/video/sunxvr1000.c | 1 - + drivers/video/sunxvr2500.c | 1 - + drivers/video/sunxvr500.c | 1 - + drivers/video/svgalib.c | 1 - + drivers/video/syscopyarea.c | 1 - + drivers/video/tcx.c | 1 - + drivers/video/tgafb.c | 1 - + drivers/video/tridentfb.c | 1 + + drivers/video/uvesafb.c | 1 + + drivers/video/vermilion/vermilion.c | 1 + + drivers/video/vesafb.c | 1 - + drivers/video/vfb.c | 1 - + drivers/video/vga16fb.c | 1 - + drivers/video/via/viafbdev.c | 1 + + drivers/video/vt8623fb.c | 1 - + drivers/video/w100fb.c | 1 + + drivers/video/xen-fbfront.c | 1 + + drivers/video/xilinxfb.c | 1 + + drivers/virtio/virtio_balloon.c | 1 + + drivers/virtio/virtio_pci.c | 1 + + drivers/virtio/virtio_ring.c | 1 + + drivers/vlynq/vlynq.c | 1 + + drivers/w1/masters/ds1wm.c | 1 + + drivers/w1/masters/ds2490.c | 1 + + drivers/w1/masters/mxc_w1.c | 1 + + drivers/w1/masters/omap_hdq.c | 1 + + drivers/w1/masters/w1-gpio.c | 1 + + drivers/w1/slaves/w1_ds2433.c | 1 + + drivers/w1/slaves/w1_ds2760.c | 1 + + drivers/w1/w1_int.c | 1 + + drivers/w1/w1_netlink.c | 1 + + drivers/watchdog/adx_wdt.c | 1 + + drivers/watchdog/at32ap700x_wdt.c | 1 + + drivers/watchdog/cpwd.c | 1 + + drivers/watchdog/davinci_wdt.c | 1 + + drivers/watchdog/hpwdt.c | 1 - + drivers/watchdog/ibmasr.c | 1 - + drivers/watchdog/max63xx_wdt.c | 1 + + drivers/watchdog/mpcore_wdt.c | 1 + + drivers/watchdog/nuc900_wdt.c | 1 + + drivers/watchdog/omap_wdt.c | 1 + + drivers/watchdog/pnx4008_wdt.c | 1 + + drivers/watchdog/riowd.c | 1 + + drivers/watchdog/s3c2410_wdt.c | 1 + + drivers/watchdog/ts72xx_wdt.c | 1 + + drivers/watchdog/twl4030_wdt.c | 1 + + drivers/xen/balloon.c | 1 + + drivers/xen/events.c | 1 + + drivers/xen/evtchn.c | 1 - + drivers/xen/grant-table.c | 1 + + drivers/xen/manage.c | 1 + + drivers/xen/sys-hypervisor.c | 1 + + drivers/xen/xenbus/xenbus_client.c | 1 + + drivers/xen/xenbus/xenbus_probe.c | 1 + + drivers/xen/xencomm.c | 2 +- + drivers/xen/xenfs/xenbus.c | 1 + + fs/9p/cache.c | 1 + + fs/9p/fid.c | 1 + + fs/9p/v9fs.c | 1 + + fs/9p/vfs_dentry.c | 1 + + fs/9p/vfs_dir.c | 1 + + fs/9p/vfs_inode.c | 1 + + fs/9p/vfs_super.c | 1 + + fs/adfs/super.c | 1 + + fs/affs/bitmap.c | 1 + + fs/affs/inode.c | 1 + + fs/affs/super.c | 1 + + fs/afs/cache.c | 1 - + fs/afs/cmservice.c | 1 + + fs/afs/dir.c | 1 - + fs/afs/file.c | 2 +- + fs/afs/fsclient.c | 1 + + fs/afs/inode.c | 1 - + fs/afs/mntpt.c | 2 +- + fs/afs/rxrpc.c | 1 + + fs/afs/vlclient.c | 1 + + fs/afs/vlocation.c | 1 + + fs/afs/vnode.c | 1 - + fs/anon_inodes.c | 1 - + fs/autofs/root.c | 1 + + fs/autofs4/dev-ioctl.c | 1 + + fs/autofs4/root.c | 1 + + fs/befs/datastream.c | 1 - + fs/binfmt_aout.c | 2 +- + fs/binfmt_em86.c | 1 - + fs/binfmt_script.c | 1 - + fs/bio-integrity.c | 1 + + fs/btrfs/acl.c | 1 + + fs/btrfs/async-thread.c | 1 + + fs/btrfs/compression.c | 1 + + fs/btrfs/ctree.c | 1 + + fs/btrfs/ctree.h | 1 + + fs/btrfs/delayed-ref.c | 1 + + fs/btrfs/disk-io.c | 1 + + fs/btrfs/extent-tree.c | 1 + + fs/btrfs/extent_io.c | 1 - + fs/btrfs/extent_map.c | 1 - + fs/btrfs/file-item.c | 1 + + fs/btrfs/file.c | 1 + + fs/btrfs/free-space-cache.c | 1 + + fs/btrfs/inode.c | 1 + + fs/btrfs/ioctl.c | 1 + + fs/btrfs/locking.c | 1 - + fs/btrfs/ordered-data.c | 1 - + fs/btrfs/ref-cache.c | 1 + + fs/btrfs/relocation.c | 1 + + fs/btrfs/super.c | 1 + + fs/btrfs/transaction.c | 1 + + fs/btrfs/tree-log.c | 1 + + fs/btrfs/volumes.c | 1 + + fs/cachefiles/interface.c | 1 + + fs/cachefiles/namei.c | 1 + + fs/cachefiles/rdwr.c | 1 + + fs/cachefiles/xattr.c | 1 + + fs/ceph/addr.c | 1 + + fs/ceph/auth.c | 1 + + fs/ceph/auth_none.c | 1 + + fs/ceph/auth_x.c | 1 + + fs/ceph/buffer.c | 3 ++ + fs/ceph/caps.c | 1 + + fs/ceph/crypto.c | 1 + + fs/ceph/debugfs.c | 1 + + fs/ceph/dir.c | 1 + + fs/ceph/export.c | 1 + + fs/ceph/file.c | 1 + + fs/ceph/mds_client.c | 1 + + fs/ceph/messenger.c | 1 + + fs/ceph/mon_client.c | 1 + + fs/ceph/osdmap.c | 4 ++- + fs/ceph/pagelist.c | 1 + + fs/ceph/snap.c | 1 + + fs/ceph/super.c | 1 + + fs/ceph/super.h | 1 + + fs/ceph/xattr.c | 1 + + fs/cifs/cifs_dfs_ref.c | 1 + + fs/cifs/cifs_spnego.c | 1 + + fs/cifs/cifs_unicode.c | 1 + + fs/cifs/cifsacl.c | 1 + + fs/cifs/cifsencrypt.c | 1 + + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifssmb.c | 1 + + fs/cifs/connect.c | 1 + + fs/cifs/dns_resolve.c | 1 + + fs/cifs/file.c | 1 + + fs/cifs/inode.c | 1 + + fs/cifs/link.c | 1 + + fs/cifs/readdir.c | 1 + + fs/cifs/sess.c | 1 + + fs/cifs/smbencrypt.c | 1 + + fs/cifs/transport.c | 1 + + fs/cifs/xattr.c | 1 + + fs/coda/dir.c | 1 + + fs/coda/file.c | 1 + + fs/coda/inode.c | 1 + + fs/coda/upcall.c | 1 + + fs/compat.c | 1 + + fs/compat_ioctl.c | 2 +- + fs/configfs/inode.c | 1 + + fs/configfs/mount.c | 1 + + fs/configfs/symlink.c | 1 + + fs/debugfs/inode.c | 1 + + fs/devpts/inode.c | 1 + + fs/dlm/config.c | 1 + + fs/dlm/debug_fs.c | 1 + + fs/dlm/lock.c | 1 + + fs/dlm/lowcomms.c | 1 + + fs/dlm/netlink.c | 1 + + fs/dlm/plock.c | 1 + + fs/dlm/user.c | 1 + + fs/ecryptfs/crypto.c | 1 + + fs/ecryptfs/dentry.c | 1 + + fs/ecryptfs/file.c | 1 + + fs/ecryptfs/inode.c | 1 + + fs/ecryptfs/keystore.c | 1 + + fs/ecryptfs/kthread.c | 1 + + fs/ecryptfs/main.c | 1 + + fs/ecryptfs/messaging.c | 1 + + fs/ecryptfs/miscdev.c | 1 + + fs/ecryptfs/mmap.c | 1 + + fs/ecryptfs/super.c | 1 + + fs/eventfd.c | 1 + + fs/exofs/inode.c | 1 + + fs/exofs/ios.c | 1 + + fs/exofs/super.c | 1 + + fs/ext2/balloc.c | 1 + + fs/ext2/xattr_security.c | 1 + + fs/ext3/balloc.c | 1 + + fs/ext3/xattr_security.c | 1 + + fs/ext4/block_validity.c | 1 + + fs/ext4/inode.c | 1 + + fs/ext4/mballoc.c | 1 + + fs/ext4/migrate.c | 1 + + fs/ext4/move_extent.c | 1 + + fs/ext4/xattr_security.c | 1 + + fs/fat/cache.c | 1 + + fs/fifo.c | 1 - + fs/filesystems.c | 2 +- + fs/freevxfs/vxfs_subr.c | 1 - + fs/fs-writeback.c | 1 + + fs/fscache/object-list.c | 1 + + fs/fscache/operation.c | 1 + + fs/fscache/page.c | 1 + + fs/fuse/cuse.c | 1 + + fs/generic_acl.c | 1 + + fs/gfs2/bmap.c | 1 - + fs/gfs2/dentry.c | 1 - + fs/gfs2/export.c | 1 - + fs/gfs2/glops.c | 1 - + fs/gfs2/lock_dlm.c | 1 + + fs/gfs2/rgrp.h | 2 + + fs/gfs2/sys.c | 1 - + fs/gfs2/util.c | 1 - + fs/hfs/bnode.c | 1 + + fs/hfs/btree.c | 1 + + fs/hfs/mdb.c | 1 + + fs/hfs/super.c | 1 + + fs/hfsplus/options.c | 1 + + fs/hostfs/hostfs_kern.c | 1 + + fs/hpfs/buffer.c | 1 + + fs/hpfs/dir.c | 1 + + fs/hpfs/inode.c | 1 + + fs/hpfs/super.c | 1 + + fs/ioprio.c | 1 + + fs/isofs/dir.c | 1 + + fs/isofs/namei.c | 1 + + fs/jbd/commit.c | 1 - + fs/jbd/recovery.c | 1 - + fs/jbd2/recovery.c | 1 - + fs/jffs2/compr_lzo.c | 1 - + fs/jffs2/compr_zlib.c | 1 - + fs/jffs2/debug.c | 1 + + fs/jffs2/file.c | 1 - + fs/jffs2/nodelist.c | 1 - + fs/jffs2/nodemgmt.c | 1 - + fs/jffs2/symlink.c | 1 - + fs/jffs2/write.c | 1 - + fs/jfs/acl.c | 1 + + fs/jfs/jfs_dmap.c | 1 + + fs/jfs/jfs_dtree.c | 1 + + fs/jfs/jfs_imap.c | 1 + + fs/jfs/jfs_logmgr.c | 1 + + fs/jfs/jfs_metapage.c | 1 + + fs/jfs/jfs_unicode.h | 1 + + fs/jfs/super.c | 1 + + fs/jfs/xattr.c | 1 + + fs/libfs.c | 1 + + fs/lockd/clntlock.c | 1 + + fs/lockd/clntproc.c | 1 + + fs/lockd/mon.c | 1 + + fs/lockd/svc.c | 1 - + fs/lockd/svc4proc.c | 1 - + fs/lockd/svclock.c | 1 + + fs/lockd/svcproc.c | 1 - + fs/lockd/svcsubs.c | 1 + + fs/logfs/dev_bdev.c | 1 + + fs/logfs/dir.c | 2 +- + fs/logfs/gc.c | 1 + + fs/logfs/inode.c | 1 + + fs/logfs/journal.c | 1 + + fs/logfs/readwrite.c | 1 + + fs/logfs/segment.c | 1 + + fs/logfs/super.c | 1 + + fs/minix/itree_v1.c | 1 + + fs/mpage.c | 1 + + fs/ncpfs/dir.c | 1 - + fs/ncpfs/file.c | 1 - + fs/ncpfs/ioctl.c | 1 + + fs/ncpfs/mmap.c | 2 +- + fs/ncpfs/sock.c | 1 + + fs/ncpfs/symlink.c | 1 + + fs/nfs/cache_lib.c | 1 + + fs/nfs/callback_proc.c | 1 + + fs/nfs/callback_xdr.c | 1 + + fs/nfs/client.c | 1 + + fs/nfs/delegation.c | 1 + + fs/nfs/direct.c | 1 + + fs/nfs/dns_resolve.c | 1 + + fs/nfs/file.c | 2 +- + fs/nfs/fscache.c | 1 + + fs/nfs/inode.c | 1 + + fs/nfs/namespace.c | 1 + + fs/nfs/nfs2xdr.c | 1 - + fs/nfs/nfs3acl.c | 1 + + fs/nfs/nfs3proc.c | 1 + + fs/nfs/nfs3xdr.c | 1 - + fs/nfs/nfs4namespace.c | 1 + + fs/nfs/nfs4proc.c | 1 + + fs/nfs/nfs4xdr.c | 1 - + fs/nfs/proc.c | 1 - + fs/nfs/super.c | 1 + + fs/nfs/symlink.c | 1 - + fs/nfs_common/nfsacl.c | 1 + + fs/nfsd/export.c | 1 + + fs/nfsd/nfs2acl.c | 1 + + fs/nfsd/nfs3acl.c | 1 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfs4callback.c | 1 + + fs/nfsd/nfs4idmap.c | 1 + + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4recover.c | 1 + + fs/nfsd/nfs4state.c | 1 + + fs/nfsd/nfs4xdr.c | 1 + + fs/nfsd/nfscache.c | 2 + + fs/nfsd/nfsctl.c | 1 + + fs/nfsd/vfs.c | 1 + + fs/nilfs2/alloc.c | 1 + + fs/nilfs2/btnode.c | 1 + + fs/nilfs2/gcinode.c | 1 + + fs/nilfs2/inode.c | 1 + + fs/nilfs2/ioctl.c | 1 + + fs/nilfs2/mdt.c | 1 + + fs/nilfs2/page.c | 1 + + fs/nilfs2/recovery.c | 1 + + fs/nilfs2/segbuf.c | 1 + + fs/nilfs2/segment.c | 1 + + fs/nilfs2/the_nilfs.h | 1 + + fs/notify/fsnotify.c | 1 + + fs/notify/inode_mark.c | 1 - + fs/ntfs/aops.c | 1 + + fs/ntfs/attrib.c | 1 + + fs/ntfs/compress.c | 1 + + fs/ntfs/dir.c | 1 + + fs/ntfs/file.c | 1 + + fs/ntfs/index.c | 2 + + fs/ntfs/mft.c | 1 + + fs/ntfs/namei.c | 1 + + fs/ocfs2/acl.c | 1 + + fs/ocfs2/buffer_head_io.c | 1 - + fs/ocfs2/cluster/heartbeat.c | 1 + + fs/ocfs2/cluster/nodemanager.c | 1 + + fs/ocfs2/cluster/quorum.c | 1 - + fs/ocfs2/dlm/dlmast.c | 1 - + fs/ocfs2/dlm/dlmconvert.c | 1 - + fs/ocfs2/dlm/dlmthread.c | 1 - + fs/ocfs2/dlm/dlmunlock.c | 1 - + fs/ocfs2/extent_map.c | 1 + + fs/ocfs2/heartbeat.c | 1 - + fs/ocfs2/inode.c | 1 - + fs/ocfs2/mmap.c | 1 - + fs/ocfs2/quota_global.c | 1 + + fs/ocfs2/quota_local.c | 1 + + fs/ocfs2/refcounttree.c | 1 - + fs/ocfs2/stack_o2cb.c | 1 + + fs/ocfs2/stack_user.c | 1 + + fs/ocfs2/sysfile.c | 1 - + fs/omfs/inode.c | 1 + + fs/open.c | 2 +- + fs/partitions/check.c | 1 + + fs/partitions/efi.c | 1 + + fs/proc/array.c | 1 - + fs/proc/base.c | 1 + + fs/proc/generic.c | 1 + + fs/proc/inode.c | 1 + + fs/proc/kcore.c | 1 + + fs/proc/nommu.c | 1 - + fs/proc/proc_devtree.c | 1 + + fs/proc/proc_net.c | 1 + + fs/proc/stat.c | 1 - + fs/proc/task_mmu.c | 1 + + fs/proc/task_nommu.c | 1 + + fs/proc/vmcore.c | 1 + + fs/quota/netlink.c | 1 + + fs/ramfs/file-nommu.c | 1 + + fs/ramfs/inode.c | 1 + + fs/reiserfs/dir.c | 1 + + fs/reiserfs/fix_node.c | 1 + + fs/reiserfs/inode.c | 1 + + fs/reiserfs/journal.c | 1 + + fs/reiserfs/namei.c | 1 + + fs/reiserfs/super.c | 1 + + fs/reiserfs/xattr.c | 1 + + fs/reiserfs/xattr_acl.c | 1 + + fs/reiserfs/xattr_security.c | 1 + + fs/signalfd.c | 1 + + fs/smbfs/file.c | 1 - + fs/smbfs/smbiod.c | 1 - + fs/smbfs/symlink.c | 1 + + fs/splice.c | 1 + + fs/squashfs/symlink.c | 1 - + fs/squashfs/zlib_wrapper.c | 1 + + fs/sync.c | 1 + + fs/sysfs/inode.c | 1 + + fs/sysfs/mount.c | 1 + + fs/sysfs/symlink.c | 1 + + fs/timerfd.c | 1 + + fs/ubifs/commit.c | 1 + + fs/ubifs/debug.c | 1 + + fs/ubifs/file.c | 1 + + fs/ubifs/gc.c | 1 + + fs/ubifs/io.c | 1 + + fs/ubifs/lpt.c | 1 + + fs/ubifs/lpt_commit.c | 1 + + fs/ubifs/recovery.c | 1 + + fs/ubifs/sb.c | 1 + + fs/ubifs/tnc.c | 1 + + fs/ubifs/ubifs.h | 1 + + fs/ubifs/xattr.c | 1 + + fs/udf/partition.c | 1 - + fs/udf/symlink.c | 1 - + fs/udf/unicode.c | 1 + + fs/xattr_acl.c | 2 +- + fs/xfs/linux-2.6/kmem.c | 1 + + fs/xfs/linux-2.6/xfs_acl.c | 1 + + fs/xfs/linux-2.6/xfs_aops.c | 1 + + fs/xfs/linux-2.6/xfs_buf.c | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 1 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 1 + + fs/xfs/linux-2.6/xfs_iops.c | 1 + + fs/xfs/linux-2.6/xfs_super.c | 1 + + include/drm/drmP.h | 1 + + include/linux/delayacct.h | 1 + + include/linux/fsnotify.h | 1 + + include/linux/gameport.h | 1 + + include/linux/io-mapping.h | 1 + + include/linux/jbd.h | 1 + + include/linux/jbd2.h | 1 + + include/linux/percpu.h | 30 +++---------------- + include/linux/security.h | 2 +- + include/linux/spi/spi.h | 1 + + include/linux/taskstats_kern.h | 1 + + include/linux/usb/gadget.h | 2 + + include/linux/wimax/debug.h | 1 + + include/net/ax25.h | 1 + + include/net/fib_rules.h | 1 + + include/net/ipx.h | 1 + + include/net/iucv/iucv.h | 1 + + include/net/netfilter/nf_conntrack_extend.h | 2 + + include/net/netlabel.h | 1 + + include/net/netrom.h | 1 + + include/net/sock.h | 1 + + include/net/x25.h | 1 + + include/net/xfrm.h | 1 + + include/scsi/libsas.h | 1 + + include/xen/xenbus.h | 1 + + init/do_mounts.c | 1 + + init/do_mounts_rd.c | 1 + + init/main.c | 2 +- + ipc/compat.c | 1 - + ipc/mqueue.c | 1 + + ipc/msg.c | 1 - + kernel/async.c | 1 + + kernel/audit.c | 1 + + kernel/audit_tree.c | 1 + + kernel/audit_watch.c | 1 + + kernel/auditfilter.c | 1 + + kernel/auditsc.c | 1 + + kernel/cgroup_freezer.c | 1 + + kernel/compat.c | 1 + + kernel/cpu.c | 1 + + kernel/cred.c | 1 + + kernel/irq/numa_migrate.c | 1 + + kernel/irq/proc.c | 1 + + kernel/kallsyms.c | 1 + + kernel/latencytop.c | 1 - + kernel/lockdep.c | 1 + + kernel/nsproxy.c | 1 + + kernel/padata.c | 1 + + kernel/perf_event.c | 1 + + kernel/pid_namespace.c | 1 + + kernel/power/hibernate.c | 1 + + kernel/power/hibernate_nvs.c | 1 + + kernel/power/snapshot.c | 1 + + kernel/power/suspend.c | 1 + + kernel/power/swap.c | 1 + + kernel/res_counter.c | 1 - + kernel/sched.c | 1 + + kernel/sched_cpupri.c | 1 + + kernel/smp.c | 1 + + kernel/srcu.c | 1 - + kernel/sys.c | 1 + + kernel/sysctl_binary.c | 1 + + kernel/taskstats.c | 1 + + kernel/time.c | 1 - + kernel/time/timecompare.c | 1 + + kernel/timer.c | 1 + + kernel/trace/blktrace.c | 1 + + kernel/trace/ftrace.c | 1 + + kernel/trace/power-traces.c | 1 - + kernel/trace/ring_buffer.c | 1 + + kernel/trace/trace.c | 2 +- + kernel/trace/trace_events.c | 1 + + kernel/trace/trace_events_filter.c | 1 + + kernel/trace/trace_functions_graph.c | 1 + + kernel/trace/trace_ksym.c | 1 + + kernel/trace/trace_mmiotrace.c | 1 + + kernel/trace/trace_selftest.c | 1 + + kernel/trace/trace_stat.c | 1 + + kernel/trace/trace_syscalls.c | 1 + + kernel/trace/trace_workqueue.c | 1 + + lib/cpumask.c | 1 + + lib/crc32.c | 1 - + lib/debugobjects.c | 1 + + lib/devres.c | 1 + + lib/dynamic_debug.c | 1 + + lib/genalloc.c | 1 + + lib/inflate.c | 1 + + lib/kasprintf.c | 1 + + lib/kobject_uevent.c | 1 + + lib/kref.c | 1 + + lib/radix-tree.c | 1 - + lib/scatterlist.c | 1 + + lib/swiotlb.c | 1 + + lib/textsearch.c | 1 + + mm/Makefile | 6 +++- + mm/bootmem.c | 1 + + mm/bounce.c | 1 + + mm/failslab.c | 1 - + mm/filemap.c | 2 +- + mm/filemap_xip.c | 1 + + mm/hugetlb.c | 2 +- + mm/kmemleak.c | 1 - + mm/memory-failure.c | 1 + + mm/memory.c | 1 + + mm/mempolicy.c | 1 - + mm/migrate.c | 1 + + mm/mincore.c | 2 +- + mm/mmu_notifier.c | 1 + + mm/mprotect.c | 1 - + mm/mremap.c | 1 - + mm/oom_kill.c | 1 + + mm/page_io.c | 1 + + mm/percpu_up.c | 30 ++++++++++++++++++++ + mm/quicklist.c | 1 + + mm/readahead.c | 1 + + mm/sparse-vmemmap.c | 1 + + mm/sparse.c | 1 + + mm/swap.c | 1 + + mm/swap_state.c | 1 + + mm/truncate.c | 1 + + mm/vmscan.c | 2 +- + mm/vmstat.c | 1 + + net/802/garp.c | 1 + + net/802/p8022.c | 1 + + net/802/p8023.c | 1 + + net/802/psnap.c | 1 + + net/802/stp.c | 1 + + net/802/tr.c | 1 + + net/8021q/vlan.c | 1 + + net/8021q/vlan_dev.c | 1 + + net/9p/client.c | 1 + + net/9p/protocol.c | 1 + + net/9p/trans_fd.c | 1 + + net/9p/trans_rdma.c | 1 + + net/9p/trans_virtio.c | 1 + + net/9p/util.c | 1 + + net/appletalk/aarp.c | 1 + + net/appletalk/ddp.c | 1 + + net/atm/addr.c | 1 + + net/atm/atm_sysfs.c | 1 + + net/atm/br2684.c | 1 + + net/atm/clip.c | 1 + + net/atm/common.c | 1 + + net/atm/lec.c | 1 + + net/atm/mpc.c | 1 + + net/atm/mpoa_caches.c | 1 + + net/atm/mpoa_proc.c | 1 + + net/atm/pppoatm.c | 1 + + net/atm/proc.c | 1 + + net/atm/raw.c | 1 + + net/atm/resources.c | 1 + + net/atm/signaling.c | 1 + + net/ax25/af_ax25.c | 1 + + net/ax25/ax25_dev.c | 1 + + net/ax25/ax25_ds_subr.c | 1 + + net/ax25/ax25_iface.c | 1 + + net/ax25/ax25_in.c | 1 + + net/ax25/ax25_ip.c | 1 + + net/ax25/ax25_out.c | 1 + + net/ax25/ax25_route.c | 1 + + net/ax25/ax25_subr.c | 1 + + net/ax25/ax25_uid.c | 1 + + net/ax25/sysctl_net_ax25.c | 1 + + net/bluetooth/af_bluetooth.c | 1 - + net/bluetooth/bnep/core.c | 1 + + net/bluetooth/bnep/netdev.c | 1 + + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_sysfs.c | 1 + + net/bluetooth/hidp/sock.c | 2 +- + net/bluetooth/rfcomm/core.c | 1 + + net/bridge/br_fdb.c | 1 + + net/bridge/br_forward.c | 1 + + net/bridge/br_if.c | 1 + + net/bridge/br_input.c | 1 + + net/bridge/br_ioctl.c | 1 + + net/bridge/br_netfilter.c | 1 + + net/bridge/br_netlink.c | 1 + + net/bridge/br_stp_bpdu.c | 1 + + net/bridge/netfilter/ebt_ulog.c | 1 + + net/bridge/netfilter/ebtables.c | 1 + + net/can/bcm.c | 1 + + net/can/raw.c | 1 + + net/compat.c | 1 + + net/core/datagram.c | 1 + + net/core/dev.c | 1 + + net/core/drop_monitor.c | 1 + + net/core/dst.c | 1 + + net/core/ethtool.c | 1 + + net/core/fib_rules.c | 1 + + net/core/filter.c | 1 + + net/core/gen_estimator.c | 1 + + net/core/iovec.c | 1 - + net/core/link_watch.c | 1 - + net/core/neighbour.c | 1 + + net/core/net-sysfs.c | 1 + + net/core/net-traces.c | 1 + + net/core/netpoll.c | 1 + + net/core/scm.c | 1 + + net/core/sysctl_net_core.c | 1 + + net/dcb/dcbnl.c | 1 + + net/dccp/ccid.c | 2 + + net/dccp/ccids/ccid2.c | 1 + + net/dccp/feat.c | 1 + + net/dccp/input.c | 1 + + net/dccp/ipv4.c | 1 + + net/dccp/ipv6.c | 1 + + net/dccp/minisocks.c | 1 + + net/dccp/output.c | 1 + + net/dccp/probe.c | 1 + + net/dccp/proto.c | 1 + + net/decnet/dn_dev.c | 1 + + net/decnet/dn_fib.c | 1 + + net/decnet/dn_neigh.c | 1 + + net/decnet/dn_nsp_in.c | 1 + + net/decnet/dn_nsp_out.c | 1 + + net/decnet/dn_route.c | 1 + + net/decnet/dn_table.c | 1 + + net/decnet/netfilter/dn_rtmsg.c | 1 + + net/dsa/dsa.c | 1 + + net/dsa/tag_dsa.c | 1 + + net/dsa/tag_edsa.c | 1 + + net/dsa/tag_trailer.c | 1 + + net/econet/af_econet.c | 1 + + net/ethernet/pe2.c | 1 + + net/ieee802154/af_ieee802154.c | 1 + + net/ieee802154/dgram.c | 1 + + net/ieee802154/netlink.c | 1 + + net/ieee802154/nl-mac.c | 1 + + net/ieee802154/nl-phy.c | 1 + + net/ieee802154/raw.c | 1 + + net/ieee802154/wpan-class.c | 1 + + net/ipv4/af_inet.c | 1 + + net/ipv4/ah4.c | 1 + + net/ipv4/arp.c | 1 + + net/ipv4/cipso_ipv4.c | 1 + + net/ipv4/devinet.c | 1 + + net/ipv4/fib_frontend.c | 1 + + net/ipv4/fib_hash.c | 1 + + net/ipv4/fib_semantics.c | 1 + + net/ipv4/fib_trie.c | 1 + + net/ipv4/icmp.c | 1 + + net/ipv4/igmp.c | 1 + + net/ipv4/inet_diag.c | 1 + + net/ipv4/inet_fragment.c | 1 + + net/ipv4/inet_timewait_sock.c | 1 + + net/ipv4/ip_forward.c | 1 + + net/ipv4/ip_fragment.c | 1 + + net/ipv4/ip_gre.c | 1 + + net/ipv4/ip_input.c | 1 + + net/ipv4/ip_options.c | 1 + + net/ipv4/ip_output.c | 1 + + net/ipv4/ip_sockglue.c | 1 + + net/ipv4/ipconfig.c | 1 + + net/ipv4/ipip.c | 1 + + net/ipv4/ipmr.c | 1 + + net/ipv4/netfilter.c | 1 + + net/ipv4/netfilter/arptable_filter.c | 1 + + net/ipv4/netfilter/ip_queue.c | 1 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 1 + + net/ipv4/netfilter/ipt_REJECT.c | 1 + + net/ipv4/netfilter/ipt_ULOG.c | 1 + + net/ipv4/netfilter/iptable_filter.c | 1 + + net/ipv4/netfilter/iptable_mangle.c | 1 + + net/ipv4/netfilter/iptable_raw.c | 1 + + net/ipv4/netfilter/iptable_security.c | 1 + + net/ipv4/netfilter/nf_nat_core.c | 1 + + net/ipv4/netfilter/nf_nat_helper.c | 1 + + net/ipv4/netfilter/nf_nat_rule.c | 1 + + net/ipv4/netfilter/nf_nat_snmp_basic.c | 1 + + net/ipv4/netfilter/nf_nat_standalone.c | 1 + + net/ipv4/raw.c | 1 - + net/ipv4/route.c | 1 + + net/ipv4/sysctl_net_ipv4.c | 1 + + net/ipv4/tcp.c | 1 + + net/ipv4/tcp_cong.c | 1 + + net/ipv4/tcp_input.c | 1 + + net/ipv4/tcp_ipv4.c | 1 + + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 1 + + net/ipv4/tcp_probe.c | 1 + + net/ipv4/tcp_timer.c | 1 + + net/ipv4/tunnel4.c | 1 + + net/ipv4/udp.c | 1 + + net/ipv4/xfrm4_input.c | 1 + + net/ipv4/xfrm4_mode_tunnel.c | 1 + + net/ipv6/addrconf.c | 1 + + net/ipv6/addrlabel.c | 1 + + net/ipv6/af_inet6.c | 1 + + net/ipv6/ah6.c | 1 + + net/ipv6/anycast.c | 1 + + net/ipv6/datagram.c | 1 + + net/ipv6/exthdrs.c | 1 + + net/ipv6/icmp.c | 1 + + net/ipv6/inet6_connection_sock.c | 1 + + net/ipv6/ip6_fib.c | 1 + + net/ipv6/ip6_flowlabel.c | 1 + + net/ipv6/ip6_input.c | 1 + + net/ipv6/ip6_output.c | 1 + + net/ipv6/ip6_tunnel.c | 1 + + net/ipv6/ip6mr.c | 1 + + net/ipv6/ipv6_sockglue.c | 1 + + net/ipv6/mcast.c | 1 + + net/ipv6/ndisc.c | 1 + + net/ipv6/netfilter/ip6_queue.c | 1 + + net/ipv6/netfilter/ip6t_REJECT.c | 1 + + net/ipv6/netfilter/ip6table_filter.c | 1 + + net/ipv6/netfilter/ip6table_mangle.c | 1 + + net/ipv6/netfilter/ip6table_raw.c | 1 + + net/ipv6/netfilter/ip6table_security.c | 1 + + net/ipv6/netfilter/nf_conntrack_reasm.c | 1 + + net/ipv6/raw.c | 1 + + net/ipv6/reassembly.c | 1 + + net/ipv6/route.c | 1 + + net/ipv6/sit.c | 1 + + net/ipv6/sysctl_net_ipv6.c | 1 + + net/ipv6/tcp_ipv6.c | 1 + + net/ipv6/tunnel6.c | 1 + + net/ipv6/udp.c | 1 + + net/ipv6/xfrm6_mode_tunnel.c | 1 + + net/ipv6/xfrm6_tunnel.c | 1 + + net/ipx/af_ipx.c | 1 + + net/ipx/ipx_route.c | 1 + + net/irda/af_irda.c | 1 + + net/irda/discovery.c | 1 + + net/irda/ircomm/ircomm_core.c | 1 + + net/irda/ircomm/ircomm_lmp.c | 1 + + net/irda/ircomm/ircomm_param.c | 1 + + net/irda/ircomm/ircomm_tty.c | 1 + + net/irda/irda_device.c | 1 + + net/irda/iriap.c | 1 + + net/irda/iriap_event.c | 2 + + net/irda/irias_object.c | 1 + + net/irda/irlan/irlan_client.c | 1 + + net/irda/irlan/irlan_common.c | 1 + + net/irda/irlan/irlan_provider.c | 1 + + net/irda/irlap_event.c | 1 + + net/irda/irlap_frame.c | 1 + + net/irda/irnet/irnet_irda.c | 1 + + net/irda/irnet/irnet_ppp.c | 1 + + net/irda/irnetlink.c | 1 + + net/irda/irqueue.c | 1 + + net/irda/irttp.c | 1 + + net/key/af_key.c | 1 + + net/lapb/lapb_iface.c | 1 + + net/lapb/lapb_in.c | 1 + + net/lapb/lapb_out.c | 1 + + net/lapb/lapb_subr.c | 1 + + net/llc/af_llc.c | 1 + + net/llc/llc_c_ac.c | 1 + + net/llc/llc_conn.c | 1 + + net/llc/llc_if.c | 1 + + net/llc/llc_input.c | 1 + + net/llc/llc_sap.c | 1 + + net/llc/llc_station.c | 1 + + net/mac80211/agg-rx.c | 1 + + net/mac80211/agg-tx.c | 1 + + net/mac80211/cfg.c | 1 + + net/mac80211/debugfs_key.c | 1 + + net/mac80211/debugfs_netdev.c | 1 + + net/mac80211/ibss.c | 1 + + net/mac80211/iface.c | 1 + + net/mac80211/key.c | 1 + + net/mac80211/led.c | 1 + + net/mac80211/mesh.c | 1 + + net/mac80211/mesh_hwmp.c | 1 + + net/mac80211/mesh_pathtbl.c | 1 + + net/mac80211/mesh_plink.c | 1 + + net/mac80211/mlme.c | 1 + + net/mac80211/rate.c | 1 + + net/mac80211/rc80211_minstrel.c | 1 + + net/mac80211/rc80211_minstrel_debugfs.c | 1 + + net/mac80211/rc80211_pid_algo.c | 1 + + net/mac80211/rc80211_pid_debugfs.c | 1 + + net/mac80211/rx.c | 1 + + net/mac80211/scan.c | 1 + + net/mac80211/wep.c | 1 + + net/mac80211/work.c | 1 + + net/mac80211/wpa.c | 2 +- + net/netfilter/core.c | 1 + + net/netfilter/ipvs/ip_vs_app.c | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 1 + + net/netfilter/ipvs/ip_vs_core.c | 1 + + net/netfilter/ipvs/ip_vs_ctl.c | 1 + + net/netfilter/ipvs/ip_vs_dh.c | 1 + + net/netfilter/ipvs/ip_vs_est.c | 1 - + net/netfilter/ipvs/ip_vs_ftp.c | 1 + + net/netfilter/ipvs/ip_vs_lblc.c | 1 + + net/netfilter/ipvs/ip_vs_lblcr.c | 1 + + net/netfilter/ipvs/ip_vs_proto.c | 1 + + net/netfilter/ipvs/ip_vs_sh.c | 1 + + net/netfilter/ipvs/ip_vs_wrr.c | 1 + + net/netfilter/ipvs/ip_vs_xmit.c | 1 + + net/netfilter/nf_conntrack_acct.c | 1 + + net/netfilter/nf_conntrack_amanda.c | 1 + + net/netfilter/nf_conntrack_ecache.c | 1 + + net/netfilter/nf_conntrack_ftp.c | 1 + + net/netfilter/nf_conntrack_h323_main.c | 1 + + net/netfilter/nf_conntrack_helper.c | 1 - + net/netfilter/nf_conntrack_irc.c | 1 + + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netfilter/nf_conntrack_proto.c | 1 + + net/netfilter/nf_conntrack_proto_dccp.c | 1 + + net/netfilter/nf_conntrack_proto_gre.c | 1 + + net/netfilter/nf_conntrack_sane.c | 1 + + net/netfilter/nf_conntrack_standalone.c | 1 + + net/netfilter/nf_queue.c | 1 + + net/netfilter/nfnetlink_log.c | 1 + + net/netfilter/nfnetlink_queue.c | 1 + + net/netfilter/x_tables.c | 1 + + net/netfilter/xt_CT.c | 1 + + net/netfilter/xt_LED.c | 1 + + net/netfilter/xt_RATEEST.c | 1 + + net/netfilter/xt_TCPMSS.c | 1 + + net/netfilter/xt_connlimit.c | 1 + + net/netfilter/xt_dccp.c | 1 + + net/netfilter/xt_limit.c | 1 + + net/netfilter/xt_quota.c | 1 + + net/netfilter/xt_recent.c | 1 + + net/netfilter/xt_statistic.c | 1 + + net/netfilter/xt_string.c | 1 + + net/netlabel/netlabel_cipso_v4.c | 1 + + net/netlabel/netlabel_domainhash.c | 1 + + net/netlabel/netlabel_kapi.c | 1 + + net/netlabel/netlabel_mgmt.c | 1 + + net/netlabel/netlabel_unlabeled.c | 1 + + net/netlabel/netlabel_user.c | 1 + + net/netlink/genetlink.c | 1 + + net/netrom/af_netrom.c | 1 + + net/netrom/nr_dev.c | 1 + + net/netrom/nr_in.c | 1 + + net/netrom/nr_loopback.c | 1 + + net/netrom/nr_out.c | 1 + + net/netrom/nr_route.c | 1 + + net/netrom/nr_subr.c | 1 + + net/packet/af_packet.c | 1 + + net/phonet/af_phonet.c | 1 + + net/phonet/datagram.c | 1 + + net/phonet/pep.c | 1 + + net/phonet/pn_dev.c | 1 + + net/phonet/pn_netlink.c | 1 + + net/phonet/socket.c | 1 + + net/rds/af_rds.c | 1 + + net/rds/cong.c | 1 + + net/rds/connection.c | 1 + + net/rds/ib.c | 1 + + net/rds/ib_cm.c | 1 + + net/rds/ib_rdma.c | 1 + + net/rds/ib_recv.c | 1 + + net/rds/info.c | 1 + + net/rds/iw.c | 1 + + net/rds/iw_cm.c | 1 + + net/rds/iw_rdma.c | 1 + + net/rds/iw_recv.c | 1 + + net/rds/loop.c | 1 + + net/rds/message.c | 1 + + net/rds/page.c | 1 + + net/rds/rdma.c | 1 + + net/rds/recv.c | 1 + + net/rds/send.c | 1 + + net/rds/tcp.c | 1 + + net/rds/tcp_listen.c | 1 + + net/rds/tcp_recv.c | 1 + + net/rfkill/core.c | 1 + + net/rose/af_rose.c | 1 + + net/rose/rose_dev.c | 1 + + net/rose/rose_link.c | 1 + + net/rose/rose_loopback.c | 1 + + net/rose/rose_out.c | 1 + + net/rose/rose_route.c | 1 + + net/rose/rose_subr.c | 1 + + net/rxrpc/af_rxrpc.c | 1 + + net/rxrpc/ar-accept.c | 1 + + net/rxrpc/ar-ack.c | 1 + + net/rxrpc/ar-call.c | 1 + + net/rxrpc/ar-connection.c | 1 + + net/rxrpc/ar-input.c | 1 + + net/rxrpc/ar-key.c | 1 + + net/rxrpc/ar-local.c | 1 + + net/rxrpc/ar-output.c | 1 + + net/rxrpc/ar-peer.c | 1 + + net/rxrpc/ar-transport.c | 1 + + net/rxrpc/rxkad.c | 1 + + net/sched/act_api.c | 1 + + net/sched/act_ipt.c | 1 + + net/sched/act_mirred.c | 1 + + net/sched/act_pedit.c | 1 + + net/sched/act_police.c | 1 + + net/sched/act_simple.c | 1 + + net/sched/cls_api.c | 1 + + net/sched/cls_basic.c | 1 + + net/sched/cls_cgroup.c | 1 + + net/sched/cls_flow.c | 1 + + net/sched/cls_fw.c | 1 + + net/sched/cls_route.c | 1 + + net/sched/cls_tcindex.c | 1 + + net/sched/cls_u32.c | 1 + + net/sched/em_meta.c | 1 + + net/sched/em_nbyte.c | 1 + + net/sched/em_text.c | 1 + + net/sched/ematch.c | 1 + + net/sched/sch_api.c | 1 + + net/sched/sch_atm.c | 1 + + net/sched/sch_cbq.c | 1 + + net/sched/sch_drr.c | 1 + + net/sched/sch_dsmark.c | 1 + + net/sched/sch_fifo.c | 1 + + net/sched/sch_generic.c | 1 + + net/sched/sch_gred.c | 1 + + net/sched/sch_htb.c | 1 + + net/sched/sch_mq.c | 1 + + net/sched/sch_multiq.c | 1 + + net/sched/sch_netem.c | 1 + + net/sched/sch_prio.c | 1 + + net/sched/sch_sfq.c | 1 + + net/sched/sch_teql.c | 1 + + net/sctp/auth.c | 1 + + net/sctp/bind_addr.c | 1 + + net/sctp/chunk.c | 1 + + net/sctp/input.c | 1 + + net/sctp/inqueue.c | 1 + + net/sctp/ipv6.c | 1 + + net/sctp/output.c | 1 + + net/sctp/outqueue.c | 1 + + net/sctp/primitive.c | 1 + + net/sctp/protocol.c | 1 + + net/sctp/sm_make_chunk.c | 1 + + net/sctp/sm_sideeffect.c | 1 + + net/sctp/sm_statefuns.c | 1 + + net/sctp/socket.c | 1 + + net/sctp/ssnmap.c | 1 + + net/sctp/transport.c | 1 + + net/sctp/tsnmap.c | 1 + + net/sctp/ulpevent.c | 1 + + net/sctp/ulpqueue.c | 1 + + net/socket.c | 1 + + net/sunrpc/addr.c | 1 + + net/sunrpc/auth_generic.c | 1 + + net/sunrpc/auth_gss/gss_generic_token.c | 1 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - + net/sunrpc/auth_gss/gss_krb5_seal.c | 1 - + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 1 - + net/sunrpc/auth_gss/gss_krb5_unseal.c | 1 - + net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - + net/sunrpc/auth_gss/gss_spkm3_seal.c | 1 - + net/sunrpc/auth_gss/svcauth_gss.c | 1 + + net/sunrpc/auth_unix.c | 1 + + net/sunrpc/backchannel_rqst.c | 1 + + net/sunrpc/rpcb_clnt.c | 1 + + net/sunrpc/socklib.c | 1 + + net/sunrpc/stats.c | 1 + + net/sunrpc/svc.c | 1 + + net/sunrpc/svc_xprt.c | 1 + + net/sunrpc/svcauth_unix.c | 1 + + net/sunrpc/xdr.c | 1 + + net/sunrpc/xprtrdma/svc_rdma.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + + net/sunrpc/xprtrdma/transport.c | 1 + + net/sunrpc/xprtrdma/verbs.c | 1 + + net/tipc/core.h | 1 + + net/tipc/eth_media.c | 1 + + net/tipc/socket.c | 2 +- + net/unix/garbage.c | 1 - + net/unix/sysctl_net_unix.c | 1 + + net/wimax/op-msg.c | 1 + + net/wimax/stack.c | 1 + + net/wireless/core.c | 1 + + net/wireless/debugfs.c | 1 + + net/wireless/ibss.c | 1 + + net/wireless/mlme.c | 1 + + net/wireless/nl80211.c | 1 + + net/wireless/reg.c | 1 + + net/wireless/scan.c | 1 + + net/wireless/sme.c | 1 + + net/wireless/util.c | 1 + + net/wireless/wext-compat.c | 1 + + net/wireless/wext-core.c | 1 + + net/wireless/wext-priv.c | 1 + + net/wireless/wext-sme.c | 1 + + net/x25/af_x25.c | 1 + + net/x25/x25_dev.c | 1 + + net/x25/x25_forward.c | 1 + + net/x25/x25_in.c | 1 + + net/x25/x25_link.c | 1 + + net/x25/x25_out.c | 1 + + net/x25/x25_route.c | 1 + + net/x25/x25_subr.c | 1 + + net/xfrm/xfrm_ipcomp.c | 2 +- + net/xfrm/xfrm_output.c | 1 + + net/xfrm/xfrm_state.c | 1 + + net/xfrm/xfrm_sysctl.c | 1 + + samples/kobject/kset-example.c | 1 + + security/device_cgroup.c | 1 + + security/integrity/ima/ima_api.c | 1 + + security/integrity/ima/ima_audit.c | 1 + + security/integrity/ima/ima_crypto.c | 1 + + security/integrity/ima/ima_fs.c | 1 + + security/integrity/ima/ima_iint.c | 1 + + security/integrity/ima/ima_init.c | 1 + + security/integrity/ima/ima_main.c | 1 + + security/integrity/ima/ima_policy.c | 1 + + security/integrity/ima/ima_queue.c | 1 + + security/keys/proc.c | 1 - + security/keys/process_keys.c | 1 - + security/lsm_audit.c | 1 + + security/selinux/netif.c | 1 + + security/selinux/netlabel.c | 1 + + security/selinux/netlink.c | 1 + + security/selinux/netnode.c | 1 + + security/selinux/netport.c | 1 + + security/selinux/xfrm.c | 1 + + security/smack/smack_access.c | 1 + + security/smack/smack_lsm.c | 1 + + security/smack/smackfs.c | 1 + + security/tomoyo/common.c | 1 + + security/tomoyo/domain.c | 1 + + security/tomoyo/file.c | 1 + + security/tomoyo/gc.c | 1 + + security/tomoyo/realpath.c | 1 + + sound/aoa/codecs/onyx.c | 1 + + sound/aoa/codecs/tas.c | 1 + + sound/aoa/codecs/toonie.c | 1 + + sound/aoa/core/gpio-pmf.c | 1 + + sound/aoa/fabrics/layout.c | 1 + + sound/aoa/soundbus/i2sbus/control.c | 1 + + sound/aoa/soundbus/i2sbus/core.c | 1 + + sound/aoa/soundbus/i2sbus/pcm.c | 1 + + sound/arm/pxa2xx-pcm-lib.c | 1 + + sound/core/control_compat.c | 1 + + sound/core/hrtimer.c | 1 + + sound/core/info.c | 1 + + sound/core/jack.c | 1 + + sound/core/misc.c | 1 + + sound/core/oss/route.c | 1 - + sound/core/pcm_compat.c | 1 + + sound/core/pcm_memory.c | 1 + + sound/core/seq/oss/seq_oss_init.c | 1 + + sound/core/seq/oss/seq_oss_midi.c | 1 + + sound/core/seq/oss/seq_oss_readq.c | 1 + + sound/core/seq/oss/seq_oss_synth.c | 1 + + sound/core/seq/oss/seq_oss_timer.c | 1 + + sound/core/seq/oss/seq_oss_writeq.c | 1 + + sound/core/seq/seq_compat.c | 1 + + sound/core/seq/seq_system.c | 1 + + sound/drivers/ml403-ac97cr.c | 1 + + sound/drivers/mtpav.c | 1 - + sound/drivers/mts64.c | 1 + + sound/drivers/opl3/opl3_oss.c | 1 - + sound/drivers/opl3/opl3_synth.c | 1 + + sound/drivers/opl4/opl4_lib.c | 1 + + sound/drivers/pcsp/pcsp_lib.c | 1 + + sound/drivers/portman2x4.c | 1 + + sound/drivers/vx/vx_hwdep.c | 1 + + sound/i2c/other/tea575x-tuner.c | 1 + + sound/isa/cmi8330.c | 1 - + sound/isa/cs423x/cs4236.c | 1 - + sound/isa/es18xx.c | 1 - + sound/isa/gus/interwave.c | 1 - + sound/isa/msnd/msnd_midi.c | 1 + + sound/isa/opl3sa2.c | 1 - + sound/isa/opti9xx/miro.c | 1 - + sound/isa/opti9xx/opti92x-ad1848.c | 1 - + sound/isa/sb/emu8000_pcm.c | 1 + + sound/isa/sb/sb16.c | 1 - + sound/isa/sb/sb8.c | 1 - + sound/isa/wavefront/wavefront.c | 1 - + sound/isa/wavefront/wavefront_fx.c | 1 + + sound/isa/wavefront/wavefront_synth.c | 1 + + sound/mips/hal2.c | 1 + + sound/mips/sgio2audio.c | 2 +- + sound/oss/ad1848.c | 1 + + sound/oss/dmabuf.c | 1 + + sound/oss/kahlua.c | 1 + + sound/oss/mpu401.c | 1 + + sound/oss/msnd.c | 1 - + sound/oss/msnd_pinnacle.c | 2 +- + sound/oss/opl3.c | 1 + + sound/oss/sb_card.c | 1 + + sound/oss/sb_common.c | 1 + + sound/oss/sb_midi.c | 1 + + sound/oss/sb_mixer.c | 2 + + sound/oss/soundcard.c | 1 - + sound/oss/uart401.c | 1 + + sound/oss/v_midi.c | 1 + + sound/oss/vidc.c | 1 + + sound/oss/vwsnd.c | 1 + + sound/oss/waveartist.c | 1 + + sound/pci/ac97/ac97_proc.c | 1 - + sound/pci/als4000.c | 1 - + sound/pci/aw2/aw2-saa7146.c | 1 - + sound/pci/ca0106/ca0106_mixer.c | 1 - + sound/pci/ca0106/ca0106_proc.c | 1 - + sound/pci/cs5530.c | 1 + + sound/pci/cs5535audio/cs5535audio_pcm.c | 1 - + sound/pci/cs5535audio/cs5535audio_pm.c | 1 - + sound/pci/ctxfi/ctatc.c | 1 + + sound/pci/ctxfi/ctpcm.c | 1 + + sound/pci/echoaudio/darla20.c | 2 +- + sound/pci/echoaudio/darla24.c | 2 +- + sound/pci/echoaudio/echo3g.c | 2 +- + sound/pci/echoaudio/gina20.c | 2 +- + sound/pci/echoaudio/gina24.c | 2 +- + sound/pci/echoaudio/indigo.c | 2 +- + sound/pci/echoaudio/indigodj.c | 2 +- + sound/pci/echoaudio/indigodjx.c | 2 +- + sound/pci/echoaudio/indigoio.c | 2 +- + sound/pci/echoaudio/indigoiox.c | 2 +- + sound/pci/echoaudio/layla20.c | 2 +- + sound/pci/echoaudio/layla24.c | 2 +- + sound/pci/echoaudio/mia.c | 2 +- + sound/pci/echoaudio/mona.c | 2 +- + sound/pci/emu10k1/memory.c | 1 + + sound/pci/hda/hda_beep.c | 1 + + sound/pci/hda/hda_eld.c | 1 + + sound/pci/ice1712/ak4xxx.c | 1 + + sound/pci/ice1712/amp.c | 1 - + sound/pci/ice1712/vt1720_mobo.c | 1 - + sound/pci/ice1712/wtm.c | 1 - + sound/pci/lx6464es/lx6464es.c | 1 + + sound/pci/mixart/mixart.c | 1 + + sound/pci/mixart/mixart_hwdep.c | 1 + + sound/pci/oxygen/oxygen_lib.c | 1 + + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 1 - + sound/pci/rme9652/hdsp.c | 1 - + sound/pci/rme9652/rme9652.c | 1 - + sound/pci/sis7019.c | 1 + + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 1 + + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 1 - + sound/pcmcia/vx/vxpocket.c | 1 + + sound/ppc/burgundy.c | 1 - + sound/ppc/keywest.c | 1 - + sound/ppc/snd_ps3.c | 2 +- + sound/sh/sh_dac_audio.c | 1 + + sound/soc/au1x/psc-ac97.c | 1 + + sound/soc/au1x/psc-i2s.c | 1 + + sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- + sound/soc/blackfin/bf5xx-ac97.c | 1 + + sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 2 +- + sound/soc/codecs/ac97.c | 1 + + sound/soc/codecs/ad1836.c | 1 + + sound/soc/codecs/ad1980.c | 1 + + sound/soc/codecs/ad73311.c | 1 + + sound/soc/codecs/ads117x.c | 1 + + sound/soc/codecs/ak4104.c | 1 + + sound/soc/codecs/ak4535.c | 1 + + sound/soc/codecs/ak4642.c | 1 + + sound/soc/codecs/ak4671.c | 1 + + sound/soc/codecs/cs4270.c | 1 + + sound/soc/codecs/cx20442.c | 1 + + sound/soc/codecs/da7210.c | 1 + + sound/soc/codecs/pcm3008.c | 1 + + sound/soc/codecs/ssm2602.c | 1 + + sound/soc/codecs/stac9766.c | 1 + + sound/soc/codecs/tlv320aic23.c | 1 + + sound/soc/codecs/tlv320aic26.c | 1 + + sound/soc/codecs/tlv320aic3x.c | 1 + + sound/soc/codecs/tlv320dac33.c | 1 + + sound/soc/codecs/tpa6130a2.c | 1 + + sound/soc/codecs/twl4030.c | 1 + + sound/soc/codecs/uda134x.c | 1 + + sound/soc/codecs/wm2000.c | 1 + + sound/soc/codecs/wm8350.c | 1 + + sound/soc/codecs/wm8400.c | 1 + + sound/soc/codecs/wm8510.c | 1 + + sound/soc/codecs/wm8523.c | 1 + + sound/soc/codecs/wm8580.c | 1 + + sound/soc/codecs/wm8711.c | 1 + + sound/soc/codecs/wm8727.c | 1 + + sound/soc/codecs/wm8728.c | 1 + + sound/soc/codecs/wm8731.c | 1 + + sound/soc/codecs/wm8750.c | 1 + + sound/soc/codecs/wm8753.c | 1 + + sound/soc/codecs/wm8776.c | 1 + + sound/soc/codecs/wm8900.c | 1 + + sound/soc/codecs/wm8903.c | 1 + + sound/soc/codecs/wm8904.c | 1 + + sound/soc/codecs/wm8940.c | 1 + + sound/soc/codecs/wm8955.c | 1 + + sound/soc/codecs/wm8960.c | 1 + + sound/soc/codecs/wm8961.c | 1 + + sound/soc/codecs/wm8971.c | 1 + + sound/soc/codecs/wm8974.c | 1 + + sound/soc/codecs/wm8978.c | 1 + + sound/soc/codecs/wm8988.c | 1 + + sound/soc/codecs/wm8990.c | 1 + + sound/soc/codecs/wm8993.c | 1 + + sound/soc/codecs/wm8994.c | 1 + + sound/soc/codecs/wm9081.c | 1 + + sound/soc/codecs/wm9705.c | 1 + + sound/soc/codecs/wm9712.c | 1 + + sound/soc/codecs/wm9713.c | 1 + + sound/soc/davinci/davinci-i2s.c | 1 + + sound/soc/davinci/davinci-mcasp.c | 1 + + sound/soc/fsl/fsl_dma.c | 1 + + sound/soc/fsl/fsl_ssi.c | 1 + + sound/soc/fsl/mpc5200_dma.c | 1 + + sound/soc/fsl/mpc8610_hpcd.c | 1 + + sound/soc/fsl/soc-of-simple.c | 1 + + sound/soc/imx/imx-pcm-dma-mx2.c | 1 + + sound/soc/imx/imx-pcm-fiq.c | 1 + + sound/soc/imx/imx-ssi.c | 1 + + sound/soc/omap/mcpdm.c | 1 + + sound/soc/omap/omap-pcm.c | 1 + + sound/soc/pxa/pxa-ssp.c | 1 + + sound/soc/s6000/s6000-i2s.c | 1 + + sound/soc/sh/dma-sh7760.c | 1 + + sound/soc/sh/fsi.c | 1 + + sound/soc/sh/siu_dai.c | 1 + + sound/soc/sh/siu_pcm.c | 1 - + sound/soc/soc-core.c | 1 + + sound/soc/soc-dapm.c | 1 + + sound/soc/txx9/txx9aclc-ac97.c | 1 + + sound/soc/txx9/txx9aclc.c | 1 + + sound/sound_firmware.c | 1 - + sound/sparc/cs4231.c | 1 - + sound/sparc/dbri.c | 1 + + sound/synth/emux/emux_proc.c | 1 - + sound/usb/caiaq/audio.c | 1 + + sound/usb/caiaq/device.c | 1 + + sound/usb/caiaq/midi.c | 1 + + sound/usb/usx2y/us122l.c | 1 + + sound/usb/usx2y/usX2Yhwdep.c | 1 + + sound/usb/usx2y/usb_stream.c | 1 + + sound/usb/usx2y/usbusx2y.c | 1 + + sound/usb/usx2y/usbusx2yaudio.c | 1 + + sound/usb/usx2y/usx2yhwdeppcm.c | 1 + + tools/perf/builtin-kmem.c | 1 + + virt/kvm/assigned-dev.c | 1 + + virt/kvm/coalesced_mmio.c | 1 + + virt/kvm/eventfd.c | 1 + + virt/kvm/ioapic.c | 1 + + virt/kvm/irq_comm.c | 1 + + virt/kvm/kvm_main.c | 2 +- + 4212 files changed, 3759 insertions(+), 743 deletions(-) + create mode 100644 mm/percpu_up.c +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 000000000000..57229885b3a4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,58 @@ +Importing driver-core.current based on 2.6.34-rc2 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing staging.current based on quilt/usb.current +Unchanged quilt series staging.current +Importing i2c based on 2.6.34-rc2-git4 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 9623e5a23724d09283c238960946ec6f65733afe +HEAD is now at 9623e5a Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-i801-02-new-parameter-to-disable-features.patch +i2c-i801-03-default-to-all-features-present.patch +i2c-i801-04-coding-style-fixes.patch +i2c-scx200_acb-make-pci-device-ids-constant.patch +i2c-stub-show-actual-functionality.patch +eeprom-at24-fallback-to-byte-reads.patch +i2c-dev-remove-unnecessary-casts.patch +i2c-parport-make-template-struct-const.patch +i2c-fix-bus-level-power-management-callbacks.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 3ea5213...b10ff46 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.34-rc2-git4 +$ cd ../quilt-tmp +$ git reset --hard 9623e5a23724d09283c238960946ec6f65733afe +HEAD is now at 9623e5a Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-asus_atk0110-dont-use-if-unsafe.patch +hwmon-lm63-add-basic-support-for-lm64.patch +hwmon-f71882fg-01-fixed-braces-coding-style-issues.patch +hwmon-f71882fg-02-use-strict_strtol-instead-of-simple_strtol.patch +hwmon-f71882fg-03-code-cleanup.patch +hwmon-f71882fg-04-properly-acquire-io-regions-while-probing.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + ba2e26b...3934565 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.34-rc2 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.33-rc7-10-g6339204 +Unchanged quilt series rr +Importing device-mapper based on v2.6.33-5070-g64ba992 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb +Importing staging based on quilt/usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..82edf9fb54de --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100331 |