diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-08 15:49:33 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-02-08 15:49:33 +1100 |
| commit | b36eb3f9d3045647c5318cf4d609655b0745b5ab (patch) | |
| tree | 237e028ba082c3d890d4cd47386a93b3b5aa81b7 | |
| parent | 5ca9d4647f998d5315241f327f295c4f13dfd66f (diff) | |
Add linux-next specific files for 20110208next-20110208
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 188 | ||||
| -rw-r--r-- | Next/Trees | 190 | ||||
| -rw-r--r-- | Next/merge.log | 4886 | ||||
| -rw-r--r-- | Next/quilt-import.log | 27 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5292 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..bbaddde731b6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,188 @@ +Name SHA1 +---- ---- +origin 100b33c8bd8a3235fd0b7948338d6cbb3db3c63d +fixes 8a335bc631ac9c43675821580c26ebf95a3044ba +arm-current 1f63b9546a8c7b90de2d9e52cf8ff07f9f653d94 +m68k-current 5df1abdbd37af2ae317a1c5b5944173284dc55d6 +powerpc-merge 57cdfdf829a850a317425ed93c6a576c9ee6329c +52xx-and-virtex-current a0f34748fa4647824dfff3b5132993712946d0b5 +sparc-current 5edddaab1d5d6143c23fef119a24ea768915681a +scsi-rc-fixes 9ee91f7fb550a4c82f82d9818e42493484c754af +net-current 95c3043008ca8449feb96aba5481fe31c2ea750b +sound-current 00e6a31984cd1adaa7cbb8bb7603e3241b26ef55 +pci-current 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf +wireless-current fc7c976dc7a565213393ce700d4a6105f037bf20 +kbuild-current 0f54088aac3fc744cae0cbc4f021fc377e48a00c +driver-core.current ebf53826e105f488f4f628703a108e98940d1dc5 +tty.current 0f66e50af53d39edebf4bc64ef90077e738c171f +usb.current 721d92fc6373dee15846216f9d178ec240ec0fd7 +staging.current 6a3be6e6e7feb4cb35275475d6a863b748d59cc3 +cpufreq-current 948e1f8f08692e35255aea6e417dc62e347a63c7 +input-current 13abe36f7f3b3d221edac2cb6a326ca66797561b +md-current c6751b2bde477f56ceef67aa1d298ce44e8e2e23 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 9d20b571f5bda7273656e1b86ef91eddc94adacc +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 +rmobile-current ad054cbd7323a675588c7aa5d714a3663c48ca25 +fbdev-current 45f1798484748894c348a76fcf0b9ec43d891795 +devicetree-current 9830fcd6f6a4781d8b46d2b35c13b39f30915c63 +spi-current 8a6afb9a950de01457a4267bcbe3292e56412326 +arm 8016a7e5aaf503a262ba01d2d8ea96556fcc49b5 +davinci d3f5ed67dd2239c5db1949da5919fb99f658b255 +i.MX e4f10ebd98413dd714630473c7358de2c942d959 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm 2ff9870c4cccf97d777bf5551d22303e0176b201 +omap 9eaf60e4834a9001f51b2840ac438afec0726d0c +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 6965f4727f4e62ec3a866d46268cf23333127590 +s5p 00c2af0b9aa516c4780587364486f076f9160de6 +tegra 145d43d75daa1a5bc7ce4992c6f36128e44cac56 +ux500-core 6d4b3da903614d26fb6bcc5aeab97d1008bcf030 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin afe8a887550f7cc24eb16449670b93f6b43c32d8 +cris 60cc10ed86d8aedf464e1a7b95c65b0c3425a9ed +ia64 2016b49522dfec4b139ea2dd2afd90b610baa3b1 +m68k d32dbb3085e6c0633058513871bdac5c9577e822 +m68knommu 6045720286c6d8042f1ac8303f8b1916c6364a6c +microblaze 0eb6aaf52965c14ba3ea245448c4806cfcd1d18c +mips 7ccc13016a363197733c63688f21bb6a521db498 +parisc 7141ee3815191ed4cd2c6b1a7b7f893dea7792ae +powerpc 5d7d8072edc11080a7cf6cc37c9f4e61ca1e93c9 +4xx 21a06b0459f5e3ecdeccacfbf076c229514c1840 +52xx-and-virtex c9de9333f5a860cab82052bce6ac28bcac9b2c26 +galak b49d81ded47e9d01f7128fce50d224ccc2150960 +s390 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 +sh 17292ecc07857bb16737c340dda289ab9d219e05 +rmobile ad054cbd7323a675588c7aa5d714a3663c48ca25 +sparc bb80dd129f6a393884dfd135e6c702ab17c84b4d +tile 81711cee933599fa114abb0d258d8bbabef8adfb +unicore32 2a84029a9974372448e55cc9e556f97acab2e438 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 766fc43973b16f9becb6b7402b3e052dbb84adee +cifs d402539b8fc3fa21f16eb5e654be742670399e8a +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs e0e48d45a911888684f87eef18363b17e5fb0b5b +ext3 6bfac0c20c57777c2317867410a067499f88bf6b +ext4 63a1555068c51e47fcdd3c097e9891ac88e86184 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse c2061de83c45192f9cc48b6bfdec390b56a68351 +gfs2 e79a46a0302a6bf8f879da43c00373b6ed1081ea +hfsplus eb808e2696465c9b8d4ce88fb7180ca9190cb44c +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 44f2c5c841da1b1e0864d768197ab1497b5c2cc1 +nfsd a8f2800b4f7b76cecb7209cb6a7d2b14904fc711 +nilfs2 a5df77b6cbd82ca3cfcd1a36c09fc5053ec97e05 +ocfs2 d6351db2073315ddebac72cc1935e912f60f86e0 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 1bae4ce27c9c90344f23c65ea6966c50ffeae2f5 +udf a4264b3f4049ae7aeeb0017f8158119e22fa354f +v9fs 831d52bc153971b70e64eccfbed2b232394f22f8 +ubifs 8c559d30b4e59cf6994215ada1fe744928f494bf +xfs 24446fc66fdebbdd8baca0f44fd2a47ad77ba580 +vfs f03c65993b98eeb909a4012ce7833c5857d74755 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 0f953bf6b4efa0daddb7c418130a9bd3ee97f7ed +hid ff324be6d65be5fdf349047cab2e5e8bdc0e0962 +i2c 5f9882954520d54f16f6042d82e2004fc33dbaa3 +bjdooks-i2c ebf8869b126d60072602d62999abe3c8d8478156 +jdelvare-hwmon 0a1d8eb6c33ea9213cf32df9c472e3d18c5789c3 +hwmon-staging d9991b51eb6ec2a723c154e4efa0ca39b60622bc +kernel-doc e8a7e48bb248a1196484d3f8afa53bded2b24e71 +v4l-dvb dbcd7c6230b2f3cd79144f95e9008f26d9d6ac48 +kbuild e6e6b1778dfe322dfb82e8539bcea9a594f734b0 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 729a6a300e628a48cf12bac93a964a535e83cd1d +infiniband 4958f8b0856dd7d0b3d50fa7ac5c7b7336fa9198 +acpi c703d12b069736bd7a24af161330781f0efb4617 +idle-test 080c9ff973b4f3683293abf8e8bf66b4f082fe65 +ieee1394 9127803a58498b50443e5e129f7b8acf6b9b0bab +ubi 2fff570e7c8f97e411cd852d64b77b92d9ab8da9 +kvm 2d5a857b6090188638b1cc673c2dd3dbf8937e91 +dlm b9d41052794385f9d47ebb7acf4a772f3ad02398 +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 75c65a5edaa8b815c1428314eaf696788f1ebbdb +async_tx 94ae85220a07d357d4937086c490854f63344de4 +net 2360d2e8f01043632d6b651672bec66c49892f94 +wireless 3ad97fbcc233a295f2ccc2c6bdeb32323e360a5e +bluetooth b212738b6db7934f920592484e0a75910c4e4ebb +mtd 154bf89f5e3e3dc59666926f27ca4a0866f39157 +crypto 36be070ac600d023ada2ec107ee925f5ac5f902b +sound 649b42d29d8e130291977217f8e1c803562e4b12 +sound-asoc 338ee25393a5627e8ded5819147f98b919656ce9 +cpufreq 62bfdfa1de1361b2fb8201c72def1bbca5e7a395 +rr c9ed9331cf7b27b64e7be72fc3455d540f1c391d +input 712a0ff6ad39eef2ec1ea54a082f84210233f9af +input-mt ebf53826e105f488f4f628703a108e98940d1dc5 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 7d22832da96468c9bdca6e194c656accef89247a +device-mapper 52cfd503ad7176d23a5dd7af3981744feb60622f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 106665d937df6eff33c71997a52f7bc3aefa6c12 +battery 6501f728c56f831626d52b236023e556bca37f51 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 4f6de050aad33f164c1b4e8ba280cfdb924b2979 +kgdb 62f6d9b5d890c6dacf17e629d91085937990ccc0 +slab e4889c4e8ffa567a216c66ccd9da1f5bd91cf595 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md c6751b2bde477f56ceef67aa1d298ce44e8e2e23 +mfd 09511cbb1d198e22a012728fc483ce79ada9dc4b +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 56bec7c009872ef33fe452ea75fecba481351b44 +fbdev 45f1798484748894c348a76fcf0b9ec43d891795 +viafb b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 +omap_dss2 18016e35d448d35739f8640b51476709c07e95db +voltage 3107f80937f5ea291f496907a2eec13ea4bfc622 +security-testing 821404434f3324bf23f545050ff64055a149766e +selinux 652bb9b0d6ce007f37c098947b2cc0c45efa3f66 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 7c169fa3b101c92b3b409f852a815a5cfa2b3587 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 7a6610139a1e1d9297dd1c5d178022eac36839cb +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 260752f57ce1a9a8e6b27f94a79e4c454811f679 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 25a64ec1e7d0cfe172832d06a31215d458dfea7f +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 973e76cb324671f69d19666a99dee9d49c646722 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree b5d937de0367d26f65b9af1aef5f2c34c1939be0 +spi 7d48ec3698e7b747efa744fd340b0f2d1dbfd3e0 +tip efca06fd74d5f41832bfbb4ba432b56b6b655d1f +rcu b24efdfdf679cf9b05947c531971905fc727dd40 +oprofile 5ee0fcc34833c7e6acfd8692af33a78ae529d9c5 +xen-two 95efb0d265f40f071519468ab207ebdcaade2849 +xen-pvhvm e0b58be59e4e278480b120ba827b8cfee7c7ddbd +edac-amd 295839e770f95a272d25dc707183cb5f9ba14c1c +percpu 0f06c063628689de5eab5dfb3ce9c797a09db900 +workqueues c534a107e8fe446202b0fab102abc015c56c0317 +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 1a7d946993aaf2a79e9c65abbe169a108e351bcb +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 781a7395d239dbdb59738ca7fe08e71641bf583c +tty 8e6d3fe1af38bea3f6c003f8737d2e3a02d00fa0 +usb ce1fd3585709e833ad102167024e97217734dbfd +staging 939b3f0b1415755d534a20f4067e6b367e1e4021 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-trivial 2a48fc0ab24241755dc93bfd4f01d68efab47f5a +bkl-llseek 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f +bkl-vfs 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 +bkl-config a3ba01b63468c925518da2da0ac3be11358f60cb +irqflags df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..a77290e4ef8c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,190 @@ +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 +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +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 +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +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 +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +msm git git://codeaurora.org/quic/kernel/davidb/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +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/jejb/parisc-2.6.git#for-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#powerpc/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#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +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 +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +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/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-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 +selinux git git://git.infradead.org/users/eparis/selinux.git#master +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 +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 +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-trivial git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#trivial +bkl-llseek git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#llseek +bkl-vfs git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#vfs +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +irqflags git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags.git#master +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +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..93252624142b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4886 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8dbdea8 Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 +Merging origin/master +$ git merge origin/master +Updating 8dbdea8..100b33c +Fast-forward + Makefile | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-imx/mach-mx25_3ds.c | 2 +- + arch/arm/mach-mxs/clock-mx23.c | 4 +- + arch/arm/mach-mxs/clock-mx28.c | 7 +- + arch/arm/mach-mxs/clock.c | 2 - + arch/arm/mach-mxs/gpio.c | 2 + + arch/arm/mach-mxs/include/mach/clock.h | 2 - + arch/arm/mach-omap1/lcd_dma.c | 24 ++-- + arch/arm/mach-omap1/time.c | 1 - + arch/arm/mach-omap2/board-devkit8000.c | 27 +++-- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/board-rm680.c | 3 - + arch/arm/mach-omap2/mux.c | 1 + + arch/arm/mach-omap2/pm34xx.c | 7 +- + arch/arm/mach-omap2/smartreflex.c | 11 +- + arch/arm/mach-omap2/voltage.c | 1 + + arch/arm/plat-mxc/include/mach/uncompress.h | 2 + + arch/arm/tools/mach-types | 105 +++++++++++++++++- + arch/powerpc/include/asm/mmu-book3e.h | 8 +- + arch/powerpc/include/asm/page.h | 2 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 40 ++++---- + arch/powerpc/kernel/cputable.c | 4 +- + arch/powerpc/mm/numa.c | 55 +++++---- + arch/powerpc/platforms/pseries/lpar.c | 37 ++++++ + arch/x86/kernel/acpi/sleep.c | 13 ++- + fs/btrfs/acl.c | 6 + + fs/btrfs/compression.c | 27 ++++- + fs/btrfs/disk-io.c | 7 + + fs/btrfs/export.c | 2 + + fs/btrfs/extent-tree.c | 98 +++++++++++++--- + fs/btrfs/extent_io.c | 6 +- + fs/btrfs/file-item.c | 5 + + fs/btrfs/file.c | 20 +++- + fs/btrfs/free-space-cache.c | 162 ++++++++++++++++---------- + fs/btrfs/inode.c | 35 ++++-- + fs/btrfs/ioctl.c | 19 +++- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/print-tree.c | 1 + + fs/btrfs/relocation.c | 29 +++++- + fs/btrfs/super.c | 9 +- + fs/btrfs/transaction.c | 5 + + fs/btrfs/tree-log.c | 35 ++++++- + fs/btrfs/volumes.c | 19 +++- + fs/cifs/cifsacl.c | 4 + + fs/cifs/cifssmb.c | 5 +- + fs/cifs/connect.c | 22 ++-- + fs/cifs/file.c | 11 +- + fs/cifs/transport.c | 4 + + kernel/cred.c | 16 ++- + security/selinux/hooks.c | 6 +- + sound/arm/aaci.c | 8 +- + 52 files changed, 677 insertions(+), 252 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/merge +Merge made by recursive. + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 29 ++++++++++++++++++++++++++--- + 1 files changed, 26 insertions(+), 3 deletions(-) +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 +Merge made by recursive. + drivers/net/benet/be_cmds.c | 5 +++++ + drivers/net/bnx2x/bnx2x_main.c | 32 +++++++++++++++++++++++--------- + drivers/net/sis900.c | 1 + + net/x25/x25_facilities.c | 28 +++++++++++++++++++--------- + net/x25/x25_in.c | 14 +++++++++++--- + 5 files changed, 59 insertions(+), 21 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 +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Merge made by recursive. + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 2 -- + drivers/net/wireless/ath/ath9k/xmit.c | 7 ++++++- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 2 ++ + drivers/net/wireless/iwlwifi/iwl-agn.c | 6 ++++++ + drivers/net/wireless/wl1251/main.c | 3 +++ + drivers/ssb/pcmcia.c | 2 +- + net/mac80211/cfg.c | 2 ++ + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/status.c | 7 ++++++- + net/mac80211/tx.c | 2 +- + 12 files changed, 30 insertions(+), 9 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Merge made by recursive. + scripts/package/builddeb | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Merge made by recursive. + arch/blackfin/include/asm/bfin_serial.h | 2 ++ + drivers/char/Makefile | 1 + + drivers/{tty/hvc => char}/virtio_console.c | 2 +- + drivers/tty/hvc/Makefile | 1 - + drivers/tty/n_gsm.c | 1 + + drivers/tty/serial/68360serial.c | 1 + + drivers/tty/serial/bfin_5xx.c | 15 ++++++--------- + 7 files changed, 12 insertions(+), 11 deletions(-) + rename drivers/{tty/hvc => char}/virtio_console.c (99%) +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Merge made by recursive. + drivers/usb/class/cdc-acm.c | 1 + + drivers/usb/core/hcd.c | 2 +- + drivers/usb/core/hub.c | 5 ++ + drivers/usb/gadget/Kconfig | 2 + + drivers/usb/gadget/f_mass_storage.c | 3 +- + drivers/usb/gadget/r8a66597-udc.c | 2 +- + drivers/usb/host/Kconfig | 2 + + drivers/usb/host/ehci-au1xxx.c | 2 +- + drivers/usb/host/ehci-hub.c | 7 +++ + drivers/usb/host/ehci-omap.c | 6 +- + drivers/usb/host/ehci-pci.c | 2 +- + drivers/usb/host/sl811-hcd.c | 1 + + drivers/usb/musb/blackfin.c | 1 + + drivers/usb/musb/musb_core.c | 10 +---- + drivers/usb/musb/musb_core.h | 12 ++++++ + drivers/usb/musb/musb_dma.h | 3 + + drivers/usb/musb/musb_gadget.c | 71 ++++++++++++++++++++++---------- + drivers/usb/musb/musb_gadget.h | 8 +++- + drivers/usb/musb/musb_host.c | 11 ++--- + drivers/usb/musb/musbhsdma.h | 19 ++++++-- + drivers/usb/otg/Kconfig | 2 + + drivers/usb/serial/ftdi_sio.c | 27 ++++++++++++ + drivers/usb/serial/ftdi_sio_ids.h | 12 ++++++ + drivers/usb/serial/io_edgeport.c | 4 +- + drivers/usb/serial/ti_usb_3410_5052.c | 2 +- + drivers/usb/storage/unusual_devs.h | 14 ++++++ + include/linux/usb/msm_hsusb_hw.h | 4 -- + 27 files changed, 178 insertions(+), 57 deletions(-) +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Merge made by recursive. + drivers/staging/brcm80211/sys/wl_mac80211.c | 12 ++++++++++-- + drivers/staging/brcm80211/sys/wlc_mac80211.c | 13 +++++++++++++ + drivers/staging/brcm80211/sys/wlc_pub.h | 2 ++ + drivers/staging/hv/netvsc_drv.c | 1 + + drivers/staging/intel_sst/intelmid_v2_control.c | 5 ++++- + 5 files changed, 30 insertions(+), 3 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merging drivers/input/input.c +Merge made by recursive. + drivers/input/input.c | 37 +++++++++--------------------- + drivers/input/misc/rotary_encoder.c | 4 +- + drivers/input/serio/serio.c | 11 +++++--- + drivers/input/touchscreen/ads7846.c | 38 ++++++++++++++++++------------- + drivers/input/touchscreen/wacom_w8001.c | 13 +++++++++- + drivers/tty/sysrq.c | 17 +++++++++++++- + 6 files changed, 69 insertions(+), 51 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/md.c | 38 +++++++++++++++++++++----------- + drivers/md/md.h | 2 - + drivers/md/raid0.c | 40 ++++++++++++++++++++++++++++++++++ + drivers/md/raid5.c | 60 ++++++++++++++++++++++++++-------------------------- + 4 files changed, 95 insertions(+), 45 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Merge made by recursive. + arch/s390/crypto/sha_common.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Merge made by recursive. + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 13 +++++++++---- + 1 files changed, 9 insertions(+), 4 deletions(-) +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Merge made by recursive. + arch/arm/mach-shmobile/board-ag5evm.c | 1 + + arch/arm/mach-shmobile/clock-sh73a0.c | 17 ++++++++++++++--- + 2 files changed, 15 insertions(+), 3 deletions(-) +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Merge made by recursive. + Documentation/arm/Booting | 33 +++- + .../bindings/ata/fsl-sata.txt} | 0 + .../bindings}/eeprom.txt | 0 + .../fsl => devicetree/bindings/gpio}/8xxx_gpio.txt | 0 + .../bindings}/gpio/gpio.txt | 0 + .../bindings}/gpio/led.txt | 0 + .../bindings/i2c/fsl-i2c.txt} | 0 + .../bindings}/marvell.txt | 0 + .../bindings/mmc/fsl-esdhc.txt} | 0 + .../bindings/mmc}/mmc-spi-slot.txt | 0 + .../bindings/mtd/fsl-upm-nand.txt} | 0 + .../bindings/mtd}/mtd-physmap.txt | 0 + .../bindings/net/can/mpc5xxx-mscan.txt} | 0 + .../bindings/net}/can/sja1000.txt | 0 + .../bindings/net/fsl-tsec-phy.txt} | 0 + .../bindings/net/mdio-gpio.txt} | 0 + .../bindings/net}/phy.txt | 0 + .../bindings/pci}/83xx-512x-pci.txt | 0 + .../bindings/powerpc}/4xx/cpm.txt | 0 + .../bindings/powerpc}/4xx/emac.txt | 0 + .../bindings/powerpc}/4xx/ndfc.txt | 0 + .../bindings/powerpc}/4xx/ppc440spe-adma.txt | 0 + .../bindings/powerpc}/4xx/reboot.txt | 0 + .../bindings/powerpc}/fsl/board.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/cpm.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/cpm/brg.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/cpm/i2c.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/cpm/pic.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/cpm/usb.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/gpio.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/network.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe/firmware.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe/par_io.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe/pincfg.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe/ucc.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/qe/usb.txt | 0 + .../bindings/powerpc}/fsl/cpm_qe/serial.txt | 0 + .../bindings/powerpc}/fsl/diu.txt | 0 + .../bindings/powerpc}/fsl/dma.txt | 0 + .../bindings/powerpc/fsl}/ecm.txt | 0 + .../bindings/powerpc}/fsl/gtm.txt | 0 + .../bindings/powerpc}/fsl/guts.txt | 0 + .../bindings/powerpc}/fsl/lbc.txt | 0 + .../bindings/powerpc}/fsl/mcm.txt | 0 + .../bindings/powerpc}/fsl/mcu-mpc8349emitx.txt | 0 + .../bindings/powerpc}/fsl/mpc5121-psc.txt | 0 + .../bindings/powerpc}/fsl/mpc5200.txt | 0 + .../bindings/powerpc}/fsl/mpic.txt | 0 + .../bindings/powerpc}/fsl/msi-pic.txt | 0 + .../bindings/powerpc}/fsl/pmc.txt | 0 + .../bindings/powerpc}/fsl/sec.txt | 0 + .../bindings/powerpc}/fsl/ssi.txt | 0 + .../bindings/powerpc}/nintendo/gamecube.txt | 0 + .../bindings/powerpc}/nintendo/wii.txt | 0 + .../bindings/spi/fsl-spi.txt} | 0 + .../bindings/spi}/spi-bus.txt | 0 + .../bindings/usb/fsl-usb.txt} | 0 + .../bindings/usb}/usb-ehci.txt | 0 + .../bindings}/xilinx.txt | 0 + .../{powerpc => devicetree}/booting-without-of.txt | 193 +++++++++----------- + 61 files changed, 117 insertions(+), 109 deletions(-) + rename Documentation/{powerpc/dts-bindings/fsl/sata.txt => devicetree/bindings/ata/fsl-sata.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/eeprom.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl => devicetree/bindings/gpio}/8xxx_gpio.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/gpio/gpio.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/gpio/led.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/i2c.txt => devicetree/bindings/i2c/fsl-i2c.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/marvell.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/esdhc.txt => devicetree/bindings/mmc/fsl-esdhc.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/mmc}/mmc-spi-slot.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/upm-nand.txt => devicetree/bindings/mtd/fsl-upm-nand.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/mtd}/mtd-physmap.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/can.txt => devicetree/bindings/net/can/mpc5xxx-mscan.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/net}/can/sja1000.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/tsec.txt => devicetree/bindings/net/fsl-tsec-phy.txt} (100%) + rename Documentation/{powerpc/dts-bindings/gpio/mdio.txt => devicetree/bindings/net/mdio-gpio.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/net}/phy.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl => devicetree/bindings/pci}/83xx-512x-pci.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/cpm.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/emac.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/ndfc.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/ppc440spe-adma.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/4xx/reboot.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/board.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/brg.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/i2c.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/pic.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/cpm/usb.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/gpio.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/network.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/firmware.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/par_io.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/pincfg.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/ucc.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/qe/usb.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/cpm_qe/serial.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/diu.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/dma.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc/fsl}/ecm.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/gtm.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/guts.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/lbc.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mcm.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mcu-mpc8349emitx.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpc5121-psc.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpc5200.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/mpic.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/msi-pic.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/pmc.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/sec.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/fsl/ssi.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/nintendo/gamecube.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/powerpc}/nintendo/wii.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/spi.txt => devicetree/bindings/spi/fsl-spi.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/spi}/spi-bus.txt (100%) + rename Documentation/{powerpc/dts-bindings/fsl/usb.txt => devicetree/bindings/usb/fsl-usb.txt} (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings/usb}/usb-ehci.txt (100%) + rename Documentation/{powerpc/dts-bindings => devicetree/bindings}/xilinx.txt (100%) + rename Documentation/{powerpc => devicetree}/booting-without-of.txt (90%) +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Merge made by recursive. + drivers/spi/spi_sh_msiof.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging arm/for-next +$ git merge arm/for-next +Removing Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen +Removing Documentation/arm/Sharp-LH/CompactFlash +Removing Documentation/arm/Sharp-LH/IOBarrier +Removing Documentation/arm/Sharp-LH/KEV7A400 +Removing Documentation/arm/Sharp-LH/LCDPanels +Removing Documentation/arm/Sharp-LH/LPD7A400 +Removing Documentation/arm/Sharp-LH/LPD7A40X +Removing Documentation/arm/Sharp-LH/SDRAM +Removing Documentation/arm/Sharp-LH/VectoredInterruptController +Removing arch/arm/configs/lpd7a400_defconfig +Removing arch/arm/configs/lpd7a404_defconfig +Removing arch/arm/mach-aaec2000/Kconfig +Removing arch/arm/mach-aaec2000/Makefile +Removing arch/arm/mach-aaec2000/Makefile.boot +Removing arch/arm/mach-aaec2000/aaed2000.c +Removing arch/arm/mach-aaec2000/core.c +Removing arch/arm/mach-aaec2000/core.h +Removing arch/arm/mach-aaec2000/include/mach/aaec2000.h +Removing arch/arm/mach-aaec2000/include/mach/aaed2000.h +Removing arch/arm/mach-aaec2000/include/mach/debug-macro.S +Removing arch/arm/mach-aaec2000/include/mach/entry-macro.S +Removing arch/arm/mach-aaec2000/include/mach/hardware.h +Removing arch/arm/mach-aaec2000/include/mach/io.h +Removing arch/arm/mach-aaec2000/include/mach/irqs.h +Removing arch/arm/mach-aaec2000/include/mach/memory.h +Removing arch/arm/mach-aaec2000/include/mach/system.h +Removing arch/arm/mach-aaec2000/include/mach/timex.h +Removing arch/arm/mach-aaec2000/include/mach/uncompress.h +Removing arch/arm/mach-aaec2000/include/mach/vmalloc.h +Removing arch/arm/mach-lh7a40x/Kconfig +Removing arch/arm/mach-lh7a40x/Makefile +Removing arch/arm/mach-lh7a40x/Makefile.boot +Removing arch/arm/mach-lh7a40x/arch-kev7a400.c +Removing arch/arm/mach-lh7a40x/arch-lpd7a40x.c +Removing arch/arm/mach-lh7a40x/clcd.c +Removing arch/arm/mach-lh7a40x/clocks.c +Removing arch/arm/mach-lh7a40x/common.h +Removing arch/arm/mach-lh7a40x/include/mach/clocks.h +Removing arch/arm/mach-lh7a40x/include/mach/constants.h +Removing arch/arm/mach-lh7a40x/include/mach/debug-macro.S +Removing arch/arm/mach-lh7a40x/include/mach/dma.h +Removing arch/arm/mach-lh7a40x/include/mach/entry-macro.S +Removing arch/arm/mach-lh7a40x/include/mach/hardware.h +Removing arch/arm/mach-lh7a40x/include/mach/io.h +Removing arch/arm/mach-lh7a40x/include/mach/irqs.h +Removing arch/arm/mach-lh7a40x/include/mach/memory.h +Removing arch/arm/mach-lh7a40x/include/mach/registers.h +Removing arch/arm/mach-lh7a40x/include/mach/ssp.h +Removing arch/arm/mach-lh7a40x/include/mach/system.h +Removing arch/arm/mach-lh7a40x/include/mach/timex.h +Removing arch/arm/mach-lh7a40x/include/mach/uncompress.h +Removing arch/arm/mach-lh7a40x/include/mach/vmalloc.h +Removing arch/arm/mach-lh7a40x/irq-kev7a400.c +Removing arch/arm/mach-lh7a40x/irq-lh7a400.c +Removing arch/arm/mach-lh7a40x/irq-lh7a404.c +Removing arch/arm/mach-lh7a40x/irq-lpd7a40x.c +Removing arch/arm/mach-lh7a40x/lcd-panel.h +Removing arch/arm/mach-lh7a40x/ssp-cpld.c +Removing arch/arm/mach-lh7a40x/time.c +Removing arch/arm/mach-realview/headsmp.S +Removing arch/arm/mach-realview/localtimer.c +Removing drivers/tty/serial/serial_lh7a40x.c +Auto-merging drivers/usb/gadget/Kconfig +Removing drivers/usb/gadget/lh7a40x_udc.c +Removing drivers/usb/gadget/lh7a40x_udc.h +Removing drivers/usb/host/ohci-lh7a404.c +Merge made by recursive. + Documentation/arm/SH-Mobile/Makefile | 8 + + Documentation/arm/SH-Mobile/vrl4.c | 169 ++ + Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt | 29 + + Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen | 61 - + Documentation/arm/Sharp-LH/CompactFlash | 32 - + Documentation/arm/Sharp-LH/IOBarrier | 45 - + Documentation/arm/Sharp-LH/KEV7A400 | 8 - + Documentation/arm/Sharp-LH/LCDPanels | 59 - + Documentation/arm/Sharp-LH/LPD7A400 | 15 - + Documentation/arm/Sharp-LH/LPD7A40X | 16 - + Documentation/arm/Sharp-LH/SDRAM | 51 - + .../arm/Sharp-LH/VectoredInterruptController | 80 - + arch/arm/Kconfig | 90 +- + arch/arm/Makefile | 7 +- + arch/arm/boot/Makefile | 4 + + arch/arm/boot/compressed/Makefile | 17 +- + arch/arm/boot/compressed/head-shmobile.S | 30 + + arch/arm/boot/compressed/head-vt8500.S | 46 + + arch/arm/boot/compressed/head.S | 2 +- + arch/arm/boot/compressed/misc.c | 2 +- + arch/arm/boot/compressed/mmcif-sh7372.c | 87 + + arch/arm/common/gic.c | 25 +- + arch/arm/configs/lpd7a400_defconfig | 68 - + arch/arm/configs/lpd7a404_defconfig | 81 - + arch/arm/include/asm/bitops.h | 60 +- + arch/arm/include/asm/cacheflush.h | 23 +- + arch/arm/include/asm/cputype.h | 3 +- + arch/arm/include/asm/fncpy.h | 94 + + arch/arm/include/asm/highmem.h | 29 +- + arch/arm/include/asm/memory.h | 66 +- + arch/arm/include/asm/module.h | 19 +- + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 24 +- + arch/arm/include/asm/proc-fns.h | 2 +- + arch/arm/include/asm/setup.h | 6 +- + arch/arm/include/asm/smp_scu.h | 5 + + arch/arm/include/asm/spinlock.h | 37 +- + arch/arm/include/asm/system.h | 17 +- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/include/asm/tls.h | 11 +- + arch/arm/kernel/armksyms.c | 22 +- + arch/arm/kernel/bios32.c | 5 + + arch/arm/kernel/debug.S | 2 +- + arch/arm/kernel/entry-header.S | 14 +- + arch/arm/kernel/head-common.S | 90 - + arch/arm/kernel/head-nommu.S | 3 - + arch/arm/kernel/head.S | 144 +- + arch/arm/kernel/irq.c | 50 +- + arch/arm/kernel/module.c | 50 +- + arch/arm/kernel/perf_event_v6.c | 4 +- + arch/arm/kernel/return_address.c | 1 + + arch/arm/kernel/setup.c | 43 +- + arch/arm/kernel/smp_scu.c | 23 + + arch/arm/kernel/tcm.c | 2 +- + arch/arm/kernel/traps.c | 2 +- + arch/arm/kernel/vmlinux.lds.S | 4 + + arch/arm/lib/bitops.h | 46 +- + arch/arm/lib/changebit.S | 10 +- + arch/arm/lib/clearbit.S | 11 +- + arch/arm/lib/setbit.S | 11 +- + arch/arm/lib/testchangebit.S | 9 +- + arch/arm/lib/testclearbit.S | 9 +- + arch/arm/lib/testsetbit.S | 9 +- + arch/arm/lib/uaccess_with_memcpy.c | 7 +- + arch/arm/mach-aaec2000/Kconfig | 11 - + arch/arm/mach-aaec2000/Makefile | 9 - + arch/arm/mach-aaec2000/Makefile.boot | 1 - + arch/arm/mach-aaec2000/aaed2000.c | 102 - + arch/arm/mach-aaec2000/core.c | 298 --- + arch/arm/mach-aaec2000/core.h | 28 - + arch/arm/mach-aaec2000/include/mach/aaec2000.h | 207 -- + arch/arm/mach-aaec2000/include/mach/aaed2000.h | 40 - + arch/arm/mach-aaec2000/include/mach/debug-macro.S | 35 - + arch/arm/mach-aaec2000/include/mach/entry-macro.S | 40 - + arch/arm/mach-aaec2000/include/mach/hardware.h | 50 - + arch/arm/mach-aaec2000/include/mach/io.h | 18 - + arch/arm/mach-aaec2000/include/mach/irqs.h | 46 - + arch/arm/mach-aaec2000/include/mach/memory.h | 17 - + arch/arm/mach-aaec2000/include/mach/system.h | 24 - + arch/arm/mach-aaec2000/include/mach/timex.h | 18 - + arch/arm/mach-aaec2000/include/mach/uncompress.h | 46 - + arch/arm/mach-aaec2000/include/mach/vmalloc.h | 16 - + arch/arm/mach-at91/include/mach/memory.h | 2 +- + arch/arm/mach-bcmring/include/mach/hardware.h | 2 +- + arch/arm/mach-bcmring/include/mach/memory.h | 2 +- + arch/arm/mach-clps711x/include/mach/memory.h | 2 +- + arch/arm/mach-cns3xxx/include/mach/memory.h | 2 +- + arch/arm/mach-davinci/include/mach/memory.h | 4 +- + arch/arm/mach-dove/Kconfig | 2 +- + arch/arm/mach-dove/include/mach/memory.h | 2 +- + arch/arm/mach-ebsa110/include/mach/memory.h | 2 +- + arch/arm/mach-ep93xx/edb93xx.c | 33 + + arch/arm/mach-ep93xx/gpio.c | 33 +- + arch/arm/mach-ep93xx/include/mach/gpio.h | 2 - + arch/arm/mach-ep93xx/include/mach/memory.h | 10 +- + arch/arm/mach-footbridge/dc21285-timer.c | 84 +- + arch/arm/mach-footbridge/include/mach/memory.h | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 129 +- + arch/arm/mach-gemini/board-nas4220b.c | 1 + + arch/arm/mach-gemini/board-rut1xx.c | 1 + + arch/arm/mach-gemini/board-wbd111.c | 1 + + arch/arm/mach-gemini/board-wbd222.c | 1 + + arch/arm/mach-gemini/common.h | 1 + + arch/arm/mach-gemini/devices.c | 26 + + arch/arm/mach-gemini/include/mach/memory.h | 4 +- + arch/arm/mach-h720x/include/mach/memory.h | 2 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/common.h | 1 + + arch/arm/mach-integrator/core.c | 7 +- + arch/arm/mach-integrator/impd1.c | 5 + + arch/arm/mach-integrator/include/mach/cm.h | 4 +- + arch/arm/mach-integrator/include/mach/memory.h | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 44 +- + arch/arm/mach-integrator/integrator_cp.c | 239 +-- + arch/arm/mach-iop13xx/include/mach/memory.h | 2 +- + arch/arm/mach-iop32x/include/mach/memory.h | 2 +- + arch/arm/mach-iop33x/include/mach/memory.h | 2 +- + arch/arm/mach-ixp2000/include/mach/memory.h | 2 +- + arch/arm/mach-ixp23xx/include/mach/memory.h | 2 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 2 +- + arch/arm/mach-kirkwood/include/mach/memory.h | 2 +- + arch/arm/mach-ks8695/include/mach/memory.h | 2 +- + arch/arm/mach-lh7a40x/Kconfig | 74 - + arch/arm/mach-lh7a40x/Makefile | 17 - + arch/arm/mach-lh7a40x/Makefile.boot | 4 - + arch/arm/mach-lh7a40x/arch-kev7a400.c | 118 -- + arch/arm/mach-lh7a40x/arch-lpd7a40x.c | 422 ---- + arch/arm/mach-lh7a40x/clcd.c | 241 --- + arch/arm/mach-lh7a40x/clocks.c | 108 - + arch/arm/mach-lh7a40x/common.h | 17 - + arch/arm/mach-lh7a40x/include/mach/clocks.h | 18 - + arch/arm/mach-lh7a40x/include/mach/constants.h | 91 - + arch/arm/mach-lh7a40x/include/mach/debug-macro.S | 37 - + arch/arm/mach-lh7a40x/include/mach/dma.h | 86 - + arch/arm/mach-lh7a40x/include/mach/entry-macro.S | 149 -- + arch/arm/mach-lh7a40x/include/mach/hardware.h | 62 - + arch/arm/mach-lh7a40x/include/mach/io.h | 20 - + arch/arm/mach-lh7a40x/include/mach/irqs.h | 200 -- + arch/arm/mach-lh7a40x/include/mach/memory.h | 28 - + arch/arm/mach-lh7a40x/include/mach/registers.h | 224 -- + arch/arm/mach-lh7a40x/include/mach/ssp.h | 70 - + arch/arm/mach-lh7a40x/include/mach/system.h | 19 - + arch/arm/mach-lh7a40x/include/mach/timex.h | 17 - + arch/arm/mach-lh7a40x/include/mach/uncompress.h | 38 - + arch/arm/mach-lh7a40x/include/mach/vmalloc.h | 10 - + arch/arm/mach-lh7a40x/irq-kev7a400.c | 93 - + arch/arm/mach-lh7a40x/irq-lh7a400.c | 91 - + arch/arm/mach-lh7a40x/irq-lh7a404.c | 175 -- + arch/arm/mach-lh7a40x/irq-lpd7a40x.c | 128 -- + arch/arm/mach-lh7a40x/lcd-panel.h | 345 ---- + arch/arm/mach-lh7a40x/ssp-cpld.c | 343 ---- + arch/arm/mach-lh7a40x/time.c | 71 - + arch/arm/mach-loki/include/mach/memory.h | 2 +- + arch/arm/mach-lpc32xx/include/mach/memory.h | 2 +- + arch/arm/mach-mmp/include/mach/memory.h | 2 +- + arch/arm/mach-msm/board-msm7x27.c | 8 +- + arch/arm/mach-msm/board-msm7x30.c | 8 +- + arch/arm/mach-msm/board-qsd8x50.c | 4 +- + arch/arm/mach-msm/board-sapphire.c | 2 +- + arch/arm/mach-msm/include/mach/memory.h | 10 +- + arch/arm/mach-mv78xx0/include/mach/memory.h | 2 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 2 +- + arch/arm/mach-netx/include/mach/memory.h | 2 +- + arch/arm/mach-nomadik/include/mach/memory.h | 2 +- + arch/arm/mach-ns9xxx/include/mach/memory.h | 2 +- + arch/arm/mach-nuc93x/include/mach/memory.h | 2 +- + arch/arm/mach-omap1/include/mach/debug-macro.S | 9 +- + arch/arm/mach-omap1/pm.h | 6 +- + arch/arm/mach-omap1/sleep.S | 3 + + arch/arm/mach-omap1/sram.S | 1 + + arch/arm/mach-omap2/include/mach/debug-macro.S | 13 +- + arch/arm/mach-omap2/pm.h | 2 +- + arch/arm/mach-omap2/sleep24xx.S | 2 + + arch/arm/mach-omap2/sleep34xx.S | 2 + + arch/arm/mach-omap2/sram242x.S | 3 + + arch/arm/mach-omap2/sram243x.S | 3 + + arch/arm/mach-omap2/sram34xx.S | 1 + + arch/arm/mach-orion5x/include/mach/memory.h | 2 +- + arch/arm/mach-pnx4008/include/mach/memory.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/include/mach/memory.h | 2 +- + arch/arm/mach-realview/Kconfig | 5 +- + arch/arm/mach-realview/Makefile | 3 +- + arch/arm/mach-realview/core.c | 233 +-- + arch/arm/mach-realview/core.h | 2 +- + arch/arm/mach-realview/headsmp.S | 40 - + arch/arm/mach-realview/include/mach/memory.h | 4 +- + arch/arm/mach-realview/localtimer.c | 26 - + arch/arm/mach-realview/platsmp.c | 98 +- + arch/arm/mach-realview/realview_eb.c | 24 +- + arch/arm/mach-realview/realview_pb1176.c | 24 +- + arch/arm/mach-realview/realview_pb11mp.c | 24 +- + arch/arm/mach-realview/realview_pba8.c | 24 +- + arch/arm/mach-realview/realview_pbx.c | 24 +- + arch/arm/mach-rpc/include/mach/memory.h | 2 +- + arch/arm/mach-s3c2400/include/mach/memory.h | 2 +- + arch/arm/mach-s3c2410/include/mach/memory.h | 2 +- + arch/arm/mach-s3c24a0/include/mach/memory.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/memory.h | 2 +- + arch/arm/mach-s5p6442/include/mach/memory.h | 2 +- + arch/arm/mach-s5p64x0/include/mach/memory.h | 2 +- + arch/arm/mach-s5pc100/include/mach/memory.h | 2 +- + arch/arm/mach-s5pv210/include/mach/memory.h | 2 +- + arch/arm/mach-s5pv210/sleep.S | 2 +- + arch/arm/mach-s5pv310/include/mach/memory.h | 2 +- + arch/arm/mach-sa1100/include/mach/memory.h | 2 +- + arch/arm/mach-shark/include/mach/memory.h | 2 +- + arch/arm/mach-shmobile/include/mach/memory.h | 2 +- + arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h | 29 + + .../mach-shmobile/include/mach/mmcif-mackerel.h | 39 + + arch/arm/mach-shmobile/include/mach/mmcif.h | 18 + + arch/arm/mach-tcc8k/board-tcc8000-sdk.c | 2 +- + arch/arm/mach-tegra/include/mach/memory.h | 2 +- + arch/arm/mach-u300/include/mach/memory.h | 6 +- + arch/arm/mach-u300/u300.c | 2 +- + arch/arm/mach-ux500/include/mach/memory.h | 2 +- + arch/arm/mach-versatile/core.c | 295 +--- + arch/arm/mach-versatile/core.h | 2 +- + arch/arm/mach-versatile/include/mach/hardware.h | 2 +- + arch/arm/mach-versatile/include/mach/memory.h | 2 +- + arch/arm/mach-versatile/versatile_ab.c | 1 + + arch/arm/mach-versatile/versatile_pb.c | 6 +- + arch/arm/mach-vexpress/Makefile | 3 +- + arch/arm/mach-vexpress/core.h | 1 + + arch/arm/mach-vexpress/ct-ca9x4.c | 70 +- + arch/arm/mach-vexpress/include/mach/memory.h | 2 +- + arch/arm/mach-vexpress/platsmp.c | 94 +- + arch/arm/mach-vexpress/v2m.c | 31 +- + arch/arm/mach-vt8500/Kconfig | 73 + + arch/arm/mach-vt8500/Makefile | 9 + + arch/arm/mach-vt8500/Makefile.boot | 3 + + arch/arm/mach-vt8500/bv07.c | 77 + + arch/arm/mach-vt8500/devices-vt8500.c | 91 + + arch/arm/mach-vt8500/devices-wm8505.c | 99 + + arch/arm/mach-vt8500/devices.c | 270 +++ + arch/arm/mach-vt8500/devices.h | 88 + + arch/arm/mach-vt8500/gpio.c | 240 +++ + arch/arm/mach-vt8500/include/mach/debug-macro.S | 31 + + arch/arm/mach-vt8500/include/mach/entry-macro.S | 32 + + arch/arm/mach-vt8500/include/mach/gpio.h | 6 + + arch/arm/mach-vt8500/include/mach/hardware.h | 12 + + arch/arm/mach-vt8500/include/mach/i8042.h | 18 + + arch/arm/mach-vt8500/include/mach/io.h | 28 + + arch/arm/mach-vt8500/include/mach/irqs.h | 22 + + arch/arm/mach-vt8500/include/mach/memory.h | 28 + + arch/arm/mach-vt8500/include/mach/system.h | 18 + + arch/arm/mach-vt8500/include/mach/timex.h | 26 + + arch/arm/mach-vt8500/include/mach/uncompress.h | 37 + + arch/arm/mach-vt8500/include/mach/vmalloc.h | 20 + + arch/arm/mach-vt8500/include/mach/vt8500_irqs.h | 88 + + arch/arm/mach-vt8500/include/mach/vt8500_regs.h | 79 + + arch/arm/mach-vt8500/include/mach/vt8500fb.h | 31 + + arch/arm/mach-vt8500/include/mach/wm8505_irqs.h | 115 ++ + arch/arm/mach-vt8500/include/mach/wm8505_regs.h | 78 + + arch/arm/mach-vt8500/irq.c | 177 ++ + arch/arm/mach-vt8500/pwm.c | 265 +++ + arch/arm/mach-vt8500/timer.c | 155 ++ + arch/arm/mach-vt8500/wm8505_7in.c | 77 + + arch/arm/mach-w90x900/include/mach/memory.h | 2 +- + arch/arm/mm/Kconfig | 52 +- + arch/arm/mm/Makefile | 1 + + arch/arm/mm/abort-ev6.S | 6 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/fault-armv.c | 7 +- + arch/arm/mm/fault.c | 29 +- + arch/arm/mm/idmap.c | 35 +- + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmap.c | 2 +- + arch/arm/mm/mmu.c | 32 +- + arch/arm/mm/pgd.c | 24 +- + arch/arm/mm/vmregion.c | 17 +- + arch/arm/plat-mxc/include/mach/memory.h | 18 +- + arch/arm/plat-omap/include/plat/memory.h | 4 +- + arch/arm/plat-omap/include/plat/serial.h | 2 +- + arch/arm/plat-omap/include/plat/sram.h | 14 +- + arch/arm/plat-omap/sram.c | 14 +- + arch/arm/plat-spear/include/plat/memory.h | 2 +- + arch/arm/plat-stmp3xxx/include/mach/memory.h | 2 +- + arch/arm/plat-tcc/include/mach/memory.h | 2 +- + arch/arm/plat-versatile/Kconfig | 17 + + arch/arm/plat-versatile/Makefile | 13 +- + arch/arm/plat-versatile/clcd.c | 182 ++ + arch/arm/plat-versatile/fpga-irq.c | 72 + + .../{mach-vexpress => plat-versatile}/headsmp.S | 8 +- + arch/arm/plat-versatile/include/plat/clcd.h | 9 + + arch/arm/plat-versatile/include/plat/fpga-irq.h | 12 + + .../{mach-vexpress => plat-versatile}/localtimer.c | 2 +- + arch/arm/plat-versatile/platsmp.c | 104 + + arch/arm/vfp/vfpmodule.c | 9 +- + drivers/dma/amba-pl08x.c | 53 +- + drivers/mmc/host/mmci.c | 345 +++- + drivers/mmc/host/mmci.h | 15 +- + drivers/net/smc91x.h | 62 - + drivers/tty/serial/Kconfig | 23 - + drivers/tty/serial/Makefile | 1 - + drivers/tty/serial/serial_lh7a40x.c | 682 ------- + drivers/usb/Kconfig | 1 - + drivers/usb/gadget/Kconfig | 12 - + drivers/usb/gadget/Makefile | 1 - + drivers/usb/gadget/gadget_chips.h | 8 - + drivers/usb/gadget/lh7a40x_udc.c | 2152 -------------------- + drivers/usb/gadget/lh7a40x_udc.h | 259 --- + drivers/usb/host/ohci-hcd.c | 5 - + drivers/usb/host/ohci-lh7a404.c | 252 --- + drivers/usb/host/ohci.h | 10 - + drivers/video/Kconfig | 63 - + drivers/video/amba-clcd.c | 103 +- + include/linux/amba/clcd.h | 90 +- + include/linux/amba/mmci.h | 17 + + sound/arm/aaci.c | 282 ++-- + sound/arm/aaci.h | 9 +- + 311 files changed, 5347 insertions(+), 10361 deletions(-) + create mode 100644 Documentation/arm/SH-Mobile/Makefile + create mode 100644 Documentation/arm/SH-Mobile/vrl4.c + create mode 100644 Documentation/arm/SH-Mobile/zboot-rom-mmcif.txt + delete mode 100644 Documentation/arm/Sharp-LH/ADC-LH7-Touchscreen + delete mode 100644 Documentation/arm/Sharp-LH/CompactFlash + delete mode 100644 Documentation/arm/Sharp-LH/IOBarrier + delete mode 100644 Documentation/arm/Sharp-LH/KEV7A400 + delete mode 100644 Documentation/arm/Sharp-LH/LCDPanels + delete mode 100644 Documentation/arm/Sharp-LH/LPD7A400 + delete mode 100644 Documentation/arm/Sharp-LH/LPD7A40X + delete mode 100644 Documentation/arm/Sharp-LH/SDRAM + delete mode 100644 Documentation/arm/Sharp-LH/VectoredInterruptController + create mode 100644 arch/arm/boot/compressed/head-vt8500.S + create mode 100644 arch/arm/boot/compressed/mmcif-sh7372.c + delete mode 100644 arch/arm/configs/lpd7a400_defconfig + delete mode 100644 arch/arm/configs/lpd7a404_defconfig + create mode 100644 arch/arm/include/asm/fncpy.h + delete mode 100644 arch/arm/mach-aaec2000/Kconfig + delete mode 100644 arch/arm/mach-aaec2000/Makefile + delete mode 100644 arch/arm/mach-aaec2000/Makefile.boot + delete mode 100644 arch/arm/mach-aaec2000/aaed2000.c + delete mode 100644 arch/arm/mach-aaec2000/core.c + delete mode 100644 arch/arm/mach-aaec2000/core.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/aaec2000.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/aaed2000.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-aaec2000/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-aaec2000/include/mach/hardware.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/io.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/irqs.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/memory.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/system.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/timex.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-aaec2000/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-lh7a40x/Kconfig + delete mode 100644 arch/arm/mach-lh7a40x/Makefile + delete mode 100644 arch/arm/mach-lh7a40x/Makefile.boot + delete mode 100644 arch/arm/mach-lh7a40x/arch-kev7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/arch-lpd7a40x.c + delete mode 100644 arch/arm/mach-lh7a40x/clcd.c + delete mode 100644 arch/arm/mach-lh7a40x/clocks.c + delete mode 100644 arch/arm/mach-lh7a40x/common.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/clocks.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/constants.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/dma.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/io.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/memory.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/registers.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/ssp.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/system.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/timex.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-lh7a40x/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-lh7a40x/irq-kev7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lh7a400.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lh7a404.c + delete mode 100644 arch/arm/mach-lh7a40x/irq-lpd7a40x.c + delete mode 100644 arch/arm/mach-lh7a40x/lcd-panel.h + delete mode 100644 arch/arm/mach-lh7a40x/ssp-cpld.c + delete mode 100644 arch/arm/mach-lh7a40x/time.c + delete mode 100644 arch/arm/mach-realview/headsmp.S + delete mode 100644 arch/arm/mach-realview/localtimer.c + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif-ap4eb.h + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif-mackerel.h + create mode 100644 arch/arm/mach-shmobile/include/mach/mmcif.h + create mode 100644 arch/arm/mach-vt8500/Kconfig + create mode 100644 arch/arm/mach-vt8500/Makefile + create mode 100644 arch/arm/mach-vt8500/Makefile.boot + create mode 100644 arch/arm/mach-vt8500/bv07.c + create mode 100644 arch/arm/mach-vt8500/devices-vt8500.c + create mode 100644 arch/arm/mach-vt8500/devices-wm8505.c + create mode 100644 arch/arm/mach-vt8500/devices.c + create mode 100644 arch/arm/mach-vt8500/devices.h + create mode 100644 arch/arm/mach-vt8500/gpio.c + create mode 100644 arch/arm/mach-vt8500/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-vt8500/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-vt8500/include/mach/gpio.h + create mode 100644 arch/arm/mach-vt8500/include/mach/hardware.h + create mode 100644 arch/arm/mach-vt8500/include/mach/i8042.h + create mode 100644 arch/arm/mach-vt8500/include/mach/io.h + create mode 100644 arch/arm/mach-vt8500/include/mach/irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/memory.h + create mode 100644 arch/arm/mach-vt8500/include/mach/system.h + create mode 100644 arch/arm/mach-vt8500/include/mach/timex.h + create mode 100644 arch/arm/mach-vt8500/include/mach/uncompress.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500_regs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/vt8500fb.h + create mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_irqs.h + create mode 100644 arch/arm/mach-vt8500/include/mach/wm8505_regs.h + create mode 100644 arch/arm/mach-vt8500/irq.c + create mode 100644 arch/arm/mach-vt8500/pwm.c + create mode 100644 arch/arm/mach-vt8500/timer.c + create mode 100644 arch/arm/mach-vt8500/wm8505_7in.c + create mode 100644 arch/arm/plat-versatile/Kconfig + create mode 100644 arch/arm/plat-versatile/clcd.c + create mode 100644 arch/arm/plat-versatile/fpga-irq.c + rename arch/arm/{mach-vexpress => plat-versatile}/headsmp.S (75%) + create mode 100644 arch/arm/plat-versatile/include/plat/clcd.h + create mode 100644 arch/arm/plat-versatile/include/plat/fpga-irq.h + rename arch/arm/{mach-vexpress => plat-versatile}/localtimer.c (92%) + create mode 100644 arch/arm/plat-versatile/platsmp.c + delete mode 100644 drivers/tty/serial/serial_lh7a40x.c + delete mode 100644 drivers/usb/gadget/lh7a40x_udc.c + delete mode 100644 drivers/usb/gadget/lh7a40x_udc.h + delete mode 100644 drivers/usb/host/ohci-lh7a404.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/board-da850-evm.c | 18 ++- + arch/arm/mach-davinci/board-mityomapl138.c | 83 +++++++- + arch/arm/mach-davinci/board-omapl138-hawk.c | 284 +++++++++++++++++++++++++++ + arch/arm/mach-davinci/da850.c | 83 +++------ + arch/arm/mach-davinci/devices-da8xx.c | 7 + + arch/arm/mach-davinci/gpio-tnetv107x.c | 18 +- + arch/arm/mach-davinci/include/mach/da8xx.h | 7 - + arch/arm/mach-davinci/include/mach/mux.h | 4 + + 8 files changed, 422 insertions(+), 82 deletions(-) +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/Makefile +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 2 - + arch/arm/mach-imx/mach-imx27ipcam.c | 77 + + arch/arm/mach-imx/mach-pca100.c | 4 - + arch/arm/mach-mx3/Kconfig | 14 + + arch/arm/mach-mx3/Makefile | 1 + + arch/arm/mach-mx3/mach-mx31_3ds.c | 10 +- + arch/arm/mach-mx3/mach-mx31ads.c | 21 +- + arch/arm/mach-mx3/mach-pcm037_eet.c | 2 - + arch/arm/mach-mx3/mach-pcm043.c | 10 +- + arch/arm/mach-mx3/mach-vpr200.c | 327 +++ + arch/arm/mach-mx5/Kconfig | 2 + + arch/arm/mach-mx5/board-cpuimx51.c | 4 - + arch/arm/mach-mx5/board-mx50_rdp.c | 31 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 32 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 19 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 17 +- + arch/arm/mach-mx5/board-mx53_evk.c | 36 +- + arch/arm/mach-mx5/board-mx53_loco.c | 29 +- + arch/arm/mach-mx5/board-mx53_smd.c | 24 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 6 +- + .../mach-mx5/{devices-mx50.h => devices-imx50.h} | 8 + + arch/arm/mach-mxs/Kconfig | 4 + + arch/arm/mach-mxs/Makefile | 3 + + arch/arm/mach-mxs/clock-mx28.c | 9 +- + arch/arm/mach-mxs/devices-mx28.h | 14 + + arch/arm/mach-mxs/devices/Kconfig | 7 + + arch/arm/mach-mxs/devices/Makefile | 2 + + arch/arm/mach-mxs/devices/platform-auart.c | 54 + + arch/arm/mach-mxs/devices/platform-flexcan.c | 51 + + arch/arm/mach-mxs/gpio.c | 45 +- + arch/arm/mach-mxs/include/mach/common.h | 1 + + arch/arm/mach-mxs/include/mach/devices-common.h | 22 + + arch/arm/mach-mxs/mach-mx28evk.c | 35 +- + arch/arm/mach-mxs/ocotp.c | 90 + + arch/arm/mach-mxs/pm.c | 43 + + arch/arm/mach-mxs/regs-clkctrl-mx23.h | 124 - + arch/arm/mach-mxs/regs-clkctrl-mx28.h | 177 -- + arch/arm/plat-mxc/devices/platform-fec.c | 5 + + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 10 + + arch/arm/plat-mxc/gpio.c | 1 + + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 2636 +++++++++++++++++--- + arch/arm/plat-mxc/include/mach/uncompress.h | 1 + + drivers/tty/serial/Kconfig | 15 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/mxs-auart.c | 799 ++++++ + 47 files changed, 4049 insertions(+), 786 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27ipcam.c + create mode 100644 arch/arm/mach-mx3/mach-vpr200.c + rename arch/arm/mach-mx5/{devices-mx50.h => devices-imx50.h} (78%) + create mode 100644 arch/arm/mach-mxs/devices/platform-auart.c + create mode 100644 arch/arm/mach-mxs/devices/platform-flexcan.c + create mode 100644 arch/arm/mach-mxs/ocotp.c + create mode 100644 arch/arm/mach-mxs/pm.c + create mode 100644 drivers/tty/serial/mxs-auart.c +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Resolved 'arch/arm/mach-msm/board-msm7x27.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-msm7x30.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-qsd8x50.c' using previous resolution. +Resolved 'arch/arm/mach-msm/board-sapphire.c' using previous resolution. +Resolved 'arch/arm/mach-msm/include/mach/memory.h' using previous resolution. +Auto-merging arch/arm/mach-msm/board-msm7x27.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c +Auto-merging arch/arm/mach-msm/board-msm7x30.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c +Auto-merging arch/arm/mach-msm/board-qsd8x50.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c +Auto-merging arch/arm/mach-msm/board-sapphire.c +CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c +Removing arch/arm/mach-msm/gpiomux-7x30.c +Auto-merging arch/arm/mach-msm/include/mach/memory.h +CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2e151f3] Merge remote branch 'msm/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-msm/Kconfig | 22 ++ + arch/arm/mach-msm/Makefile | 26 +- + arch/arm/mach-msm/board-halibut.c | 2 - + arch/arm/mach-msm/board-mahimahi.c | 2 - + arch/arm/mach-msm/board-msm7x27.c | 8 - + arch/arm/mach-msm/board-msm7x30.c | 28 ++- + arch/arm/mach-msm/board-msm8960.c | 90 +++++++ + arch/arm/mach-msm/board-msm8x60.c | 4 - + arch/arm/mach-msm/board-qsd8x50.c | 85 ++++++- + arch/arm/mach-msm/board-sapphire.c | 2 - + arch/arm/mach-msm/board-trout-gpio.c | 2 - + arch/arm/mach-msm/board-trout.c | 2 - + arch/arm/mach-msm/clock-debug.c | 131 ++++++++++ + arch/arm/mach-msm/clock-pcom.c | 1 + + arch/arm/mach-msm/clock-pcom.h | 4 +- + arch/arm/mach-msm/clock.c | 148 +----------- + arch/arm/mach-msm/clock.h | 52 +---- + arch/arm/mach-msm/devices-msm7x00.c | 4 + + arch/arm/mach-msm/devices-msm7x30.c | 6 +- + arch/arm/mach-msm/devices-msm8960.c | 85 +++++++ + arch/arm/mach-msm/devices-qsd8x50.c | 206 ++++++++++++++++- + arch/arm/mach-msm/devices.h | 3 + + arch/arm/mach-msm/gpiomux-7x30.c | 38 --- + arch/arm/mach-msm/gpiomux-8x50.c | 23 ++ + arch/arm/mach-msm/include/mach/cpu.h | 54 ++++ + arch/arm/mach-msm/include/mach/io.h | 1 + + arch/arm/mach-msm/include/mach/irqs-8960.h | 293 +++++++++++++++++++++++ + arch/arm/mach-msm/include/mach/irqs.h | 3 + + arch/arm/mach-msm/include/mach/memory.h | 2 + + arch/arm/mach-msm/include/mach/mmc.h | 11 + + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 16 +- + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 14 +- + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 48 ++++ + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 22 +-- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 25 +-- + arch/arm/mach-msm/include/mach/msm_iomap.h | 9 +- + arch/arm/mach-msm/io.c | 41 ++- + arch/arm/mach-msm/timer.c | 46 ++-- + drivers/mmc/host/msm_sdcc.c | 40 +++- + drivers/mmc/host/msm_sdcc.h | 1 + + drivers/tty/serial/msm_serial.c | 286 +++++++++++++++++++--- + drivers/tty/serial/msm_serial.h | 28 ++- + drivers/video/msm/msm_fb.c | 11 +- + 43 files changed, 1510 insertions(+), 415 deletions(-) + create mode 100644 arch/arm/mach-msm/board-msm8960.c + create mode 100644 arch/arm/mach-msm/clock-debug.c + create mode 100644 arch/arm/mach-msm/devices-msm8960.c + delete mode 100644 arch/arm/mach-msm/gpiomux-7x30.c + create mode 100644 arch/arm/mach-msm/include/mach/cpu.h + create mode 100644 arch/arm/mach-msm/include/mach/irqs-8960.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_iomap-8960.h +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/plat-omap/sram.c +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_core.h +Auto-merging drivers/usb/musb/musbhsdma.h +Merge made by recursive. + arch/arm/mach-omap1/Makefile | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 14 ++-- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 4 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 13 --- + arch/arm/mach-omap1/board-voiceblue.c | 107 ++++++++++++---------- + arch/arm/mach-omap1/reset.c | 25 +++++ + arch/arm/mach-omap2/Kconfig | 16 ++-- + arch/arm/mach-omap2/Makefile | 20 ++-- + arch/arm/mach-omap2/clock2xxx.h | 4 +- + arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c | 16 ++-- + arch/arm/mach-omap2/common.c | 4 +- + arch/arm/mach-omap2/devices.c | 6 +- + arch/arm/mach-omap2/io.c | 8 +- + arch/arm/mach-omap2/irq.c | 4 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 4 +- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/opp2xxx.h | 2 +- + arch/arm/mach-omap2/pm-debug.c | 8 +- + arch/arm/mach-omap2/powerdomains2xxx_data.c | 6 +- + arch/arm/mach-omap2/prcm.c | 5 +- + arch/arm/mach-omap2/smartreflex.c | 4 +- + arch/arm/plat-omap/counter_32k.c | 4 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-omap/i2c.c | 2 +- + arch/arm/plat-omap/include/plat/cpu.h | 10 +- + arch/arm/plat-omap/include/plat/fpga.h | 92 +++++++++--------- + arch/arm/plat-omap/include/plat/io.h | 4 +- + arch/arm/plat-omap/include/plat/multi.h | 4 +- + arch/arm/plat-omap/include/plat/prcm.h | 1 - + arch/arm/plat-omap/include/plat/system.h | 38 +------- + arch/arm/plat-omap/sram.c | 4 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/spi/omap2_mcspi.c | 4 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_core.h | 6 +- + drivers/usb/musb/musbhsdma.h | 2 +- + drivers/w1/masters/Kconfig | 2 +- + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-mcbsp.h | 4 +- + 44 files changed, 233 insertions(+), 240 deletions(-) + create mode 100644 arch/arm/mach-omap1/reset.c +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 302 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 57 ++++++ + 4 files changed, 356 insertions(+), 17 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Removing arch/arm/plat-s5p/include/plat/sysmmu.h +Merge made by recursive. + arch/arm/mach-s5pc100/include/mach/map.h | 193 ++++++++++++--------------- + arch/arm/mach-s5pv210/include/mach/map.h | 168 ++++++++++++------------ + arch/arm/mach-s5pv210/mach-aquila.c | 52 +++----- + arch/arm/mach-s5pv210/mach-goni.c | 52 +++----- + arch/arm/mach-s5pv310/Kconfig | 1 + + arch/arm/mach-s5pv310/include/mach/map.h | 151 ++++++++++----------- + arch/arm/mach-s5pv310/include/mach/sysmmu.h | 5 +- + arch/arm/plat-s5p/Kconfig | 24 +--- + arch/arm/plat-s5p/Makefile | 2 +- + arch/arm/plat-s5p/include/plat/sysmmu.h | 23 --- + arch/arm/plat-s5p/sysmmu.c | 4 +- + arch/arm/plat-samsung/include/plat/pm.h | 2 + + 12 files changed, 290 insertions(+), 387 deletions(-) + delete mode 100644 arch/arm/plat-s5p/include/plat/sysmmu.h +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/timer.c' using previous resolution. +Auto-merging arch/arm/mach-tegra/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3f84ca7] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Removing arch/arm/mach-ux500/board-mop500-keypads.c +Merge made by recursive. + arch/arm/configs/u8500_defconfig | 60 +++++- + arch/arm/mach-u300/core.c | 179 ++++++++++++++-- + arch/arm/mach-u300/mmc.c | 160 ++------------ + arch/arm/mach-u300/spi.c | 21 ++- + arch/arm/mach-ux500/Makefile | 7 +- + arch/arm/mach-ux500/board-mop500-keypads.c | 229 -------------------- + arch/arm/mach-ux500/board-mop500-regulators.c | 62 ++++++ + arch/arm/mach-ux500/board-mop500-sdi.c | 81 +++++++- + arch/arm/mach-ux500/board-mop500-stuib.c | 197 +++++++++++++++++ + arch/arm/mach-ux500/board-mop500-u8500uib.c | 111 ++++++++++ + arch/arm/mach-ux500/board-mop500-uib.c | 135 ++++++++++++ + arch/arm/mach-ux500/board-mop500.c | 278 +++++++++++++++++++++++-- + arch/arm/mach-ux500/board-mop500.h | 10 +- + arch/arm/mach-ux500/board-u5500-sdi.c | 25 +++ + arch/arm/mach-ux500/board-u5500.c | 6 +- + arch/arm/mach-ux500/clock.c | 6 +- + arch/arm/mach-ux500/cpu-db5500.c | 53 +++++- + arch/arm/mach-ux500/cpu-db8500.c | 25 +++ + arch/arm/mach-ux500/devices-common.h | 7 +- + arch/arm/mach-ux500/devices-db5500.h | 19 +- + arch/arm/mach-ux500/devices-db8500.c | 67 ++++++- + arch/arm/mach-ux500/devices-db8500.h | 15 +- + arch/arm/mach-ux500/dma-db5500.c | 16 ++ + arch/arm/mach-ux500/include/mach/usb.h | 25 +++ + arch/arm/mach-ux500/usb.c | 164 +++++++++++++++ + 25 files changed, 1507 insertions(+), 451 deletions(-) + delete mode 100644 arch/arm/mach-ux500/board-mop500-keypads.c + create mode 100644 arch/arm/mach-ux500/board-mop500-stuib.c + create mode 100644 arch/arm/mach-ux500/board-mop500-u8500uib.c + create mode 100644 arch/arm/mach-ux500/board-mop500-uib.c + create mode 100644 arch/arm/mach-ux500/include/mach/usb.h + create mode 100644 arch/arm/mach-ux500/usb.c +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-v32/kernel/smp.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) +Merging ia64/test +$ git merge ia64/test +Auto-merging fs/Kconfig +Auto-merging include/linux/magic.h +Merge made by recursive. + Documentation/ABI/testing/pstore | 35 ++++ + Documentation/ABI/testing/sysfs-fs-pstore | 7 + + arch/ia64/include/asm/dma-mapping.h | 2 + + drivers/acpi/apei/Kconfig | 1 + + drivers/acpi/apei/erst.c | 136 ++++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/pstore/Kconfig | 13 ++ + fs/pstore/Makefile | 7 + + fs/pstore/inode.c | 285 +++++++++++++++++++++++++++++ + fs/pstore/internal.h | 7 + + fs/pstore/platform.c | 202 ++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/pstore.h | 60 ++++++ + 14 files changed, 758 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/pstore + create mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 fs/pstore/Kconfig + create mode 100644 fs/pstore/Makefile + create mode 100644 fs/pstore/inode.c + create mode 100644 fs/pstore/internal.h + create mode 100644 fs/pstore/platform.c + create mode 100644 include/linux/pstore.h +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/Kconfig | 2 -- + arch/m68k/amiga/chipram.c | 4 ---- + arch/m68k/include/asm/processor.h | 2 ++ + arch/m68k/kernel/signal.c | 24 +++++++++++++++++++++++- + arch/m68k/kernel/traps.c | 20 ++++++++++++-------- + arch/m68k/math-emu/Makefile | 4 ++-- + arch/m68k/mm/fault.c | 16 +--------------- + 7 files changed, 40 insertions(+), 32 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68knommu/platform/68328/entry.S | 1 - + arch/m68knommu/platform/68360/entry.S | 1 - + arch/m68knommu/platform/coldfire/entry.S | 1 - + drivers/net/can/mscan/Kconfig | 2 +- + drivers/watchdog/Kconfig | 6 +- + drivers/watchdog/Makefile | 2 +- + drivers/watchdog/{m548x_wdt.c => m54xx_wdt.c} | 50 ++++++++++++------------ + lib/Kconfig.debug | 2 +- + 8 files changed, 31 insertions(+), 34 deletions(-) + rename drivers/watchdog/{m548x_wdt.c => m54xx_wdt.c} (80%) +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/include/asm/irqflags.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 27 +++++++++++++-------------- + arch/microblaze/kernel/cpu/pvr.c | 4 ++-- + arch/microblaze/kernel/head.S | 15 +++++++-------- + arch/microblaze/kernel/setup.c | 4 ++-- + 5 files changed, 25 insertions(+), 27 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Merge made by recursive. + arch/mips/Kconfig | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) +Merging parisc/for-next +$ git merge parisc/for-next +Merge made by recursive. + arch/parisc/include/asm/cacheflush.h | 7 +- + arch/parisc/include/asm/pgtable.h | 14 +-- + arch/parisc/kernel/cache.c | 109 +++------------- + arch/parisc/kernel/entry.S | 217 +++++++++++++++++------------- + arch/parisc/kernel/pacache.S | 245 +++++++++++++++------------------- + 5 files changed, 260 insertions(+), 332 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Auto-merging arch/powerpc/kernel/cputable.c +Merge made by recursive. + arch/powerpc/boot/dts/canyonlands.dts | 24 +++++ + arch/powerpc/include/asm/cputable.h | 3 +- + arch/powerpc/kernel/cputable.c | 22 ++++- + arch/powerpc/mm/tlb_nohash_low.S | 35 +++++++ + arch/powerpc/platforms/44x/44x.h | 4 + + arch/powerpc/platforms/44x/Kconfig | 1 - + arch/powerpc/platforms/44x/Makefile | 1 + + arch/powerpc/platforms/44x/canyonlands.c | 134 ++++++++++++++++++++++++++++ + arch/powerpc/platforms/44x/ppc44x_simple.c | 1 - + 9 files changed, 218 insertions(+), 7 deletions(-) + create mode 100644 arch/powerpc/platforms/44x/canyonlands.c +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/sh-latest +$ git merge sh/sh-latest +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + arch/sh/drivers/pci/pcie-sh7786.c | 46 +++-- + drivers/tty/serial/sh-sci.c | 425 ++++++++++++++++++------------------- + drivers/tty/serial/sh-sci.h | 39 ---- + drivers/watchdog/Kconfig | 8 - + drivers/watchdog/shwdt.c | 365 +++++++++++++++----------------- + include/linux/serial_sci.h | 16 +- + 6 files changed, 415 insertions(+), 484 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Removing arch/sparc/kernel/tick14.c +Merge made by recursive. + arch/sparc/Kconfig | 34 ++++ + arch/sparc/Makefile | 3 +- + arch/sparc/boot/Makefile | 31 ++++ + arch/sparc/include/asm/irq_64.h | 18 +- + arch/sparc/include/asm/leon_amba.h | 6 + + arch/sparc/include/asm/mmu_32.h | 3 + + arch/sparc/include/asm/smp_32.h | 6 + + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/entry.h | 4 +- + arch/sparc/kernel/ioport.c | 108 +++++++----- + arch/sparc/kernel/irq_32.c | 251 ++++++++++++----------------- + arch/sparc/kernel/irq_64.c | 312 ++++++++++++++++++------------------ + arch/sparc/kernel/kernel.h | 47 ++++++ + arch/sparc/kernel/leon_kernel.c | 9 +- + arch/sparc/kernel/leon_pmc.c | 82 ++++++++++ + arch/sparc/kernel/leon_smp.c | 16 -- + arch/sparc/kernel/pci.c | 10 +- + arch/sparc/kernel/pci_fire.c | 8 +- + arch/sparc/kernel/pci_impl.h | 4 +- + arch/sparc/kernel/pci_msi.c | 44 +++--- + arch/sparc/kernel/pci_sun4v.c | 6 +- + arch/sparc/kernel/prom_irqtrans.c | 16 +- + arch/sparc/kernel/setup_32.c | 19 +-- + arch/sparc/kernel/sun4c_irq.c | 81 +++++----- + arch/sparc/kernel/sun4d_irq.c | 243 +++++++++++++--------------- + arch/sparc/kernel/sun4d_smp.c | 176 ++++++++------------- + arch/sparc/kernel/sun4m_irq.c | 182 +++++++++++---------- + arch/sparc/kernel/sun4m_smp.c | 91 +++-------- + arch/sparc/kernel/tick14.c | 39 ----- + arch/sparc/prom/misc_32.c | 4 - + 31 files changed, 940 insertions(+), 917 deletions(-) + create mode 100644 arch/sparc/kernel/leon_pmc.c + delete mode 100644 arch/sparc/kernel/tick14.c +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Auto-merging MAINTAINERS +Auto-merging drivers/input/serio/i8042.h +Merge made by recursive. + MAINTAINERS | 14 + + arch/unicore32/.gitignore | 21 + + arch/unicore32/Kconfig | 248 ++++++++ + arch/unicore32/Kconfig.debug | 68 ++ + arch/unicore32/Kconfig.puv3 | 125 ++++ + arch/unicore32/Makefile | 97 +++ + arch/unicore32/boot/Makefile | 47 ++ + arch/unicore32/boot/compressed/Makefile | 68 ++ + arch/unicore32/boot/compressed/head.S | 204 ++++++ + arch/unicore32/boot/compressed/misc.c | 126 ++++ + arch/unicore32/boot/compressed/piggy.S.in | 6 + + arch/unicore32/boot/compressed/vmlinux.lds.in | 61 ++ + arch/unicore32/configs/debug_defconfig | 210 +++++++ + arch/unicore32/configs/nb0916_defconfig | 202 ++++++ + arch/unicore32/include/asm/Kbuild | 2 + + arch/unicore32/include/asm/assembler.h | 131 ++++ + arch/unicore32/include/asm/bitops.h | 47 ++ + arch/unicore32/include/asm/byteorder.h | 24 + + arch/unicore32/include/asm/cache.h | 27 + + arch/unicore32/include/asm/cacheflush.h | 211 +++++++ + arch/unicore32/include/asm/checksum.h | 41 ++ + arch/unicore32/include/asm/cpu-single.h | 45 ++ + arch/unicore32/include/asm/cputype.h | 33 + + arch/unicore32/include/asm/delay.h | 52 ++ + arch/unicore32/include/asm/dma-mapping.h | 124 ++++ + arch/unicore32/include/asm/dma.h | 23 + + arch/unicore32/include/asm/elf.h | 94 +++ + arch/unicore32/include/asm/fpstate.h | 26 + + arch/unicore32/include/asm/fpu-ucf64.h | 53 ++ + arch/unicore32/include/asm/futex.h | 143 +++++ + arch/unicore32/include/asm/gpio.h | 103 +++ + arch/unicore32/include/asm/hwcap.h | 32 + + arch/unicore32/include/asm/io.h | 52 ++ + arch/unicore32/include/asm/irq.h | 107 ++++ + arch/unicore32/include/asm/irqflags.h | 53 ++ + arch/unicore32/include/asm/linkage.h | 22 + + arch/unicore32/include/asm/memblock.h | 46 ++ + arch/unicore32/include/asm/memory.h | 123 ++++ + arch/unicore32/include/asm/mmu.h | 17 + + arch/unicore32/include/asm/mmu_context.h | 87 +++ + arch/unicore32/include/asm/mutex.h | 20 + + arch/unicore32/include/asm/page.h | 80 +++ + arch/unicore32/include/asm/pci.h | 46 ++ + arch/unicore32/include/asm/pgalloc.h | 110 ++++ + arch/unicore32/include/asm/pgtable-hwdef.h | 55 ++ + arch/unicore32/include/asm/pgtable.h | 317 ++++++++++ + arch/unicore32/include/asm/processor.h | 92 +++ + arch/unicore32/include/asm/ptrace.h | 133 ++++ + arch/unicore32/include/asm/sigcontext.h | 29 + + arch/unicore32/include/asm/stacktrace.h | 31 + + arch/unicore32/include/asm/string.h | 38 ++ + arch/unicore32/include/asm/suspend.h | 30 + + arch/unicore32/include/asm/system.h | 161 +++++ + arch/unicore32/include/asm/thread_info.h | 154 +++++ + arch/unicore32/include/asm/timex.h | 34 + + arch/unicore32/include/asm/tlb.h | 98 +++ + arch/unicore32/include/asm/tlbflush.h | 195 ++++++ + arch/unicore32/include/asm/traps.h | 21 + + arch/unicore32/include/asm/uaccess.h | 47 ++ + arch/unicore32/include/asm/unistd.h | 18 + + arch/unicore32/include/mach/PKUnity.h | 104 ++++ + arch/unicore32/include/mach/bitfield.h | 24 + + arch/unicore32/include/mach/dma.h | 41 ++ + arch/unicore32/include/mach/hardware.h | 45 ++ + arch/unicore32/include/mach/map.h | 20 + + arch/unicore32/include/mach/memory.h | 58 ++ + arch/unicore32/include/mach/ocd.h | 36 ++ + arch/unicore32/include/mach/pm.h | 43 ++ + arch/unicore32/include/mach/regs-ac97.h | 32 + + arch/unicore32/include/mach/regs-dmac.h | 81 +++ + arch/unicore32/include/mach/regs-gpio.h | 70 +++ + arch/unicore32/include/mach/regs-i2c.h | 63 ++ + arch/unicore32/include/mach/regs-intc.h | 28 + + arch/unicore32/include/mach/regs-nand.h | 79 +++ + arch/unicore32/include/mach/regs-ost.h | 92 +++ + arch/unicore32/include/mach/regs-pci.h | 94 +++ + arch/unicore32/include/mach/regs-pm.h | 126 ++++ + arch/unicore32/include/mach/regs-ps2.h | 20 + + arch/unicore32/include/mach/regs-resetc.h | 34 + + arch/unicore32/include/mach/regs-rtc.h | 37 ++ + arch/unicore32/include/mach/regs-sdc.h | 156 +++++ + arch/unicore32/include/mach/regs-spi.h | 98 +++ + arch/unicore32/include/mach/regs-uart.h | 3 + + arch/unicore32/include/mach/regs-umal.h | 229 +++++++ + arch/unicore32/include/mach/regs-unigfx.h | 200 ++++++ + arch/unicore32/include/mach/uncompress.h | 34 + + arch/unicore32/kernel/Makefile | 34 + + arch/unicore32/kernel/asm-offsets.c | 112 ++++ + arch/unicore32/kernel/clock.c | 388 ++++++++++++ + arch/unicore32/kernel/cpu-ucv2.c | 93 +++ + arch/unicore32/kernel/debug-macro.S | 89 +++ + arch/unicore32/kernel/debug.S | 85 +++ + arch/unicore32/kernel/dma.c | 180 ++++++ + arch/unicore32/kernel/early_printk.c | 59 ++ + arch/unicore32/kernel/elf.c | 38 ++ + arch/unicore32/kernel/entry.S | 824 +++++++++++++++++++++++++ + arch/unicore32/kernel/fpu-ucf64.c | 126 ++++ + arch/unicore32/kernel/gpio.c | 122 ++++ + arch/unicore32/kernel/head.S | 252 ++++++++ + arch/unicore32/kernel/hibernate.c | 160 +++++ + arch/unicore32/kernel/hibernate_asm.S | 117 ++++ + arch/unicore32/kernel/init_task.c | 44 ++ + arch/unicore32/kernel/irq.c | 426 +++++++++++++ + arch/unicore32/kernel/ksyms.c | 99 +++ + arch/unicore32/kernel/ksyms.h | 15 + + arch/unicore32/kernel/module.c | 152 +++++ + arch/unicore32/kernel/pci.c | 404 ++++++++++++ + arch/unicore32/kernel/pm.c | 123 ++++ + arch/unicore32/kernel/process.c | 389 ++++++++++++ + arch/unicore32/kernel/ptrace.c | 149 +++++ + arch/unicore32/kernel/puv3-core.c | 270 ++++++++ + arch/unicore32/kernel/puv3-nb0916.c | 175 ++++++ + arch/unicore32/kernel/puv3-smw0919.c | 115 ++++ + arch/unicore32/kernel/pwm.c | 263 ++++++++ + arch/unicore32/kernel/rtc.c | 380 ++++++++++++ + arch/unicore32/kernel/setup.c | 360 +++++++++++ + arch/unicore32/kernel/setup.h | 30 + + arch/unicore32/kernel/signal.c | 494 +++++++++++++++ + arch/unicore32/kernel/sleep.S | 202 ++++++ + arch/unicore32/kernel/stacktrace.c | 131 ++++ + arch/unicore32/kernel/sys.c | 126 ++++ + arch/unicore32/kernel/time.c | 148 +++++ + arch/unicore32/kernel/traps.c | 333 ++++++++++ + arch/unicore32/kernel/vmlinux.lds.S | 61 ++ + arch/unicore32/lib/Makefile | 27 + + arch/unicore32/lib/backtrace.S | 163 +++++ + arch/unicore32/lib/clear_user.S | 57 ++ + arch/unicore32/lib/copy_from_user.S | 108 ++++ + arch/unicore32/lib/copy_page.S | 39 ++ + arch/unicore32/lib/copy_template.S | 214 +++++++ + arch/unicore32/lib/copy_to_user.S | 96 +++ + arch/unicore32/lib/delay.S | 51 ++ + arch/unicore32/lib/findbit.S | 98 +++ + arch/unicore32/lib/strncpy_from_user.S | 45 ++ + arch/unicore32/lib/strnlen_user.S | 42 ++ + arch/unicore32/mm/Kconfig | 50 ++ + arch/unicore32/mm/Makefile | 15 + + arch/unicore32/mm/alignment.c | 523 ++++++++++++++++ + arch/unicore32/mm/cache-ucv2.S | 212 +++++++ + arch/unicore32/mm/dma-swiotlb.c | 34 + + arch/unicore32/mm/extable.c | 24 + + arch/unicore32/mm/fault.c | 479 ++++++++++++++ + arch/unicore32/mm/flush.c | 98 +++ + arch/unicore32/mm/init.c | 517 ++++++++++++++++ + arch/unicore32/mm/iomap.c | 56 ++ + arch/unicore32/mm/ioremap.c | 261 ++++++++ + arch/unicore32/mm/mm.h | 39 ++ + arch/unicore32/mm/mmu.c | 533 ++++++++++++++++ + arch/unicore32/mm/pgd.c | 102 +++ + arch/unicore32/mm/proc-macros.S | 145 +++++ + arch/unicore32/mm/proc-syms.c | 23 + + arch/unicore32/mm/proc-ucv2.S | 134 ++++ + arch/unicore32/mm/tlb-ucv2.S | 89 +++ + drivers/input/serio/i8042-unicore32io.h | 70 +++ + drivers/input/serio/i8042.h | 2 + + drivers/pci/Makefile | 1 + + include/asm-generic/ftrace.h | 16 + + include/asm-generic/sizes.h | 47 ++ + include/asm-generic/uaccess.h | 8 +- + 159 files changed, 18754 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/.gitignore + create mode 100644 arch/unicore32/Kconfig + create mode 100644 arch/unicore32/Kconfig.debug + create mode 100644 arch/unicore32/Kconfig.puv3 + create mode 100644 arch/unicore32/Makefile + create mode 100644 arch/unicore32/boot/Makefile + create mode 100644 arch/unicore32/boot/compressed/Makefile + create mode 100644 arch/unicore32/boot/compressed/head.S + create mode 100644 arch/unicore32/boot/compressed/misc.c + create mode 100644 arch/unicore32/boot/compressed/piggy.S.in + create mode 100644 arch/unicore32/boot/compressed/vmlinux.lds.in + create mode 100644 arch/unicore32/configs/debug_defconfig + create mode 100644 arch/unicore32/configs/nb0916_defconfig + create mode 100644 arch/unicore32/include/asm/Kbuild + create mode 100644 arch/unicore32/include/asm/assembler.h + create mode 100644 arch/unicore32/include/asm/bitops.h + create mode 100644 arch/unicore32/include/asm/byteorder.h + create mode 100644 arch/unicore32/include/asm/cache.h + create mode 100644 arch/unicore32/include/asm/cacheflush.h + create mode 100644 arch/unicore32/include/asm/checksum.h + create mode 100644 arch/unicore32/include/asm/cpu-single.h + create mode 100644 arch/unicore32/include/asm/cputype.h + create mode 100644 arch/unicore32/include/asm/delay.h + create mode 100644 arch/unicore32/include/asm/dma-mapping.h + create mode 100644 arch/unicore32/include/asm/dma.h + create mode 100644 arch/unicore32/include/asm/elf.h + create mode 100644 arch/unicore32/include/asm/fpstate.h + create mode 100644 arch/unicore32/include/asm/fpu-ucf64.h + create mode 100644 arch/unicore32/include/asm/futex.h + create mode 100644 arch/unicore32/include/asm/gpio.h + create mode 100644 arch/unicore32/include/asm/hwcap.h + create mode 100644 arch/unicore32/include/asm/io.h + create mode 100644 arch/unicore32/include/asm/irq.h + create mode 100644 arch/unicore32/include/asm/irqflags.h + create mode 100644 arch/unicore32/include/asm/linkage.h + create mode 100644 arch/unicore32/include/asm/memblock.h + create mode 100644 arch/unicore32/include/asm/memory.h + create mode 100644 arch/unicore32/include/asm/mmu.h + create mode 100644 arch/unicore32/include/asm/mmu_context.h + create mode 100644 arch/unicore32/include/asm/mutex.h + create mode 100644 arch/unicore32/include/asm/page.h + create mode 100644 arch/unicore32/include/asm/pci.h + create mode 100644 arch/unicore32/include/asm/pgalloc.h + create mode 100644 arch/unicore32/include/asm/pgtable-hwdef.h + create mode 100644 arch/unicore32/include/asm/pgtable.h + create mode 100644 arch/unicore32/include/asm/processor.h + create mode 100644 arch/unicore32/include/asm/ptrace.h + create mode 100644 arch/unicore32/include/asm/sigcontext.h + create mode 100644 arch/unicore32/include/asm/stacktrace.h + create mode 100644 arch/unicore32/include/asm/string.h + create mode 100644 arch/unicore32/include/asm/suspend.h + create mode 100644 arch/unicore32/include/asm/system.h + create mode 100644 arch/unicore32/include/asm/thread_info.h + create mode 100644 arch/unicore32/include/asm/timex.h + create mode 100644 arch/unicore32/include/asm/tlb.h + create mode 100644 arch/unicore32/include/asm/tlbflush.h + create mode 100644 arch/unicore32/include/asm/traps.h + create mode 100644 arch/unicore32/include/asm/uaccess.h + create mode 100644 arch/unicore32/include/asm/unistd.h + create mode 100644 arch/unicore32/include/mach/PKUnity.h + create mode 100644 arch/unicore32/include/mach/bitfield.h + create mode 100644 arch/unicore32/include/mach/dma.h + create mode 100644 arch/unicore32/include/mach/hardware.h + create mode 100644 arch/unicore32/include/mach/map.h + create mode 100644 arch/unicore32/include/mach/memory.h + create mode 100644 arch/unicore32/include/mach/ocd.h + create mode 100644 arch/unicore32/include/mach/pm.h + create mode 100644 arch/unicore32/include/mach/regs-ac97.h + create mode 100644 arch/unicore32/include/mach/regs-dmac.h + create mode 100644 arch/unicore32/include/mach/regs-gpio.h + create mode 100644 arch/unicore32/include/mach/regs-i2c.h + create mode 100644 arch/unicore32/include/mach/regs-intc.h + create mode 100644 arch/unicore32/include/mach/regs-nand.h + create mode 100644 arch/unicore32/include/mach/regs-ost.h + create mode 100644 arch/unicore32/include/mach/regs-pci.h + create mode 100644 arch/unicore32/include/mach/regs-pm.h + create mode 100644 arch/unicore32/include/mach/regs-ps2.h + create mode 100644 arch/unicore32/include/mach/regs-resetc.h + create mode 100644 arch/unicore32/include/mach/regs-rtc.h + create mode 100644 arch/unicore32/include/mach/regs-sdc.h + create mode 100644 arch/unicore32/include/mach/regs-spi.h + create mode 100644 arch/unicore32/include/mach/regs-uart.h + create mode 100644 arch/unicore32/include/mach/regs-umal.h + create mode 100644 arch/unicore32/include/mach/regs-unigfx.h + create mode 100644 arch/unicore32/include/mach/uncompress.h + create mode 100644 arch/unicore32/kernel/Makefile + create mode 100644 arch/unicore32/kernel/asm-offsets.c + create mode 100644 arch/unicore32/kernel/clock.c + create mode 100644 arch/unicore32/kernel/cpu-ucv2.c + create mode 100644 arch/unicore32/kernel/debug-macro.S + create mode 100644 arch/unicore32/kernel/debug.S + create mode 100644 arch/unicore32/kernel/dma.c + create mode 100644 arch/unicore32/kernel/early_printk.c + create mode 100644 arch/unicore32/kernel/elf.c + create mode 100644 arch/unicore32/kernel/entry.S + create mode 100644 arch/unicore32/kernel/fpu-ucf64.c + create mode 100644 arch/unicore32/kernel/gpio.c + create mode 100644 arch/unicore32/kernel/head.S + create mode 100644 arch/unicore32/kernel/hibernate.c + create mode 100644 arch/unicore32/kernel/hibernate_asm.S + create mode 100644 arch/unicore32/kernel/init_task.c + create mode 100644 arch/unicore32/kernel/irq.c + create mode 100644 arch/unicore32/kernel/ksyms.c + create mode 100644 arch/unicore32/kernel/ksyms.h + create mode 100644 arch/unicore32/kernel/module.c + create mode 100644 arch/unicore32/kernel/pci.c + create mode 100644 arch/unicore32/kernel/pm.c + create mode 100644 arch/unicore32/kernel/process.c + create mode 100644 arch/unicore32/kernel/ptrace.c + create mode 100644 arch/unicore32/kernel/puv3-core.c + create mode 100644 arch/unicore32/kernel/puv3-nb0916.c + create mode 100644 arch/unicore32/kernel/puv3-smw0919.c + create mode 100644 arch/unicore32/kernel/pwm.c + create mode 100644 arch/unicore32/kernel/rtc.c + create mode 100644 arch/unicore32/kernel/setup.c + create mode 100644 arch/unicore32/kernel/setup.h + create mode 100644 arch/unicore32/kernel/signal.c + create mode 100644 arch/unicore32/kernel/sleep.S + create mode 100644 arch/unicore32/kernel/stacktrace.c + create mode 100644 arch/unicore32/kernel/sys.c + create mode 100644 arch/unicore32/kernel/time.c + create mode 100644 arch/unicore32/kernel/traps.c + create mode 100644 arch/unicore32/kernel/vmlinux.lds.S + create mode 100644 arch/unicore32/lib/Makefile + create mode 100644 arch/unicore32/lib/backtrace.S + create mode 100644 arch/unicore32/lib/clear_user.S + create mode 100644 arch/unicore32/lib/copy_from_user.S + create mode 100644 arch/unicore32/lib/copy_page.S + create mode 100644 arch/unicore32/lib/copy_template.S + create mode 100644 arch/unicore32/lib/copy_to_user.S + create mode 100644 arch/unicore32/lib/delay.S + create mode 100644 arch/unicore32/lib/findbit.S + create mode 100644 arch/unicore32/lib/strncpy_from_user.S + create mode 100644 arch/unicore32/lib/strnlen_user.S + create mode 100644 arch/unicore32/mm/Kconfig + create mode 100644 arch/unicore32/mm/Makefile + create mode 100644 arch/unicore32/mm/alignment.c + create mode 100644 arch/unicore32/mm/cache-ucv2.S + create mode 100644 arch/unicore32/mm/dma-swiotlb.c + create mode 100644 arch/unicore32/mm/extable.c + create mode 100644 arch/unicore32/mm/fault.c + create mode 100644 arch/unicore32/mm/flush.c + create mode 100644 arch/unicore32/mm/init.c + create mode 100644 arch/unicore32/mm/iomap.c + create mode 100644 arch/unicore32/mm/ioremap.c + create mode 100644 arch/unicore32/mm/mm.h + create mode 100644 arch/unicore32/mm/mmu.c + create mode 100644 arch/unicore32/mm/pgd.c + create mode 100644 arch/unicore32/mm/proc-macros.S + create mode 100644 arch/unicore32/mm/proc-syms.c + create mode 100644 arch/unicore32/mm/proc-ucv2.S + create mode 100644 arch/unicore32/mm/tlb-ucv2.S + create mode 100644 drivers/input/serio/i8042-unicore32io.h + create mode 100644 include/asm-generic/ftrace.h + create mode 100644 include/asm-generic/sizes.h +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 329561f] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + 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 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 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 +Already up-to-date. +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 +Merge made by recursive. + fs/ecryptfs/ecryptfs_kernel.h | 3 +-- + fs/ecryptfs/kthread.c | 19 +++++++++++++++---- + fs/ecryptfs/main.c | 3 +-- + 3 files changed, 17 insertions(+), 8 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/ext3/balloc.c | 10 ++++------ + fs/quota/quota_v2.c | 2 +- + 2 files changed, 5 insertions(+), 7 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. + fs/ext4/mballoc.c | 100 +++++++++++++++++++++++++++++++--------------------- + fs/ext4/page-io.c | 11 +++--- + fs/ext4/super.c | 53 ++++++++++++++++++---------- + 3 files changed, 100 insertions(+), 64 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Auto-merging fs/fuse/dir.c +Merge made by recursive. + fs/fuse/dir.c | 36 +++++++++++++++++++++++++----------- + 1 files changed, 25 insertions(+), 11 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/acl.c | 7 +- + fs/gfs2/file.c | 15 ++- + fs/gfs2/glock.c | 392 +++++++++++++++++++------------------------------- + fs/gfs2/glock.h | 39 +++--- + fs/gfs2/glops.c | 23 ++-- + fs/gfs2/incore.h | 5 +- + fs/gfs2/lock_dlm.c | 14 +-- + fs/gfs2/lops.c | 3 +- + fs/gfs2/main.c | 6 +- + fs/gfs2/ops_fstype.c | 7 +- + fs/gfs2/ops_inode.c | 10 +- + fs/gfs2/quota.c | 6 +- + 12 files changed, 216 insertions(+), 311 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + 1 files changed, 27 insertions(+), 8 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 43f5c2d] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +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 +Merge made by recursive. + fs/nilfs2/dir.c | 5 +-- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/inode.c | 19 +++------ + fs/nilfs2/ioctl.c | 92 +++++++++++++++++++++++++++++++++++++++++++++ + fs/nilfs2/nilfs.h | 18 +++++++++ + fs/nilfs2/the_nilfs.c | 11 +++-- + include/linux/nilfs2_fs.h | 24 ++---------- + 7 files changed, 130 insertions(+), 41 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Auto-merging fs/ubifs/super.c +Merge made by recursive. + fs/ubifs/commit.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++- + fs/ubifs/debug.c | 6 ++-- + fs/ubifs/io.c | 12 +++++++--- + fs/ubifs/recovery.c | 21 ++++++++++++++++++ + fs/ubifs/scan.c | 2 +- + fs/ubifs/super.c | 11 +-------- + fs/ubifs/tnc.c | 10 ++++++-- + fs/ubifs/ubifs.h | 21 ++++++++--------- + 8 files changed, 109 insertions(+), 32 deletions(-) +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 vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +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 +Auto-merging drivers/hid/Kconfig +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-arvo | 53 ++ + .../ABI/testing/sysfs-driver-hid-roccat-kone | 8 + + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 11 + + .../ABI/testing/sysfs-driver-hid-roccat-kovaplus | 100 +++ + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 9 + + Documentation/ioctl/ioctl-number.txt | 1 + + drivers/hid/Kconfig | 29 + + drivers/hid/Makefile | 4 + + drivers/hid/hid-core.c | 3 + + drivers/hid/hid-ids.h | 8 + + drivers/hid/hid-lcpower.c | 70 ++ + drivers/hid/hid-multitouch.c | 26 +- + drivers/hid/hid-roccat-arvo.c | 450 ++++++++++++ + drivers/hid/hid-roccat-arvo.h | 98 +++ + drivers/hid/hid-roccat-common.c | 62 ++ + drivers/hid/hid-roccat-common.h | 23 + + drivers/hid/hid-roccat-kone.c | 156 ++--- + drivers/hid/hid-roccat-koneplus.c | 165 ++--- + drivers/hid/hid-roccat-kovaplus.c | 715 ++++++++++++++++++++ + drivers/hid/hid-roccat-kovaplus.h | 157 +++++ + drivers/hid/hid-roccat-pyra.c | 174 ++---- + drivers/hid/hid-roccat.c | 53 ++- + drivers/hid/hidraw.c | 2 +- + {drivers/hid => include/linux}/hid-roccat.h | 19 +- + 24 files changed, 2018 insertions(+), 378 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-arvo + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-kovaplus + create mode 100644 drivers/hid/hid-lcpower.c + create mode 100644 drivers/hid/hid-roccat-arvo.c + create mode 100644 drivers/hid/hid-roccat-arvo.h + create mode 100644 drivers/hid/hid-roccat-common.c + create mode 100644 drivers/hid/hid-roccat-common.h + create mode 100644 drivers/hid/hid-roccat-kovaplus.c + create mode 100644 drivers/hid/hid-roccat-kovaplus.h + rename {drivers/hid => include/linux}/hid-roccat.h (52%) +Merging quilt/i2c +$ git merge quilt/i2c +Removing include/linux/i2c-id.h +Merge made by recursive. + include/linux/i2c-id.h | 37 ------------------------------------- + include/linux/i2c.h | 1 - + 2 files changed, 0 insertions(+), 38 deletions(-) + delete mode 100644 include/linux/i2c-id.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/i2c/busses/i2c-diolan-u2c | 26 ++ + MAINTAINERS | 6 + + drivers/i2c/busses/Kconfig | 10 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-diolan-u2c.c | 535 +++++++++++++++++++++++++++++++ + drivers/i2c/busses/i2c-omap.c | 28 ++ + drivers/i2c/busses/i2c-stu300.c | 2 +- + 7 files changed, 607 insertions(+), 1 deletions(-) + create mode 100644 Documentation/i2c/busses/i2c-diolan-u2c + create mode 100644 drivers/i2c/busses/i2c-diolan-u2c.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/w83795 | 127 ++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 127 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwmon/w83795 +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Merge made by recursive. + Documentation/hwmon/max6639 | 49 +++ + drivers/hwmon/Kconfig | 10 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/lis3lv02d_spi.c | 19 +- + drivers/hwmon/max6639.c | 653 +++++++++++++++++++++++++++++++++++++++++ + include/linux/i2c/max6639.h | 14 + + 6 files changed, 737 insertions(+), 9 deletions(-) + create mode 100644 Documentation/hwmon/max6639 + create mode 100644 drivers/hwmon/max6639.c + create mode 100644 include/linux/i2c/max6639.h +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + Documentation/DocBook/media-entities.tmpl | 8 + + Documentation/DocBook/v4l/common.xml | 2 + + Documentation/DocBook/v4l/compat.xml | 11 + + Documentation/DocBook/v4l/dev-capture.xml | 13 +- + Documentation/DocBook/v4l/dev-output.xml | 13 +- + Documentation/DocBook/v4l/func-mmap.xml | 10 +- + Documentation/DocBook/v4l/func-munmap.xml | 3 +- + Documentation/DocBook/v4l/io.xml | 283 +++- + Documentation/DocBook/v4l/pixfmt-nv12m.xml | 154 ++ + Documentation/DocBook/v4l/pixfmt-yuv420m.xml | 162 ++ + Documentation/DocBook/v4l/pixfmt.xml | 118 ++- + Documentation/DocBook/v4l/planar-apis.xml | 81 + + Documentation/DocBook/v4l/v4l2.xml | 22 +- + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 2 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 15 +- + Documentation/DocBook/v4l/vidioc-qbuf.xml | 24 +- + Documentation/DocBook/v4l/vidioc-querybuf.xml | 14 +- + Documentation/DocBook/v4l/vidioc-querycap.xml | 24 +- + Documentation/dvb/get_dvb_firmware | 8 +- + drivers/media/common/tuners/tuner-types.c | 21 + + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 2 + + drivers/media/dvb/dvb-usb/dib0700_core.c | 47 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1410 ++++++++++++++-- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 6 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 2 + + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 +++++++++ + drivers/media/dvb/frontends/Kconfig | 8 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/dib0090.c | 1595 +++++++++++++---- + drivers/media/dvb/frontends/dib0090.h | 31 + + drivers/media/dvb/frontends/dib7000p.c | 1945 +++++++++++++++------ + drivers/media/dvb/frontends/dib7000p.h | 96 +- + drivers/media/dvb/frontends/dib8000.c | 821 ++++++---- + drivers/media/dvb/frontends/dib8000.h | 20 + + drivers/media/dvb/frontends/dib9000.c | 2350 +++++++++++++++++++++++++ + drivers/media/dvb/frontends/dib9000.h | 131 ++ + drivers/media/dvb/frontends/dibx000_common.c | 279 +++- + drivers/media/dvb/frontends/dibx000_common.h | 152 ++- + drivers/media/dvb/frontends/stv090x.c | 286 +++- + drivers/media/dvb/frontends/stv090x.h | 16 + + drivers/media/dvb/frontends/stv090x_reg.h | 16 +- + drivers/media/dvb/ngene/Makefile | 3 + + drivers/media/dvb/ngene/ngene-cards.c | 179 ++- + drivers/media/dvb/ngene/ngene-core.c | 236 ++- + drivers/media/dvb/ngene/ngene-dvb.c | 71 +- + drivers/media/dvb/ngene/ngene.h | 24 + + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 + + drivers/media/video/Kconfig | 36 +- + drivers/media/video/Makefile | 7 + + drivers/media/video/adv7343.c | 167 +-- + drivers/media/video/adv7343_regs.h | 8 +- + drivers/media/video/bt819.c | 129 +- + drivers/media/video/cs5345.c | 87 +- + drivers/media/video/cx18/cx18-av-audio.c | 92 +- + drivers/media/video/cx18/cx18-av-core.c | 175 +-- + drivers/media/video/cx18/cx18-av-core.h | 12 +- + drivers/media/video/cx18/cx18-controls.c | 285 +--- + drivers/media/video/cx18/cx18-controls.h | 7 +- + drivers/media/video/cx18/cx18-driver.c | 30 +- + drivers/media/video/cx18/cx18-driver.h | 2 +- + drivers/media/video/cx18/cx18-fileops.c | 32 +- + drivers/media/video/cx18/cx18-ioctl.c | 24 +- + drivers/media/video/cx18/cx18-mailbox.c | 5 +- + drivers/media/video/cx18/cx18-mailbox.h | 5 - + drivers/media/video/cx18/cx18-streams.c | 16 +- + drivers/media/video/mem2mem_testdev.c | 227 ++-- + drivers/media/video/noon010pc30.c | 792 +++++++++ + drivers/media/video/s5p-fimc/fimc-capture.c | 550 ++++--- + drivers/media/video/s5p-fimc/fimc-core.c | 872 +++++----- + drivers/media/video/s5p-fimc/fimc-core.h | 134 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 199 ++- + drivers/media/video/s5p-fimc/regs-fimc.h | 29 +- + drivers/media/video/saa7110.c | 115 +- + drivers/media/video/saa7134/saa7134-cards.c | 39 + + drivers/media/video/saa7134/saa7134-core.c | 35 +- + drivers/media/video/saa7134/saa7134-input.c | 1 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/tlv320aic23b.c | 74 +- + drivers/media/video/tvp514x.c | 236 +-- + drivers/media/video/tvp5150.c | 157 +-- + drivers/media/video/tvp7002.c | 117 +- + drivers/media/video/v4l2-compat-ioctl32.c | 229 ++- + drivers/media/video/v4l2-ioctl.c | 455 +++++- + drivers/media/video/v4l2-mem2mem.c | 232 ++-- + drivers/media/video/videobuf2-core.c | 1804 +++++++++++++++++++ + drivers/media/video/videobuf2-dma-contig.c | 185 ++ + drivers/media/video/videobuf2-dma-sg.c | 292 +++ + drivers/media/video/videobuf2-memops.c | 232 +++ + drivers/media/video/videobuf2-vmalloc.c | 132 ++ + drivers/media/video/vivi.c | 585 ++++--- + drivers/media/video/vpx3220.c | 137 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cxd2099/Kconfig | 11 + + drivers/staging/cxd2099/Makefile | 5 + + drivers/staging/cxd2099/TODO | 12 + + drivers/staging/cxd2099/cxd2099.c | 574 ++++++ + drivers/staging/cxd2099/cxd2099.h | 41 + + include/linux/videodev2.h | 131 ++- + include/media/noon010pc30.h | 28 + + include/media/rc-map.h | 1 + + include/media/{s3c_fimc.h => s5p_fimc.h} | 20 +- + include/media/tuner.h | 1 + + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-ioctl.h | 16 + + include/media/v4l2-mem2mem.h | 56 +- + include/media/videobuf2-core.h | 380 ++++ + include/media/videobuf2-dma-contig.h | 29 + + include/media/videobuf2-dma-sg.h | 32 + + include/media/videobuf2-memops.h | 45 + + include/media/videobuf2-vmalloc.h | 20 + + 115 files changed, 17691 insertions(+), 4326 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12m.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420m.xml + create mode 100644 Documentation/DocBook/v4l/planar-apis.xml + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + create mode 100644 drivers/media/dvb/frontends/dib9000.c + create mode 100644 drivers/media/dvb/frontends/dib9000.h + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + create mode 100644 drivers/media/video/noon010pc30.c + create mode 100644 drivers/media/video/videobuf2-core.c + create mode 100644 drivers/media/video/videobuf2-dma-contig.c + create mode 100644 drivers/media/video/videobuf2-dma-sg.c + create mode 100644 drivers/media/video/videobuf2-memops.c + create mode 100644 drivers/media/video/videobuf2-vmalloc.c + create mode 100644 drivers/staging/cxd2099/Kconfig + create mode 100644 drivers/staging/cxd2099/Makefile + create mode 100644 drivers/staging/cxd2099/TODO + create mode 100644 drivers/staging/cxd2099/cxd2099.c + create mode 100644 drivers/staging/cxd2099/cxd2099.h + create mode 100644 include/media/noon010pc30.h + rename include/media/{s3c_fimc.h => s5p_fimc.h} (75%) + create mode 100644 include/media/videobuf2-core.h + create mode 100644 include/media/videobuf2-dma-contig.h + create mode 100644 include/media/videobuf2-dma-sg.h + create mode 100644 include/media/videobuf2-memops.h + create mode 100644 include/media/videobuf2-vmalloc.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging Makefile +Merge made by recursive. + Makefile | 7 +- + scripts/setlocalversion | 14 ++- + scripts/tags.sh | 9 ++ + scripts/unifdef.c | 247 +++++++++++++++++++++++++++++++++++------------ + 4 files changed, 206 insertions(+), 71 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/nes/nes_hw.c | 32 ++++++++++++++++++++------------ + 1 files changed, 20 insertions(+), 12 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging drivers/acpi/acpica/acglobal.h +Auto-merging drivers/acpi/acpica/acobject.h +Auto-merging drivers/acpi/acpica/evmisc.c +Auto-merging drivers/acpi/acpica/nsinit.c +Auto-merging drivers/acpi/acpica/utmutex.c +Auto-merging include/acpi/actbl1.h +Merge made by recursive. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging drivers/idle/intel_idle.c +Merge made by recursive. + arch/x86/include/asm/msr-index.h | 4 ++++ + drivers/idle/intel_idle.c | 30 ++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 0 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-card.c | 5 ++- + drivers/firewire/core-cdev.c | 54 ++++++++++++++++++---------------- + drivers/firewire/core-device.c | 3 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/ohci.c | 59 +++++++++++++++++++++++++++++++++++-- + include/linux/firewire.h | 2 +- + 6 files changed, 91 insertions(+), 34 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 2 +- + drivers/mtd/ubi/io.c | 13 +++++++++++-- + 2 files changed, 12 insertions(+), 3 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Merge made by recursive. + arch/x86/kvm/svm.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging MAINTAINERS +Removing drivers/scsi/mpt2sas/mpi/mpi2_history.txt +Auto-merging drivers/scsi/mpt2sas/mpt2sas_base.c +Merge made by recursive. + Documentation/scsi/hpsa.txt | 6 + + Documentation/scsi/scsi_mid_low_api.txt | 14 +- + MAINTAINERS | 3 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 3 + + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 51 +---- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.h | 19 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 - + drivers/scsi/cxgbi/libcxgbi.c | 30 +-- + drivers/scsi/cxgbi/libcxgbi.h | 3 - + drivers/scsi/device_handler/scsi_dh.c | 112 +++------ + drivers/scsi/device_handler/scsi_dh_alua.c | 16 +- + drivers/scsi/hpsa.c | 223 +++++++++-------- + drivers/scsi/hpsa.h | 4 + + drivers/scsi/hpsa_cmd.h | 1 + + drivers/scsi/libsas/Kconfig | 8 - + drivers/scsi/libsas/Makefile | 4 - + drivers/scsi/libsas/sas_ata.c | 59 +---- + drivers/scsi/libsas/sas_dump.c | 4 - + drivers/scsi/libsas/sas_dump.h | 12 - + drivers/scsi/libsas/sas_internal.h | 6 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 6 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 384 ---------------------------- + drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 7 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 8 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 128 ++++++---- + drivers/scsi/mpt2sas/mpt2sas_base.h | 40 +++- + drivers/scsi/osd/osd_initiator.c | 20 ++- + drivers/scsi/scsi_devinfo.c | 85 ++++++ + drivers/scsi/scsi_priv.h | 2 + + include/scsi/scsi_device.h | 1 + + 32 files changed, 467 insertions(+), 803 deletions(-) + delete mode 100644 drivers/scsi/mpt2sas/mpi/mpi2_history.txt +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Resolved 'Documentation/feature-removal-schedule.txt' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Removing drivers/net/wireless/ath/ath9k/virtual.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Removing net/ipv4/fib_hash.c +Auto-merging net/mac80211/tx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3fb6379] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 7 + + Documentation/networking/batman-adv.txt | 16 +- + MAINTAINERS | 2 + + drivers/net/atl1c/atl1c_hw.c | 15 +- + drivers/net/atl1c/atl1c_hw.h | 43 +- + drivers/net/atl1e/atl1e_ethtool.c | 12 +- + drivers/net/atl1e/atl1e_hw.c | 34 +- + drivers/net/atl1e/atl1e_hw.h | 111 +- + drivers/net/atl1e/atl1e_main.c | 4 +- + drivers/net/benet/be_ethtool.c | 25 +- + drivers/net/benet/be_main.c | 98 +- + drivers/net/bna/bnad.c | 108 +- + drivers/net/bna/bnad.h | 2 +- + drivers/net/bnx2.c | 8 +- + drivers/net/bnx2.h | 4 +- + drivers/net/bnx2x/bnx2x.h | 31 +- + drivers/net/bnx2x/bnx2x_cmn.c | 70 +- + drivers/net/bnx2x/bnx2x_cmn.h | 6 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 2 +- + drivers/net/bnx2x/bnx2x_hsi.h | 114 +- + drivers/net/bnx2x/bnx2x_link.c | 2527 +++++++------ + drivers/net/bnx2x/bnx2x_link.h | 34 +- + drivers/net/bnx2x/bnx2x_main.c | 569 +++- + drivers/net/bnx2x/bnx2x_reg.h | 1 + + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/bonding/bond_sysfs.c | 4 +- + drivers/net/cnic.c | 170 +- + drivers/net/cnic.h | 2 +- + drivers/net/cnic_if.h | 8 +- + drivers/net/e1000e/e1000.h | 5 +- + drivers/net/e1000e/ethtool.c | 52 +- + drivers/net/e1000e/ich8lan.c | 3 +- + drivers/net/e1000e/lib.c | 4 +- + drivers/net/e1000e/netdev.c | 117 +- + drivers/net/e1000e/phy.c | 8 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 7 +- + drivers/net/enic/enic_dev.c | 221 ++ + drivers/net/enic/enic_dev.h | 41 + + drivers/net/enic/enic_main.c | 307 +-- + drivers/net/enic/vnic_dev.c | 19 - + drivers/net/enic/vnic_dev.h | 8 - + drivers/net/enic/vnic_rq.h | 5 - + drivers/net/hamradio/bpqether.c | 5 +- + drivers/net/igb/e1000_82575.c | 1 + + drivers/net/igb/e1000_hw.h | 1 + + drivers/net/igb/igb_main.c | 1 + + drivers/net/macvtap.c | 18 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/ppp_generic.c | 148 +- + drivers/net/sfc/ethtool.c | 4 +- + drivers/net/sfc/net_driver.h | 2 +- + drivers/net/smc91x.c | 13 + + drivers/net/sungem.c | 58 +- + drivers/net/sungem.h | 1 - + drivers/net/tg3.c | 163 +- + drivers/net/tg3.h | 13 +- + drivers/net/tlan.c | 3773 ++++++++++---------- + drivers/net/tlan.h | 192 +- + drivers/net/tun.c | 2 +- + drivers/net/typhoon.c | 3 +- + drivers/net/veth.c | 12 - + drivers/net/via-velocity.c | 9 + + drivers/net/via-velocity.h | 8 +- + drivers/net/vxge/vxge-config.c | 32 +- + drivers/net/vxge/vxge-config.h | 10 + + drivers/net/vxge/vxge-main.c | 216 +- + drivers/net/vxge/vxge-main.h | 23 +- + drivers/net/vxge/vxge-traffic.c | 116 +- + drivers/net/vxge/vxge-traffic.h | 14 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wireless/ath/ar9170/main.c | 3 +- + drivers/net/wireless/ath/ath.h | 2 + + drivers/net/wireless/ath/ath5k/Kconfig | 11 + + drivers/net/wireless/ath/ath5k/ahb.c | 7 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 18 +- + drivers/net/wireless/ath/ath5k/attach.c | 4 +- + drivers/net/wireless/ath/ath5k/base.c | 114 +- + drivers/net/wireless/ath/ath5k/base.h | 3 - + drivers/net/wireless/ath/ath5k/caps.c | 48 +- + drivers/net/wireless/ath/ath5k/debug.c | 20 - + drivers/net/wireless/ath/ath5k/debug.h | 10 - + drivers/net/wireless/ath/ath5k/eeprom.c | 24 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 28 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 9 + + drivers/net/wireless/ath/ath5k/pci.c | 9 +- + drivers/net/wireless/ath/ath5k/qcu.c | 46 +- + drivers/net/wireless/ath/ath5k/reg.h | 15 +- + drivers/net/wireless/ath/ath5k/trace.h | 107 + + drivers/net/wireless/ath/ath9k/Makefile | 1 - + drivers/net/wireless/ath/ath9k/ahb.c | 13 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 5 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 26 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 8 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 + + drivers/net/wireless/ath/ath9k/ath9k.h | 108 +- + drivers/net/wireless/ath/ath9k/beacon.c | 34 +- + drivers/net/wireless/ath/ath9k/calib.c | 5 +- + drivers/net/wireless/ath/ath9k/common.h | 2 - + drivers/net/wireless/ath/ath9k/debug.c | 429 ++- + drivers/net/wireless/ath/ath9k/debug.h | 17 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 32 + + drivers/net/wireless/ath/ath9k/eeprom.h | 2 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 41 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 45 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 38 +- + drivers/net/wireless/ath/ath9k/gpio.c | 3 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 29 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 9 +- + drivers/net/wireless/ath/ath9k/hw.c | 64 +- + drivers/net/wireless/ath/ath9k/hw.h | 4 + + drivers/net/wireless/ath/ath9k/init.c | 35 +- + drivers/net/wireless/ath/ath9k/mac.c | 14 +- + drivers/net/wireless/ath/ath9k/mac.h | 2 + + drivers/net/wireless/ath/ath9k/main.c | 601 ++-- + drivers/net/wireless/ath/ath9k/pci.c | 20 +- + drivers/net/wireless/ath/ath9k/rc.c | 3 +- + drivers/net/wireless/ath/ath9k/recv.c | 171 +- + drivers/net/wireless/ath/ath9k/reg.h | 17 + + drivers/net/wireless/ath/ath9k/virtual.c | 717 ---- + drivers/net/wireless/ath/ath9k/xmit.c | 280 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 1 + + drivers/net/wireless/ath/carl9170/fw.c | 15 + + drivers/net/wireless/ath/carl9170/fwcmd.h | 1 + + drivers/net/wireless/ath/carl9170/fwdesc.h | 28 +- + drivers/net/wireless/ath/carl9170/hw.h | 25 + + drivers/net/wireless/ath/carl9170/main.c | 9 +- + drivers/net/wireless/ath/carl9170/tx.c | 3 + + drivers/net/wireless/ath/carl9170/version.h | 8 +- + drivers/net/wireless/ath/carl9170/wlan.h | 20 +- + drivers/net/wireless/ath/regd.c | 7 + + drivers/net/wireless/ath/regd.h | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 26 +- + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 1 + + drivers/net/wireless/iwlwifi/iwl-2000.c | 556 +++ + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 27 - + drivers/net/wireless/iwlwifi/iwl-3945.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 52 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 51 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rx.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 43 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 180 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 30 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 6 + + drivers/net/wireless/iwlwifi/iwl-core.c | 27 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 25 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 14 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 110 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 59 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 + + drivers/net/wireless/iwlwifi/iwl-led.c | 201 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-legacy.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 13 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 3 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 3 +- + drivers/net/wireless/mwl8k.c | 456 +++- + drivers/net/wireless/rt2x00/rt2400pci.c | 165 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 159 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 - + drivers/net/wireless/rt2x00/rt2800.h | 10 + + drivers/net/wireless/rt2x00/rt2800lib.c | 107 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 4 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 228 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 9 +- + drivers/net/wireless/rt2x00/rt2x00.h | 35 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 74 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 24 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 44 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 60 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 2 - + drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +- + drivers/net/wireless/rt2x00/rt61pci.c | 226 +- + drivers/net/wireless/rt2x00/rt73usb.c | 49 +- + drivers/net/wireless/rtlwifi/core.c | 3 +- + drivers/net/wireless/wl1251/rx.c | 3 +- + drivers/net/wireless/wl12xx/acx.c | 160 +- + drivers/net/wireless/wl12xx/acx.h | 91 +- + drivers/net/wireless/wl12xx/boot.c | 35 +- + drivers/net/wireless/wl12xx/cmd.c | 308 ++- + drivers/net/wireless/wl12xx/cmd.h | 147 +- + drivers/net/wireless/wl12xx/conf.h | 76 +- + drivers/net/wireless/wl12xx/debugfs.c | 49 +- + drivers/net/wireless/wl12xx/event.c | 7 +- + drivers/net/wireless/wl12xx/event.h | 8 +- + drivers/net/wireless/wl12xx/init.c | 387 ++- + drivers/net/wireless/wl12xx/init.h | 2 +- + drivers/net/wireless/wl12xx/main.c | 1116 +++++-- + drivers/net/wireless/wl12xx/rx.c | 16 +- + drivers/net/wireless/wl12xx/rx.h | 11 +- + drivers/net/wireless/wl12xx/sdio.c | 1 + + drivers/net/wireless/wl12xx/spi.c | 2 + + drivers/net/wireless/wl12xx/tx.c | 105 +- + drivers/net/wireless/wl12xx/tx.h | 10 +- + drivers/net/wireless/wl12xx/wl12xx.h | 88 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 11 +- + include/linux/audit.h | 2 + + include/linux/cpu_rmap.h | 73 + + include/linux/dccp.h | 2 - + include/linux/if_link.h | 1 + + include/linux/interrupt.h | 33 +- + include/linux/ip_vs.h | 8 + + include/linux/irqdesc.h | 3 + + include/linux/netdevice.h | 141 +- + include/linux/netfilter.h | 27 +- + include/linux/netfilter/Kbuild | 6 + + include/linux/netfilter/ipset/Kbuild | 4 + + include/linux/netfilter/ipset/ip_set.h | 452 +++ + include/linux/netfilter/ipset/ip_set_ahash.h | 1074 ++++++ + include/linux/netfilter/ipset/ip_set_bitmap.h | 31 + + include/linux/netfilter/ipset/ip_set_getport.h | 21 + + include/linux/netfilter/ipset/ip_set_hash.h | 26 + + include/linux/netfilter/ipset/ip_set_list.h | 27 + + include/linux/netfilter/ipset/ip_set_timeout.h | 127 + + include/linux/netfilter/ipset/pfxlen.h | 35 + + include/linux/netfilter/nf_conntrack_snmp.h | 9 + + include/linux/netfilter/nfnetlink.h | 3 +- + include/linux/netfilter/nfnetlink_conntrack.h | 9 + + include/linux/netfilter/x_tables.h | 3 +- + include/linux/netfilter/xt_AUDIT.h | 30 + + include/linux/netfilter/xt_CT.h | 12 +- + include/linux/netfilter/xt_NFQUEUE.h | 6 + + include/linux/netfilter/xt_TCPOPTSTRIP.h | 4 +- + include/linux/netfilter/xt_TPROXY.h | 10 +- + include/linux/netfilter/xt_cluster.h | 10 +- + include/linux/netfilter/xt_comment.h | 2 +- + include/linux/netfilter/xt_connlimit.h | 16 +- + include/linux/netfilter/xt_conntrack.h | 15 + + include/linux/netfilter/xt_devgroup.h | 21 + + include/linux/netfilter/xt_quota.h | 8 +- + include/linux/netfilter/xt_set.h | 56 + + include/linux/netfilter/xt_socket.h | 2 + + include/linux/netfilter/xt_time.h | 16 +- + include/linux/netfilter/xt_u32.h | 18 +- + include/linux/netfilter_bridge/ebt_802_3.h | 26 +- + include/linux/netfilter_bridge/ebt_among.h | 4 +- + include/linux/netfilter_bridge/ebt_arp.h | 6 +- + include/linux/netfilter_bridge/ebt_ip.h | 14 +- + include/linux/netfilter_bridge/ebt_ip6.h | 25 +- + include/linux/netfilter_bridge/ebt_limit.h | 10 +- + include/linux/netfilter_bridge/ebt_log.h | 8 +- + include/linux/netfilter_bridge/ebt_mark_m.h | 6 +- + include/linux/netfilter_bridge/ebt_nflog.h | 12 +- + include/linux/netfilter_bridge/ebt_pkttype.h | 6 +- + include/linux/netfilter_bridge/ebt_stp.h | 26 +- + include/linux/netfilter_bridge/ebt_ulog.h | 4 +- + include/linux/netfilter_bridge/ebt_vlan.h | 10 +- + include/linux/netfilter_ipv4/ipt_CLUSTERIP.h | 16 +- + include/linux/netfilter_ipv4/ipt_ECN.h | 8 +- + include/linux/netfilter_ipv4/ipt_SAME.h | 8 +- + include/linux/netfilter_ipv4/ipt_TTL.h | 6 +- + include/linux/netfilter_ipv4/ipt_addrtype.h | 16 +- + include/linux/netfilter_ipv4/ipt_ah.h | 6 +- + include/linux/netfilter_ipv4/ipt_ecn.h | 10 +- + include/linux/netfilter_ipv4/ipt_ttl.h | 6 +- + include/linux/netfilter_ipv6/ip6t_HL.h | 6 +- + include/linux/netfilter_ipv6/ip6t_REJECT.h | 4 +- + include/linux/netfilter_ipv6/ip6t_ah.h | 10 +- + include/linux/netfilter_ipv6/ip6t_frag.h | 10 +- + include/linux/netfilter_ipv6/ip6t_hl.h | 6 +- + include/linux/netfilter_ipv6/ip6t_ipv6header.h | 8 +- + include/linux/netfilter_ipv6/ip6t_mh.h | 6 +- + include/linux/netfilter_ipv6/ip6t_opts.h | 12 +- + include/linux/netfilter_ipv6/ip6t_rt.h | 13 +- + include/linux/pkt_sched.h | 41 + + include/linux/skbuff.h | 11 +- + include/net/cfg80211.h | 3 +- + include/net/dst.h | 115 +- + include/net/dst_ops.h | 1 + + include/net/flow.h | 3 +- + include/net/icmp.h | 3 - + include/net/ieee80211_radiotap.h | 25 + + include/net/inet_sock.h | 8 +- + include/net/inetpeer.h | 16 +- + include/net/ip_fib.h | 23 +- + include/net/ip_vs.h | 297 ++- + include/net/mac80211.h | 20 +- + include/net/net_namespace.h | 2 + + include/net/netfilter/nf_conntrack.h | 23 +- + include/net/netfilter/nf_conntrack_ecache.h | 12 +- + include/net/netfilter/nf_conntrack_extend.h | 10 + + include/net/netfilter/nf_conntrack_helper.h | 6 + + include/net/netfilter/nf_conntrack_l3proto.h | 2 +- + include/net/netfilter/nf_conntrack_timestamp.h | 65 + + include/net/netfilter/nf_nat.h | 6 + + include/net/netfilter/nf_nat_core.h | 4 +- + include/net/netlink.h | 9 + + include/net/netns/conntrack.h | 4 +- + include/net/netns/ip_vs.h | 143 + + include/net/netns/ipv4.h | 1 - + include/net/protocol.h | 4 +- + include/net/route.h | 6 + + include/net/sch_generic.h | 59 +- + include/net/sock.h | 2 +- + include/net/tcp.h | 14 +- + include/net/udp.h | 2 +- + kernel/audit.c | 2 + + kernel/irq/manage.c | 82 + + lib/Kconfig | 4 + + lib/Makefile | 2 + + lib/cpu_rmap.c | 269 ++ + net/8021q/vlan.c | 2 +- + net/9p/trans_rdma.c | 1 - + net/Kconfig | 6 + + net/batman-adv/Makefile | 2 +- + net/batman-adv/aggregation.c | 2 +- + net/batman-adv/aggregation.h | 2 +- + net/batman-adv/bat_debugfs.c | 6 +- + net/batman-adv/bat_debugfs.h | 2 +- + net/batman-adv/bat_sysfs.c | 2 +- + net/batman-adv/bat_sysfs.h | 2 +- + net/batman-adv/bitarray.c | 2 +- + net/batman-adv/bitarray.h | 2 +- + net/batman-adv/gateway_client.c | 2 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/gateway_common.c | 2 +- + net/batman-adv/gateway_common.h | 2 +- + net/batman-adv/hard-interface.c | 13 +- + net/batman-adv/hard-interface.h | 6 +- + net/batman-adv/hash.c | 2 +- + net/batman-adv/hash.h | 7 +- + net/batman-adv/icmp_socket.c | 2 +- + net/batman-adv/icmp_socket.h | 2 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 17 +- + net/batman-adv/originator.c | 4 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/packet.h | 3 +- + net/batman-adv/ring_buffer.c | 2 +- + net/batman-adv/ring_buffer.h | 2 +- + net/batman-adv/routing.c | 26 +- + net/batman-adv/routing.h | 5 +- + net/batman-adv/send.c | 6 +- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/soft-interface.h | 2 +- + net/batman-adv/translation-table.c | 2 +- + net/batman-adv/translation-table.h | 2 +- + net/batman-adv/types.h | 2 +- + net/batman-adv/unicast.c | 15 +- + net/batman-adv/unicast.h | 25 +- + net/batman-adv/vis.c | 2 +- + net/batman-adv/vis.h | 2 +- + net/bridge/br_if.c | 4 +- + net/bridge/br_private.h | 2 +- + net/bridge/netfilter/ebt_ip6.c | 46 +- + net/bridge/netfilter/ebtables.c | 1 + + net/caif/cfcnfg.c | 2 - + net/caif/cfdgml.c | 1 - + net/caif/cfserl.c | 1 - + net/caif/cfutill.c | 2 +- + net/caif/cfveil.c | 2 +- + net/core/dev.c | 251 +- + net/core/dst.c | 39 + + net/core/ethtool.c | 2 +- + net/core/filter.c | 6 +- + net/core/neighbour.c | 13 +- + net/core/net-sysfs.c | 17 +- + net/core/pktgen.c | 234 +- + net/core/rtnetlink.c | 43 +- + net/core/skbuff.c | 4 +- + net/dccp/ccids/ccid2.c | 9 + + net/decnet/dn_route.c | 18 +- + net/decnet/dn_table.c | 1 - + net/ipv4/Kconfig | 42 +- + net/ipv4/Makefile | 4 +- + net/ipv4/af_inet.c | 2 +- + net/ipv4/fib_frontend.c | 23 +- + net/ipv4/fib_hash.c | 1133 ------ + net/ipv4/fib_lookup.h | 2 +- + net/ipv4/fib_rules.c | 10 +- + net/ipv4/fib_semantics.c | 125 +- + net/ipv4/fib_trie.c | 207 +- + net/ipv4/icmp.c | 49 +- + net/ipv4/inetpeer.c | 44 + + net/ipv4/ip_input.c | 2 +- + net/ipv4/netfilter/Kconfig | 3 +- + net/ipv4/netfilter/arp_tables.c | 2 + + net/ipv4/netfilter/ip_tables.c | 2 + + net/ipv4/netfilter/ipt_CLUSTERIP.c | 7 +- + net/ipv4/netfilter/ipt_LOG.c | 3 +- + net/ipv4/netfilter/iptable_mangle.c | 2 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 17 +- + net/ipv4/netfilter/nf_nat_amanda.c | 8 +- + net/ipv4/netfilter/nf_nat_core.c | 33 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 9 +- + net/ipv4/route.c | 158 +- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv4/xfrm4_policy.c | 4 + + net/ipv6/af_inet6.c | 2 +- + net/ipv6/icmp.c | 16 +- + net/ipv6/ip6_output.c | 5 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/netfilter/ip6_tables.c | 2 + + net/ipv6/netfilter/ip6t_LOG.c | 3 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +- + net/ipv6/raw.c | 14 +- + net/ipv6/route.c | 44 +- + net/ipv6/sit.c | 23 +- + net/ipv6/udp.c | 2 +- + net/ipv6/xfrm6_policy.c | 2 + + net/mac80211/agg-rx.c | 7 +- + net/mac80211/agg-tx.c | 23 +- + net/mac80211/debugfs_netdev.c | 14 + + net/mac80211/driver-ops.h | 6 +- + net/mac80211/driver-trace.h | 213 +- + net/mac80211/ibss.c | 3 +- + net/mac80211/main.c | 1 + + net/mac80211/mesh.c | 4 +- + net/mac80211/mlme.c | 24 +- + net/mac80211/rx.c | 44 +- + net/mac80211/scan.c | 3 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/tx.c | 17 +- + net/netfilter/Kconfig | 66 +- + net/netfilter/Makefile | 9 + + net/netfilter/core.c | 20 +- + net/netfilter/ipset/Kconfig | 121 + + net/netfilter/ipset/Makefile | 24 + + net/netfilter/ipset/ip_set_bitmap_ip.c | 587 +++ + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 652 ++++ + net/netfilter/ipset/ip_set_bitmap_port.c | 515 +++ + net/netfilter/ipset/ip_set_core.c | 1671 +++++++++ + net/netfilter/ipset/ip_set_getport.c | 141 + + net/netfilter/ipset/ip_set_hash_ip.c | 464 +++ + net/netfilter/ipset/ip_set_hash_ipport.c | 544 +++ + net/netfilter/ipset/ip_set_hash_ipportip.c | 562 +++ + net/netfilter/ipset/ip_set_hash_ipportnet.c | 628 ++++ + net/netfilter/ipset/ip_set_hash_net.c | 458 +++ + net/netfilter/ipset/ip_set_hash_netport.c | 578 +++ + net/netfilter/ipset/ip_set_list_set.c | 584 +++ + net/netfilter/ipset/pfxlen.c | 291 ++ + net/netfilter/ipvs/ip_vs_app.c | 98 +- + net/netfilter/ipvs/ip_vs_conn.c | 195 +- + net/netfilter/ipvs/ip_vs_core.c | 376 ++- + net/netfilter/ipvs/ip_vs_ctl.c | 892 +++-- + net/netfilter/ipvs/ip_vs_est.c | 134 +- + net/netfilter/ipvs/ip_vs_ftp.c | 61 +- + net/netfilter/ipvs/ip_vs_lblc.c | 67 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 72 +- + net/netfilter/ipvs/ip_vs_nfct.c | 6 +- + net/netfilter/ipvs/ip_vs_pe.c | 17 +- + net/netfilter/ipvs/ip_vs_pe_sip.c | 3 + + net/netfilter/ipvs/ip_vs_proto.c | 129 +- + net/netfilter/ipvs/ip_vs_proto_ah_esp.c | 45 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 153 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 142 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 110 +- + net/netfilter/ipvs/ip_vs_sync.c | 1239 +++++-- + net/netfilter/ipvs/ip_vs_xmit.c | 26 +- + net/netfilter/nf_conntrack_broadcast.c | 82 + + net/netfilter/nf_conntrack_core.c | 57 +- + net/netfilter/nf_conntrack_expect.c | 34 +- + net/netfilter/nf_conntrack_extend.c | 11 +- + net/netfilter/nf_conntrack_helper.c | 20 +- + net/netfilter/nf_conntrack_netbios_ns.c | 74 +- + net/netfilter/nf_conntrack_netlink.c | 49 +- + net/netfilter/nf_conntrack_proto.c | 24 +- + net/netfilter/nf_conntrack_proto_dccp.c | 3 + + net/netfilter/nf_conntrack_proto_sctp.c | 1 + + net/netfilter/nf_conntrack_proto_tcp.c | 14 +- + net/netfilter/nf_conntrack_snmp.c | 77 + + net/netfilter/nf_conntrack_standalone.c | 45 +- + net/netfilter/nf_conntrack_timestamp.c | 120 + + net/netfilter/nf_log.c | 6 +- + net/netfilter/nf_queue.c | 82 +- + net/netfilter/nfnetlink_log.c | 6 +- + net/netfilter/nfnetlink_queue.c | 22 +- + net/netfilter/x_tables.c | 98 +- + net/netfilter/xt_AUDIT.c | 204 ++ + net/netfilter/xt_CLASSIFY.c | 36 +- + net/netfilter/xt_IDLETIMER.c | 2 + + net/netfilter/xt_LED.c | 2 + + net/netfilter/xt_NFQUEUE.c | 34 +- + net/netfilter/xt_connlimit.c | 62 +- + net/netfilter/xt_conntrack.c | 75 +- + net/netfilter/xt_cpu.c | 2 + + net/netfilter/xt_devgroup.c | 82 + + net/netfilter/xt_iprange.c | 18 +- + net/netfilter/xt_ipvs.c | 2 +- + net/netfilter/xt_set.c | 359 ++ + net/packet/af_packet.c | 7 +- + net/rds/rds.h | 1 - + net/sched/Kconfig | 28 +- + net/sched/Makefile | 3 + + net/sched/act_api.c | 46 +- + net/sched/act_csum.c | 2 +- + net/sched/act_gact.c | 8 +- + net/sched/act_ipt.c | 16 +- + net/sched/act_mirred.c | 4 +- + net/sched/act_nat.c | 2 +- + net/sched/act_pedit.c | 10 +- + net/sched/act_police.c | 9 +- + net/sched/act_simple.c | 10 +- + net/sched/act_skbedit.c | 8 +- + net/sched/cls_api.c | 33 +- + net/sched/cls_basic.c | 17 +- + net/sched/cls_cgroup.c | 8 +- + net/sched/cls_flow.c | 6 +- + net/sched/cls_fw.c | 38 +- + net/sched/cls_route.c | 126 +- + net/sched/cls_rsvp.h | 95 +- + net/sched/cls_tcindex.c | 2 +- + net/sched/cls_u32.c | 77 +- + net/sched/em_cmp.c | 47 +- + net/sched/em_meta.c | 44 +- + net/sched/em_nbyte.c | 3 +- + net/sched/em_text.c | 3 +- + net/sched/em_u32.c | 2 +- + net/sched/ematch.c | 37 +- + net/sched/sch_api.c | 169 +- + net/sched/sch_atm.c | 16 +- + net/sched/sch_cbq.c | 362 +- + net/sched/sch_choke.c | 677 ++++ + net/sched/sch_dsmark.c | 21 +- + net/sched/sch_fifo.c | 22 +- + net/sched/sch_generic.c | 40 +- + net/sched/sch_gred.c | 85 +- + net/sched/sch_hfsc.c | 37 +- + net/sched/sch_htb.c | 106 +- + net/sched/sch_mq.c | 1 - + net/sched/sch_mqprio.c | 416 +++ + net/sched/sch_multiq.c | 8 +- + net/sched/sch_netem.c | 8 +- + net/sched/sch_prio.c | 34 +- + net/sched/sch_red.c | 61 +- + net/sched/sch_sfq.c | 67 +- + net/sched/sch_tbf.c | 39 +- + net/sched/sch_teql.c | 36 +- + net/unix/af_unix.c | 66 +- + net/wanrouter/wanmain.c | 2 - + net/wireless/nl80211.c | 6 +- + net/wireless/reg.c | 6 +- + net/wireless/util.c | 47 +- + net/wireless/wext-compat.c | 5 +- + 554 files changed, 30390 insertions(+), 12213 deletions(-) + create mode 100644 drivers/net/enic/enic_dev.c + create mode 100644 drivers/net/enic/enic_dev.h + create mode 100644 drivers/net/wireless/ath/ath5k/trace.h + delete mode 100644 drivers/net/wireless/ath/ath9k/virtual.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-2000.c + create mode 100644 include/linux/cpu_rmap.h + create mode 100644 include/linux/netfilter/ipset/Kbuild + create mode 100644 include/linux/netfilter/ipset/ip_set.h + create mode 100644 include/linux/netfilter/ipset/ip_set_ahash.h + create mode 100644 include/linux/netfilter/ipset/ip_set_bitmap.h + create mode 100644 include/linux/netfilter/ipset/ip_set_getport.h + create mode 100644 include/linux/netfilter/ipset/ip_set_hash.h + create mode 100644 include/linux/netfilter/ipset/ip_set_list.h + create mode 100644 include/linux/netfilter/ipset/ip_set_timeout.h + create mode 100644 include/linux/netfilter/ipset/pfxlen.h + create mode 100644 include/linux/netfilter/nf_conntrack_snmp.h + create mode 100644 include/linux/netfilter/xt_AUDIT.h + create mode 100644 include/linux/netfilter/xt_devgroup.h + create mode 100644 include/linux/netfilter/xt_set.h + create mode 100644 include/net/netfilter/nf_conntrack_timestamp.h + create mode 100644 include/net/netns/ip_vs.h + create mode 100644 lib/cpu_rmap.c + delete mode 100644 net/ipv4/fib_hash.c + create mode 100644 net/netfilter/ipset/Kconfig + create mode 100644 net/netfilter/ipset/Makefile + create mode 100644 net/netfilter/ipset/ip_set_bitmap_ip.c + create mode 100644 net/netfilter/ipset/ip_set_bitmap_ipmac.c + create mode 100644 net/netfilter/ipset/ip_set_bitmap_port.c + create mode 100644 net/netfilter/ipset/ip_set_core.c + create mode 100644 net/netfilter/ipset/ip_set_getport.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ip.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipport.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipportip.c + create mode 100644 net/netfilter/ipset/ip_set_hash_ipportnet.c + create mode 100644 net/netfilter/ipset/ip_set_hash_net.c + create mode 100644 net/netfilter/ipset/ip_set_hash_netport.c + create mode 100644 net/netfilter/ipset/ip_set_list_set.c + create mode 100644 net/netfilter/ipset/pfxlen.c + create mode 100644 net/netfilter/nf_conntrack_broadcast.c + create mode 100644 net/netfilter/nf_conntrack_snmp.c + create mode 100644 net/netfilter/nf_conntrack_timestamp.c + create mode 100644 net/netfilter/xt_AUDIT.c + create mode 100644 net/netfilter/xt_devgroup.c + create mode 100644 net/netfilter/xt_set.c + create mode 100644 net/sched/sch_choke.c + create mode 100644 net/sched/sch_mqprio.c +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/wl1251/main.c +Auto-merging net/mac80211/cfg.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/status.c +Auto-merging net/mac80211/tx.c +Merge made by recursive. + drivers/net/wireless/ath/ath5k/phy.c | 142 +++++--- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 + + drivers/net/wireless/ath/ath9k/beacon.c | 5 +- + drivers/net/wireless/ath/ath9k/common.c | 11 + + drivers/net/wireless/ath/ath9k/common.h | 2 + + drivers/net/wireless/ath/ath9k/debug.c | 23 ++- + drivers/net/wireless/ath/ath9k/htc.h | 1 - + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 3 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 24 +- + drivers/net/wireless/ath/ath9k/main.c | 96 +++--- + drivers/net/wireless/ath/key.c | 5 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 1 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 32 ++- + drivers/net/wireless/iwlwifi/iwl-6000.c | 3 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 28 -- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 8 - + drivers/net/wireless/iwlwifi/iwl-agn.c | 87 ++++-- + drivers/net/wireless/iwlwifi/iwl-commands.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 14 +- + drivers/net/wireless/libertas/cmd.c | 10 +- + drivers/net/wireless/libertas/dev.h | 2 + + drivers/net/wireless/libertas/if_spi.c | 368 +++++++++++++------- + drivers/net/wireless/libertas/main.c | 77 +++-- + drivers/net/wireless/wl1251/acx.c | 53 +++ + drivers/net/wireless/wl1251/acx.h | 72 ++++ + drivers/net/wireless/wl1251/event.c | 18 + + drivers/net/wireless/wl1251/main.c | 18 +- + drivers/net/wireless/wl1251/ps.c | 11 + + drivers/net/wireless/wl1251/rx.c | 46 +++- + drivers/net/wireless/wl1251/tx.c | 74 ++--- + drivers/net/wireless/wl1251/wl1251.h | 7 + + drivers/net/wireless/zd1211rw/zd_chip.c | 134 +++++--- + drivers/net/wireless/zd1211rw/zd_chip.h | 5 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 448 +++++++++++++++++++------ + drivers/net/wireless/zd1211rw/zd_mac.h | 24 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 444 +++++++++++++++++++------ + drivers/net/wireless/zd1211rw/zd_usb.h | 30 ++- + include/net/mac80211.h | 58 ++++- + net/mac80211/cfg.c | 26 ++- + net/mac80211/debugfs_netdev.c | 108 ++++++- + net/mac80211/ieee80211_i.h | 14 +- + net/mac80211/iface.c | 9 +- + net/mac80211/main.c | 53 +++- + net/mac80211/mlme.c | 60 +++- + net/mac80211/offchannel.c | 68 ++-- + net/mac80211/rx.c | 59 +++-- + net/mac80211/scan.c | 88 ++++-- + net/mac80211/sta_info.c | 3 +- + net/mac80211/status.c | 4 + + net/mac80211/tx.c | 12 +- + net/mac80211/work.c | 66 +++- + net/mac80211/wpa.c | 39 +-- + net/wireless/core.c | 20 +- + 61 files changed, 2215 insertions(+), 872 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + drivers/bluetooth/ath3k.c | 8 +- + include/net/bluetooth/bluetooth.h | 5 + + include/net/bluetooth/hci.h | 57 ++ + include/net/bluetooth/hci_core.h | 62 ++- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/mgmt.h | 142 ++++ + net/bluetooth/af_bluetooth.c | 19 +- + net/bluetooth/cmtp/capi.c | 3 +- + net/bluetooth/cmtp/core.c | 9 +- + net/bluetooth/hci_conn.c | 1 + + net/bluetooth/hci_core.c | 230 ++++++- + net/bluetooth/hci_event.c | 457 ++++++++++++- + net/bluetooth/hci_sock.c | 6 +- + net/bluetooth/hci_sysfs.c | 52 ++ + net/bluetooth/hidp/core.c | 9 +- + net/bluetooth/l2cap.c | 70 ++- + net/bluetooth/mgmt.c | 1310 +++++++++++++++++++++++++++++++++---- + 17 files changed, 2256 insertions(+), 185 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/aesni-intel_glue.c | 17 ++-- + crypto/ablkcipher.c | 3 +- + crypto/testmgr.c | 2 + + drivers/char/hw_random/Kconfig | 12 ++ + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/picoxcell-rng.c | 208 ++++++++++++++++++++++++++++++++ + drivers/crypto/omap-aes.c | 4 +- + drivers/crypto/omap-sham.c | 4 +- + 8 files changed, 237 insertions(+), 14 deletions(-) + create mode 100644 drivers/char/hw_random/picoxcell-rng.c +Merging sound/for-next +$ git merge sound/for-next +Auto-merging arch/arm/mach-shmobile/board-ag5evm.c +Auto-merging arch/arm/mach-shmobile/board-mackerel.c +Auto-merging arch/sh/boards/mach-ecovec24/setup.c +Removing sound/soc/samsung/ac97.h +Merge made by recursive. + arch/arm/mach-shmobile/board-ag5evm.c | 10 - + arch/arm/mach-shmobile/board-ap4evb.c | 13 +- + arch/arm/mach-shmobile/board-mackerel.c | 13 +- + arch/arm/mach-tegra/include/mach/harmony_audio.h | 22 + + arch/sh/boards/mach-ecovec24/setup.c | 6 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + include/sound/cs4271.h | 25 + + include/sound/hdspm.h | 179 +- + include/sound/sh_fsi.h | 76 +- + include/sound/soc-dapm.h | 16 + + include/sound/soc.h | 86 +- + include/sound/version.h | 2 +- + include/sound/wm8903.h | 20 +- + include/trace/events/asoc.h | 25 + + sound/pci/Kconfig | 6 +- + sound/pci/hda/patch_realtek.c | 25 +- + sound/pci/rme9652/hdspm.c | 4361 ++++++++++++++++------ + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 2 + + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ak4642.c | 24 + + sound/soc/codecs/cs4270.c | 4 +- + sound/soc/codecs/cs4271.c | 659 ++++ + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/sn95031.c | 776 ++++ + sound/soc/codecs/sn95031.h | 99 + + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm8523.c | 8 +- + sound/soc/codecs/wm8741.c | 13 +- + sound/soc/codecs/wm8804.c | 2 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 129 +- + sound/soc/codecs/wm8904.c | 43 +- + sound/soc/codecs/wm8955.c | 27 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 36 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8991.c | 1427 +++++++ + sound/soc/codecs/wm8991.h | 833 +++++ + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994.c | 10 +- + sound/soc/codecs/wm8995.c | 103 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm9090.c | 45 +- + sound/soc/ep93xx/Kconfig | 9 + + sound/soc/ep93xx/Makefile | 2 + + sound/soc/ep93xx/edb93xx.c | 142 + + sound/soc/fsl/mpc8610_hpcd.c | 6 +- + sound/soc/fsl/p1022_ds.c | 6 +- + sound/soc/mid-x86/Kconfig | 14 + + sound/soc/mid-x86/Makefile | 5 + + sound/soc/mid-x86/mfld_machine.c | 299 ++ + sound/soc/mid-x86/sst_platform.c | 465 +++ + sound/soc/mid-x86/sst_platform.h | 63 + + sound/soc/omap/Kconfig | 1 + + sound/soc/omap/rx51.c | 93 +- + sound/soc/pxa/raumfeld.c | 4 +- + sound/soc/pxa/tosa.c | 4 +- + sound/soc/pxa/zylonite.c | 9 +- + sound/soc/samsung/ac97.c | 8 +- + sound/soc/samsung/ac97.h | 21 - + sound/soc/samsung/dma.c | 11 +- + sound/soc/samsung/dma.h | 8 - + sound/soc/samsung/goni_wm8994.c | 10 +- + sound/soc/samsung/h1940_uda1380.c | 9 - + sound/soc/samsung/i2s.c | 3 +- + sound/soc/samsung/jive_wm8750.c | 11 - + sound/soc/samsung/ln2440sbc_alc650.c | 7 - + sound/soc/samsung/neo1973_gta02_wm8753.c | 14 +- + sound/soc/samsung/neo1973_wm8753.c | 1 - + sound/soc/samsung/pcm.c | 118 +- + sound/soc/samsung/pcm.h | 107 - + sound/soc/samsung/rx1950_uda1380.c | 11 - + sound/soc/samsung/s3c-i2s-v2.c | 3 +- + sound/soc/samsung/s3c2412-i2s.c | 12 +- + sound/soc/samsung/s3c24xx-i2s.c | 14 +- + sound/soc/samsung/s3c24xx_simtec.c | 7 - + sound/soc/samsung/s3c24xx_simtec_hermes.c | 10 - + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 12 - + sound/soc/samsung/s3c24xx_uda134x.c | 9 +- + sound/soc/samsung/smartq_wm8987.c | 6 - + sound/soc/samsung/smdk2443_wm9710.c | 7 - + sound/soc/samsung/smdk_spdif.c | 5 - + sound/soc/samsung/smdk_wm8580.c | 7 +- + sound/soc/samsung/smdk_wm9713.c | 5 - + sound/soc/samsung/spdif.c | 3 +- + sound/soc/sh/fsi-ak4642.c | 24 +- + sound/soc/sh/fsi-da7210.c | 13 +- + sound/soc/sh/fsi-hdmi.c | 77 +- + sound/soc/sh/fsi.c | 203 +- + sound/soc/soc-cache.c | 367 +- + sound/soc/soc-core.c | 270 +- + sound/soc/soc-dapm.c | 65 +- + sound/soc/soc-utils.c | 23 +- + sound/soc/tegra/Kconfig | 26 + + sound/soc/tegra/Makefile | 14 + + sound/soc/tegra/harmony.c | 304 ++ + sound/soc/tegra/tegra_asoc_utils.c | 149 + + sound/soc/tegra/tegra_asoc_utils.h | 45 + + sound/soc/tegra/tegra_das.c | 264 ++ + sound/soc/tegra/tegra_das.h | 135 + + sound/soc/tegra/tegra_i2s.c | 502 +++ + sound/soc/tegra/tegra_i2s.h | 165 + + sound/soc/tegra/tegra_pcm.c | 401 ++ + sound/soc/tegra/tegra_pcm.h | 55 + + sound/usb/6fire/Makefile | 3 + + sound/usb/6fire/chip.c | 232 ++ + sound/usb/6fire/chip.h | 32 + + sound/usb/6fire/comm.c | 176 + + sound/usb/6fire/comm.h | 44 + + sound/usb/6fire/common.h | 30 + + sound/usb/6fire/control.c | 275 ++ + sound/usb/6fire/control.h | 37 + + sound/usb/6fire/firmware.c | 426 +++ + sound/usb/6fire/firmware.h | 27 + + sound/usb/6fire/midi.c | 203 + + sound/usb/6fire/midi.h | 46 + + sound/usb/6fire/pcm.c | 688 ++++ + sound/usb/6fire/pcm.h | 76 + + sound/usb/Kconfig | 16 + + sound/usb/Makefile | 2 +- + 122 files changed, 14033 insertions(+), 2110 deletions(-) + create mode 100644 arch/arm/mach-tegra/include/mach/harmony_audio.h + create mode 100644 include/sound/cs4271.h + create mode 100644 sound/soc/codecs/cs4271.c + create mode 100644 sound/soc/codecs/sn95031.c + create mode 100644 sound/soc/codecs/sn95031.h + create mode 100644 sound/soc/codecs/wm8991.c + create mode 100644 sound/soc/codecs/wm8991.h + create mode 100644 sound/soc/ep93xx/edb93xx.c + create mode 100644 sound/soc/mid-x86/Kconfig + create mode 100644 sound/soc/mid-x86/Makefile + create mode 100644 sound/soc/mid-x86/mfld_machine.c + create mode 100644 sound/soc/mid-x86/sst_platform.c + create mode 100644 sound/soc/mid-x86/sst_platform.h + delete mode 100644 sound/soc/samsung/ac97.h + create mode 100644 sound/soc/tegra/Kconfig + create mode 100644 sound/soc/tegra/Makefile + create mode 100644 sound/soc/tegra/harmony.c + create mode 100644 sound/soc/tegra/tegra_asoc_utils.c + create mode 100644 sound/soc/tegra/tegra_asoc_utils.h + create mode 100644 sound/soc/tegra/tegra_das.c + create mode 100644 sound/soc/tegra/tegra_das.h + create mode 100644 sound/soc/tegra/tegra_i2s.c + create mode 100644 sound/soc/tegra/tegra_i2s.h + create mode 100644 sound/soc/tegra/tegra_pcm.c + create mode 100644 sound/soc/tegra/tegra_pcm.h + create mode 100644 sound/usb/6fire/Makefile + create mode 100644 sound/usb/6fire/chip.c + create mode 100644 sound/usb/6fire/chip.h + create mode 100644 sound/usb/6fire/comm.c + create mode 100644 sound/usb/6fire/comm.h + create mode 100644 sound/usb/6fire/common.h + create mode 100644 sound/usb/6fire/control.c + create mode 100644 sound/usb/6fire/control.h + create mode 100644 sound/usb/6fire/firmware.c + create mode 100644 sound/usb/6fire/firmware.h + create mode 100644 sound/usb/6fire/midi.c + create mode 100644 sound/usb/6fire/midi.h + create mode 100644 sound/usb/6fire/pcm.c + create mode 100644 sound/usb/6fire/pcm.h +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + sound/soc/codecs/Makefile | 2 +- + sound/soc/codecs/wm8753.c | 296 ++++++++++++++++----------------------- + sound/soc/codecs/wm8994.c | 26 +++- + sound/soc/davinci/davinci-evm.c | 18 ++- + sound/soc/ep93xx/ep93xx-ac97.c | 1 - + sound/soc/mid-x86/Kconfig | 2 +- + sound/soc/pxa/raumfeld.c | 16 +- + sound/soc/soc-core.c | 114 ++++++++++----- + 8 files changed, 243 insertions(+), 232 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Renaming drivers/tty/hvc/virtio_console.c => drivers/char/virtio_console.c +Auto-merging drivers/char/virtio_console.c +Merge made by recursive. + drivers/block/virtio_blk.c | 88 +++++++++++++++++++++++++++++++++++----- + drivers/char/virtio_console.c | 18 +++++++- + include/linux/virtio_console.h | 3 +- + 3 files changed, 95 insertions(+), 14 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging arch/arm/mach-s5pv210/mach-goni.c +Auto-merging drivers/input/input.c +Auto-merging drivers/input/touchscreen/ads7846.c +Removing drivers/input/touchscreen/qt602240_ts.c +Auto-merging drivers/media/dvb/dvb-usb/dvb-usb-remote.c +Merge made by recursive. + arch/arm/mach-s5pv210/mach-goni.c | 6 +- + drivers/hid/hid-input.c | 4 +- + drivers/input/input-polldev.c | 76 +- + drivers/input/input.c | 55 +- + drivers/input/misc/ati_remote2.c | 4 +- + drivers/input/sparse-keymap.c | 4 +- + drivers/input/touchscreen/Kconfig | 34 +- + drivers/input/touchscreen/Makefile | 3 +- + drivers/input/touchscreen/ad7877.c | 19 +- + drivers/input/touchscreen/ad7879-spi.c | 17 +- + drivers/input/touchscreen/ads7846.c | 16 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 1407 ++++++++++++++++++++ + drivers/input/touchscreen/qt602240_ts.c | 1406 ------------------- + drivers/input/touchscreen/wm831x-ts.c | 363 +++++ + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 109 +- + drivers/media/rc/rc-main.c | 4 +- + .../linux/i2c/{qt602240_ts.h => atmel_mxt_ts.h} | 28 +- + include/linux/input-polldev.h | 4 +- + include/linux/input.h | 12 +- + include/linux/mfd/wm831x/pdata.h | 3 +- + 20 files changed, 1955 insertions(+), 1619 deletions(-) + create mode 100644 drivers/input/touchscreen/atmel_mxt_ts.c + delete mode 100644 drivers/input/touchscreen/qt602240_ts.c + create mode 100644 drivers/input/touchscreen/wm831x-ts.c + rename include/linux/i2c/{qt602240_ts.h => atmel_mxt_ts.h} (52%) +Merging input-mt/next +$ git merge input-mt/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 +Merge made by recursive. + block/blk-core.c | 56 +++---- + block/blk-flush.c | 441 +++++++++++++++++++++++++++++++-------------- + block/blk.h | 12 +- + block/elevator.c | 7 + + include/linux/blk_types.h | 2 + + include/linux/blkdev.h | 18 ++- + include/linux/elevator.h | 1 + + 7 files changed, 355 insertions(+), 182 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +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. + drivers/leds/led-triggers.c | 20 ++++++++ + drivers/power/bq20z75.c | 98 ++++++++++++++++++++++++++++++++---- + drivers/power/power_supply_leds.c | 19 +++++++ + include/linux/leds.h | 3 + + include/linux/power_supply.h | 46 +++++++++++++++++ + 5 files changed, 175 insertions(+), 11 deletions(-) +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a73146] Merge remote branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/card/block.c +Auto-merging drivers/mmc/host/mmci.c +Auto-merging drivers/mmc/host/sdhci-s3c.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-devices-mmc | 21 +++++ + drivers/mmc/card/block.c | 1 + + drivers/mmc/card/mmc_test.c | 7 +- + drivers/mmc/core/Makefile | 3 +- + drivers/mmc/core/core.c | 3 +- + drivers/mmc/core/core.h | 2 + + drivers/mmc/core/host.c | 5 +- + drivers/mmc/core/mmc.c | 74 ++++++++++++++++ + drivers/mmc/core/quirks.c | 85 ++++++++++++++++++ + drivers/mmc/core/sdio.c | 1 + + drivers/mmc/host/sdhci-pci.c | 125 +++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-s3c.c | 3 + + drivers/mmc/host/sdhci.c | 60 +++++++++++++ + drivers/mmc/host/sdhci.h | 5 + + include/linux/mmc/card.h | 6 ++ + include/linux/mmc/mmc.h | 3 + + include/linux/mmc/sdhci.h | 1 + + 17 files changed, 395 insertions(+), 10 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-mmc + create mode 100644 drivers/mmc/core/quirks.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Renaming drivers/serial/kgdboc.c => drivers/tty/serial/kgdboc.c +Auto-merging drivers/tty/serial/kgdboc.c +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/tty/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slab.h | 1 - + mm/slab.c | 8 -------- + mm/slob.c | 6 ------ + mm/slub.c | 6 ------ + 4 files changed, 0 insertions(+), 21 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 +Auto-merging include/linux/mfd/wm831x/pdata.h +Merge made by recursive. + drivers/mfd/adp5520.c | 15 +++++++-------- + drivers/mfd/asic3.c | 4 ++-- + drivers/mfd/davinci_voicecodec.c | 4 ++-- + drivers/mfd/max8998.c | 4 ++-- + drivers/mfd/pcf50633-core.c | 23 +++++++++++------------ + drivers/mfd/tps6586x.c | 26 ++++++++++++++++---------- + drivers/mfd/ucb1x00-ts.c | 17 +++++++++++++---- + drivers/mfd/wl1273-core.c | 2 -- + drivers/mfd/wm831x-irq.c | 11 +++++++++++ + include/linux/mfd/wm831x/pdata.h | 3 +++ + 10 files changed, 67 insertions(+), 42 deletions(-) +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 fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/wm831x-dcdc.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + fs/cachefiles/namei.c | 52 +++++- + include/linux/xattr.h | 2 + + security/security.c | 3 + + security/selinux/ss/avtab.h | 1 - + security/selinux/ss/ebitmap.h | 1 - + security/smack/smack.h | 9 +- + security/smack/smack_access.c | 52 ++++-- + security/smack/smack_lsm.c | 269 +++++++++++++++++++++++++----- + security/smack/smackfs.c | 370 ++++++++++++++++++++++++++++------------- + 9 files changed, 571 insertions(+), 188 deletions(-) +Merging selinux/master +$ git merge selinux/master +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/xattr.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext3/namei.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/xfs/linux-2.6/xfs_iops.c +Auto-merging include/linux/ext3_fs.h +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/ss/policydb.c +Merge made by recursive. + fs/btrfs/inode.c | 13 ++-- + fs/btrfs/xattr.c | 6 +- + fs/btrfs/xattr.h | 3 +- + fs/ext2/ext2.h | 2 +- + fs/ext2/ialloc.c | 5 +- + fs/ext2/namei.c | 8 +- + fs/ext2/xattr.h | 6 +- + fs/ext2/xattr_security.c | 5 +- + fs/ext3/ialloc.c | 5 +- + fs/ext3/namei.c | 8 +- + fs/ext3/xattr.h | 4 +- + fs/ext3/xattr_security.c | 5 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/xattr.h | 4 +- + fs/ext4/xattr_security.c | 5 +- + fs/gfs2/inode.c | 7 +- + fs/jffs2/dir.c | 9 +-- + fs/jffs2/nodelist.h | 2 +- + fs/jffs2/security.c | 5 +- + fs/jffs2/write.c | 18 +++-- + fs/jffs2/xattr.h | 5 +- + fs/jfs/jfs_xattr.h | 5 +- + fs/jfs/namei.c | 8 +- + fs/jfs/xattr.c | 6 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/refcounttree.c | 3 +- + fs/ocfs2/xattr.c | 10 ++- + fs/ocfs2/xattr.h | 4 +- + fs/reiserfs/namei.c | 9 ++- + fs/reiserfs/xattr_security.c | 3 +- + fs/xfs/linux-2.6/xfs_iops.c | 9 ++- + include/linux/ext3_fs.h | 3 +- + include/linux/reiserfs_xattr.h | 2 + + include/linux/security.h | 9 ++- + mm/shmem.c | 9 ++- + security/capability.c | 3 +- + security/security.c | 6 +- + security/selinux/hooks.c | 20 +++--- + security/selinux/include/security.h | 8 ++- + security/selinux/ss/avtab.h | 22 +++--- + security/selinux/ss/policydb.c | 130 +++++++++++++++++++++++++++++++++++ + security/selinux/ss/policydb.h | 14 ++++- + security/selinux/ss/services.c | 45 ++++++++---- + security/smack/smack_lsm.c | 5 +- + 44 files changed, 333 insertions(+), 131 deletions(-) +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 watchdog/master +$ git merge watchdog/master +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/watchdog/Makefile +Merge made by recursive. + arch/mips/include/asm/mach-jz4740/platform.h | 1 + + arch/mips/jz4740/platform.c | 16 ++ + drivers/watchdog/Kconfig | 6 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/booke_wdt.c | 17 +- + drivers/watchdog/jz4740_wdt.c | 322 ++++++++++++++++++++++++++ + 6 files changed, 354 insertions(+), 9 deletions(-) + create mode 100644 drivers/watchdog/jz4740_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/intel-iommu.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. + fs/exofs/dir.c | 15 ++++++--------- + fs/exofs/exofs.h | 2 ++ + fs/exofs/file.c | 5 ----- + fs/exofs/inode.c | 45 +++++++++++++++++++++++++++++++++++++-------- + fs/exofs/super.c | 18 ++++++++++++++++++ + 5 files changed, 63 insertions(+), 22 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 +Auto-merging Documentation/device-mapper/dm-crypt.txt +Auto-merging MAINTAINERS +Auto-merging arch/xtensa/configs/s6105_defconfig +Auto-merging drivers/net/sungem.h +Auto-merging fs/direct-io.c +Auto-merging fs/ext4/extents.c +Auto-merging include/linux/mmzone.h +Auto-merging init/Kconfig +Auto-merging net/mac80211/tx.c +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 2 +- + MAINTAINERS | 2 +- + arch/ia64/include/asm/perfmon.h | 2 +- + arch/x86/oprofile/op_model_p4.c | 2 +- + arch/xtensa/configs/s6105_defconfig | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/block/smart1,2.h | 2 +- + drivers/bluetooth/btusb.c | 4 ++-- + drivers/cpuidle/sysfs.c | 2 +- + drivers/dma/shdma.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/gpu/drm/drm_sman.c | 4 +--- + drivers/message/i2o/i2o_config.c | 3 +-- + drivers/net/atl1c/atl1c.h | 4 ++-- + drivers/net/sungem.h | 2 +- + drivers/platform/x86/acer-wmi.c | 1 - + drivers/scsi/aic7xxx/aic79xx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/megaraid.c | 4 ++-- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/osst.c | 10 ++++------ + drivers/usb/wusbcore/rh.c | 2 +- + fs/direct-io.c | 6 +++--- + fs/ext4/extents.c | 2 +- + fs/ocfs2/dir.c | 2 +- + include/linux/mmzone.h | 2 +- + init/Kconfig | 6 +++--- + kernel/trace/ring_buffer.c | 2 +- + net/ipv6/inet6_hashtables.c | 2 +- + net/mac80211/tx.c | 2 +- + sound/pci/au88x0/au88x0.h | 4 ++-- + sound/pci/au88x0/au88x0_core.c | 4 ++-- + 34 files changed, 45 insertions(+), 51 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Merge made by recursive. + drivers/base/power/trace.c | 6 ++-- + drivers/base/power/wakeup.c | 80 +++++++++++++++++++++++++------------------ + 2 files changed, 50 insertions(+), 36 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa76a78] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 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 drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Auto-merging include/linux/i2c.h +Merge made by recursive. + arch/microblaze/include/asm/pci-bridge.h | 12 ++++ + arch/microblaze/include/asm/prom.h | 15 ----- + arch/microblaze/kernel/prom_parse.c | 77 ----------------------- + arch/microblaze/pci/pci-common.c | 1 + + arch/microblaze/pci/pci_32.c | 1 + + arch/powerpc/include/asm/pci-bridge.h | 37 +++++------- + arch/powerpc/include/asm/pci.h | 2 +- + arch/powerpc/include/asm/prom.h | 15 ----- + arch/powerpc/kernel/of_platform.c | 2 +- + arch/powerpc/kernel/pci-common.c | 12 +--- + arch/powerpc/kernel/pci_32.c | 2 +- + arch/powerpc/kernel/pci_64.c | 6 +- + arch/powerpc/kernel/pci_dn.c | 9 ++- + arch/powerpc/kernel/pci_of_scan.c | 4 +- + arch/powerpc/kernel/prom_parse.c | 84 ------------------------- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + drivers/i2c/busses/i2c-ocores.c | 14 +---- + drivers/i2c/i2c-core.c | 2 - + drivers/mmc/host/mmc_spi.c | 4 - + drivers/net/ethoc.c | 8 +-- + drivers/of/Kconfig | 6 ++ + drivers/of/Makefile | 1 + + drivers/of/of_pci.c | 91 ++++++++++++++++++++++++++++ + drivers/spi/pxa2xx_spi.c | 2 - + drivers/spi/pxa2xx_spi_pci.c | 2 - + drivers/spi/xilinx_spi.c | 6 -- + include/linux/device.h | 7 +-- + include/linux/i2c.h | 2 - + include/linux/of.h | 4 +- + include/linux/of_pci.h | 9 +++ + 30 files changed, 163 insertions(+), 276 deletions(-) + create mode 100644 drivers/of/of_pci.c + create mode 100644 include/linux/of_pci.h +Merging spi/spi/next +$ git merge spi/spi/next +Auto-merging drivers/spi/spi_sh_msiof.c +Merge made by recursive. + drivers/spi/spi_sh_msiof.c | 127 ++++++++++++++++++++++++++++++++------------ + drivers/spi/spidev.c | 12 ++++ + 2 files changed, 105 insertions(+), 34 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Removing arch/x86/lib/memmove_64.c +Auto-merging arch/xtensa/kernel/time.c +Auto-merging include/linux/security.h +Auto-merging kernel/cred.c +Auto-merging security/security.c +Merge made by recursive. + Documentation/spinlocks.txt | 24 +- + arch/alpha/include/asm/rwsem.h | 36 -- + arch/alpha/kernel/time.c | 8 +- + arch/arm/kernel/time.c | 4 +- + arch/arm/mach-clps711x/include/mach/time.h | 2 +- + arch/blackfin/kernel/time.c | 6 +- + arch/cris/arch-v10/kernel/time.c | 4 +- + arch/cris/arch-v32/kernel/time.c | 6 +- + arch/frv/kernel/time.c | 14 +- + arch/h8300/kernel/time.c | 4 +- + arch/h8300/kernel/timer/timer8.c | 2 +- + arch/ia64/include/asm/rwsem.h | 37 -- + arch/ia64/kernel/time.c | 19 +- + arch/ia64/xen/time.c | 13 +- + arch/m32r/kernel/time.c | 5 +- + arch/m68k/bvme6000/config.c | 4 +- + arch/m68k/kernel/time.c | 4 +- + arch/m68k/mvme147/config.c | 4 +- + arch/m68k/mvme16x/config.c | 4 +- + arch/m68k/sun3/sun3ints.c | 2 +- + arch/m68knommu/kernel/time.c | 8 +- + arch/mips/kernel/vpe.c | 4 +- + arch/parisc/kernel/time.c | 7 +- + arch/powerpc/include/asm/rwsem.h | 51 -- + arch/s390/include/asm/rwsem.h | 63 -- + arch/sh/include/asm/rwsem.h | 56 -- + arch/sparc/include/asm/rwsem.h | 46 -- + arch/sparc/kernel/pcic.c | 4 +- + arch/sparc/kernel/time_32.c | 9 +- + arch/sparc/lib/atomic32.c | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/amd_nb.h | 1 + + arch/x86/include/asm/apic.h | 36 +- + arch/x86/include/asm/ipi.h | 8 +- + arch/x86/include/asm/mpspec.h | 3 - + arch/x86/include/asm/numa.h | 49 ++ + arch/x86/include/asm/numa_32.h | 7 +- + arch/x86/include/asm/numa_64.h | 16 +- + arch/x86/include/asm/processor.h | 4 - + arch/x86/include/asm/rwsem.h | 80 +--- + arch/x86/include/asm/smp.h | 10 + + arch/x86/include/asm/topology.h | 17 - + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/acpi/boot.c | 8 +- + arch/x86/kernel/amd_nb.c | 14 +- + arch/x86/kernel/apic/apic.c | 37 +- + arch/x86/kernel/apic/apic_flat_64.c | 4 - + arch/x86/kernel/apic/apic_noop.c | 26 +- + arch/x86/kernel/apic/bigsmp_32.c | 34 +- + arch/x86/kernel/apic/es7000_32.c | 35 +- + arch/x86/kernel/apic/ipi.c | 12 +- + arch/x86/kernel/apic/numaq_32.c | 21 +- + arch/x86/kernel/apic/probe_32.c | 10 +- + arch/x86/kernel/apic/summit_32.c | 47 +- + arch/x86/kernel/apic/x2apic_cluster.c | 2 - + arch/x86/kernel/apic/x2apic_phys.c | 2 - + arch/x86/kernel/apic/x2apic_uv_x.c | 2 - + arch/x86/kernel/cpu/amd.c | 59 ++- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 5 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 7 +- + arch/x86/kernel/cpu/perf_event.c | 4 +- + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/setup_percpu.c | 11 +- + arch/x86/kernel/smpboot.c | 113 +--- + arch/x86/kernel/syscall_table_32.S | 1 + + arch/x86/kernel/x8664_ksyms_64.c | 1 + + arch/x86/lib/memmove_64.S | 197 ++++++ + arch/x86/lib/memmove_64.c | 192 ------ + arch/x86/mm/amdtopology_64.c | 4 +- + arch/x86/mm/numa.c | 208 +++++++- + arch/x86/mm/numa_32.c | 7 + + arch/x86/mm/numa_64.c | 227 +------- + arch/x86/mm/srat_32.c | 6 +- + arch/x86/mm/srat_64.c | 12 +- + arch/xtensa/include/asm/rwsem.h | 37 -- + arch/xtensa/kernel/time.c | 6 +- + drivers/char/mmtimer.c | 30 +- + include/asm-generic/cputime.h | 3 + + include/linux/interrupt.h | 7 + + include/linux/jiffies.h | 1 + + include/linux/kthread.h | 2 +- + include/linux/pci_ids.h | 1 + + include/linux/posix-clock.h | 150 +++++ + include/linux/posix-timers.h | 44 +- + include/linux/rwlock_types.h | 8 - + include/linux/rwsem-spinlock.h | 31 +- + include/linux/rwsem.h | 53 ++- + include/linux/sched.h | 22 +- + include/linux/security.h | 9 +- + include/linux/spinlock_types.h | 8 - + include/linux/syscalls.h | 2 + + include/linux/thread_info.h | 3 - + include/linux/time.h | 11 +- + include/linux/timex.h | 3 +- + kernel/compat.c | 136 +++-- + kernel/cred.c | 2 +- + kernel/futex.c | 22 +- + kernel/hrtimer.c | 13 +- + kernel/irq/manage.c | 2 +- + kernel/perf_event.c | 260 ++++++--- + kernel/posix-cpu-timers.c | 110 ++-- + kernel/posix-timers.c | 321 +++++----- + kernel/rtmutex-debug.c | 1 - + kernel/rtmutex-tester.c | 39 +-- + kernel/rtmutex.c | 318 ++++------- + kernel/rtmutex_common.h | 16 +- + kernel/sched.c | 303 ++++++++-- + kernel/sched_debug.c | 2 +- + kernel/sched_fair.c | 271 ++++++--- + kernel/sched_idletask.c | 26 +- + kernel/sched_rt.c | 19 +- + kernel/sched_stoptask.c | 7 +- + kernel/softirq.c | 3 +- + kernel/sysctl.c | 7 - + kernel/time.c | 38 +- + kernel/time/Makefile | 3 +- + kernel/time/clockevents.c | 1 - + kernel/time/jiffies.c | 20 + + kernel/time/ntp.c | 13 + + kernel/time/posix-clock.c | 441 ++++++++++++++ + kernel/time/tick-broadcast.c | 1 - + kernel/time/tick-common.c | 1 - + kernel/time/tick-internal.h | 9 + + kernel/time/tick-oneshot.c | 1 - + kernel/time/tick-sched.c | 1 - + kernel/time/timekeeping.c | 86 +++- + kernel/timer.c | 13 - + lib/rwsem.c | 10 +- + scripts/checkpatch.pl | 5 - + security/commoncap.c | 2 +- + security/security.c | 2 +- + tools/perf/Documentation/perf-probe.txt | 19 + + tools/perf/Makefile | 42 ++- + tools/perf/builtin-annotate.c | 13 +- + tools/perf/builtin-diff.c | 16 +- + tools/perf/builtin-inject.c | 82 ++-- + tools/perf/builtin-kmem.c | 10 +- + tools/perf/builtin-lock.c | 6 +- + tools/perf/builtin-probe.c | 70 +++- + tools/perf/builtin-record.c | 420 ++++++-------- + tools/perf/builtin-report.c | 87 ++-- + tools/perf/builtin-sched.c | 15 +- + tools/perf/builtin-script.c | 17 +- + tools/perf/builtin-stat.c | 78 ++-- + tools/perf/builtin-test.c | 184 ++++++- + tools/perf/builtin-timechart.c | 13 +- + tools/perf/builtin-top.c | 763 +++++++----------------- + tools/perf/perf.h | 26 + + tools/perf/python/twatch.py | 41 ++ + tools/perf/util/build-id.c | 21 +- + tools/perf/util/cache.h | 7 +- + tools/perf/util/callchain.c | 227 ++++---- + tools/perf/util/callchain.h | 76 +++- + tools/perf/util/cpumap.c | 5 + + tools/perf/util/cpumap.h | 2 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debug.h | 2 +- + tools/perf/util/event.c | 316 ++++------- + tools/perf/util/event.h | 72 ++-- + tools/perf/util/evlist.c | 350 +++++++++++ + tools/perf/util/evlist.h | 64 ++ + tools/perf/util/evsel.c | 195 ++++++- + tools/perf/util/evsel.h | 29 +- + tools/perf/util/header.c | 98 ++-- + tools/perf/util/header.h | 55 +- + tools/perf/util/hist.c | 17 +- + tools/perf/util/hist.h | 2 + + tools/perf/util/include/linux/list.h | 1 + + tools/perf/util/parse-events.c | 71 +-- + tools/perf/util/parse-events.h | 7 - + tools/perf/util/probe-event.c | 137 ++++- + tools/perf/util/probe-event.h | 4 +- + tools/perf/util/probe-finder.c | 361 +++++++----- + tools/perf/util/python.c | 891 ++++++++++++++++++++++++++++ + tools/perf/util/session.c | 215 ++++---- + tools/perf/util/session.h | 27 +- + tools/perf/util/setup.py | 19 + + tools/perf/util/strfilter.c | 200 +++++++ + tools/perf/util/strfilter.h | 48 ++ + tools/perf/util/thread.c | 55 -- + tools/perf/util/thread.h | 14 - + tools/perf/util/thread_map.c | 64 ++ + tools/perf/util/thread_map.h | 15 + + tools/perf/util/top.c | 217 +++++++ + tools/perf/util/top.h | 80 +++ + tools/perf/util/ui/browsers/hists.c | 2 +- + tools/perf/util/ui/browsers/top.c | 136 +++++ + tools/perf/util/ui/libslang.h | 6 +- + tools/perf/util/ui/setup.c | 5 +- + 194 files changed, 6865 insertions(+), 4117 deletions(-) + create mode 100644 arch/x86/lib/memmove_64.S + delete mode 100644 arch/x86/lib/memmove_64.c + create mode 100644 include/linux/posix-clock.h + create mode 100644 kernel/time/posix-clock.c + create mode 100755 tools/perf/python/twatch.py + create mode 100644 tools/perf/util/evlist.c + create mode 100644 tools/perf/util/evlist.h + create mode 100644 tools/perf/util/python.c + create mode 100644 tools/perf/util/setup.py + create mode 100644 tools/perf/util/strfilter.c + create mode 100644 tools/perf/util/strfilter.h + create mode 100644 tools/perf/util/thread_map.c + create mode 100644 tools/perf/util/thread_map.h + create mode 100644 tools/perf/util/top.c + create mode 100644 tools/perf/util/top.h + create mode 100644 tools/perf/util/ui/browsers/top.c +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date! +Merge made by recursive. +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging drivers/gpu/drm/radeon/radeon.h +Merge made by recursive. + arch/x86/include/asm/xen/page.h | 24 ++++- + arch/x86/pci/xen.c | 22 ++-- + arch/x86/xen/Kconfig | 8 ++ + arch/x86/xen/mmu.c | 72 +++++++++++- + arch/x86/xen/p2m.c | 198 +++++++++++++++++++++++++++++- + arch/x86/xen/setup.c | 70 +++++++++++- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 31 ++++-- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 36 ++++-- + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 34 +++++- + drivers/gpu/drm/ttm/ttm_tt.c | 12 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 3 +- + drivers/xen/balloon.c | 2 +- + drivers/xen/events.c | 142 +++++++++++----------- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_page_alloc.h | 8 +- + 18 files changed, 553 insertions(+), 130 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Resolved 'arch/x86/include/asm/xen/page.h' using previous resolution. +Auto-merging arch/x86/include/asm/xen/page.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1125949] Merge remote branch 'xen-pvhvm/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_core.h +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/vmlinux.lds.h +Merge made by recursive. + arch/alpha/kernel/vmlinux.lds.S | 5 +++-- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 ++-- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 35 ++++++++++++++++++++++------------- + 19 files changed, 43 insertions(+), 33 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Auto-merging drivers/cpufreq/cpufreq_conservative.c +Auto-merging drivers/md/md.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c +Auto-merging fs/ext4/super.c +Auto-merging fs/nfs/inode.c +Merge made by recursive. + arch/arm/plat-omap/mailbox.c | 10 +-- + drivers/acpi/osl.c | 6 +- + drivers/cpufreq/cpufreq_conservative.c | 22 +--- + drivers/cpufreq/cpufreq_ondemand.c | 20 +--- + drivers/input/touchscreen/tps6507x-ts.c | 12 +-- + drivers/md/md.c | 2 +- + drivers/message/i2o/driver.c | 3 +- + drivers/misc/iwmc3200top/iwmc3200top.h | 4 +- + drivers/misc/iwmc3200top/main.c | 14 +-- + drivers/net/wireless/ipw2x00/ipw2100.c | 70 +++++------- + drivers/net/wireless/ipw2x00/ipw2100.h | 1 - + drivers/net/wireless/ipw2x00/ipw2200.c | 196 ++++++++++++++----------------- + drivers/net/wireless/ipw2x00/ipw2200.h | 2 - + drivers/scsi/be2iscsi/be_main.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 2 +- + drivers/scsi/scsi_tgt_lib.c | 2 +- + fs/aio.c | 4 +- + fs/ext4/super.c | 7 +- + fs/nfs/inode.c | 2 +- + fs/ocfs2/quota.h | 3 - + fs/ocfs2/quota_global.c | 27 +---- + fs/ocfs2/super.c | 7 - + fs/reiserfs/journal.c | 2 +- + fs/xfs/linux-2.6/xfs_buf.c | 5 +- + fs/xfs/xfs_mru_cache.c | 2 +- + net/9p/trans_fd.c | 52 ++------ + net/rds/ib.c | 9 +-- + net/rds/ib.h | 2 - + net/rds/ib_rdma.c | 27 +---- + net/sunrpc/sched.c | 2 +- + 30 files changed, 181 insertions(+), 338 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Auto-merging drivers/platform/x86/acer-wmi.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-platform-eeepc-wmi | 21 + + drivers/platform/x86/Kconfig | 17 +- + drivers/platform/x86/Makefile | 3 + + drivers/platform/x86/acer-wmi.c | 2 +- + drivers/platform/x86/asus-laptop.c | 180 +---- + drivers/platform/x86/asus_acpi.c | 8 +- + drivers/platform/x86/eeepc-wmi.c | 780 ++++++++++++++++---- + drivers/platform/x86/intel_mid_powerbtn.c | 148 ++++ + drivers/platform/x86/intel_pmic_gpio.c | 118 ++-- + drivers/platform/x86/tc1100-wmi.c | 2 +- + 10 files changed, 909 insertions(+), 370 deletions(-) + create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c +$ git reset --hard HEAD^ +HEAD is now at 82b0f77 Merge remote branch 'workqueues/for-next' +Merging refs/next/20110207/drivers-x86 +$ git merge refs/next/20110207/drivers-x86 +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 driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging init/Kconfig +Merge made by recursive. + Documentation/ABI/testing/sysfs-platform-kim | 48 +++ + Documentation/dynamic-debug-howto.txt | 12 +- + Documentation/filesystems/sysfs.txt | 16 +- + Documentation/memory-hotplug.txt | 47 ++- + Documentation/zh_CN/SecurityBugs | 50 +++ + Documentation/zh_CN/SubmittingPatches | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 66 +++- + arch/x86/mm/init_64.c | 14 + + drivers/base/core.c | 34 ++- + drivers/base/firmware_class.c | 7 +- + drivers/base/memory.c | 197 +++++++--- + drivers/base/node.c | 12 +- + drivers/base/sys.c | 65 +++- + drivers/misc/Kconfig | 7 +- + drivers/misc/pch_phub.c | 69 +++- + drivers/misc/ti-st/st_core.c | 413 +++++++------------ + drivers/misc/ti-st/st_kim.c | 491 +++++++++++------------ + drivers/misc/ti-st/st_ll.c | 10 +- + fs/debugfs/inode.c | 15 - + include/linux/dynamic_debug.h | 8 +- + include/linux/firmware.h | 4 +- + include/linux/kobject.h | 7 +- + include/linux/memory.h | 3 +- + include/linux/node.h | 6 +- + include/linux/ti_wilink_st.h | 76 +++-- + init/Kconfig | 4 +- + lib/dynamic_debug.c | 61 +++- + 27 files changed, 1021 insertions(+), 723 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-kim + create mode 100644 Documentation/zh_CN/SecurityBugs +Merging tty/tty-next +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/Kconfig' using previous resolution. +Auto-merging drivers/tty/serial/Kconfig +CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5b48626] Merge remote branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + drivers/tty/hvc/hvc_dcc.c | 43 +++++---------------------------- + drivers/tty/serial/68328serial.c | 23 ------------------ + drivers/tty/serial/68328serial.h | 1 - + drivers/tty/serial/Kconfig | 10 +++++-- + drivers/tty/serial/bfin_sport_uart.c | 2 +- + drivers/tty/serial/ifx6x60.c | 33 +++++++++++++------------ + drivers/tty/serial/ifx6x60.h | 4 ++- + drivers/tty/serial/mfd.c | 38 ------------------------------ + drivers/tty/serial/mrst_max3110.c | 2 +- + drivers/tty/serial/omap-serial.c | 11 +++++--- + drivers/tty/serial/pch_uart.c | 27 +++++++++++++++------ + drivers/tty/serial/serial_core.c | 6 ++-- + drivers/tty/tty_ldisc.c | 17 ++++++++++++- + include/linux/spi/ifx_modem.h | 19 +++++++++----- + 14 files changed, 92 insertions(+), 144 deletions(-) +Merging usb/usb-next +$ git merge usb/usb-next +Resolved 'drivers/usb/gadget/Kconfig' using previous resolution. +Resolved 'drivers/usb/host/ehci-pci.c' using previous resolution. +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/gadget/Kconfig +CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/Makefile +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/host/ehci-hub.c +Auto-merging drivers/usb/host/ehci-pci.c +CONFLICT (content): Merge conflict in drivers/usb/host/ehci-pci.c +Auto-merging drivers/usb/host/ohci-hcd.c +Auto-merging drivers/usb/host/ohci.h +Auto-merging drivers/usb/musb/musb_host.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging include/linux/usb/hcd.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0c14285] Merge remote branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/usbmon.txt | 42 +- + drivers/usb/atm/ueagle-atm.c | 19 +- + drivers/usb/core/buffer.c | 26 +- + drivers/usb/core/hcd.c | 30 +- + drivers/usb/core/usb.h | 13 + + drivers/usb/early/ehci-dbgp.c | 2 +- + drivers/usb/gadget/Kconfig | 12 + + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/epautoconf.c | 7 + + drivers/usb/gadget/f_fs.c | 8 + + drivers/usb/gadget/fsl_mxc_udc.c | 21 +- + drivers/usb/gadget/fusb300_udc.c | 1743 +++++++++++++++++++++++++++++++++ + drivers/usb/gadget/fusb300_udc.h | 687 +++++++++++++ + drivers/usb/host/ehci-dbg.c | 4 +- + drivers/usb/host/ehci-hcd.c | 10 +- + drivers/usb/host/ehci-hub.c | 5 +- + drivers/usb/host/ehci-pci.c | 45 +- + drivers/usb/host/ehci-q.c | 18 +- + drivers/usb/host/ehci-sched.c | 76 +-- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/imx21-hcd.c | 5 +- + drivers/usb/host/ohci-hcd.c | 13 +- + drivers/usb/host/ohci-pci.c | 110 +-- + drivers/usb/host/ohci-q.c | 4 +- + drivers/usb/host/ohci.h | 4 +- + drivers/usb/host/pci-quirks.c | 260 +++++ + drivers/usb/host/pci-quirks.h | 19 + + drivers/usb/misc/usbtest.c | 236 ++++- + drivers/usb/mon/mon_text.c | 3 + + drivers/usb/musb/musb_host.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/mct_u232.c | 107 ++- + drivers/usb/storage/Kconfig | 10 + + drivers/usb/storage/Makefile | 2 + + drivers/usb/storage/realtek_cr.c | 675 +++++++++++++ + drivers/usb/storage/unusual_realtek.h | 41 + + drivers/usb/storage/usual-tables.c | 1 + + include/linux/usb.h | 1 + + include/linux/usb/Kbuild | 1 + + include/linux/usb/hcd.h | 19 +- + tools/usb/hcd-tests.sh | 275 ++++++ + 41 files changed, 4209 insertions(+), 354 deletions(-) + create mode 100644 drivers/usb/gadget/fusb300_udc.c + create mode 100644 drivers/usb/gadget/fusb300_udc.h + create mode 100644 drivers/usb/storage/realtek_cr.c + create mode 100644 drivers/usb/storage/unusual_realtek.h + create mode 100644 tools/usb/hcd-tests.sh +Merging staging/staging-next +$ git merge staging/staging-next +Renaming drivers/staging/brcm80211/sys/wl_mac80211.c => drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +Renaming drivers/staging/brcm80211/sys/wlc_mac80211.c => drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +Renaming drivers/staging/brcm80211/sys/wlc_pub.h => drivers/staging/brcm80211/brcmsmac/wlc_pub.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pub.h +Auto-merging MAINTAINERS +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/autofs/Kconfig +Removing drivers/staging/autofs/Makefile +Removing drivers/staging/autofs/TODO +Removing drivers/staging/autofs/autofs_i.h +Removing drivers/staging/autofs/dirhash.c +Removing drivers/staging/autofs/init.c +Removing drivers/staging/autofs/inode.c +Removing drivers/staging/autofs/root.c +Removing drivers/staging/autofs/symlink.c +Removing drivers/staging/autofs/waitq.c +Removing drivers/staging/brcm80211/brcmfmac/Kconfig +Removing drivers/staging/brcm80211/include/packed_section_end.h +Removing drivers/staging/brcm80211/include/packed_section_start.h +Removing drivers/staging/brcm80211/include/proto/ethernet.h +Removing drivers/staging/brcm80211/include/proto/wpa.h +Removing drivers/staging/brcm80211/include/rpc_osl.h +Removing drivers/staging/brcm80211/include/spid.h +Removing drivers/staging/easycap/easycap_debug.h +Removing drivers/staging/easycap/easycap_ioctl.h +Removing drivers/staging/easycap/easycap_sound.h +Removing drivers/staging/easycap/easycap_standard.h +Removing drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h +Auto-merging drivers/staging/hv/netvsc_drv.c +Removing drivers/staging/rtl8712/farray.h +Removing drivers/staging/smbfs/Kconfig +Removing drivers/staging/smbfs/Makefile +Removing drivers/staging/smbfs/TODO +Removing drivers/staging/smbfs/cache.c +Removing drivers/staging/smbfs/dir.c +Removing drivers/staging/smbfs/file.c +Removing drivers/staging/smbfs/getopt.c +Removing drivers/staging/smbfs/getopt.h +Removing drivers/staging/smbfs/inode.c +Removing drivers/staging/smbfs/ioctl.c +Removing drivers/staging/smbfs/proc.c +Removing drivers/staging/smbfs/proto.h +Removing drivers/staging/smbfs/request.c +Removing drivers/staging/smbfs/request.h +Removing drivers/staging/smbfs/smb.h +Removing drivers/staging/smbfs/smb_debug.h +Removing drivers/staging/smbfs/smb_fs.h +Removing drivers/staging/smbfs/smb_fs_i.h +Removing drivers/staging/smbfs/smb_fs_sb.h +Removing drivers/staging/smbfs/smb_mount.h +Removing drivers/staging/smbfs/smbfs.txt +Removing drivers/staging/smbfs/smbiod.c +Removing drivers/staging/smbfs/smbno.h +Removing drivers/staging/smbfs/sock.c +Removing drivers/staging/smbfs/symlink.c +Removing drivers/staging/ti-st/bt_drv.c +Removing drivers/staging/ti-st/bt_drv.h +Removing drivers/staging/westbridge/astoria/device/cyandevice_export.h +Merge made by recursive. + MAINTAINERS | 6 - + drivers/staging/Kconfig | 6 +- + drivers/staging/Makefile | 3 +- + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 12 +- + drivers/staging/ath6kl/bmi/src/bmi.c | 352 +- + .../staging/ath6kl/hif/common/hif_sdio_common.h | 4 +- + .../hif/sdio/linux_sdio/include/hif_internal.h | 24 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 174 +- + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 36 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 294 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 204 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 136 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 140 +- + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 227 +- + drivers/staging/ath6kl/htc2/htc.c | 72 +- + drivers/staging/ath6kl/htc2/htc_internal.h | 40 +- + drivers/staging/ath6kl/htc2/htc_recv.c | 254 +- + drivers/staging/ath6kl/htc2/htc_send.c | 66 +- + drivers/staging/ath6kl/htc2/htc_services.c | 48 +- + drivers/staging/ath6kl/include/a_debug.h | 20 +- + drivers/staging/ath6kl/include/a_drv_api.h | 4 +- + drivers/staging/ath6kl/include/aggr_recv_api.h | 10 +- + drivers/staging/ath6kl/include/ar3kconfig.h | 20 +- + drivers/staging/ath6kl/include/ar6000_diag.h | 26 +- + drivers/staging/ath6kl/include/ar6kap_common.h | 10 +- + drivers/staging/ath6kl/include/athbtfilter.h | 2 +- + drivers/staging/ath6kl/include/bmi.h | 90 +- + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 34 +- + .../staging/ath6kl/include/common/AR6002/addrs.h | 6 +- + drivers/staging/ath6kl/include/common/a_hci.h | 386 +- + drivers/staging/ath6kl/include/common/athdefs.h | 85 +- + drivers/staging/ath6kl/include/common/bmi_msg.h | 92 +- + drivers/staging/ath6kl/include/common/btcoexGpio.h | 4 +- + drivers/staging/ath6kl/include/common/dbglog.h | 26 +- + .../staging/ath6kl/include/common/dset_internal.h | 6 +- + drivers/staging/ath6kl/include/common/dsetid.h | 12 +- + .../staging/ath6kl/include/common/epping_test.h | 44 +- + drivers/staging/ath6kl/include/common/gmboxif.h | 16 +- + drivers/staging/ath6kl/include/common/htc.h | 84 +- + drivers/staging/ath6kl/include/common/ini_dset.h | 6 +- + drivers/staging/ath6kl/include/common/pkt_log.h | 8 +- + drivers/staging/ath6kl/include/common/regdump.h | 8 +- + .../include/common/regulatory/reg_dbschema.h | 96 +- + drivers/staging/ath6kl/include/common/targaddrs.h | 96 +- + drivers/staging/ath6kl/include/common/testcmd.h | 60 +- + drivers/staging/ath6kl/include/common/wlan_dset.h | 6 +- + drivers/staging/ath6kl/include/common/wmi.h | 1362 ++-- + drivers/staging/ath6kl/include/common/wmi_thin.h | 156 +- + drivers/staging/ath6kl/include/common/wmix.h | 88 +- + drivers/staging/ath6kl/include/common_drv.h | 46 +- + drivers/staging/ath6kl/include/dset_api.h | 30 +- + drivers/staging/ath6kl/include/gpio_api.h | 22 +- + drivers/staging/ath6kl/include/hci_transport_api.h | 38 +- + drivers/staging/ath6kl/include/hif.h | 82 +- + drivers/staging/ath6kl/include/htc_api.h | 108 +- + drivers/staging/ath6kl/include/htc_packet.h | 20 +- + drivers/staging/ath6kl/include/target_reg_table.h | 84 +- + drivers/staging/ath6kl/include/wlan_api.h | 76 +- + drivers/staging/ath6kl/include/wmi_api.h | 463 +- + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 166 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 130 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.h | 4 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 112 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 25 +- + drivers/staging/ath6kl/miscdrv/common_drv.c | 275 +- + drivers/staging/ath6kl/miscdrv/credit_dist.c | 8 +- + drivers/staging/ath6kl/miscdrv/miscdrv.h | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_android.c | 45 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 1022 +- + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 194 +- + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 54 +- + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 60 +- + drivers/staging/ath6kl/os/linux/cfg80211.c | 178 +- + drivers/staging/ath6kl/os/linux/eeprom.c | 62 +- + .../staging/ath6kl/os/linux/export_hci_transport.c | 42 +- + drivers/staging/ath6kl/os/linux/hci_bridge.c | 154 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 261 +- + drivers/staging/ath6kl/os/linux/include/ar6k_pal.h | 4 +- + .../ath6kl/os/linux/include/ar6xapi_linux.h | 158 +- + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 240 +- + .../ath6kl/os/linux/include/athtypes_linux.h | 1 - + drivers/staging/ath6kl/os/linux/include/cfg80211.h | 20 +- + .../ath6kl/os/linux/include/export_hci_transport.h | 22 +- + .../staging/ath6kl/os/linux/include/osapi_linux.h | 32 +- + .../ath6kl/os/linux/include/wmi_filter_linux.h | 6 +- + drivers/staging/ath6kl/os/linux/ioctl.c | 829 +- + drivers/staging/ath6kl/os/linux/netbuf.c | 60 +- + drivers/staging/ath6kl/os/linux/wireless_ext.c | 293 +- + drivers/staging/ath6kl/reorder/aggr_rx_internal.h | 42 +- + drivers/staging/ath6kl/reorder/rcv_aggr.c | 94 +- + drivers/staging/ath6kl/wlan/include/ieee80211.h | 72 +- + .../staging/ath6kl/wlan/include/ieee80211_node.h | 10 +- + drivers/staging/ath6kl/wlan/src/wlan_node.c | 48 +- + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 40 +- + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 6 +- + drivers/staging/ath6kl/wmi/wmi.c | 1539 ++-- + drivers/staging/ath6kl/wmi/wmi_host.h | 42 +- + drivers/staging/autofs/Kconfig | 22 - + drivers/staging/autofs/Makefile | 7 - + drivers/staging/autofs/TODO | 8 - + drivers/staging/autofs/autofs_i.h | 165 - + drivers/staging/autofs/dirhash.c | 260 - + drivers/staging/autofs/init.c | 52 - + drivers/staging/autofs/inode.c | 288 - + drivers/staging/autofs/root.c | 648 -- + drivers/staging/autofs/symlink.c | 26 - + drivers/staging/autofs/waitq.c | 205 - + drivers/staging/bcm/Bcmchar.c | 7 + + drivers/staging/brcm80211/Kconfig | 18 +- + drivers/staging/brcm80211/Makefile | 63 +- + drivers/staging/brcm80211/brcmfmac/Kconfig | 15 - + drivers/staging/brcm80211/brcmfmac/Makefile | 35 +- + drivers/staging/brcm80211/brcmfmac/aiutils.c | 1 + + .../brcm80211/{include => brcmfmac}/bcmcdc.h | 4 +- + .../brcm80211/{include => brcmfmac}/bcmsdbus.h | 0 + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 2 - + .../brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h | 0 + drivers/staging/brcm80211/brcmfmac/bcmutils.c | 1 + + drivers/staging/brcm80211/brcmfmac/bcmwifi.c | 1 + + drivers/staging/brcm80211/brcmfmac/dhd.h | 74 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 22 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 61 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 4 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 73 +- + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 3 - + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 - + .../brcm80211/{include => brcmfmac}/dhdioctl.h | 7 - + drivers/staging/brcm80211/brcmfmac/hndpmu.c | 1 + + .../{include => brcmfmac}/hndrte_armtrap.h | 0 + .../brcm80211/{include => brcmfmac}/hndrte_cons.h | 5 + + drivers/staging/brcm80211/brcmfmac/linux_osl.c | 1 + + .../brcm80211/{include => brcmfmac}/msgtrace.h | 10 +- + drivers/staging/brcm80211/brcmfmac/sbutils.c | 1 + + .../brcm80211/{include => brcmfmac}/sdioh.h | 0 + .../brcm80211/{include => brcmfmac}/sdiovar.h | 6 - + drivers/staging/brcm80211/brcmfmac/siutils.c | 1 + + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 41 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 3 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 116 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 9 +- + drivers/staging/brcm80211/brcmsmac/Makefile | 65 + + .../staging/brcm80211/{include => brcmsmac}/d11.h | 43 +- + .../brcm80211/{sys => brcmsmac}/d11ucode_ext.h | 0 + .../brcm80211/{ => brcmsmac}/phy/phy_version.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c | 0 + .../brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h | 0 + .../brcm80211/{include => brcmsmac}/sbhndpio.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wl_dbg.h | 0 + .../brcm80211/{sys => brcmsmac}/wl_export.h | 1 + + .../brcm80211/{sys => brcmsmac}/wl_mac80211.c | 86 +- + .../brcm80211/{sys => brcmsmac}/wl_mac80211.h | 9 - + .../staging/brcm80211/{sys => brcmsmac}/wl_ucode.h | 0 + .../brcm80211/{sys => brcmsmac}/wl_ucode_loader.c | 0 + .../brcm80211/{sys => brcmsmac}/wlc_alloc.c | 6 +- + .../brcm80211/{sys => brcmsmac}/wlc_alloc.h | 0 + .../brcm80211/{sys => brcmsmac}/wlc_ampdu.c | 38 +- + .../brcm80211/{sys => brcmsmac}/wlc_ampdu.h | 0 + .../brcm80211/{sys => brcmsmac}/wlc_antsel.c | 0 + .../brcm80211/{sys => brcmsmac}/wlc_antsel.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c | 242 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h | 61 +- + .../brcm80211/{sys => brcmsmac}/wlc_bsscfg.h | 6 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h | 0 + .../brcm80211/{sys => brcmsmac}/wlc_channel.c | 67 - + .../brcm80211/{sys => brcmsmac}/wlc_channel.h | 10 - + .../brcm80211/{sys => brcmsmac}/wlc_event.c | 29 - + .../brcm80211/{sys => brcmsmac}/wlc_event.h | 2 - + .../staging/brcm80211/{sys => brcmsmac}/wlc_key.h | 5 +- + .../brcm80211/{sys => brcmsmac}/wlc_mac80211.c | 247 +- + .../brcm80211/{sys => brcmsmac}/wlc_mac80211.h | 16 +- + .../brcm80211/{sys => brcmsmac}/wlc_phy_shim.c | 0 + .../brcm80211/{sys => brcmsmac}/wlc_phy_shim.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_pub.h | 21 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_rate.c | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_rate.h | 0 + .../staging/brcm80211/{sys => brcmsmac}/wlc_scb.h | 2 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_stf.c | 77 +- + .../staging/brcm80211/{sys => brcmsmac}/wlc_stf.h | 1 - + .../brcm80211/{sys => brcmsmac}/wlc_types.h | 0 + drivers/staging/brcm80211/include/bcmnvram.h | 6 - + drivers/staging/brcm80211/include/bcmsdh.h | 1 + + drivers/staging/brcm80211/include/bcmutils.h | 33 +- + drivers/staging/brcm80211/include/bcmwifi.h | 25 - + drivers/staging/brcm80211/include/hnddma.h | 46 +- + .../staging/brcm80211/include/packed_section_end.h | 32 - + .../brcm80211/include/packed_section_start.h | 36 - + drivers/staging/brcm80211/include/proto/802.11.h | 117 +- + drivers/staging/brcm80211/include/proto/bcmeth.h | 8 +- + drivers/staging/brcm80211/include/proto/bcmevent.h | 24 +- + drivers/staging/brcm80211/include/proto/ethernet.h | 72 - + drivers/staging/brcm80211/include/proto/wpa.h | 33 - + drivers/staging/brcm80211/include/rpc_osl.h | 33 - + drivers/staging/brcm80211/include/sbsdio.h | 2 +- + drivers/staging/brcm80211/include/siutils.h | 4 - + drivers/staging/brcm80211/include/spid.h | 155 - + drivers/staging/brcm80211/include/wlioctl.h | 33 +- + drivers/staging/brcm80211/util/aiutils.c | 7 - + drivers/staging/brcm80211/util/bcmsrom.c | 18 +- + .../brcm80211/{include => util}/bcmsrom_tbl.h | 0 + drivers/staging/brcm80211/util/bcmutils.c | 5 +- + drivers/staging/brcm80211/util/bcmwifi.c | 56 - + drivers/staging/brcm80211/util/hnddma.c | 1409 +--- + drivers/staging/brcm80211/util/hndpmu.c | 14 +- + .../staging/brcm80211/{include => util}/pci_core.h | 0 + .../staging/brcm80211/{include => util}/sbpcmcia.h | 0 + .../staging/brcm80211/{include => util}/sbsocram.h | 0 + drivers/staging/brcm80211/util/sbutils.c | 111 - + drivers/staging/brcm80211/util/siutils.c | 3 - + drivers/staging/brcm80211/util/siutils_priv.h | 2 - + drivers/staging/comedi/comedi_fops.c | 23 +- + drivers/staging/comedi/drivers.c | 4 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 62 +- + drivers/staging/comedi/drivers/icp_multi.c | 14 +- + drivers/staging/comedi/drivers/me4000.c | 8 +- + drivers/staging/comedi/drivers/rtd520.c | 321 +- + drivers/staging/cs5535_gpio/cs5535_gpio.c | 3 +- + drivers/staging/cxt1e1/linux.c | 2 +- + drivers/staging/dabusb/dabusb.c | 338 +- + drivers/staging/dabusb/dabusb.h | 41 +- + drivers/staging/easycap/Kconfig | 26 +- + drivers/staging/easycap/Makefile | 15 +- + drivers/staging/easycap/easycap.h | 545 +- + drivers/staging/easycap/easycap_debug.h | 29 - + drivers/staging/easycap/easycap_ioctl.c | 1101 +-- + drivers/staging/easycap/easycap_ioctl.h | 28 - + drivers/staging/easycap/easycap_low.c | 362 +- + drivers/staging/easycap/easycap_main.c | 3980 ++++---- + drivers/staging/easycap/easycap_settings.c | 49 +- + drivers/staging/easycap/easycap_sound.c | 1385 +-- + drivers/staging/easycap/easycap_sound.h | 28 - + drivers/staging/easycap/easycap_sound_oss.c | 1019 ++ + drivers/staging/easycap/easycap_standard.h | 27 - + drivers/staging/easycap/easycap_testcard.c | 5 +- + drivers/staging/et131x/et1310_eeprom.c | 8 +- + drivers/staging/et131x/et1310_mac.c | 74 +- + drivers/staging/et131x/et1310_phy.c | 70 +- + drivers/staging/et131x/et1310_phy.h | 649 +- + drivers/staging/et131x/et1310_pm.c | 34 +- + drivers/staging/et131x/et1310_rx.c | 61 +- + drivers/staging/et131x/et1310_tx.c | 4 +- + drivers/staging/et131x/et131x.h | 4 +- + drivers/staging/et131x/et131x_adapter.h | 63 +- + drivers/staging/et131x/et131x_initpci.c | 50 +- + drivers/staging/et131x/et131x_isr.c | 18 +- + drivers/staging/et131x/et131x_netdev.c | 2 +- + drivers/staging/ft1000/Kconfig | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 263 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h | 1 - + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 3 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 34 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 1552 ++-- + drivers/staging/go7007/Kconfig | 1 - + drivers/staging/go7007/s2250-loader.c | 3 - + drivers/staging/hv/Kconfig | 1 + + drivers/staging/hv/Makefile | 1 + + drivers/staging/hv/blkvsc.c | 22 +- + drivers/staging/hv/blkvsc_drv.c | 58 +- + drivers/staging/hv/channel.c | 148 +- + drivers/staging/hv/channel_mgmt.c | 103 +- + drivers/staging/hv/connection.c | 189 +- + drivers/staging/hv/hv.c | 4 +- + drivers/staging/hv/hv_kvp.c | 346 + + drivers/staging/hv/hv_kvp.h | 184 + + drivers/staging/hv/{hv_utils.c => hv_util.c} | 20 +- + drivers/staging/hv/netvsc.c | 126 +- + drivers/staging/hv/netvsc_drv.c | 38 +- + drivers/staging/hv/osd.h | 10 +- + drivers/staging/hv/rndis_filter.c | 52 +- + drivers/staging/hv/storvsc.c | 52 +- + drivers/staging/hv/storvsc_drv.c | 32 +- + drivers/staging/hv/tools/hv_kvp_daemon.c | 470 + + drivers/staging/hv/utils.h | 1 + + drivers/staging/hv/vmbus_api.h | 68 +- + drivers/staging/hv/vmbus_channel_interface.h | 26 +- + drivers/staging/hv/vmbus_drv.c | 245 +- + drivers/staging/hv/vmbus_packet_format.h | 118 +- + drivers/staging/hv/vmbus_private.h | 58 +- + drivers/staging/iio/Documentation/dac/max517 | 41 + + drivers/staging/iio/Documentation/iio_utils.h | 2 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 18 + + drivers/staging/iio/adc/ad7476_core.c | 2 +- + drivers/staging/iio/dac/Kconfig | 10 + + drivers/staging/iio/dac/Makefile | 1 + + drivers/staging/iio/dac/max517.c | 298 + + drivers/staging/iio/dac/max517.h | 19 + + drivers/staging/keucr/TODO | 3 +- + drivers/staging/keucr/smilecc.c | 16 +- + drivers/staging/keucr/smilsub.c | 69 +- + drivers/staging/msm/lcdc.c | 4 +- + drivers/staging/octeon/cvmx-cmd-queue.h | 16 +- + drivers/staging/octeon/cvmx-pko.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 97 +- + drivers/staging/pohmelfs/config.c | 2 +- + drivers/staging/pohmelfs/dir.c | 1 - + drivers/staging/pohmelfs/inode.c | 10 +- + drivers/staging/pohmelfs/netfs.h | 2 +- + drivers/staging/rt2860/common/cmm_mac_pci.c | 2 +- + drivers/staging/rt2860/rt_linux.c | 3 +- + drivers/staging/rt2860/rt_linux.h | 12 +- + drivers/staging/rt2860/wpa.h | 12 +- + drivers/staging/rtl8192e/dot11d.h | 9 +- + drivers/staging/rtl8192e/ieee80211.h | 1 - + drivers/staging/rtl8192e/ieee80211/dot11d.c | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 2 +- + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 6 - + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 25 - + .../rtl8192e/ieee80211/ieee80211_crypt_wep.c | 1 - + .../staging/rtl8192e/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 224 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 250 +- + .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 33 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 46 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 19 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 207 +- + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 41 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 1 - + drivers/staging/rtl8192e/r8190_rtl8256.c | 10 - + drivers/staging/rtl8192e/r8192E.h | 481 +- + drivers/staging/rtl8192e/r8192E_core.c | 696 +-- + drivers/staging/rtl8192e/r8192E_dm.c | 682 +-- + drivers/staging/rtl8192e/r8192E_wx.c | 25 +- + drivers/staging/rtl8192e/r819xE_cmdpkt.c | 101 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 - + drivers/staging/rtl8192u/r8192U.h | 6 - + drivers/staging/rtl8192u/r819xU_firmware.c | 76 +- + drivers/staging/rtl8192u/r819xU_firmware_img.c | 2900 ------ + drivers/staging/rtl8192u/r819xU_firmware_img.h | 7 - + drivers/staging/rtl8712/Kconfig | 1 + + drivers/staging/rtl8712/TODO | 2 - + drivers/staging/rtl8712/farray.h |10197 -------------------- + drivers/staging/rtl8712/hal_init.c | 23 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 1 + + drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 2 - + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 2 +- + drivers/staging/rts_pstor/Kconfig | 16 + + drivers/staging/rts_pstor/Makefile | 16 + + drivers/staging/rts_pstor/TODO | 5 + + drivers/staging/rts_pstor/debug.h | 43 + + drivers/staging/rts_pstor/general.c | 35 + + drivers/staging/rts_pstor/general.h | 31 + + drivers/staging/rts_pstor/ms.c | 4244 ++++++++ + drivers/staging/rts_pstor/ms.h | 225 + + drivers/staging/rts_pstor/rtsx.c | 1124 +++ + drivers/staging/rts_pstor/rtsx.h | 183 + + drivers/staging/rts_pstor/rtsx_card.c | 1257 +++ + drivers/staging/rts_pstor/rtsx_card.h | 1093 +++ + drivers/staging/rts_pstor/rtsx_chip.c | 2337 +++++ + drivers/staging/rts_pstor/rtsx_chip.h | 989 ++ + drivers/staging/rts_pstor/rtsx_scsi.c | 3203 ++++++ + drivers/staging/rts_pstor/rtsx_scsi.h | 142 + + drivers/staging/rts_pstor/rtsx_sys.h | 50 + + drivers/staging/rts_pstor/rtsx_transport.c | 914 ++ + drivers/staging/rts_pstor/rtsx_transport.h | 66 + + drivers/staging/rts_pstor/sd.c | 4768 +++++++++ + drivers/staging/rts_pstor/sd.h | 295 + + drivers/staging/rts_pstor/spi.c | 812 ++ + drivers/staging/rts_pstor/spi.h | 65 + + drivers/staging/rts_pstor/trace.h | 117 + + drivers/staging/rts_pstor/xd.c | 2051 ++++ + drivers/staging/rts_pstor/xd.h | 188 + + drivers/staging/sep/TODO | 1 + + drivers/staging/sep/sep_driver.c | 317 +- + drivers/staging/sep/sep_driver_api.h | 4 +- + drivers/staging/sep/sep_driver_config.h | 4 + + drivers/staging/smbfs/Kconfig | 56 - + drivers/staging/smbfs/Makefile | 18 - + drivers/staging/smbfs/TODO | 8 - + drivers/staging/smbfs/cache.c | 208 - + drivers/staging/smbfs/dir.c | 699 -- + drivers/staging/smbfs/file.c | 456 - + drivers/staging/smbfs/getopt.c | 64 - + drivers/staging/smbfs/getopt.h | 14 - + drivers/staging/smbfs/inode.c | 854 -- + drivers/staging/smbfs/ioctl.c | 68 - + drivers/staging/smbfs/proc.c | 3502 ------- + drivers/staging/smbfs/proto.h | 89 - + drivers/staging/smbfs/request.c | 817 -- + drivers/staging/smbfs/request.h | 70 - + drivers/staging/smbfs/smb.h | 118 - + drivers/staging/smbfs/smb_debug.h | 34 - + drivers/staging/smbfs/smb_fs.h | 153 - + drivers/staging/smbfs/smb_fs_i.h | 37 - + drivers/staging/smbfs/smb_fs_sb.h | 100 - + drivers/staging/smbfs/smb_mount.h | 65 - + drivers/staging/smbfs/smbfs.txt | 8 - + drivers/staging/smbfs/smbiod.c | 343 - + drivers/staging/smbfs/smbno.h | 363 - + drivers/staging/smbfs/sock.c | 385 - + drivers/staging/smbfs/symlink.c | 67 - + drivers/staging/speakup/main.c | 127 +- + drivers/staging/speakup/spk_priv_keyinfo.h | 44 +- + drivers/staging/speakup/spk_types.h | 18 +- + drivers/staging/spectra/lld_nand.c | 2 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 10 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 1 - + drivers/staging/ti-st/Makefile | 2 +- + drivers/staging/ti-st/bt_drv.c | 509 - + drivers/staging/ti-st/bt_drv.h | 61 - + drivers/staging/ti-st/btwilink.c | 363 + + drivers/staging/tm6000/tm6000-input.c | 4 +- + drivers/staging/usbvideo/usbvideo.c | 170 +- + drivers/staging/usbvideo/vicam.c | 164 +- + drivers/staging/vt6655/device_main.c | 18 +- + drivers/staging/vt6656/Kconfig | 1 + + drivers/staging/vt6656/device.h | 3 + + drivers/staging/vt6656/firmware.c | 805 +-- + drivers/staging/vt6656/main_usb.c | 3 + + .../staging/westbridge/astoria/api/src/cyasmisc.c | 20 +- + .../staging/westbridge/astoria/api/src/cyasmtp.c | 8 + + .../westbridge/astoria/api/src/cyasstorage.c | 33 +- + .../staging/westbridge/astoria/api/src/cyasusb.c | 33 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 7 +- + .../westbridge/astoria/device/cyandevice_export.h | 132 - + .../staging/westbridge/astoria/device/cyasdevice.c | 5 +- + drivers/staging/wlan-ng/hfa384x.h | 156 +- + drivers/staging/wlan-ng/p80211conv.c | 4 +- + drivers/staging/wlan-ng/p80211conv.h | 6 +- + drivers/staging/wlan-ng/p80211hdr.h | 6 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 30 +- + drivers/staging/wlan-ng/p80211mgmt.h | 18 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 34 +- + drivers/staging/zram/Kconfig | 10 +- + drivers/staging/zram/xvmalloc.c | 81 +- + drivers/staging/zram/xvmalloc_int.h | 23 +- + drivers/staging/zram/zram_drv.c | 35 +- + drivers/staging/zram/zram_drv.h | 1 + + drivers/staging/zram/zram_sysfs.c | 7 +- + include/linux/connector.h | 3 +- + 441 files changed, 40872 insertions(+), 44559 deletions(-) + delete mode 100644 drivers/staging/autofs/Kconfig + delete mode 100644 drivers/staging/autofs/Makefile + delete mode 100644 drivers/staging/autofs/TODO + delete mode 100644 drivers/staging/autofs/autofs_i.h + delete mode 100644 drivers/staging/autofs/dirhash.c + delete mode 100644 drivers/staging/autofs/init.c + delete mode 100644 drivers/staging/autofs/inode.c + delete mode 100644 drivers/staging/autofs/root.c + delete mode 100644 drivers/staging/autofs/symlink.c + delete mode 100644 drivers/staging/autofs/waitq.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/Kconfig + create mode 100644 drivers/staging/brcm80211/brcmfmac/aiutils.c + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmcdc.h (97%) + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdbus.h (100%) + rename drivers/staging/brcm80211/{include => brcmfmac}/bcmsdh_sdmmc.h (100%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmutils.c + create mode 100644 drivers/staging/brcm80211/brcmfmac/bcmwifi.c + rename drivers/staging/brcm80211/{include => brcmfmac}/dhdioctl.h (95%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/hndpmu.c + rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_armtrap.h (100%) + rename drivers/staging/brcm80211/{include => brcmfmac}/hndrte_cons.h (96%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/linux_osl.c + rename drivers/staging/brcm80211/{include => brcmfmac}/msgtrace.h (88%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/sbutils.c + rename drivers/staging/brcm80211/{include => brcmfmac}/sdioh.h (100%) + rename drivers/staging/brcm80211/{include => brcmfmac}/sdiovar.h (90%) + create mode 100644 drivers/staging/brcm80211/brcmfmac/siutils.c + create mode 100644 drivers/staging/brcm80211/brcmsmac/Makefile + rename drivers/staging/brcm80211/{include => brcmsmac}/d11.h (98%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/d11ucode_ext.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/phy_version.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_cmn.c (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_hal.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_int.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.c (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_lcn.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_n.c (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phy_radio.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phyreg_n.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.c (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_lcn.h (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.c (100%) + rename drivers/staging/brcm80211/{ => brcmsmac}/phy/wlc_phytbl_n.h (100%) + rename drivers/staging/brcm80211/{include => brcmsmac}/sbhndpio.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_dbg.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_export.h (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.c (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_mac80211.h (91%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_ucode.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wl_ucode_loader.c (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.c (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_alloc.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.c (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_ampdu.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.c (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_antsel.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.c (94%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bmac.h (81%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_bsscfg.h (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_cfg.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.c (96%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_channel.h (90%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_event.c (90%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_event.h (94%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_key.h (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_mac80211.c (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_mac80211.h (98%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.c (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_phy_shim.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_pub.h (97%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.c (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_rate.h (100%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_scb.h (98%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.c (87%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_stf.h (96%) + rename drivers/staging/brcm80211/{sys => brcmsmac}/wlc_types.h (100%) + delete mode 100644 drivers/staging/brcm80211/include/packed_section_end.h + delete mode 100644 drivers/staging/brcm80211/include/packed_section_start.h + delete mode 100644 drivers/staging/brcm80211/include/proto/ethernet.h + delete mode 100644 drivers/staging/brcm80211/include/proto/wpa.h + delete mode 100644 drivers/staging/brcm80211/include/rpc_osl.h + delete mode 100644 drivers/staging/brcm80211/include/spid.h + rename drivers/staging/brcm80211/{include => util}/bcmsrom_tbl.h (100%) + rename drivers/staging/brcm80211/{include => util}/pci_core.h (100%) + rename drivers/staging/brcm80211/{include => util}/sbpcmcia.h (100%) + rename drivers/staging/brcm80211/{include => util}/sbsocram.h (100%) + delete mode 100644 drivers/staging/easycap/easycap_debug.h + delete mode 100644 drivers/staging/easycap/easycap_ioctl.h + delete mode 100644 drivers/staging/easycap/easycap_sound.h + create mode 100644 drivers/staging/easycap/easycap_sound_oss.c + delete mode 100644 drivers/staging/easycap/easycap_standard.h + delete mode 100644 drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.h + create mode 100644 drivers/staging/hv/hv_kvp.c + create mode 100644 drivers/staging/hv/hv_kvp.h + rename drivers/staging/hv/{hv_utils.c => hv_util.c} (96%) + create mode 100644 drivers/staging/hv/tools/hv_kvp_daemon.c + create mode 100644 drivers/staging/iio/Documentation/dac/max517 + create mode 100644 drivers/staging/iio/dac/max517.c + create mode 100644 drivers/staging/iio/dac/max517.h + delete mode 100644 drivers/staging/rtl8712/farray.h + create mode 100644 drivers/staging/rts_pstor/Kconfig + create mode 100644 drivers/staging/rts_pstor/Makefile + create mode 100644 drivers/staging/rts_pstor/TODO + create mode 100644 drivers/staging/rts_pstor/debug.h + create mode 100644 drivers/staging/rts_pstor/general.c + create mode 100644 drivers/staging/rts_pstor/general.h + create mode 100644 drivers/staging/rts_pstor/ms.c + create mode 100644 drivers/staging/rts_pstor/ms.h + create mode 100644 drivers/staging/rts_pstor/rtsx.c + create mode 100644 drivers/staging/rts_pstor/rtsx.h + create mode 100644 drivers/staging/rts_pstor/rtsx_card.c + create mode 100644 drivers/staging/rts_pstor/rtsx_card.h + create mode 100644 drivers/staging/rts_pstor/rtsx_chip.c + create mode 100644 drivers/staging/rts_pstor/rtsx_chip.h + create mode 100644 drivers/staging/rts_pstor/rtsx_scsi.c + create mode 100644 drivers/staging/rts_pstor/rtsx_scsi.h + create mode 100644 drivers/staging/rts_pstor/rtsx_sys.h + create mode 100644 drivers/staging/rts_pstor/rtsx_transport.c + create mode 100644 drivers/staging/rts_pstor/rtsx_transport.h + create mode 100644 drivers/staging/rts_pstor/sd.c + create mode 100644 drivers/staging/rts_pstor/sd.h + create mode 100644 drivers/staging/rts_pstor/spi.c + create mode 100644 drivers/staging/rts_pstor/spi.h + create mode 100644 drivers/staging/rts_pstor/trace.h + create mode 100644 drivers/staging/rts_pstor/xd.c + create mode 100644 drivers/staging/rts_pstor/xd.h + delete mode 100644 drivers/staging/smbfs/Kconfig + delete mode 100644 drivers/staging/smbfs/Makefile + delete mode 100644 drivers/staging/smbfs/TODO + delete mode 100644 drivers/staging/smbfs/cache.c + delete mode 100644 drivers/staging/smbfs/dir.c + delete mode 100644 drivers/staging/smbfs/file.c + delete mode 100644 drivers/staging/smbfs/getopt.c + delete mode 100644 drivers/staging/smbfs/getopt.h + delete mode 100644 drivers/staging/smbfs/inode.c + delete mode 100644 drivers/staging/smbfs/ioctl.c + delete mode 100644 drivers/staging/smbfs/proc.c + delete mode 100644 drivers/staging/smbfs/proto.h + delete mode 100644 drivers/staging/smbfs/request.c + delete mode 100644 drivers/staging/smbfs/request.h + delete mode 100644 drivers/staging/smbfs/smb.h + delete mode 100644 drivers/staging/smbfs/smb_debug.h + delete mode 100644 drivers/staging/smbfs/smb_fs.h + delete mode 100644 drivers/staging/smbfs/smb_fs_i.h + delete mode 100644 drivers/staging/smbfs/smb_fs_sb.h + delete mode 100644 drivers/staging/smbfs/smb_mount.h + delete mode 100644 drivers/staging/smbfs/smbfs.txt + delete mode 100644 drivers/staging/smbfs/smbiod.c + delete mode 100644 drivers/staging/smbfs/smbno.h + delete mode 100644 drivers/staging/smbfs/sock.c + delete mode 100644 drivers/staging/smbfs/symlink.c + delete mode 100644 drivers/staging/ti-st/bt_drv.c + delete mode 100644 drivers/staging/ti-st/bt_drv.h + create mode 100644 drivers/staging/ti-st/btwilink.c + delete mode 100644 drivers/staging/westbridge/astoria/device/cyandevice_export.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Resolved 'include/linux/hardirq.h' using previous resolution. +Resolved 'include/linux/smp_lock.h' using previous resolution. +Auto-merging arch/powerpc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c +Auto-merging arch/sparc/kernel/leon_smp.c +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/kernel/compat_signal.c +Auto-merging arch/tile/kernel/signal.c +Auto-merging block/compat_ioctl.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/char/agp/frontend.c +Auto-merging drivers/char/amiserial.c +Auto-merging drivers/char/specialix.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/drm_fops.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/infiniband/hw/ipath/ipath_file_ops.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/dvb/ngene/ngene-dvb.c +Auto-merging drivers/media/radio/si470x/radio-si470x.h +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/cx88/cx88-video.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-empress.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging drivers/media/video/usbvision/usbvision-video.c +Auto-merging drivers/media/video/v4l2-compat-ioctl32.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/block/dasd_eer.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/cx25821/cx25821.h +Auto-merging drivers/staging/easycap/easycap.h +Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/core/inode.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/host/isp1362-hcd.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/video/console/vgacon.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/block_dev.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/compat_ioctl.c +Auto-merging fs/ecryptfs/super.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ioctl.c +Auto-merging fs/lockd/clntlock.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/svc4proc.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcproc.c +Auto-merging fs/locks.c +Auto-merging fs/namespace.c +Auto-merging fs/ncpfs/dir.c +Auto-merging fs/ncpfs/file.c +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/ncpfs/ioctl.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/nfs/delegation.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/inode.c +Auto-merging fs/read_write.c +Auto-merging fs/reiserfs/ioctl.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/reiserfs/super.c +Auto-merging include/linux/hardirq.h +CONFLICT (content): Merge conflict in include/linux/hardirq.h +Auto-merging include/linux/smp_lock.h +CONFLICT (content): Merge conflict in include/linux/smp_lock.h +Auto-merging include/linux/tty.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/irda/af_irda.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/sound.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/stradis/Kconfig +arch/powerpc/kernel/setup_64.c: needs merge +drivers/staging/stradis/Kconfig: needs merge +fs/nfsd/nfs4state.c: needs merge +include/linux/hardirq.h: needs merge +include/linux/smp_lock.h: needs merge +rm 'drivers/staging/stradis/Kconfig' +$ git commit -v -a +[master 3a39f8b] Merge remote branch 'bkl-config/config' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/staging/Kconfig | 11 +++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + lib/Kconfig.debug | 9 --------- + 7 files changed, 21 insertions(+), 43 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ca9d46] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..adf30b38051e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,27 @@ +Importing i2c based on 2.6.38-rc3-git5 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 8dbdea8444d303a772bceb1ba963f0e3273bfc5e +HEAD is now at 8dbdea8 Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-delete-linux-i2c-id-h.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 69d4685...5f98829 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.38-rc3-git5 +$ cd ../quilt-tmp +$ git reset --hard 8dbdea8444d303a772bceb1ba963f0e3273bfc5e +HEAD is now at 8dbdea8 Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-w83795-document-pin-mapping.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 0f34c62...0a1d8eb master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.37-rc4 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.38-rc3-19-gafe8a88 +Unchanged quilt series rr +Importing device-mapper based on v2.6.37-7185-g52cfd50 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5731e3330ec6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110208 |