From e01658a3cf94364df08d44ecbc6f552293398566 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Sat, 22 May 2010 16:54:34 +1000 Subject: Add linux-next specific files for 20100522 Signed-off-by: Stephen Rothwell --- Next/SHA1s | 162 ++ Next/Trees | 164 ++ Next/merge.log | 6628 +++++++++++++++++++++++++++++++++++++++++++++++++ Next/quilt-import.log | 153 ++ localversion-next | 1 + 5 files changed, 7108 insertions(+) create mode 100644 Next/SHA1s create mode 100644 Next/Trees create mode 100644 Next/merge.log create mode 100644 Next/quilt-import.log create mode 100644 localversion-next diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..6683ea01ee3c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,162 @@ +Name SHA1 +---- ---- +origin f4b87dee923342505e1ddba8d34ce9de33e75050 +fixes 7b2762f796342bf22e13b53276e885b02cd0f50e +arm-current a901ff715d53c109821cbbd9d7ea1f2a311646a9 +m68k-current 92183b346f02773dae09182c65f16b013f295d80 +powerpc-merge 7a9b149212f3716c598afe973b6261fd58453b7a +sparc-current f72caf7e496465182eeda842ac66a5e75404ddf1 +scsi-rc-fixes 1b4d0d8ea7b3cbd107f345ab766416f9b38ce66a +net-current 76cc8b13a6e41b537fd262b600da1571314add62 +sound-current d71f4cece4bd97d05592836202fc04ff2e7817e3 +pci-current fc2a093e7ad23e935aa29e349bc27173c92f1a95 +wireless-current 79fa6c99556631c98c7296a1db078e5f80e53a87 +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +tty.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +usb.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +staging.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +cpufreq-current fd187aaf980c45f1d16a94a846faa68e24de03c8 +input-current a62f0d27b4196bad5e900d766b285feb7069cd16 +md-current 19fdb9eefb21b72edbc365b838502780c392bad6 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current e954bc91bdd4bb08b8325478c5004b24a23a3522 +ide-curent a9ddabc52ce3757a4331d6c1e8bf4065333cc51b +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current 95b1ed2ac7ffe3205afc6f5a20320fbdb984da92 +arm 27ada410c7a56e72fd8c5d304704fbf5cb685659 +davinci 5e682ef825302f2378726e44257291eaeadbfd50 +i.MX 54c1f6367c2836a85e821a010085ed04ab2235bc +msm 5f4088e60da385e14343785f3144564b68d7c2b7 +omap f6304f5804f228b6c2fea9e3dfac25c5b2db9b38 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 49369a5615089c7b737b441372f08003ea850e07 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 39710479303fd3affb3e204e9a7a75cc676977b5 +cris f35d77645808d1b890abb1a36260bf228854259e +ia64 024a6b95181f2df6090975c8a293499d24bf8b28 +m68k 6987b1a7598bb48e021b99b2fe8309250db2318a +m68knommu 1f93acba01a980404535af119c0acb59f3492943 +microblaze d67290a02b045d41429a6bc9e515600a119664a5 +mips a5a1ecf6d741bb0cbe1c86c7e12057d0cda21a5b +parisc 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +powerpc 99ec28f183daa450faa7bdad6f932364ae325648 +4xx a89eda26753311d8ff2da64da621714b2f8d5dcc +52xx-and-virtex ff0210f6f9ed59e8f761d045b8e979bd6e5cf93a +galak 78f622377f7d31d988db350a43c5689dd5f31876 +s390 11a1b580583f47231df88b28d7f409c72d195fa3 +sh f5acc1503868137b02881f2d466bc7b8a2810cbc +genesis e370bc22c2aa42e0bdae178d558ce83ed8d23364 +sparc f72caf7e496465182eeda842ac66a5e75404ddf1 +xtensa 0c2345ea9b9632168921016aa658112ef722e80a +ceph 3a6e756908487ca0ec1d201c389e823c557de863 +cifs 537b60d17894b7c19a6060feae40299d7109d6e7 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs ae0660764caffebba056214a8450e7217430939f +ext3 fa3f71d5c733ac6a76416741eac0486c5f15ca71 +ext4 d775059ed11398f7c3bc230f47920c5fee240fda +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 f72f2d2e2f3238e4dedf4afb5f9945b3227dd87e +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs d515e86e639890b33a09390d062b0831664f04a2 +nfsd e4e83ea47babd9d4bf95a13aed87f8ef51e46472 +nilfs2 d240e06713007bba309b074a386b7072b73c31a6 +ocfs2 18d3a98f3c1b0e27ce026afa4d1ef042f2903726 +squashfs 0f87ee08564b95389e609699990725efd282021c +udf 2f07a88b30f510c7625d75cdf286903b465350a0 +v9fs 4681dbdacb5cdc4d3273c3a97a1858d6e00a5fe7 +ubifs 2fde99cb55fb9d9b88180512a5e8a5d939d27fec +xfs b4ed4626a9775cd8cb77209280d24839526f94f2 +vfs 82f3952c02add60b15eea9151d4d99b6b82066c6 +pci ac81860ea073daed50246af54db706c6e491f240 +hid d515e86e639890b33a09390d062b0831664f04a2 +i2c 009237b550715ff98d3c87d9a1374dffd81969b5 +bjdooks-i2c bd588d8800abd6c6c92b85f07cc2c4a5780c7b8f +jdelvare-hwmon 3296f92680d29528da3cbac056c7fa2fe733dc08 +kernel-doc a18764a8431bcc8feb2434b55973948d5dd76ea2 +v4l-dvb 7fa1d32ae067204d72a7a52fcf630d8ca01921a5 +kbuild fb994ecc2b1c214951366c2ba5d8b121f0010d1f +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide c48b24ba6db637e92f477ac2646be21e12b29f86 +libata 360ff7833098e944e5003618b03894251e937802 +infiniband a0fe3cc5d36a5f5b4f60abfe1a4b1caf4a5cce5a +acpi a21c117675e91b2ab4cb0651d79c4c0e8c6932de +ieee1394 957c6ea6f455a10bde89e43c284d4dc9103ddc14 +ubi be436f6238a17b8432b9de0212bcfc838afb1f85 +kvm 8fbf065d625617bbbf6b72d5f78f84ad13c8b547 +dlm 89d799d008710e048ee14df4f4e5441e9f4d5d50 +ibft 57a5f3c99c99f70f8fdfa0bbc83b98c48f56551a +scsi 95bb335c0ebe96afe926387a1ef3a096bd884a82 +async_tx 0b28330e39bbe0ffee4c56b09fc415fcec595ea3 +net 7a9b149212f3716c598afe973b6261fd58453b7a +wireless 7a9b149212f3716c598afe973b6261fd58453b7a +mtd 39c5837d7968ffd68e1d3c79efba1631b7f513d9 +crypto 1efbd15c3bc2b79d33e033e898211109c32159fa +sound a5b5bc726879698fce47a2427b049433e080b397 +cpufreq 81f07b43424f6c328b1c9f54277b24b9f627c9b7 +rr c3a326ddfc2de6ba5aa49beb7764def2f65e25f5 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input a62f0d27b4196bad5e900d766b285feb7069cd16 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 0b4b7a20f6d720fbec8920c39c9eb708d133b9eb +device-mapper cafeca17acd526690a86b62f7c13e9a7a0c6c34b +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia acd200bf45487271d54f05938ad9e30f32a530ee +battery 24af3202459d9a25643009b1ab8ab5ff04d94b49 +leds 34f3b3aa6713dede7dc894d7cbfdc281c67c1df0 +backlight ddf5b06745a1e8c0353ba9bc1f2a7d5c53598cd4 +kgdb 1c897a6494ebcd49d6789bb151468d2e8ede2333 +slab 562b9b68c5ebd69cb811e7334742d52a5e766946 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md be6800a73aa2f3dc14744c3b80e676d189789f04 +mfd 8ac602f1146c56bf1ad20a1958fbd850f8c11c50 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm b486787ee4797d6e42a9bd3a6f079385ad0f4472 +viafb ec66841e495b9ab4f92bdf91efe8cf56e1471fbd +voltage 70d12bfcd0ce6da5f318a68aa8abae7f715bfb6e +security-testing a0fe3cc5d36a5f5b4f60abfe1a4b1caf4a5cce5a +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259 +watchdog cf58c8a85e7370bca4e5299bdbbcfcd5866d5ef3 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu fd0c8894893cba722bdea12de25b49f980795d06 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd ddf08f4b90a413892bbb9bb2e8a57aed991cd47d +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial d515e86e639890b33a09390d062b0831664f04a2 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend d515e86e639890b33a09390d062b0831664f04a2 +bluetooth 2b0b05ddc04b6d45e71cd36405df512075786f1e +fsnotify a663c31fafdd9dc316edcaae2aacc24ccb8eb692 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +drbd 36b0118a3cd472fb57ff375c23e2bc7b41a1e1a4 +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 52707f918cca231f8461d45e78a60014795f20d9 +devicetree ce02010e372113a7a7d315227de5652b622930dd +spi fa3a16126e660847f34daa369c4671afa5854d13 +omap_dss2 fce064cbda85dda330150e8d4d9f6db1a3300023 +tip fa9e355c6e40b3c2c91121780efb724722ec7ece +edac-amd 5b89d2f9ace1970324facc68ca9b8fae19ce8096 +oprofile 45c34e05c4e3d36e7c44e790241ea11a1d90d54e +percpu 308eb7add8adaca8088c28a3f7610069b70d1ad6 +workqueues 4d707b9f48e2c4aa94b96f1133813b73df71fb55 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +bkl-core b8bc1389b74c2b66255651a6fcfae56c78b6e63f +bkl-procfs 99df95a22f7cfcf85405d4edc07c2d953542f0dd +bkl-ioctl 452c4d022e084c4c3bfdc62ffb066ed1f3a73697 +driver-core 640c8e0789a4f79cc43d6d026998f398e7711a38 +tty 640c8e0789a4f79cc43d6d026998f398e7711a38 +usb 640c8e0789a4f79cc43d6d026998f398e7711a38 +staging-next 107c161b7ddeeb7da43509cc6b29211885ccd9af +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2a821dc295fd --- /dev/null +++ b/Next/Trees @@ -0,0 +1,164 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://repo.or.cz/linux-kbuild.git#for-linus +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +viafb git git://git.lwn.net/linux-2.6.git#viafb-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +bkl-core git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/core +bkl-procfs git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/procfs +bkl-ioctl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/ioctl +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging-next git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..8f6e044397df --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6628 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a0fe3cc Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input +Merging origin/master +$ git merge origin/master +Updating a0fe3cc..f4b87de +Fast-forward + Documentation/00-INDEX | 2 + + Documentation/ABI/obsolete/sysfs-bus-usb | 31 + + Documentation/ABI/obsolete/sysfs-class-rfkill | 29 + + Documentation/ABI/stable/sysfs-class-rfkill | 67 + + Documentation/ABI/testing/sysfs-bus-pci | 40 + + Documentation/ABI/testing/sysfs-bus-usb | 28 - + .../testing/sysfs-devices-platform-_UDC_-gadget | 9 + + Documentation/ABI/testing/sysfs-driver-hid-picolcd | 43 + + .../ABI/testing/sysfs-driver-hid-prodikeys | 29 + + .../ABI/testing/sysfs-driver-hid-roccat-kone | 111 + + Documentation/ABI/testing/sysfs-wacom | 10 + + Documentation/Changes | 2 +- + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/drm.tmpl | 839 +++ + Documentation/DocBook/kgdb.tmpl | 692 ++- + Documentation/DocBook/writing_usb_driver.tmpl | 2 +- + Documentation/PCI/pcieaer-howto.txt | 29 +- + Documentation/cgroups/blkio-controller.txt | 151 +- + Documentation/feature-removal-schedule.txt | 57 +- + Documentation/filesystems/ext3.txt | 15 +- + Documentation/filesystems/gfs2.txt | 12 +- + Documentation/filesystems/nilfs2.txt | 4 +- + Documentation/filesystems/ocfs2.txt | 7 + + Documentation/filesystems/sysfs-tagging.txt | 42 + + Documentation/i2c/busses/i2c-i801 | 8 +- + Documentation/kernel-parameters.txt | 31 +- + Documentation/kvm/api.txt | 208 +- + Documentation/kvm/cpuid.txt | 42 + + Documentation/kvm/mmu.txt | 304 + + Documentation/laptops/thinkpad-acpi.txt | 66 +- + Documentation/networking/caif/Linux-CAIF.txt | 212 + + Documentation/networking/caif/README | 109 + + Documentation/networking/ip-sysctl.txt | 31 + + Documentation/networking/l2tp.txt | 247 +- + Documentation/networking/x25-iface.txt | 16 +- + Documentation/oops-tracing.txt | 4 + + Documentation/padata.txt | 107 + + Documentation/power/pci.txt | 1258 ++++- + Documentation/powerpc/dts-bindings/4xx/reboot.txt | 18 + + .../powerpc/dts-bindings/fsl/8xxx_gpio.txt | 22 +- + Documentation/rfkill.txt | 44 +- + Documentation/sysctl/net.txt | 10 + + Documentation/usb/bulk-streams.txt | 78 + + Documentation/usb/dma.txt | 22 +- + Documentation/usb/gadget_hid.txt | 445 ++ + Documentation/usb/power-management.txt | 19 +- + Documentation/usb/usb-serial.txt | 29 +- + MAINTAINERS | 46 +- + arch/alpha/kernel/pci-sysfs.c | 8 +- + arch/arm/configs/am3517_evm_defconfig | 144 +- + arch/arm/configs/ams_delta_defconfig | 10 +- + arch/arm/configs/devkit8000_defconfig | 157 +- + arch/arm/configs/omap3_defconfig | 151 +- + arch/arm/configs/omap3_evm_defconfig | 51 +- + arch/arm/configs/omap3_stalker_lks_defconfig | 1691 ++++++ + arch/arm/configs/omap_4430sdp_defconfig | 448 ++- + arch/arm/configs/rx51_defconfig | 39 +- + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 5 + + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - + arch/arm/mach-ep93xx/ts72xx.c | 190 +- + arch/arm/mach-kirkwood/common.c | 9 + + arch/arm/mach-kirkwood/common.h | 2 + + arch/arm/mach-msm/dma.c | 5 + + arch/arm/mach-msm/include/mach/dma.h | 2 + + arch/arm/mach-mx2/pcm970-baseboard.c | 6 +- + arch/arm/mach-mx3/mach-pcm037.c | 6 +- + arch/arm/mach-omap1/Kconfig | 10 + + arch/arm/mach-omap1/Makefile | 1 + + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 278 + + arch/arm/mach-omap1/ams-delta-fiq.c | 155 + + arch/arm/mach-omap1/board-ams-delta.c | 18 +- + arch/arm/mach-omap1/clock.c | 2 +- + arch/arm/mach-omap1/clock.h | 2 +- + arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 79 + + arch/arm/mach-omap1/include/mach/debug-macro.S | 21 +- + arch/arm/mach-omap2/Kconfig | 7 + + arch/arm/mach-omap2/Makefile | 13 +- + arch/arm/mach-omap2/board-2430sdp.c | 21 +- + arch/arm/mach-omap2/board-3430sdp.c | 1 + + arch/arm/mach-omap2/board-4430sdp.c | 360 +- + arch/arm/mach-omap2/board-am3517evm.c | 166 +- + arch/arm/mach-omap2/board-cm-t35.c | 1 + + arch/arm/mach-omap2/board-devkit8000.c | 155 + + arch/arm/mach-omap2/board-omap3beagle.c | 101 +- + arch/arm/mach-omap2/board-omap3evm.c | 9 +- + arch/arm/mach-omap2/board-omap3stalker.c | 672 +++ + arch/arm/mach-omap2/board-overo.c | 14 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 120 +- + arch/arm/mach-omap2/board-rx51-video.c | 109 + + arch/arm/mach-omap2/board-rx51.c | 2 + + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- + arch/arm/mach-omap2/board-zoom2.c | 4 +- + arch/arm/mach-omap2/board-zoom3.c | 4 +- + arch/arm/mach-omap2/clkt2xxx_apll.c | 4 +- + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 17 +- + arch/arm/mach-omap2/clkt_clksel.c | 472 +- + arch/arm/mach-omap2/clock.c | 9 + + arch/arm/mach-omap2/clock.h | 11 +- + arch/arm/mach-omap2/clock2420_data.c | 52 +- + arch/arm/mach-omap2/clock2430_data.c | 56 +- + arch/arm/mach-omap2/clock3xxx_data.c | 414 +- + arch/arm/mach-omap2/clock44xx_data.c | 5 + + arch/arm/mach-omap2/clock_common_data.c | 12 +- + arch/arm/mach-omap2/clockdomain.c | 4 +- + arch/arm/mach-omap2/clockdomains44xx.h | 4 +- + arch/arm/mach-omap2/cm-regbits-24xx.h | 236 +- + arch/arm/mach-omap2/cm-regbits-34xx.h | 222 +- + arch/arm/mach-omap2/cm.c | 3 - + arch/arm/mach-omap2/cm.h | 16 +- + arch/arm/mach-omap2/cm44xx.h | 301 +- + arch/arm/mach-omap2/cm4xxx.c | 54 +- + arch/arm/mach-omap2/control.c | 7 +- + arch/arm/mach-omap2/devices.c | 95 +- + arch/arm/mach-omap2/hsmmc.c | 120 +- + arch/arm/mach-omap2/include/mach/am35xx.h | 20 +- + arch/arm/mach-omap2/include/mach/debug-macro.S | 15 +- + arch/arm/mach-omap2/include/mach/omap4-common.h | 26 + + arch/arm/mach-omap2/io.c | 9 + + arch/arm/mach-omap2/iommu2.c | 6 +- + arch/arm/mach-omap2/mux34xx.c | 86 - + arch/arm/mach-omap2/omap-iommu.c | 157 + + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap3-iommu.c | 105 - + arch/arm/mach-omap2/omap4-common.c | 72 + + arch/arm/mach-omap2/omap_hwmod.c | 121 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- + arch/arm/mach-omap2/pm-debug.c | 3 + + arch/arm/mach-omap2/pm.h | 1 + + arch/arm/mach-omap2/pm24xx.c | 130 +- + arch/arm/mach-omap2/pm34xx.c | 259 +- + arch/arm/mach-omap2/powerdomain.c | 56 +- + arch/arm/mach-omap2/powerdomains44xx.h | 23 +- + arch/arm/mach-omap2/prcm-common.h | 164 +- + arch/arm/mach-omap2/prcm.c | 4 +- + arch/arm/mach-omap2/prm-regbits-24xx.h | 120 +- + arch/arm/mach-omap2/prm-regbits-34xx.h | 360 +- + arch/arm/mach-omap2/prm.h | 22 +- + arch/arm/mach-omap2/prm44xx.h | 389 ++- + arch/arm/mach-omap2/usb-ehci.c | 155 + + arch/arm/mach-omap2/usb-musb.c | 1 + + arch/arm/mach-pxa/icontrol.c | 9 +- + arch/arm/mach-pxa/zeus.c | 4 +- + arch/arm/mach-u300/include/mach/coh901318.h | 21 - + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 239 + + arch/arm/plat-omap/Kconfig | 9 +- + arch/arm/plat-omap/clock.c | 25 +- + arch/arm/plat-omap/common.c | 3 - + arch/arm/plat-omap/dma.c | 45 +- + arch/arm/plat-omap/dmtimer.c | 4 +- + arch/arm/plat-omap/gpio.c | 236 +- + arch/arm/plat-omap/i2c.c | 98 +- + arch/arm/plat-omap/include/plat/clock.h | 14 +- + arch/arm/plat-omap/include/plat/common.h | 3 - + arch/arm/plat-omap/include/plat/control.h | 20 + + arch/arm/plat-omap/include/plat/gpio.h | 4 +- + arch/arm/plat-omap/include/plat/irqs.h | 4 + + arch/arm/plat-omap/include/plat/mmc.h | 4 + + arch/arm/plat-omap/include/plat/multi.h | 16 +- + arch/arm/plat-omap/include/plat/omap34xx.h | 5 + + arch/arm/plat-omap/include/plat/omap44xx.h | 4 + + arch/arm/plat-omap/include/plat/omap_hwmod.h | 16 +- + arch/arm/plat-omap/include/plat/powerdomain.h | 7 + + arch/arm/plat-omap/include/plat/serial.h | 16 +- + arch/arm/plat-omap/include/plat/uncompress.h | 44 +- + arch/arm/plat-omap/include/plat/usb.h | 24 + + arch/arm/plat-omap/iommu.c | 101 +- + arch/arm/plat-omap/iovmm.c | 9 +- + arch/arm/plat-omap/omap_device.c | 4 +- + arch/arm/plat-omap/sram.c | 16 +- + arch/arm/plat-orion/include/plat/orion_nand.h | 1 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/cris/arch-v10/drivers/eeprom.c | 48 +- + arch/ia64/kvm/kvm-ia64.c | 8 +- + arch/ia64/kvm/vmm.c | 2 +- + arch/microblaze/include/asm/system.h | 11 + + arch/mips/Kconfig | 2 + + arch/mips/alchemy/common/dbdma.c | 101 +- + arch/mips/alchemy/common/irq.c | 174 +- + arch/mips/alchemy/common/power.c | 16 - + arch/mips/alchemy/devboards/pb1000/board_setup.c | 16 +- + arch/mips/alchemy/devboards/pb1100/board_setup.c | 5 - + arch/mips/alchemy/devboards/pb1200/board_setup.c | 6 - + arch/mips/alchemy/devboards/pb1500/board_setup.c | 5 - + arch/mips/alchemy/devboards/pb1550/board_setup.c | 5 - + arch/mips/ar7/platform.c | 17 +- + arch/mips/bcm63xx/gpio.c | 6 +- + arch/mips/cavium-octeon/serial.c | 6 +- + arch/mips/cavium-octeon/setup.c | 27 +- + arch/mips/configs/ar7_defconfig | 196 +- + arch/mips/configs/bcm47xx_defconfig | 973 ++-- + arch/mips/configs/mtx1_defconfig | 2404 +++----- + arch/mips/configs/rb532_defconfig | 521 ++- + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/include/asm/mach-au1x00/au1000.h | 34 +- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 4 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 4 +- + .../asm/mach-loongson/cpu-feature-overrides.h | 2 + + arch/mips/include/asm/mach-loongson/gpio.h | 35 + + arch/mips/include/asm/processor.h | 12 +- + arch/mips/kernel/cpu-probe.c | 30 + + arch/mips/kernel/cpufreq/loongson2_cpufreq.c | 4 +- + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/mips-mt-fpaff.c | 4 +- + arch/mips/kernel/setup.c | 21 - + arch/mips/kernel/traps.c | 15 +- + arch/mips/loongson/common/Makefile | 1 + + arch/mips/loongson/common/gpio.c | 139 + + arch/mips/math-emu/cp1emu.c | 11 +- + arch/mips/oprofile/op_model_loongson2.c | 60 +- + arch/mips/powertv/asic/prealloc-calliope.c | 673 +-- + arch/mips/powertv/asic/prealloc-cronus.c | 668 +-- + arch/mips/powertv/asic/prealloc-cronuslite.c | 302 +- + arch/mips/powertv/asic/prealloc-zeus.c | 505 +-- + arch/mips/powertv/asic/prealloc.h | 70 + + arch/mips/sibyte/swarm/platform.c | 54 + + arch/mips/txx9/generic/setup.c | 4 +- + arch/parisc/include/asm/bug.h | 8 +- + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 12 + + arch/powerpc/boot/Makefile | 9 +- + arch/powerpc/boot/dts/iss4xx-mpic.dts | 155 + + arch/powerpc/boot/dts/iss4xx.dts | 116 + + arch/powerpc/boot/dts/mpc8315erdb.dts | 16 +- + arch/powerpc/boot/dts/mpc8377_rdb.dts | 14 + + arch/powerpc/boot/dts/mpc8378_rdb.dts | 14 + + arch/powerpc/boot/dts/mpc8379_rdb.dts | 14 + + arch/powerpc/boot/dts/p1020rdb.dts | 125 + + arch/powerpc/boot/treeboot-iss4xx.c | 56 + + arch/powerpc/boot/wrapper | 9 +- + arch/powerpc/configs/44x/iss476-smp_defconfig | 1026 ++++ + arch/powerpc/configs/ppc64_defconfig | 2 +- + arch/powerpc/configs/pseries_defconfig | 2 +- + arch/powerpc/include/asm/asm-compat.h | 2 + + arch/powerpc/include/asm/bug.h | 6 +- + arch/powerpc/include/asm/cache.h | 6 +- + arch/powerpc/include/asm/cputable.h | 5 + + arch/powerpc/include/asm/hvcall.h | 2 + + arch/powerpc/include/asm/kexec.h | 4 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/include/asm/kvm.h | 10 + + arch/powerpc/include/asm/kvm_asm.h | 2 + + arch/powerpc/include/asm/kvm_book3s.h | 157 +- + .../asm/kvm_book3s_32.h} | 36 +- + .../asm/kvm_book3s_64.h} | 22 +- + .../asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} | 25 +- + arch/powerpc/include/asm/kvm_booke.h | 96 + + arch/powerpc/include/asm/kvm_fpu.h | 85 + + arch/powerpc/include/asm/kvm_host.h | 38 +- + arch/powerpc/include/asm/kvm_ppc.h | 97 +- + arch/powerpc/include/asm/mmu-44x.h | 51 +- + arch/powerpc/include/asm/mmu.h | 1 + + arch/powerpc/include/asm/mmu_context.h | 2 + + arch/powerpc/include/asm/mmzone.h | 2 +- + arch/powerpc/include/asm/mpic.h | 3 - + arch/powerpc/include/asm/paca.h | 11 +- + arch/powerpc/include/asm/parport.h | 11 +- + arch/powerpc/include/asm/pgalloc-64.h | 6 + + arch/powerpc/include/asm/pgtable-ppc32.h | 2 +- + arch/powerpc/include/asm/processor.h | 3 + + arch/powerpc/include/asm/ptrace.h | 64 + + arch/powerpc/include/asm/reg.h | 14 + + arch/powerpc/include/asm/reg_booke.h | 24 + + arch/powerpc/include/asm/smp.h | 18 +- + arch/powerpc/include/asm/topology.h | 26 +- + arch/powerpc/kernel/asm-offsets.c | 111 +- + arch/powerpc/kernel/cputable.c | 29 + + arch/powerpc/kernel/crash.c | 38 +- + arch/powerpc/kernel/entry_32.S | 5 + + arch/powerpc/kernel/exceptions-64s.S | 13 +- + arch/powerpc/kernel/head_32.S | 14 + + arch/powerpc/kernel/head_44x.S | 828 +++- + arch/powerpc/kernel/head_64.S | 4 +- + arch/powerpc/kernel/head_8xx.S | 70 +- + arch/powerpc/kernel/head_booke.h | 4 + + arch/powerpc/kernel/head_fsl_booke.S | 13 +- + arch/powerpc/kernel/iommu.c | 12 - + arch/powerpc/kernel/irq.c | 17 +- + arch/powerpc/kernel/kgdb.c | 11 +- + arch/powerpc/kernel/kprobes.c | 3 + + arch/powerpc/kernel/lparcfg.c | 12 +- + arch/powerpc/kernel/machine_kexec_64.c | 48 +- + arch/powerpc/kernel/misc_32.S | 9 +- + arch/powerpc/kernel/misc_64.S | 8 +- + arch/powerpc/kernel/paca.c | 2 + + arch/powerpc/kernel/pci_of_scan.c | 2 + + arch/powerpc/kernel/ppc_ksyms.c | 4 + + arch/powerpc/kernel/process.c | 3 + + arch/powerpc/kernel/ptrace.c | 103 + + arch/powerpc/kernel/rtas.c | 15 +- + arch/powerpc/kernel/rtasd.c | 16 +- + arch/powerpc/kernel/setup-common.c | 86 +- + arch/powerpc/kernel/setup_64.c | 23 +- + arch/powerpc/kernel/smp.c | 73 +- + arch/powerpc/kernel/sysfs.c | 46 +- + arch/powerpc/kernel/traps.c | 47 +- + arch/powerpc/kernel/vio.c | 26 +- + arch/powerpc/kvm/44x.c | 2 +- + arch/powerpc/kvm/Kconfig | 24 +- + arch/powerpc/kvm/Makefile | 20 +- + arch/powerpc/kvm/book3s.c | 503 ++- + arch/powerpc/kvm/book3s_32_mmu.c | 54 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 483 ++ + arch/powerpc/kvm/book3s_32_sr.S | 143 + + arch/powerpc/kvm/book3s_64_emulate.c | 348 -- + arch/powerpc/kvm/book3s_64_mmu.c | 36 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 102 +- + arch/powerpc/kvm/book3s_64_slb.S | 183 +- + arch/powerpc/kvm/book3s_emulate.c | 573 ++ + .../kvm/{book3s_64_exports.c => book3s_exports.c} | 0 + ...{book3s_64_interrupts.S => book3s_interrupts.S} | 204 +- + arch/powerpc/kvm/book3s_paired_singles.c | 1289 +++++ + ...{book3s_64_rmhandlers.S => book3s_rmhandlers.S} | 135 +- + arch/powerpc/kvm/book3s_segment.S | 259 + + arch/powerpc/kvm/booke.c | 21 +- + arch/powerpc/kvm/e500.c | 2 +- + arch/powerpc/kvm/emulate.c | 55 +- + arch/powerpc/kvm/fpu.S | 273 + + arch/powerpc/kvm/powerpc.c | 110 +- + arch/powerpc/lib/string.S | 18 +- + arch/powerpc/mm/44x_mmu.c | 144 +- + arch/powerpc/mm/fault.c | 19 +- + arch/powerpc/mm/fsl_booke_mmu.c | 25 +- + arch/powerpc/mm/init_64.c | 43 + + arch/powerpc/mm/mmu_context_hash32.c | 29 +- + arch/powerpc/mm/mmu_context_nohash.c | 8 + + arch/powerpc/mm/mmu_decl.h | 17 +- + arch/powerpc/mm/numa.c | 78 +- + arch/powerpc/mm/pgtable_32.c | 12 +- + arch/powerpc/mm/pgtable_64.c | 8 + + arch/powerpc/mm/tlb_nohash_low.S | 146 +- + arch/powerpc/platforms/44x/Kconfig | 20 + + arch/powerpc/platforms/44x/Makefile | 1 + + arch/powerpc/platforms/44x/iss4xx.c | 167 + + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 1 + + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 1 + + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 3 +- + arch/powerpc/platforms/Kconfig.cputype | 5 +- + arch/powerpc/platforms/cell/cbe_cpufreq.c | 2 +- + arch/powerpc/platforms/iseries/exception.S | 4 +- + arch/powerpc/platforms/iseries/pci.c | 10 +- + arch/powerpc/platforms/iseries/smp.c | 2 +- + arch/powerpc/platforms/pasemi/cpufreq.c | 2 +- + arch/powerpc/platforms/powermac/cpufreq_64.c | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 7 +- + arch/powerpc/platforms/powermac/pmac.h | 2 + + arch/powerpc/platforms/powermac/setup.c | 13 +- + arch/powerpc/platforms/powermac/smp.c | 9 +- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 8 +- + arch/powerpc/platforms/pseries/eeh.c | 2 +- + arch/powerpc/platforms/pseries/event_sources.c | 79 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 67 +- + arch/powerpc/platforms/pseries/hvCall.S | 38 + + arch/powerpc/platforms/pseries/lpar.c | 35 +- + arch/powerpc/platforms/pseries/plpar_wrappers.h | 26 + + arch/powerpc/platforms/pseries/pseries.h | 7 + + arch/powerpc/platforms/pseries/ras.c | 62 +- + arch/powerpc/platforms/pseries/setup.c | 10 +- + arch/powerpc/platforms/pseries/smp.c | 42 +- + arch/powerpc/platforms/pseries/xics.c | 38 +- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 147 + + arch/powerpc/sysdev/mpic.c | 72 +- + arch/powerpc/sysdev/mv64x60_pci.c | 4 +- + arch/powerpc/sysdev/ppc4xx_soc.c | 24 +- + arch/s390/include/asm/bug.h | 8 +- + arch/s390/kernel/ipl.c | 14 +- + arch/s390/kvm/kvm-s390.c | 6 +- + arch/s390/kvm/kvm-s390.h | 2 +- + arch/sh/include/asm/bug.h | 4 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/Kconfig | 8 + + arch/x86/crypto/aesni-intel_asm.S | 115 + + arch/x86/crypto/aesni-intel_glue.c | 130 +- + arch/x86/include/asm/cacheflush.h | 2 + + arch/x86/include/asm/inst.h | 96 +- + arch/x86/include/asm/intel_scu_ipc.h | 55 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/include/asm/kvm.h | 17 +- + arch/x86/include/asm/kvm_emulate.h | 46 +- + arch/x86/include/asm/kvm_host.h | 80 +- + arch/x86/include/asm/kvm_para.h | 13 + + arch/x86/include/asm/msr-index.h | 5 +- + arch/x86/include/asm/pci_x86.h | 2 +- + arch/x86/include/asm/processor.h | 2 + + arch/x86/include/asm/pvclock-abi.h | 4 +- + arch/x86/include/asm/pvclock.h | 1 + + arch/x86/include/asm/svm.h | 9 +- + arch/x86/include/asm/vmx.h | 12 +- + arch/x86/kernel/cpu/common.c | 29 +- + arch/x86/kernel/early_printk.c | 8 + + arch/x86/kernel/kgdb.c | 103 +- + arch/x86/kernel/kvmclock.c | 56 +- + arch/x86/kernel/pvclock.c | 37 + + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/tboot.c | 1 + + arch/x86/kernel/traps.c | 20 +- + arch/x86/kvm/emulate.c | 1247 +++-- + arch/x86/kvm/i8259.c | 53 +- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/kvm_timer.h | 4 +- + arch/x86/kvm/mmu.c | 225 +- + arch/x86/kvm/mmutrace.h | 84 +- + arch/x86/kvm/paging_tmpl.h | 46 +- + arch/x86/kvm/svm.c | 944 ++-- + arch/x86/kvm/timer.c | 3 +- + arch/x86/kvm/trace.h | 165 +- + arch/x86/kvm/vmx.c | 378 +- + arch/x86/kvm/x86.c | 1599 ++--- + arch/x86/kvm/x86.h | 7 + + arch/x86/mm/pageattr.c | 53 +- + arch/x86/pci/Makefile | 2 + + arch/x86/pci/broadcom_bus.c | 101 + + arch/x86/pci/common.c | 2 +- + arch/x86/pci/direct.c | 16 +- + arch/x86/pci/irq.c | 9 +- + arch/x86/pci/mmconfig-shared.c | 17 +- + arch/x86/pci/mmconfig_32.c | 8 +- + arch/x86/pci/numaq_32.c | 8 +- + arch/x86/pci/pcbios.c | 8 +- + block/Kconfig | 23 - + block/Kconfig.iosched | 16 +- + block/Makefile | 2 +- + block/blk-barrier.c | 147 +- + block/blk-cgroup.c | 791 +++- + block/blk-cgroup.h | 178 +- + block/blk-core.c | 31 +- + block/blk-lib.c | 233 + + block/cfq-iosched.c | 81 +- + block/elevator.c | 11 + + block/genhd.c | 2 +- + block/ioctl.c | 2 +- + crypto/ablkcipher.c | 277 + + crypto/algapi.c | 2 +- + crypto/async_tx/async_tx.c | 46 +- + crypto/authenc.c | 8 +- + crypto/internal.h | 2 +- + crypto/pcrypt.c | 11 +- + crypto/scatterwalk.c | 2 +- + crypto/shash.c | 2 +- + crypto/tcrypt.c | 343 ++- + crypto/tcrypt.h | 29 + + crypto/testmgr.c | 66 +- + crypto/testmgr.h | 64 +- + crypto/vmac.c | 75 +- + drivers/acpi/system.c | 2 +- + drivers/atm/Kconfig | 1 + + drivers/atm/atmtcp.c | 6 +- + drivers/atm/eni.c | 2 +- + drivers/atm/he.c | 4 +- + drivers/base/Kconfig | 7 +- + drivers/base/class.c | 9 + + drivers/base/core.c | 130 +- + drivers/base/cpu.c | 2 +- + drivers/base/dd.c | 4 +- + drivers/base/devtmpfs.c | 5 + + drivers/base/firmware_class.c | 206 +- + drivers/base/module.c | 4 +- + drivers/base/platform.c | 8 +- + drivers/block/Kconfig | 22 +- + drivers/block/drbd/drbd_bitmap.c | 21 +- + drivers/block/drbd/drbd_int.h | 151 +- + drivers/block/drbd/drbd_main.c | 158 +- + drivers/block/drbd/drbd_nl.c | 52 +- + drivers/block/drbd/drbd_proc.c | 19 +- + drivers/block/drbd/drbd_receiver.c | 666 ++- + drivers/block/drbd/drbd_req.c | 40 +- + drivers/block/drbd/drbd_strings.c | 2 +- + drivers/block/drbd/drbd_worker.c | 206 +- + drivers/block/drbd/drbd_wrappers.h | 16 +- + drivers/block/loop.c | 14 +- + drivers/block/virtio_blk.c | 46 +- + drivers/bluetooth/btmrvl_drv.h | 8 +- + drivers/bluetooth/btmrvl_main.c | 92 +- + drivers/bluetooth/btmrvl_sdio.c | 7 +- + drivers/bluetooth/hci_h4.c | 2 +- + drivers/bluetooth/hci_ll.c | 8 +- + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/char/Kconfig | 10 +- + drivers/char/Makefile | 1 + + drivers/char/agp/agp.h | 80 - + drivers/char/agp/ali-agp.c | 1 + + drivers/char/agp/amd-k7-agp.c | 9 + + drivers/char/agp/amd64-agp.c | 28 +- + drivers/char/agp/ati-agp.c | 8 + + drivers/char/agp/efficeon-agp.c | 1 + + drivers/char/agp/intel-agp.c | 1883 +------ + drivers/char/agp/intel-agp.h | 239 + + drivers/char/agp/intel-gtt.c | 1516 +++++ + drivers/char/agp/nvidia-agp.c | 1 + + drivers/char/agp/sis-agp.c | 9 +- + drivers/char/agp/uninorth-agp.c | 16 +- + drivers/char/agp/via-agp.c | 2 + + drivers/char/hw_random/virtio-rng.c | 6 +- + drivers/char/isicom.c | 8 +- + drivers/char/n_gsm.c | 2763 +++++++++ + drivers/char/random.c | 10 +- + drivers/char/serial167.c | 223 +- + drivers/char/tty_buffer.c | 2 +- + drivers/char/virtio_console.c | 700 ++-- + drivers/crypto/Kconfig | 21 + + drivers/crypto/Makefile | 4 + + drivers/crypto/geode-aes.c | 36 +- + drivers/crypto/hifn_795x.c | 18 +- + drivers/crypto/mv_cesa.c | 692 ++- + drivers/crypto/mv_cesa.h | 40 +- + drivers/crypto/n2_asm.S | 95 + + drivers/crypto/n2_core.c | 2083 +++++++ + drivers/crypto/n2_core.h | 231 + + drivers/crypto/omap-sham.c | 1259 ++++ + drivers/crypto/talitos.c | 699 +++- + drivers/crypto/talitos.h | 12 +- + drivers/dma/Kconfig | 14 + + drivers/dma/Makefile | 2 + + drivers/dma/at_hdmac.c | 35 +- + drivers/dma/coh901318.c | 263 +- + drivers/dma/dmaengine.c | 22 +- + drivers/dma/dw_dmac.c | 24 +- + drivers/dma/fsldma.c | 28 +- + drivers/dma/ioat/dma.c | 12 +- + drivers/dma/ioat/dma.h | 19 +- + drivers/dma/ioat/dma_v2.c | 186 +- + drivers/dma/ioat/dma_v2.h | 33 +- + drivers/dma/ioat/dma_v3.c | 143 +- + drivers/dma/ioat/pci.c | 7 +- + drivers/dma/iop-adma.c | 39 +- + drivers/dma/ipu/ipu_idmac.c | 34 +- + drivers/dma/mpc512x_dma.c | 15 +- + drivers/dma/mv_xor.c | 25 +- + drivers/dma/ppc4xx/adma.c | 19 +- + drivers/dma/shdma.c | 27 +- + drivers/dma/ste_dma40.c | 2657 +++++++++ + drivers/dma/ste_dma40_ll.c | 454 ++ + drivers/dma/ste_dma40_ll.h | 354 ++ + drivers/dma/timb_dma.c | 860 +++ + drivers/dma/txx9dmac.c | 23 +- + drivers/edac/amd76x_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 2 +- + drivers/edac/r82600_edac.c | 2 +- + drivers/firmware/dcdbas.c | 4 +- + drivers/firmware/dell_rbu.c | 10 +- + drivers/firmware/efivars.c | 4 +- + drivers/gpio/gpiolib.c | 2 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/drm_auth.c | 3 +- + drivers/gpu/drm/drm_crtc.c | 9 +- + drivers/gpu/drm/drm_crtc_helper.c | 490 +-- + drivers/gpu/drm/drm_dma.c | 4 +- + drivers/gpu/drm/drm_edid.c | 802 ++- + drivers/gpu/drm/drm_fb_helper.c | 908 +++- + drivers/gpu/drm/drm_fops.c | 3 +- + drivers/gpu/drm/drm_gem.c | 49 +- + drivers/gpu/drm/drm_modes.c | 105 +- + drivers/gpu/drm/drm_sysfs.c | 7 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/dvo.h | 10 - + drivers/gpu/drm/i915/dvo_ch7017.c | 46 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 44 +- + drivers/gpu/drm/i915/dvo_ivch.c | 21 - + drivers/gpu/drm/i915/dvo_sil164.c | 38 - + drivers/gpu/drm/i915/dvo_tfp410.c | 32 - + drivers/gpu/drm/i915/i915_debugfs.c | 28 +- + drivers/gpu/drm/i915/i915_dma.c | 15 +- + drivers/gpu/drm/i915/i915_drv.c | 29 + + drivers/gpu/drm/i915/i915_drv.h | 38 +- + drivers/gpu/drm/i915/i915_gem.c | 154 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 5 + + drivers/gpu/drm/i915/i915_irq.c | 23 +- + drivers/gpu/drm/i915/i915_reg.h | 143 +- + drivers/gpu/drm/i915/i915_suspend.c | 41 +- + drivers/gpu/drm/i915/i915_trace.h | 88 +- + drivers/gpu/drm/i915/intel_bios.c | 1 + + drivers/gpu/drm/i915/intel_crt.c | 93 +- + drivers/gpu/drm/i915/intel_display.c | 1064 +++- + drivers/gpu/drm/i915/intel_dp.c | 256 +- + drivers/gpu/drm/i915/intel_drv.h | 31 +- + drivers/gpu/drm/i915/intel_dvo.c | 103 +- + drivers/gpu/drm/i915/intel_fb.c | 217 +- + drivers/gpu/drm/i915/intel_hdmi.c | 71 +- + drivers/gpu/drm/i915/intel_lvds.c | 111 +- + drivers/gpu/drm/i915/intel_modes.c | 21 +- + drivers/gpu/drm/i915/intel_overlay.c | 8 +- + drivers/gpu/drm/i915/intel_sdvo.c | 1009 ++-- + drivers/gpu/drm/i915/intel_tv.c | 185 +- + drivers/gpu/drm/nouveau/Makefile | 3 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 500 ++- + drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 116 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 12 + + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 3 + + drivers/gpu/drm/nouveau/nouveau_display.c | 42 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 10 + + drivers/gpu/drm/nouveau/nouveau_encoder.h | 2 + + drivers/gpu/drm/nouveau/nouveau_fb.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 259 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 19 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_grctx.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_i2c.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_irq.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_reg.h | 1 + + drivers/gpu/drm/nouveau/nouveau_state.c | 58 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 18 +- + drivers/gpu/drm/nouveau/nv04_graph.c | 566 ++- + drivers/gpu/drm/nouveau/nv40_grctx.c | 5 - + drivers/gpu/drm/nouveau/nv50_calc.c | 87 + + drivers/gpu/drm/nouveau/nv50_crtc.c | 46 +- + drivers/gpu/drm/nouveau/nv50_display.c | 36 + + drivers/gpu/drm/nouveau/nv50_fbcon.c | 16 +- + drivers/gpu/drm/nouveau/nv50_sor.c | 15 +- + drivers/gpu/drm/radeon/atombios.h | 76 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 22 +- + drivers/gpu/drm/radeon/atombios_dp.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 1549 +++++- + drivers/gpu/drm/radeon/evergreen_reg.h | 4 + + drivers/gpu/drm/radeon/evergreend.h | 556 ++ + drivers/gpu/drm/radeon/r100.c | 729 ++- + drivers/gpu/drm/radeon/r100d.h | 164 + + drivers/gpu/drm/radeon/r300.c | 151 +- + drivers/gpu/drm/radeon/r300d.h | 47 +- + drivers/gpu/drm/radeon/r420.c | 36 +- + drivers/gpu/drm/radeon/r500_reg.h | 3 + + drivers/gpu/drm/radeon/r520.c | 7 +- + drivers/gpu/drm/radeon/r600.c | 600 ++- + drivers/gpu/drm/radeon/r600_audio.c | 58 +- + drivers/gpu/drm/radeon/r600_blit_kms.c | 3 + + drivers/gpu/drm/radeon/r600_hdmi.c | 65 +- + drivers/gpu/drm/radeon/r600_reg.h | 57 +- + drivers/gpu/drm/radeon/radeon.h | 258 +- + drivers/gpu/drm/radeon/radeon_asic.c | 140 +- + drivers/gpu/drm/radeon/radeon_asic.h | 44 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 242 +- + drivers/gpu/drm/radeon/radeon_bios.c | 3 +- + drivers/gpu/drm/radeon/radeon_combios.c | 64 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 63 +- + drivers/gpu/drm/radeon/radeon_cs.c | 4 - + drivers/gpu/drm/radeon/radeon_device.c | 61 +- + drivers/gpu/drm/radeon/radeon_display.c | 129 +- + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 44 +- + drivers/gpu/drm/radeon/radeon_fb.c | 358 +- + drivers/gpu/drm/radeon/radeon_fence.c | 107 +- + drivers/gpu/drm/radeon/radeon_gart.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 6 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_kms.c | 18 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 14 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 15 - + drivers/gpu/drm/radeon/radeon_mode.h | 49 +- + drivers/gpu/drm/radeon/radeon_object.c | 44 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_pm.c | 814 ++- + drivers/gpu/drm/radeon/radeon_reg.h | 4 +- + drivers/gpu/drm/radeon/radeon_ring.c | 66 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 122 +- + drivers/gpu/drm/radeon/rs400.c | 9 +- + drivers/gpu/drm/radeon/rs600.c | 231 +- + drivers/gpu/drm/radeon/rs600d.h | 80 + + drivers/gpu/drm/radeon/rs690.c | 289 +- + drivers/gpu/drm/radeon/rv515.c | 287 +- + drivers/gpu/drm/radeon/rv515d.h | 46 + + drivers/gpu/drm/radeon/rv770.c | 28 +- + drivers/gpu/drm/savage/savage_bci.c | 3 +- + drivers/gpu/drm/ttm/Makefile | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 98 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 122 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 41 +- + drivers/gpu/drm/ttm/ttm_memory.c | 7 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 845 +++ + drivers/gpu/drm/ttm/ttm_tt.c | 44 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 50 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 - + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- + drivers/gpu/vga/Kconfig | 6 +- + drivers/hid/Kconfig | 151 +- + drivers/hid/Makefile | 6 + + drivers/hid/hid-3m-pct.c | 31 +- + drivers/hid/hid-cando.c | 272 + + drivers/hid/hid-core.c | 53 +- + drivers/hid/hid-egalax.c | 281 + + drivers/hid/hid-ids.h | 25 + + drivers/hid/hid-lg.c | 9 + + drivers/hid/hid-magicmouse.c | 5 +- + drivers/hid/hid-ntrig.c | 526 ++- + drivers/hid/hid-picolcd.c | 2631 +++++++++ + drivers/hid/hid-prodikeys.c | 910 +++ + drivers/hid/hid-roccat-kone.c | 994 ++++ + drivers/hid/hid-roccat-kone.h | 224 + + drivers/hid/hid-samsung.c | 95 +- + drivers/hid/hid-topseed.c | 38 +- + drivers/hid/hid-wacom.c | 229 +- + drivers/hid/hid-zydacron.c | 237 + + drivers/hid/hidraw.c | 50 +- + drivers/hid/usbhid/hid-core.c | 93 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/hiddev.c | 19 +- + drivers/hid/usbhid/usbhid.h | 1 - + drivers/hid/usbhid/usbkbd.c | 17 +- + drivers/hid/usbhid/usbmouse.c | 6 +- + drivers/i2c/algos/i2c-algo-pca.c | 36 +- + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-amd756.c | 2 +- + drivers/i2c/busses/i2c-amd8111.c | 2 +- + drivers/i2c/busses/i2c-at91.c | 3 +- + drivers/i2c/busses/i2c-elektor.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hydra.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 59 +- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 3 +- + drivers/i2c/busses/i2c-mv64xxx.c | 3 +- + drivers/i2c/busses/i2c-nforce2.c | 12 +- + drivers/i2c/busses/i2c-ocores.c | 2 +- + drivers/i2c/busses/i2c-parport-light.c | 2 +- + drivers/i2c/busses/i2c-parport.c | 2 +- + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-pca-isa.c | 2 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-pmcmsp.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-s6000.c | 2 +- + drivers/i2c/busses/i2c-sh7760.c | 2 +- + drivers/i2c/busses/i2c-sibyte.c | 2 +- + drivers/i2c/busses/i2c-simtec.c | 3 +- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-sis96x.c | 2 +- + drivers/i2c/busses/i2c-stub.c | 9 +- + drivers/i2c/busses/i2c-versatile.c | 3 +- + drivers/i2c/busses/i2c-via.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 2 +- + drivers/i2c/busses/scx200_acb.c | 4 +- + drivers/i2c/busses/scx200_i2c.c | 2 +- + drivers/i2c/i2c-core.c | 90 +- + drivers/i2c/i2c-dev.c | 36 +- + drivers/ide/ide-disk.c | 40 +- + drivers/ide/ide-gd.c | 11 +- + drivers/infiniband/hw/nes/nes_nic.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +- + drivers/input/joystick/xpad.c | 16 +- + drivers/input/misc/ati_remote.c | 12 +- + drivers/input/misc/ati_remote2.c | 4 +- + drivers/input/misc/cm109.c | 28 +- + drivers/input/misc/keyspan_remote.c | 6 +- + drivers/input/misc/powermate.c | 17 +- + drivers/input/misc/yealink.c | 25 +- + drivers/input/mouse/appletouch.c | 12 +- + drivers/input/mouse/bcm5974.c | 24 +- + drivers/input/serio/Kconfig | 16 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/ams_delta_serio.c | 177 + + drivers/input/tablet/acecad.c | 6 +- + drivers/input/tablet/aiptek.c | 14 +- + drivers/input/tablet/gtco.c | 12 +- + drivers/input/tablet/kbtab.c | 6 +- + drivers/input/tablet/wacom_sys.c | 8 +- + drivers/input/touchscreen/usbtouchscreen.c | 8 +- + drivers/isdn/hisax/hisax_fcpcipnp.c | 3 +- + drivers/isdn/i4l/isdn_x25iface.c | 17 +- + drivers/macintosh/macio-adb.c | 1 + + drivers/macintosh/smu.c | 4 +- + drivers/macintosh/therm_adt746x.c | 2 + + drivers/macintosh/windfarm_pm81.c | 6 +- + drivers/macintosh/windfarm_pm91.c | 9 +- + drivers/md/Kconfig | 4 +- + drivers/md/bitmap.c | 47 +- + drivers/md/bitmap.h | 2 + + drivers/md/faulty.c | 9 +- + drivers/md/linear.c | 36 +- + drivers/md/md.c | 543 ++- + drivers/md/md.h | 16 +- + drivers/md/multipath.c | 13 +- + drivers/md/raid0.c | 251 +- + drivers/md/raid0.h | 3 + + drivers/md/raid1.c | 114 +- + drivers/md/raid10.c | 300 +- + drivers/md/raid10.h | 12 + + drivers/md/raid5.c | 231 +- + drivers/media/dvb/dvb-core/dvb_net.c | 14 +- + drivers/media/dvb/dvb-usb/usb-urb.c | 7 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 6 +- + drivers/media/video/au0828/au0828-video.c | 4 +- + drivers/media/video/cx231xx/cx231xx-core.c | 14 +- + drivers/media/video/em28xx/em28xx-core.c | 4 +- + drivers/media/video/gspca/benq.c | 4 +- + drivers/media/video/gspca/gspca.c | 30 +- + drivers/media/video/hdpvr/hdpvr-video.c | 8 +- + drivers/media/video/tlg2300/pd-main.c | 2 +- + drivers/media/video/tlg2300/pd-video.c | 14 +- + drivers/media/video/usbvision/usbvision-core.c | 16 +- + drivers/media/video/uvc/uvc_video.c | 4 +- + drivers/message/fusion/mptbase.c | 177 +- + drivers/message/fusion/mptbase.h | 5 +- + drivers/message/fusion/mptctl.c | 181 +- + drivers/message/fusion/mptfc.c | 22 +- + drivers/message/fusion/mptsas.c | 55 +- + drivers/message/fusion/mptsas.h | 2 +- + drivers/message/fusion/mptscsih.c | 27 +- + drivers/message/fusion/mptspi.c | 10 + + drivers/misc/Makefile | 1 - + drivers/misc/c2port/core.c | 4 +- + drivers/misc/ds1682.c | 6 +- + drivers/misc/eeprom/at24.c | 65 +- + drivers/misc/eeprom/at25.c | 6 +- + drivers/misc/eeprom/eeprom.c | 3 +- + drivers/misc/eeprom/max6875.c | 2 +- + drivers/misc/hdpuftrs/Makefile | 1 - + drivers/misc/hdpuftrs/hdpu_cpustate.c | 256 - + drivers/misc/hdpuftrs/hdpu_nexus.c | 149 - + drivers/mmc/host/atmel-mci.c | 2 +- + drivers/mmc/host/msm_sdcc.c | 472 +- + drivers/mmc/host/msm_sdcc.h | 15 +- + drivers/mtd/Kconfig | 13 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 137 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 344 +- + drivers/mtd/chips/cfi_cmdset_0020.c | 136 +- + drivers/mtd/chips/cfi_probe.c | 56 +- + drivers/mtd/chips/cfi_util.c | 3 +- + drivers/mtd/chips/fwh_lock.h | 6 +- + drivers/mtd/chips/gen_probe.c | 15 +- + drivers/mtd/chips/jedec_probe.c | 288 +- + drivers/mtd/devices/Makefile | 2 +- + drivers/mtd/devices/block2mtd.c | 4 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/devices/sst25l.c | 68 +- + drivers/mtd/ftl.c | 1 - + drivers/mtd/inftlcore.c | 1 - + drivers/mtd/inftlmount.c | 7 +- + drivers/mtd/lpddr/lpddr_cmds.c | 79 +- + drivers/mtd/lpddr/qinfo_probe.c | 7 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/ixp2000.c | 3 +- + drivers/mtd/maps/ixp4xx.c | 7 +- + drivers/mtd/maps/pcmciamtd.c | 88 +- + drivers/mtd/maps/physmap.c | 7 +- + drivers/mtd/maps/physmap_of.c | 55 +- + drivers/mtd/maps/pismo.c | 8 +- + drivers/mtd/maps/pxa2xx-flash.c | 3 +- + drivers/mtd/mtd_blkdevs.c | 335 +- + drivers/mtd/mtdblock.c | 72 +- + drivers/mtd/mtdblock_ro.c | 4 +- + drivers/mtd/mtdchar.c | 105 +- + drivers/mtd/mtdconcat.c | 3 +- + drivers/mtd/mtdcore.c | 285 +- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdoops.c | 5 - + drivers/mtd/mtdsuper.c | 18 +- + drivers/mtd/nand/Kconfig | 69 +- + drivers/mtd/nand/Makefile | 10 +- + drivers/mtd/nand/alauda.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/au1550nd.c | 12 +- + drivers/mtd/nand/bcm_umi_nand.c | 3 +- + drivers/mtd/nand/bf5xx_nand.c | 29 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 6 +- + drivers/mtd/nand/denali.c | 2134 +++++++ + drivers/mtd/nand/denali.h | 816 +++ + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 9 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/mpc5121_nfc.c | 917 +++ + drivers/mtd/nand/mxc_nand.c | 146 +- + drivers/mtd/nand/nand_base.c | 387 +- + drivers/mtd/nand/nand_bbt.c | 29 +- + drivers/mtd/nand/nand_bcm_umi.h | 71 +- + drivers/mtd/nand/nand_ids.c | 1 + + drivers/mtd/nand/nandsim.c | 17 +- + drivers/mtd/nand/nomadik_nand.c | 6 +- + drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 +- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/orion_nand.c | 13 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 11 + + drivers/mtd/nand/r852.c | 1140 ++++ + drivers/mtd/nand/r852.h | 163 + + drivers/mtd/nand/s3c2410.c | 12 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 148 + + drivers/mtd/nand/sm_common.h | 61 + + drivers/mtd/nand/socrates_nand.c | 4 +- + drivers/mtd/nand/tmio_nand.c | 14 +- + drivers/mtd/nand/ts7250.c | 207 - + drivers/mtd/nand/txx9ndfmc.c | 2 +- + drivers/mtd/nftlcore.c | 1 - + drivers/mtd/onenand/Kconfig | 7 + + drivers/mtd/onenand/Makefile | 1 + + drivers/mtd/onenand/omap2.c | 12 +- + drivers/mtd/onenand/onenand_base.c | 63 +- + drivers/mtd/onenand/samsung.c | 1071 ++++ + drivers/mtd/rfd_ftl.c | 1 - + drivers/mtd/sm_ftl.c | 1284 +++++ + drivers/mtd/sm_ftl.h | 94 + + drivers/mtd/ssfdc.c | 1 - + drivers/mtd/tests/mtd_pagetest.c | 3 +- + drivers/mtd/tests/mtd_readtest.c | 3 +- + drivers/mtd/tests/mtd_speedtest.c | 3 +- + drivers/mtd/tests/mtd_stresstest.c | 3 +- + drivers/mtd/tests/mtd_subpagetest.c | 3 +- + drivers/mtd/ubi/Kconfig | 2 +- + drivers/mtd/ubi/build.c | 60 +- + drivers/mtd/ubi/io.c | 6 +- + drivers/mtd/ubi/kapi.c | 6 +- + drivers/mtd/ubi/scan.c | 4 +- + drivers/mtd/ubi/ubi.h | 2 - + drivers/mtd/ubi/vtbl.c | 4 +- + drivers/mtd/ubi/wl.c | 2 +- + drivers/net/3c501.c | 2 - + drivers/net/3c503.c | 44 +- + drivers/net/3c505.c | 14 +- + drivers/net/3c507.c | 5 +- + drivers/net/3c509.c | 4 +- + drivers/net/3c515.c | 6 +- + drivers/net/3c523.c | 11 +- + drivers/net/3c527.c | 6 +- + drivers/net/3c59x.c | 11 +- + drivers/net/7990.c | 12 +- + drivers/net/8139cp.c | 9 +- + drivers/net/8139too.c | 8 +- + drivers/net/82596.c | 9 +- + drivers/net/Kconfig | 46 +- + drivers/net/Makefile | 3 +- + drivers/net/a2065.c | 10 +- + drivers/net/ac3200.c | 2 - + drivers/net/acenic.c | 44 +- + drivers/net/acenic.h | 6 +- + drivers/net/amd8111e.c | 8 +- + drivers/net/apne.c | 1 - + drivers/net/appletalk/cops.c | 9 +- + drivers/net/appletalk/ltpc.c | 1 - + drivers/net/arcnet/arcnet.c | 1 - + drivers/net/arcnet/com20020-pci.c | 4 +- + drivers/net/ariadne.c | 2 - + drivers/net/arm/am79c961a.c | 7 +- + drivers/net/arm/at91_ether.c | 7 +- + drivers/net/arm/ep93xx_eth.c | 2 - + drivers/net/arm/ether1.c | 1 - + drivers/net/arm/ether3.c | 1 - + drivers/net/arm/ixp4xx_eth.c | 9 +- + drivers/net/arm/ks8695net.c | 13 +- + drivers/net/arm/w90p910_ether.c | 7 +- + drivers/net/at1700.c | 11 +- + drivers/net/atarilance.c | 5 +- + drivers/net/atl1c/atl1c_ethtool.c | 2 - + drivers/net/atl1c/atl1c_main.c | 9 +- + drivers/net/atl1e/atl1e_ethtool.c | 2 - + drivers/net/atl1e/atl1e_main.c | 16 +- + drivers/net/atlx/atl1.c | 7 +- + drivers/net/atlx/atl2.c | 8 +- + drivers/net/atlx/atlx.c | 6 +- + drivers/net/atp.c | 10 +- + drivers/net/au1000_eth.c | 262 +- + drivers/net/au1000_eth.h | 4 +- + drivers/net/ax88796.c | 1 - + drivers/net/b44.c | 8 +- + drivers/net/bcm63xx_enet.c | 14 +- + drivers/net/benet/be.h | 11 +- + drivers/net/benet/be_cmds.c | 14 +- + drivers/net/benet/be_cmds.h | 2 +- + drivers/net/benet/be_ethtool.c | 5 +- + drivers/net/benet/be_hw.h | 3 + + drivers/net/benet/be_main.c | 315 +- + drivers/net/bfin_mac.c | 559 ++- + drivers/net/bfin_mac.h | 18 + + drivers/net/bmac.c | 15 +- + drivers/net/bnx2.c | 102 +- + drivers/net/bnx2.h | 9 +- + drivers/net/bnx2x.h | 66 +- + drivers/net/bnx2x_link.c | 12 +- + drivers/net/bnx2x_main.c | 1878 +++++-- + drivers/net/bnx2x_reg.h | 27 +- + drivers/net/bonding/bond_ipv6.c | 9 +- + drivers/net/bonding/bond_main.c | 275 +- + drivers/net/bonding/bonding.h | 2 +- + drivers/net/caif/Kconfig | 17 + + drivers/net/caif/Makefile | 12 + + drivers/net/caif/caif_serial.c | 449 ++ + drivers/net/can/at91_can.c | 4 - + drivers/net/can/bfin_can.c | 3 - + drivers/net/can/mcp251x.c | 16 +- + drivers/net/can/mscan/mpc5xxx_can.c | 1 - + drivers/net/can/mscan/mscan.c | 1 - + drivers/net/can/sja1000/Kconfig | 4 +- + drivers/net/can/sja1000/ems_pci.c | 1 - + drivers/net/can/sja1000/kvaser_pci.c | 1 - + drivers/net/can/sja1000/plx_pci.c | 154 +- + drivers/net/can/sja1000/sja1000.c | 23 +- + drivers/net/can/sja1000/sja1000.h | 1 + + drivers/net/can/sja1000/sja1000_isa.c | 1 - + drivers/net/can/sja1000/sja1000_of_platform.c | 1 - + drivers/net/can/sja1000/sja1000_platform.c | 48 +- + drivers/net/can/ti_hecc.c | 1 - + drivers/net/can/usb/ems_usb.c | 22 +- + drivers/net/cassini.c | 15 +- + drivers/net/chelsio/pm3393.c | 7 +- + drivers/net/chelsio/sge.c | 58 +- + drivers/net/cnic.c | 80 +- + drivers/net/cnic.h | 10 +- + drivers/net/cpmac.c | 17 +- + drivers/net/cris/eth_v10.c | 8 +- + drivers/net/cs89x0.c | 3 - + drivers/net/cxgb3/l2t.c | 1 - + drivers/net/cxgb3/sge.c | 20 +- + drivers/net/cxgb3/xgmac.c | 8 +- + drivers/net/cxgb4/cxgb4.h | 9 +- + drivers/net/cxgb4/cxgb4_main.c | 102 +- + drivers/net/cxgb4/sge.c | 11 +- + drivers/net/cxgb4/t4_hw.c | 117 +- + drivers/net/cxgb4/t4_msg.h | 1 + + drivers/net/cxgb4/t4fw_api.h | 4 +- + drivers/net/davinci_emac.c | 8 +- + drivers/net/de600.c | 4 +- + drivers/net/de620.c | 1 - + drivers/net/declance.c | 10 +- + drivers/net/defxx.c | 6 +- + drivers/net/depca.c | 15 +- + drivers/net/dl2k.c | 8 +- + drivers/net/dm9000.c | 50 +- + drivers/net/dnet.c | 4 +- + drivers/net/e100.c | 190 +- + drivers/net/e1000/e1000.h | 37 +- + drivers/net/e1000/e1000_ethtool.c | 89 +- + drivers/net/e1000/e1000_hw.c | 356 +- + drivers/net/e1000/e1000_hw.h | 1 + + drivers/net/e1000/e1000_main.c | 429 +- + drivers/net/e1000/e1000_osdep.h | 14 - + drivers/net/e1000/e1000_param.c | 112 +- + drivers/net/e1000e/82571.c | 29 +- + drivers/net/e1000e/defines.h | 9 + + drivers/net/e1000e/e1000.h | 26 +- + drivers/net/e1000e/es2lan.c | 11 +- + drivers/net/e1000e/ethtool.c | 48 +- + drivers/net/e1000e/hw.h | 5 + + drivers/net/e1000e/ich8lan.c | 391 +- + drivers/net/e1000e/lib.c | 60 +- + drivers/net/e1000e/netdev.c | 844 +++- + drivers/net/e1000e/param.c | 25 +- + drivers/net/e1000e/phy.c | 21 +- + drivers/net/e2100.c | 1 - + drivers/net/eepro.c | 13 +- + drivers/net/eexpress.c | 11 +- + drivers/net/ehea/ehea.h | 2 +- + drivers/net/ehea/ehea_main.c | 78 +- + drivers/net/ehea/ehea_qmr.c | 43 +- + drivers/net/ehea/ehea_qmr.h | 14 +- + drivers/net/enc28j60.c | 2 - + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/cq_enet_desc.h | 12 +- + drivers/net/enic/enic.h | 12 +- + drivers/net/enic/enic_main.c | 341 ++- + drivers/net/enic/enic_res.c | 5 - + drivers/net/enic/enic_res.h | 1 - + drivers/net/enic/vnic_dev.c | 110 +- + drivers/net/enic/vnic_dev.h | 10 +- + drivers/net/enic/vnic_rq.c | 4 +- + drivers/net/enic/vnic_vic.c | 73 + + drivers/net/enic/vnic_vic.h | 59 + + drivers/net/enic/vnic_wq.c | 4 +- + drivers/net/epic100.c | 13 +- + drivers/net/eql.c | 2 +- + drivers/net/es3210.c | 2 - + drivers/net/eth16i.c | 5 +- + drivers/net/ethoc.c | 8 +- + drivers/net/ewrk3.c | 14 +- + drivers/net/fealnx.c | 9 +- + drivers/net/fec.c | 1140 +--- + drivers/net/fec_mpc52xx.c | 8 +- + drivers/net/forcedeth.c | 251 +- + drivers/net/fs_enet/fs_enet-main.c | 2 - + drivers/net/fs_enet/mac-fcc.c | 6 +- + drivers/net/fs_enet/mac-fec.c | 6 +- + drivers/net/fs_enet/mac-scc.c | 6 +- + drivers/net/fsl_pq_mdio.c | 6 +- + drivers/net/gianfar.c | 213 +- + drivers/net/gianfar.h | 8 +- + drivers/net/greth.c | 7 +- + drivers/net/hamachi.c | 11 +- + drivers/net/hamradio/baycom_ser_fdx.c | 2 +- + drivers/net/hamradio/scc.c | 1 - + drivers/net/hp-plus.c | 4 - + drivers/net/hp.c | 3 - + drivers/net/hp100.c | 16 +- + drivers/net/ibm_newemac/core.c | 12 +- + drivers/net/ibmlana.c | 8 +- + drivers/net/ibmveth.c | 24 +- + drivers/net/ifb.c | 1 - + drivers/net/igb/e1000_82575.c | 35 +- + drivers/net/igb/e1000_82575.h | 9 +- + drivers/net/igb/e1000_defines.h | 5 +- + drivers/net/igb/e1000_hw.h | 17 +- + drivers/net/igb/e1000_mac.c | 27 +- + drivers/net/igb/igb.h | 9 +- + drivers/net/igb/igb_ethtool.c | 58 +- + drivers/net/igb/igb_main.c | 613 ++- + drivers/net/igbvf/ethtool.c | 2 - + drivers/net/igbvf/netdev.c | 82 +- + drivers/net/ioc3-eth.c | 7 +- + drivers/net/ipg.c | 11 +- + drivers/net/ipg.h | 109 +- + drivers/net/irda/Kconfig | 6 + + drivers/net/irda/Makefile | 1 + + drivers/net/irda/ali-ircc.c | 32 +- + drivers/net/irda/au1k_ir.c | 1 - + drivers/net/irda/donauboe.c | 2 - + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/mcs7780.c | 4 - + drivers/net/irda/pxaficp_ir.c | 1 - + drivers/net/irda/sa1100_ir.c | 2 - + drivers/net/irda/sh_irda.c | 865 +++ + drivers/net/irda/sh_sir.c | 12 +- + drivers/net/irda/sir_dev.c | 1 - + drivers/net/irda/smsc-ircc2.c | 3 +- + drivers/net/irda/via-ircc.h | 2 +- + drivers/net/irda/vlsi_ir.c | 5 +- + drivers/net/irda/w83977af_ir.c | 2 - + drivers/net/iseries_veth.c | 6 +- + drivers/net/ixgb/ixgb.h | 8 +- + drivers/net/ixgb/ixgb_ee.c | 24 +- + drivers/net/ixgb/ixgb_hw.c | 164 +- + drivers/net/ixgb/ixgb_hw.h | 12 - + drivers/net/ixgb/ixgb_main.c | 159 +- + drivers/net/ixgb/ixgb_osdep.h | 16 +- + drivers/net/ixgb/ixgb_param.c | 31 +- + drivers/net/ixgbe/ixgbe.h | 3 + + drivers/net/ixgbe/ixgbe_82598.c | 8 +- + drivers/net/ixgbe/ixgbe_82599.c | 418 +-- + drivers/net/ixgbe/ixgbe_common.c | 539 ++- + drivers/net/ixgbe/ixgbe_common.h | 22 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 1 - + drivers/net/ixgbe/ixgbe_ethtool.c | 146 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 17 +- + drivers/net/ixgbe/ixgbe_main.c | 656 ++- + drivers/net/ixgbe/ixgbe_phy.c | 42 +- + drivers/net/ixgbe/ixgbe_phy.h | 3 + + drivers/net/ixgbe/ixgbe_sriov.c | 137 +- + drivers/net/ixgbe/ixgbe_sriov.h | 8 +- + drivers/net/ixgbe/ixgbe_type.h | 50 +- + drivers/net/ixgbevf/defines.h | 12 +- + drivers/net/ixgbevf/ixgbevf_main.c | 125 +- + drivers/net/ixgbevf/vf.c | 27 +- + drivers/net/ixgbevf/vf.h | 4 +- + drivers/net/ixp2000/ixpdev.c | 2 - + drivers/net/jme.c | 12 +- + drivers/net/korina.c | 12 +- + drivers/net/ks8842.c | 61 +- + drivers/net/ks8851.c | 448 ++- + drivers/net/ks8851.h | 14 +- + drivers/net/ks8851_mll.c | 63 +- + drivers/net/ksz884x.c | 86 +- + drivers/net/lance.c | 4 +- + drivers/net/lib82596.c | 11 +- + drivers/net/lib8390.c | 22 +- + drivers/net/ll_temac.h | 14 +- + drivers/net/ll_temac_main.c | 159 +- + drivers/net/lne390.c | 2 - + drivers/net/lp486e.c | 8 +- + drivers/net/mac8390.c | 2 - + drivers/net/mac89x0.c | 1 - + drivers/net/macb.c | 9 +- + drivers/net/mace.c | 6 +- + drivers/net/macmace.c | 7 +- + drivers/net/macvlan.c | 23 +- + drivers/net/macvtap.c | 46 +- + drivers/net/meth.c | 4 +- + drivers/net/mlx4/en_ethtool.c | 2 - + drivers/net/mlx4/en_netdev.c | 53 +- + drivers/net/mlx4/eq.c | 2 +- + drivers/net/mlx4/mlx4.h | 1 + + drivers/net/mlx4/mlx4_en.h | 3 +- + drivers/net/mv643xx_eth.c | 10 +- + drivers/net/myri10ge/myri10ge.c | 54 +- + drivers/net/myri_sbus.c | 2 +- + drivers/net/natsemi.c | 10 +- + drivers/net/ne-h8300.c | 1 - + drivers/net/ne.c | 1 - + drivers/net/ne2.c | 1 - + drivers/net/ne2k-pci.c | 1 - + drivers/net/ne3210.c | 2 - + drivers/net/netconsole.c | 15 +- + drivers/net/netx-eth.c | 1 - + drivers/net/netxen/netxen_nic.h | 6 +- + drivers/net/netxen/netxen_nic_ethtool.c | 9 + + drivers/net/netxen/netxen_nic_hdr.h | 8 - + drivers/net/netxen/netxen_nic_hw.c | 131 +- + drivers/net/netxen/netxen_nic_init.c | 169 +- + drivers/net/netxen/netxen_nic_main.c | 85 +- + drivers/net/ni5010.c | 5 +- + drivers/net/ni52.c | 13 +- + drivers/net/ni65.c | 5 +- + drivers/net/niu.c | 57 +- + drivers/net/niu.h | 7 +- + drivers/net/octeon/octeon_mgmt.c | 66 +- + drivers/net/pasemi_mac.c | 2 - + drivers/net/pci-skeleton.c | 7 +- + drivers/net/pcmcia/3c574_cs.c | 6 +- + drivers/net/pcmcia/3c589_cs.c | 287 +- + drivers/net/pcmcia/axnet_cs.c | 10 +- + drivers/net/pcmcia/fmvj18x_cs.c | 9 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 - + drivers/net/pcmcia/nmclan_cs.c | 12 +- + drivers/net/pcmcia/smc91c92_cs.c | 14 +- + drivers/net/pcmcia/xirc2ps_cs.c | 9 +- + drivers/net/pcnet32.c | 15 +- + drivers/net/phy/bcm63xx.c | 8 + + drivers/net/phy/broadcom.c | 16 + + drivers/net/phy/cicada.c | 8 + + drivers/net/phy/davicom.c | 9 + + drivers/net/phy/et1011c.c | 7 + + drivers/net/phy/icplus.c | 7 + + drivers/net/phy/lxt.c | 8 + + drivers/net/phy/marvell.c | 13 + + drivers/net/phy/mdio-bitbang.c | 60 +- + drivers/net/phy/mdio_bus.c | 4 +- + drivers/net/phy/micrel.c | 9 + + drivers/net/phy/national.c | 10 +- + drivers/net/phy/phy_device.c | 12 + + drivers/net/phy/qsemi.c | 7 + + drivers/net/phy/realtek.c | 7 + + drivers/net/phy/smsc.c | 11 + + drivers/net/phy/ste10Xp.c | 8 + + drivers/net/phy/vitesse.c | 8 + + drivers/net/plip.c | 4 - + drivers/net/ppp_generic.c | 19 + + drivers/net/pppoe.c | 11 +- + drivers/net/pppol2tp.c | 2680 --------- + drivers/net/ps3_gelic_net.c | 13 +- + drivers/net/ps3_gelic_wireless.c | 74 +- + drivers/net/qla3xxx.c | 72 +- + drivers/net/qla3xxx.h | 8 +- + drivers/net/qlcnic/qlcnic.h | 40 +- + drivers/net/qlcnic/qlcnic_ctx.c | 3 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 34 +- + drivers/net/qlcnic/qlcnic_hdr.h | 60 +- + drivers/net/qlcnic/qlcnic_hw.c | 136 +- + drivers/net/qlcnic/qlcnic_init.c | 101 +- + drivers/net/qlcnic/qlcnic_main.c | 447 +- + drivers/net/qlge/qlge.h | 8 +- + drivers/net/qlge/qlge_dbg.c | 4 +- + drivers/net/qlge/qlge_ethtool.c | 2 - + drivers/net/qlge/qlge_main.c | 64 +- + drivers/net/r6040.c | 46 +- + drivers/net/r8169.c | 158 +- + drivers/net/rrunner.c | 1 - + drivers/net/s2io.c | 15 +- + drivers/net/s6gmac.c | 3 +- + drivers/net/sb1000.c | 5 - + drivers/net/sb1250-mac.c | 275 +- + drivers/net/sc92031.c | 8 +- + drivers/net/seeq8005.c | 4 +- + drivers/net/sfc/efx.c | 137 +- + drivers/net/sfc/efx.h | 4 +- + drivers/net/sfc/ethtool.c | 6 +- + drivers/net/sfc/falcon.c | 16 +- + drivers/net/sfc/falcon_xmac.c | 22 +- + drivers/net/sfc/mcdi.c | 32 +- + drivers/net/sfc/mcdi_mac.c | 25 +- + drivers/net/sfc/mcdi_pcol.h | 71 +- + drivers/net/sfc/mcdi_phy.c | 152 +- + drivers/net/sfc/net_driver.h | 76 +- + drivers/net/sfc/nic.c | 114 +- + drivers/net/sfc/nic.h | 3 + + drivers/net/sfc/selftest.c | 8 +- + drivers/net/sfc/selftest.h | 4 +- + drivers/net/sfc/siena.c | 19 + + drivers/net/sfc/tx.c | 61 +- + drivers/net/sfc/workarounds.h | 2 +- + drivers/net/sgiseeq.c | 6 +- + drivers/net/sh_eth.c | 2 - + drivers/net/sis190.c | 6 +- + drivers/net/sis900.c | 25 +- + drivers/net/skfp/fplustm.c | 2 +- + drivers/net/skfp/pcmplc.c | 4 +- + drivers/net/skfp/skfddi.c | 15 +- + drivers/net/skfp/smt.c | 2 +- + drivers/net/skfp/srf.c | 2 +- + drivers/net/skge.c | 46 +- + drivers/net/skge.h | 4 +- + drivers/net/sky2.c | 215 +- + drivers/net/sky2.h | 41 +- + drivers/net/slhc.c | 1 - + drivers/net/slip.c | 4 +- + drivers/net/smc-mca.c | 1 - + drivers/net/smc-ultra.c | 1 - + drivers/net/smc-ultra32.c | 1 - + drivers/net/smc911x.c | 21 +- + drivers/net/smc9194.c | 61 +- + drivers/net/smc91x.c | 12 +- + drivers/net/smsc911x.c | 7 +- + drivers/net/smsc9420.c | 8 +- + drivers/net/sonic.c | 10 +- + drivers/net/spider_net.c | 8 +- + drivers/net/starfire.c | 16 +- + drivers/net/stmmac/Makefile | 2 +- + drivers/net/stmmac/common.h | 21 +- + drivers/net/stmmac/dwmac100.c | 538 -- + drivers/net/stmmac/dwmac100.h | 5 + + drivers/net/stmmac/dwmac1000.h | 12 - + drivers/net/stmmac/dwmac1000_core.c | 41 +- + drivers/net/stmmac/dwmac1000_dma.c | 338 +-- + drivers/net/stmmac/dwmac100_core.c | 196 + + drivers/net/stmmac/dwmac100_dma.c | 134 + + drivers/net/stmmac/dwmac_dma.h | 1 + + drivers/net/stmmac/dwmac_lib.c | 19 +- + drivers/net/stmmac/enh_desc.c | 337 ++ + drivers/net/stmmac/norm_desc.c | 236 + + drivers/net/stmmac/stmmac.h | 10 +- + drivers/net/stmmac/stmmac_ethtool.c | 7 - + drivers/net/stmmac/stmmac_main.c | 32 +- + drivers/net/stmmac/stmmac_timer.c | 6 - + drivers/net/stnic.c | 1 - + drivers/net/sun3_82586.c | 13 +- + drivers/net/sun3lance.c | 8 +- + drivers/net/sunbmac.c | 12 +- + drivers/net/sundance.c | 14 +- + drivers/net/sungem.c | 9 +- + drivers/net/sunhme.c | 22 +- + drivers/net/sunlance.c | 11 +- + drivers/net/sunqe.c | 7 +- + drivers/net/sunvnet.c | 9 +- + drivers/net/tc35815.c | 8 +- + drivers/net/tehuti.c | 10 +- + drivers/net/tg3.c | 839 ++-- + drivers/net/tg3.h | 17 +- + drivers/net/tlan.c | 13 +- + drivers/net/tokenring/3c359.c | 112 +- + drivers/net/tokenring/ibmtr.c | 13 +- + drivers/net/tokenring/lanstreamer.c | 58 +- + drivers/net/tokenring/madgemc.c | 12 - + drivers/net/tokenring/olympic.c | 74 +- + drivers/net/tokenring/smctr.c | 4 +- + drivers/net/tokenring/tms380tr.c | 65 +- + drivers/net/tsi108_eth.c | 16 +- + drivers/net/tulip/de2104x.c | 13 +- + drivers/net/tulip/de4x5.c | 87 +- + drivers/net/tulip/dmfe.c | 17 +- + drivers/net/tulip/media.c | 2 - + drivers/net/tulip/pnic.c | 2 +- + drivers/net/tulip/tulip_core.c | 31 +- + drivers/net/tulip/uli526x.c | 10 +- + drivers/net/tulip/winbond-840.c | 18 +- + drivers/net/tulip/xircom_cb.c | 6 +- + drivers/net/tun.c | 55 +- + drivers/net/typhoon.c | 8 +- + drivers/net/ucc_geth.c | 12 +- + drivers/net/usb/asix.c | 53 +- + drivers/net/usb/catc.c | 6 +- + drivers/net/usb/cdc_ether.c | 113 +- + drivers/net/usb/dm9601.c | 9 +- + drivers/net/usb/hso.c | 4 - + drivers/net/usb/ipheth.c | 24 +- + drivers/net/usb/kaweth.c | 13 +- + drivers/net/usb/mcs7830.c | 10 +- + drivers/net/usb/pegasus.c | 9 +- + drivers/net/usb/pegasus.h | 2 +- + drivers/net/usb/rndis_host.c | 18 +- + drivers/net/usb/smsc75xx.c | 6 +- + drivers/net/usb/smsc95xx.c | 6 +- + drivers/net/usb/usbnet.c | 15 +- + drivers/net/via-rhine.c | 10 +- + drivers/net/via-velocity.c | 121 +- + drivers/net/via-velocity.h | 77 +- + drivers/net/virtio_net.c | 95 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 11 +- + drivers/net/vxge/vxge-config.c | 41 +- + drivers/net/vxge/vxge-config.h | 34 +- + drivers/net/vxge/vxge-ethtool.c | 5 +- + drivers/net/vxge/vxge-main.c | 245 +- + drivers/net/vxge/vxge-main.h | 6 + + drivers/net/vxge/vxge-traffic.c | 79 +- + drivers/net/vxge/vxge-traffic.h | 50 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/cycx_x25.c | 13 +- + drivers/net/wan/dscc4.c | 2 - + drivers/net/wan/hd64570.c | 1 - + drivers/net/wan/hd64572.c | 1 - + drivers/net/wan/hdlc_x25.c | 12 +- + drivers/net/wan/ixp4xx_hss.c | 1 - + drivers/net/wan/lapbether.c | 12 +- + drivers/net/wan/lmc/lmc_main.c | 6 +- + drivers/net/wan/pc300_drv.c | 5 +- + drivers/net/wan/pc300_tty.c | 2 +- + drivers/net/wan/sdla.c | 2 +- + drivers/net/wan/wanxl.c | 1 - + drivers/net/wan/x25_asy.c | 12 +- + drivers/net/wd.c | 1 - + drivers/net/wimax/i2400m/control.c | 27 +- + drivers/net/wimax/i2400m/driver.c | 167 +- + drivers/net/wimax/i2400m/i2400m-sdio.h | 5 +- + drivers/net/wimax/i2400m/i2400m.h | 82 +- + drivers/net/wimax/i2400m/netdev.c | 14 +- + drivers/net/wimax/i2400m/rx.c | 116 +- + drivers/net/wimax/i2400m/sdio-rx.c | 2 - + drivers/net/wimax/i2400m/sdio-tx.c | 35 +- + drivers/net/wimax/i2400m/sdio.c | 7 + + drivers/net/wimax/i2400m/tx.c | 155 +- + drivers/net/wimax/i2400m/usb-notif.c | 1 - + drivers/net/wimax/i2400m/usb.c | 14 +- + drivers/net/wireless/Kconfig | 92 +- + drivers/net/wireless/adm8211.c | 12 +- + drivers/net/wireless/airo.c | 37 +- + drivers/net/wireless/at76c50x-usb.c | 2 +- + drivers/net/wireless/ath/Kconfig | 2 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 52 +- + drivers/net/wireless/ath/ar9170/cmd.h | 2 +- + drivers/net/wireless/ath/ar9170/eeprom.h | 4 +- + drivers/net/wireless/ath/ar9170/hw.h | 1 + + drivers/net/wireless/ath/ar9170/main.c | 587 +-- + drivers/net/wireless/ath/ar9170/usb.c | 25 +- + drivers/net/wireless/ath/ath.h | 27 +- + drivers/net/wireless/ath/ath5k/Makefile | 1 + + drivers/net/wireless/ath/ath5k/ani.c | 744 +++ + drivers/net/wireless/ath/ath5k/ani.h | 104 + + drivers/net/wireless/ath/ath5k/ath5k.h | 313 +- + drivers/net/wireless/ath/ath5k/attach.c | 7 +- + drivers/net/wireless/ath/ath5k/base.c | 329 +- + drivers/net/wireless/ath/ath5k/base.h | 39 +- + drivers/net/wireless/ath/ath5k/caps.c | 9 +- + drivers/net/wireless/ath/ath5k/debug.c | 382 ++ + drivers/net/wireless/ath/ath5k/debug.h | 4 + + drivers/net/wireless/ath/ath5k/desc.c | 19 +- + drivers/net/wireless/ath/ath5k/desc.h | 35 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 88 +- + drivers/net/wireless/ath/ath5k/pcu.c | 379 +-- + drivers/net/wireless/ath/ath5k/phy.c | 77 +- + drivers/net/wireless/ath/ath5k/qcu.c | 17 - + drivers/net/wireless/ath/ath5k/reg.h | 42 +- + drivers/net/wireless/ath/ath5k/reset.c | 41 +- + drivers/net/wireless/ath/ath9k/Kconfig | 21 + + drivers/net/wireless/ath/ath9k/Makefile | 26 +- + drivers/net/wireless/ath/ath9k/ahb.c | 1 + + drivers/net/wireless/ath/ath9k/ani.c | 217 +- + drivers/net/wireless/ath/ath9k/ani.h | 1 - + drivers/net/wireless/ath/ath9k/ar5008_initvals.h | 742 +++ + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 1374 +++++ + drivers/net/wireless/ath/ath9k/ar9001_initvals.h | 1254 ++++ + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 1000 ++++ + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 598 ++ + .../ath/ath9k/{initvals.h => ar9002_initvals.h} | 2292 +------- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 480 ++ + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 535 ++ + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 572 ++ + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 802 +++ + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 1838 ++++++ + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 323 ++ + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 205 + + drivers/net/wireless/ath/ath9k/ar9003_initvals.h | 1784 ++++++ + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 614 ++ + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 120 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 1134 ++++ + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 847 +++ + drivers/net/wireless/ath/ath9k/ath9k.h | 28 +- + drivers/net/wireless/ath/ath9k/beacon.c | 40 +- + drivers/net/wireless/ath/ath9k/calib.c | 1024 +---- + drivers/net/wireless/ath/ath9k/calib.h | 19 +- + drivers/net/wireless/ath/ath9k/common.c | 392 ++- + drivers/net/wireless/ath/ath9k/common.h | 17 +- + drivers/net/wireless/ath/ath9k/debug.c | 297 +- + drivers/net/wireless/ath/ath9k/debug.h | 21 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 11 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 25 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 19 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 11 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 18 +- + drivers/net/wireless/ath/ath9k/gpio.c | 17 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 1008 ++++ + drivers/net/wireless/ath/ath9k/hif_usb.h | 104 + + drivers/net/wireless/ath/ath9k/htc.h | 464 ++ + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 255 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 834 +++ + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 1775 ++++++ + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 707 +++ + drivers/net/wireless/ath/ath9k/htc_hst.c | 480 ++ + drivers/net/wireless/ath/ath9k/htc_hst.h | 245 + + drivers/net/wireless/ath/ath9k/hw-ops.h | 280 + + drivers/net/wireless/ath/ath9k/hw.c | 1913 ++----- + drivers/net/wireless/ath/ath9k/hw.h | 275 +- + drivers/net/wireless/ath/ath9k/init.c | 88 +- + drivers/net/wireless/ath/ath9k/mac.c | 571 +-- + drivers/net/wireless/ath/ath9k/mac.h | 93 +- + drivers/net/wireless/ath/ath9k/main.c | 158 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 + + drivers/net/wireless/ath/ath9k/phy.c | 978 ---- + drivers/net/wireless/ath/ath9k/phy.h | 596 +-- + drivers/net/wireless/ath/ath9k/rc.c | 21 +- + drivers/net/wireless/ath/ath9k/rc.h | 11 +- + drivers/net/wireless/ath/ath9k/recv.c | 533 ++- + drivers/net/wireless/ath/ath9k/reg.h | 183 +- + drivers/net/wireless/ath/ath9k/virtual.c | 2 +- + drivers/net/wireless/ath/ath9k/wmi.c | 336 ++ + drivers/net/wireless/ath/ath9k/wmi.h | 139 + + drivers/net/wireless/ath/ath9k/xmit.c | 591 ++- + drivers/net/wireless/ath/debug.h | 1 + + drivers/net/wireless/ath/hw.c | 4 +- + drivers/net/wireless/ath/regd.c | 4 +- + drivers/net/wireless/atmel.c | 1 - + drivers/net/wireless/b43/b43.h | 1 + + drivers/net/wireless/b43/main.c | 26 +- + drivers/net/wireless/b43/phy_n.c | 479 ++- + drivers/net/wireless/b43/phy_n.h | 21 +- + drivers/net/wireless/b43/tables_nphy.c | 20 +- + drivers/net/wireless/b43/tables_nphy.h | 37 +- + drivers/net/wireless/b43/xmit.c | 1 - + drivers/net/wireless/b43legacy/main.c | 21 +- + drivers/net/wireless/b43legacy/xmit.c | 1 - + drivers/net/wireless/hostap/hostap_80211_rx.c | 3 +- + drivers/net/wireless/hostap/hostap_ap.c | 2 +- + drivers/net/wireless/hostap/hostap_download.c | 2 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 3 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 49 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 190 +- + drivers/net/wireless/ipw2x00/libipw.h | 14 +- + drivers/net/wireless/ipw2x00/libipw_module.c | 13 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 1 - + drivers/net/wireless/iwlwifi/Makefile | 6 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 102 +- + drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c | 500 ++ + drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h | 60 + + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 93 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 361 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 24 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 198 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 33 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 1493 +----- + drivers/net/wireless/iwlwifi/iwl-6000.c | 331 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 850 +++ + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 56 + + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 276 + + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 118 + + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 307 + + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 1530 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 208 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 1340 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 425 ++ + drivers/net/wireless/iwlwifi/iwl-agn.c | 1021 ++-- + drivers/net/wireless/iwlwifi/iwl-agn.h | 181 + + drivers/net/wireless/iwlwifi/iwl-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 116 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 1021 +--- + drivers/net/wireless/iwlwifi/iwl-core.h | 136 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 912 +--- + drivers/net/wireless/iwlwifi/iwl-dev.h | 288 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 1 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 + + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 49 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 3 + + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 94 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 826 +--- + drivers/net/wireless/iwlwifi/iwl-scan.c | 536 +-- + drivers/net/wireless/iwlwifi/iwl-sta.c | 901 ++-- + drivers/net/wireless/iwlwifi/iwl-sta.h | 76 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 1074 +---- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 406 +- + drivers/net/wireless/iwmc3200wifi/Kconfig | 9 +- + drivers/net/wireless/iwmc3200wifi/Makefile | 5 + + drivers/net/wireless/iwmc3200wifi/bus.h | 2 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 17 +- + drivers/net/wireless/iwmc3200wifi/commands.c | 14 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 1 + + drivers/net/wireless/iwmc3200wifi/debug.h | 7 +- + drivers/net/wireless/iwmc3200wifi/debugfs.c | 123 +- + drivers/net/wireless/iwmc3200wifi/hal.c | 15 +- + drivers/net/wireless/iwmc3200wifi/hal.h | 5 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 3 + + drivers/net/wireless/iwmc3200wifi/main.c | 9 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 79 +- + drivers/net/wireless/iwmc3200wifi/sdio.c | 19 +- + drivers/net/wireless/iwmc3200wifi/trace.c | 3 + + drivers/net/wireless/iwmc3200wifi/trace.h | 283 + + drivers/net/wireless/iwmc3200wifi/tx.c | 12 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 2 +- + drivers/net/wireless/libertas/assoc.c | 22 +- + drivers/net/wireless/libertas/cfg.c | 1 + + drivers/net/wireless/libertas/debugfs.c | 5 +- + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/if_sdio.c | 127 +- + drivers/net/wireless/libertas/if_usb.c | 4 - + drivers/net/wireless/libertas/main.c | 15 +- + drivers/net/wireless/libertas/rx.c | 51 +- + drivers/net/wireless/libertas/tx.c | 2 - + drivers/net/wireless/libertas/wext.c | 4 + + drivers/net/wireless/libertas_tf/cmd.c | 203 +- + drivers/net/wireless/libertas_tf/deb_defs.h | 104 + + drivers/net/wireless/libertas_tf/if_usb.c | 252 +- + drivers/net/wireless/libertas_tf/libertas_tf.h | 2 + + drivers/net/wireless/libertas_tf/main.c | 106 +- + drivers/net/wireless/mac80211_hwsim.c | 96 +- + drivers/net/wireless/mwl8k.c | 30 +- + drivers/net/wireless/orinoco/Kconfig | 20 +- + drivers/net/wireless/orinoco/Makefile | 4 + + drivers/net/wireless/orinoco/airport.c | 8 +- + drivers/net/wireless/orinoco/cfg.c | 91 +- + drivers/net/wireless/orinoco/fw.c | 10 +- + drivers/net/wireless/orinoco/hermes.c | 286 +- + drivers/net/wireless/orinoco/hermes.h | 62 +- + drivers/net/wireless/orinoco/hermes_dld.c | 243 +- + drivers/net/wireless/orinoco/hw.c | 102 +- + drivers/net/wireless/orinoco/hw.h | 1 - + drivers/net/wireless/orinoco/main.c | 307 +- + drivers/net/wireless/orinoco/main.h | 12 - + drivers/net/wireless/orinoco/orinoco.h | 38 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 85 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 2 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 2 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 1795 ++++++ + drivers/net/wireless/orinoco/scan.c | 4 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 7 +- + drivers/net/wireless/orinoco/wext.c | 273 +- + drivers/net/wireless/p54/main.c | 2 +- + drivers/net/wireless/p54/p54pci.c | 10 +- + drivers/net/wireless/p54/p54usb.c | 1 - + drivers/net/wireless/p54/txrx.c | 3 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 - + drivers/net/wireless/prism54/islpci_dev.c | 18 +- + drivers/net/wireless/prism54/islpci_eth.c | 10 +- + drivers/net/wireless/prism54/islpci_mgt.c | 8 +- + drivers/net/wireless/prism54/oid_mgt.c | 2 +- + drivers/net/wireless/ray_cs.c | 242 +- + drivers/net/wireless/rndis_wlan.c | 374 ++- + drivers/net/wireless/rt2x00/Kconfig | 4 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 56 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 54 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 130 +- + drivers/net/wireless/rt2x00/rt2800.h | 119 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 676 ++- + drivers/net/wireless/rt2x00/rt2800lib.h | 3 + + drivers/net/wireless/rt2x00/rt2800pci.c | 318 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 297 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 40 - + drivers/net/wireless/rt2x00/rt2x00.h | 35 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 1 + + drivers/net/wireless/rt2x00/rt2x00debug.c | 23 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 1 - + drivers/net/wireless/rt2x00/rt2x00dump.h | 3 + + drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 17 + + drivers/net/wireless/rt2x00/rt2x00pci.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 3 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 47 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 11 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 10 + + drivers/net/wireless/rt2x00/rt2x00usb.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 3 +- + drivers/net/wireless/rt2x00/rt61pci.c | 95 +- + drivers/net/wireless/rt2x00/rt73usb.c | 128 +- + drivers/net/wireless/rtl818x/Kconfig | 88 + + drivers/net/wireless/rtl818x/rtl8180.h | 11 + + drivers/net/wireless/rtl818x/rtl8180_dev.c | 115 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 14 +- + drivers/net/wireless/wl12xx/Kconfig | 24 + + drivers/net/wireless/wl12xx/Makefile | 6 +- + drivers/net/wireless/wl12xx/wl1251.h | 2 + + drivers/net/wireless/wl12xx/wl1251_boot.c | 3 +- + drivers/net/wireless/wl12xx/wl1251_io.h | 20 + + drivers/net/wireless/wl12xx/wl1251_main.c | 73 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 8 +- + drivers/net/wireless/wl12xx/wl1251_reg.h | 7 + + drivers/net/wireless/wl12xx/wl1251_rx.c | 8 - + drivers/net/wireless/wl12xx/wl1251_sdio.c | 144 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +- + drivers/net/wireless/wl12xx/wl1271.h | 63 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 179 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 157 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 46 +- + drivers/net/wireless/wl12xx/wl1271_boot.h | 10 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 337 +- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 27 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 488 ++- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 12 +- + drivers/net/wireless/wl12xx/wl1271_event.c | 69 +- + drivers/net/wireless/wl12xx/wl1271_event.h | 8 + + drivers/net/wireless/wl12xx/wl1271_init.c | 57 +- + drivers/net/wireless/wl12xx/wl1271_io.c | 87 +- + drivers/net/wireless/wl12xx/wl1271_io.h | 139 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 1272 +++-- + drivers/net/wireless/wl12xx/wl1271_ps.c | 7 +- + drivers/net/wireless/wl12xx/wl1271_rx.c | 94 +- + drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_sdio.c | 291 + + drivers/net/wireless/wl12xx/wl1271_spi.c | 315 +- + drivers/net/wireless/wl12xx/wl1271_spi.h | 96 - + drivers/net/wireless/wl12xx/wl1271_testmode.c | 1 - + drivers/net/wireless/wl12xx/wl1271_tx.c | 133 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 9 +- + drivers/net/wireless/wl3501_cs.c | 57 +- + drivers/net/wireless/zd1201.c | 12 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 13 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 10 +- + drivers/net/xilinx_emaclite.c | 10 +- + drivers/net/yellowfin.c | 13 +- + drivers/net/znet.c | 2 - + drivers/net/zorro8390.c | 1 - + drivers/pci/Kconfig | 2 +- + drivers/pci/access.c | 41 +- + drivers/pci/dmar.c | 82 +- + drivers/pci/hotplug/acpiphp_ibm.c | 5 +- + drivers/pci/hotplug/cpqphp_core.c | 3 +- + drivers/pci/hotplug/pciehp_pci.c | 17 +- + drivers/pci/intel-iommu.c | 129 +- + drivers/pci/intr_remapping.c | 6 +- + drivers/pci/pci-sysfs.c | 89 +- + drivers/pci/pci.c | 4 +- + drivers/pci/pcie/aer/aer_inject.c | 2 +- + drivers/pci/pcie/aer/aerdrv.c | 179 +- + drivers/pci/pcie/aer/aerdrv.h | 6 +- + drivers/pci/pcie/aer/aerdrv_core.c | 558 +-- + drivers/pci/quirks.c | 21 +- + drivers/pci/slot.c | 48 + + drivers/pcmcia/cistpl.c | 4 +- + drivers/platform/x86/Kconfig | 10 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/classmate-laptop.c | 170 +- + drivers/platform/x86/eeepc-wmi.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 6 +- + drivers/platform/x86/intel_scu_ipc.c | 829 +++ + drivers/platform/x86/msi-laptop.c | 163 +- + drivers/platform/x86/thinkpad_acpi.c | 600 ++- + drivers/platform/x86/wmi.c | 103 +- + drivers/power/olpc_battery.c | 2 +- + drivers/rapidio/rio-sysfs.c | 6 +- + drivers/rtc/rtc-cmos.c | 89 +- + drivers/rtc/rtc-ds1305.c | 6 +- + drivers/rtc/rtc-ds1307.c | 6 +- + drivers/rtc/rtc-ds1511.c | 10 +- + drivers/rtc/rtc-ds1553.c | 4 +- + drivers/rtc/rtc-ds1742.c | 4 +- + drivers/rtc/rtc-m48t59.c | 4 +- + drivers/rtc/rtc-stk17ta8.c | 4 +- + drivers/rtc/rtc-tx4939.c | 4 +- + drivers/s390/cio/chp.c | 5 +- + drivers/s390/net/ctcm_main.c | 6 +- + drivers/s390/net/ctcm_mpc.c | 6 +- + drivers/s390/net/lcs.c | 3 +- + drivers/s390/net/qeth_core.h | 32 +- + drivers/s390/net/qeth_core_main.c | 237 +- + drivers/s390/net/qeth_core_mpc.h | 10 +- + drivers/s390/net/qeth_core_sys.c | 151 +- + drivers/s390/net/qeth_l2_main.c | 47 +- + drivers/s390/net/qeth_l3_main.c | 108 +- + drivers/s390/net/qeth_l3_sys.c | 244 +- + drivers/s390/scsi/zfcp_aux.c | 7 +- + drivers/s390/scsi/zfcp_def.h | 19 +- + drivers/s390/scsi/zfcp_erp.c | 2 +- + drivers/s390/scsi/zfcp_ext.h | 6 +- + drivers/s390/scsi/zfcp_fc.c | 4 +- + drivers/s390/scsi/zfcp_fsf.c | 246 +- + drivers/s390/scsi/zfcp_fsf.h | 11 +- + drivers/s390/scsi/zfcp_qdio.c | 108 +- + drivers/s390/scsi/zfcp_qdio.h | 104 + + drivers/s390/scsi/zfcp_scsi.c | 23 +- + drivers/scsi/3w-9xxx.c | 24 +- + drivers/scsi/3w-9xxx.h | 9 +- + drivers/scsi/3w-sas.c | 4 +- + drivers/scsi/3w-xxxx.c | 23 +- + drivers/scsi/3w-xxxx.h | 8 +- + drivers/scsi/Makefile | 1 + + drivers/scsi/a2091.c | 309 +- + drivers/scsi/a2091.h | 42 +- + drivers/scsi/a3000.c | 285 +- + drivers/scsi/a3000.h | 46 +- + drivers/scsi/aacraid/aachba.c | 67 +- + drivers/scsi/aacraid/aacraid.h | 4 +- + drivers/scsi/aacraid/commsup.c | 18 + + drivers/scsi/arcmsr/arcmsr_attr.c | 9 +- + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 29 - + drivers/scsi/bfa/bfa_ioim.c | 22 +- + drivers/scsi/bfa/bfa_os_inc.h | 23 +- + drivers/scsi/bfa/bfad.c | 21 +- + drivers/scsi/bfa/bfad_attr.c | 201 + + drivers/scsi/bfa/bfad_drv.h | 4 +- + drivers/scsi/bfa/bfad_im.c | 67 +- + drivers/scsi/bfa/bfad_im.h | 6 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/bnx2i/bnx2i_init.c | 11 +- + drivers/scsi/cxgb3i/cxgb3i_init.c | 4 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 2 - + drivers/scsi/fcoe/fcoe.c | 212 +- + drivers/scsi/fcoe/libfcoe.c | 111 +- + drivers/scsi/fnic/fnic.h | 4 +- + drivers/scsi/fnic/fnic_fcs.c | 2 +- + drivers/scsi/fnic/fnic_main.c | 2 +- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/gvp11.c | 565 +- + drivers/scsi/gvp11.h | 36 +- + drivers/scsi/hpsa.c | 8 - + drivers/scsi/hpsa_cmd.h | 15 - + drivers/scsi/ibmvscsi/ibmvfc.c | 11 +- + drivers/scsi/ibmvscsi/ibmvfc.h | 1 + + drivers/scsi/ipr.c | 9 +- + drivers/scsi/iscsi_tcp.c | 10 +- + drivers/scsi/iscsi_tcp.h | 1 - + drivers/scsi/libfc/fc_disc.c | 8 +- + drivers/scsi/libfc/fc_elsct.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 51 +- + drivers/scsi/libfc/fc_fcp.c | 103 +- + drivers/scsi/libfc/fc_libfc.h | 8 +- + drivers/scsi/libfc/fc_lport.c | 58 +- + drivers/scsi/libfc/fc_npiv.c | 7 +- + drivers/scsi/libfc/fc_rport.c | 195 +- + drivers/scsi/libiscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 5 +- + drivers/scsi/libsas/sas_scsi_host.c | 16 +- + drivers/scsi/lpfc/lpfc.h | 4 + + drivers/scsi/lpfc/lpfc_attr.c | 40 +- + drivers/scsi/lpfc/lpfc_bsg.c | 498 ++- + drivers/scsi/lpfc/lpfc_bsg.h | 3 +- + drivers/scsi/lpfc/lpfc_crtn.h | 1 + + drivers/scsi/lpfc/lpfc_disc.h | 1 + + drivers/scsi/lpfc/lpfc_els.c | 24 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 79 +- + drivers/scsi/lpfc/lpfc_hw.h | 190 +- + drivers/scsi/lpfc/lpfc_hw4.h | 60 +- + drivers/scsi/lpfc/lpfc_init.c | 213 +- + drivers/scsi/lpfc/lpfc_mbox.c | 69 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 99 +- + drivers/scsi/lpfc/lpfc_scsi.c | 149 +- + drivers/scsi/lpfc/lpfc_sli.c | 269 +- + drivers/scsi/lpfc/lpfc_sli.h | 4 + + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 4 +- + drivers/scsi/mpt2sas/Kconfig | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 90 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 36 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 8 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 46 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_debug.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 1055 +++-- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 89 +- + drivers/scsi/mvme147.c | 169 +- + drivers/scsi/mvme147.h | 4 +- + drivers/scsi/mvsas/mv_64xx.c | 25 +- + drivers/scsi/mvsas/mv_94xx.c | 10 + + drivers/scsi/mvsas/mv_init.c | 19 +- + drivers/scsi/mvsas/mv_sas.c | 201 +- + drivers/scsi/mvsas/mv_sas.h | 11 +- + drivers/scsi/pm8001/pm8001_hwi.c | 1 - + drivers/scsi/pm8001/pm8001_sas.c | 4 +- + drivers/scsi/pmcraid.c | 6 - + drivers/scsi/qla2xxx/Makefile | 3 +- + drivers/scsi/qla2xxx/qla_attr.c | 804 +--- + drivers/scsi/qla2xxx/qla_bsg.c | 1212 ++++ + drivers/scsi/qla2xxx/qla_bsg.h | 135 + + drivers/scsi/qla2xxx/qla_dbg.c | 61 + + drivers/scsi/qla2xxx/qla_dbg.h | 10 + + drivers/scsi/qla2xxx/qla_def.h | 343 +- + drivers/scsi/qla2xxx/qla_fw.h | 106 +- + drivers/scsi/qla2xxx/qla_gbl.h | 126 +- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 724 +++- + drivers/scsi/qla2xxx/qla_inline.h | 21 +- + drivers/scsi/qla2xxx/qla_iocb.c | 879 +++- + drivers/scsi/qla2xxx/qla_isr.c | 540 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 266 +- + drivers/scsi/qla2xxx/qla_nx.c | 3636 ++++++++++++ + drivers/scsi/qla2xxx/qla_nx.h | 889 +++ + drivers/scsi/qla2xxx/qla_os.c | 543 ++- + drivers/scsi/qla2xxx/qla_sup.c | 149 +- + drivers/scsi/qla4xxx/ql4_def.h | 48 +- + drivers/scsi/qla4xxx/ql4_fw.h | 46 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 8 +- + drivers/scsi/qla4xxx/ql4_init.c | 374 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 23 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 337 +- + drivers/scsi/qla4xxx/ql4_os.c | 135 +- + drivers/scsi/qla4xxx/ql4_version.h | 3 +- + drivers/scsi/scsi.c | 6 + + drivers/scsi/scsi_debug.c | 89 +- + drivers/scsi/scsi_error.c | 19 +- + drivers/scsi/scsi_scan.c | 3 +- + drivers/scsi/scsi_sysfs.c | 7 +- + drivers/scsi/scsi_trace.c | 284 + + drivers/scsi/scsi_transport_fc.c | 30 +- + drivers/scsi/sd.c | 25 +- + drivers/scsi/wd33c93.c | 6 - + drivers/scsi/wd33c93.h | 1 - + drivers/serial/8250.c | 4 +- + drivers/serial/Kconfig | 82 +- + drivers/serial/Makefile | 2 + + drivers/serial/altera_jtaguart.c | 504 ++ + drivers/serial/altera_uart.c | 570 ++ + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/bfin_sport_uart.c | 209 +- + drivers/serial/bfin_sport_uart.h | 27 +- + drivers/serial/kgdboc.c | 94 +- + drivers/serial/mpsc.c | 1 + + drivers/serial/sh-sci.c | 8 +- + drivers/serial/sunzilog.c | 50 + + drivers/serial/timbuart.c | 25 +- + drivers/serial/uartlite.c | 32 +- + drivers/spi/Kconfig | 6 +- + drivers/ssb/driver_chipcommon.c | 3 + + drivers/ssb/main.c | 3 + + drivers/ssb/pci.c | 14 +- + drivers/ssb/sprom.c | 14 + + drivers/staging/Kconfig | 18 +- + drivers/staging/Makefile | 11 +- + drivers/staging/adis16255/Kconfig | 11 + + drivers/staging/adis16255/Makefile | 1 + + drivers/staging/adis16255/adis16255.c | 466 ++ + drivers/staging/adis16255/adis16255.h | 12 + + drivers/staging/arlan/Kconfig | 15 - + drivers/staging/arlan/Makefile | 3 - + drivers/staging/arlan/TODO | 7 - + drivers/staging/arlan/arlan-main.c | 1882 ------ + drivers/staging/arlan/arlan-proc.c | 1210 ---- + drivers/staging/arlan/arlan.h | 535 -- + drivers/staging/asus_oled/asus_oled.c | 2 +- + drivers/staging/batman-adv/CHANGELOG | 14 + + drivers/staging/batman-adv/Makefile | 4 +- + drivers/staging/batman-adv/README | 255 +- + drivers/staging/batman-adv/TODO | 23 +- + drivers/staging/batman-adv/aggregation.c | 45 +- + drivers/staging/batman-adv/aggregation.h | 7 +- + drivers/staging/batman-adv/bat_sysfs.c | 484 ++ + drivers/staging/batman-adv/bat_sysfs.h | 29 + + drivers/staging/batman-adv/bitarray.c | 76 +- + drivers/staging/batman-adv/bitarray.h | 2 +- + drivers/staging/batman-adv/device.c | 37 +- + drivers/staging/batman-adv/device.h | 2 +- + drivers/staging/batman-adv/hard-interface.c | 530 +- + drivers/staging/batman-adv/hard-interface.h | 20 +- + drivers/staging/batman-adv/hash.c | 2 +- + drivers/staging/batman-adv/hash.h | 2 +- + drivers/staging/batman-adv/main.c | 60 +- + drivers/staging/batman-adv/main.h | 23 +- + drivers/staging/batman-adv/originator.c | 295 +- + drivers/staging/batman-adv/originator.h | 7 +- + drivers/staging/batman-adv/packet.h | 2 +- + drivers/staging/batman-adv/proc.c | 670 --- + drivers/staging/batman-adv/proc.h | 40 - + drivers/staging/batman-adv/ring_buffer.c | 2 +- + drivers/staging/batman-adv/ring_buffer.h | 2 +- + drivers/staging/batman-adv/routing.c | 221 +- + drivers/staging/batman-adv/routing.h | 2 +- + drivers/staging/batman-adv/send.c | 149 +- + drivers/staging/batman-adv/send.h | 6 +- + drivers/staging/batman-adv/soft-interface.c | 30 +- + drivers/staging/batman-adv/soft-interface.h | 2 +- + drivers/staging/batman-adv/translation-table.c | 92 +- + drivers/staging/batman-adv/translation-table.h | 8 +- + drivers/staging/batman-adv/types.h | 54 +- + drivers/staging/batman-adv/vis.c | 353 +- + drivers/staging/batman-adv/vis.h | 19 +- + drivers/staging/comedi/Kconfig | 1284 ++++- + drivers/staging/comedi/Makefile | 1 - + drivers/staging/comedi/comedi.h | 202 +- + drivers/staging/comedi/comedi_compat32.c | 3 +- + drivers/staging/comedi/comedi_fops.c | 242 +- + drivers/staging/comedi/comedi_fops.h | 1 + + drivers/staging/comedi/comedi_ksyms.c | 69 - + drivers/staging/comedi/comedidev.h | 34 +- + drivers/staging/comedi/comedilib.h | 170 +- + drivers/staging/comedi/drivers.c | 112 +- + drivers/staging/comedi/drivers/8253.h | 3 +- + drivers/staging/comedi/drivers/8255.c | 16 +- + drivers/staging/comedi/drivers/8255.h | 22 - + drivers/staging/comedi/drivers/Makefile | 245 +- + .../comedi/drivers/addi-data/addi_amcc_s5933.h | 6 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 13 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 2 +- + .../comedi/drivers/addi-data/amcc_s5933_58.h | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 6 +- + .../comedi/drivers/addi-data/hwdrv_apci035.h | 16 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 94 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 191 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 10 +- + drivers/staging/comedi/drivers/adl_pci7230.c | 206 + + drivers/staging/comedi/drivers/adl_pci9111.c | 41 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 857 ++- + drivers/staging/comedi/drivers/adv_pci1710.c | 27 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 153 +- + drivers/staging/comedi/drivers/adv_pci_dio.c | 36 +- + drivers/staging/comedi/drivers/aio_aio12_8.c | 4 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 6 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 116 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 132 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 16 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 94 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 2 + + drivers/staging/comedi/drivers/cb_pcimdda.c | 3 +- + drivers/staging/comedi/drivers/comedi_bond.c | 13 +- + drivers/staging/comedi/drivers/comedi_parport.c | 10 +- + drivers/staging/comedi/drivers/das08.c | 156 +- + drivers/staging/comedi/drivers/das08.h | 2 +- + drivers/staging/comedi/drivers/das08_cs.c | 5 +- + drivers/staging/comedi/drivers/das16.c | 159 +- + drivers/staging/comedi/drivers/das1800.c | 10 +- + drivers/staging/comedi/drivers/dt2801.c | 2 +- + drivers/staging/comedi/drivers/dt2811.c | 191 +- + drivers/staging/comedi/drivers/dt2814.c | 38 +- + drivers/staging/comedi/drivers/dt282x.c | 225 +- + drivers/staging/comedi/drivers/dt3000.c | 21 +- + drivers/staging/comedi/drivers/icp_multi.h | 3 +- + drivers/staging/comedi/drivers/me_daq.c | 1 + + drivers/staging/comedi/drivers/mite.c | 2 +- + drivers/staging/comedi/drivers/mite.h | 2 - + drivers/staging/comedi/drivers/mpc624.c | 185 +- + drivers/staging/comedi/drivers/ni_6527.c | 7 +- + drivers/staging/comedi/drivers/ni_65xx.c | 47 +- + drivers/staging/comedi/drivers/ni_660x.c | 11 +- + drivers/staging/comedi/drivers/ni_670x.c | 11 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 13 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 4 + + drivers/staging/comedi/drivers/ni_labpc.c | 7 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 4 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 5 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 25 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 107 +- + drivers/staging/comedi/drivers/plx9080.h | 4 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 43 +- + drivers/staging/comedi/drivers/skel.c | 21 +- + drivers/staging/comedi/drivers/ssv_dnp.c | 86 +- + drivers/staging/comedi/drivers/unioxx5.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 13 +- + drivers/staging/comedi/drivers/usbduxfast.c | 49 +- + drivers/staging/comedi/internal.h | 12 + + drivers/staging/comedi/kcomedilib/Makefile | 9 +- + drivers/staging/comedi/kcomedilib/data.c | 92 - + drivers/staging/comedi/kcomedilib/dio.c | 95 - + drivers/staging/comedi/kcomedilib/get.c | 293 - + .../staging/comedi/kcomedilib/kcomedilib_main.c | 523 +-- + drivers/staging/comedi/kcomedilib/ksyms.c | 146 - + drivers/staging/comedi/pci_ids.h | 31 - + drivers/staging/comedi/proc.c | 23 +- + drivers/staging/comedi/range.c | 36 +- + drivers/staging/comedi/wrapper.h | 25 - + drivers/staging/crystalhd/TODO | 1 - + drivers/staging/crystalhd/bc_dts_defs.h | 72 +- + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 119 +- + drivers/staging/crystalhd/bc_dts_types.h | 25 +- + drivers/staging/crystalhd/bcm_70012_regs.h | 24 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 178 +- + drivers/staging/crystalhd/crystalhd_cmds.h | 21 +- + drivers/staging/crystalhd/crystalhd_fw_if.h | 60 +- + drivers/staging/crystalhd/crystalhd_hw.c | 212 +- + drivers/staging/crystalhd/crystalhd_hw.h | 121 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 76 +- + drivers/staging/crystalhd/crystalhd_lnx.h | 10 +- + drivers/staging/crystalhd/crystalhd_misc.c | 100 +- + drivers/staging/crystalhd/crystalhd_misc.h | 55 +- + drivers/staging/cx25821/cx25821-audio-upstream.c | 6 +- + .../staging/cx25821/cx25821-video-upstream-ch2.c | 6 +- + drivers/staging/cx25821/cx25821-video-upstream.c | 4 +- + drivers/staging/cxt1e1/Kconfig | 22 + + drivers/staging/cxt1e1/Makefile | 19 + + drivers/staging/cxt1e1/comet.c | 568 ++ + drivers/staging/cxt1e1/comet.h | 366 ++ + drivers/staging/cxt1e1/comet_tables.c | 561 ++ + drivers/staging/cxt1e1/comet_tables.h | 85 + + drivers/staging/cxt1e1/functions.c | 368 ++ + drivers/staging/cxt1e1/hwprobe.c | 402 ++ + drivers/staging/cxt1e1/libsbew.h | 581 ++ + drivers/staging/cxt1e1/linux.c | 1356 +++++ + drivers/staging/cxt1e1/musycc.c | 2185 +++++++ + drivers/staging/cxt1e1/musycc.h | 460 ++ + drivers/staging/cxt1e1/ossiRelease.c | 39 + + drivers/staging/cxt1e1/pmc93x6_eeprom.c | 561 ++ + drivers/staging/cxt1e1/pmc93x6_eeprom.h | 60 + + drivers/staging/cxt1e1/pmcc4.h | 155 + + drivers/staging/cxt1e1/pmcc4_cpld.h | 124 + + drivers/staging/cxt1e1/pmcc4_defs.h | 82 + + drivers/staging/cxt1e1/pmcc4_drv.c | 1860 ++++++ + drivers/staging/cxt1e1/pmcc4_ioctls.h | 81 + + drivers/staging/cxt1e1/pmcc4_private.h | 296 + + drivers/staging/cxt1e1/pmcc4_sysdep.h | 62 + + drivers/staging/cxt1e1/sbe_bid.h | 61 + + drivers/staging/cxt1e1/sbe_promformat.h | 157 + + drivers/staging/cxt1e1/sbecom_inline_linux.h | 310 + + drivers/staging/cxt1e1/sbecrc.c | 137 + + drivers/staging/cxt1e1/sbeid.c | 217 + + drivers/staging/cxt1e1/sbeproc.c | 358 ++ + drivers/staging/cxt1e1/sbeproc.h | 52 + + drivers/staging/cxt1e1/sbew_ioc.h | 136 + + drivers/staging/dream/Kconfig | 11 +- + drivers/staging/dream/Makefile | 3 +- + drivers/staging/dream/TODO | 1 - + drivers/staging/dream/camera/msm_vfe8x_proc.c | 2 +- + drivers/staging/dream/pmem.c | 27 +- + drivers/staging/dream/qdsp5/audio_out.c | 9 - + drivers/staging/dream/smd/Kconfig | 26 - + drivers/staging/dream/smd/Makefile | 7 - + .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 - + drivers/staging/dream/smd/rpc_server_time_remote.c | 77 - + drivers/staging/dream/smd/smd.c | 1330 ----- + drivers/staging/dream/smd/smd_private.h | 171 - + drivers/staging/dream/smd/smd_qmi.c | 855 --- + drivers/staging/dream/smd/smd_rpcrouter.c | 1261 ---- + drivers/staging/dream/smd/smd_rpcrouter.h | 193 - + drivers/staging/dream/smd/smd_rpcrouter_device.c | 377 -- + drivers/staging/dream/smd/smd_rpcrouter_servers.c | 230 - + drivers/staging/dream/smd/smd_tty.c | 208 - + drivers/staging/dream/synaptics_i2c_rmi.c | 28 +- + drivers/staging/dt3155/allocator.c | 16 +- + drivers/staging/dt3155/allocator.h | 4 +- + drivers/staging/dt3155/dt3155.h | 44 +- + drivers/staging/dt3155/dt3155_drv.c | 380 +- + drivers/staging/dt3155/dt3155_io.c | 24 +- + drivers/staging/dt3155/dt3155_isr.c | 297 +- + drivers/staging/dt3155/dt3155_isr.h | 2 +- + drivers/staging/dt3155v4l/Kconfig | 20 + + drivers/staging/dt3155v4l/Makefile | 1 + + drivers/staging/dt3155v4l/dt3155v4l.c | 1200 ++++ + drivers/staging/dt3155v4l/dt3155v4l.h | 224 + + drivers/staging/echo/echo.c | 2 +- + drivers/staging/et131x/et1310_address_map.h | 7 +- + drivers/staging/et131x/et1310_eeprom.c | 8 +- + drivers/staging/et131x/et1310_phy.c | 2 +- + drivers/staging/et131x/et1310_rx.c | 55 +- + drivers/staging/et131x/et1310_rx.h | 5 +- + drivers/staging/et131x/et1310_tx.c | 2 +- + drivers/staging/et131x/et131x_initpci.c | 12 +- + drivers/staging/et131x/et131x_isr.c | 6 +- + drivers/staging/et131x/et131x_netdev.c | 20 +- + drivers/staging/frontier/alphatrack.c | 34 +- + drivers/staging/frontier/tranzport.c | 36 +- + drivers/staging/go7007/go7007-fw.c | 12 +- + drivers/staging/go7007/go7007-usb.c | 3 +- + drivers/staging/go7007/go7007-v4l2.c | 4 +- + drivers/staging/go7007/saa7134-go7007.c | 3 +- + drivers/staging/go7007/wis-saa7113.c | 1 + + drivers/staging/go7007/wis-saa7115.c | 1 + + drivers/staging/go7007/wis-tw9903.c | 1 + + drivers/staging/hv/Kconfig | 8 +- + drivers/staging/hv/Makefile | 11 +- + drivers/staging/hv/TODO | 3 - + drivers/staging/hv/{BlkVsc.c => blkvsc.c} | 4 +- + drivers/staging/hv/blkvsc_drv.c | 45 +- + drivers/staging/hv/{Channel.c => channel.c} | 195 +- + drivers/staging/hv/{Channel.h => channel.h} | 2 +- + .../hv/{ChannelInterface.c => channel_interface.c} | 2 +- + .../hv/{ChannelInterface.h => channel_interface.h} | 2 +- + .../staging/hv/{ChannelMgmt.c => channel_mgmt.c} | 228 +- + .../staging/hv/{ChannelMgmt.h => channel_mgmt.h} | 6 +- + drivers/staging/hv/{Connection.c => connection.c} | 31 +- + drivers/staging/hv/{Hv.c => hv.c} | 28 +- + drivers/staging/hv/{Hv.h => hv.h} | 0 + drivers/staging/hv/hv_utils.c | 295 + + drivers/staging/hv/logging.h | 7 - + drivers/staging/hv/{NetVsc.c => netvsc.c} | 104 +- + drivers/staging/hv/{NetVsc.h => netvsc.h} | 7 +- + drivers/staging/hv/{NetVscApi.h => netvsc_api.h} | 9 +- + drivers/staging/hv/netvsc_drv.c | 243 +- + drivers/staging/hv/osd.c | 70 + + drivers/staging/hv/{RingBuffer.c => ring_buffer.c} | 16 +- + drivers/staging/hv/{RingBuffer.h => ring_buffer.h} | 0 + drivers/staging/hv/rndis.h | 2 +- + .../staging/hv/{RndisFilter.c => rndis_filter.c} | 56 +- + .../staging/hv/{RndisFilter.h => rndis_filter.h} | 2 +- + drivers/staging/hv/{StorVsc.c => storvsc.c} | 54 +- + drivers/staging/hv/{StorVscApi.h => storvsc_api.h} | 2 +- + drivers/staging/hv/storvsc_drv.c | 54 +- + drivers/staging/hv/utils.h | 119 + + .../staging/hv/{VersionInfo.h => version_info.h} | 7 +- + drivers/staging/hv/{Vmbus.c => vmbus.c} | 33 +- + drivers/staging/hv/vmbus.h | 2 +- + drivers/staging/hv/{VmbusApi.h => vmbus_api.h} | 18 + + ...hannelInterface.h => vmbus_channel_interface.h} | 0 + drivers/staging/hv/vmbus_drv.c | 96 +- + .../{VmbusPacketFormat.h => vmbus_packet_format.h} | 1 + + .../staging/hv/{VmbusPrivate.h => vmbus_private.h} | 12 +- + drivers/staging/hv/vstorage.h | 2 +- + drivers/staging/iio/Documentation/iio_utils.h | 266 +- + .../iio/Documentation/lis3l02dqbuffersimple.c | 237 +- + drivers/staging/iio/Documentation/sysfs-class-iio | 294 + + drivers/staging/iio/Documentation/userspace.txt | 2 +- + drivers/staging/iio/Kconfig | 2 + + drivers/staging/iio/Makefile | 2 + + drivers/staging/iio/accel/Kconfig | 25 + + drivers/staging/iio/accel/Makefile | 11 + + drivers/staging/iio/accel/accel.h | 12 +- + drivers/staging/iio/accel/adis16209.h | 193 + + drivers/staging/iio/accel/adis16209_core.c | 615 ++ + drivers/staging/iio/accel/adis16209_ring.c | 266 + + drivers/staging/iio/accel/adis16209_trigger.c | 124 + + drivers/staging/iio/accel/adis16220.h | 147 + + drivers/staging/iio/accel/adis16220_core.c | 670 +++ + drivers/staging/iio/accel/adis16240.h | 218 + + drivers/staging/iio/accel/adis16240_core.c | 599 ++ + drivers/staging/iio/accel/adis16240_ring.c | 254 + + drivers/staging/iio/accel/adis16240_trigger.c | 124 + + drivers/staging/iio/accel/inclinometer.h | 23 + + drivers/staging/iio/accel/kxsd9.c | 88 +- + drivers/staging/iio/accel/lis3l02dq.h | 4 - + drivers/staging/iio/accel/lis3l02dq_core.c | 173 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 24 +- + drivers/staging/iio/accel/sca3000.h | 2 + + drivers/staging/iio/accel/sca3000_core.c | 178 +- + drivers/staging/iio/accel/sca3000_ring.c | 35 +- + drivers/staging/iio/adc/Kconfig | 11 +- + drivers/staging/iio/adc/Makefile | 2 +- + drivers/staging/iio/adc/adc.h | 15 + + drivers/staging/iio/adc/max1363.h | 122 +- + drivers/staging/iio/adc/max1363_core.c | 1107 +++- + drivers/staging/iio/adc/max1363_ring.c | 82 +- + drivers/staging/iio/chrdev.h | 2 +- + drivers/staging/iio/gyro/Kconfig | 13 + + drivers/staging/iio/gyro/Makefile | 7 + + drivers/staging/iio/gyro/adis16260.h | 175 + + drivers/staging/iio/gyro/adis16260_core.c | 661 +++ + drivers/staging/iio/gyro/adis16260_ring.c | 256 + + drivers/staging/iio/gyro/adis16260_trigger.c | 124 + + drivers/staging/iio/gyro/gyro.h | 43 + + drivers/staging/iio/iio.h | 47 +- + drivers/staging/iio/imu/Kconfig | 33 + + drivers/staging/iio/imu/Makefile | 14 + + drivers/staging/iio/imu/adis16300.h | 194 + + drivers/staging/iio/imu/adis16300_core.c | 768 +++ + drivers/staging/iio/imu/adis16300_ring.c | 233 + + drivers/staging/iio/imu/adis16300_trigger.c | 127 + + drivers/staging/iio/imu/adis16350.h | 193 + + drivers/staging/iio/imu/adis16350_core.c | 736 +++ + drivers/staging/iio/imu/adis16350_ring.c | 286 + + drivers/staging/iio/imu/adis16350_trigger.c | 127 + + drivers/staging/iio/imu/adis16400.h | 229 + + drivers/staging/iio/imu/adis16400_core.c | 800 +++ + drivers/staging/iio/imu/adis16400_ring.c | 245 + + drivers/staging/iio/imu/adis16400_trigger.c | 127 + + drivers/staging/iio/industrialio-core.c | 60 +- + drivers/staging/iio/industrialio-ring.c | 75 +- + drivers/staging/iio/industrialio-trigger.c | 20 +- + drivers/staging/iio/light/tsl2563.c | 18 +- + drivers/staging/iio/magnetometer/magnet.h | 31 + + drivers/staging/iio/ring_generic.h | 50 +- + drivers/staging/iio/ring_sw.c | 50 +- + drivers/staging/iio/sysfs.h | 15 +- + drivers/staging/iio/trigger/iio-trig-gpio.c | 131 +- + .../staging/iio/trigger/iio-trig-periodic-rtc.c | 4 +- + drivers/staging/line6/control.h | 166 +- + drivers/staging/line6/driver.c | 10 +- + drivers/staging/line6/dumprequest.c | 3 +- + drivers/staging/line6/pod.c | 6 +- + drivers/staging/line6/variax.c | 5 +- + drivers/staging/memrar/Kconfig | 15 + + drivers/staging/memrar/Makefile | 2 + + drivers/staging/memrar/TODO | 43 + + drivers/staging/memrar/memrar-abi | 89 + + drivers/staging/memrar/memrar.h | 155 + + drivers/staging/memrar/memrar_allocator.c | 432 ++ + drivers/staging/memrar/memrar_allocator.h | 149 + + drivers/staging/memrar/memrar_handler.c | 996 ++++ + drivers/staging/netwave/Kconfig | 11 - + drivers/staging/netwave/Makefile | 1 - + drivers/staging/netwave/TODO | 7 - + drivers/staging/netwave/netwave_cs.c | 1364 ----- + drivers/staging/otus/80211core/cagg.c | 34 +- + drivers/staging/otus/80211core/ccmd.c | 3 +- + drivers/staging/otus/80211core/cfunc.c | 3 +- + drivers/staging/otus/80211core/cic.c | 9 +- + drivers/staging/otus/80211core/cinit.c | 3 +- + drivers/staging/otus/80211core/cmm.c | 144 +- + drivers/staging/otus/80211core/cmmap.c | 103 +- + drivers/staging/otus/80211core/cmmsta.c | 123 +- + drivers/staging/otus/80211core/coid.c | 3 +- + drivers/staging/otus/80211core/cpsmgr.c | 3 +- + drivers/staging/otus/80211core/ctxrx.c | 81 +- + drivers/staging/otus/80211core/queue.c | 5 +- + drivers/staging/otus/80211core/ratectrl.c | 3 +- + drivers/staging/otus/hal/hpani.c | 33 +- + drivers/staging/otus/hal/hpani.h | 7 +- + drivers/staging/otus/hal/hpfw2.c | 2 +- + drivers/staging/otus/hal/hpfwu.c | 2 +- + drivers/staging/otus/hal/hpfwu_2k.c | 2 +- + drivers/staging/otus/hal/hpfwu_BA.c | 2 +- + drivers/staging/otus/hal/hpfwu_OTUS_RC.c | 2 +- + drivers/staging/otus/hal/hpfwuinit.c | 2 +- + drivers/staging/otus/hal/hpmain.c | 30 +- + drivers/staging/otus/hal/hpreg.c | 1586 +++--- + drivers/staging/otus/ioctl.c | 37 +- + drivers/staging/otus/usbdrv.c | 6 +- + drivers/staging/otus/wwrap.c | 1 - + drivers/staging/otus/zdusb.c | 6 +- + drivers/staging/panel/panel.c | 5 +- + drivers/staging/phison/phison.c | 4 +- + drivers/staging/poch/Kconfig | 6 - + drivers/staging/poch/Makefile | 1 - + drivers/staging/poch/README | 136 - + drivers/staging/poch/poch.c | 1443 ----- + drivers/staging/poch/poch.h | 35 - + drivers/staging/pohmelfs/config.c | 41 +- + drivers/staging/pohmelfs/crypto.c | 38 +- + drivers/staging/pohmelfs/dir.c | 14 +- + drivers/staging/pohmelfs/inode.c | 64 +- + drivers/staging/pohmelfs/net.c | 38 +- + drivers/staging/pohmelfs/netfs.h | 17 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 12 +- + drivers/staging/ramzswap/TODO | 5 - + drivers/staging/ramzswap/ramzswap_drv.c | 667 +-- + drivers/staging/ramzswap/ramzswap_drv.h | 51 +- + drivers/staging/ramzswap/ramzswap_ioctl.h | 14 +- + drivers/staging/rar_register/Kconfig | 28 +- + drivers/staging/rar_register/rar_register.c | 610 ++- + drivers/staging/rar_register/rar_register.h | 62 +- + drivers/staging/rt2860/chip/mac_pci.h | 41 +- + drivers/staging/rt2860/chip/mac_usb.h | 55 +- + drivers/staging/rt2860/chip/rtmp_mac.h | 52 +- + drivers/staging/rt2860/chip/rtmp_phy.h | 338 +- + drivers/staging/rt2860/chips/rt3070.c | 4 +- + drivers/staging/rt2860/chips/rt3090.c | 4 +- + drivers/staging/rt2860/chips/rt30xx.c | 9 +- + drivers/staging/rt2860/common/cmm_aes.c | 2 +- + drivers/staging/rt2860/common/cmm_data.c | 8 +- + drivers/staging/rt2860/common/cmm_mac_pci.c | 2 +- + drivers/staging/rt2860/common/cmm_mac_usb.c | 2 +- + drivers/staging/rt2860/common/cmm_wpa.c | 18 +- + drivers/staging/rt2860/common/spectrum.c | 7 +- + drivers/staging/rt2860/iface/rtmp_usb.h | 4 +- + drivers/staging/rt2860/mlme.h | 2 +- + drivers/staging/rt2860/pci_main_dev.c | 37 +- + drivers/staging/rt2860/rt_linux.c | 51 +- + drivers/staging/rt2860/rt_linux.h | 14 +- + drivers/staging/rt2860/rt_main_dev.c | 20 +- + drivers/staging/rt2860/rt_pci_rbus.c | 24 +- + drivers/staging/rt2860/rt_usb.c | 20 +- + drivers/staging/rt2860/rtmp.h | 410 +- + drivers/staging/rt2860/sta/assoc.c | 1 - + drivers/staging/rt2860/sta_ioctl.c | 15 +- + drivers/staging/rt2860/usb_main_dev.c | 5 +- + drivers/staging/rt2870/Kconfig | 2 +- + drivers/staging/rt2870/common/rtusb_bulk.c | 42 +- + drivers/staging/rt2870/common/rtusb_data.c | 8 +- + drivers/staging/rt2870/common/rtusb_io.c | 39 +- + .../staging/rtl8187se/ieee80211/ieee80211_crypt.c | 6 +- + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 3 +- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 3 +- + .../rtl8187se/ieee80211/ieee80211_crypt_wep.c | 3 +- + .../staging/rtl8187se/ieee80211/ieee80211_module.c | 7 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 4 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 20 +- + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 4 - + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8187se/r8180_core.c | 2076 ++++---- + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 129 +- + drivers/staging/rtl8192e/Makefile | 1 + + drivers/staging/rtl8192e/ieee80211.h | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 6 +- + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 3 +- + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 3 +- + .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 3 +- + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 9 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 17 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192e/ieee80211/rtl819x_Qos.h | 168 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 38 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 4 +- + drivers/staging/rtl8192e/r8192E_core.c | 14 +- + drivers/staging/rtl8192e/r8192_pm.c | 6 +- + drivers/staging/rtl8192e/r8192_pm.h | 4 - + drivers/staging/rtl8192su/Kconfig | 1 + + drivers/staging/rtl8192su/Makefile | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 2 +- + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 6 +- + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 3 +- + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 3 +- + .../rtl8192su/ieee80211/ieee80211_crypt_wep.c | 3 +- + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 9 +- + .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 24 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 2 +- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 17 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8192su/ieee80211/rtl819x_Qos.h | 1 - + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 12 +- + drivers/staging/rtl8192su/r8180_93cx6.c | 146 - + drivers/staging/rtl8192su/r8180_93cx6.h | 40 - + drivers/staging/rtl8192su/r8192SU_led.c | 2347 ++++++++ + drivers/staging/rtl8192su/r8192SU_led.h | 93 + + drivers/staging/rtl8192su/r8192S_firmware.c | 503 +- + drivers/staging/rtl8192su/r8192S_phy.c | 194 +- + drivers/staging/rtl8192su/r8192U.h | 41 +- + drivers/staging/rtl8192su/r8192U_core.c | 626 +-- + drivers/staging/rtl8192su/r819xU_cmdpkt.c | 663 +-- + drivers/staging/rtl8192su/r819xU_cmdpkt.h | 366 +- + drivers/staging/rtl8192u/dot11d.h | 52 +- + drivers/staging/rtl8192u/ieee80211.h | 548 +- + drivers/staging/rtl8192u/ieee80211/api.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 6 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 3 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 9 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 20 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 7 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 3 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 9 +- + drivers/staging/rtl8192u/ieee80211_crypt.h | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 12 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 1 - + drivers/staging/sep/sep_driver.c | 1 - + drivers/staging/serqt_usb2/serqt_usb2.c | 26 +- + drivers/staging/slicoss/slicoss.c | 6 +- + drivers/staging/sm7xx/smtcfb.c | 18 +- + drivers/staging/sm7xx/smtcfb.h | 2 +- + drivers/staging/strip/Kconfig | 22 - + drivers/staging/strip/Makefile | 1 - + drivers/staging/strip/TODO | 7 - + drivers/staging/strip/strip.c | 2823 --------- + drivers/staging/ti-st/Kconfig | 25 + + drivers/staging/ti-st/Makefile | 7 + + drivers/staging/ti-st/TODO | 19 + + drivers/staging/ti-st/bt_drv.c | 502 ++ + drivers/staging/ti-st/bt_drv.h | 61 + + drivers/staging/ti-st/fm.h | 13 + + drivers/staging/ti-st/st.h | 90 + + drivers/staging/ti-st/st_core.c | 1062 ++++ + drivers/staging/ti-st/st_core.h | 98 + + drivers/staging/ti-st/st_kim.c | 754 +++ + drivers/staging/ti-st/st_kim.h | 150 + + drivers/staging/ti-st/st_ll.c | 147 + + drivers/staging/ti-st/st_ll.h | 62 + + drivers/staging/ti-st/sysfs-uim | 16 + + drivers/staging/udlfb/udlfb.c | 73 +- + drivers/staging/usbip/stub_rx.c | 6 +- + drivers/staging/usbip/usbip_common.c | 2 +- + drivers/staging/usbip/usbip_common.h | 2 +- + drivers/staging/usbip/vhci.h | 2 +- + drivers/staging/usbip/vhci_hcd.c | 2 +- + drivers/staging/usbip/vhci_tx.c | 2 +- + drivers/staging/vme/boards/vme_vmivme7805.c | 1 - + drivers/staging/vme/bridges/vme_ca91cx42.c | 115 +- + drivers/staging/vme/bridges/vme_tsi148.c | 396 +- + drivers/staging/vme/bridges/vme_tsi148.h | 26 +- + drivers/staging/vme/devices/vme_user.c | 18 +- + drivers/staging/vme/vme.c | 4 +- + drivers/staging/vt6655/80211hdr.h | 46 +- + drivers/staging/vt6655/80211mgr.c | 88 +- + drivers/staging/vt6655/80211mgr.h | 88 +- + drivers/staging/vt6655/IEEE11h.c | 6 +- + drivers/staging/vt6655/IEEE11h.h | 2 +- + drivers/staging/vt6655/aes_ccmp.c | 10 +- + drivers/staging/vt6655/baseband.c | 64 +- + drivers/staging/vt6655/baseband.h | 52 +- + drivers/staging/vt6655/bssdb.c | 214 +- + drivers/staging/vt6655/bssdb.h | 148 +- + drivers/staging/vt6655/card.c | 214 +- + drivers/staging/vt6655/card.h | 158 +- + drivers/staging/vt6655/datarate.c | 52 +- + drivers/staging/vt6655/datarate.h | 36 +- + drivers/staging/vt6655/desc.h | 12 +- + drivers/staging/vt6655/device.h | 28 +- + drivers/staging/vt6655/device_main.c | 99 +- + drivers/staging/vt6655/dpc.c | 184 +- + drivers/staging/vt6655/dpc.h | 6 +- + drivers/staging/vt6655/hostap.c | 13 +- + drivers/staging/vt6655/hostap.h | 4 +- + drivers/staging/vt6655/ioctl.c | 32 +- + drivers/staging/vt6655/ioctl.h | 10 +- + drivers/staging/vt6655/iwctl.c | 31 +- + drivers/staging/vt6655/key.c | 36 +- + drivers/staging/vt6655/key.h | 30 +- + drivers/staging/vt6655/mac.c | 8 +- + drivers/staging/vt6655/mac.h | 52 +- + drivers/staging/vt6655/mib.c | 6 +- + drivers/staging/vt6655/mib.h | 2 +- + drivers/staging/vt6655/michael.c | 24 +- + drivers/staging/vt6655/michael.h | 8 +- + drivers/staging/vt6655/power.c | 26 +- + drivers/staging/vt6655/power.h | 28 +- + drivers/staging/vt6655/rc4.c | 4 +- + drivers/staging/vt6655/rc4.h | 2 +- + drivers/staging/vt6655/rf.c | 22 +- + drivers/staging/vt6655/rf.h | 14 +- + drivers/staging/vt6655/rxtx.c | 510 +- + drivers/staging/vt6655/rxtx.h | 84 +- + drivers/staging/vt6655/srom.c | 54 +- + drivers/staging/vt6655/srom.h | 2 +- + drivers/staging/vt6655/tether.c | 2 +- + drivers/staging/vt6655/tether.h | 31 +- + drivers/staging/vt6655/tkip.c | 2 +- + drivers/staging/vt6655/tkip.h | 2 +- + drivers/staging/vt6655/ttype.h | 22 - + drivers/staging/vt6655/vntwifi.c | 142 +- + drivers/staging/vt6655/vntwifi.h | 142 +- + drivers/staging/vt6655/wcmd.c | 104 +- + drivers/staging/vt6655/wcmd.h | 26 +- + drivers/staging/vt6655/wctl.c | 4 +- + drivers/staging/vt6655/wmgr.c | 672 ++-- + drivers/staging/vt6655/wmgr.h | 96 +- + drivers/staging/vt6655/wpa.c | 14 +- + drivers/staging/vt6655/wpa.h | 14 +- + drivers/staging/vt6655/wpa2.c | 16 +- + drivers/staging/vt6655/wpa2.h | 14 +- + drivers/staging/vt6655/wpactl.c | 19 +- + drivers/staging/vt6655/wroute.c | 6 +- + drivers/staging/vt6656/80211hdr.h | 83 +- + drivers/staging/vt6656/80211mgr.c | 88 +- + drivers/staging/vt6656/80211mgr.h | 136 +- + drivers/staging/vt6656/aes_ccmp.c | 564 +- + drivers/staging/vt6656/aes_ccmp.h | 2 +- + drivers/staging/vt6656/baseband.c | 114 +- + drivers/staging/vt6656/baseband.h | 59 +- + drivers/staging/vt6656/bssdb.c | 402 +- + drivers/staging/vt6656/bssdb.h | 252 +- + drivers/staging/vt6656/card.c | 68 +- + drivers/staging/vt6656/card.h | 62 +- + drivers/staging/vt6656/channel.c | 12 +- + drivers/staging/vt6656/channel.h | 10 +- + drivers/staging/vt6656/control.c | 87 +- + drivers/staging/vt6656/control.h | 31 +- + drivers/staging/vt6656/datarate.c | 71 +- + drivers/staging/vt6656/datarate.h | 39 +- + drivers/staging/vt6656/desc.h | 12 +- + drivers/staging/vt6656/device.h | 218 +- + drivers/staging/vt6656/dpc.c | 305 +- + drivers/staging/vt6656/dpc.h | 27 +- + drivers/staging/vt6656/firmware.c | 6 +- + drivers/staging/vt6656/firmware.h | 9 +- + drivers/staging/vt6656/hostap.c | 27 +- + drivers/staging/vt6656/hostap.h | 9 +- + drivers/staging/vt6656/int.c | 251 +- + drivers/staging/vt6656/int.h | 12 +- + drivers/staging/vt6656/iocmd.h | 353 +- + drivers/staging/vt6656/ioctl.c | 47 +- + drivers/staging/vt6656/ioctl.h | 15 +- + drivers/staging/vt6656/iowpa.h | 4 +- + drivers/staging/vt6656/iwctl.c | 52 +- + drivers/staging/vt6656/iwctl.h | 5 +- + drivers/staging/vt6656/key.c | 87 +- + drivers/staging/vt6656/key.h | 62 +- + drivers/staging/vt6656/mac.c | 14 +- + drivers/staging/vt6656/mac.h | 9 +- + drivers/staging/vt6656/main_usb.c | 229 +- + drivers/staging/vt6656/mib.c | 115 +- + drivers/staging/vt6656/mib.h | 192 +- + drivers/staging/vt6656/michael.c | 181 +- + drivers/staging/vt6656/michael.h | 12 +- + drivers/staging/vt6656/power.c | 58 +- + drivers/staging/vt6656/power.h | 45 +- + drivers/staging/vt6656/rc4.c | 84 +- + drivers/staging/vt6656/rc4.h | 13 +- + drivers/staging/vt6656/rf.c | 32 +- + drivers/staging/vt6656/rf.h | 33 +- + drivers/staging/vt6656/rndis.h | 3 +- + drivers/staging/vt6656/rxtx.c | 868 ++-- + drivers/staging/vt6656/rxtx.h | 46 +- + drivers/staging/vt6656/srom.h | 2 +- + drivers/staging/vt6656/tcrc.c | 23 +- + drivers/staging/vt6656/tcrc.h | 11 +- + drivers/staging/vt6656/tether.c | 45 +- + drivers/staging/vt6656/tether.h | 33 +- + drivers/staging/vt6656/tkip.c | 2 +- + drivers/staging/vt6656/tkip.h | 7 +- + drivers/staging/vt6656/tmacro.h | 4 +- + drivers/staging/vt6656/ttype.h | 57 +- + drivers/staging/vt6656/upc.h | 8 +- + drivers/staging/vt6656/usbpipe.c | 138 +- + drivers/staging/vt6656/usbpipe.h | 51 +- + drivers/staging/vt6656/wcmd.c | 172 +- + drivers/staging/vt6656/wcmd.h | 36 +- + drivers/staging/vt6656/wctl.c | 23 +- + drivers/staging/vt6656/wctl.h | 13 +- + drivers/staging/vt6656/wmgr.c | 960 ++-- + drivers/staging/vt6656/wmgr.h | 180 +- + drivers/staging/vt6656/wpa.c | 14 +- + drivers/staging/vt6656/wpa.h | 16 +- + drivers/staging/vt6656/wpa2.c | 50 +- + drivers/staging/vt6656/wpa2.h | 20 +- + drivers/staging/vt6656/wpactl.c | 25 +- + drivers/staging/vt6656/wpactl.h | 9 +- + drivers/staging/wavelan/Kconfig | 38 - + drivers/staging/wavelan/Makefile | 2 - + drivers/staging/wavelan/TODO | 7 - + drivers/staging/wavelan/i82586.h | 413 -- + drivers/staging/wavelan/wavelan.c | 4383 -------------- + drivers/staging/wavelan/wavelan.h | 370 -- + drivers/staging/wavelan/wavelan.p.h | 696 --- + drivers/staging/wavelan/wavelan_cs.c | 4601 --------------- + drivers/staging/wavelan/wavelan_cs.h | 386 -- + drivers/staging/wavelan/wavelan_cs.p.h | 766 --- + drivers/staging/winbond/{README => TODO} | 3 +- + drivers/staging/winbond/core.h | 14 +- + drivers/staging/winbond/localpara.h | 452 +- + drivers/staging/winbond/mac_structures.h | 342 +- + drivers/staging/winbond/mds.c | 324 +- + drivers/staging/winbond/mds_f.h | 20 +- + drivers/staging/winbond/mds_s.h | 173 +- + drivers/staging/winbond/mlme_s.h | 288 +- + drivers/staging/winbond/mlmetxrx.c | 62 +- + drivers/staging/winbond/mlmetxrx_f.h | 6 +- + drivers/staging/winbond/mto.c | 299 +- + drivers/staging/winbond/mto.h | 179 +- + drivers/staging/winbond/phy_calibration.c | 9 +- + drivers/staging/winbond/phy_calibration.h | 177 +- + drivers/staging/winbond/reg.c | 3985 ++++++------- + drivers/staging/winbond/scan_s.h | 152 +- + drivers/staging/winbond/sme_api.h | 211 +- + drivers/staging/winbond/sysdef.h | 18 +- + drivers/staging/winbond/wb35reg.c | 618 +- + drivers/staging/winbond/wb35reg_f.h | 104 +- + drivers/staging/winbond/wb35reg_s.h | 221 +- + drivers/staging/winbond/wb35rx.c | 258 +- + drivers/staging/winbond/wb35tx_f.h | 18 +- + drivers/staging/winbond/wbhal_f.h | 137 +- + drivers/staging/winbond/wbhal_s.h | 502 +- + drivers/staging/winbond/wblinux_f.h | 19 +- + drivers/staging/winbond/wbusb.c | 193 +- + drivers/staging/winbond/wbusb_s.h | 23 +- + drivers/staging/wlags49_h2/Kconfig | 2 +- + drivers/staging/wlags49_h2/README.wlags49 | 2 +- + drivers/staging/wlags49_h2/ap_h2.c | 80 +- + drivers/staging/wlags49_h2/debug.h | 104 +- + drivers/staging/wlags49_h2/dhf.c | 143 +- + drivers/staging/wlags49_h2/dhf.h | 56 +- + drivers/staging/wlags49_h2/dhfcfg.h | 118 +- + drivers/staging/wlags49_h2/hcf.c | 15 +- + drivers/staging/wlags49_h2/wl_cs.c | 32 +- + drivers/staging/wlags49_h2/wl_cs.h | 4 - + drivers/staging/wlags49_h2/wl_internal.h | 8 +- + drivers/staging/wlags49_h2/wl_main.c | 3 +- + drivers/staging/wlags49_h2/wl_netdev.c | 51 +- + drivers/staging/wlags49_h2/wl_priv.c | 11 +- + drivers/staging/wlags49_h2/wl_profile.c | 957 ++-- + drivers/staging/wlags49_h2/wl_sysfs.c | 3 +- + drivers/staging/wlags49_h2/wl_wext.c | 9 +- + drivers/staging/wlags49_h25/Kconfig | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 154 +- + drivers/staging/wlan-ng/p80211conv.c | 5 +- + drivers/staging/wlan-ng/p80211req.c | 5 +- + drivers/staging/wlan-ng/p80211wext.c | 399 +- + drivers/staging/wlan-ng/prism2fw.c | 36 +- + drivers/staging/wlan-ng/prism2sta.c | 71 +- + drivers/staging/wlan-ng/prism2usb.c | 65 + + drivers/usb/atm/ueagle-atm.c | 347 +- + drivers/usb/c67x00/c67x00-hcd.h | 2 +- + drivers/usb/class/cdc-acm.c | 22 +- + drivers/usb/class/cdc-acm.h | 4 +- + drivers/usb/class/cdc-wdm.c | 38 +- + drivers/usb/class/usblp.c | 2 +- + drivers/usb/core/buffer.c | 2 +- + drivers/usb/core/config.c | 214 +- + drivers/usb/core/devices.c | 19 +- + drivers/usb/core/devio.c | 3 +- + drivers/usb/core/driver.c | 60 +- + drivers/usb/core/generic.c | 2 +- + drivers/usb/core/hcd-pci.c | 2 +- + drivers/usb/core/hcd.c | 246 +- + drivers/usb/core/hub.c | 30 +- + drivers/usb/core/inode.c | 2 +- + drivers/usb/core/message.c | 133 +- + drivers/usb/core/quirks.c | 4 + + drivers/usb/core/sysfs.c | 25 +- + drivers/usb/core/urb.c | 18 +- + drivers/usb/core/usb.c | 96 +- + drivers/usb/early/ehci-dbgp.c | 120 +- + drivers/usb/gadget/Kconfig | 58 +- + drivers/usb/gadget/Makefile | 8 +- + drivers/usb/gadget/atmel_usba_udc.c | 3 +- + drivers/usb/gadget/composite.c | 60 +- + drivers/usb/gadget/config.c | 4 +- + drivers/usb/gadget/dummy_hcd.c | 4 +- + drivers/usb/gadget/epautoconf.c | 12 +- + drivers/usb/gadget/f_acm.c | 32 +- + drivers/usb/gadget/f_ecm.c | 33 +- + drivers/usb/gadget/f_fs.c | 2442 ++++++++ + drivers/usb/gadget/f_hid.c | 673 +++ + drivers/usb/gadget/f_mass_storage.c | 138 +- + drivers/usb/gadget/f_rndis.c | 33 +- + drivers/usb/gadget/f_uvc.c | 661 +++ + drivers/usb/gadget/f_uvc.h | 376 ++ + .../usb/gadget/{fsl_mx3_udc.c => fsl_mxc_udc.c} | 14 +- + drivers/usb/gadget/fsl_udc_core.c | 2 +- + drivers/usb/gadget/g_ffs.c | 426 ++ + drivers/usb/gadget/hid.c | 298 + + drivers/usb/gadget/pxa27x_udc.h | 2 +- + drivers/usb/gadget/storage_common.c | 2 +- + drivers/usb/gadget/u_ether.c | 4 +- + drivers/usb/gadget/uvc.h | 241 + + drivers/usb/gadget/uvc_queue.c | 583 ++ + drivers/usb/gadget/uvc_queue.h | 89 + + drivers/usb/gadget/uvc_v4l2.c | 374 ++ + drivers/usb/gadget/uvc_video.c | 386 ++ + drivers/usb/gadget/webcam.c | 399 ++ + drivers/usb/host/Kconfig | 15 + + drivers/usb/host/ehci-au1xxx.c | 27 +- + drivers/usb/host/ehci-fsl.c | 2 + + drivers/usb/host/ehci-hcd.c | 3 +- + drivers/usb/host/ehci-hub.c | 182 +- + drivers/usb/host/ehci-omap.c | 21 +- + drivers/usb/host/ehci-pci.c | 18 +- + drivers/usb/host/ehci-q.c | 2 +- + drivers/usb/host/ehci.h | 18 +- + drivers/usb/host/fhci-dbg.c | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/fhci-hub.c | 2 +- + drivers/usb/host/fhci-mem.c | 2 +- + drivers/usb/host/fhci-q.c | 2 +- + drivers/usb/host/fhci-sched.c | 2 +- + drivers/usb/host/fhci-tds.c | 2 +- + drivers/usb/host/fhci.h | 11 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 6 +- + drivers/usb/host/isp1760-hcd.c | 29 +- + drivers/usb/host/isp1760-if.c | 13 +- + drivers/usb/host/ohci-hcd.c | 33 +- + drivers/usb/host/ohci-omap3.c | 735 +++ + drivers/usb/host/oxu210hp-hcd.c | 31 +- + drivers/usb/host/r8a66597-hcd.c | 39 +- + drivers/usb/host/sl811-hcd.c | 60 +- + drivers/usb/host/u132-hcd.c | 6 +- + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/host/whci/debug.c | 2 +- + drivers/usb/host/whci/qset.c | 6 +- + drivers/usb/host/xhci-dbg.c | 24 + + drivers/usb/host/xhci-hub.c | 39 +- + drivers/usb/host/xhci-mem.c | 489 ++- + drivers/usb/host/xhci-pci.c | 8 +- + drivers/usb/host/xhci-ring.c | 329 +- + drivers/usb/host/xhci.c | 416 ++- + drivers/usb/host/xhci.h | 112 +- + drivers/usb/misc/appledisplay.c | 6 +- + drivers/usb/misc/ftdi-elan.c | 20 +- + drivers/usb/misc/iowarrior.c | 12 +- + drivers/usb/misc/sisusbvga/sisusb.c | 13 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 8 +- + drivers/usb/misc/usblcd.c | 8 +- + drivers/usb/misc/usbtest.c | 17 +- + drivers/usb/mon/mon_bin.c | 4 +- + drivers/usb/mon/mon_main.c | 3 +- + drivers/usb/mon/mon_text.c | 6 +- + drivers/usb/musb/Kconfig | 6 +- + drivers/usb/musb/Makefile | 14 +- + drivers/usb/musb/blackfin.c | 96 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_core.c | 147 +- + drivers/usb/musb/musb_core.h | 10 +- + drivers/usb/musb/musb_debug.h | 13 + + drivers/usb/musb/musb_debugfs.c | 294 + + drivers/usb/musb/musb_gadget_ep0.c | 25 + + drivers/usb/musb/musb_regs.h | 10 + + drivers/usb/musb/musb_virthub.c | 4 +- + drivers/usb/musb/musbhsdma.h | 16 +- + drivers/usb/musb/omap2430.c | 29 +- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/otg/isp1301_omap.c | 2 +- + drivers/usb/otg/twl4030-usb.c | 108 +- + drivers/usb/otg/ulpi.c | 50 +- + drivers/usb/serial/Kconfig | 23 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/aircable.c | 499 +-- + drivers/usb/serial/ark3116.c | 111 +- + drivers/usb/serial/belkin_sa.c | 130 +- + drivers/usb/serial/belkin_sa.h | 10 +- + drivers/usb/serial/ch341.c | 5 +- + drivers/usb/serial/console.c | 27 +- + drivers/usb/serial/cp210x.c | 63 +- + drivers/usb/serial/cypress_m8.c | 242 +- + drivers/usb/serial/cypress_m8.h | 53 +- + drivers/usb/serial/digi_acceleport.c | 4 +- + drivers/usb/serial/empeg.c | 401 +-- + drivers/usb/serial/ftdi_sio.c | 457 +-- + drivers/usb/serial/ftdi_sio.h | 126 +- + drivers/usb/serial/ftdi_sio_ids.h | 42 +- + drivers/usb/serial/generic.c | 330 +- + drivers/usb/serial/io_edgeport.c | 3 +- + drivers/usb/serial/io_edgeport.h | 16 +- + drivers/usb/serial/io_ionsp.h | 95 +- + drivers/usb/serial/io_ti.c | 228 +- + drivers/usb/serial/io_ti.h | 92 +- + drivers/usb/serial/io_usbvend.h | 87 +- + drivers/usb/serial/ipaq.c | 357 +-- + drivers/usb/serial/ipaq.h | 54 - + drivers/usb/serial/ipw.c | 184 +- + drivers/usb/serial/ir-usb.c | 272 +- + drivers/usb/serial/iuu_phoenix.c | 30 +- + drivers/usb/serial/kl5kusb105.c | 436 +-- + drivers/usb/serial/kl5kusb105.h | 47 +- + drivers/usb/serial/kobil_sct.c | 3 +- + drivers/usb/serial/kobil_sct.h | 75 +- + drivers/usb/serial/mct_u232.c | 7 +- + drivers/usb/serial/mct_u232.h | 254 +- + drivers/usb/serial/mos7720.c | 1130 +++- + drivers/usb/serial/mos7840.c | 1 - + drivers/usb/serial/option.c | 841 +-- + drivers/usb/serial/oti6858.c | 254 +- + drivers/usb/serial/pl2303.c | 430 +-- + drivers/usb/serial/pl2303.h | 6 +- + drivers/usb/serial/qcaux.c | 5 + + drivers/usb/serial/qcserial.c | 64 +- + drivers/usb/serial/safe_serial.c | 231 +- + drivers/usb/serial/spcp8x5.c | 407 +-- + drivers/usb/serial/ti_usb_3410_5052.c | 179 +- + drivers/usb/serial/usb-serial.c | 47 +- + drivers/usb/serial/usb-wwan.h | 67 + + drivers/usb/serial/usb_debug.c | 12 +- + drivers/usb/serial/usb_wwan.c | 665 +++ + drivers/usb/serial/visor.c | 344 +-- + drivers/usb/serial/visor.h | 9 +- + drivers/usb/serial/zio.c | 64 + + drivers/usb/storage/isd200.c | 4 +- + drivers/usb/storage/onetouch.c | 12 +- + drivers/usb/storage/transport.c | 2 - + drivers/usb/storage/unusual_devs.h | 24 +- + drivers/usb/storage/usb.c | 87 +- + drivers/usb/storage/usb.h | 3 +- + drivers/usb/usb-skeleton.c | 10 +- + drivers/usb/wusbcore/wa-xfer.c | 2 - + drivers/usb/wusbcore/wusbhc.h | 4 +- + drivers/vhost/net.c | 4 +- + drivers/vhost/vhost.c | 11 +- + drivers/video/Kconfig | 17 +- + drivers/video/aty/radeon_base.c | 4 +- + drivers/video/efifb.c | 11 +- + drivers/video/fbmem.c | 77 +- + drivers/video/fbsysfs.c | 1 + + drivers/video/mx3fb.c | 3 +- + drivers/video/offb.c | 28 +- + drivers/video/omap2/displays/Kconfig | 9 +- + drivers/video/omap2/displays/Makefile | 1 + + drivers/video/omap2/displays/panel-acx565akm.c | 819 +++ + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 78 + + drivers/video/omap2/displays/panel-taal.c | 143 +- + drivers/video/omap2/dss/Kconfig | 6 + + drivers/video/omap2/dss/Makefile | 3 +- + drivers/video/omap2/dss/core.c | 85 +- + drivers/video/omap2/dss/display.c | 9 +- + drivers/video/omap2/dss/dss.c | 24 +- + drivers/video/omap2/dss/dss.h | 50 + + drivers/video/omap2/dss/manager.c | 21 + + drivers/video/omap2/dss/sdi.c | 26 +- + drivers/video/omap2/dss/venc.c | 15 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 5 +- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 25 +- + drivers/video/vesafb.c | 11 +- + drivers/video/vga16fb.c | 26 +- + drivers/video/via/Makefile | 4 +- + drivers/video/via/accel.c | 137 +- + drivers/video/via/accel.h | 40 + + drivers/video/via/chip.h | 8 + + drivers/video/via/dvi.c | 37 +- + drivers/video/via/global.h | 1 - + drivers/video/via/hw.c | 307 +- + drivers/video/via/hw.h | 20 +- + drivers/video/via/ioctl.h | 2 +- + drivers/video/via/lcd.c | 31 +- + drivers/video/via/lcd.h | 2 + + drivers/video/via/share.h | 20 +- + drivers/video/via/via-core.c | 668 +++ + drivers/video/via/via-gpio.c | 285 + + drivers/video/via/via_i2c.c | 232 +- + drivers/video/via/via_modesetting.c | 126 + + drivers/video/via/{via_i2c.h => via_modesetting.h} | 42 +- + drivers/video/via/via_utility.c | 1 + + drivers/video/via/viafbdev.c | 181 +- + drivers/video/via/viafbdev.h | 14 +- + drivers/video/via/viamode.c | 15 + + drivers/video/via/vt1636.c | 34 +- + drivers/video/via/vt1636.h | 2 +- + drivers/virtio/virtio_balloon.c | 17 +- + drivers/virtio/virtio_ring.c | 44 +- + drivers/w1/slaves/w1_ds2431.c | 4 +- + drivers/w1/slaves/w1_ds2433.c | 4 +- + drivers/w1/slaves/w1_ds2760.c | 2 +- + drivers/w1/w1.c | 4 +- + drivers/watchdog/pcwd_usb.c | 6 +- + drivers/zorro/zorro-sysfs.c | 2 +- + firmware/Makefile | 2 +- + firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw.ihex | 6081 ++++++++++++++++++++ + firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw.ihex | 6058 ------------------- + fs/9p/vfs_inode.c | 4 +- + fs/Makefile | 2 +- + fs/afs/dir.c | 6 +- + fs/afs/file.c | 64 +- + fs/afs/internal.h | 1 + + fs/afs/mntpt.c | 6 +- + fs/anon_inodes.c | 2 +- + fs/bfs/dir.c | 4 +- + fs/block_dev.c | 330 +- + fs/btrfs/acl.c | 4 +- + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/inode.c | 11 +- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/xattr.h | 6 +- + fs/buffer.c | 26 +- + fs/ceph/file.c | 3 +- + fs/ceph/super.c | 3 +- + fs/coda/file.c | 2 +- + fs/dcache.c | 20 +- + fs/devpts/inode.c | 9 +- + fs/dlm/lock.c | 5 +- + fs/dlm/user.c | 88 +- + fs/drop_caches.c | 24 +- + fs/ecryptfs/ecryptfs_kernel.h | 5 +- + fs/ecryptfs/file.c | 4 +- + fs/ecryptfs/inode.c | 48 +- + fs/ecryptfs/main.c | 166 +- + fs/ecryptfs/mmap.c | 19 +- + fs/ecryptfs/read_write.c | 13 +- + fs/ecryptfs/super.c | 22 - + fs/exofs/inode.c | 11 +- + fs/ext2/acl.c | 4 +- + fs/ext2/balloc.c | 6 + + fs/ext2/ialloc.c | 21 +- + fs/ext2/inode.c | 7 +- + fs/ext2/super.c | 99 +- + fs/ext2/xattr.c | 12 +- + fs/ext2/xattr.h | 12 +- + fs/ext2/xattr_security.c | 2 +- + fs/ext2/xattr_trusted.c | 2 +- + fs/ext2/xattr_user.c | 2 +- + fs/ext3/acl.c | 4 +- + fs/ext3/balloc.c | 6 + + fs/ext3/fsync.c | 23 +- + fs/ext3/ialloc.c | 13 +- + fs/ext3/inode.c | 2 +- + fs/ext3/super.c | 77 +- + fs/ext3/xattr.c | 10 +- + fs/ext3/xattr.h | 12 +- + fs/ext3/xattr_security.c | 2 +- + fs/ext3/xattr_trusted.c | 2 +- + fs/ext3/xattr_user.c | 2 +- + fs/ext4/acl.c | 4 +- + fs/ext4/fsync.c | 6 +- + fs/ext4/ialloc.c | 12 +- + fs/ext4/inode.c | 2 +- + fs/ext4/xattr.c | 10 +- + fs/ext4/xattr.h | 12 +- + fs/ext4/xattr_security.c | 2 +- + fs/ext4/xattr_trusted.c | 2 +- + fs/ext4/xattr_user.c | 2 +- + fs/fcntl.c | 71 +- + fs/fs-writeback.c | 104 +- + fs/generic_acl.c | 4 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/aops.c | 8 +- + fs/gfs2/bmap.c | 17 +- + fs/gfs2/dir.c | 2 +- + fs/gfs2/export.c | 2 +- + fs/gfs2/glock.c | 3 + + fs/gfs2/incore.h | 11 +- + fs/gfs2/inode.c | 101 +- + fs/gfs2/inode.h | 5 +- + fs/gfs2/log.c | 158 +- + fs/gfs2/log.h | 1 - + fs/gfs2/lops.c | 2 + + fs/gfs2/main.c | 2 +- + fs/gfs2/meta_io.c | 5 +- + fs/gfs2/ops_fstype.c | 19 +- + fs/gfs2/quota.c | 114 +- + fs/gfs2/rgrp.c | 73 +- + fs/gfs2/super.c | 11 +- + fs/gfs2/super.h | 2 +- + fs/gfs2/sys.c | 6 +- + fs/gfs2/trans.c | 18 + + fs/gfs2/xattr.c | 6 +- + fs/inode.c | 26 +- + fs/internal.h | 2 + + fs/ioctl.c | 15 +- + fs/jbd/commit.c | 8 +- + fs/jbd/journal.c | 33 + + fs/jbd2/checkpoint.c | 3 +- + fs/jbd2/commit.c | 6 +- + fs/jffs2/acl.c | 4 +- + fs/jffs2/acl.h | 4 +- + fs/jffs2/background.c | 3 +- + fs/jffs2/erase.c | 12 +- + fs/jffs2/fs.c | 10 +- + fs/jffs2/gc.c | 17 +- + fs/jffs2/nodelist.h | 10 +- + fs/jffs2/nodemgmt.c | 28 +- + fs/jffs2/os-linux.h | 3 +- + fs/jffs2/scan.c | 4 +- + fs/jffs2/security.c | 2 +- + fs/jffs2/super.c | 2 - + fs/jffs2/wbuf.c | 8 +- + fs/jffs2/xattr.c | 8 +- + fs/jffs2/xattr.h | 8 +- + fs/jffs2/xattr_trusted.c | 2 +- + fs/jffs2/xattr_user.c | 2 +- + fs/jfs/file.c | 2 +- + fs/jfs/jfs_inode.c | 12 +- + fs/logfs/inode.c | 9 +- + fs/minix/bitmap.c | 5 +- + fs/minix/minix.h | 2 +- + fs/minix/namei.c | 11 +- + fs/namei.c | 5 +- + fs/nfsd/nfs4recover.c | 87 +- + fs/nfsd/vfs.c | 5 +- + fs/nilfs2/alloc.c | 154 +- + fs/nilfs2/alloc.h | 7 + + fs/nilfs2/btree.c | 91 +- + fs/nilfs2/btree.h | 23 +- + fs/nilfs2/inode.c | 15 +- + fs/nilfs2/recovery.c | 2 + + fs/nilfs2/segbuf.c | 70 +- + fs/nilfs2/segbuf.h | 10 +- + fs/nilfs2/segment.c | 157 +- + fs/nilfs2/segment.h | 6 +- + fs/nilfs2/super.c | 218 +- + fs/nilfs2/the_nilfs.c | 14 +- + fs/notify/inotify/inotify.c | 88 +- + fs/ocfs2/Makefile | 1 + + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/alloc.c | 908 +--- + fs/ocfs2/alloc.h | 12 +- + fs/ocfs2/aops.c | 3 + + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/cluster/tcp.c | 3 + + fs/ocfs2/dir.c | 75 +- + fs/ocfs2/dlm/dlmast.c | 8 +- + fs/ocfs2/dlm/dlmcommon.h | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 4 +- + fs/ocfs2/dlm/dlmdomain.c | 28 +- + fs/ocfs2/dlm/dlmlock.c | 6 +- + fs/ocfs2/dlm/dlmmaster.c | 30 +- + fs/ocfs2/dlm/dlmrecovery.c | 27 +- + fs/ocfs2/dlm/dlmthread.c | 16 +- + fs/ocfs2/dlm/dlmunlock.c | 3 +- + fs/ocfs2/dlmglue.c | 3 +- + fs/ocfs2/file.c | 236 +- + fs/ocfs2/inode.c | 45 +- + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 26 +- + fs/ocfs2/journal.h | 15 +- + fs/ocfs2/localalloc.c | 275 +- + fs/ocfs2/localalloc.h | 3 + + fs/ocfs2/mmap.c | 48 +- + fs/ocfs2/namei.c | 100 +- + fs/ocfs2/ocfs2.h | 22 + + fs/ocfs2/ocfs2_fs.h | 144 +- + fs/ocfs2/quota.h | 12 +- + fs/ocfs2/quota_global.c | 351 +- + fs/ocfs2/quota_local.c | 183 +- + fs/ocfs2/refcounttree.c | 74 +- + fs/ocfs2/refcounttree.h | 4 +- + fs/ocfs2/reservations.c | 847 +++ + fs/ocfs2/reservations.h | 159 + + fs/ocfs2/resize.c | 19 +- + fs/ocfs2/suballoc.c | 688 ++- + fs/ocfs2/suballoc.h | 21 +- + fs/ocfs2/super.c | 92 +- + fs/ocfs2/super.h | 7 + + fs/ocfs2/xattr.c | 115 +- + fs/ocfs2/xattr.h | 12 +- + fs/omfs/inode.c | 4 +- + fs/open.c | 166 - + fs/partitions/acorn.c | 68 +- + fs/partitions/acorn.h | 10 +- + fs/partitions/amiga.c | 13 +- + fs/partitions/amiga.h | 2 +- + fs/partitions/atari.c | 8 +- + fs/partitions/atari.h | 2 +- + fs/partitions/check.c | 84 +- + fs/partitions/check.h | 12 + + fs/partitions/efi.c | 93 +- + fs/partitions/efi.h | 2 +- + fs/partitions/ibm.c | 21 +- + fs/partitions/ibm.h | 2 +- + fs/partitions/karma.c | 4 +- + fs/partitions/karma.h | 2 +- + fs/partitions/ldm.c | 89 +- + fs/partitions/ldm.h | 2 +- + fs/partitions/mac.c | 13 +- + fs/partitions/mac.h | 2 +- + fs/partitions/msdos.c | 87 +- + fs/partitions/msdos.h | 2 +- + fs/partitions/osf.c | 4 +- + fs/partitions/osf.h | 2 +- + fs/partitions/sgi.c | 6 +- + fs/partitions/sgi.h | 2 +- + fs/partitions/sun.c | 6 +- + fs/partitions/sun.h | 2 +- + fs/partitions/sysv68.c | 6 +- + fs/partitions/sysv68.h | 2 +- + fs/partitions/ultrix.c | 4 +- + fs/partitions/ultrix.h | 2 +- + fs/pipe.c | 122 +- + fs/quota/dquot.c | 275 +- + fs/quota/quota.c | 95 +- + fs/quota/quota_tree.c | 50 +- + fs/quota/quota_tree.h | 6 + + fs/quota/quota_v1.c | 4 +- + fs/quota/quota_v2.c | 6 +- + fs/ramfs/inode.c | 22 +- + fs/reiserfs/file.c | 3 +- + fs/reiserfs/inode.c | 3 +- + fs/reiserfs/namei.c | 18 +- + fs/reiserfs/xattr.c | 16 +- + fs/reiserfs/xattr_acl.c | 4 +- + fs/reiserfs/xattr_security.c | 2 +- + fs/reiserfs/xattr_trusted.c | 2 +- + fs/reiserfs/xattr_user.c | 2 +- + fs/splice.c | 151 +- + fs/statfs.c | 196 + + fs/super.c | 321 +- + fs/sync.c | 88 +- + fs/sysfs/bin.c | 26 +- + fs/sysfs/dir.c | 114 +- + fs/sysfs/file.c | 17 +- + fs/sysfs/group.c | 6 +- + fs/sysfs/inode.c | 6 +- + fs/sysfs/mount.c | 95 +- + fs/sysfs/symlink.c | 36 +- + fs/sysfs/sysfs.h | 34 +- + fs/sysv/ialloc.c | 11 +- + fs/timerfd.c | 25 +- + fs/ubifs/dir.c | 9 +- + fs/ubifs/io.c | 1 + + fs/udf/dir.c | 2 +- + fs/udf/file.c | 45 +- + fs/udf/ialloc.c | 11 +- + fs/udf/namei.c | 10 +- + fs/udf/udfdecl.h | 3 +- + fs/ufs/ialloc.c | 10 +- + fs/ufs/inode.c | 2 +- + fs/ufs/namei.c | 2 +- + fs/ufs/symlink.c | 8 + + fs/ufs/truncate.c | 10 +- + fs/ufs/ufs.h | 2 + + fs/xattr.c | 14 +- + fs/xfs/linux-2.6/xfs_acl.c | 4 +- + fs/xfs/linux-2.6/xfs_aops.c | 231 +- + fs/xfs/linux-2.6/xfs_buf.c | 27 +- + fs/xfs/linux-2.6/xfs_buf.h | 2 +- + fs/xfs/linux-2.6/xfs_file.c | 2 + + fs/xfs/linux-2.6/xfs_ioctl.c | 4 + + fs/xfs/linux-2.6/xfs_ioctl32.c | 4 + + fs/xfs/linux-2.6/xfs_iops.c | 5 +- + fs/xfs/linux-2.6/xfs_quotaops.c | 8 +- + fs/xfs/linux-2.6/xfs_super.c | 13 +- + fs/xfs/linux-2.6/xfs_super.h | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 91 +- + fs/xfs/linux-2.6/xfs_trace.c | 4 +- + fs/xfs/linux-2.6/xfs_trace.h | 150 +- + fs/xfs/linux-2.6/xfs_xattr.c | 8 +- + fs/xfs/quota/xfs_dquot.c | 193 +- + fs/xfs/quota/xfs_dquot.h | 35 +- + fs/xfs/quota/xfs_dquot_item.c | 30 +- + fs/xfs/quota/xfs_qm.c | 609 +-- + fs/xfs/quota/xfs_qm.h | 23 +- + fs/xfs/quota/xfs_qm_stats.c | 2 +- + fs/xfs/quota/xfs_qm_syscalls.c | 162 +- + fs/xfs/quota/xfs_quota_priv.h | 102 - + fs/xfs/quota/xfs_trans_dquot.c | 29 +- + fs/xfs/xfs_acl.h | 4 +- + fs/xfs/xfs_bmap.c | 2 +- + fs/xfs/xfs_buf_item.c | 55 +- + fs/xfs/xfs_buf_item.h | 2 +- + fs/xfs/xfs_error.c | 30 +- + fs/xfs/xfs_error.h | 9 +- + fs/xfs/xfs_extfree_item.c | 18 +- + fs/xfs/xfs_inode.c | 2 + + fs/xfs/xfs_inode_item.c | 21 +- + fs/xfs/xfs_iomap.c | 123 +- + fs/xfs/xfs_iomap.h | 47 +- + fs/xfs/xfs_log.c | 702 ++- + fs/xfs/xfs_log.h | 13 + + fs/xfs/xfs_log_priv.h | 12 +- + fs/xfs/xfs_log_recover.c | 311 +- + fs/xfs/xfs_mount.c | 7 - + fs/xfs/xfs_quota.h | 3 - + fs/xfs/xfs_trans.c | 760 ++-- + fs/xfs/xfs_trans.h | 14 +- + fs/xfs/xfs_trans_buf.c | 187 +- + include/asm-generic/bug.h | 34 +- + include/asm-generic/kmap_types.h | 3 +- + include/crypto/algapi.h | 40 + + include/drm/drmP.h | 3 + + include/drm/drm_crtc.h | 43 +- + include/drm/drm_crtc_helper.h | 9 +- + include/drm/drm_edid.h | 5 +- + include/drm/drm_fb_helper.h | 67 +- + .../radeon_fixed.h => include/drm/drm_fixed.h | 40 +- + include/drm/radeon_drm.h | 1 + + include/drm/ttm/ttm_bo_api.h | 46 +- + include/drm/ttm/ttm_bo_driver.h | 57 +- + include/drm/ttm/ttm_page_alloc.h | 74 + + include/linux/Kbuild | 1 + + include/linux/altera_jtaguart.h | 16 + + include/linux/altera_uart.h | 14 + + include/linux/backing-dev.h | 6 +- + include/linux/blkdev.h | 72 +- + include/linux/caif/caif_socket.h | 165 + + include/linux/caif/if_caif.h | 34 + + include/linux/can/dev.h | 1 + + include/linux/can/platform/mcp251x.h | 4 +- + include/linux/can/platform/sja1000.h | 2 +- + include/linux/dcbnl.h | 2 - + include/linux/device.h | 12 +- + include/linux/dmaengine.h | 127 +- + include/linux/dqblk_xfs.h | 9 + + include/linux/drbd.h | 5 +- + include/linux/drbd_limits.h | 16 + + include/linux/drbd_nl.h | 5 + + include/linux/elevator.h | 6 + + include/linux/elfcore.h | 4 +- + include/linux/ethtool.h | 116 +- + include/linux/ext2_fs_sb.h | 9 + + include/linux/fb.h | 19 +- + include/linux/fcntl.h | 6 + + include/linux/filter.h | 3 +- + include/linux/firmware.h | 1 + + include/linux/fs.h | 33 +- + include/linux/ftrace_event.h | 3 + + include/linux/generic_acl.h | 4 +- + include/linux/genetlink.h | 8 + + include/linux/gsmmux.h | 25 + + include/linux/hdpu_features.h | 26 - + include/linux/hid.h | 10 + + include/linux/ide.h | 2 +- + include/linux/ieee80211.h | 4 +- + include/linux/if.h | 2 + + include/linux/if_arp.h | 1 + + include/linux/if_ether.h | 1 + + include/linux/if_link.h | 108 + + include/linux/if_macvlan.h | 3 +- + include/linux/if_packet.h | 1 + + include/linux/if_pppol2tp.h | 16 +- + include/linux/if_pppox.h | 9 + + include/linux/if_tun.h | 2 + + include/linux/if_x25.h | 26 + + include/linux/in6.h | 5 +- + include/linux/interrupt.h | 2 +- + include/linux/ioport.h | 4 +- + include/linux/ipv6.h | 18 +- + include/linux/isapnp.h | 8 +- + include/linux/jbd.h | 3 +- + include/linux/jffs2.h | 4 +- + include/linux/kdb.h | 117 + + include/linux/kernel.h | 7 +- + include/linux/kgdb.h | 55 +- + include/linux/kobject.h | 38 + + include/linux/kref.h | 1 - + include/linux/ks8842.h | 34 + + include/linux/kvm.h | 26 + + include/linux/kvm_host.h | 16 +- + include/linux/l2tp.h | 163 + + include/linux/lockdep.h | 8 + + include/linux/mmc/sdio.h | 2 + + include/linux/mod_devicetable.h | 33 + + include/linux/mroute.h | 20 +- + include/linux/mroute6.h | 35 +- + include/linux/msm_mdp.h | 78 + + include/linux/mtd/blktrans.h | 15 +- + include/linux/mtd/cfi.h | 30 +- + include/linux/mtd/flashchip.h | 4 +- + include/linux/mtd/map.h | 3 + + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/mtdram.h | 2 +- + include/linux/mtd/nand.h | 25 +- + include/linux/mtd/onenand.h | 9 + + include/linux/mtd/sh_flctl.h | 7 +- + include/linux/net.h | 14 +- + include/linux/netdevice.h | 292 +- + include/linux/netfilter/Kbuild | 1 + + include/linux/netfilter/nf_conntrack_common.h | 1 + + .../linux/netfilter/nf_conntrack_tuple_common.h | 3 +- + include/linux/netfilter/x_tables.h | 95 +- + include/linux/netfilter/xt_CONNMARK.h | 22 +- + include/linux/netfilter/xt_MARK.h | 6 +- + include/linux/netfilter/xt_TEE.h | 12 + + include/linux/netfilter/xt_connmark.h | 11 + + include/linux/netfilter/xt_mark.h | 4 + + include/linux/netfilter/xt_recent.h | 7 + + include/linux/netfilter_bridge.h | 29 +- + include/linux/netfilter_ipv6/ip6_tables.h | 4 - + include/linux/netlink.h | 4 + + include/linux/netpoll.h | 13 +- + include/linux/nilfs2_fs.h | 17 +- + include/linux/nl80211.h | 76 + + include/linux/notifier.h | 10 +- + include/linux/padata.h | 55 + + include/linux/pci.h | 10 + + include/linux/pci_ids.h | 4 +- + include/linux/pci_regs.h | 6 +- + include/linux/phy.h | 13 +- + include/linux/pipe_fs_i.h | 13 +- + include/linux/ppp_channel.h | 3 + + include/linux/quota.h | 48 +- + include/linux/quotaops.h | 15 +- + include/linux/ramfs.h | 5 +- + include/linux/rculist.h | 42 + + include/linux/reiserfs_acl.h | 4 +- + include/linux/reiserfs_xattr.h | 6 +- + include/linux/rtnetlink.h | 7 + + include/linux/serial_core.h | 5 + + include/linux/skbuff.h | 83 +- + include/linux/snmp.h | 2 + + include/linux/socket.h | 5 +- + include/linux/spi/wl12xx.h | 2 + + include/linux/splice.h | 7 + + include/linux/ssb/ssb.h | 4 + + include/linux/ssb/ssb_driver_chipcommon.h | 15 + + include/linux/ssb/ssb_regs.h | 239 +- + include/linux/stmmac.h | 1 + + include/linux/swap.h | 1 + + include/linux/sysctl.h | 2 + + include/linux/sysfs.h | 26 +- + include/linux/tboot.h | 1 + + include/linux/timb_dma.h | 55 + + include/linux/tipc.h | 36 +- + include/linux/tipc_config.h | 1 + + include/linux/tty.h | 5 +- + include/linux/usb.h | 137 +- + include/linux/usb/Kbuild | 1 + + include/linux/usb/atmel_usba_udc.h | 2 +- + include/linux/usb/audio.h | 6 +- + include/linux/usb/cdc.h | 94 + + drivers/usb/core/hub.h => include/linux/usb/ch11.h | 60 +- + include/linux/usb/ch9.h | 16 +- + include/linux/usb/composite.h | 1 + + include/linux/usb/ehci_def.h | 6 +- + include/linux/usb/functionfs.h | 199 + + include/linux/usb/g_hid.h | 32 + + include/linux/usb/gadget.h | 6 +- + include/linux/usb/gadgetfs.h | 2 +- + {drivers/usb/core => include/linux/usb}/hcd.h | 75 +- + include/linux/usb/langwell_udc.h | 2 +- + include/linux/usb/musb.h | 40 +- + include/linux/usb/ncm.h | 114 + + include/linux/usb/net2280.h | 6 +- + include/linux/usb/quirks.h | 4 + + include/linux/usb/rndis_host.h | 70 +- + include/linux/usb/serial.h | 36 +- + include/linux/usb/ulpi.h | 140 + + include/linux/usb/usbnet.h | 40 +- + include/linux/usb/wusb-wa.h | 2 +- + include/linux/via-core.h | 219 + + include/linux/via-gpio.h | 14 + + {drivers/video/via => include/linux}/via_i2c.h | 24 +- + include/linux/virtio.h | 55 +- + include/linux/virtio_blk.h | 5 + + include/linux/virtio_console.h | 25 + + include/linux/wait.h | 149 + + include/linux/wireless.h | 4 +- + include/linux/writeback.h | 18 +- + include/linux/xattr.h | 2 +- + include/net/af_unix.h | 20 +- + include/net/bluetooth/hci_core.h | 6 +- + include/net/bluetooth/l2cap.h | 41 +- + include/net/caif/caif_dev.h | 103 + + include/net/caif/caif_device.h | 55 + + include/net/caif/caif_layer.h | 283 + + include/net/caif/cfcnfg.h | 140 + + include/net/caif/cfctrl.h | 139 + + include/net/caif/cffrml.h | 16 + + include/net/caif/cfmuxl.h | 22 + + include/net/caif/cfpkt.h | 274 + + include/net/caif/cfserl.h | 12 + + include/net/caif/cfsrvl.h | 56 + + include/net/cfg80211.h | 47 +- + include/net/dn_fib.h | 4 - + include/net/dst.h | 83 +- + include/net/fib_rules.h | 3 +- + include/net/flow.h | 23 +- + include/net/icmp.h | 11 - + include/net/if_inet6.h | 25 +- + include/net/inet6_connection_sock.h | 2 +- + include/net/inet_connection_sock.h | 5 +- + include/net/inet_sock.h | 1 + + include/net/inet_timewait_sock.h | 4 +- + include/net/ip.h | 9 +- + include/net/ip6_fib.h | 29 +- + include/net/ip6_route.h | 4 +- + include/net/ipv6.h | 10 +- + include/net/iw_handler.h | 2 +- + include/net/mac80211.h | 149 +- + include/net/mld.h | 75 + + include/net/neighbour.h | 14 + + include/net/netns/generic.h | 9 +- + include/net/netns/ipv4.h | 15 +- + include/net/netns/ipv6.h | 14 +- + include/net/pkt_sched.h | 2 +- + include/net/raw.h | 13 + + include/net/route.h | 17 +- + include/net/sch_generic.h | 1 + + include/net/sctp/sctp.h | 4 +- + include/net/sctp/sm.h | 2 +- + include/net/sctp/structs.h | 66 +- + include/net/snmp.h | 31 +- + include/net/sock.h | 192 +- + include/net/tcp.h | 13 +- + include/net/tipc/tipc.h | 16 +- + include/net/transp_v6.h | 3 +- + include/net/x25.h | 10 +- + include/net/x25device.h | 1 + + include/net/xfrm.h | 19 +- + include/scsi/Kbuild | 1 - + include/scsi/fc/fc_fcp.h | 1 + + include/scsi/fc_encode.h | 18 +- + include/scsi/libfc.h | 29 +- + include/scsi/libfcoe.h | 10 +- + include/scsi/scsi.h | 3 + + include/scsi/scsi_transport_fc.h | 2 +- + include/trace/events/kvm.h | 1 - + include/trace/events/scsi.h | 345 ++ + include/trace/ftrace.h | 3 + + init/Kconfig | 27 + + init/main.c | 2 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 6 + + kernel/debug/debug_core.c | 983 ++++ + 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 | 2849 +++++++++ + kernel/debug/kdb/kdb_private.h | 300 + + kernel/debug/kdb/kdb_support.c | 927 +++ + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1764 ------ + kernel/ksysfs.c | 3 +- + kernel/lockdep.c | 5 + + kernel/module.c | 63 +- + kernel/padata.c | 185 +- + kernel/panic.c | 26 +- + kernel/printk.c | 25 + + kernel/relay.c | 15 +- + kernel/resource.c | 16 +- + kernel/sched.c | 8 +- + kernel/sched_clock.c | 1 + + kernel/signal.c | 40 + + kernel/sysctl.c | 560 ++- + kernel/sysctl_binary.c | 1 - + kernel/trace/trace.c | 60 +- + kernel/trace/trace_output.c | 16 + + kernel/user_namespace.c | 4 +- + lib/Kconfig.kgdb | 24 +- + lib/bug.c | 2 +- + lib/idr.c | 2 +- + lib/kobject.c | 115 + + lib/kobject_uevent.c | 109 +- + lib/kref.c | 15 +- + mm/backing-dev.c | 15 +- + mm/msync.c | 2 +- + mm/page-writeback.c | 44 +- + mm/shmem.c | 29 +- + mm/swapfile.c | 14 +- + net/802/garp.c | 4 +- + net/8021q/vlan.c | 8 +- + net/8021q/vlan_core.c | 2 +- + net/8021q/vlan_dev.c | 18 +- + net/9p/trans_rdma.c | 1 - + net/9p/trans_virtio.c | 6 +- + net/Kconfig | 8 + + net/Makefile | 2 + + net/appletalk/ddp.c | 2 +- + net/atm/br2684.c | 1 - + net/atm/common.c | 30 +- + net/atm/lec.c | 6 - + net/atm/mpc.c | 32 - + net/atm/mpoa_caches.c | 20 - + net/atm/proc.c | 10 +- + net/atm/signaling.c | 2 +- + net/atm/svc.c | 62 +- + net/ax25/af_ax25.c | 8 +- + net/bluetooth/Kconfig | 13 + + net/bluetooth/af_bluetooth.c | 6 +- + net/bluetooth/bnep/core.c | 8 +- + net/bluetooth/bnep/netdev.c | 20 +- + net/bluetooth/cmtp/cmtp.h | 2 +- + net/bluetooth/cmtp/core.c | 4 +- + net/bluetooth/hci_core.c | 27 +- + net/bluetooth/hci_sysfs.c | 34 +- + net/bluetooth/hidp/core.c | 10 +- + net/bluetooth/hidp/hidp.h | 4 +- + net/bluetooth/l2cap.c | 1115 +++- + net/bluetooth/rfcomm/sock.c | 8 +- + net/bluetooth/rfcomm/tty.c | 2 - + net/bluetooth/sco.c | 31 +- + net/bridge/Kconfig | 6 +- + net/bridge/br.c | 2 +- + net/bridge/br_device.c | 131 +- + net/bridge/br_fdb.c | 9 +- + net/bridge/br_forward.c | 51 +- + net/bridge/br_if.c | 14 +- + net/bridge/br_input.c | 12 +- + net/bridge/br_ioctl.c | 2 +- + net/bridge/br_multicast.c | 690 ++- + net/bridge/br_netfilter.c | 263 +- + net/bridge/br_netlink.c | 8 +- + net/bridge/br_notify.c | 11 + + net/bridge/br_private.h | 57 +- + net/bridge/br_stp.c | 11 +- + net/bridge/br_stp_bpdu.c | 2 +- + net/bridge/br_stp_if.c | 16 +- + net/bridge/br_stp_timer.c | 24 +- + net/bridge/br_sysfs_br.c | 2 +- + net/bridge/br_sysfs_if.c | 32 +- + net/bridge/netfilter/ebt_802_3.c | 8 +- + net/bridge/netfilter/ebt_among.c | 27 +- + net/bridge/netfilter/ebt_arp.c | 10 +- + net/bridge/netfilter/ebt_arpreply.c | 10 +- + net/bridge/netfilter/ebt_dnat.c | 12 +- + net/bridge/netfilter/ebt_ip.c | 18 +- + net/bridge/netfilter/ebt_ip6.c | 39 +- + net/bridge/netfilter/ebt_limit.c | 11 +- + net/bridge/netfilter/ebt_log.c | 10 +- + net/bridge/netfilter/ebt_mark.c | 12 +- + net/bridge/netfilter/ebt_mark_m.c | 12 +- + net/bridge/netfilter/ebt_nflog.c | 8 +- + net/bridge/netfilter/ebt_pkttype.c | 8 +- + net/bridge/netfilter/ebt_redirect.c | 12 +- + net/bridge/netfilter/ebt_snat.c | 12 +- + net/bridge/netfilter/ebt_stp.c | 10 +- + net/bridge/netfilter/ebt_ulog.c | 38 +- + net/bridge/netfilter/ebt_vlan.c | 54 +- + net/bridge/netfilter/ebtables.c | 56 +- + net/caif/Kconfig | 48 + + net/caif/Makefile | 26 + + net/caif/caif_config_util.c | 87 + + net/caif/caif_dev.c | 417 ++ + net/caif/caif_socket.c | 1252 ++++ + net/caif/cfcnfg.c | 470 ++ + net/caif/cfctrl.c | 692 +++ + net/caif/cfdbgl.c | 40 + + net/caif/cfdgml.c | 108 + + net/caif/cffrml.c | 151 + + net/caif/cfmuxl.c | 251 + + net/caif/cfpkt_skbuff.c | 571 ++ + net/caif/cfrfml.c | 108 + + net/caif/cfserl.c | 192 + + net/caif/cfsrvl.c | 192 + + net/caif/cfutill.c | 115 + + net/caif/cfveil.c | 107 + + net/caif/cfvidl.c | 65 + + net/caif/chnl_net.c | 467 ++ + net/can/bcm.c | 2 - + net/core/Makefile | 2 +- + net/core/datagram.c | 21 +- + net/core/dev.c | 1391 +++--- + net/core/dev_addr_lists.c | 741 +++ + net/core/dev_mcast.c | 232 - + net/core/dst.c | 45 +- + net/core/ethtool.c | 152 +- + net/core/fib_rules.c | 31 +- + net/core/filter.c | 7 + + net/core/flow.c | 405 +- + net/core/net-sysfs.c | 377 ++- + net/core/net-sysfs.h | 1 - + net/core/net_namespace.c | 95 +- + net/core/netpoll.c | 26 +- + net/core/pktgen.c | 58 +- + net/core/rtnetlink.c | 238 +- + net/core/skbuff.c | 71 +- + net/core/sock.c | 78 +- + net/core/stream.c | 22 +- + net/core/sysctl_net_core.c | 75 + + net/dccp/ccids/ccid3.c | 2 +- + net/dccp/dccp.h | 4 +- + net/dccp/input.c | 2 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 7 +- + net/dccp/output.c | 18 +- + net/dccp/proto.c | 2 +- + net/dccp/timer.c | 4 +- + net/decnet/af_decnet.c | 32 +- + net/decnet/dn_dev.c | 15 +- + net/decnet/dn_neigh.c | 9 +- + net/decnet/dn_nsp_in.c | 3 +- + net/decnet/dn_route.c | 29 +- + net/decnet/dn_rules.c | 22 +- + net/dsa/slave.c | 14 +- + net/ethernet/eth.c | 4 +- + net/ipv4/Kconfig | 22 + + net/ipv4/af_inet.c | 57 +- + net/ipv4/arp.c | 2 +- + net/ipv4/cipso_ipv4.c | 2 - + net/ipv4/devinet.c | 4 +- + net/ipv4/fib_rules.c | 22 +- + net/ipv4/fib_trie.c | 2 - + net/ipv4/icmp.c | 11 +- + net/ipv4/igmp.c | 4 +- + net/ipv4/inet_connection_sock.c | 10 +- + net/ipv4/inet_hashtables.c | 2 + + net/ipv4/ip_forward.c | 4 +- + net/ipv4/ip_gre.c | 10 +- + net/ipv4/ip_input.c | 8 +- + net/ipv4/ip_options.c | 10 +- + net/ipv4/ip_output.c | 35 +- + net/ipv4/ip_sockglue.c | 20 +- + net/ipv4/ipconfig.c | 2 +- + net/ipv4/ipip.c | 7 +- + net/ipv4/ipmr.c | 925 +++- + net/ipv4/netfilter.c | 6 +- + net/ipv4/netfilter/arp_tables.c | 102 +- + net/ipv4/netfilter/arpt_mangle.c | 4 +- + net/ipv4/netfilter/ip_queue.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 260 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 77 +- + net/ipv4/netfilter/ipt_ECN.c | 23 +- + net/ipv4/netfilter/ipt_LOG.c | 19 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 18 +- + net/ipv4/netfilter/ipt_NETMAP.c | 16 +- + net/ipv4/netfilter/ipt_REDIRECT.c | 16 +- + net/ipv4/netfilter/ipt_REJECT.c | 19 +- + net/ipv4/netfilter/ipt_ULOG.c | 47 +- + net/ipv4/netfilter/ipt_addrtype.c | 28 +- + net/ipv4/netfilter/ipt_ah.c | 28 +- + net/ipv4/netfilter/ipt_ecn.c | 19 +- + net/ipv4/netfilter/iptable_filter.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 10 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 7 +- + net/ipv4/netfilter/nf_nat_h323.c | 17 +- + net/ipv4/netfilter/nf_nat_rule.c | 21 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 16 +- + net/ipv4/netfilter/nf_nat_standalone.c | 7 +- + net/ipv4/netfilter/nf_nat_tftp.c | 1 - + net/ipv4/proc.c | 1 + + net/ipv4/raw.c | 6 +- + net/ipv4/route.c | 154 +- + net/ipv4/sysctl_net_ipv4.c | 17 + + net/ipv4/tcp.c | 21 +- + net/ipv4/tcp_input.c | 12 +- + net/ipv4/tcp_ipv4.c | 43 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 25 +- + net/ipv4/tcp_timer.c | 8 +- + net/ipv4/udp.c | 34 +- + net/ipv4/xfrm4_input.c | 6 +- + net/ipv4/xfrm4_output.c | 2 +- + net/ipv4/xfrm4_policy.c | 22 - + net/ipv6/Kconfig | 14 + + net/ipv6/addrconf.c | 886 ++-- + net/ipv6/addrlabel.c | 8 +- + net/ipv6/af_inet6.c | 3 + + net/ipv6/datagram.c | 108 +- + net/ipv6/fib6_rules.c | 3 +- + net/ipv6/icmp.c | 7 +- + net/ipv6/inet6_connection_sock.c | 4 +- + net/ipv6/ip6_fib.c | 16 +- + net/ipv6/ip6_flowlabel.c | 3 +- + net/ipv6/ip6_input.c | 4 +- + net/ipv6/ip6_output.c | 103 +- + net/ipv6/ip6_tunnel.c | 8 +- + net/ipv6/ip6mr.c | 942 +++- + net/ipv6/ipv6_sockglue.c | 86 +- + net/ipv6/mcast.c | 143 +- + net/ipv6/ndisc.c | 6 +- + net/ipv6/netfilter.c | 25 +- + net/ipv6/netfilter/ip6_queue.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 236 +- + net/ipv6/netfilter/ip6t_LOG.c | 20 +- + net/ipv6/netfilter/ip6t_REJECT.c | 32 +- + net/ipv6/netfilter/ip6t_ah.c | 18 +- + net/ipv6/netfilter/ip6t_eui64.c | 4 +- + net/ipv6/netfilter/ip6t_frag.c | 18 +- + net/ipv6/netfilter/ip6t_hbh.c | 33 +- + net/ipv6/netfilter/ip6t_ipv6header.c | 8 +- + net/ipv6/netfilter/ip6t_mh.c | 21 +- + net/ipv6/netfilter/ip6t_rt.c | 20 +- + net/ipv6/netfilter/ip6table_filter.c | 2 +- + net/ipv6/netfilter/ip6table_mangle.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 14 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/proc.c | 2 +- + net/ipv6/raw.c | 18 +- + net/ipv6/route.c | 2 - + net/ipv6/sit.c | 8 +- + net/ipv6/tcp_ipv6.c | 68 +- + net/ipv6/udp.c | 41 +- + net/ipv6/xfrm6_input.c | 2 +- + net/ipv6/xfrm6_output.c | 4 +- + net/ipv6/xfrm6_policy.c | 31 - + net/irda/af_irda.c | 14 +- + net/irda/ircomm/ircomm_param.c | 2 +- + net/irda/iriap.c | 2 - + net/irda/irnet/irnet_irda.c | 3 - + net/iucv/af_iucv.c | 22 +- + net/key/af_key.c | 10 +- + net/l2tp/Kconfig | 107 + + net/l2tp/Makefile | 12 + + net/l2tp/l2tp_core.c | 1666 ++++++ + net/l2tp/l2tp_core.h | 304 + + net/l2tp/l2tp_debugfs.c | 341 ++ + net/l2tp/l2tp_eth.c | 334 ++ + net/l2tp/l2tp_ip.c | 679 +++ + net/l2tp/l2tp_netlink.c | 840 +++ + net/l2tp/l2tp_ppp.c | 1837 ++++++ + net/llc/af_llc.c | 12 +- + net/llc/llc_core.c | 6 - + net/mac80211/Kconfig | 17 +- + net/mac80211/Makefile | 3 +- + net/mac80211/agg-rx.c | 80 +- + net/mac80211/agg-tx.c | 16 +- + net/mac80211/cfg.c | 122 +- + net/mac80211/chan.c | 127 + + net/mac80211/debugfs.h | 1 - + net/mac80211/debugfs_netdev.c | 12 + + net/mac80211/debugfs_sta.c | 79 +- + net/mac80211/driver-ops.h | 33 +- + net/mac80211/driver-trace.h | 333 ++- + net/mac80211/ht.c | 3 +- + net/mac80211/ibss.c | 46 +- + net/mac80211/ieee80211_i.h | 51 +- + net/mac80211/iface.c | 124 +- + net/mac80211/key.c | 1 + + net/mac80211/main.c | 28 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/mesh.h | 2 - + net/mac80211/mesh_hwmp.c | 5 +- + net/mac80211/mesh_plink.c | 2 +- + net/mac80211/mlme.c | 310 +- + net/mac80211/pm.c | 2 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/mac80211/rc80211_minstrel.h | 11 + + net/mac80211/rc80211_minstrel_debugfs.c | 41 +- + net/mac80211/rx.c | 108 +- + net/mac80211/scan.c | 126 +- + net/mac80211/sta_info.c | 105 +- + net/mac80211/sta_info.h | 12 +- + net/mac80211/status.c | 21 +- + net/mac80211/tx.c | 26 +- + net/mac80211/util.c | 36 +- + net/mac80211/work.c | 62 +- + net/netfilter/Kconfig | 133 +- + net/netfilter/Makefile | 9 +- + net/netfilter/ipvs/ip_vs_ftp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto.c | 28 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 14 +- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/netfilter/ipvs/ip_vs_xmit.c | 16 +- + net/netfilter/nf_conntrack_amanda.c | 2 +- + net/netfilter/nf_conntrack_core.c | 6 +- + net/netfilter/nf_conntrack_ecache.c | 12 +- + net/netfilter/nf_conntrack_ftp.c | 4 +- + net/netfilter/nf_conntrack_h323_main.c | 9 +- + net/netfilter/nf_conntrack_irc.c | 4 +- + net/netfilter/nf_conntrack_netlink.c | 30 +- + net/netfilter/nf_conntrack_proto.c | 8 +- + net/netfilter/nf_conntrack_proto_sctp.c | 4 +- + net/netfilter/nf_conntrack_sip.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 9 +- + net/netfilter/nf_conntrack_tftp.c | 4 +- + net/netfilter/nf_internals.h | 2 +- + net/netfilter/nf_log.c | 6 +- + net/netfilter/nf_queue.c | 3 +- + net/netfilter/nfnetlink.c | 7 +- + net/netfilter/nfnetlink_log.c | 4 +- + net/netfilter/nfnetlink_queue.c | 3 +- + net/netfilter/x_tables.c | 128 +- + net/netfilter/xt_CLASSIFY.c | 2 +- + net/netfilter/xt_CONNMARK.c | 113 - + net/netfilter/xt_CONNSECMARK.c | 29 +- + net/netfilter/xt_CT.c | 25 +- + net/netfilter/xt_DSCP.c | 18 +- + net/netfilter/xt_HL.c | 30 +- + net/netfilter/xt_LED.c | 93 +- + net/netfilter/xt_MARK.c | 56 - + net/netfilter/xt_NFLOG.c | 10 +- + net/netfilter/xt_NFQUEUE.c | 50 +- + net/netfilter/xt_NOTRACK.c | 2 +- + net/netfilter/xt_RATEEST.c | 20 +- + net/netfilter/xt_SECMARK.c | 48 +- + net/netfilter/xt_TCPMSS.c | 41 +- + net/netfilter/xt_TCPOPTSTRIP.c | 7 +- + net/netfilter/xt_TEE.c | 309 + + net/netfilter/xt_TPROXY.c | 12 +- + net/netfilter/xt_TRACE.c | 2 +- + net/netfilter/xt_cluster.c | 21 +- + net/netfilter/xt_comment.c | 2 +- + net/netfilter/xt_connbytes.c | 22 +- + net/netfilter/xt_connlimit.c | 24 +- + net/netfilter/xt_connmark.c | 104 +- + net/netfilter/xt_conntrack.c | 23 +- + net/netfilter/xt_dccp.c | 18 +- + net/netfilter/xt_dscp.c | 18 +- + net/netfilter/xt_esp.c | 28 +- + net/netfilter/xt_hashlimit.c | 346 +- + net/netfilter/xt_helper.c | 18 +- + net/netfilter/xt_hl.c | 16 +- + net/netfilter/xt_iprange.c | 5 +- + net/netfilter/xt_length.c | 4 +- + net/netfilter/xt_limit.c | 15 +- + net/netfilter/xt_mac.c | 23 +- + net/netfilter/xt_mark.c | 37 +- + net/netfilter/xt_multiport.c | 103 +- + net/netfilter/xt_osf.c | 12 +- + net/netfilter/xt_owner.c | 2 +- + net/netfilter/xt_physdev.c | 18 +- + net/netfilter/xt_pkttype.c | 2 +- + net/netfilter/xt_policy.c | 31 +- + net/netfilter/xt_quota.c | 10 +- + net/netfilter/xt_rateest.c | 10 +- + net/netfilter/xt_realm.c | 2 +- + net/netfilter/xt_recent.c | 189 +- + net/netfilter/xt_sctp.c | 57 +- + net/netfilter/xt_socket.c | 11 +- + net/netfilter/xt_state.c | 50 +- + net/netfilter/xt_statistic.c | 14 +- + net/netfilter/xt_string.c | 68 +- + net/netfilter/xt_tcpmss.c | 4 +- + net/netfilter/xt_tcpudp.c | 38 +- + net/netfilter/xt_time.c | 16 +- + net/netfilter/xt_u32.c | 5 +- + net/netlabel/netlabel_addrlist.h | 2 - + net/netlabel/netlabel_unlabeled.c | 1 - + net/netlink/af_netlink.c | 23 +- + net/netlink/genetlink.c | 6 +- + net/netrom/af_netrom.c | 8 +- + net/packet/af_packet.c | 69 +- + net/phonet/pep.c | 8 +- + net/phonet/pn_dev.c | 23 +- + net/phonet/socket.c | 2 +- + net/rds/af_rds.c | 11 +- + net/rds/cong.c | 2 - + net/rds/ib_cm.c | 3 +- + net/rds/ib_rdma.c | 5 +- + net/rds/ib_recv.c | 4 +- + net/rds/ib_send.c | 20 +- + net/rds/iw_cm.c | 4 +- + net/rds/iw_recv.c | 4 +- + net/rds/iw_send.c | 3 +- + net/rds/loop.c | 7 - + net/rds/rdma.c | 4 +- + net/rds/rdma_transport.c | 5 +- + net/rds/rds.h | 4 +- + net/rds/recv.c | 2 +- + net/rds/send.c | 40 +- + net/rds/tcp_connect.c | 2 +- + net/rds/tcp_recv.c | 1 + + net/rds/tcp_send.c | 4 +- + net/rds/threads.c | 2 +- + net/rfkill/core.c | 53 +- + net/rose/af_rose.c | 8 +- + net/rxrpc/af_rxrpc.c | 12 +- + net/rxrpc/ar-recvmsg.c | 6 +- + net/sched/act_api.c | 65 +- + net/sched/act_gact.c | 4 +- + net/sched/act_ipt.c | 9 +- + net/sched/act_mirred.c | 6 +- + net/sched/act_pedit.c | 11 +- + net/sched/act_simple.c | 4 +- + net/sched/cls_api.c | 30 +- + net/sched/cls_flow.c | 1 - + net/sched/cls_u32.c | 10 +- + net/sched/ematch.c | 3 +- + net/sched/sch_api.c | 121 +- + net/sched/sch_generic.c | 21 +- + net/sched/sch_hfsc.c | 7 +- + net/sched/sch_ingress.c | 1 - + net/sched/sch_mq.c | 1 - + net/sched/sch_multiq.c | 1 - + net/sched/sch_prio.c | 1 - + net/sched/sch_red.c | 1 - + net/sched/sch_sfq.c | 10 +- + net/sched/sch_tbf.c | 6 +- + net/sctp/Kconfig | 12 + + net/sctp/Makefile | 3 + + net/sctp/associola.c | 15 +- + net/sctp/chunk.c | 4 +- + net/sctp/endpointola.c | 2 - + net/sctp/ipv6.c | 27 +- + net/sctp/output.c | 27 +- + net/sctp/outqueue.c | 96 +- + net/sctp/probe.c | 214 + + net/sctp/proc.c | 3 - + net/sctp/protocol.c | 9 +- + net/sctp/sm_make_chunk.c | 28 +- + net/sctp/sm_sideeffect.c | 12 +- + net/sctp/socket.c | 41 +- + net/sctp/transport.c | 61 +- + net/sctp/ulpqueue.c | 2 - + net/socket.c | 123 +- + net/sunrpc/auth_gss/gss_spkm3_token.c | 2 +- + net/sunrpc/bc_svc.c | 2 +- + net/sunrpc/clnt.c | 1 - + net/sunrpc/svcsock.c | 25 +- + net/sunrpc/xprt.c | 2 +- + net/sunrpc/xprtsock.c | 4 - + net/sysctl_net.c | 1 - + net/tipc/addr.c | 32 + + net/tipc/addr.h | 37 +- + net/tipc/bcast.c | 149 +- + net/tipc/bcast.h | 117 +- + net/tipc/bearer.c | 16 +- + net/tipc/bearer.h | 16 +- + net/tipc/cluster.c | 2 +- + net/tipc/config.c | 68 +- + net/tipc/core.c | 26 +- + net/tipc/core.h | 27 +- + net/tipc/discover.c | 8 +- + net/tipc/link.c | 102 +- + net/tipc/link.h | 35 + + net/tipc/msg.c | 94 + + net/tipc/msg.h | 99 +- + net/tipc/name_distr.c | 2 +- + net/tipc/name_table.c | 2 +- + net/tipc/net.c | 8 +- + net/tipc/node.c | 14 +- + net/tipc/port.c | 27 +- + net/tipc/port.h | 2 - + net/tipc/socket.c | 26 +- + net/tipc/subscr.c | 15 +- + net/unix/af_unix.c | 25 +- + net/unix/garbage.c | 13 +- + net/wimax/op-reset.c | 2 - + net/wimax/op-state-get.c | 2 - + net/wimax/stack.c | 4 +- + net/wireless/chan.c | 56 +- + net/wireless/core.c | 3 +- + net/wireless/core.h | 27 +- + net/wireless/ibss.c | 5 - + net/wireless/mlme.c | 52 +- + net/wireless/nl80211.c | 328 +- + net/wireless/nl80211.h | 6 + + net/wireless/reg.c | 6 +- + net/wireless/sme.c | 36 +- + net/wireless/util.c | 24 +- + net/wireless/wext-compat.c | 15 +- + net/wireless/wext-core.c | 134 +- + net/wireless/wext-sme.c | 2 +- + net/x25/af_x25.c | 42 +- + net/x25/x25_dev.c | 36 +- + net/x25/x25_in.c | 2 +- + net/x25/x25_out.c | 5 +- + net/xfrm/xfrm_hash.h | 9 +- + net/xfrm/xfrm_policy.c | 848 ++-- + net/xfrm/xfrm_state.c | 5 +- + net/xfrm/xfrm_user.c | 22 +- + scripts/checkpatch.pl | 11 + + scripts/mod/file2alias.c | 43 + + security/integrity/ima/ima_iint.c | 4 +- + security/selinux/hooks.c | 55 +- + security/selinux/include/objsec.h | 1 - + sound/aoa/core/gpio-pmf.c | 9 +- + sound/soc/txx9/txx9aclc.c | 7 +- + sound/usb/midi.c | 14 +- + sound/usb/misc/ua101.c | 16 +- + sound/usb/urb.c | 10 +- + tools/usb/ffs-test.c | 554 ++ + tools/usb/testusb.c | 547 ++ + virt/kvm/assigned-dev.c | 8 +- + virt/kvm/coalesced_mmio.c | 6 +- + virt/kvm/iommu.c | 4 +- + virt/kvm/kvm_main.c | 63 +- + 3976 files changed, 286339 insertions(+), 145954 deletions(-) + create mode 100644 Documentation/ABI/obsolete/sysfs-bus-usb + create mode 100644 Documentation/ABI/obsolete/sysfs-class-rfkill + create mode 100644 Documentation/ABI/stable/sysfs-class-rfkill + create mode 100644 Documentation/ABI/testing/sysfs-devices-platform-_UDC_-gadget + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-picolcd + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-prodikeys + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kone + create mode 100644 Documentation/ABI/testing/sysfs-wacom + create mode 100644 Documentation/DocBook/drm.tmpl + create mode 100644 Documentation/filesystems/sysfs-tagging.txt + create mode 100644 Documentation/kvm/cpuid.txt + create mode 100644 Documentation/kvm/mmu.txt + create mode 100644 Documentation/networking/caif/Linux-CAIF.txt + create mode 100644 Documentation/networking/caif/README + create mode 100644 Documentation/padata.txt + create mode 100644 Documentation/powerpc/dts-bindings/4xx/reboot.txt + create mode 100644 Documentation/usb/bulk-streams.txt + create mode 100644 Documentation/usb/gadget_hid.txt + create mode 100644 arch/arm/configs/omap3_stalker_lks_defconfig + create mode 100644 arch/arm/mach-omap1/ams-delta-fiq-handler.S + create mode 100644 arch/arm/mach-omap1/ams-delta-fiq.c + create mode 100644 arch/arm/mach-omap1/include/mach/ams-delta-fiq.h + create mode 100644 arch/arm/mach-omap2/board-omap3stalker.c + create mode 100644 arch/arm/mach-omap2/board-rx51-video.c + create mode 100644 arch/arm/mach-omap2/include/mach/omap4-common.h + create mode 100644 arch/arm/mach-omap2/omap-iommu.c + delete mode 100644 arch/arm/mach-omap2/omap3-iommu.c + create mode 100644 arch/arm/mach-omap2/omap4-common.c + create mode 100644 arch/arm/plat-nomadik/include/plat/ste_dma40.h + create mode 100644 arch/mips/include/asm/mach-loongson/gpio.h + create mode 100644 arch/mips/loongson/common/gpio.c + create mode 100644 arch/mips/powertv/asic/prealloc.h + create mode 100644 arch/powerpc/boot/dts/iss4xx-mpic.dts + create mode 100644 arch/powerpc/boot/dts/iss4xx.dts + create mode 100644 arch/powerpc/boot/treeboot-iss4xx.c + create mode 100644 arch/powerpc/configs/44x/iss476-smp_defconfig + copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_32.h} (53%) + copy arch/powerpc/{kvm/book3s_64_exports.c => include/asm/kvm_book3s_64.h} (64%) + rename arch/powerpc/include/asm/{kvm_book3s_64_asm.h => kvm_book3s_asm.h} (82%) + create mode 100644 arch/powerpc/include/asm/kvm_booke.h + create mode 100644 arch/powerpc/include/asm/kvm_fpu.h + create mode 100644 arch/powerpc/kvm/book3s_32_mmu_host.c + create mode 100644 arch/powerpc/kvm/book3s_32_sr.S + delete mode 100644 arch/powerpc/kvm/book3s_64_emulate.c + create mode 100644 arch/powerpc/kvm/book3s_emulate.c + rename arch/powerpc/kvm/{book3s_64_exports.c => book3s_exports.c} (100%) + rename arch/powerpc/kvm/{book3s_64_interrupts.S => book3s_interrupts.S} (62%) + create mode 100644 arch/powerpc/kvm/book3s_paired_singles.c + rename arch/powerpc/kvm/{book3s_64_rmhandlers.S => book3s_rmhandlers.S} (62%) + create mode 100644 arch/powerpc/kvm/book3s_segment.S + create mode 100644 arch/powerpc/kvm/fpu.S + create mode 100644 arch/powerpc/platforms/44x/iss4xx.c + create mode 100644 arch/powerpc/platforms/pseries/event_sources.c + create mode 100644 arch/x86/include/asm/intel_scu_ipc.h + create mode 100644 arch/x86/pci/broadcom_bus.c + create mode 100644 block/blk-lib.c + create mode 100644 drivers/char/agp/intel-agp.h + create mode 100644 drivers/char/agp/intel-gtt.c + create mode 100644 drivers/char/n_gsm.c + create mode 100644 drivers/crypto/n2_asm.S + create mode 100644 drivers/crypto/n2_core.c + create mode 100644 drivers/crypto/n2_core.h + create mode 100644 drivers/crypto/omap-sham.c + create mode 100644 drivers/dma/ste_dma40.c + create mode 100644 drivers/dma/ste_dma40_ll.c + create mode 100644 drivers/dma/ste_dma40_ll.h + create mode 100644 drivers/dma/timb_dma.c + create mode 100644 drivers/gpu/drm/nouveau/nv50_calc.c + create mode 100644 drivers/gpu/drm/radeon/evergreend.h + create mode 100644 drivers/gpu/drm/ttm/ttm_page_alloc.c + create mode 100644 drivers/hid/hid-cando.c + create mode 100644 drivers/hid/hid-egalax.c + create mode 100644 drivers/hid/hid-picolcd.c + create mode 100644 drivers/hid/hid-prodikeys.c + create mode 100644 drivers/hid/hid-roccat-kone.c + create mode 100644 drivers/hid/hid-roccat-kone.h + create mode 100644 drivers/hid/hid-zydacron.c + create mode 100644 drivers/input/serio/ams_delta_serio.c + delete mode 100644 drivers/misc/hdpuftrs/Makefile + delete mode 100644 drivers/misc/hdpuftrs/hdpu_cpustate.c + delete mode 100644 drivers/misc/hdpuftrs/hdpu_nexus.c + create mode 100644 drivers/mtd/nand/denali.c + create mode 100644 drivers/mtd/nand/denali.h + create mode 100644 drivers/mtd/nand/mpc5121_nfc.c + rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) + create mode 100644 drivers/mtd/nand/r852.c + create mode 100644 drivers/mtd/nand/r852.h + create mode 100644 drivers/mtd/nand/sm_common.c + create mode 100644 drivers/mtd/nand/sm_common.h + delete mode 100644 drivers/mtd/nand/ts7250.c + create mode 100644 drivers/mtd/onenand/samsung.c + create mode 100644 drivers/mtd/sm_ftl.c + create mode 100644 drivers/mtd/sm_ftl.h + create mode 100644 drivers/net/caif/Kconfig + create mode 100644 drivers/net/caif/Makefile + create mode 100644 drivers/net/caif/caif_serial.c + create mode 100644 drivers/net/enic/vnic_vic.c + create mode 100644 drivers/net/enic/vnic_vic.h + create mode 100644 drivers/net/irda/sh_irda.c + delete mode 100644 drivers/net/pppol2tp.c + delete mode 100644 drivers/net/stmmac/dwmac100.c + create mode 100644 drivers/net/stmmac/dwmac100_core.c + create mode 100644 drivers/net/stmmac/dwmac100_dma.c + create mode 100644 drivers/net/stmmac/enh_desc.c + create mode 100644 drivers/net/stmmac/norm_desc.c + create mode 100644 drivers/net/wireless/ath/ath5k/ani.c + create mode 100644 drivers/net/wireless/ath/ath5k/ani.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_initvals.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar5008_phy.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9001_initvals.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_calib.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_hw.c + rename drivers/net/wireless/ath/ath9k/{initvals.h => ar9002_initvals.h} (77%) + create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_mac.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9002_phy.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_calib.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_hw.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_initvals.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_mac.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9003_phy.h + create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.c + create mode 100644 drivers/net/wireless/ath/ath9k/hif_usb.h + create mode 100644 drivers/net/wireless/ath/ath9k/htc.h + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_beacon.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_init.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_main.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_txrx.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.c + create mode 100644 drivers/net/wireless/ath/ath9k/htc_hst.h + create mode 100644 drivers/net/wireless/ath/ath9k/hw-ops.h + delete mode 100644 drivers/net/wireless/ath/ath9k/phy.c + create mode 100644 drivers/net/wireless/ath/ath9k/wmi.c + create mode 100644 drivers/net/wireless/ath/ath9k/wmi.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-3945-debugfs.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-hw.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ict.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-lib.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tx.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-ucode.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn.h + create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.c + create mode 100644 drivers/net/wireless/iwmc3200wifi/trace.h + create mode 100644 drivers/net/wireless/libertas_tf/deb_defs.h + create mode 100644 drivers/net/wireless/orinoco/orinoco_usb.c + create mode 100644 drivers/net/wireless/rtl818x/Kconfig + create mode 100644 drivers/net/wireless/wl12xx/wl1271_sdio.c + delete mode 100644 drivers/net/wireless/wl12xx/wl1271_spi.h + create mode 100644 drivers/platform/x86/intel_scu_ipc.c + create mode 100644 drivers/scsi/qla2xxx/qla_bsg.c + create mode 100644 drivers/scsi/qla2xxx/qla_bsg.h + create mode 100644 drivers/scsi/qla2xxx/qla_nx.c + create mode 100644 drivers/scsi/qla2xxx/qla_nx.h + create mode 100644 drivers/scsi/scsi_trace.c + create mode 100644 drivers/serial/altera_jtaguart.c + create mode 100644 drivers/serial/altera_uart.c + create mode 100644 drivers/staging/adis16255/Kconfig + create mode 100644 drivers/staging/adis16255/Makefile + create mode 100644 drivers/staging/adis16255/adis16255.c + create mode 100644 drivers/staging/adis16255/adis16255.h + delete mode 100644 drivers/staging/arlan/Kconfig + delete mode 100644 drivers/staging/arlan/Makefile + delete mode 100644 drivers/staging/arlan/TODO + delete mode 100644 drivers/staging/arlan/arlan-main.c + delete mode 100644 drivers/staging/arlan/arlan-proc.c + delete mode 100644 drivers/staging/arlan/arlan.h + create mode 100644 drivers/staging/batman-adv/bat_sysfs.c + create mode 100644 drivers/staging/batman-adv/bat_sysfs.h + delete mode 100644 drivers/staging/batman-adv/proc.c + delete mode 100644 drivers/staging/batman-adv/proc.h + delete mode 100644 drivers/staging/comedi/comedi_ksyms.c + create mode 100644 drivers/staging/comedi/drivers/adl_pci7230.c + create mode 100644 drivers/staging/comedi/internal.h + delete mode 100644 drivers/staging/comedi/kcomedilib/data.c + delete mode 100644 drivers/staging/comedi/kcomedilib/dio.c + delete mode 100644 drivers/staging/comedi/kcomedilib/get.c + delete mode 100644 drivers/staging/comedi/kcomedilib/ksyms.c + delete mode 100644 drivers/staging/comedi/pci_ids.h + delete mode 100644 drivers/staging/comedi/wrapper.h + create mode 100644 drivers/staging/cxt1e1/Kconfig + create mode 100644 drivers/staging/cxt1e1/Makefile + create mode 100644 drivers/staging/cxt1e1/comet.c + create mode 100644 drivers/staging/cxt1e1/comet.h + create mode 100644 drivers/staging/cxt1e1/comet_tables.c + create mode 100644 drivers/staging/cxt1e1/comet_tables.h + create mode 100644 drivers/staging/cxt1e1/functions.c + create mode 100644 drivers/staging/cxt1e1/hwprobe.c + create mode 100644 drivers/staging/cxt1e1/libsbew.h + create mode 100644 drivers/staging/cxt1e1/linux.c + create mode 100644 drivers/staging/cxt1e1/musycc.c + create mode 100644 drivers/staging/cxt1e1/musycc.h + create mode 100644 drivers/staging/cxt1e1/ossiRelease.c + create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.c + create mode 100644 drivers/staging/cxt1e1/pmc93x6_eeprom.h + create mode 100644 drivers/staging/cxt1e1/pmcc4.h + create mode 100644 drivers/staging/cxt1e1/pmcc4_cpld.h + create mode 100644 drivers/staging/cxt1e1/pmcc4_defs.h + create mode 100644 drivers/staging/cxt1e1/pmcc4_drv.c + create mode 100644 drivers/staging/cxt1e1/pmcc4_ioctls.h + create mode 100644 drivers/staging/cxt1e1/pmcc4_private.h + create mode 100644 drivers/staging/cxt1e1/pmcc4_sysdep.h + create mode 100644 drivers/staging/cxt1e1/sbe_bid.h + create mode 100644 drivers/staging/cxt1e1/sbe_promformat.h + create mode 100644 drivers/staging/cxt1e1/sbecom_inline_linux.h + create mode 100644 drivers/staging/cxt1e1/sbecrc.c + create mode 100644 drivers/staging/cxt1e1/sbeid.c + create mode 100644 drivers/staging/cxt1e1/sbeproc.c + create mode 100644 drivers/staging/cxt1e1/sbeproc.h + create mode 100644 drivers/staging/cxt1e1/sbew_ioc.h + delete mode 100644 drivers/staging/dream/smd/Kconfig + delete mode 100644 drivers/staging/dream/smd/Makefile + delete mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c + delete mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c + delete mode 100644 drivers/staging/dream/smd/smd.c + delete mode 100644 drivers/staging/dream/smd/smd_private.h + delete mode 100644 drivers/staging/dream/smd/smd_qmi.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c + delete mode 100644 drivers/staging/dream/smd/smd_tty.c + create mode 100644 drivers/staging/dt3155v4l/Kconfig + create mode 100644 drivers/staging/dt3155v4l/Makefile + create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.c + create mode 100644 drivers/staging/dt3155v4l/dt3155v4l.h + rename drivers/staging/hv/{BlkVsc.c => blkvsc.c} (97%) + rename drivers/staging/hv/{Channel.c => channel.c} (88%) + rename drivers/staging/hv/{Channel.h => channel.h} (99%) + rename drivers/staging/hv/{ChannelInterface.c => channel_interface.c} (99%) + rename drivers/staging/hv/{ChannelInterface.h => channel_interface.h} (97%) + rename drivers/staging/hv/{ChannelMgmt.c => channel_mgmt.c} (79%) + rename drivers/staging/hv/{ChannelMgmt.h => channel_mgmt.h} (98%) + rename drivers/staging/hv/{Connection.c => connection.c} (97%) + rename drivers/staging/hv/{Hv.c => hv.c} (98%) + rename drivers/staging/hv/{Hv.h => hv.h} (100%) + create mode 100644 drivers/staging/hv/hv_utils.c + rename drivers/staging/hv/{NetVsc.c => netvsc.c} (95%) + rename drivers/staging/hv/{NetVsc.h => netvsc.h} (98%) + rename drivers/staging/hv/{NetVscApi.h => netvsc_api.h} (93%) + rename drivers/staging/hv/{RingBuffer.c => ring_buffer.c} (97%) + rename drivers/staging/hv/{RingBuffer.h => ring_buffer.h} (100%) + rename drivers/staging/hv/{RndisFilter.c => rndis_filter.c} (96%) + rename drivers/staging/hv/{RndisFilter.h => rndis_filter.h} (98%) + rename drivers/staging/hv/{StorVsc.c => storvsc.c} (96%) + rename drivers/staging/hv/{StorVscApi.h => storvsc_api.h} (99%) + create mode 100644 drivers/staging/hv/utils.h + rename drivers/staging/hv/{VersionInfo.h => version_info.h} (88%) + rename drivers/staging/hv/{Vmbus.c => vmbus.c} (97%) + rename drivers/staging/hv/{VmbusApi.h => vmbus_api.h} (86%) + rename drivers/staging/hv/{VmbusChannelInterface.h => vmbus_channel_interface.h} (100%) + rename drivers/staging/hv/{VmbusPacketFormat.h => vmbus_packet_format.h} (99%) + rename drivers/staging/hv/{VmbusPrivate.h => vmbus_private.h} (95%) + create mode 100644 drivers/staging/iio/Documentation/sysfs-class-iio + create mode 100644 drivers/staging/iio/accel/adis16209.h + create mode 100644 drivers/staging/iio/accel/adis16209_core.c + create mode 100644 drivers/staging/iio/accel/adis16209_ring.c + create mode 100644 drivers/staging/iio/accel/adis16209_trigger.c + create mode 100644 drivers/staging/iio/accel/adis16220.h + create mode 100644 drivers/staging/iio/accel/adis16220_core.c + create mode 100644 drivers/staging/iio/accel/adis16240.h + create mode 100644 drivers/staging/iio/accel/adis16240_core.c + create mode 100644 drivers/staging/iio/accel/adis16240_ring.c + create mode 100644 drivers/staging/iio/accel/adis16240_trigger.c + create mode 100644 drivers/staging/iio/accel/inclinometer.h + create mode 100644 drivers/staging/iio/gyro/Kconfig + create mode 100644 drivers/staging/iio/gyro/Makefile + create mode 100644 drivers/staging/iio/gyro/adis16260.h + create mode 100644 drivers/staging/iio/gyro/adis16260_core.c + create mode 100644 drivers/staging/iio/gyro/adis16260_ring.c + create mode 100644 drivers/staging/iio/gyro/adis16260_trigger.c + create mode 100644 drivers/staging/iio/gyro/gyro.h + create mode 100644 drivers/staging/iio/imu/Kconfig + create mode 100644 drivers/staging/iio/imu/Makefile + create mode 100644 drivers/staging/iio/imu/adis16300.h + create mode 100644 drivers/staging/iio/imu/adis16300_core.c + create mode 100644 drivers/staging/iio/imu/adis16300_ring.c + create mode 100644 drivers/staging/iio/imu/adis16300_trigger.c + create mode 100644 drivers/staging/iio/imu/adis16350.h + create mode 100644 drivers/staging/iio/imu/adis16350_core.c + create mode 100644 drivers/staging/iio/imu/adis16350_ring.c + create mode 100644 drivers/staging/iio/imu/adis16350_trigger.c + create mode 100644 drivers/staging/iio/imu/adis16400.h + create mode 100644 drivers/staging/iio/imu/adis16400_core.c + create mode 100644 drivers/staging/iio/imu/adis16400_ring.c + create mode 100644 drivers/staging/iio/imu/adis16400_trigger.c + create mode 100644 drivers/staging/iio/magnetometer/magnet.h + create mode 100644 drivers/staging/memrar/Kconfig + create mode 100644 drivers/staging/memrar/Makefile + create mode 100644 drivers/staging/memrar/TODO + create mode 100644 drivers/staging/memrar/memrar-abi + create mode 100644 drivers/staging/memrar/memrar.h + create mode 100644 drivers/staging/memrar/memrar_allocator.c + create mode 100644 drivers/staging/memrar/memrar_allocator.h + create mode 100644 drivers/staging/memrar/memrar_handler.c + delete mode 100644 drivers/staging/netwave/Kconfig + delete mode 100644 drivers/staging/netwave/Makefile + delete mode 100644 drivers/staging/netwave/TODO + delete mode 100644 drivers/staging/netwave/netwave_cs.c + delete mode 100644 drivers/staging/poch/Kconfig + delete mode 100644 drivers/staging/poch/Makefile + delete mode 100644 drivers/staging/poch/README + delete mode 100644 drivers/staging/poch/poch.c + delete mode 100644 drivers/staging/poch/poch.h + delete mode 100644 drivers/staging/ramzswap/TODO + delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.c + delete mode 100644 drivers/staging/rtl8192su/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8192su/r8192SU_led.c + create mode 100644 drivers/staging/rtl8192su/r8192SU_led.h + delete mode 100644 drivers/staging/strip/Kconfig + delete mode 100644 drivers/staging/strip/Makefile + delete mode 100644 drivers/staging/strip/TODO + delete mode 100644 drivers/staging/strip/strip.c + create mode 100644 drivers/staging/ti-st/Kconfig + create mode 100644 drivers/staging/ti-st/Makefile + create mode 100644 drivers/staging/ti-st/TODO + create mode 100644 drivers/staging/ti-st/bt_drv.c + create mode 100644 drivers/staging/ti-st/bt_drv.h + create mode 100644 drivers/staging/ti-st/fm.h + create mode 100644 drivers/staging/ti-st/st.h + create mode 100644 drivers/staging/ti-st/st_core.c + create mode 100644 drivers/staging/ti-st/st_core.h + create mode 100644 drivers/staging/ti-st/st_kim.c + create mode 100644 drivers/staging/ti-st/st_kim.h + create mode 100644 drivers/staging/ti-st/st_ll.c + create mode 100644 drivers/staging/ti-st/st_ll.h + create mode 100644 drivers/staging/ti-st/sysfs-uim + delete mode 100644 drivers/staging/wavelan/Kconfig + delete mode 100644 drivers/staging/wavelan/Makefile + delete mode 100644 drivers/staging/wavelan/TODO + delete mode 100644 drivers/staging/wavelan/i82586.h + delete mode 100644 drivers/staging/wavelan/wavelan.c + delete mode 100644 drivers/staging/wavelan/wavelan.h + delete mode 100644 drivers/staging/wavelan/wavelan.p.h + delete mode 100644 drivers/staging/wavelan/wavelan_cs.c + delete mode 100644 drivers/staging/wavelan/wavelan_cs.h + delete mode 100644 drivers/staging/wavelan/wavelan_cs.p.h + rename drivers/staging/winbond/{README => TODO} (79%) + create mode 100644 drivers/usb/gadget/f_fs.c + create mode 100644 drivers/usb/gadget/f_hid.c + create mode 100644 drivers/usb/gadget/f_uvc.c + create mode 100644 drivers/usb/gadget/f_uvc.h + rename drivers/usb/gadget/{fsl_mx3_udc.c => fsl_mxc_udc.c} (89%) + create mode 100644 drivers/usb/gadget/g_ffs.c + create mode 100644 drivers/usb/gadget/hid.c + create mode 100644 drivers/usb/gadget/uvc.h + create mode 100644 drivers/usb/gadget/uvc_queue.c + create mode 100644 drivers/usb/gadget/uvc_queue.h + create mode 100644 drivers/usb/gadget/uvc_v4l2.c + create mode 100644 drivers/usb/gadget/uvc_video.c + create mode 100644 drivers/usb/gadget/webcam.c + create mode 100644 drivers/usb/host/ohci-omap3.c + create mode 100644 drivers/usb/musb/musb_debugfs.c + delete mode 100644 drivers/usb/serial/ipaq.h + create mode 100644 drivers/usb/serial/usb-wwan.h + create mode 100644 drivers/usb/serial/usb_wwan.c + create mode 100644 drivers/usb/serial/zio.c + create mode 100644 drivers/video/omap2/displays/panel-acx565akm.c + create mode 100644 drivers/video/via/via-core.c + create mode 100644 drivers/video/via/via-gpio.c + create mode 100644 drivers/video/via/via_modesetting.c + copy drivers/video/via/{via_i2c.h => via_modesetting.h} (53%) + create mode 100644 firmware/bnx2/bnx2-mips-09-5.0.0.j15.fw.ihex + delete mode 100644 firmware/bnx2/bnx2-mips-09-5.0.0.j9.fw.ihex + create mode 100644 fs/ocfs2/reservations.c + create mode 100644 fs/ocfs2/reservations.h + create mode 100644 fs/statfs.c + rename drivers/gpu/drm/radeon/radeon_fixed.h => include/drm/drm_fixed.h (60%) + create mode 100644 include/drm/ttm/ttm_page_alloc.h + create mode 100644 include/linux/altera_jtaguart.h + create mode 100644 include/linux/altera_uart.h + create mode 100644 include/linux/caif/caif_socket.h + create mode 100644 include/linux/caif/if_caif.h + create mode 100644 include/linux/gsmmux.h + delete mode 100644 include/linux/hdpu_features.h + create mode 100644 include/linux/if_x25.h + create mode 100644 include/linux/kdb.h + create mode 100644 include/linux/ks8842.h + create mode 100644 include/linux/l2tp.h + create mode 100644 include/linux/msm_mdp.h + create mode 100644 include/linux/netfilter/xt_TEE.h + create mode 100644 include/linux/timb_dma.h + rename drivers/usb/core/hub.h => include/linux/usb/ch11.h (72%) + create mode 100644 include/linux/usb/functionfs.h + create mode 100644 include/linux/usb/g_hid.h + rename {drivers/usb/core => include/linux/usb}/hcd.h (89%) + create mode 100644 include/linux/usb/ncm.h + create mode 100644 include/linux/via-core.h + create mode 100644 include/linux/via-gpio.h + rename {drivers/video/via => include/linux}/via_i2c.h (65%) + create mode 100644 include/net/caif/caif_dev.h + create mode 100644 include/net/caif/caif_device.h + create mode 100644 include/net/caif/caif_layer.h + create mode 100644 include/net/caif/cfcnfg.h + create mode 100644 include/net/caif/cfctrl.h + create mode 100644 include/net/caif/cffrml.h + create mode 100644 include/net/caif/cfmuxl.h + create mode 100644 include/net/caif/cfpkt.h + create mode 100644 include/net/caif/cfserl.h + create mode 100644 include/net/caif/cfsrvl.h + create mode 100644 include/net/mld.h + create mode 100644 include/trace/events/scsi.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 + create mode 100644 net/caif/Kconfig + create mode 100644 net/caif/Makefile + create mode 100644 net/caif/caif_config_util.c + create mode 100644 net/caif/caif_dev.c + create mode 100644 net/caif/caif_socket.c + create mode 100644 net/caif/cfcnfg.c + create mode 100644 net/caif/cfctrl.c + create mode 100644 net/caif/cfdbgl.c + create mode 100644 net/caif/cfdgml.c + create mode 100644 net/caif/cffrml.c + create mode 100644 net/caif/cfmuxl.c + create mode 100644 net/caif/cfpkt_skbuff.c + create mode 100644 net/caif/cfrfml.c + create mode 100644 net/caif/cfserl.c + create mode 100644 net/caif/cfsrvl.c + create mode 100644 net/caif/cfutill.c + create mode 100644 net/caif/cfveil.c + create mode 100644 net/caif/cfvidl.c + create mode 100644 net/caif/chnl_net.c + create mode 100644 net/core/dev_addr_lists.c + delete mode 100644 net/core/dev_mcast.c + create mode 100644 net/l2tp/Kconfig + create mode 100644 net/l2tp/Makefile + create mode 100644 net/l2tp/l2tp_core.c + create mode 100644 net/l2tp/l2tp_core.h + create mode 100644 net/l2tp/l2tp_debugfs.c + create mode 100644 net/l2tp/l2tp_eth.c + create mode 100644 net/l2tp/l2tp_ip.c + create mode 100644 net/l2tp/l2tp_netlink.c + create mode 100644 net/l2tp/l2tp_ppp.c + create mode 100644 net/mac80211/chan.c + delete mode 100644 net/netfilter/xt_CONNMARK.c + delete mode 100644 net/netfilter/xt_MARK.c + create mode 100644 net/netfilter/xt_TEE.c + create mode 100644 net/sctp/probe.c + create mode 100644 tools/usb/ffs-test.c + create mode 100644 tools/usb/testusb.c +Merging fixes/fixes +$ git merge fixes/fixes +Updating f4b87de..7b2762f +Fast-forward + arch/arm/mach-vexpress/ct-ca9x4.c | 1 + + drivers/hid/hid-roccat-kone.c | 24 ++++++++++++------------ + drivers/net/wireless/ath/ath9k/htc.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 1 + + drivers/rtc/rtc-davinci.c | 1 + + drivers/staging/tm6000/tm6000-alsa.c | 1 + + drivers/staging/tm6000/tm6000-cards.c | 1 + + drivers/staging/tm6000/tm6000-core.c | 1 + + drivers/staging/tm6000/tm6000-dvb.c | 1 + + fs/ocfs2/reservations.c | 1 - + 10 files changed, 20 insertions(+), 13 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/mach-mx2/devices.c | 4 ++-- + arch/arm/mm/cache-v7.S | 4 ++++ + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging net/core/dev.c +Auto-merging net/core/skbuff.c +Merge made by recursive. + drivers/net/can/sja1000/sja1000.c | 2 + + drivers/net/ixgbe/ixgbe.h | 3 + + drivers/net/ixgbe/ixgbe_82598.c | 1 + + drivers/net/ixgbe/ixgbe_82599.c | 1 + + drivers/net/ixgbe/ixgbe_main.c | 69 +++++++++++++++++++++++++++++ + drivers/net/ixgbe/ixgbe_phy.c | 30 ++++++++++++ + drivers/net/ixgbe/ixgbe_phy.h | 3 + + drivers/net/ixgbe/ixgbe_type.h | 4 ++ + drivers/net/sh_eth.c | 3 + + include/linux/netdevice.h | 14 +++++- + include/linux/netfilter/x_tables.h | 2 +- + include/net/netfilter/nf_conntrack_core.h | 2 +- + net/core/dev.c | 28 ++++++----- + net/core/skbuff.c | 1 + + net/netfilter/nf_conntrack_core.c | 10 ++++ + net/netfilter/nf_conntrack_sip.c | 12 ++--- + 16 files changed, 159 insertions(+), 26 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/ath5k/base.c | 7 ++++--- + drivers/net/wireless/ath/ath9k/pci.c | 1 - + drivers/net/wireless/ath/ath9k/recv.c | 14 +++++++++----- + drivers/net/wireless/iwlwifi/iwl-scan.c | 21 ++++++++++++++++++--- + drivers/net/wireless/rndis_wlan.c | 16 ++++++++++------ + drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_rx.c | 2 ++ + net/wireless/chan.c | 2 +- + net/wireless/nl80211.c | 6 ++++-- + net/wireless/scan.c | 4 ++-- + 10 files changed, 51 insertions(+), 24 deletions(-) +Merging kbuild-current/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + Documentation/devices.txt | 2 ++ + arch/x86/kernel/microcode_core.c | 1 + + drivers/net/ppp_generic.c | 4 ++-- + drivers/net/tun.c | 1 + + fs/autofs4/dev-ioctl.c | 5 ++++- + fs/btrfs/super.c | 5 ++++- + fs/fuse/dev.c | 1 + + include/linux/miscdevice.h | 2 ++ + 8 files changed, 17 insertions(+), 4 deletions(-) +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Auto-merging include/linux/ide.h +Merge made by recursive. + drivers/ide/cmd640.c | 6 ++---- + drivers/ide/ide_platform.c | 1 + + drivers/ide/pdc202xx_old.c | 5 +++-- + include/linux/ide.h | 4 ++-- + 4 files changed, 8 insertions(+), 8 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. + arch/arm/include/asm/hardirq.h | 4 +++- + arch/arm/mach-nomadik/clock.c | 1 + + drivers/char/hw_random/nomadik-rng.c | 17 +++++++++++++++++ + 3 files changed, 21 insertions(+), 1 deletions(-) +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/mach-mx2/devices.c +Auto-merging arch/arm/mach-mx3/mach-pcm037.c +Auto-merging arch/arm/mach-mx5/clock-mx51.c +Auto-merging drivers/mtd/nand/mxc_nand.c +Merge made by recursive. + arch/arm/configs/mx51_defconfig | 17 ++- + arch/arm/mach-mx2/devices.c | 9 +- + arch/arm/mach-mx2/mach-pca100.c | 1 + + arch/arm/mach-mx2/mach-pcm038.c | 1 + + arch/arm/mach-mx25/devices.c | 15 ++ + arch/arm/mach-mx25/devices.h | 1 + + arch/arm/mach-mx3/Kconfig | 1 + + arch/arm/mach-mx3/devices.c | 40 +++++- + arch/arm/mach-mx3/devices.h | 2 + + arch/arm/mach-mx3/mach-mx31_3ds.c | 87 ++++++++++ + arch/arm/mach-mx3/mach-mx31lilly.c | 145 +++++++++++++++++ + arch/arm/mach-mx3/mach-mx31moboard.c | 104 +++++-------- + arch/arm/mach-mx3/mach-pcm037.c | 1 + + arch/arm/mach-mx3/mach-pcm043.c | 1 + + arch/arm/mach-mx3/mx31lite-db.c | 1 + + arch/arm/mach-mx3/mx31moboard-devboard.c | 9 + + arch/arm/mach-mx3/mx31moboard-marxbot.c | 8 + + arch/arm/mach-mx3/mx31moboard-smartbot.c | 53 ++++++- + arch/arm/mach-mx5/board-mx51_babbage.c | 167 ++++++++++++++++++++ + arch/arm/mach-mx5/clock-mx51.c | 45 ++++++ + arch/arm/mach-mx5/devices.c | 109 +++++++++++++- + arch/arm/mach-mx5/devices.h | 4 + + arch/arm/plat-mxc/ehci.c | 100 ++++++++++++- + arch/arm/plat-mxc/gpio.c | 5 +- + arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 3 +- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 17 ++ + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 34 +++-- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 14 ++- + arch/arm/plat-mxc/time.c | 46 +++--- + arch/arm/plat-mxc/tzic.c | 4 +- + drivers/mmc/core/sdio.c | 6 + + drivers/mmc/host/mxcmmc.c | 114 ++++++++++++-- + drivers/usb/host/ehci-mxc.c | 4 +- + include/linux/mmc/host.h | 3 + + 34 files changed, 1027 insertions(+), 144 deletions(-) +Merging msm/for-next +$ git merge msm/for-next +Merge made by recursive. + arch/arm/mach-msm/dma.c | 1 + + drivers/serial/msm_serial.c | 21 ++------------- + drivers/serial/msm_serial.h | 56 +++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 60 insertions(+), 18 deletions(-) +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + drivers/watchdog/Kconfig | 14 ++++++++++---- + drivers/watchdog/s3c2410_wdt.c | 3 +-- + 2 files changed, 11 insertions(+), 6 deletions(-) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v10/drivers/ds1302.c | 20 +++++++++++++++----- + arch/cris/arch-v10/drivers/pcf8563.c | 19 +++++++++++++++---- + arch/cris/arch-v32/drivers/i2c.c | 22 ++++++++++++++-------- + arch/cris/arch-v32/drivers/pcf8563.c | 21 ++++++++++++++++----- + 4 files changed, 60 insertions(+), 22 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Recorded preimage for 'include/linux/mod_devicetable.h' +Recorded preimage for 'scripts/mod/file2alias.c' +Auto-merging drivers/base/platform.c +Auto-merging drivers/char/serial167.c +Auto-merging drivers/net/a2065.c +Auto-merging drivers/net/ariadne.c +Auto-merging drivers/net/mac8390.c +Auto-merging drivers/net/zorro8390.c +Auto-merging drivers/zorro/zorro-sysfs.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Auto-merging scripts/mod/file2alias.c +CONFLICT (content): Merge conflict in scripts/mod/file2alias.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/mod_devicetable.h'. +Recorded resolution for 'scripts/mod/file2alias.c'. +[master 208bef9] Merge remote branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/mac8390.c | 44 ++++++++++++++++++++++---------------------- + 1 files changed, 22 insertions(+), 22 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/m520xsim.h | 4 + + arch/m68k/include/asm/m523xsim.h | 8 + + arch/m68k/include/asm/m5249sim.h | 6 +- + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 67 +--------- + arch/m68k/include/asm/m532xsim.h | 1 + + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ + arch/m68knommu/Kconfig | 4 + + arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ + arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ + arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ + arch/m68knommu/platform/5272/intc.c | 39 +++++- + arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ + arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ + arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ + arch/m68knommu/platform/68328/ints.c | 8 +- + arch/m68knommu/platform/68360/ints.c | 8 +- + arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- + arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- + arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- + 20 files changed, 1249 insertions(+), 102 deletions(-) + create mode 100644 arch/m68k/include/asm/mcfqspi.h +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/system.h +Merge made by recursive. + arch/microblaze/Kconfig | 30 +++ + arch/microblaze/include/asm/elf.h | 2 +- + arch/microblaze/include/asm/exceptions.h | 5 + + arch/microblaze/include/asm/page.h | 12 +- + arch/microblaze/include/asm/system.h | 1 - + arch/microblaze/include/asm/uaccess.h | 4 +- + arch/microblaze/include/asm/unwind.h | 29 +++ + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/cpu/mb.c | 1 + + arch/microblaze/kernel/entry-nommu.S | 28 +++ + arch/microblaze/kernel/entry.S | 27 ++ + arch/microblaze/kernel/head.S | 4 +- + arch/microblaze/kernel/hw_exception_handler.S | 4 +- + arch/microblaze/kernel/stacktrace.c | 44 +--- + arch/microblaze/kernel/traps.c | 91 +++---- + arch/microblaze/kernel/unwind.c | 318 +++++++++++++++++++++++++ + arch/microblaze/kernel/vmlinux.lds.S | 12 +- + 17 files changed, 506 insertions(+), 108 deletions(-) + create mode 100644 arch/microblaze/include/asm/unwind.h + create mode 100644 arch/microblaze/kernel/unwind.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +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 +Merge made by recursive. + arch/powerpc/boot/4xx.c | 12 +- + arch/powerpc/boot/dts/icon.dts | 447 ++++++++++ + arch/powerpc/boot/dts/katmai.dts | 1 + + arch/powerpc/boot/dts/redwood.dts | 122 +++ + arch/powerpc/configs/44x/icon_defconfig | 1316 ++++++++++++++++++++++++++++ + arch/powerpc/platforms/44x/Kconfig | 11 + + arch/powerpc/platforms/44x/ppc44x_simple.c | 3 +- + arch/powerpc/sysdev/ppc4xx_pci.c | 119 +++ + arch/powerpc/sysdev/ppc4xx_pci.h | 58 ++ + 9 files changed, 2082 insertions(+), 7 deletions(-) + create mode 100644 arch/powerpc/boot/dts/icon.dts + create mode 100644 arch/powerpc/configs/44x/icon_defconfig +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Auto-merging drivers/serial/mpc52xx_uart.c +Merge made by recursive. + arch/powerpc/platforms/512x/Kconfig | 13 +-- + drivers/serial/mpc52xx_uart.c | 145 ++++++++++++++++++++++++++++------- + 2 files changed, 120 insertions(+), 38 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 7 --- + arch/s390/include/asm/atomic.h | 19 +++++++ + arch/s390/include/asm/ccwdev.h | 10 ++++ + arch/s390/kernel/asm-offsets.c | 4 +- + arch/s390/kernel/kprobes.c | 3 + + arch/s390/kernel/setup.c | 2 +- + arch/s390/mm/cmm.c | 109 ++++++++++++++-------------------------- + drivers/s390/block/dasd.c | 23 ++++++++ + drivers/s390/block/dasd_eckd.c | 1 + + drivers/s390/block/dasd_int.h | 1 + + drivers/s390/cio/ccwgroup.c | 7 +++ + drivers/s390/cio/ccwreq.c | 15 ++++++ + drivers/s390/cio/ioasm.h | 15 ------ + 13 files changed, 120 insertions(+), 96 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 1 - + arch/sh/kernel/dwarf.c | 4 ++++ + 2 files changed, 4 insertions(+), 1 deletions(-) +Merging genesis/master +$ git merge genesis/master +Auto-merging MAINTAINERS +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/shdma.c +Merge made by recursive. + MAINTAINERS | 3 +- + arch/arm/configs/ap4evb_defconfig | 71 ++++- + arch/arm/configs/g3evm_defconfig | 73 ++++- + arch/arm/configs/g4evm_defconfig | 72 ++++- + arch/arm/mach-shmobile/Kconfig | 10 + + arch/arm/mach-shmobile/Makefile | 4 +- + arch/arm/mach-shmobile/board-ap4evb.c | 122 ++++++++- + arch/arm/mach-shmobile/board-g3evm.c | 33 ++ + arch/arm/mach-shmobile/board-g4evm.c | 127 ++++++++ + arch/arm/mach-shmobile/clock-sh7367.c | 36 +--- + arch/arm/mach-shmobile/clock-sh7372.c | 387 +++++++++++++++++++++++++ + arch/arm/mach-shmobile/clock.c | 44 +++ + arch/arm/mach-shmobile/include/mach/common.h | 3 + + arch/arm/mach-shmobile/include/mach/irqs.h | 6 + + arch/arm/mach-shmobile/include/mach/memory.h | 3 + + arch/arm/mach-shmobile/include/mach/vmalloc.h | 3 +- + arch/arm/mach-shmobile/intc-sh7367.c | 178 +++++++++++- + arch/arm/mach-shmobile/intc-sh7372.c | 232 ++++++++++++++- + arch/arm/mach-shmobile/intc-sh7377.c | 300 +++++++++++++++++++- + arch/arm/mach-shmobile/setup-sh7372.c | 55 +++- + drivers/dma/Kconfig | 2 +- + drivers/dma/shdma.c | 8 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-sh_mobile.c | 121 ++++++--- + drivers/sh/Makefile | 5 +- + include/linux/serial_sci.h | 2 +- + 26 files changed, 1754 insertions(+), 148 deletions(-) + create mode 100644 arch/arm/mach-shmobile/clock-sh7372.c + create mode 100644 arch/arm/mach-shmobile/clock.c +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/kernel/time.c +Merge made by recursive. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 7 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/cacheflush.h | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/elf.h | 1 + + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/pgalloc.h | 1 + + arch/xtensa/include/asm/processor.h | 1 - + arch/xtensa/include/asm/ptrace.h | 2 + + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 8 +- + arch/xtensa/kernel/asm-offsets.c | 1 + + arch/xtensa/kernel/entry.S | 1 + + arch/xtensa/kernel/head.S | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/iss/network.c | 22 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 24 files changed, 553 insertions(+), 50 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/super.c +Merge made by recursive. + fs/ceph/Kconfig | 10 + + fs/ceph/Makefile | 2 + + fs/ceph/README | 1 + + fs/ceph/addr.c | 11 +- + fs/ceph/auth.c | 9 +- + fs/ceph/auth.h | 2 + + fs/ceph/auth_none.c | 1 + + fs/ceph/auth_x.c | 19 +- + fs/ceph/caps.c | 24 +- + fs/ceph/ceph_fs.h | 62 ++- + fs/ceph/ceph_strings.c | 16 +- + fs/ceph/debugfs.c | 24 +- + fs/ceph/dir.c | 45 +- + fs/ceph/export.c | 14 +- + fs/ceph/file.c | 62 ++- + fs/ceph/inode.c | 97 ++-- + fs/ceph/ioctl.c | 2 +- + fs/ceph/mds_client.c | 385 +++++++---- + fs/ceph/mds_client.h | 6 +- + fs/ceph/messenger.c | 279 ++++++--- + fs/ceph/messenger.h | 13 +- + fs/ceph/mon_client.c | 396 ++++++++--- + fs/ceph/mon_client.h | 32 +- + fs/ceph/msgpool.c | 180 +---- + fs/ceph/msgpool.h | 12 +- + fs/ceph/msgr.h | 21 +- + fs/ceph/osd_client.c | 301 +++++---- + fs/ceph/osd_client.h | 30 + + fs/ceph/osdmap.c | 13 + + fs/ceph/osdmap.h | 2 + + fs/ceph/pagelist.c | 2 +- + fs/ceph/rados.h | 23 +- + fs/ceph/rbd.c | 1803 ++++++++++++++++++++++++++++++++++++++++++++++++ + fs/ceph/rbd.h | 8 + + fs/ceph/rbd_types.h | 48 ++ + fs/ceph/snap.c | 2 +- + fs/ceph/super.c | 312 ++++++--- + fs/ceph/super.h | 64 ++- + fs/ceph/xattr.c | 35 +- + 39 files changed, 3478 insertions(+), 890 deletions(-) + create mode 100644 fs/ceph/rbd.c + create mode 100644 fs/ceph/rbd.h + create mode 100644 fs/ceph/rbd_types.h +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Recorded preimage for 'fs/ecryptfs/main.c' +Auto-merging fs/ecryptfs/main.c +CONFLICT (content): Merge conflict in fs/ecryptfs/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ecryptfs/main.c'. +[master 37fe71b] Merge remote branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. +Merging ext3/for_next +$ git merge ext3/for_next +Recorded preimage for 'fs/super.c' +Auto-merging drivers/staging/pohmelfs/inode.c +Auto-merging fs/quota/quota.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging fs/udf/ialloc.c +Auto-merging fs/udf/namei.c +Auto-merging fs/ufs/ialloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/super.c'. +[master a80658f] Merge remote branch 'ext3/for_next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/pohmelfs/inode.c | 8 -- + fs/ext2/super.c | 20 +++++ + fs/ext3/super.c | 38 ++++++---- + fs/ext4/super.c | 37 ++++++---- + fs/jfs/super.c | 16 ++++ + fs/ocfs2/super.c | 50 ++++++------- + fs/quota/dquot.c | 142 +++++++++++++++++-------------------- + fs/quota/quota.c | 4 +- + fs/reiserfs/super.c | 48 ++++++++----- + fs/super.c | 13 +--- + fs/udf/balloc.c | 43 +----------- + fs/udf/file.c | 26 +------- + fs/udf/ialloc.c | 21 +----- + fs/udf/inode.c | 5 -- + fs/udf/namei.c | 20 ----- + fs/udf/super.c | 13 ++-- + fs/udf/udfdecl.h | 1 - + fs/ufs/balloc.c | 24 ------- + fs/ufs/file.c | 3 +- + fs/ufs/ialloc.c | 13 ---- + fs/ufs/inode.c | 4 - + fs/ufs/namei.c | 16 ---- + fs/ufs/super.c | 110 +----------------------------- + fs/ufs/truncate.c | 10 --- + include/linux/quota.h | 4 +- + include/linux/quotaops.h | 79 ++++++++++------------ + 26 files changed, 255 insertions(+), 513 deletions(-) +Merging ext4/next +$ git merge ext4/next +Recorded preimage for 'fs/ext4/super.c' +Recorded preimage for 'include/linux/quotaops.h' +Resolved 'fs/ext4/fsync.c' using previous resolution. +Auto-merging fs/ext4/fsync.c +CONFLICT (content): Merge conflict in fs/ext4/fsync.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/quota/dquot.c +Auto-merging include/linux/quotaops.h +CONFLICT (content): Merge conflict in include/linux/quotaops.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ext4/super.c'. +Recorded resolution for 'include/linux/quotaops.h'. +[master f8f654b] Merge remote branch 'ext4/next' +$ git diff -M --stat --summary HEAD^.. + fs/ext4/balloc.c | 5 +- + fs/ext4/ext4.h | 1 + + fs/ext4/extents.c | 87 ++++++++++++++++++++++++++++---------- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 81 ++++++++++++++++------------------- + fs/ext4/inode.c | 83 +++++++++++++++--------------------- + fs/ext4/ioctl.c | 2 + + fs/ext4/mballoc.c | 105 +++++++++++++++++++++++++++++++--------------- + fs/ext4/move_extent.c | 1 + + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 75 ++++++++++++++++++--------------- + fs/ext4/symlink.c | 2 + + fs/jbd2/transaction.c | 5 +-- + fs/quota/dquot.c | 11 +++-- + include/linux/quotaops.h | 37 +++++++++++----- + 15 files changed, 294 insertions(+), 206 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/dir.c | 28 ++++++++++++---------------- + fs/fat/fat.h | 4 ++-- + fs/fat/file.c | 19 ++++++++++++++++--- + fs/fat/inode.c | 6 ++---- + 4 files changed, 32 insertions(+), 25 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Auto-merging fs/gfs2/acl.c +Auto-merging fs/gfs2/rgrp.c +Merge made by recursive. + fs/gfs2/acl.c | 4 ++++ + fs/gfs2/inode.c | 54 +++++++++++++++++++++++++++++------------------------- + fs/gfs2/inode.h | 3 +-- + fs/gfs2/log.c | 2 +- + fs/gfs2/log.h | 29 +++++++++++------------------ + fs/gfs2/rgrp.c | 20 ++++++++++++-------- + 6 files changed, 58 insertions(+), 54 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/logfs.h +Merge made by recursive. + fs/logfs/dir.c | 2 +- + fs/logfs/file.c | 6 +++--- + fs/logfs/logfs.h | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Merge made by recursive. + fs/squashfs/Kconfig | 11 ++ + fs/squashfs/Makefile | 2 + + fs/squashfs/inode.c | 92 +++++++++++- + fs/squashfs/namei.c | 6 +- + fs/squashfs/squashfs.h | 12 ++- + fs/squashfs/squashfs_fs.h | 76 ++++++++++- + fs/squashfs/squashfs_fs_i.h | 3 + + fs/squashfs/squashfs_fs_sb.h | 3 + + fs/squashfs/super.c | 30 +++-- + fs/squashfs/symlink.c | 11 ++ + fs/squashfs/xattr.c | 319 ++++++++++++++++++++++++++++++++++++++++++ + fs/squashfs/xattr.h | 46 ++++++ + fs/squashfs/xattr_id.c | 100 +++++++++++++ + 13 files changed, 692 insertions(+), 19 deletions(-) + create mode 100644 fs/squashfs/xattr.c + create mode 100644 fs/squashfs/xattr.h + create mode 100644 fs/squashfs/xattr_id.c +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Auto-merging fs/9p/vfs_inode.c +Merge made by recursive. + fs/9p/v9fs_vfs.h | 2 + + fs/9p/vfs_dir.c | 8 +++++ + fs/9p/vfs_file.c | 11 ++++++ + fs/9p/vfs_inode.c | 78 ++++++++++++++++++++++++++++++++++++++++------ + fs/9p/vfs_super.c | 55 ++++++++++++++++++++++++++++++++- + include/net/9p/9p.h | 33 ++++++++++++++++++++ + include/net/9p/client.h | 2 + + net/9p/client.c | 70 +++++++++++++++++++++++++++++++++++++++++- + net/9p/protocol.c | 6 ++- + 9 files changed, 249 insertions(+), 16 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/misc/eeprom/at24.c +Merge made by recursive. +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/plat-omap/i2c.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/plat-omap/i2c.c +CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c +Auto-merging drivers/i2c/busses/i2c-ibm_iic.c +Auto-merging drivers/i2c/busses/i2c-pxa.c +Auto-merging drivers/i2c/busses/i2c-s3c2410.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7870731] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/dme1737 | 51 ++++- + Documentation/hwmon/lm63 | 7 + + Documentation/hwmon/ltc4245 | 4 +- + Documentation/hwmon/sysfs-interface | 13 +- + Documentation/hwmon/tmp102 | 26 +++ + drivers/acpi/osl.c | 9 + + drivers/hwmon/Kconfig | 31 +++- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1031.c | 68 +++++++- + drivers/hwmon/applesmc.c | 186 +++++++++++++++++++- + drivers/hwmon/asus_atk0110.c | 7 + + drivers/hwmon/dme1737.c | 328 +++++++++++++++++++++++----------- + drivers/hwmon/emc1403.c | 344 +++++++++++++++++++++++++++++++++++ + drivers/hwmon/f71882fg.c | 170 +++++++++++++----- + drivers/hwmon/lm63.c | 16 ++- + drivers/hwmon/lm90.c | 3 +- + drivers/hwmon/ltc4245.c | 18 +-- + drivers/hwmon/tmp102.c | 321 ++++++++++++++++++++++++++++++++ + drivers/hwmon/tmp401.c | 255 +++++++++++++------------- + include/linux/acpi.h | 2 + + 20 files changed, 1539 insertions(+), 322 deletions(-) + create mode 100644 Documentation/hwmon/tmp102 + create mode 100644 drivers/hwmon/emc1403.c + create mode 100644 drivers/hwmon/tmp102.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merging MAINTAINERS +Auto-merging drivers/message/fusion/mptscsih.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_scan.c +Merge made by recursive. + .mailmap | 2 +- + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/DocBook/scsi.tmpl | 2 +- + Documentation/SubmitChecklist | 12 ++ + Documentation/development-process/2.Process | 29 +++-- + Documentation/development-process/7.AdvancedTopics | 2 +- + Documentation/scsi/scsi-generic.txt | 30 +++--- + Documentation/scsi/scsi.txt | 22 ++-- + Documentation/scsi/scsi_mid_low_api.txt | 130 ++++++++++---------- + Documentation/timers/hpet_example.c | 2 - + Documentation/vm/map_hugetlb.c | 2 +- + MAINTAINERS | 2 +- + drivers/message/fusion/mptscsih.c | 6 +- + drivers/scsi/Kconfig | 4 +- + drivers/scsi/scsi_scan.c | 26 ++--- + include/scsi/sg.h | 19 ++-- + 16 files changed, 152 insertions(+), 140 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging include/linux/input.h +Merge made by recursive. + drivers/input/evdev.c | 39 +++++++ + drivers/input/input.c | 267 ++++++++++++++++++++++++++++++++++++++++++++----- + include/linux/input.h | 39 ++++++- + 3 files changed, 313 insertions(+), 32 deletions(-) +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging .gitignore +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/ia64/include/asm/percpu.h +Auto-merging arch/ia64/kernel/ivt.S +Auto-merging arch/parisc/include/asm/system.h +Auto-merging arch/powerpc/include/asm/cache.h +Auto-merging arch/s390/kernel/swsusp_asm64.S +Auto-merging arch/sh/include/asm/cache.h +Auto-merging arch/sparc/include/asm/cache.h +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/percpu.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/percpu-defs.h +Auto-merging include/linux/spinlock.h +Auto-merging init/Kconfig +Auto-merging kernel/module.c +Auto-merging scripts/Makefile.lib +Auto-merging scripts/kconfig/Makefile +Auto-merging scripts/kconfig/util.c +Auto-merging scripts/markup_oops.pl +Auto-merging scripts/package/mkspec +Merge made by recursive. + .gitignore | 1 + + Documentation/.gitignore | 7 + + 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/.gitignore | 3 + + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 4 +- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/kernel/acpi/wakeup_32.S | 2 +- + arch/x86/kernel/init_task.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + include/asm-generic/percpu.h | 10 +- + include/asm-generic/vmlinux.lds.h | 38 +- + include/linux/cache.h | 2 +- + include/linux/init.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/linkage.h | 8 +- + include/linux/percpu-defs.h | 4 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 8 + + kernel/module.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/Makefile.lib | 2 +- + scripts/checkincludes.pl | 24 +- + scripts/checkstack.pl | 16 +- + scripts/checkversion.pl | 23 +- + scripts/decodecode | 48 +- + scripts/export_report.pl | 37 +- + scripts/gen_initramfs_list.sh | 3 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/headerdep.pl | 3 +- + scripts/headers_check.pl | 11 +- + scripts/headers_install.pl | 19 +- + scripts/kallsyms.c | 6 +- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/expr.c | 27 +- + scripts/kconfig/expr.h | 5 +- + scripts/kconfig/gconf.c | 113 +-- + scripts/kconfig/gconf.glade | 26 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 6 +- + scripts/kconfig/lxdialog/inputbox.c | 4 +- + scripts/kconfig/lxdialog/menubox.c | 22 +- + scripts/kconfig/mconf.c | 36 +- + scripts/kconfig/menu.c | 28 +- + scripts/kconfig/nconf.c | 1568 ++++++++++++++++++++++++++++++ + scripts/kconfig/nconf.gui.c | 617 ++++++++++++ + scripts/kconfig/nconf.h | 95 ++ + scripts/kconfig/symbol.c | 30 +- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.tab.c_shipped | 25 +- + scripts/kconfig/zconf.y | 25 +- + scripts/markup_oops.pl | 54 +- + scripts/mkcompile_h | 5 +- + scripts/mod/modpost.c | 152 ++-- + scripts/namespace.pl | 65 +- + scripts/package/builddeb | 2 + + scripts/package/mkspec | 2 +- + scripts/profile2linkerlist.pl | 8 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 45 +- + 112 files changed, 3024 insertions(+), 539 deletions(-) + create mode 100644 Documentation/.gitignore + create mode 100644 arch/x86/.gitignore + create mode 100644 scripts/kconfig/nconf.c + create mode 100644 scripts/kconfig/nconf.gui.c + create mode 100644 scripts/kconfig/nconf.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Merge made by recursive. + drivers/ide/ide-dma.c | 11 +++-------- + 1 files changed, 3 insertions(+), 8 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/acpi/acpica/evxfevnt.c +Removing drivers/acpi/hest.c +Auto-merging drivers/pci/pcie/aer/aerdrv.h +Auto-merging drivers/pci/pcie/aer/aerdrv_core.c +Removing include/acpi/acpi_hest.h +Auto-merging include/linux/acpi.h +Auto-merging include/linux/pci.h +Merge made by recursive. + Documentation/acpi/apei/einj.txt | 59 ++ + Documentation/kernel-parameters.txt | 9 + + arch/ia64/pci/pci.c | 5 +- + arch/x86/include/asm/mce.h | 8 + + arch/x86/kernel/acpi/sleep.c | 2 - + arch/x86/kernel/cpu/mcheck/Makefile | 2 + + arch/x86/kernel/cpu/mcheck/mce-apei.c | 138 +++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 23 + + arch/x86/kernel/cpu/mcheck/mce.c | 79 +++- + arch/x86/pci/acpi.c | 5 +- + drivers/acpi/Kconfig | 9 + + drivers/acpi/Makefile | 5 +- + drivers/acpi/acpica/evxfevnt.c | 33 +- + drivers/acpi/acpica/hwacpi.c | 20 +- + drivers/acpi/apei/Kconfig | 30 + + drivers/acpi/apei/Makefile | 5 + + drivers/acpi/apei/apei-base.c | 593 ++++++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 114 ++++ + drivers/acpi/apei/cper.c | 84 +++ + drivers/acpi/apei/einj.c | 548 ++++++++++++++++++ + drivers/acpi/apei/erst.c | 855 +++++++++++++++++++++++++++++ + drivers/acpi/apei/ghes.c | 427 ++++++++++++++ + drivers/acpi/apei/hest.c | 173 ++++++ + drivers/acpi/atomicio.c | 360 ++++++++++++ + drivers/acpi/ec.c | 3 +- + drivers/acpi/hed.c | 112 ++++ + drivers/acpi/hest.c | 139 ----- + drivers/acpi/pci_root.c | 67 ++- + drivers/acpi/sleep.c | 157 +------ + drivers/acpi/video.c | 118 ++++- + drivers/acpi/video_detect.c | 2 +- + drivers/pci/pcie/aer/aerdrv.h | 17 + + drivers/pci/pcie/aer/aerdrv_acpi.c | 77 +++ + drivers/pci/pcie/aer/aerdrv_core.c | 8 +- + drivers/pci/probe.c | 8 - + fs/debugfs/file.c | 21 +- + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpi_drivers.h | 3 +- + include/acpi/acpi_hest.h | 12 - + include/acpi/apei.h | 34 ++ + include/acpi/atomicio.h | 10 + + include/acpi/hed.h | 18 + + include/acpi/video.h | 16 + + include/linux/acpi.h | 1 - + include/linux/cper.h | 314 +++++++++++ + include/linux/cpuidle.h | 6 +- + include/linux/debugfs.h | 2 + + include/linux/pci.h | 3 +- + include/linux/uuid.h | 70 +++ + lib/Makefile | 2 +- + lib/uuid.c | 53 ++ + 51 files changed, 4444 insertions(+), 417 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + create mode 100644 arch/x86/kernel/cpu/mcheck/mce-apei.c + create mode 100644 drivers/acpi/apei/Kconfig + create mode 100644 drivers/acpi/apei/Makefile + create mode 100644 drivers/acpi/apei/apei-base.c + create mode 100644 drivers/acpi/apei/apei-internal.h + create mode 100644 drivers/acpi/apei/cper.c + create mode 100644 drivers/acpi/apei/einj.c + create mode 100644 drivers/acpi/apei/erst.c + create mode 100644 drivers/acpi/apei/ghes.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 drivers/acpi/hed.c + delete mode 100644 drivers/acpi/hest.c + delete mode 100644 include/acpi/acpi_hest.h + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h + create mode 100644 include/acpi/hed.h + create mode 100644 include/linux/cper.h + create mode 100644 include/linux/uuid.h + create mode 100644 lib/uuid.c +$ git am -3 ../patches/acpi__update_gfp_slab.h_includes +Applying: acpi: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/acpi/apei/apei-base.c +M drivers/acpi/atomicio.c +$ git add . +$ git commit -v -a --amend +[master 84a4842] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-cdev.c +Auto-merging drivers/firewire/ohci.c +Merge made by recursive. + drivers/firewire/core-card.c | 22 +--- + drivers/firewire/core-cdev.c | 8 +- + drivers/firewire/core-transaction.c | 96 +++++++++++------- + drivers/firewire/core.h | 6 +- + drivers/firewire/ohci.c | 188 ++++++++++++++++++++++++++++------- + drivers/firewire/ohci.h | 10 ++- + drivers/ieee1394/dv1394.c | 11 +- + drivers/ieee1394/raw1394.c | 3 +- + drivers/ieee1394/video1394.c | 5 +- + include/linux/firewire.h | 5 +- + 10 files changed, 248 insertions(+), 106 deletions(-) +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 +Merge made by recursive. + drivers/firmware/Kconfig | 9 + + drivers/firmware/Makefile | 1 + + drivers/firmware/iscsi_boot_sysfs.c | 481 +++++++++++++++++++++++ + drivers/firmware/iscsi_ibft.c | 726 +++++++++++++---------------------- + drivers/firmware/iscsi_ibft_find.c | 56 +++- + include/linux/iscsi_boot_sysfs.h | 123 ++++++ + include/linux/iscsi_ibft.h | 12 +- + 7 files changed, 924 insertions(+), 484 deletions(-) + create mode 100644 drivers/firmware/iscsi_boot_sysfs.c + create mode 100644 include/linux/iscsi_boot_sysfs.h +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/s390/crypto/Makefile | 2 +- + arch/s390/crypto/des_s390.c | 238 ++++--------------------------------------- + 2 files changed, 22 insertions(+), 218 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging sound/usb/midi.c +Merge made by recursive. + sound/core/pcm_lib.c | 9 +++- + sound/core/pcm_native.c | 39 +--------------- + sound/usb/midi.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++ + sound/usb/midi.h | 2 + + sound/usb/quirks-table.h | 11 +++++ + sound/usb/quirks.c | 1 + + sound/usb/usbaudio.h | 1 + + 7 files changed, 135 insertions(+), 38 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/cpufreq/cpufreq_ondemand.c +Auto-merging include/linux/cpufreq.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 -------- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 + + drivers/cpufreq/cpufreq.c | 10 ++------ + drivers/cpufreq/cpufreq_ondemand.c | 33 +++++++++++++++------------ + include/linux/cpufreq.h | 5 ---- + 5 files changed, 23 insertions(+), 37 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Recorded preimage for 'drivers/net/virtio_net.c' +Resolved 'drivers/net/wireless/libertas_tf/if_usb.c' using previous resolution. +Resolved 'drivers/staging/rtl8187se/r8180_core.c' using previous resolution. +Auto-merging drivers/input/misc/ati_remote2.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/net/wireless/libertas_tf/if_usb.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas_tf/if_usb.c +Auto-merging drivers/scsi/bfa/bfad.c +Auto-merging drivers/staging/rtl8187se/r8180_core.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/r8180_core.c +Auto-merging drivers/staging/rtl8192e/r8192E_core.c +Auto-merging drivers/staging/rtl8192su/r8192U_core.c +Auto-merging drivers/usb/atm/ueagle-atm.c +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging include/linux/mod_devicetable.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging scripts/mod/file2alias.c +Auto-merging scripts/mod/modpost.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/virtio_net.c'. +[master f644aaf] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + arch/um/drivers/hostaudio_kern.c | 10 + + drivers/acpi/debug.c | 32 +++- + drivers/char/hvc_iucv.c | 9 +- + drivers/char/ipmi/ipmi_watchdog.c | 42 +++-- + drivers/ide/ide.c | 20 ++- + drivers/input/misc/ati_remote2.c | 26 ++- + drivers/input/mouse/psmouse-base.c | 14 +- + drivers/message/fusion/mptbase.c | 3 +- + drivers/misc/lkdtm.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 54 ++++-- + drivers/net/virtio_net.c | 10 +- + drivers/net/wireless/libertas/if_sdio.c | 32 +++- + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas_tf/if_usb.c | 3 + + drivers/scsi/bfa/bfad.c | 2 + + drivers/staging/rtl8187se/r8180_core.c | 6 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 6 +- + drivers/usb/atm/ueagle-atm.c | 2 + + drivers/video/uvesafb.c | 7 +- + drivers/video/vt8623fb.c | 2 + + drivers/virtio/virtio_ring.c | 21 ++- + fs/nfs/callback.c | 11 +- + include/linux/moduleparam.h | 282 ++++++++++++++++++++++------- + include/linux/virtio_ring.h | 12 ++ + init/main.c | 8 +- + kernel/params.c | 233 ++++++++++++++++-------- + net/mac80211/rate.c | 2 + + net/sunrpc/xprtsock.c | 26 ++- + scripts/mod/modpost.c | 13 ++ + 31 files changed, 654 insertions(+), 249 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging fs/fcntl.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/trace/trace.c +Auto-merging net/core/skbuff.c +Merge made by recursive. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/Kconfig +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ + drivers/md/dm-ioctl.c | 3 +- + 5 files changed, 240 insertions(+), 2 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + Documentation/ABI/testing/sysfs-class-power | 20 ++ + drivers/power/Kconfig | 15 +- + drivers/power/Makefile | 2 + + drivers/power/ds2760_battery.c | 64 ++++++ + drivers/power/ds2782_battery.c | 194 ++++++++++++----- + drivers/power/pda_power.c | 10 + + drivers/power/power_supply.h | 7 +- + drivers/power/power_supply_core.c | 48 +++-- + drivers/power/power_supply_sysfs.c | 145 ++++++------ + drivers/power/test_power.c | 163 +++++++++++++ + drivers/power/tosa_battery.c | 4 +- + drivers/power/wm831x_power.c | 33 ++-- + drivers/power/wm97xx_battery.c | 3 + + drivers/power/z2_battery.c | 328 +++++++++++++++++++++++++++ + include/linux/ds2782_battery.h | 8 + + include/linux/pda_power.h | 2 + + include/linux/power_supply.h | 6 + + include/linux/z2_battery.h | 17 ++ + 18 files changed, 901 insertions(+), 168 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-power + create mode 100644 drivers/power/test_power.c + create mode 100644 drivers/power/z2_battery.c + create mode 100644 include/linux/ds2782_battery.h + create mode 100644 include/linux/z2_battery.h +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/leds-88pm860x.c | 11 ++++++++--- + 1 files changed, 8 insertions(+), 3 deletions(-) +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/88pm860x_bl.c | 1 + + drivers/video/backlight/Kconfig | 101 +++-- + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/adp8860_bl.c | 814 +++++++++++++++++++++++++++++++ + drivers/video/backlight/adx_bl.c | 4 +- + drivers/video/backlight/ep93xx_bl.c | 160 ++++++ + drivers/video/backlight/l4f00242t03.c | 4 +- + drivers/video/backlight/mbp_nvidia_bl.c | 92 ++++- + include/linux/i2c/adp8860.h | 137 ++++++ + 9 files changed, 1266 insertions(+), 49 deletions(-) + create mode 100644 drivers/video/backlight/adp8860_bl.c + create mode 100644 drivers/video/backlight/ep93xx_bl.c + create mode 100644 include/linux/i2c/adp8860.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Recorded preimage for 'kernel/debug/kdb/kdb_main.c' +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging include/linux/serial_core.h +Auto-merging init/main.c +Auto-merging kernel/debug/kdb/kdb_main.c +CONFLICT (add/add): Merge conflict in kernel/debug/kdb/kdb_main.c +Auto-merging kernel/module.c +Auto-merging kernel/sched.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'kernel/debug/kdb/kdb_main.c'. +[master db8d7f7] Merge remote branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/sysrq.c | 2 +- + kernel/debug/kdb/kdb_main.c | 9 ++++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/crypto.h | 6 -- + include/linux/slab_def.h | 24 ++++++ + include/linux/slob_def.h | 8 ++ + include/linux/slub_def.h | 8 ++ + mm/slab.c | 198 +++++++++++++++++++++++++++++++--------------- + mm/slob.c | 8 -- + mm/slub.c | 46 ++++++----- + 7 files changed, 200 insertions(+), 98 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/dma/Makefile' using previous resolution. +Resolved 'drivers/dma/timb_dma.c' using previous resolution. +Removing arch/x86/include/asm/rdc321x_defs.h +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/Makefile +CONFLICT (content): Merge conflict in drivers/dma/Makefile +Auto-merging drivers/dma/timb_dma.c +CONFLICT (add/add): Merge conflict in drivers/dma/timb_dma.c +Removing drivers/mfd/ab4500-core.c +Removing include/linux/mfd/ab3100.h +Removing include/linux/mfd/ab4500.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ff04b43] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/board-da850-evm.c | 19 +- + arch/arm/mach-u300/i2c.c | 57 +- + arch/arm/mach-u300/include/mach/irqs.h | 7 + + arch/arm/mach-ux500/board-mop500.c | 2 +- + arch/x86/include/asm/rdc321x_defs.h | 12 - + drivers/gpio/Kconfig | 26 + + drivers/gpio/Makefile | 5 +- + drivers/gpio/janz-ttl.c | 258 +++++ + drivers/gpio/rdc321x-gpio.c | 246 +++++ + drivers/gpio/tc35892-gpio.c | 381 +++++++ + drivers/input/touchscreen/Kconfig | 13 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/tps6507x-ts.c | 400 +++++++ + drivers/mfd/88pm860x-core.c | 42 +- + drivers/mfd/88pm860x-i2c.c | 2 +- + drivers/mfd/Kconfig | 87 ++- + drivers/mfd/Makefile | 13 +- + drivers/mfd/ab3100-core.c | 99 ++- + drivers/mfd/ab3100-otp.c | 13 +- + drivers/mfd/ab3550-core.c | 1401 +++++++++++++++++++++++ + drivers/mfd/ab4500-core.c | 209 ---- + drivers/mfd/ab8500-core.c | 444 ++++++++ + drivers/mfd/ab8500-spi.c | 133 +++ + drivers/mfd/abx500-core.c | 157 +++ + drivers/mfd/da903x.c | 1 + + drivers/mfd/janz-cmodio.c | 304 +++++ + drivers/mfd/max8925-core.c | 7 +- + drivers/mfd/max8925-i2c.c | 2 - + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/pcf50633-adc.c | 39 +- + drivers/mfd/pcf50633-core.c | 345 +------ + drivers/mfd/pcf50633-irq.c | 318 ++++++ + drivers/mfd/rdc321x-southbridge.c | 123 +++ + drivers/mfd/t7l66xb.c | 3 + + drivers/mfd/tc35892.c | 347 ++++++ + drivers/mfd/timberdale.c | 156 +++- + drivers/mfd/timberdale.h | 16 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6507x.c | 159 +++ + drivers/mfd/twl4030-irq.c | 11 +- + drivers/mfd/wm831x-core.c | 112 ++- + drivers/mfd/wm831x-irq.c | 18 +- + drivers/mfd/wm8350-i2c.c | 6 +- + drivers/mfd/wm8400-core.c | 4 +- + drivers/net/can/Kconfig | 10 + + drivers/net/can/Makefile | 1 + + drivers/net/can/janz-ican3.c | 1830 +++++++++++++++++++++++++++++++ + drivers/regulator/88pm8607.c | 533 ++++----- + drivers/regulator/ab3100.c | 35 +- + drivers/regulator/tps6507x-regulator.c | 373 +++---- + drivers/rtc/rtc-ab3100.c | 41 +- + drivers/watchdog/rdc321x_wdt.c | 53 +- + include/linux/input/tps6507x-ts.h | 24 + + include/linux/mfd/88pm860x.h | 7 +- + include/linux/mfd/ab3100.h | 129 --- + include/linux/mfd/ab4500.h | 262 ----- + include/linux/mfd/ab8500.h | 128 +++ + include/linux/mfd/abx500.h | 233 ++++ + include/linux/mfd/janz.h | 54 + + include/linux/mfd/rdc321x.h | 26 + + include/linux/mfd/tc35892.h | 132 +++ + include/linux/mfd/tps6507x.h | 169 +++ + include/linux/mfd/wm831x/core.h | 5 +- + 64 files changed, 8364 insertions(+), 1686 deletions(-) + delete mode 100644 arch/x86/include/asm/rdc321x_defs.h + create mode 100644 drivers/gpio/janz-ttl.c + create mode 100644 drivers/gpio/rdc321x-gpio.c + create mode 100644 drivers/gpio/tc35892-gpio.c + create mode 100644 drivers/input/touchscreen/tps6507x-ts.c + create mode 100644 drivers/mfd/ab3550-core.c + delete mode 100644 drivers/mfd/ab4500-core.c + create mode 100644 drivers/mfd/ab8500-core.c + create mode 100644 drivers/mfd/ab8500-spi.c + create mode 100644 drivers/mfd/abx500-core.c + create mode 100644 drivers/mfd/janz-cmodio.c + create mode 100644 drivers/mfd/pcf50633-irq.c + create mode 100644 drivers/mfd/rdc321x-southbridge.c + create mode 100644 drivers/mfd/tc35892.c + create mode 100644 drivers/mfd/tps6507x.c + create mode 100644 drivers/net/can/janz-ican3.c + create mode 100644 include/linux/input/tps6507x-ts.h + delete mode 100644 include/linux/mfd/ab3100.h + delete mode 100644 include/linux/mfd/ab4500.h + create mode 100644 include/linux/mfd/ab8500.h + create mode 100644 include/linux/mfd/abx500.h + create mode 100644 include/linux/mfd/janz.h + create mode 100644 include/linux/mfd/rdc321x.h + create mode 100644 include/linux/mfd/tc35892.h + create mode 100644 include/linux/mfd/tps6507x.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/mfd/88pm860x-core.c +Auto-merging drivers/regulator/ab3100.c +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/mc13783-regulator.c +Auto-merging include/linux/mfd/88pm860x.h +Merge made by recursive. + drivers/regulator/ab3100.c | 10 +++ + drivers/regulator/bq24022.c | 1 + + drivers/regulator/core.c | 83 ++++++++++++-------- + drivers/regulator/mc13783-regulator.c | 6 +- + drivers/regulator/twl-regulator.c | 138 ++++++++++++++++++++++----------- + include/linux/regulator/machine.h | 9 ++- + 6 files changed, 163 insertions(+), 84 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/watchdog/s3c2410_wdt.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 15 +- + Documentation/watchdog/00-INDEX | 5 + + Documentation/watchdog/watchdog-parameters.txt | 390 ++++++++++++++++++++++++ + Documentation/watchdog/wdt.txt | 15 +- + drivers/watchdog/bfin_wdt.c | 19 +-- + drivers/watchdog/booke_wdt.c | 6 +- + drivers/watchdog/eurotechwdt.c | 1 - + drivers/watchdog/iTCO_vendor_support.c | 11 +- + drivers/watchdog/iTCO_wdt.c | 29 ++- + drivers/watchdog/mpc8xxx_wdt.c | 2 +- + drivers/watchdog/pc87413_wdt.c | 9 +- + drivers/watchdog/pnx833x_wdt.c | 11 +- + drivers/watchdog/s3c2410_wdt.c | 6 +- + drivers/watchdog/shwdt.c | 2 +- + drivers/watchdog/twl4030_wdt.c | 2 + + drivers/watchdog/wdt.c | 2 +- + drivers/watchdog/wdt977.c | 2 +- + 17 files changed, 457 insertions(+), 70 deletions(-) + create mode 100644 Documentation/watchdog/watchdog-parameters.txt +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging fs/exofs/inode.c +Merge made by recursive. + fs/exofs/dir.c | 2 +- + fs/exofs/inode.c | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 31 insertions(+), 1 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/inode.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/inotify/Kconfig +CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree. +Auto-merging fs/open.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f fs/notify/inotify/inotify.c +fs/notify/inotify/inotify.c: needs merge +rm 'fs/notify/inotify/inotify.c' +$ git commit -v -a +[master f530884] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 ++++++++++++++++++++++++ + fs/notify/fsnotify.c | 141 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 873 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 114 +++- + fs/notify/inotify/inotify_user.c | 305 ++++++---- + fs/notify/mark.c | 325 +++++++++++ + fs/notify/notification.c | 180 ++++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 166 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 175 +------ + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 233 ++++---- + kernel/audit_watch.c | 295 ++++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 7 +- + security/security.c | 16 +- + 57 files changed, 3099 insertions(+), 2189 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +$ git am -3 ../patches/fsnotify__update_gfp_slab.h_includes +Applying: fsnotify: update gfp/slab.h includes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/notify/fanotify/fanotify_user.c +M fs/notify/vfsmount_mark.c +$ git add . +$ git commit -v -a --amend +[master b6d4b0e] 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 d9c73aa] 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 +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +Auto-merging lib/Makefile +Merge made by recursive. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 152 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 42 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 2078 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 52 + + 13 files changed, 2598 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Resolved 'drivers/i2c/busses/i2c-cpm.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-mpc.c' using previous resolution. +Resolved 'drivers/net/gianfar.c' using previous resolution. +Resolved 'drivers/serial/mpc52xx_uart.c' using previous resolution. +Auto-merging arch/powerpc/kernel/vio.c +Auto-merging arch/sparc/kernel/time_32.c +Auto-merging drivers/ata/pata_macio.c +Auto-merging drivers/ata/pata_mpc52xx.c +Auto-merging drivers/crypto/talitos.c +Auto-merging drivers/dma/fsldma.c +Auto-merging drivers/dma/ppc4xx/adma.c +Auto-merging drivers/gpio/pca953x.c +Auto-merging drivers/i2c/busses/i2c-cpm.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c +Auto-merging drivers/i2c/busses/i2c-ibm_iic.c +Auto-merging drivers/i2c/busses/i2c-mpc.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c +Auto-merging drivers/i2c/i2c-core.c +Auto-merging drivers/macintosh/smu.c +Auto-merging drivers/mtd/maps/physmap_of.c +Auto-merging drivers/mtd/nand/fsl_elbc_nand.c +Auto-merging drivers/mtd/nand/fsl_upm.c +Auto-merging drivers/mtd/nand/pasemi_nand.c +Auto-merging drivers/mtd/nand/socrates_nand.c +Auto-merging drivers/net/can/mscan/mpc5xxx_can.c +Auto-merging drivers/net/can/sja1000/sja1000_of_platform.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/fec_mpc52xx.c +Auto-merging drivers/net/fs_enet/fs_enet-main.c +Auto-merging drivers/net/fs_enet/mac-fcc.c +Auto-merging drivers/net/fs_enet/mac-fec.c +Auto-merging drivers/net/fs_enet/mac-scc.c +Auto-merging drivers/net/fsl_pq_mdio.c +Auto-merging drivers/net/gianfar.c +CONFLICT (content): Merge conflict in drivers/net/gianfar.c +Auto-merging drivers/net/greth.c +Auto-merging drivers/net/ibm_newemac/core.c +Auto-merging drivers/net/ll_temac_main.c +Auto-merging drivers/net/myri_sbus.c +Auto-merging drivers/net/niu.c +Auto-merging drivers/net/sunbmac.c +Auto-merging drivers/net/sunhme.c +Auto-merging drivers/net/sunlance.c +Auto-merging drivers/net/sunqe.c +Auto-merging drivers/net/ucc_geth.c +Auto-merging drivers/net/xilinx_emaclite.c +Auto-merging drivers/of/of_mdio.c +Auto-merging drivers/sbus/char/flash.c +Auto-merging drivers/scsi/ibmvscsi/ibmvfc.c +Auto-merging drivers/scsi/ibmvscsi/ibmvscsi.c +Auto-merging drivers/serial/mpc52xx_uart.c +CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c +Auto-merging drivers/serial/pmac_zilog.c +Auto-merging drivers/serial/sunzilog.c +Auto-merging drivers/serial/uartlite.c +Auto-merging drivers/spi/spi_mpc8xxx.c +Auto-merging drivers/usb/host/fhci-hcd.c +Auto-merging drivers/usb/host/isp1760-if.c +Auto-merging drivers/watchdog/mpc8xxx_wdt.c +Auto-merging include/linux/device.h +Auto-merging include/linux/i2c.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 866eeaa] Merge remote branch 'devicetree/next-devicetree' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/include/asm/device.h | 16 +---------- + arch/microblaze/include/asm/of_device.h | 3 +- + arch/microblaze/kernel/of_device.c | 13 ++++----- + arch/microblaze/kernel/of_platform.c | 6 ++-- + arch/powerpc/include/asm/device.h | 16 +---------- + arch/powerpc/include/asm/macio.h | 2 +- + arch/powerpc/include/asm/of_device.h | 3 +- + arch/powerpc/kernel/ibmebus.c | 6 ++-- + arch/powerpc/kernel/of_device.c | 13 ++++----- + arch/powerpc/kernel/of_platform.c | 21 +++++++------- + arch/powerpc/kernel/pci-common.c | 4 +- + arch/powerpc/kernel/vio.c | 18 ++++++------ + arch/powerpc/platforms/52xx/mpc52xx_gpio.c | 18 ++++++++---- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 23 +++++++++------- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 14 +++++---- + arch/powerpc/platforms/82xx/ep8248e.c | 9 +++--- + arch/powerpc/platforms/83xx/suspend.c | 9 ++++-- + arch/powerpc/platforms/cell/axon_msi.c | 9 +++--- + arch/powerpc/platforms/cell/iommu.c | 5 +-- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 9 +++--- + arch/powerpc/platforms/pasemi/setup.c | 4 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/sysdev/axonram.c | 14 +++++----- + arch/powerpc/sysdev/bestcomm/bestcomm.c | 18 +++++------- + arch/powerpc/sysdev/fsl_msi.c | 21 ++++++++------ + arch/powerpc/sysdev/fsl_pmc.c | 9 ++++-- + arch/powerpc/sysdev/fsl_rio.c | 37 +++++++++++++----------- + arch/powerpc/sysdev/pmi.c | 9 +++--- + arch/powerpc/sysdev/qe_lib/qe.c | 7 +++- + arch/sparc/include/asm/device.h | 15 ---------- + arch/sparc/include/asm/fb.h | 2 +- + arch/sparc/include/asm/floppy_64.h | 4 +- + arch/sparc/include/asm/of_device.h | 1 - + arch/sparc/include/asm/parport.h | 9 ++++-- + arch/sparc/kernel/apc.c | 7 +++- + arch/sparc/kernel/auxio_64.c | 9 +++--- + arch/sparc/kernel/central.c | 18 +++++++----- + arch/sparc/kernel/chmc.c | 17 +++++++----- + arch/sparc/kernel/ioport.c | 2 +- + arch/sparc/kernel/of_device_32.c | 17 +++++------ + arch/sparc/kernel/of_device_64.c | 29 +++++++++---------- + arch/sparc/kernel/of_device_common.c | 4 +- + arch/sparc/kernel/pci.c | 14 ++++----- + arch/sparc/kernel/pci_common.c | 9 +++--- + arch/sparc/kernel/pci_fire.c | 11 +++++--- + arch/sparc/kernel/pci_msi.c | 18 ++++++------ + arch/sparc/kernel/pci_psycho.c | 11 +++++--- + arch/sparc/kernel/pci_sabre.c | 11 +++++--- + arch/sparc/kernel/pci_schizo.c | 21 ++++++++------ + arch/sparc/kernel/pci_sun4v.c | 15 ++++++---- + arch/sparc/kernel/pmc.c | 7 +++- + arch/sparc/kernel/power.c | 11 ++++--- + arch/sparc/kernel/psycho_common.c | 2 +- + arch/sparc/kernel/sbus.c | 16 +++++----- + arch/sparc/kernel/time_32.c | 9 +++--- + arch/sparc/kernel/time_64.c | 27 ++++++++++-------- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_mpc52xx.c | 14 ++++----- + drivers/ata/pata_of_platform.c | 9 ++++-- + drivers/ata/sata_fsl.c | 11 +++++--- + drivers/atm/fore200e.c | 23 +++++++++------ + drivers/block/swim3.c | 2 +- + drivers/block/xsysace.c | 13 ++++----- + drivers/cdrom/viocd.c | 2 +- + drivers/char/hw_random/n2-drv.c | 9 ++++-- + drivers/char/hw_random/pasemi-rng.c | 9 ++++-- + drivers/char/ipmi/ipmi_si_intf.c | 11 +++++--- + drivers/char/viotape.c | 2 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 11 +++---- + drivers/crypto/amcc/crypto4xx_core.c | 7 +++- + drivers/crypto/talitos.c | 9 ++++-- + drivers/dma/fsldma.c | 17 +++++++----- + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/edac/mpc85xx_edac.c | 30 ++++++++------------ + drivers/edac/ppc4xx_edac.c | 10 +++--- + drivers/gpio/pca953x.c | 2 +- + drivers/hwmon/ultra45_env.c | 7 +++- + drivers/i2c/busses/i2c-cpm.c | 30 ++++++++++---------- + drivers/i2c/busses/i2c-ibm_iic.c | 11 +++++--- + drivers/i2c/busses/i2c-mpc.c | 25 +++++++++-------- + drivers/i2c/i2c-core.c | 3 ++ + drivers/ide/pmac.c | 10 +++--- + drivers/infiniband/hw/ehca/ehca_main.c | 18 +++++++----- + drivers/input/misc/sparcspkr.c | 14 +++++++--- + drivers/input/serio/i8042-sparcio.h | 9 ++++-- + drivers/input/serio/xilinx_ps2.c | 15 ++++++---- + drivers/leds/leds-gpio.c | 4 +- + drivers/macintosh/macio_asic.c | 28 +++++++++---------- + drivers/macintosh/macio_sysfs.c | 6 ++-- + drivers/macintosh/mediabay.c | 2 +- + drivers/macintosh/rack-meter.c | 4 +- + drivers/macintosh/smu.c | 7 +++- + drivers/macintosh/therm_pm72.c | 9 ++++-- + drivers/macintosh/therm_windtunnel.c | 7 +++- + drivers/mmc/host/of_mmc_spi.c | 4 +- + drivers/mmc/host/sdhci-of-core.c | 9 ++++-- + drivers/mtd/maps/physmap_of.c | 13 +++++--- + drivers/mtd/maps/sun_uflash.c | 9 ++++-- + drivers/mtd/nand/fsl_elbc_nand.c | 11 ++++--- + drivers/mtd/nand/fsl_upm.c | 7 +++- + drivers/mtd/nand/ndfc.c | 15 +++++----- + drivers/mtd/nand/pasemi_nand.c | 9 ++++-- + drivers/mtd/nand/socrates_nand.c | 7 +++- + drivers/net/can/mscan/mpc5xxx_can.c | 8 +++-- + drivers/net/can/sja1000/sja1000_of_platform.c | 12 +++++--- + drivers/net/ehea/ehea_main.c | 21 ++++++++------ + drivers/net/fec_mpc52xx.c | 20 +++++++------ + drivers/net/fec_mpc52xx_phy.c | 11 +++++--- + drivers/net/fs_enet/fs_enet-main.c | 15 ++++++---- + drivers/net/fs_enet/mac-fcc.c | 8 +++--- + drivers/net/fs_enet/mac-fec.c | 4 +- + drivers/net/fs_enet/mac-scc.c | 6 ++-- + drivers/net/fs_enet/mii-bitbang.c | 7 +++- + drivers/net/fs_enet/mii-fec.c | 13 +++++--- + drivers/net/fsl_pq_mdio.c | 9 ++++-- + drivers/net/gianfar.c | 16 ++++++----- + drivers/net/greth.c | 3 +- + drivers/net/ibm_newemac/core.c | 21 ++++++++------ + drivers/net/ibm_newemac/debug.c | 9 +++--- + drivers/net/ibm_newemac/debug.h | 4 +- + drivers/net/ibm_newemac/mal.c | 36 +++++++++++++----------- + drivers/net/ibm_newemac/rgmii.c | 20 +++++++------ + drivers/net/ibm_newemac/tah.c | 15 ++++++---- + drivers/net/ibm_newemac/zmii.c | 17 +++++++----- + drivers/net/ll_temac_main.c | 12 ++++---- + drivers/net/myri_sbus.c | 9 ++++-- + drivers/net/niu.c | 17 +++++++----- + drivers/net/phy/mdio-gpio.c | 13 +++++--- + drivers/net/sunbmac.c | 13 +++++--- + drivers/net/sunhme.c | 15 ++++++---- + drivers/net/sunlance.c | 13 +++++--- + drivers/net/sunqe.c | 13 +++++--- + drivers/net/ucc_geth.c | 9 ++++-- + drivers/net/xilinx_emaclite.c | 17 +++++++----- + drivers/of/device.c | 25 ++++++++--------- + drivers/of/fdt.c | 15 ++++++++++ + drivers/of/of_i2c.c | 4 +- + drivers/of/of_mdio.c | 6 ++-- + drivers/of/of_spi.c | 2 +- + drivers/of/platform.c | 13 ++------- + drivers/parport/parport_sunbpp.c | 7 +++- + drivers/pcmcia/electra_cf.c | 9 ++++-- + drivers/pcmcia/m8xx_pcmcia.c | 7 +++- + drivers/sbus/char/bbc_envctrl.c | 4 +- + drivers/sbus/char/bbc_i2c.c | 11 +++++--- + drivers/sbus/char/display7seg.c | 9 ++++-- + drivers/sbus/char/envctrl.c | 9 ++++-- + drivers/sbus/char/flash.c | 11 +++++--- + drivers/sbus/char/uctrl.c | 9 ++++-- + drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/qlogicpti.c | 17 +++++++----- + drivers/scsi/sun_esp.c | 23 +++++++++------- + drivers/serial/apbuart.c | 10 +++--- + drivers/serial/cpm_uart/cpm_uart_core.c | 9 ++++-- + drivers/serial/mpc52xx_uart.c | 15 +++++----- + drivers/serial/nwpserial.c | 2 +- + drivers/serial/of_serial.c | 12 +++++--- + drivers/serial/pmac_zilog.c | 2 +- + drivers/serial/sunhv.c | 9 ++++-- + drivers/serial/sunsab.c | 13 +++++--- + drivers/serial/sunsu.c | 13 +++++--- + drivers/serial/sunzilog.c | 15 ++++++---- + drivers/serial/uartlite.c | 11 +++---- + drivers/serial/ucc_uart.c | 10 ++++--- + drivers/spi/mpc52xx_psc_spi.c | 15 +++++----- + drivers/spi/mpc52xx_spi.c | 22 ++++++++------- + drivers/spi/spi_mpc8xxx.c | 15 ++++++---- + drivers/spi/spi_ppc4xx.c | 2 +- + drivers/spi/xilinx_spi_of.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.c | 7 +++- + drivers/usb/host/ehci-ppc-of.c | 11 +++---- + drivers/usb/host/ehci-xilinx-of.c | 9 +++--- + drivers/usb/host/fhci-hcd.c | 11 +++++--- + drivers/usb/host/isp1760-if.c | 9 ++++-- + drivers/usb/host/ohci-ppc-of.c | 15 +++------- + drivers/video/bw2.c | 7 +++- + drivers/video/cg14.c | 7 +++- + drivers/video/cg3.c | 7 +++- + drivers/video/cg6.c | 9 ++++-- + drivers/video/ffb.c | 9 ++++-- + drivers/video/fsl-diu-fb.c | 10 ++++--- + drivers/video/leo.c | 7 +++- + drivers/video/mb862xx/mb862xxfb.c | 8 +++-- + drivers/video/p9100.c | 7 +++- + drivers/video/platinumfb.c | 9 ++++-- + drivers/video/sunxvr1000.c | 9 ++++-- + drivers/video/tcx.c | 7 +++- + drivers/video/xilinxfb.c | 23 +++++++-------- + drivers/watchdog/cpwd.c | 9 ++++-- + drivers/watchdog/gef_wdt.c | 8 +++-- + drivers/watchdog/mpc8xxx_wdt.c | 8 +++--- + drivers/watchdog/riowd.c | 7 +++- + include/linux/device.h | 8 +++++ + include/linux/i2c.h | 4 +++ + include/linux/of_device.h | 4 ++- + include/linux/of_fdt.h | 4 +++ + include/linux/of_platform.h | 6 +--- + sound/aoa/fabrics/layout.c | 2 +- + sound/aoa/soundbus/core.c | 8 +++--- + sound/aoa/soundbus/i2sbus/control.c | 2 +- + sound/aoa/soundbus/i2sbus/core.c | 8 +++--- + sound/aoa/soundbus/sysfs.c | 4 +- + sound/soc/fsl/mpc5200_dma.c | 6 ++-- + sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 4 +- + sound/soc/fsl/mpc8610_hpcd.c | 10 ++++--- + sound/sparc/amd7930.c | 7 +++- + sound/sparc/cs4231.c | 13 +++++--- + sound/sparc/dbri.c | 9 ++++-- + 211 files changed, 1253 insertions(+), 973 deletions(-) +$ git am -3 ../patches/0002-fixup-arch-powerpc-kernel-vio.c.patch +Applying: fixup arch/powerpc/kernel/vio.c +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/vio.c +$ git add . +$ git commit -v -a --amend +[master d8766a5] Merge remote branch 'devicetree/next-devicetree' +Merging spi/next-spi +$ git merge spi/next-spi +Auto-merging drivers/spi/spi_mpc8xxx.c +Merge made by recursive. + drivers/spi/spi_mpc8xxx.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Resolved 'kernel/Makefile' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/sparc/kernel/perf_event.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/traps.c +Auto-merging include/linux/ftrace_event.h +Auto-merging include/trace/ftrace.h +Auto-merging kernel/Makefile +CONFLICT (content): Merge conflict in kernel/Makefile +Removing kernel/softlockup.c +Auto-merging kernel/sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9654f37] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 + + arch/Kconfig | 7 + + arch/sparc/kernel/perf_event.c | 108 ++++--- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/nmi.h | 2 + + arch/x86/include/asm/perf_event_p4.h | 3 +- + arch/x86/kernel/apic/Makefile | 7 +- + arch/x86/kernel/apic/hw_nmi.c | 107 ++++++ + arch/x86/kernel/apic/nmi.c | 7 - + arch/x86/kernel/cpu/perf_event_p4.c | 41 ++-- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/traps.c | 7 + + include/linux/ftrace_event.h | 8 +- + include/linux/nmi.h | 13 + + include/linux/perf_event.h | 19 +- + include/linux/sched.h | 12 +- + include/trace/ftrace.h | 3 +- + kernel/Makefile | 2 +- + kernel/mutex.c | 7 + + kernel/perf_event.c | 153 ++++----- + kernel/softlockup.c | 293 ---------------- + kernel/sysctl.c | 55 ++-- + kernel/timer.c | 1 - + kernel/trace/trace_event_perf.c | 11 +- + kernel/trace/trace_kprobe.c | 4 +- + kernel/trace/trace_syscalls.c | 6 +- + kernel/watchdog.c | 568 ++++++++++++++++++++++++++++++++ + lib/Kconfig.debug | 34 ++- + tools/perf/Documentation/perf-stat.txt | 3 + + tools/perf/builtin-probe.c | 10 +- + tools/perf/builtin-record.c | 1 + + tools/perf/builtin-stat.c | 18 +- + tools/perf/util/abspath.c | 81 ----- + tools/perf/util/cache.h | 55 +--- + tools/perf/util/config.c | 461 +------------------------- + tools/perf/util/exec_cmd.c | 6 +- + tools/perf/util/exec_cmd.h | 1 - + tools/perf/util/help.c | 30 +-- + tools/perf/util/newt.c | 10 +- + tools/perf/util/path.c | 204 +------------ + tools/perf/util/probe-finder.c | 33 ++- + tools/perf/util/probe-finder.h | 3 + + tools/perf/util/quote.c | 433 +------------------------ + tools/perf/util/quote.h | 39 --- + tools/perf/util/run-command.c | 90 ----- + tools/perf/util/run-command.h | 30 -- + tools/perf/util/session.c | 1 + + tools/perf/util/sigchain.c | 2 +- + tools/perf/util/sigchain.h | 1 - + tools/perf/util/strbuf.c | 229 +------------- + tools/perf/util/strbuf.h | 45 --- + tools/perf/util/util.h | 162 --------- + tools/perf/util/wrapper.c | 110 ------ + 53 files changed, 1043 insertions(+), 2497 deletions(-) + create mode 100644 arch/x86/kernel/apic/hw_nmi.c + delete mode 100644 kernel/softlockup.c + create mode 100644 kernel/watchdog.c +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Merge made by recursive. + arch/x86/oprofile/nmi_int.c | 16 ++++++++++++++-- + 1 files changed, 14 insertions(+), 2 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Auto-merging arch/ia64/sn/kernel/sn2/sn_hwperf.c +Auto-merging arch/um/drivers/hostaudio_kern.c +Auto-merging drivers/char/ipmi/ipmi_watchdog.c +Auto-merging drivers/media/dvb/dvb-core/dvb_frontend.c +Auto-merging drivers/media/dvb/dvb-core/dvb_net.c +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/pcmcia/pcmcia_ioctl.c +Auto-merging drivers/scsi/3w-9xxx.c +Auto-merging drivers/scsi/3w-sas.c +Auto-merging drivers/scsi/3w-xxxx.c +Auto-merging drivers/scsi/gdth.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging fs/ecryptfs/file.c +Auto-merging net/sunrpc/cache.c +Merge made by recursive. + arch/cris/arch-v10/drivers/gpio.c | 30 +++++++---- + arch/cris/arch-v10/drivers/i2c.c | 24 ++++++-- + arch/cris/arch-v10/drivers/sync_serial.c | 32 ++++++++---- + arch/cris/arch-v32/drivers/cryptocop.c | 24 ++++++-- + arch/cris/arch-v32/drivers/mach-a3/gpio.c | 28 +++++++--- + arch/cris/arch-v32/drivers/mach-fs/gpio.c | 29 +++++++---- + arch/cris/arch-v32/drivers/sync_serial.c | 30 +++++++--- + arch/ia64/kernel/perfmon.c | 22 ++++---- + arch/ia64/sn/kernel/sn2/sn_hwperf.c | 9 +--- + arch/um/drivers/harddog_kern.c | 18 +++++- + arch/um/drivers/hostaudio_kern.c | 8 ++-- + arch/um/drivers/mmapper_kern.c | 5 +- + drivers/char/apm-emulation.c | 8 ++- + drivers/char/applicom.c | 13 +++-- + drivers/char/ds1620.c | 16 +++++- + drivers/char/dtlk.c | 15 +++--- + drivers/char/generic_nvram.c | 17 +++++- + drivers/char/genrtc.c | 16 +++++- + drivers/char/hpet.c | 14 +++-- + drivers/char/ipmi/ipmi_devintf.c | 26 +++++++-- + drivers/char/ipmi/ipmi_watchdog.c | 17 +++++- + drivers/char/nvram.c | 10 +++- + drivers/char/nwflash.c | 7 ++- + drivers/char/raw.c | 42 ++++++++------ + drivers/hwmon/fschmd.c | 9 ++-- + drivers/hwmon/w83793.c | 10 ++-- + drivers/input/misc/hp_sdc_rtc.c | 34 ++++++++---- + drivers/isdn/capi/capi.c | 17 +++++- + drivers/isdn/i4l/isdn_common.c | 18 +++++- + drivers/isdn/mISDN/timerdev.c | 10 ++-- + drivers/macintosh/nvram.c | 2 +- + drivers/macintosh/via-pmu.c | 17 +++++- + drivers/media/dvb/dvb-core/dmxdev.c | 31 ++++++++--- + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 17 ++++-- + drivers/media/dvb/dvb-core/dvb_frontend.c | 30 +++++----- + drivers/media/dvb/dvb-core/dvb_net.c | 15 ++++-- + drivers/media/dvb/dvb-core/dvbdev.c | 17 ++++-- + drivers/media/dvb/dvb-core/dvbdev.h | 11 ++--- + drivers/media/dvb/firewire/firedtv-ci.c | 5 +- + drivers/media/dvb/ttpci/av7110.c | 4 +- + drivers/media/dvb/ttpci/av7110_av.c | 8 ++-- + drivers/media/dvb/ttpci/av7110_ca.c | 5 +- + drivers/mtd/mtdchar.c | 19 +++++-- + drivers/pcmcia/pcmcia_ioctl.c | 17 +++++- + drivers/rtc/rtc-m41t80.c | 16 +++++- + drivers/sbus/char/openprom.c | 44 +++++++++------- + drivers/scsi/3w-9xxx.c | 10 +++- + drivers/scsi/3w-sas.c | 8 ++- + drivers/scsi/3w-xxxx.c | 11 +++- + drivers/scsi/aacraid/linit.c | 11 +++- + drivers/scsi/dpt_i2o.c | 20 ++++++- + drivers/scsi/gdth.c | 20 +++++-- + drivers/scsi/megaraid.c | 20 ++++++- + drivers/scsi/megaraid.h | 3 +- + drivers/scsi/megaraid/megaraid_mm.c | 22 ++++++-- + drivers/scsi/osst.c | 14 ++++-- + drivers/scsi/sg.c | 17 +++++- + drivers/usb/mon/mon_bin.c | 23 ++++++-- + drivers/usb/mon/mon_stat.c | 3 +- + fs/autofs/root.c | 19 ++++++- + fs/autofs4/root.c | 22 ++++++-- + fs/coda/pioctl.c | 76 ++++++++++++++------------ + fs/coda/psdev.c | 5 +- + fs/ecryptfs/file.c | 23 ++++++-- + fs/hfsplus/dir.c | 2 +- + fs/hfsplus/hfsplus_fs.h | 3 +- + fs/hfsplus/inode.c | 2 +- + fs/hfsplus/ioctl.c | 12 +++- + fs/ncpfs/dir.c | 2 +- + fs/ncpfs/file.c | 2 +- + fs/ncpfs/ioctl.c | 27 ++++++---- + fs/smbfs/dir.c | 2 +- + fs/smbfs/file.c | 2 +- + fs/smbfs/ioctl.c | 10 ++-- + fs/smbfs/proto.h | 2 +- + include/linux/ncp_fs.h | 2 +- + net/sunrpc/cache.c | 13 ++++- + net/sunrpc/rpc_pipe.c | 18 +++++- + 78 files changed, 851 insertions(+), 391 deletions(-) +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..742b0b0229c4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,153 @@ +Importing driver-core.current based on 2.6.34-git6 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 7a9b149212f3716c598afe973b6261fd58453b7a +HEAD is now at 7a9b149 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Greg KH --patches ../quilt/driver-core.current +driver-core-add-devname-module-aliases-to-allow-module-on-demand-auto-loading.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + a45b31e...640c8e0 master -> quilt/driver-core.current (forced update) +Importing tty.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/tty.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +Importing usb.current based on quilt/tty.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +Importing staging.current based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/staging.current 640c8e0789a4f79cc43d6d026998f398e7711a38 +Importing i2c based on 2.6.34-git6 +$ cd ../quilt-tmp +$ git reset --hard 7a9b149212f3716c598afe973b6261fd58453b7a +HEAD is now at 7a9b149 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Jean Delvare --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-gpio-move-initialization-code-to-subsys_initcall.patch +i2c-core-fix-some-coding-style-issues.patch +i2c-dev-fix-all-coding-style-issues.patch +i2c-algo-pca-fix-coding-style-issues.patch +i2c-use-linux-io.h-instead-of-asm-io.h.patch +i2c-nforce2-remove-redundant-error-messages-on-acpi-conflict.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 76facd9...009237b master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.34-git6 +$ cd ../quilt-tmp +$ git reset --hard 7a9b149212f3716c598afe973b6261fd58453b7a +HEAD is now at 7a9b149 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 +$ git quiltimport --author Jean Delvare --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 +hwmon-lm90-use-programmed-update-rate.patch +hwmon-add-description-of-the-update_rate-sysfs-attribute.patch +hwmon-adm1031-allow-setting-update-rate-2.patch +hwmon-tmp401-01-use-constants-for-sysfs-file-permissions.patch +hwmon-tmp401-02-reorganize-code-to-get-rid-of-static-forward-declarations.patch +hwmon-applesmc-01-add-support-for-macbook-pro-5-3-and-5-4.patch +hwmon-applesmc-02-add-generic-support-for-macbook-pro-6.patch +hwmon-applesmc-03-add-generic-support-for-macbook-pro-7.patch +hwmon-applesmc-04-add-temperature-sensor-labels-to-sysfs-interface.patch +hwmon-emc1403-thermal-sensor-support.patch +hwmon-tmp102-01-driver-for-ti-tmp102-temperature-sensor.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:17: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +hwmon-tmp102-02-misc-fixes.patch +hwmon-tmp102-03-fix-suspend-resume.patch +hwmon-tmp102-04-restore-configuration-at-exit.patch +hwmon-dme1737-add-support-for-sch5127.patch +hwmon-ltc4245-01-read-only-one-gpio-pin.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + cdc70a9...3296f92 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.34 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.34-2641-ga0fe3cc +$ cd ../quilt-tmp +$ git reset --hard a0fe3cc5d36a5f5b4f60abfe1a4b1caf4a5cce5a +HEAD is now at a0fe3cc Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input +$ git quiltimport --author Rusty Russell --patches ../quilt/rr +modules:isapnp-mod_devicetable.h.patch +hisax:device-table-fix.patch +module:device_table_isapnp_does_nothing.patch +module:drop-lock-while-waiting.patch +virtio:add_disk_identification_support.patch +virtio:add_disk_identification_ioctl.patch +virtio:add_disk_identification_ioctl-fix.patch +virtio:add_virtqueue_vq_ops_wrappers.patch +virtio:balloon_use_virtqueue_xxx_wrappers.patch +virtio:console_use_virtqueue_xxx_wrappers.patch +virtio:blk_use_virtqueue_xxx_wrappers.patch +virtio:net_use_virtqueue_xxx_wrappers.patch +virtio:ring_remove_a_level_of_indirection.patch +virtio:rng_use_virtqueue_xxx_wrappers.patch +virtio:trans_use_virtqueue_xxx_wrappers.patch +virtio:add_buf_gfp.patch +revert_"virtio__disable_multiport_console_support." +virtio__console__add_a___send_control_msg()_that_can_send_messages_without_a_valid_port +virtio__console__let_host_know_of_port_or_device_add_failures +virtio__console__return_-epipe_to_hvc_console_if_we_lost_the_connection +virtio__console__dont_call_hvc_remove()_on_unplugging_console_ports +virtio__console__remove_config_work_handler +virtio__console__move_code_around_for_future_patches +virtio__console__use_a_control_message_to_add_ports +virtio__console__dont_always_create_a_port_0_if_using_multiport +virtio__console__rename_wait_is_over()_to_will_read_block() +virtio__console__add_support_for_nonblocking_write()s +virtio:console_resize_console_port_0_on_config_intr_only_if_multiport_is_off.patch +virtio:console_store_each_console_s_size_in_the_console_structure.patch +virtio:console_accept_console_size_along_with_resize_control_message.patch +misc:drivers_char_eliminate_use_after_free.patch +virtio:put_last_seen_used_index_into_ring_itself.patch +virtio:net_pass_gfp_to_add_buf.patch +misc:fix-email.patch +kernel-params_c-check-null-for-non-bool.diff +param:neaten-param.c-exports.patch +param:param_ops.patch +param:param_ops-for-hvc_iucv-driver.patch +param:param_ops-modpost-complaint-silence.patch +param:add-free-hook.patch +param:use-free-hook-for-charp.patch +param:params-are-const.patch +param:kernel_param_lock.patch +param:documentation.patch +param:remove-useless-writable-charp.patch +param:lock-charp-simple.patch +param:lock-charp-myri10ge.patch +param:lock-charp-if_sdio.patch +param:ipmi_watchdog.patch +param:cleanup-ide.patch +param:cleanup-mptbase.patch +param:acpi-use-ops.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 20747a7...c3a326d master -> quilt/rr (forced update) +Importing device-mapper based on v2.6.34-rc7 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core 640c8e0789a4f79cc43d6d026998f398e7711a38 +Importing tty based on quilt/driver-core + quilt series is empty +$ git update-ref refs/heads/quilt/tty 640c8e0789a4f79cc43d6d026998f398e7711a38 +Importing usb based on quilt/tty + quilt series is empty +$ git update-ref refs/heads/quilt/usb 640c8e0789a4f79cc43d6d026998f398e7711a38 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5547ae37aeed --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100522 -- cgit v1.2.3