diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 14:53:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-05-13 14:53:40 +1000 |
| commit | e7d93d172b268b289688347787052bb0c04963da (patch) | |
| tree | 34ae75ae1112999b6f48141063633d52da9f07bf | |
| parent | cdab2bb105dbb93c7ff1b6405a6a100ccdeb2d8d (diff) | |
Add linux-next specific files for 20110513next-20110513
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 192 | ||||
| -rw-r--r-- | Next/Trees | 194 | ||||
| -rw-r--r-- | Next/merge.log | 8591 | ||||
| -rw-r--r-- | Next/quilt-import.log | 22 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 9000 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7788a10705bf --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,192 @@ +Name SHA1 +---- ---- +origin 411f05f123cbd7f8aa1edcae86970755a6e2a9d9 +fixes 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current 3568bd9720b4a775f28a718fcbb462ce2f386988 +m68k-current 4aac0b4815ba592052758f4b468f253d383dc9d6 +powerpc-merge 7b84b29b8c2711fe64e0dba4db22f02ce0f16015 +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current b1054282d752c5a026e2c0450616ebf37fc0413e +scsi-rc-fixes c055f5b2614b4f758ae6cc86733f31fa4c2c5844 +net-current ca06707022d6ba4744198a8ebbe4994786b0c613 +sound-current 24af2b1cc418d6791b1d9e56bf6070cccb752db3 +pci-current 2f666bcf757cb72549f360ef6da02f03620a48b6 +wireless-current 2ae1b8b35faba31a59b153cbad07f9c15de99740 +driver-core.current 0ee5623f9a6e52df90a78bd21179f8ab370e102e +tty.current 0ee5623f9a6e52df90a78bd21179f8ab370e102e +usb.current 693d92a1bbc9e42681c42ed190bd42b636ca876f +staging.current 693d92a1bbc9e42681c42ed190bd42b636ca876f +cpufreq-current 5dd12af05ca6b7d052c06a9ca4ff755fdfa25ae4 +input-current 28350e330cfab46b60a1dbf763b678d859f9f3d9 +md-current 2005ee9b5f721d432c74e6c283be682e74f9872d +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 60af520cf264ea26b2af3a6871bbd71850522aea +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current a375b15164dd9264f724ad941825e52c90145151 +rmobile-current a7f800131f35925299860a95259453c9bc0c272f +fbdev-current da09931454f4d84a1c44064a3db385886761542b +devicetree-current 8e10cd74342c7f5ce259cceca36f6eba084f5d58 +spi-current 8faa7cf828bca1745a4ed599876567f5afc47544 +arm c1af1638d406b3adf680a6b3b51d97d972e93efb +at91 bad3db778f4ea5b41690400ce5bfff262a1d9775 +davinci 8ac764e3479f6057c1cc85bd960dd2aa0fb82fea +i.MX 1caf9263808a66963b5169f32a90449f3c66d47a +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm f2ba30560a71b39b4ad3230f5deb96fefaaa6417 +omap b184ce78859d9da3b5ea544fb80bdf1dbc7104bc +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 3185847957d4834d1b30b253b1c71bb05bad7265 +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core 417ffd2681947603a1a60372fd02406890fb120f +xilinx 950faba947efed354a63cc32acf7deb9882baf9f +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin a35f257e695a06122dc47c683a12fddced6f2dd8 +cris ea78f5b898555ddfbab494c7755130362fe3cf46 +ia64 9138ea42304fe495b32628d4f18f492f7d891e21 +m68k b7845e51c4b198f5b6d35ec67eb38aabec2d41d3 +m68knommu e2a693e72396039dd2dd726c35938d333ae4d543 +microblaze a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077 +mips 95317334d9537a42171df3633295751ef0f2602e +parisc 54a6067ece30c11c8b340b94ecc5a01bb0bd9317 +powerpc a0496d450ab8c17f6c4d86979b1f6ba486fe9365 +4xx 65f47f1339dfcffcd5837a307172fb41aa39e479 +52xx-and-virtex 3c4ad4eeb45d396189f051603f9c326f64fef707 +galak b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e +s390 7c094eb86ab49a341e4630a675202f13c2051669 +sh a375b15164dd9264f724ad941825e52c90145151 +rmobile a7f800131f35925299860a95259453c9bc0c272f +sparc 970def654e9df1ad28ddb466bb1d123a55e1e7e7 +tile d2e48c1d4184a0baa4bf09920b63661e0b860b8c +unicore32 5ab8a4a9bcbc3e425e7b5ab147f231a23dd57547 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 4b2a58abd1e17c0ee53c8dded879e015917cca67 +cifs 231bf25a7d7e103bb251d059d01239421f339a4c +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 8d49dba68412af6a34fbce6644b8b30dd66a8e35 +ext3 a79a9596ad9987389d48ff120525be3cdeea0e02 +ext4 44183d4231a52a797beb477f962e1d361e31299d +fatfs f68e542f3478147986a9c8958942ec649dc06201 +fuse d24339059d640f108c08ba99ef30e3bafa10f8e4 +gfs2 32e471ef1057e812856739d26b4a87d929fb8aa1 +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs a75b9df9d3bfc3cd1083974c045ae31ce5f3434f +nfsd 6ce2357f1e73e0da8ebeace6ec829f48a646bb8c +nilfs2 5fc7b14177b1a1c2f2511aed62a4ca870d0332e7 +ocfs2 272b62c1f0f6f742046e45b50b6fec98860208a0 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs 11b1f3397f092754c28c924f1795f1432c476a02 +ubifs 52c6e6f990669deac3f370f1603815adb55a1dbd +xfs e4d3c4a43b595d5124ae824d300626e6489ae857 +vfs 0f60f240d522772467c7d2cebedb910748c78ed4 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci 51c2e0a7e5bc7ed1384cc68cfb95e702571500c9 +hid 1ce0561218e0e7cbe08f0c52b91a5f0589ec86d4 +i2c 143785209104f7075c18d902eb1b7339ae262af2 +bjdooks-i2c 5af199b609f49aa451e7a30ebe7f461a1ee669eb +jdelvare-hwmon bbad82efd11bab581c8917d37e72bf0d7f8edc35 +hwmon-staging 56284a5fc5a480a5f8094ada23e54f56f70b97cb +kernel-doc bd4cb700fc1cefbbf923a58f984d69627a143aa4 +docs 61516587513c84ac26e68e3ab008dc6e965d0378 +v4l-dvb 32e60110369b3beed0885e3a178cc7e1985dbf5f +kbuild 23122fbbbabe226a30e0ea04e4f70345eb525bdb +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 50be5e3657cd2851a297dc0b3fd459f25829d29b +infiniband 1df9fad1220beb21b4b4230373cbf4924436dd88 +acpi 6447f55da90b77faec1697d499ed7986bb4f6de6 +idle-test 78fca1b95837a44983608302e89c7258981be9b3 +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +cpupowerutils 9cd581865c6ad25348b6b6d61859a1773c1728bf +ieee1394 15a6271b2d2ee936b459e708a4a26860cc96452d +ubi de4cad1e0c5a5779d563ad889d10dab6254c7441 +dlm 4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 140363500ddadad0c09cb512cc0c96a4d3efa053 +scsi 8a025bbc8ff897c36c6e2b91c2e852ea5e569394 +async_tx 3ea205c449d2b5996d0256aa8b2894f7aea228a2 +net def57687e9579b7a797681990dff763c411f5347 +wireless 6b86bd62a505a4a9739474f00f8088395b7a80ba +bluetooth 55183d06cd1bd939ceccdad628b0aae12c86b803 +mtd a6360dd37e1a144ed11e6548371bade559a1e4df +crypto 6ef84509f3d439ed2d43ea40080643efec37f54f +sound 67274db6adc94306ca51e1914296d454256ccd46 +sound-asoc 9e53d856af0db8acc8a1bc6a9e3298f6bbb8944b +cpufreq 1a8e1463a49aaa452da1cefe184a00d4df47f1ef +cpufreq-move ff397e04dcca765e054ffb1ffc9d65fabe357a41 +rr bd8c7d496d270f9fbb4d10be3d5ff97df7ee9d26 +input 36682b81de32090f5c9fac165e71ab8939aab8c0 +input-mt a6360dd37e1a144ed11e6548371bade559a1e4df +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 1d76862a2bdae386686b7b60d683ba536c7996a5 +device-mapper 055d219441cc23f631240335fd369b6b5852681a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 2202a5a7490a9de282846ea8d4a56d0249e09033 +battery 6f9efe76cb213e9b0dd89e465efaf9725f4bf492 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc c6150fa2ea7e6c4d467e3459f696816b68fedffb +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab 1759415e630e5db0dd2390df9f94892cbfb9a8a2 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md b098636cf04c89db4036fedc778da0acc666ad1a +mfd ed74fa3e4674101f910de8420c3045f3e1882f30 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 0eacdba3a186e5d5b8a8bb421caacddc135e67e3 +fbdev 4f2970b9f622ba180680a5892be6534cc58843e0 +viafb e01255d698ad00a6f4c6b3e0bf061e27ab238969 +omap_dss2 83563d67f2a4fedc34face1f0fa0e07a72d57705 +voltage ef5adb1c57cfdcecceb66144fb6f8104e5cd1614 +security-testing e77dc3460fa59be5759e9327ad882868eee9d61b +selinux 7a627e3b9a2bd0f06945bbe64bcf403e788ecf6e +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 3568bd9720b4a775f28a718fcbb462ce2f386988 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 51a63e67da6056c13b5b597dcc9e1b3bd7ceaa55 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd a49fb4c3d035ab516507b31ec3bd49263caee14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial 2d9ff66da61d1365406586a6b1ed53cf61e6143f +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 3afde07e75700e9e63c2a4f0c4b1f6e5e450f997 +apm f7cb4bfccf3462b844ba1773d33fe48f934b6555 +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 05a1e39120b59efe8a3032b5c4bb2c3b79c59f75 +spi 3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 +tip 70fe9330b6b1ca44f3882a6a6f049988bba7c657 +rcu 11c476f31a0fabc6e604da5b09a6590b57c3fb20 +kvm b4a927a6db8e46a56ff3c3a93bac8f065b49d7fa +oprofile 855f905a48cf6798c7c65ab5a04f2ac172c168d9 +ptrace 40ae717d1e78d982bd469b2013a4cbf4ec1ca434 +xen-two fb9aa40026250ee6c23a5b2e1bb5571faf7243af +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu ac24307b6910e7286910c1f227bd7951b87a3bae +workqueues 5035b20fa5cd146b66f5f89619c20a4177fb736d +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 62a2f1cc0e91adf12cc5ca84492bf7d5b117adb2 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +namespace 823b7fe56b38319db1a1e2ea78e673072022cc47 +driver-core a236c71766a5f69edf189e2eaeb0aa587c8c5684 +tty e0f263d719cc70245406cc26d86a480925e6a3c9 +usb a0885924326f79e157847010a9aaf49b058b30dc +staging 64a47c5072a6d702349dba30ea8b0e69be4d9778 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +cleancache e046b9640996aa07d240865d97527ed3ea26289d +arm-dt e471e512c8ecf5c32061f9fc88bb939f44b4d395 +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..da9bfcb40e5e --- /dev/null +++ b/Next/Trees @@ -0,0 +1,194 @@ +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 +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-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 +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 +at91 git git://github.com/at91linux/linux-2.6-at91.git#at91-next +davinci git git://gitorious.org/linux-davinci/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 +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/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#dev +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/ +docs git git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap/linux-docs.git#docs-move +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 +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-test +cpupowerutils git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/cpupowerutils.git#master +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 +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 +cpufreq-move git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#move-drivers +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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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 +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 +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +ptrace git git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc.git#ptrace +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 +namespace git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfd.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-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +arm-dt git git://git.secretlab.ca/git/linux-2.6#devicetree/arm-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..9c7b29f6af71 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8591 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 9f381a6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 +Merging origin/master +$ git merge origin/master +Updating 9f381a6..411f05f +Fast-forward + MAINTAINERS | 80 ++++++------ + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/boot/compressed/head.S | 35 ++++-- + arch/arm/boot/compressed/vmlinux.lds.in | 1 + + arch/arm/include/asm/system.h | 2 +- + arch/arm/kernel/signal.c | 90 ++++++++------ + arch/arm/mach-realview/include/mach/barriers.h | 2 +- + arch/arm/mach-tegra/include/mach/barriers.h | 2 +- + arch/arm/mm/init.c | 16 +++- + arch/s390/include/asm/diag.h | 17 +++- + arch/s390/include/asm/mmu_context.h | 2 +- + arch/s390/kernel/diag.c | 21 ---- + arch/s390/kernel/dis.c | 1 + + arch/s390/kernel/entry.S | 2 +- + arch/s390/kernel/entry64.S | 2 +- + arch/s390/mm/cmm.c | 2 +- + arch/s390/oprofile/hwsampler.c | 14 +-- + arch/s390/oprofile/hwsampler.h | 4 +- + arch/s390/oprofile/init.c | 8 +- + arch/sparc/kernel/apc.c | 2 +- + arch/sparc/kernel/pmc.c | 2 +- + arch/sparc/kernel/smp_32.c | 10 +- + arch/sparc/kernel/time_32.c | 2 +- + arch/sparc/lib/checksum_32.S | 12 ++- + arch/x86/include/asm/pgtable_types.h | 1 + + arch/x86/include/asm/x86_init.h | 12 ++ + arch/x86/kernel/x86_init.c | 4 + + arch/x86/mm/init.c | 24 ++++- + arch/x86/xen/mmu.c | 138 +++------------------- + drivers/gpu/drm/i915/intel_display.c | 2 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 3 +- + drivers/gpu/drm/radeon/ni.c | 18 ++-- + drivers/gpu/drm/radeon/radeon_gart.c | 6 +- + drivers/input/touchscreen/ads7846.c | 13 ++- + drivers/mfd/asic3.c | 2 +- + drivers/mfd/omap-usb-host.c | 8 +- + drivers/mfd/twl4030-power.c | 3 +- + drivers/net/arm/etherh.c | 4 +- + drivers/rtc/rtc-s3c.c | 13 ++- + drivers/s390/block/dasd.c | 11 ++- + drivers/s390/char/sclp_cmd.c | 2 + + drivers/video/acornfb.c | 26 ++--- + drivers/video/fbmem.c | 106 +++++++++++++---- + fs/ceph/caps.c | 16 ++-- + fs/ceph/inode.c | 1 + + fs/ceph/mds_client.c | 2 +- + fs/ceph/snap.c | 2 +- + fs/ceph/super.h | 2 +- + fs/fuse/dir.c | 2 +- + include/linux/bootmem.h | 2 + + include/linux/fb.h | 1 + + include/linux/gfp.h | 2 + + include/trace/events/gfpflags.h | 6 +- + kernel/power/suspend.c | 4 +- + kernel/power/user.c | 5 +- + lib/vsprintf.c | 2 +- + mm/page_alloc.c | 56 +++++++--- + mm/page_cgroup.c | 2 +- + mm/shmem.c | 151 +++++++++++++---------- + mm/swap.c | 3 + + net/bluetooth/sco.c | 9 -- + sound/soc/codecs/ssm2602.c | 10 +- + sound/soc/codecs/uda134x.c | 2 - + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/jz4740/jz4740-i2s.c | 2 +- + sound/soc/mid-x86/sst_platform.c | 6 + + sound/soc/soc-core.c | 2 + + 67 files changed, 560 insertions(+), 459 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-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 +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/net/Makefile | 6 ++-- + drivers/net/ehea/ehea_main.c | 6 ++-- + drivers/net/hydra.c | 14 ++++---- + drivers/net/ne-h8300.c | 16 +++++----- + drivers/net/sfc/mcdi.c | 49 ++++++++++++++++++----------- + drivers/net/sfc/nic.h | 2 + + drivers/net/sfc/siena.c | 25 +++++++++++++-- + drivers/net/wireless/ath/ath9k/main.c | 8 +++++ + drivers/net/wireless/iwlegacy/iwl-core.c | 7 ++++ + drivers/net/wireless/iwlegacy/iwl-dev.h | 6 ++++ + drivers/net/wireless/libertas/cmd.c | 6 ++- + drivers/net/zorro8390.c | 12 ++++---- + include/net/inet_ecn.h | 16 ++++++++-- + net/mac80211/tx.c | 4 ++ + 14 files changed, 122 insertions(+), 55 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging 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 +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Merge made by recursive. + arch/sh/boards/mach-ecovec24/setup.c | 18 +++++++++--------- + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/configs/sh7757lcr_defconfig | 2 +- + arch/sh/kernel/cpu/Makefile | 4 +--- + drivers/i2c/busses/i2c-sh_mobile.c | 1 + + drivers/sh/clk/cpg.c | 2 +- + 6 files changed, 14 insertions(+), 15 deletions(-) +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Merge made by recursive. + arch/arm/mach-shmobile/clock-sh7372.c | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Merge made by recursive. + drivers/video/efifb.c | 4 ++-- + drivers/video/omap2/displays/Kconfig | 9 +++++---- + drivers/video/omap2/dss/dsi.c | 14 +++++++++----- + drivers/video/omap2/dss/dss.c | 10 ++++++++-- + drivers/video/omap2/dss/dss_features.c | 2 +- + drivers/video/omap2/dss/dss_features.h | 2 ++ + drivers/video/s3c-fb.c | 11 +++++++++-- + drivers/video/via/hw.c | 8 ++++++-- + drivers/video/via/viamode.c | 2 +- + 9 files changed, 43 insertions(+), 19 deletions(-) +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Already up-to-date. +Merging arm/for-next +$ git merge arm/for-next +Removing arch/arm/configs/ns9xxx_defconfig +Removing arch/arm/configs/stmp378x_defconfig +Removing arch/arm/configs/stmp37xx_defconfig +Removing arch/arm/mach-exynos4/include/mach/smp.h +Removing arch/arm/mach-msm/include/mach/smp.h +Removing arch/arm/mach-ns9xxx/Kconfig +Removing arch/arm/mach-ns9xxx/Makefile +Removing arch/arm/mach-ns9xxx/Makefile.boot +Removing arch/arm/mach-ns9xxx/board-a9m9750dev.c +Removing arch/arm/mach-ns9xxx/board-a9m9750dev.h +Removing arch/arm/mach-ns9xxx/board-jscc9p9360.c +Removing arch/arm/mach-ns9xxx/board-jscc9p9360.h +Removing arch/arm/mach-ns9xxx/clock.c +Removing arch/arm/mach-ns9xxx/clock.h +Removing arch/arm/mach-ns9xxx/generic.c +Removing arch/arm/mach-ns9xxx/generic.h +Removing arch/arm/mach-ns9xxx/gpio-ns9360.c +Removing arch/arm/mach-ns9xxx/gpio-ns9360.h +Removing arch/arm/mach-ns9xxx/gpio.c +Removing arch/arm/mach-ns9xxx/include/mach/board.h +Removing arch/arm/mach-ns9xxx/include/mach/debug-macro.S +Removing arch/arm/mach-ns9xxx/include/mach/entry-macro.S +Removing arch/arm/mach-ns9xxx/include/mach/gpio.h +Removing arch/arm/mach-ns9xxx/include/mach/hardware.h +Removing arch/arm/mach-ns9xxx/include/mach/io.h +Removing arch/arm/mach-ns9xxx/include/mach/irqs.h +Removing arch/arm/mach-ns9xxx/include/mach/memory.h +Removing arch/arm/mach-ns9xxx/include/mach/module.h +Removing arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h +Removing arch/arm/mach-ns9xxx/include/mach/processor.h +Removing arch/arm/mach-ns9xxx/include/mach/regs-bbu.h +Removing arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h +Removing arch/arm/mach-ns9xxx/include/mach/regs-mem.h +Removing arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h +Removing arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h +Removing arch/arm/mach-ns9xxx/include/mach/system.h +Removing arch/arm/mach-ns9xxx/include/mach/timex.h +Removing arch/arm/mach-ns9xxx/include/mach/uncompress.h +Removing arch/arm/mach-ns9xxx/include/mach/vmalloc.h +Removing arch/arm/mach-ns9xxx/irq.c +Removing arch/arm/mach-ns9xxx/mach-cc9p9360dev.c +Removing arch/arm/mach-ns9xxx/mach-cc9p9360js.c +Removing arch/arm/mach-ns9xxx/plat-serial8250.c +Removing arch/arm/mach-ns9xxx/processor-ns9360.c +Removing arch/arm/mach-ns9xxx/time-ns9360.c +Removing arch/arm/mach-realview/include/mach/smp.h +Removing arch/arm/mach-shmobile/include/mach/smp.h +Removing arch/arm/mach-stmp378x/Makefile +Removing arch/arm/mach-stmp378x/Makefile.boot +Removing arch/arm/mach-stmp378x/include/mach/entry-macro.S +Removing arch/arm/mach-stmp378x/include/mach/irqs.h +Removing arch/arm/mach-stmp378x/include/mach/pins.h +Removing arch/arm/mach-stmp378x/include/mach/regs-apbh.h +Removing arch/arm/mach-stmp378x/include/mach/regs-apbx.h +Removing arch/arm/mach-stmp378x/include/mach/regs-audioin.h +Removing arch/arm/mach-stmp378x/include/mach/regs-audioout.h +Removing arch/arm/mach-stmp378x/include/mach/regs-bch.h +Removing arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h +Removing arch/arm/mach-stmp378x/include/mach/regs-dcp.h +Removing arch/arm/mach-stmp378x/include/mach/regs-digctl.h +Removing arch/arm/mach-stmp378x/include/mach/regs-dram.h +Removing arch/arm/mach-stmp378x/include/mach/regs-dri.h +Removing arch/arm/mach-stmp378x/include/mach/regs-ecc8.h +Removing arch/arm/mach-stmp378x/include/mach/regs-emi.h +Removing arch/arm/mach-stmp378x/include/mach/regs-gpmi.h +Removing arch/arm/mach-stmp378x/include/mach/regs-i2c.h +Removing arch/arm/mach-stmp378x/include/mach/regs-icoll.h +Removing arch/arm/mach-stmp378x/include/mach/regs-ir.h +Removing arch/arm/mach-stmp378x/include/mach/regs-lcdif.h +Removing arch/arm/mach-stmp378x/include/mach/regs-lradc.h +Removing arch/arm/mach-stmp378x/include/mach/regs-ocotp.h +Removing arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h +Removing arch/arm/mach-stmp378x/include/mach/regs-power.h +Removing arch/arm/mach-stmp378x/include/mach/regs-pwm.h +Removing arch/arm/mach-stmp378x/include/mach/regs-pxp.h +Removing arch/arm/mach-stmp378x/include/mach/regs-rtc.h +Removing arch/arm/mach-stmp378x/include/mach/regs-saif.h +Removing arch/arm/mach-stmp378x/include/mach/regs-spdif.h +Removing arch/arm/mach-stmp378x/include/mach/regs-ssp.h +Removing arch/arm/mach-stmp378x/include/mach/regs-sydma.h +Removing arch/arm/mach-stmp378x/include/mach/regs-timrot.h +Removing arch/arm/mach-stmp378x/include/mach/regs-tvenc.h +Removing arch/arm/mach-stmp378x/include/mach/regs-uartapp.h +Removing arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h +Removing arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h +Removing arch/arm/mach-stmp378x/include/mach/regs-usbphy.h +Removing arch/arm/mach-stmp378x/stmp378x.c +Removing arch/arm/mach-stmp378x/stmp378x.h +Removing arch/arm/mach-stmp378x/stmp378x_devb.c +Removing arch/arm/mach-stmp37xx/Makefile +Removing arch/arm/mach-stmp37xx/Makefile.boot +Removing arch/arm/mach-stmp37xx/include/mach/entry-macro.S +Removing arch/arm/mach-stmp37xx/include/mach/irqs.h +Removing arch/arm/mach-stmp37xx/include/mach/pins.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-apbh.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-apbx.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-audioin.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-audioout.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-digctl.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-i2c.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-icoll.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-lradc.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-power.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-pwm.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-rtc.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-ssp.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-timrot.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h +Removing arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h +Removing arch/arm/mach-stmp37xx/stmp37xx.c +Removing arch/arm/mach-stmp37xx/stmp37xx.h +Removing arch/arm/mach-stmp37xx/stmp37xx_devb.c +Removing arch/arm/mach-tegra/include/mach/legacy_irq.h +Removing arch/arm/mach-tegra/include/mach/smp.h +Removing arch/arm/mach-tegra/legacy_irq.c +Removing arch/arm/mach-ux500/include/mach/smp.h +Removing arch/arm/mach-vexpress/include/mach/smp.h +Removing arch/arm/plat-omap/include/plat/smp.h +Removing arch/arm/plat-stmp3xxx/Kconfig +Removing arch/arm/plat-stmp3xxx/Makefile +Removing arch/arm/plat-stmp3xxx/clock.c +Removing arch/arm/plat-stmp3xxx/clock.h +Removing arch/arm/plat-stmp3xxx/core.c +Removing arch/arm/plat-stmp3xxx/devices.c +Removing arch/arm/plat-stmp3xxx/dma.c +Removing arch/arm/plat-stmp3xxx/include/mach/clkdev.h +Removing arch/arm/plat-stmp3xxx/include/mach/cputype.h +Removing arch/arm/plat-stmp3xxx/include/mach/debug-macro.S +Removing arch/arm/plat-stmp3xxx/include/mach/dma.h +Removing arch/arm/plat-stmp3xxx/include/mach/gpio.h +Removing arch/arm/plat-stmp3xxx/include/mach/gpmi.h +Removing arch/arm/plat-stmp3xxx/include/mach/hardware.h +Removing arch/arm/plat-stmp3xxx/include/mach/io.h +Removing arch/arm/plat-stmp3xxx/include/mach/memory.h +Removing arch/arm/plat-stmp3xxx/include/mach/mmc.h +Removing arch/arm/plat-stmp3xxx/include/mach/pinmux.h +Removing arch/arm/plat-stmp3xxx/include/mach/pins.h +Removing arch/arm/plat-stmp3xxx/include/mach/platform.h +Removing arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h +Removing arch/arm/plat-stmp3xxx/include/mach/system.h +Removing arch/arm/plat-stmp3xxx/include/mach/timex.h +Removing arch/arm/plat-stmp3xxx/include/mach/uncompress.h +Removing arch/arm/plat-stmp3xxx/include/mach/vmalloc.h +Removing arch/arm/plat-stmp3xxx/irq.c +Removing arch/arm/plat-stmp3xxx/pinmux.c +Removing arch/arm/plat-stmp3xxx/timer.c +Merge made by recursive. + Documentation/DocBook/genericirq.tmpl | 82 +- + arch/arm/Kconfig | 84 +- + arch/arm/Makefile | 4 - + arch/arm/boot/compressed/Makefile | 17 +- + arch/arm/boot/compressed/decompress.c | 4 +- + arch/arm/boot/compressed/head.S | 46 +- + arch/arm/boot/compressed/misc.c | 24 +- + arch/arm/common/gic.c | 84 +- + arch/arm/common/sa1111.c | 8 - + arch/arm/common/timer-sp.c | 22 +- + arch/arm/configs/dove_defconfig | 12 +- + arch/arm/configs/mxs_defconfig | 129 +++ + arch/arm/configs/ns9xxx_defconfig | 56 - + arch/arm/configs/stmp378x_defconfig | 128 --- + arch/arm/configs/stmp37xx_defconfig | 108 -- + arch/arm/include/asm/dma.h | 4 +- + arch/arm/include/asm/futex.h | 137 ++- + arch/arm/include/asm/i8253.h | 15 + + arch/arm/include/asm/memory.h | 10 +- + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 23 +- + arch/arm/include/asm/sizes.h | 42 +- + arch/arm/include/asm/smp.h | 6 +- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/kernel/setup.c | 13 +- + arch/arm/kernel/smp.c | 7 + + arch/arm/mach-davinci/include/mach/memory.h | 18 +- + arch/arm/mach-davinci/include/mach/uncompress.h | 5 +- + arch/arm/mach-davinci/irq.c | 93 +-- + arch/arm/mach-ep93xx/gpio.c | 24 - + arch/arm/mach-exynos4/include/mach/smp.h | 19 - + arch/arm/mach-exynos4/irq-combiner.c | 6 +- + arch/arm/mach-exynos4/platsmp.c | 5 +- + arch/arm/mach-footbridge/Kconfig | 2 + + arch/arm/mach-footbridge/isa-timer.c | 45 +- + arch/arm/mach-gemini/include/mach/uncompress.h | 2 +- + arch/arm/mach-h720x/include/mach/memory.h | 3 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/integrator_ap.c | 21 +- + arch/arm/mach-iop32x/include/mach/uncompress.h | 2 +- + arch/arm/mach-iop33x/include/mach/uncompress.h | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 23 - + arch/arm/mach-ixp4xx/common.c | 16 +- + arch/arm/mach-ixp4xx/include/mach/memory.h | 12 +- + arch/arm/mach-ixp4xx/include/mach/uncompress.h | 2 +- + arch/arm/mach-lpc32xx/timer.c | 17 +- + arch/arm/mach-mmp/include/mach/uncompress.h | 2 +- + arch/arm/mach-msm/gpio-v2.c | 10 +- + arch/arm/mach-msm/include/mach/smp.h | 23 - + arch/arm/mach-msm/platsmp.c | 4 +- + arch/arm/mach-mxs/Kconfig | 10 + + arch/arm/mach-mxs/Makefile | 1 + + arch/arm/mach-mxs/include/mach/uncompress.h | 2 +- + arch/arm/mach-mxs/mach-stmp378x_devb.c | 120 ++ + arch/arm/mach-mxs/timer.c | 20 +- + arch/arm/mach-netx/time.c | 16 +- + arch/arm/mach-ns9xxx/Kconfig | 40 - + arch/arm/mach-ns9xxx/Makefile | 12 - + arch/arm/mach-ns9xxx/Makefile.boot | 2 - + arch/arm/mach-ns9xxx/board-a9m9750dev.c | 156 --- + arch/arm/mach-ns9xxx/board-a9m9750dev.h | 15 - + arch/arm/mach-ns9xxx/board-jscc9p9360.c | 17 - + arch/arm/mach-ns9xxx/board-jscc9p9360.h | 13 - + arch/arm/mach-ns9xxx/clock.c | 215 ---- + arch/arm/mach-ns9xxx/clock.h | 35 - + arch/arm/mach-ns9xxx/generic.c | 19 - + arch/arm/mach-ns9xxx/generic.h | 16 - + arch/arm/mach-ns9xxx/gpio-ns9360.c | 118 -- + arch/arm/mach-ns9xxx/gpio-ns9360.h | 13 - + arch/arm/mach-ns9xxx/gpio.c | 147 --- + arch/arm/mach-ns9xxx/include/mach/board.h | 40 - + arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 21 - + arch/arm/mach-ns9xxx/include/mach/entry-macro.S | 28 - + arch/arm/mach-ns9xxx/include/mach/gpio.h | 47 - + arch/arm/mach-ns9xxx/include/mach/hardware.h | 77 -- + arch/arm/mach-ns9xxx/include/mach/io.h | 20 - + arch/arm/mach-ns9xxx/include/mach/irqs.h | 86 -- + arch/arm/mach-ns9xxx/include/mach/memory.h | 24 - + arch/arm/mach-ns9xxx/include/mach/module.h | 55 - + .../mach-ns9xxx/include/mach/processor-ns9360.h | 32 - + arch/arm/mach-ns9xxx/include/mach/processor.h | 42 - + arch/arm/mach-ns9xxx/include/mach/regs-bbu.h | 45 - + .../include/mach/regs-board-a9m9750dev.h | 24 - + arch/arm/mach-ns9xxx/include/mach/regs-mem.h | 135 --- + .../arm/mach-ns9xxx/include/mach/regs-sys-common.h | 31 - + .../arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h | 148 --- + arch/arm/mach-ns9xxx/include/mach/system.h | 35 - + arch/arm/mach-ns9xxx/include/mach/timex.h | 20 - + arch/arm/mach-ns9xxx/include/mach/uncompress.h | 164 --- + arch/arm/mach-ns9xxx/include/mach/vmalloc.h | 16 - + arch/arm/mach-ns9xxx/irq.c | 74 -- + arch/arm/mach-ns9xxx/mach-cc9p9360dev.c | 43 - + arch/arm/mach-ns9xxx/mach-cc9p9360js.c | 31 - + arch/arm/mach-ns9xxx/plat-serial8250.c | 70 -- + arch/arm/mach-ns9xxx/processor-ns9360.c | 53 - + arch/arm/mach-ns9xxx/time-ns9360.c | 181 ---- + arch/arm/mach-nuc93x/include/mach/uncompress.h | 2 +- + arch/arm/mach-omap1/time.c | 69 +- + arch/arm/mach-omap2/include/mach/omap4-common.h | 7 + + arch/arm/mach-omap2/omap-smp.c | 5 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 27 - + arch/arm/mach-pxa/include/mach/memory.h | 10 +- + arch/arm/mach-pxa/include/mach/uncompress.h | 6 +- + arch/arm/mach-pxa/time.c | 17 +- + arch/arm/mach-realview/core.c | 19 - + arch/arm/mach-realview/include/mach/memory.h | 9 +- + arch/arm/mach-realview/include/mach/smp.h | 14 - + arch/arm/mach-realview/platsmp.c | 3 + + arch/arm/mach-rpc/include/mach/uncompress.h | 12 +- + arch/arm/mach-s3c64xx/irq.c | 7 +- + arch/arm/mach-s5p64x0/include/mach/uncompress.h | 6 +- + arch/arm/mach-sa1100/include/mach/memory.h | 12 +- + arch/arm/mach-sa1100/time.c | 24 +- + arch/arm/mach-shark/include/mach/memory.h | 20 +- + arch/arm/mach-shmobile/include/mach/smp.h | 16 - + arch/arm/mach-shmobile/platsmp.c | 3 + + arch/arm/mach-stmp378x/Makefile | 2 - + arch/arm/mach-stmp378x/Makefile.boot | 3 - + arch/arm/mach-stmp378x/include/mach/entry-macro.S | 35 - + arch/arm/mach-stmp378x/include/mach/irqs.h | 95 -- + arch/arm/mach-stmp378x/include/mach/pins.h | 151 --- + arch/arm/mach-stmp378x/include/mach/regs-apbh.h | 101 -- + arch/arm/mach-stmp378x/include/mach/regs-apbx.h | 119 -- + arch/arm/mach-stmp378x/include/mach/regs-audioin.h | 63 -- + .../arm/mach-stmp378x/include/mach/regs-audioout.h | 104 -- + arch/arm/mach-stmp378x/include/mach/regs-bch.h | 56 - + arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h | 88 -- + arch/arm/mach-stmp378x/include/mach/regs-dcp.h | 87 -- + arch/arm/mach-stmp378x/include/mach/regs-digctl.h | 38 - + arch/arm/mach-stmp378x/include/mach/regs-dram.h | 27 - + arch/arm/mach-stmp378x/include/mach/regs-dri.h | 45 - + arch/arm/mach-stmp378x/include/mach/regs-ecc8.h | 39 - + arch/arm/mach-stmp378x/include/mach/regs-emi.h | 25 - + arch/arm/mach-stmp378x/include/mach/regs-gpmi.h | 78 -- + arch/arm/mach-stmp378x/include/mach/regs-i2c.h | 55 - + arch/arm/mach-stmp378x/include/mach/regs-icoll.h | 45 - + arch/arm/mach-stmp378x/include/mach/regs-ir.h | 23 - + arch/arm/mach-stmp378x/include/mach/regs-lcdif.h | 195 ---- + arch/arm/mach-stmp378x/include/mach/regs-lradc.h | 99 -- + arch/arm/mach-stmp378x/include/mach/regs-ocotp.h | 40 - + arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h | 90 -- + arch/arm/mach-stmp378x/include/mach/regs-power.h | 63 -- + arch/arm/mach-stmp378x/include/mach/regs-pwm.h | 53 - + arch/arm/mach-stmp378x/include/mach/regs-pxp.h | 140 --- + arch/arm/mach-stmp378x/include/mach/regs-rtc.h | 59 - + arch/arm/mach-stmp378x/include/mach/regs-saif.h | 21 - + arch/arm/mach-stmp378x/include/mach/regs-spdif.h | 49 - + arch/arm/mach-stmp378x/include/mach/regs-ssp.h | 102 -- + arch/arm/mach-stmp378x/include/mach/regs-sydma.h | 23 - + arch/arm/mach-stmp378x/include/mach/regs-timrot.h | 68 -- + arch/arm/mach-stmp378x/include/mach/regs-tvenc.h | 67 -- + arch/arm/mach-stmp378x/include/mach/regs-uartapp.h | 87 -- + arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h | 268 ----- + arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h | 40 - + arch/arm/mach-stmp378x/include/mach/regs-usbphy.h | 37 - + arch/arm/mach-stmp378x/stmp378x.c | 299 ----- + arch/arm/mach-stmp378x/stmp378x.h | 25 - + arch/arm/mach-stmp378x/stmp378x_devb.c | 332 ------ + arch/arm/mach-stmp37xx/Makefile | 2 - + arch/arm/mach-stmp37xx/Makefile.boot | 3 - + arch/arm/mach-stmp37xx/include/mach/entry-macro.S | 37 - + arch/arm/mach-stmp37xx/include/mach/irqs.h | 99 -- + arch/arm/mach-stmp37xx/include/mach/pins.h | 147 --- + arch/arm/mach-stmp37xx/include/mach/regs-apbh.h | 97 -- + arch/arm/mach-stmp37xx/include/mach/regs-apbx.h | 113 -- + arch/arm/mach-stmp37xx/include/mach/regs-audioin.h | 61 -- + .../arm/mach-stmp37xx/include/mach/regs-audioout.h | 111 -- + arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h | 72 -- + arch/arm/mach-stmp37xx/include/mach/regs-digctl.h | 24 - + arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h | 37 - + arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h | 63 -- + arch/arm/mach-stmp37xx/include/mach/regs-i2c.h | 55 - + arch/arm/mach-stmp37xx/include/mach/regs-icoll.h | 43 - + arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h | 89 -- + arch/arm/mach-stmp37xx/include/mach/regs-lradc.h | 97 -- + arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h | 88 -- + arch/arm/mach-stmp37xx/include/mach/regs-power.h | 56 - + arch/arm/mach-stmp37xx/include/mach/regs-pwm.h | 51 - + arch/arm/mach-stmp37xx/include/mach/regs-rtc.h | 57 - + arch/arm/mach-stmp37xx/include/mach/regs-ssp.h | 101 -- + arch/arm/mach-stmp37xx/include/mach/regs-timrot.h | 49 - + arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h | 85 -- + arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h | 268 ----- + arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h | 22 - + arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h | 22 - + arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h | 37 - + arch/arm/mach-stmp37xx/stmp37xx.c | 219 ---- + arch/arm/mach-stmp37xx/stmp37xx.h | 24 - + arch/arm/mach-stmp37xx/stmp37xx_devb.c | 99 -- + arch/arm/mach-tcc8k/time.c | 16 +- + arch/arm/mach-tegra/Makefile | 2 +- + arch/arm/mach-tegra/gpio.c | 9 +- + arch/arm/mach-tegra/include/mach/legacy_irq.h | 35 - + arch/arm/mach-tegra/include/mach/smp.h | 14 - + arch/arm/mach-tegra/irq.c | 174 ++-- + arch/arm/mach-tegra/legacy_irq.c | 215 ---- + arch/arm/mach-tegra/platsmp.c | 3 + + arch/arm/mach-tegra/timer.c | 16 +- + arch/arm/mach-u300/timer.c | 18 +- + arch/arm/mach-ux500/include/mach/smp.h | 24 - + arch/arm/mach-ux500/include/mach/uncompress.h | 2 +- + arch/arm/mach-ux500/platsmp.c | 8 +- + arch/arm/mach-vexpress/ct-ca9x4.c | 2 + + arch/arm/mach-vexpress/include/mach/smp.h | 13 - + arch/arm/mach-w90x900/include/mach/uncompress.h | 2 +- + arch/arm/mach-w90x900/time.c | 17 +- + arch/arm/mm/init.c | 23 +- + arch/arm/mm/proc-v6.S | 34 - + arch/arm/plat-mxc/epit.c | 18 +- + arch/arm/plat-mxc/include/mach/uncompress.h | 2 +- + arch/arm/plat-mxc/time.c | 38 +- + arch/arm/plat-nomadik/Kconfig | 1 + + arch/arm/plat-nomadik/gpio.c | 12 +- + arch/arm/plat-nomadik/timer.c | 31 +- + arch/arm/plat-omap/Kconfig | 1 + + arch/arm/plat-omap/gpio.c | 7 +- + arch/arm/plat-omap/include/plat/smp.h | 36 - + arch/arm/plat-omap/include/plat/uncompress.h | 4 +- + arch/arm/plat-orion/time.c | 21 +- + arch/arm/plat-s5p/irq-gpioint.c | 116 +-- + arch/arm/plat-s5p/irq.c | 6 +- + arch/arm/plat-s5p/s5p-time.c | 58 +- + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 2 +- + arch/arm/plat-samsung/include/plat/uncompress.h | 4 +- + arch/arm/plat-samsung/irq-uart.c | 83 +-- + arch/arm/plat-samsung/irq-vic-timer.c | 69 +- + arch/arm/plat-spear/time.c | 16 +- + arch/arm/plat-stmp3xxx/Kconfig | 37 - + arch/arm/plat-stmp3xxx/Makefile | 5 - + arch/arm/plat-stmp3xxx/clock.c | 1134 -------------------- + arch/arm/plat-stmp3xxx/clock.h | 61 -- + arch/arm/plat-stmp3xxx/core.c | 128 --- + arch/arm/plat-stmp3xxx/devices.c | 389 ------- + arch/arm/plat-stmp3xxx/dma.c | 464 -------- + arch/arm/plat-stmp3xxx/include/mach/clkdev.h | 18 - + arch/arm/plat-stmp3xxx/include/mach/cputype.h | 33 - + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 39 - + arch/arm/plat-stmp3xxx/include/mach/dma.h | 153 --- + arch/arm/plat-stmp3xxx/include/mach/gpio.h | 28 - + arch/arm/plat-stmp3xxx/include/mach/gpmi.h | 12 - + arch/arm/plat-stmp3xxx/include/mach/hardware.h | 32 - + arch/arm/plat-stmp3xxx/include/mach/io.h | 25 - + arch/arm/plat-stmp3xxx/include/mach/memory.h | 22 - + arch/arm/plat-stmp3xxx/include/mach/mmc.h | 14 - + arch/arm/plat-stmp3xxx/include/mach/pinmux.h | 157 --- + arch/arm/plat-stmp3xxx/include/mach/pins.h | 30 - + arch/arm/plat-stmp3xxx/include/mach/platform.h | 68 -- + arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h | 54 - + arch/arm/plat-stmp3xxx/include/mach/system.h | 49 - + arch/arm/plat-stmp3xxx/include/mach/timex.h | 20 - + arch/arm/plat-stmp3xxx/include/mach/uncompress.h | 53 - + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 12 - + arch/arm/plat-stmp3xxx/irq.c | 50 - + arch/arm/plat-stmp3xxx/pinmux.c | 550 ---------- + arch/arm/plat-stmp3xxx/timer.c | 186 ---- + arch/arm/plat-versatile/platsmp.c | 3 +- + arch/arm/tools/mach-types | 142 ++-- + arch/mips/Kconfig | 1 + + arch/mips/include/asm/i8253.h | 5 + + arch/mips/kernel/i8253.c | 78 +-- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/i8253.h | 2 + + arch/x86/kernel/i8253.c | 79 +-- + drivers/Kconfig | 3 + + drivers/clocksource/Kconfig | 5 + + drivers/clocksource/Makefile | 2 + + drivers/clocksource/i8253.c | 88 ++ + drivers/clocksource/mmio.c | 73 ++ + drivers/mmc/host/mmci.c | 6 +- + drivers/mmc/host/mmci.h | 41 +- + include/linux/clocksource.h | 12 +- + include/linux/irq.h | 179 +++- + include/linux/irqdesc.h | 6 +- + kernel/irq/Makefile | 1 + + kernel/irq/chip.c | 1 + + kernel/irq/debug.h | 1 + + kernel/irq/generic-chip.c | 354 ++++++ + kernel/irq/manage.c | 3 +- + kernel/irq/settings.h | 17 + + 279 files changed, 1833 insertions(+), 14251 deletions(-) + create mode 100644 arch/arm/configs/mxs_defconfig + delete mode 100644 arch/arm/configs/ns9xxx_defconfig + delete mode 100644 arch/arm/configs/stmp378x_defconfig + delete mode 100644 arch/arm/configs/stmp37xx_defconfig + create mode 100644 arch/arm/include/asm/i8253.h + delete mode 100644 arch/arm/mach-exynos4/include/mach/smp.h + delete mode 100644 arch/arm/mach-msm/include/mach/smp.h + create mode 100644 arch/arm/mach-mxs/mach-stmp378x_devb.c + delete mode 100644 arch/arm/mach-ns9xxx/Kconfig + delete mode 100644 arch/arm/mach-ns9xxx/Makefile + delete mode 100644 arch/arm/mach-ns9xxx/Makefile.boot + delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.c + delete mode 100644 arch/arm/mach-ns9xxx/board-a9m9750dev.h + delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.c + delete mode 100644 arch/arm/mach-ns9xxx/board-jscc9p9360.h + delete mode 100644 arch/arm/mach-ns9xxx/clock.c + delete mode 100644 arch/arm/mach-ns9xxx/clock.h + delete mode 100644 arch/arm/mach-ns9xxx/generic.c + delete mode 100644 arch/arm/mach-ns9xxx/generic.h + delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.c + delete mode 100644 arch/arm/mach-ns9xxx/gpio-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/gpio.c + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/board.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/gpio.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/hardware.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/io.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/memory.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/module.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/processor.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-bbu.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-board-a9m9750dev.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-mem.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-common.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/regs-sys-ns9360.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/system.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/timex.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-ns9xxx/include/mach/vmalloc.h + delete mode 100644 arch/arm/mach-ns9xxx/irq.c + delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360dev.c + delete mode 100644 arch/arm/mach-ns9xxx/mach-cc9p9360js.c + delete mode 100644 arch/arm/mach-ns9xxx/plat-serial8250.c + delete mode 100644 arch/arm/mach-ns9xxx/processor-ns9360.c + delete mode 100644 arch/arm/mach-ns9xxx/time-ns9360.c + delete mode 100644 arch/arm/mach-realview/include/mach/smp.h + delete mode 100644 arch/arm/mach-shmobile/include/mach/smp.h + delete mode 100644 arch/arm/mach-stmp378x/Makefile + delete mode 100644 arch/arm/mach-stmp378x/Makefile.boot + delete mode 100644 arch/arm/mach-stmp378x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-stmp378x/include/mach/irqs.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/pins.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbh.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-apbx.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioin.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-audioout.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-bch.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-clkctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dcp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-digctl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dram.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-dri.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ecc8.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-emi.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-gpmi.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-i2c.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-icoll.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ir.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lcdif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-lradc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ocotp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pinctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-power.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pwm.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-pxp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-rtc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-saif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-spdif.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-ssp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-sydma.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-timrot.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-tvenc.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartapp.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-uartdbg.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbctrl.h + delete mode 100644 arch/arm/mach-stmp378x/include/mach/regs-usbphy.h + delete mode 100644 arch/arm/mach-stmp378x/stmp378x.c + delete mode 100644 arch/arm/mach-stmp378x/stmp378x.h + delete mode 100644 arch/arm/mach-stmp378x/stmp378x_devb.c + delete mode 100644 arch/arm/mach-stmp37xx/Makefile + delete mode 100644 arch/arm/mach-stmp37xx/Makefile.boot + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/pins.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbh.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-apbx.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioin.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-audioout.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-clkctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-digctl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ecc8.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-gpmi.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-i2c.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-icoll.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lcdif.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-lradc.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pinctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-power.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-pwm.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-rtc.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-ssp.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-timrot.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartapp.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-uartdbg.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbctrl.h + delete mode 100644 arch/arm/mach-stmp37xx/include/mach/regs-usbphy.h + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.c + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx.h + delete mode 100644 arch/arm/mach-stmp37xx/stmp37xx_devb.c + delete mode 100644 arch/arm/mach-tegra/include/mach/legacy_irq.h + delete mode 100644 arch/arm/mach-tegra/include/mach/smp.h + delete mode 100644 arch/arm/mach-tegra/legacy_irq.c + delete mode 100644 arch/arm/mach-ux500/include/mach/smp.h + delete mode 100644 arch/arm/mach-vexpress/include/mach/smp.h + delete mode 100644 arch/arm/plat-omap/include/plat/smp.h + delete mode 100644 arch/arm/plat-stmp3xxx/Kconfig + delete mode 100644 arch/arm/plat-stmp3xxx/Makefile + delete mode 100644 arch/arm/plat-stmp3xxx/clock.c + delete mode 100644 arch/arm/plat-stmp3xxx/clock.h + delete mode 100644 arch/arm/plat-stmp3xxx/core.c + delete mode 100644 arch/arm/plat-stmp3xxx/devices.c + delete mode 100644 arch/arm/plat-stmp3xxx/dma.c + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/clkdev.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/cputype.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/debug-macro.S + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/dma.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpio.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/gpmi.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/hardware.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/io.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/memory.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/mmc.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pinmux.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/pins.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/platform.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/stmp3xxx.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/system.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/timex.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/uncompress.h + delete mode 100644 arch/arm/plat-stmp3xxx/include/mach/vmalloc.h + delete mode 100644 arch/arm/plat-stmp3xxx/irq.c + delete mode 100644 arch/arm/plat-stmp3xxx/pinmux.c + delete mode 100644 arch/arm/plat-stmp3xxx/timer.c + create mode 100644 drivers/clocksource/Kconfig + create mode 100644 drivers/clocksource/i8253.c + create mode 100644 drivers/clocksource/mmio.c + create mode 100644 kernel/irq/generic-chip.c +Merging at91/at91-next +$ git merge at91/at91-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/configs/at91sam9261_defconfig +Auto-merging arch/arm/configs/at91sam9263_defconfig +Removing arch/arm/configs/neocore926_defconfig +Removing arch/arm/configs/usb-a9263_defconfig +Merge made by recursive. + arch/arm/Kconfig | 2 + + ...91sam9261ek_defconfig => at91sam9261_defconfig} | 85 ++++++++++++++-- + ...91sam9263ek_defconfig => at91sam9263_defconfig} | 84 ++++++++++++++-- + arch/arm/configs/neocore926_defconfig | 104 ------------------- + arch/arm/configs/usb-a9263_defconfig | 106 -------------------- + arch/arm/mach-at91/Kconfig | 19 ---- + arch/arm/mach-at91/at572d940hf.c | 69 +++++++++++++- + arch/arm/mach-at91/at572d940hf_devices.c | 26 +++-- + arch/arm/mach-at91/at91cap9.c | 63 ++++++++++++- + arch/arm/mach-at91/at91cap9_devices.c | 32 +++--- + arch/arm/mach-at91/at91rm9200.c | 55 ++++++++++- + arch/arm/mach-at91/at91rm9200_devices.c | 32 +++--- + arch/arm/mach-at91/at91sam9260.c | 60 +++++++++++- + arch/arm/mach-at91/at91sam9260_devices.c | 35 +++---- + arch/arm/mach-at91/at91sam9261.c | 61 +++++++++++- + arch/arm/mach-at91/at91sam9261_devices.c | 30 +++--- + arch/arm/mach-at91/at91sam9263.c | 59 +++++++++++- + arch/arm/mach-at91/at91sam9263_devices.c | 28 +++--- + arch/arm/mach-at91/at91sam9g45.c | 89 +++++++++++++---- + arch/arm/mach-at91/at91sam9g45_devices.c | 35 +++---- + arch/arm/mach-at91/at91sam9rl.c | 56 ++++++++++- + arch/arm/mach-at91/at91sam9rl_devices.c | 31 +++--- + arch/arm/mach-at91/at91x40.c | 5 - + arch/arm/mach-at91/board-1arm.c | 6 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 6 +- + arch/arm/mach-at91/board-at572d940hf_ek.c | 13 +-- + arch/arm/mach-at91/board-cam60.c | 6 +- + arch/arm/mach-at91/board-cap9adk.c | 13 +-- + arch/arm/mach-at91/board-carmeva.c | 6 +- + arch/arm/mach-at91/board-cpu9krea.c | 6 +- + arch/arm/mach-at91/board-cpuat91.c | 6 +- + arch/arm/mach-at91/board-csb337.c | 6 +- + arch/arm/mach-at91/board-csb637.c | 6 +- + arch/arm/mach-at91/board-eb01.c | 4 +- + arch/arm/mach-at91/board-eb9200.c | 6 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +- + arch/arm/mach-at91/board-eco920.c | 25 +---- + arch/arm/mach-at91/board-flexibity.c | 6 +- + arch/arm/mach-at91/board-foxg20.c | 6 +- + arch/arm/mach-at91/board-gsia18s.c | 8 +- + arch/arm/mach-at91/board-kafa.c | 6 +- + arch/arm/mach-at91/board-kb9202.c | 6 +- + arch/arm/mach-at91/board-neocore926.c | 6 +- + arch/arm/mach-at91/board-pcontrol-g20.c | 8 +- + arch/arm/mach-at91/board-picotux200.c | 6 +- + arch/arm/mach-at91/board-qil-a9260.c | 6 +- + arch/arm/mach-at91/board-rm9200dk.c | 6 +- + arch/arm/mach-at91/board-rm9200ek.c | 6 +- + arch/arm/mach-at91/board-sam9-l9260.c | 6 +- + arch/arm/mach-at91/board-sam9260ek.c | 13 +-- + arch/arm/mach-at91/board-sam9261ek.c | 13 +-- + arch/arm/mach-at91/board-sam9263ek.c | 13 +-- + arch/arm/mach-at91/board-sam9g20ek.c | 17 ++-- + arch/arm/mach-at91/board-sam9m10g45ek.c | 13 +-- + arch/arm/mach-at91/board-sam9rlek.c | 6 +- + arch/arm/mach-at91/board-snapper9260.c | 6 +- + arch/arm/mach-at91/board-stamp9g20.c | 18 ++-- + arch/arm/mach-at91/board-usb-a9260.c | 6 +- + arch/arm/mach-at91/board-usb-a9263.c | 6 +- + arch/arm/mach-at91/board-yl-9200.c | 6 +- + arch/arm/mach-at91/clock.c | 54 +++------- + arch/arm/mach-at91/clock.h | 19 +++- + arch/arm/mach-at91/generic.h | 23 ++++- + arch/arm/mach-at91/include/mach/at572d940hf.h | 2 - + arch/arm/mach-at91/include/mach/at91cap9.h | 4 - + arch/arm/mach-at91/include/mach/at91rm9200.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9260.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9261.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9263.h | 2 - + arch/arm/mach-at91/include/mach/at91sam9g45.h | 4 - + arch/arm/mach-at91/include/mach/at91sam9rl.h | 2 - + arch/arm/mach-at91/include/mach/at91x40.h | 2 - + arch/arm/mach-at91/include/mach/board.h | 1 + + arch/arm/mach-at91/include/mach/clkdev.h | 7 ++ + arch/arm/mach-at91/include/mach/hardware.h | 13 +-- + arch/arm/mach-at91/include/mach/memory.h | 2 - + arch/arm/mach-at91/include/mach/stamp9g20.h | 2 +- + arch/arm/mach-at91/include/mach/system_rev.h | 25 +++++ + arch/avr32/mach-at32ap/at32ap700x.c | 4 +- + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + drivers/tty/serial/atmel_serial.c | 2 +- + 81 files changed, 984 insertions(+), 665 deletions(-) + rename arch/arm/configs/{at91sam9261ek_defconfig => at91sam9261_defconfig} (53%) + rename arch/arm/configs/{at91sam9263ek_defconfig => at91sam9263_defconfig} (57%) + delete mode 100644 arch/arm/configs/neocore926_defconfig + delete mode 100644 arch/arm/configs/usb-a9263_defconfig + create mode 100644 arch/arm/mach-at91/include/mach/clkdev.h + create mode 100644 arch/arm/mach-at91/include/mach/system_rev.h +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/devices-da8xx.c | 16 +++++++++------- + arch/arm/mach-davinci/include/mach/da8xx.h | 4 ---- + 3 files changed, 10 insertions(+), 12 deletions(-) +Merging i.MX/for-next +$ git merge i.MX/for-next +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/mach-imx/clock-imx31.c +Auto-merging arch/arm/mach-imx/clock-imx35.c +Auto-merging arch/arm/mach-imx/cpu-imx31.c +Auto-merging arch/arm/mach-imx/devices-imx31.h +Auto-merging arch/arm/mach-imx/devices-imx35.h +Auto-merging arch/arm/mach-imx/ehci-imx31.c +Auto-merging arch/arm/mach-imx/ehci-imx35.c +Auto-merging arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c +Auto-merging arch/arm/mach-imx/mach-armadillo5x0.c +Auto-merging arch/arm/mach-imx/mach-bug.c +Auto-merging arch/arm/mach-imx/mach-cpuimx35.c +Auto-merging arch/arm/mach-imx/mach-kzm_arm11_01.c +Auto-merging arch/arm/mach-imx/mach-mx31_3ds.c +Auto-merging arch/arm/mach-imx/mach-mx31ads.c +Auto-merging arch/arm/mach-imx/mach-mx31lilly.c +Auto-merging arch/arm/mach-imx/mach-mx31lite.c +Auto-merging arch/arm/mach-imx/mach-mx31moboard.c +Auto-merging arch/arm/mach-imx/mach-mx35_3ds.c +Auto-merging arch/arm/mach-imx/mach-pcm037.c +Auto-merging arch/arm/mach-imx/mach-pcm037_eet.c +Auto-merging arch/arm/mach-imx/mach-pcm043.c +Auto-merging arch/arm/mach-imx/mach-qong.c +Auto-merging arch/arm/mach-imx/mach-vpr200.c +Auto-merging arch/arm/mach-imx/mx31lilly-db.c +Auto-merging arch/arm/mach-imx/mx31lite-db.c +Auto-merging arch/arm/mach-imx/mx31moboard-devboard.c +Auto-merging arch/arm/mach-imx/mx31moboard-marxbot.c +Auto-merging arch/arm/mach-imx/mx31moboard-smartbot.c +Removing arch/arm/mach-mx3/Kconfig +Removing arch/arm/mach-mx3/Makefile +Removing arch/arm/mach-mx3/Makefile.boot +Removing arch/arm/mach-mx3/devices.c +Removing arch/arm/mach-mx3/devices.h +Removing arch/arm/mach-mx3/mm.c +Auto-merging arch/arm/mach-mx5/board-mx53_loco.c +Removing arch/arm/mach-mxc91231/Kconfig +Removing arch/arm/mach-mxc91231/Makefile +Removing arch/arm/mach-mxc91231/Makefile.boot +Removing arch/arm/mach-mxc91231/clock.c +Removing arch/arm/mach-mxc91231/crm_regs.h +Removing arch/arm/mach-mxc91231/devices.c +Removing arch/arm/mach-mxc91231/devices.h +Removing arch/arm/mach-mxc91231/iomux.c +Removing arch/arm/mach-mxc91231/magx-zn5.c +Removing arch/arm/mach-mxc91231/mm.c +Removing arch/arm/mach-mxc91231/system.c +Auto-merging arch/arm/mach-mxs/Kconfig +Removing arch/arm/plat-mxc/include/mach/iomux-mxc91231.h +Removing arch/arm/plat-mxc/include/mach/mxc91231.h +Auto-merging arch/arm/plat-mxc/time.c +Merge made by recursive. + arch/arm/Makefile | 3 +- + arch/arm/configs/mx1_defconfig | 12 +- + arch/arm/configs/mx21_defconfig | 10 +- + arch/arm/configs/mx27_defconfig | 46 ++- + arch/arm/configs/mx3_defconfig | 43 +- + arch/arm/configs/mx51_defconfig | 57 ++- + arch/arm/mach-imx/Kconfig | 306 +++++++++- + arch/arm/mach-imx/Makefile | 38 +- + arch/arm/mach-imx/Makefile.boot | 4 + + arch/arm/mach-imx/cache-l2x0.c | 56 ++ + arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c | 3 +- + arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c | 1 - + arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} | 38 +-- + arch/arm/mach-imx/cpu-imx35.c | 44 ++ + .../crm_regs.h => mach-imx/crmregs-imx31.h} | 0 + arch/arm/mach-imx/devices-imx1.h | 8 +- + arch/arm/mach-imx/devices-imx21.h | 22 +- + arch/arm/mach-imx/devices-imx25.h | 35 +- + arch/arm/mach-imx/devices-imx27.h | 30 +- + arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h | 36 +- + arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h | 37 +- + arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c | 1 - + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 1 - + arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c | 17 +- + .../eukrea_mbimxsd35-baseboard.c} | 29 +- + arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c | 0 + arch/arm/mach-imx/mach-apf9328.c | 144 +++++ + .../arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c | 29 +- + arch/arm/{mach-mx3 => mach-imx}/mach-bug.c | 1 - + arch/arm/mach-imx/mach-cpuimx27.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c | 2 - + arch/arm/mach-imx/mach-eukrea_cpuimx25.c | 2 - + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 14 +- + .../arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c | 1 - + arch/arm/mach-imx/mach-mx1ads.c | 1 - + arch/arm/mach-imx/mach-mx21ads.c | 1 - + arch/arm/mach-imx/mach-mx25_3ds.c | 13 +- + arch/arm/mach-imx/mach-mx27ads.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c | 50 +- + arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c | 75 ++- + arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c | 1 - + arch/arm/mach-imx/mach-mxt_td60.c | 1 - + arch/arm/mach-imx/mach-pca100.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c | 65 ++- + arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c | 17 +- + arch/arm/mach-imx/mach-pcm038.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c | 17 +- + arch/arm/{mach-mx3 => mach-imx}/mach-qong.c | 15 +- + arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c | 25 +- + arch/arm/mach-imx/mm-imx31.c | 66 ++ + arch/arm/mach-imx/mm-imx35.c | 63 ++ + arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c | 13 +- + arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c | 3 +- + .../{mach-mx3 => mach-imx}/mx31moboard-devboard.c | 1 - + .../{mach-mx3 => mach-imx}/mx31moboard-marxbot.c | 2 - + .../{mach-mx3 => mach-imx}/mx31moboard-smartbot.c | 1 - + arch/arm/{mach-mx3 => mach-imx}/pcm037.h | 0 + arch/arm/mach-mx3/Kconfig | 257 -------- + arch/arm/mach-mx3/Makefile | 26 - + arch/arm/mach-mx3/Makefile.boot | 3 - + arch/arm/mach-mx3/devices.c | 115 ---- + arch/arm/mach-mx3/devices.h | 4 - + arch/arm/mach-mx3/mm.c | 141 ----- + arch/arm/mach-mx5/Kconfig | 58 ++- + arch/arm/mach-mx5/board-cpuimx51.c | 2 - + arch/arm/mach-mx5/board-cpuimx51sd.c | 2 - + arch/arm/mach-mx5/board-mx50_rdp.c | 1 - + arch/arm/mach-mx5/board-mx51_babbage.c | 18 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 5 +- + arch/arm/mach-mx5/board-mx51_efikasb.c | 5 +- + arch/arm/mach-mx5/board-mx53_evk.c | 2 - + arch/arm/mach-mx5/board-mx53_loco.c | 2 - + arch/arm/mach-mx5/board-mx53_smd.c | 30 +- + arch/arm/mach-mx5/clock-mx51-mx53.c | 1 + + arch/arm/mach-mx5/cpu.c | 23 + + arch/arm/mach-mx5/devices-imx50.h | 6 +- + arch/arm/mach-mx5/devices-imx51.h | 25 +- + arch/arm/mach-mx5/devices-imx53.h | 13 +- + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 - + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 16 +- + arch/arm/mach-mx5/mx51_efika.c | 3 - + arch/arm/mach-mxc91231/Kconfig | 11 - + arch/arm/mach-mxc91231/Makefile | 2 - + arch/arm/mach-mxc91231/Makefile.boot | 3 - + arch/arm/mach-mxc91231/clock.c | 640 -------------------- + arch/arm/mach-mxc91231/crm_regs.h | 394 ------------ + arch/arm/mach-mxc91231/devices.c | 251 -------- + arch/arm/mach-mxc91231/devices.h | 13 - + arch/arm/mach-mxc91231/iomux.c | 177 ------ + arch/arm/mach-mxc91231/magx-zn5.c | 62 -- + arch/arm/mach-mxc91231/mm.c | 62 -- + arch/arm/mach-mxc91231/system.c | 51 -- + arch/arm/mach-mxs/Kconfig | 2 - + arch/arm/mach-mxs/clock-mx23.c | 2 + + arch/arm/mach-mxs/devices-mx28.h | 2 +- + arch/arm/mach-mxs/devices/platform-mxs-i2c.c | 5 +- + arch/arm/mach-mxs/include/mach/devices-common.h | 5 +- + arch/arm/mach-mxs/include/mach/mx23.h | 2 +- + arch/arm/mach-mxs/mach-mx23evk.c | 2 +- + arch/arm/mach-mxs/mach-mx28evk.c | 4 +- + arch/arm/plat-mxc/Kconfig | 54 +- + arch/arm/plat-mxc/devices/Kconfig | 7 +- + arch/arm/plat-mxc/devices/Makefile | 2 + + arch/arm/plat-mxc/devices/platform-ipu-core.c | 129 ++++ + arch/arm/plat-mxc/devices/platform-mxc_rtc.c | 40 ++ + arch/arm/plat-mxc/devices/platform-spi_imx.c | 2 +- + arch/arm/plat-mxc/include/mach/common.h | 8 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 7 - + arch/arm/plat-mxc/include/mach/devices-common.h | 27 + + arch/arm/plat-mxc/include/mach/hardware.h | 17 +- + arch/arm/plat-mxc/include/mach/io.h | 23 +- + arch/arm/plat-mxc/include/mach/iomux-mx25.h | 3 + + arch/arm/plat-mxc/include/mach/iomux-mxc91231.h | 283 --------- + arch/arm/plat-mxc/include/mach/irqs.h | 2 - + arch/arm/plat-mxc/include/mach/memory.h | 3 - + arch/arm/plat-mxc/include/mach/mx27.h | 4 +- + arch/arm/plat-mxc/include/mach/mx53.h | 13 - + arch/arm/plat-mxc/include/mach/mxc.h | 22 +- + arch/arm/plat-mxc/include/mach/mxc91231.h | 256 -------- + arch/arm/plat-mxc/include/mach/system.h | 6 - + arch/arm/plat-mxc/include/mach/timex.h | 2 - + arch/arm/plat-mxc/system.c | 6 - + arch/arm/plat-mxc/time.c | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/imxfb.c | 28 +- + 129 files changed, 1487 insertions(+), 3422 deletions(-) + create mode 100644 arch/arm/mach-imx/cache-l2x0.c + rename arch/arm/{mach-mx3 => mach-imx}/clock-imx31.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/clock-imx35.c (99%) + rename arch/arm/{mach-mx3/cpu.c => mach-imx/cpu-imx31.c} (72%) + create mode 100644 arch/arm/mach-imx/cpu-imx35.c + rename arch/arm/{mach-mx3/crm_regs.h => mach-imx/crmregs-imx31.h} (100%) + rename arch/arm/{mach-mx3 => mach-imx}/devices-imx31.h (67%) + rename arch/arm/{mach-mx3 => mach-imx}/devices-imx35.h (69%) + rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx31.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/ehci-imx35.c (99%) + rename arch/arm/{mach-mx3/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd35-baseboard.c} (92%) + rename arch/arm/{mach-mx3 => mach-imx}/iomux-imx31.c (100%) + create mode 100644 arch/arm/mach-imx/mach-apf9328.c + rename arch/arm/{mach-mx3 => mach-imx}/mach-armadillo5x0.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-bug.c (98%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-cpuimx35.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-kzm_arm11_01.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31_3ds.c (96%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31ads.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lilly.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31lite.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx31moboard.c (92%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-mx35_3ds.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037.c (94%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm037_eet.c (92%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-pcm043.c (97%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-qong.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mach-vpr200.c (94%) + create mode 100644 arch/arm/mach-imx/mm-imx31.c + create mode 100644 arch/arm/mach-imx/mm-imx35.c + rename arch/arm/{mach-mx3 => mach-imx}/mx31lilly-db.c (95%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31lite-db.c (98%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-devboard.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-marxbot.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/mx31moboard-smartbot.c (99%) + rename arch/arm/{mach-mx3 => mach-imx}/pcm037.h (100%) + delete mode 100644 arch/arm/mach-mx3/Kconfig + delete mode 100644 arch/arm/mach-mx3/Makefile + delete mode 100644 arch/arm/mach-mx3/Makefile.boot + delete mode 100644 arch/arm/mach-mx3/devices.c + delete mode 100644 arch/arm/mach-mx3/devices.h + delete mode 100644 arch/arm/mach-mx3/mm.c + delete mode 100644 arch/arm/mach-mxc91231/Kconfig + delete mode 100644 arch/arm/mach-mxc91231/Makefile + delete mode 100644 arch/arm/mach-mxc91231/Makefile.boot + delete mode 100644 arch/arm/mach-mxc91231/clock.c + delete mode 100644 arch/arm/mach-mxc91231/crm_regs.h + delete mode 100644 arch/arm/mach-mxc91231/devices.c + delete mode 100644 arch/arm/mach-mxc91231/devices.h + delete mode 100644 arch/arm/mach-mxc91231/iomux.c + delete mode 100644 arch/arm/mach-mxc91231/magx-zn5.c + delete mode 100644 arch/arm/mach-mxc91231/mm.c + delete mode 100644 arch/arm/mach-mxc91231/system.c + create mode 100644 arch/arm/plat-mxc/devices/platform-ipu-core.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rtc.c + delete mode 100644 arch/arm/plat-mxc/include/mach/iomux-mxc91231.h + delete mode 100644 arch/arm/plat-mxc/include/mach/mxc91231.h +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/mach-msm/acpuclock-arm11.c +Merge made by recursive. + arch/arm/mach-msm/Makefile | 5 +- + arch/arm/mach-msm/acpuclock-arm11.c | 2 +- + arch/arm/mach-msm/board-halibut.c | 1 + + arch/arm/mach-msm/board-mahimahi.c | 1 + + arch/arm/mach-msm/board-msm7x30.c | 1 + + arch/arm/mach-msm/board-msm8960.c | 18 + + arch/arm/mach-msm/board-msm8x60.c | 9 +- + arch/arm/mach-msm/board-qsd8x50.c | 1 + + arch/arm/mach-msm/board-trout.c | 1 + + arch/arm/mach-msm/clock-dummy.c | 81 +++++ + arch/arm/mach-msm/clock.h | 11 + + arch/arm/mach-msm/devices-msm7x00.c | 21 ++- + arch/arm/mach-msm/devices-msm7x30.c | 21 ++- + arch/arm/mach-msm/devices-msm8960.c | 181 +++++++++++ + arch/arm/mach-msm/devices-msm8x60.c | 56 ++++ + arch/arm/mach-msm/devices-qsd8x50.c | 21 ++- + arch/arm/mach-msm/devices.h | 8 + + arch/arm/mach-msm/dma.c | 391 ++++++++++++++++++----- + arch/arm/mach-msm/include/mach/dma.h | 84 +++--- + arch/arm/mach-msm/include/mach/msm_iomap-7x00.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 3 + + arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 5 +- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 6 + + arch/arm/mach-msm/io.c | 3 - + 25 files changed, 808 insertions(+), 133 deletions(-) + create mode 100644 arch/arm/mach-msm/clock-dummy.c + create mode 100644 arch/arm/mach-msm/devices-msm8x60.c +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap2plus_defconfig | 83 +------- + arch/arm/mach-omap2/Makefile | 2 + + arch/arm/mach-omap2/board-2430sdp.c | 27 +-- + arch/arm/mach-omap2/board-3430sdp.c | 132 ++---------- + arch/arm/mach-omap2/board-4430sdp.c | 114 +++-------- + arch/arm/mach-omap2/board-am3517crane.c | 10 +- + arch/arm/mach-omap2/board-am3517evm.c | 54 ++---- + arch/arm/mach-omap2/board-apollon.c | 29 ++-- + arch/arm/mach-omap2/board-cm-t35.c | 236 ++++----------------- + arch/arm/mach-omap2/board-cm-t3517.c | 9 +- + arch/arm/mach-omap2/board-devkit8000.c | 131 +---------- + arch/arm/mach-omap2/board-igep0020.c | 219 +++++++------------ + arch/arm/mach-omap2/board-igep0030.c | 114 ++++------ + arch/arm/mach-omap2/board-ldp.c | 138 +----------- + arch/arm/mach-omap2/board-n8x0.c | 28 +-- + arch/arm/mach-omap2/board-omap3beagle.c | 194 +++++------------ + arch/arm/mach-omap2/board-omap3evm.c | 242 ++++----------------- + arch/arm/mach-omap2/board-omap3logic.c | 14 +- + arch/arm/mach-omap2/board-omap3pandora.c | 90 +------- + arch/arm/mach-omap2/board-omap3stalker.c | 133 ++---------- + arch/arm/mach-omap2/board-omap3touchbook.c | 121 ++--------- + arch/arm/mach-omap2/board-omap4panda.c | 79 ++----- + arch/arm/mach-omap2/board-overo.c | 265 ++++------------------- + arch/arm/mach-omap2/board-rm680.c | 21 +-- + arch/arm/mach-omap2/board-rx51-peripherals.c | 42 +--- + arch/arm/mach-omap2/board-rx51-video.c | 5 +- + arch/arm/mach-omap2/board-zoom-debugboard.c | 65 +----- + arch/arm/mach-omap2/board-zoom-display.c | 31 +-- + arch/arm/mach-omap2/board-zoom-peripherals.c | 29 +-- + arch/arm/mach-omap2/common-board-devices.c | 163 ++++++++++++++ + arch/arm/mach-omap2/common-board-devices.h | 35 +++ + arch/arm/mach-omap2/gpmc-smc91x.c | 11 +- + arch/arm/mach-omap2/gpmc-smsc911x.c | 44 ++--- + arch/arm/mach-omap2/omap_l3_noc.c | 51 ++--- + arch/arm/mach-omap2/omap_l3_smx.c | 42 ++--- + arch/arm/mach-omap2/pm44xx.c | 2 - + arch/arm/mach-omap2/smartreflex.c | 23 ++- + arch/arm/mach-omap2/usb-musb.c | 14 ++- + arch/arm/mach-omap2/usb-tusb6010.c | 3 +- + arch/arm/mach-omap2/voltage.c | 1 - + arch/arm/plat-omap/include/plat/gpmc-smsc911x.h | 4 +- + arch/arm/plat-omap/iommu.c | 2 + + 42 files changed, 835 insertions(+), 2217 deletions(-) + create mode 100644 arch/arm/mach-omap2/common-board-devices.c + create mode 100644 arch/arm/mach-omap2/common-board-devices.h +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Already up-to-date. +Merging s5p/for-next +$ git merge s5p/for-next +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h +Removing arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h +Merge made by recursive. + arch/arm/configs/exynos4_defconfig | 2 + + arch/arm/mach-exynos4/Kconfig | 2 + + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/cpuidle.c | 86 +++++++++++++++++++++ + arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++ + arch/arm/mach-s3c64xx/dev-spi.c | 20 ++--- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h | 48 ------------ + arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h | 60 --------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h | 53 ------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h | 49 ------------ + arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h | 44 ----------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h | 71 ----------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h | 42 ---------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h | 74 ------------------ + arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h | 40 ---------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h | 36 --------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h | 54 ------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h | 70 ----------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h | 69 ----------------- + arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h | 46 ----------- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 - + arch/arm/mach-s3c64xx/pm.c | 34 +++++---- + arch/arm/mach-s3c64xx/setup-i2c0.c | 7 +- + arch/arm/mach-s3c64xx/setup-i2c1.c | 7 +- + arch/arm/mach-s3c64xx/sleep.S | 8 ++- + 25 files changed, 217 insertions(+), 796 deletions(-) + create mode 100644 arch/arm/mach-exynos4/cpuidle.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Recorded preimage for 'drivers/gpio/nomadik-gpio.c' +Auto-merging arch/arm/Kconfig +Removing arch/arm/mach-u300/gpio.c +Removing arch/arm/mach-ux500/cpufreq.c +Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h +Removing arch/arm/mach-ux500/include/mach/prcmu.h +Auto-merging arch/arm/mach-ux500/include/mach/uncompress.h +Removing arch/arm/mach-ux500/prcmu.c +Auto-merging arch/arm/plat-nomadik/Kconfig +Removing arch/arm/plat-nomadik/include/plat/gpio.h +Removing arch/arm/plat-nomadik/include/plat/pincfg.h +Auto-merging drivers/gpio/nomadik-gpio.c +CONFLICT (content): Merge conflict in drivers/gpio/nomadik-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpio/nomadik-gpio.c'. +[master 47d86dc] Merge remote-tracking branch 'ux500-core/ux500-core' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 2 +- + arch/arm/configs/u8500_defconfig | 29 +- + arch/arm/mach-nomadik/Kconfig | 2 +- + arch/arm/mach-nomadik/board-nhk8815.c | 3 +- + arch/arm/mach-nomadik/cpu-8815.c | 1 + + arch/arm/mach-nomadik/i2c-8815nhk.c | 14 +- + arch/arm/mach-nomadik/include/mach/gpio.h | 8 +- + arch/arm/mach-u300/Kconfig | 1 + + arch/arm/mach-u300/Makefile | 6 +- + arch/arm/mach-u300/core.c | 31 +- + arch/arm/mach-u300/gpio.c | 700 ------- + arch/arm/mach-u300/include/mach/gpio.h | 163 +-- + arch/arm/mach-u300/include/mach/irqs.h | 25 +- + arch/arm/mach-ux500/Kconfig | 18 +- + arch/arm/mach-ux500/Makefile | 11 +- + arch/arm/mach-ux500/board-mop500-pins.c | 3 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 9 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 63 +- + arch/arm/mach-ux500/board-mop500.c | 3 + + arch/arm/mach-ux500/board-mop500.h | 5 + + arch/arm/mach-ux500/board-snowball-pins.c | 131 ++ + arch/arm/mach-ux500/board-snowball.c | 359 ++++ + arch/arm/mach-ux500/board-snowball.h | 12 + + arch/arm/mach-ux500/board-u5500-sdi.c | 3 +- + arch/arm/mach-ux500/clock-db8500.c | 1287 +++++++++++++ + arch/arm/mach-ux500/clock.c | 904 +++------- + arch/arm/mach-ux500/clock.h | 225 +-- + arch/arm/mach-ux500/cpu-db5500.c | 5 +- + arch/arm/mach-ux500/cpu-db8500.c | 195 ++- + arch/arm/mach-ux500/cpu.c | 7 +- + arch/arm/mach-ux500/cpufreq.c | 211 -- + arch/arm/mach-ux500/devices-common.c | 3 +- + arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- + arch/arm/mach-ux500/include/mach/gpio.h | 8 +- + arch/arm/mach-ux500/include/mach/hardware.h | 1 + + arch/arm/mach-ux500/include/mach/id.h | 20 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- + arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 + + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - + arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++ + .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++ + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +- + arch/arm/mach-ux500/include/mach/prcmu.h | 28 - + arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- + arch/arm/mach-ux500/pins-db5500.h | 2 + + arch/arm/mach-ux500/pins-db8500.h | 144 +- + arch/arm/mach-ux500/pm/Kconfig | 6 + + arch/arm/mach-ux500/pm/Makefile | 4 + + arch/arm/mach-ux500/pm/cpufreq.c | 171 ++ + arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++ + arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++ + arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++ + arch/arm/mach-ux500/prcmu.c | 394 ---- + arch/arm/mach-ux500/regulator-db8500.c | 562 ++++++ + arch/arm/mach-ux500/regulator-db8500.h | 45 + + arch/arm/plat-nomadik/Kconfig | 5 - + arch/arm/plat-nomadik/Makefile | 1 - + arch/arm/plat-nomadik/include/plat/gpio.h | 93 - + arch/arm/plat-nomadik/include/plat/pincfg.h | 144 -- + drivers/gpio/Kconfig | 25 +- + drivers/gpio/Makefile | 8 +- + drivers/gpio/gpiolib.c | 28 + + .../gpio.c => drivers/gpio/nomadik-gpio.c | 871 +++++---- + drivers/gpio/u300-gpio.c | 889 +++++++++ + drivers/mfd/ab8500-i2c.c | 2 +- + drivers/video/via/via-gpio.c | 49 +- + include/asm-generic/gpio.h | 8 +- + include/linux/gpio.h | 61 + + include/linux/gpio/nomadik.h | 291 +++ + include/linux/gpio/u300.h | 32 + + 75 files changed, 9142 insertions(+), 3123 deletions(-) + delete mode 100644 arch/arm/mach-u300/gpio.c + create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c + create mode 100644 arch/arm/mach-ux500/board-snowball.c + create mode 100644 arch/arm/mach-ux500/board-snowball.h + create mode 100644 arch/arm/mach-ux500/clock-db8500.c + delete mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/pm/Kconfig + create mode 100644 arch/arm/mach-ux500/pm/Makefile + create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c + create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c + create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c + create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h + delete mode 100644 arch/arm/mach-ux500/prcmu.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.h + delete mode 100644 arch/arm/plat-nomadik/include/plat/gpio.h + delete mode 100644 arch/arm/plat-nomadik/include/plat/pincfg.h + rename arch/arm/plat-nomadik/gpio.c => drivers/gpio/nomadik-gpio.c (55%) + create mode 100644 drivers/gpio/u300-gpio.c + create mode 100644 include/linux/gpio/nomadik.h + create mode 100644 include/linux/gpio/u300.h +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Merge made by recursive. + arch/arm/Kconfig | 14 ++ + arch/arm/Makefile | 1 + + arch/arm/mach-zynq/Kconfig | 14 ++ + arch/arm/mach-zynq/Makefile | 7 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/board_ep107.c | 85 +++++++ + arch/arm/mach-zynq/common.c | 114 ++++++++++ + arch/arm/mach-zynq/common.h | 30 +++ + arch/arm/mach-zynq/include/mach/clkdev.h | 33 +++ + arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++ + arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++ + arch/arm/mach-zynq/include/mach/hardware.h | 18 ++ + arch/arm/mach-zynq/include/mach/io.h | 33 +++ + arch/arm/mach-zynq/include/mach/irqs.h | 29 +++ + arch/arm/mach-zynq/include/mach/memory.h | 23 ++ + arch/arm/mach-zynq/include/mach/system.h | 28 +++ + arch/arm/mach-zynq/include/mach/timex.h | 23 ++ + arch/arm/mach-zynq/include/mach/uart.h | 25 ++ + arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++++ + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++ + arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++ + arch/arm/mach-zynq/timer.c | 297 +++++++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + 23 files changed, 963 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-zynq/Kconfig + create mode 100644 arch/arm/mach-zynq/Makefile + create mode 100644 arch/arm/mach-zynq/Makefile.boot + create mode 100644 arch/arm/mach-zynq/board_ep107.c + create mode 100644 arch/arm/mach-zynq/common.c + create mode 100644 arch/arm/mach-zynq/common.h + create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h + create mode 100644 arch/arm/mach-zynq/include/mach/io.h + create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h + create mode 100644 arch/arm/mach-zynq/include/mach/memory.h + create mode 100644 arch/arm/mach-zynq/include/mach/system.h + create mode 100644 arch/arm/mach-zynq/include/mach/timex.h + create mode 100644 arch/arm/mach-zynq/include/mach/uart.h + create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h + create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h + create mode 100644 arch/arm/mach-zynq/timer.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig.debug | 2 +- + arch/blackfin/configs/BF527-EZKIT-V2_defconfig | 12 +- + arch/blackfin/configs/BF527-EZKIT_defconfig | 14 +- + arch/blackfin/include/asm/bfin-global.h | 10 - + arch/blackfin/include/asm/cacheflush.h | 23 +- + arch/blackfin/include/asm/cpu.h | 3 - + arch/blackfin/include/asm/irq_handler.h | 25 + + arch/blackfin/include/asm/kgdb.h | 6 +- + arch/blackfin/include/asm/ptrace.h | 2 - + arch/blackfin/include/mach-common/irq.h | 57 + + arch/blackfin/kernel/Makefile | 2 + + arch/blackfin/kernel/bfin_gpio.c | 3 +- + arch/blackfin/kernel/bfin_ksyms.c | 1 + + arch/blackfin/kernel/debug-mmrs.c | 1860 +++++++++++++++++++++ + arch/blackfin/kernel/ipipe.c | 1 + + arch/blackfin/kernel/irqchip.c | 1 + + arch/blackfin/kernel/setup.c | 50 +- + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 16 +- + arch/blackfin/mach-bf518/include/mach/defBF512.h | 8 +- + arch/blackfin/mach-bf518/include/mach/irq.h | 262 ++-- + arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 16 +- + arch/blackfin/mach-bf527/include/mach/defBF522.h | 8 +- + arch/blackfin/mach-bf527/include/mach/irq.h | 266 ++-- + arch/blackfin/mach-bf533/include/mach/irq.h | 168 +-- + arch/blackfin/mach-bf537/include/mach/irq.h | 365 ++--- + arch/blackfin/mach-bf537/ints-priority.c | 163 ++ + arch/blackfin/mach-bf538/include/mach/irq.h | 89 +- + arch/blackfin/mach-bf548/include/mach/irq.h | 89 +- + arch/blackfin/mach-bf561/include/mach/irq.h | 505 ++---- + arch/blackfin/mach-bf561/smp.c | 3 - + arch/blackfin/mach-common/ints-priority.c | 476 ++---- + arch/blackfin/mach-common/smp.c | 1 + + 32 files changed, 2989 insertions(+), 1518 deletions(-) + create mode 100644 arch/blackfin/include/mach-common/irq.h + create mode 100644 arch/blackfin/kernel/debug-mmrs.c +Merging cris/for-next +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Merge made by recursive. + Documentation/cris/README | 62 +++++++++++++++--------------- + arch/cris/arch-v32/drivers/cryptocop.c | 6 +-- + arch/cris/arch-v32/kernel/ptrace.c | 2 - + arch/cris/include/arch-v32/arch/cache.h | 2 +- + drivers/net/cris/eth_v10.c | 1 - + 5 files changed, 34 insertions(+), 39 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/oprofile/backtrace.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 9 +- + arch/m68k/atari/atakeyb.c | 9 +- + arch/m68k/atari/stdma.c | 2 +- + arch/m68k/include/asm/atarikb.h | 2 - + arch/m68k/include/asm/bitops_mm.h | 87 ++++++---- + arch/m68k/include/asm/unistd.h | 46 +++--- + arch/m68k/kernel/Makefile_mm | 2 +- + arch/m68k/kernel/entry_mm.S | 348 ------------------------------------- + arch/m68k/kernel/syscalltable.S | 195 ++++++++++----------- + drivers/input/keyboard/atakbd.c | 5 +- + drivers/input/mouse/atarimouse.c | 15 +- + drivers/net/atarilance.c | 2 +- + drivers/video/atafb.c | 2 +- + 13 files changed, 200 insertions(+), 524 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/kernel/asm-offsets_mm.c +Removing arch/m68k/kernel/asm-offsets_no.c +Removing arch/m68k/kernel/m68k_ksyms_mm.c +Removing arch/m68k/kernel/m68k_ksyms_no.c +Auto-merging arch/m68k/kernel/syscalltable.S +Removing arch/m68k/lib/Makefile_mm +Removing arch/m68k/lib/Makefile_no +Removing arch/m68k/lib/checksum.c +Removing arch/m68k/lib/muldi3_mm.c +Removing arch/m68k/lib/muldi3_no.c +Removing arch/m68k/mm/Makefile_mm +Removing arch/m68k/mm/Makefile_no +Removing arch/m68k/mm/kmap_mm.c +Removing arch/m68k/mm/kmap_no.c +Merge made by recursive. + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/bitops_no.h | 18 +-- + arch/m68k/include/asm/io_no.h | 8 +- + arch/m68k/kernel/asm-offsets.c | 106 ++++++++++- + arch/m68k/kernel/asm-offsets_mm.c | 100 ---------- + arch/m68k/kernel/asm-offsets_no.c | 76 ------- + arch/m68k/kernel/entry_no.S | 1 - + arch/m68k/kernel/irq.c | 28 --- + arch/m68k/kernel/m68k_ksyms.c | 35 +++- + arch/m68k/kernel/m68k_ksyms_mm.c | 16 -- + arch/m68k/kernel/m68k_ksyms_no.c | 78 -------- + arch/m68k/kernel/process_no.c | 2 + + arch/m68k/kernel/syscalltable.S | 1 - + arch/m68k/lib/Makefile | 13 +- + arch/m68k/lib/Makefile_mm | 6 - + arch/m68k/lib/Makefile_no | 7 - + arch/m68k/lib/checksum.c | 5 - + arch/m68k/lib/checksum_no.c | 3 + + arch/m68k/lib/memcpy.c | 128 +++++++------ + arch/m68k/lib/memmove.c | 2 - + arch/m68k/lib/memset.c | 114 +++++++---- + arch/m68k/lib/muldi3.c | 99 +++++++++- + arch/m68k/lib/muldi3_mm.c | 63 ------ + arch/m68k/lib/muldi3_no.c | 86 -------- + arch/m68k/lib/string.c | 223 --------------------- + arch/m68k/mm/Makefile | 14 +- + arch/m68k/mm/Makefile_mm | 8 - + arch/m68k/mm/Makefile_no | 5 - + arch/m68k/mm/init_no.c | 51 +----- + arch/m68k/mm/kmap.c | 368 ++++++++++++++++++++++++++++++++++- + arch/m68k/mm/kmap_mm.c | 367 ---------------------------------- + arch/m68k/mm/kmap_no.c | 45 ----- + arch/m68k/platform/68328/entry.S | 7 +- + arch/m68k/platform/68360/entry.S | 7 +- + arch/m68k/platform/coldfire/dma.c | 3 + + arch/m68k/platform/coldfire/entry.S | 11 +- + arch/m68k/platform/coldfire/head.S | 1 - + drivers/spi/coldfire_qspi.c | 1 + + 38 files changed, 790 insertions(+), 1317 deletions(-) + delete mode 100644 arch/m68k/kernel/asm-offsets_mm.c + delete mode 100644 arch/m68k/kernel/asm-offsets_no.c + delete mode 100644 arch/m68k/kernel/m68k_ksyms_mm.c + delete mode 100644 arch/m68k/kernel/m68k_ksyms_no.c + delete mode 100644 arch/m68k/lib/Makefile_mm + delete mode 100644 arch/m68k/lib/Makefile_no + delete mode 100644 arch/m68k/lib/checksum.c + delete mode 100644 arch/m68k/lib/muldi3_mm.c + delete mode 100644 arch/m68k/lib/muldi3_no.c + delete mode 100644 arch/m68k/mm/Makefile_mm + delete mode 100644 arch/m68k/mm/Makefile_no + delete mode 100644 arch/m68k/mm/kmap_mm.c + delete mode 100644 arch/m68k/mm/kmap_no.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Auto-merging drivers/net/Makefile +Merge made by recursive. + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 61 ++ + arch/mips/Makefile | 12 + + arch/mips/alchemy/common/dbdma.c | 123 ++-- + arch/mips/alchemy/common/dma.c | 46 +- + arch/mips/alchemy/common/irq.c | 345 +++++----- + arch/mips/alchemy/common/platform.c | 250 ++++--- + arch/mips/alchemy/common/setup.c | 4 +- + arch/mips/alchemy/devboards/db1200/setup.c | 7 + + arch/mips/alchemy/devboards/pb1000/board_setup.c | 2 +- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 2 +- + arch/mips/alchemy/devboards/prom.c | 2 +- + arch/mips/alchemy/gpr/board_setup.c | 14 +- + arch/mips/alchemy/gpr/init.c | 2 +- + arch/mips/alchemy/mtx-1/board_setup.c | 2 +- + arch/mips/alchemy/mtx-1/init.c | 2 +- + arch/mips/alchemy/xxs1500/board_setup.c | 11 +- + arch/mips/alchemy/xxs1500/init.c | 2 +- + arch/mips/bcm47xx/nvram.c | 3 +- + arch/mips/bcm47xx/setup.c | 130 +++- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 16 +- + arch/mips/boot/compressed/uart-alchemy.c | 2 +- + arch/mips/cavium-octeon/setup.c | 7 - + arch/mips/cavium-octeon/smp.c | 15 +- + arch/mips/configs/lemote2f_defconfig | 6 +- + arch/mips/configs/malta_defconfig | 2 +- + arch/mips/configs/mtx1_defconfig | 4 +- + arch/mips/configs/nlm_xlr_defconfig | 574 ++++++++++++++ + arch/mips/include/asm/cpu.h | 27 + + arch/mips/include/asm/mach-au1x00/au1000.h | 334 ++------ + arch/mips/include/asm/mach-au1x00/au1000_dma.h | 4 - + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 8 - + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 122 +++- + arch/mips/include/asm/mach-bcm47xx/nvram.h | 12 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 5 + + arch/mips/include/asm/mach-lantiq/lantiq.h | 63 ++ + .../mips/include/asm/mach-lantiq/lantiq_platform.h | 53 ++ + arch/mips/include/asm/mach-lantiq/war.h | 24 + + arch/mips/include/asm/mach-lantiq/xway/irq.h | 18 + + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 66 ++ + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 141 ++++ + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 60 ++ + .../asm/mach-netlogic/cpu-feature-overrides.h | 47 ++ + arch/mips/include/asm/mach-netlogic/irq.h | 14 + + arch/mips/include/asm/mach-netlogic/war.h | 26 + + arch/mips/include/asm/module.h | 2 + + arch/mips/include/asm/netlogic/interrupt.h | 45 ++ + arch/mips/include/asm/netlogic/mips-extns.h | 76 ++ + arch/mips/include/asm/netlogic/psb-bootinfo.h | 109 +++ + arch/mips/include/asm/netlogic/xlr/gpio.h | 73 ++ + arch/mips/include/asm/netlogic/xlr/iomap.h | 131 ++++ + arch/mips/include/asm/netlogic/xlr/pic.h | 231 ++++++ + arch/mips/include/asm/netlogic/xlr/xlr.h | 75 ++ + arch/mips/include/asm/pgtable-bits.h | 44 +- + arch/mips/include/asm/pgtable.h | 20 +- + arch/mips/include/asm/ptrace.h | 3 +- + arch/mips/include/asm/thread_info.h | 3 + + arch/mips/jz4740/setup.c | 32 + + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/cpu-probe.c | 83 ++- + arch/mips/kernel/entry.S | 7 +- + arch/mips/kernel/ptrace.c | 43 +- + arch/mips/kernel/scall32-o32.S | 3 +- + arch/mips/kernel/scall64-64.S | 3 +- + arch/mips/kernel/scall64-n32.S | 3 +- + arch/mips/kernel/scall64-o32.S | 3 +- + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lantiq/Kconfig | 23 + + arch/mips/lantiq/Makefile | 11 + + arch/mips/lantiq/Platform | 8 + + arch/mips/lantiq/clk.c | 140 ++++ + arch/mips/lantiq/clk.h | 18 + + arch/mips/lantiq/devices.c | 122 +++ + arch/mips/lantiq/devices.h | 23 + + arch/mips/lantiq/early_printk.c | 33 + + arch/mips/lantiq/irq.c | 326 ++++++++ + arch/mips/lantiq/machtypes.h | 20 + + arch/mips/lantiq/prom.c | 71 ++ + arch/mips/lantiq/prom.h | 25 + + arch/mips/lantiq/setup.c | 66 ++ + arch/mips/lantiq/xway/Kconfig | 23 + + arch/mips/lantiq/xway/Makefile | 7 + + arch/mips/lantiq/xway/clk-ase.c | 48 ++ + arch/mips/lantiq/xway/clk-xway.c | 223 ++++++ + arch/mips/lantiq/xway/devices.c | 121 +++ + arch/mips/lantiq/xway/devices.h | 20 + + arch/mips/lantiq/xway/dma.c | 253 ++++++ + arch/mips/lantiq/xway/ebu.c | 53 ++ + arch/mips/lantiq/xway/gpio.c | 195 +++++ + arch/mips/lantiq/xway/gpio_ebu.c | 126 +++ + arch/mips/lantiq/xway/gpio_stp.c | 157 ++++ + arch/mips/lantiq/xway/mach-easy50601.c | 57 ++ + arch/mips/lantiq/xway/mach-easy50712.c | 74 ++ + arch/mips/lantiq/xway/pmu.c | 70 ++ + arch/mips/lantiq/xway/prom-ase.c | 39 + + arch/mips/lantiq/xway/prom-xway.c | 54 ++ + arch/mips/lantiq/xway/reset.c | 91 +++ + arch/mips/lantiq/xway/setup-ase.c | 19 + + arch/mips/lantiq/xway/setup-xway.c | 20 + + arch/mips/lib/Makefile | 1 + + arch/mips/mm/Makefile | 1 + + arch/mips/mm/c-r4k.c | 1 + + arch/mips/mm/cache.c | 62 +- + arch/mips/mm/tlbex.c | 18 +- + arch/mips/netlogic/Kconfig | 5 + + arch/mips/netlogic/xlr/Makefile | 5 + + arch/mips/netlogic/xlr/irq.c | 300 ++++++++ + arch/mips/netlogic/xlr/platform.c | 98 +++ + arch/mips/netlogic/xlr/setup.c | 188 +++++ + arch/mips/netlogic/xlr/smp.c | 225 ++++++ + arch/mips/netlogic/xlr/smpboot.S | 94 +++ + arch/mips/netlogic/xlr/time.c | 51 ++ + arch/mips/netlogic/xlr/xlr_console.c | 46 ++ + arch/mips/pci/Makefile | 2 + + arch/mips/pci/ops-lantiq.c | 116 +++ + arch/mips/pci/pci-lantiq.c | 297 +++++++ + arch/mips/pci/pci-lantiq.h | 18 + + arch/mips/pci/pci-xlr.c | 214 ++++++ + arch/mips/sgi-ip27/ip27-timer.c | 13 +- + drivers/mtd/maps/Kconfig | 7 + + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/lantiq-flash.c | 251 ++++++ + drivers/net/Kconfig | 7 + + drivers/net/Makefile | 1 + + drivers/net/lantiq_etop.c | 805 ++++++++++++++++++++ + drivers/ssb/pci.c | 16 +- + drivers/ssb/sprom.c | 43 +- + drivers/ssb/ssb_private.h | 3 +- + drivers/tty/serial/Kconfig | 8 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/lantiq.c | 756 ++++++++++++++++++ + drivers/watchdog/Kconfig | 6 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/lantiq_wdt.c | 261 +++++++ + drivers/watchdog/mtx-1_wdt.c | 21 +- + include/linux/ssb/ssb.h | 4 +- + lib/Kconfig.debug | 2 +- + 137 files changed, 9255 insertions(+), 892 deletions(-) + create mode 100644 arch/mips/configs/nlm_xlr_defconfig + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h + create mode 100644 arch/mips/include/asm/mach-lantiq/war.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/xway_dma.h + create mode 100644 arch/mips/include/asm/mach-netlogic/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-netlogic/irq.h + create mode 100644 arch/mips/include/asm/mach-netlogic/war.h + create mode 100644 arch/mips/include/asm/netlogic/interrupt.h + create mode 100644 arch/mips/include/asm/netlogic/mips-extns.h + create mode 100644 arch/mips/include/asm/netlogic/psb-bootinfo.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/gpio.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/iomap.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/pic.h + create mode 100644 arch/mips/include/asm/netlogic/xlr/xlr.h + create mode 100644 arch/mips/lantiq/Kconfig + create mode 100644 arch/mips/lantiq/Makefile + create mode 100644 arch/mips/lantiq/Platform + create mode 100644 arch/mips/lantiq/clk.c + create mode 100644 arch/mips/lantiq/clk.h + create mode 100644 arch/mips/lantiq/devices.c + create mode 100644 arch/mips/lantiq/devices.h + create mode 100644 arch/mips/lantiq/early_printk.c + create mode 100644 arch/mips/lantiq/irq.c + create mode 100644 arch/mips/lantiq/machtypes.h + create mode 100644 arch/mips/lantiq/prom.c + create mode 100644 arch/mips/lantiq/prom.h + create mode 100644 arch/mips/lantiq/setup.c + create mode 100644 arch/mips/lantiq/xway/Kconfig + create mode 100644 arch/mips/lantiq/xway/Makefile + create mode 100644 arch/mips/lantiq/xway/clk-ase.c + create mode 100644 arch/mips/lantiq/xway/clk-xway.c + create mode 100644 arch/mips/lantiq/xway/devices.c + create mode 100644 arch/mips/lantiq/xway/devices.h + create mode 100644 arch/mips/lantiq/xway/dma.c + create mode 100644 arch/mips/lantiq/xway/ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio.c + create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio_stp.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c + create mode 100644 arch/mips/lantiq/xway/pmu.c + create mode 100644 arch/mips/lantiq/xway/prom-ase.c + create mode 100644 arch/mips/lantiq/xway/prom-xway.c + create mode 100644 arch/mips/lantiq/xway/reset.c + create mode 100644 arch/mips/lantiq/xway/setup-ase.c + create mode 100644 arch/mips/lantiq/xway/setup-xway.c + create mode 100644 arch/mips/netlogic/Kconfig + create mode 100644 arch/mips/netlogic/xlr/Makefile + create mode 100644 arch/mips/netlogic/xlr/irq.c + create mode 100644 arch/mips/netlogic/xlr/platform.c + create mode 100644 arch/mips/netlogic/xlr/setup.c + create mode 100644 arch/mips/netlogic/xlr/smp.c + create mode 100644 arch/mips/netlogic/xlr/smpboot.S + create mode 100644 arch/mips/netlogic/xlr/time.c + create mode 100644 arch/mips/netlogic/xlr/xlr_console.c + create mode 100644 arch/mips/pci/ops-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.h + create mode 100644 arch/mips/pci/pci-xlr.c + create mode 100644 drivers/mtd/maps/lantiq-flash.c + create mode 100644 drivers/net/lantiq_etop.c + create mode 100644 drivers/tty/serial/lantiq.c + create mode 100644 drivers/watchdog/lantiq_wdt.c +Merging parisc/for-next +$ git merge parisc/for-next +Merge made by recursive. + arch/parisc/include/asm/cacheflush.h | 5 +- + arch/parisc/include/asm/pgtable.h | 9 +- + arch/parisc/include/asm/unistd.h | 8 +- + arch/parisc/kernel/cache.c | 13 ++- + arch/parisc/kernel/entry.S | 3 + + arch/parisc/kernel/head.S | 5 +- + arch/parisc/kernel/module.c | 10 ++- + arch/parisc/kernel/pacache.S | 6 +- + arch/parisc/kernel/sys_parisc32.c | 8 + + arch/parisc/kernel/syscall_table.S | 6 + + arch/parisc/kernel/vmlinux.lds.S | 1 + + arch/parisc/mm/init.c | 260 +++++++++++++++++++--------------- + 12 files changed, 205 insertions(+), 129 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Auto-merging arch/powerpc/include/asm/io-workarounds.h +Auto-merging arch/powerpc/kernel/io-workarounds.c +Removing arch/powerpc/platforms/pseries/xics.c +Removing arch/powerpc/platforms/pseries/xics.h +Merge made by recursive. + arch/powerpc/Kconfig | 6 + + arch/powerpc/Kconfig.debug | 5 + + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/crt0.S | 116 ++- + arch/powerpc/boot/epapr.c | 66 ++ + arch/powerpc/boot/wrapper | 13 +- + arch/powerpc/boot/zImage.coff.lds.S | 6 +- + arch/powerpc/boot/zImage.lds.S | 57 +- + arch/powerpc/configs/c2k_defconfig | 4 +- + arch/powerpc/configs/pmac32_defconfig | 4 +- + arch/powerpc/configs/ppc6xx_defconfig | 4 +- + arch/powerpc/configs/ps3_defconfig | 4 +- + arch/powerpc/include/asm/cputable.h | 51 +- + arch/powerpc/include/asm/cputhreads.h | 12 +- + arch/powerpc/include/asm/emulated_ops.h | 4 + + arch/powerpc/include/asm/exception-64s.h | 113 ++- + arch/powerpc/include/asm/feature-fixups.h | 15 +- + arch/powerpc/include/asm/firmware.h | 3 +- + arch/powerpc/include/asm/hvcall.h | 12 + + .../cell => include/asm}/io-workarounds.h | 1 - + arch/powerpc/include/asm/io.h | 16 +- + arch/powerpc/include/asm/io_event_irq.h | 54 ++ + arch/powerpc/include/asm/irq.h | 15 +- + arch/powerpc/include/asm/kexec.h | 2 +- + arch/powerpc/include/asm/kvm_asm.h | 1 + + arch/powerpc/include/asm/kvm_book3s_asm.h | 1 + + arch/powerpc/include/asm/machdep.h | 3 +- + arch/powerpc/include/asm/mmu-book3e.h | 20 + + arch/powerpc/include/asm/mmu-hash64.h | 6 + + arch/powerpc/include/asm/mmu.h | 52 +- + arch/powerpc/include/asm/mmu_context.h | 12 +- + arch/powerpc/include/asm/pSeries_reconfig.h | 5 + + arch/powerpc/include/asm/paca.h | 11 +- + arch/powerpc/include/asm/page_64.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 35 + + arch/powerpc/include/asm/ppc_asm.h | 1 + + arch/powerpc/include/asm/processor.h | 4 + + arch/powerpc/include/asm/reg.h | 99 ++- + arch/powerpc/include/asm/reg_a2.h | 165 ++++ + arch/powerpc/include/asm/reg_booke.h | 6 +- + arch/powerpc/include/asm/rtas.h | 45 +- + arch/powerpc/include/asm/scom.h | 156 ++++ + arch/powerpc/include/asm/smp.h | 3 +- + arch/powerpc/include/asm/tlbflush.h | 2 + + arch/powerpc/include/asm/udbg.h | 1 + + arch/powerpc/include/asm/wsp.h | 14 + + arch/powerpc/include/asm/xics.h | 142 +++ + arch/powerpc/kernel/Makefile | 5 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/cpu_setup_a2.S | 114 +++ + arch/powerpc/kernel/cpu_setup_power7.S | 91 ++ + arch/powerpc/kernel/cputable.c | 66 +- + arch/powerpc/kernel/crash.c | 91 +- + arch/powerpc/kernel/entry_64.S | 27 +- + arch/powerpc/kernel/exceptions-64e.S | 90 ++- + arch/powerpc/kernel/exceptions-64s.S | 208 ++++- + arch/powerpc/kernel/head_64.S | 42 +- + arch/powerpc/kernel/idle_power7.S | 97 ++ + .../{platforms/cell => kernel}/io-workarounds.c | 31 +- + arch/powerpc/kernel/irq.c | 60 +- + arch/powerpc/kernel/lparcfg.c | 53 +- + arch/powerpc/kernel/paca.c | 13 +- + arch/powerpc/kernel/process.c | 20 +- + arch/powerpc/kernel/prom.c | 44 +- + arch/powerpc/kernel/prom_init.c | 30 +- + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/setup_32.c | 1 + + arch/powerpc/kernel/setup_64.c | 36 +- + arch/powerpc/kernel/signal_64.c | 4 +- + arch/powerpc/kernel/smp.c | 14 +- + arch/powerpc/kernel/sysfs.c | 38 + + arch/powerpc/kernel/traps.c | 28 +- + arch/powerpc/kernel/udbg.c | 2 + + arch/powerpc/kernel/udbg_16550.c | 51 ++ + arch/powerpc/kvm/book3s_rmhandlers.S | 11 +- + arch/powerpc/kvm/book3s_segment.S | 12 +- + arch/powerpc/lib/sstep.c | 61 +- + arch/powerpc/mm/hash_low_64.S | 8 +- + arch/powerpc/mm/hash_native_64.c | 18 +- + arch/powerpc/mm/hash_utils_64.c | 62 +- + arch/powerpc/mm/hugetlbpage.c | 2 +- + arch/powerpc/mm/mmu_context_hash64.c | 214 +++++- + arch/powerpc/mm/mmu_context_nohash.c | 18 +- + arch/powerpc/mm/numa.c | 17 +- + arch/powerpc/mm/slb.c | 10 +- + arch/powerpc/mm/slb_low.S | 8 +- + arch/powerpc/mm/stab.c | 2 +- + arch/powerpc/platforms/44x/iss4xx.c | 6 +- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 4 +- + arch/powerpc/platforms/52xx/media5200.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 79 +-- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 4 +- + arch/powerpc/platforms/85xx/smp.c | 6 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 26 +- + arch/powerpc/platforms/86xx/gef_pic.c | 10 +- + arch/powerpc/platforms/86xx/mpc86xx_smp.c | 6 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- + arch/powerpc/platforms/Kconfig | 18 +- + arch/powerpc/platforms/Kconfig.cputype | 22 + + arch/powerpc/platforms/Makefile | 1 + + arch/powerpc/platforms/cell/Kconfig | 4 +- + arch/powerpc/platforms/cell/Makefile | 8 +- + arch/powerpc/platforms/cell/axon_msi.c | 2 +- + arch/powerpc/platforms/cell/beat_smp.c | 7 +- + arch/powerpc/platforms/cell/cbe_regs.c | 11 +- + arch/powerpc/platforms/cell/celleb_pci.c | 19 +- + arch/powerpc/platforms/cell/celleb_pci.h | 3 +- + arch/powerpc/platforms/cell/qpace_setup.c | 1 - + arch/powerpc/platforms/cell/setup.c | 4 +- + arch/powerpc/platforms/cell/smp.c | 19 +- + arch/powerpc/platforms/cell/spider-pci.c | 3 +- + arch/powerpc/platforms/cell/spider-pic.c | 10 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/chrp/smp.c | 4 +- + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 8 +- + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 8 +- + arch/powerpc/platforms/iseries/Kconfig | 3 +- + arch/powerpc/platforms/iseries/exception.S | 3 +- + arch/powerpc/platforms/iseries/irq.c | 10 +- + arch/powerpc/platforms/iseries/setup.c | 4 +- + arch/powerpc/platforms/iseries/smp.c | 6 +- + arch/powerpc/platforms/powermac/pic.c | 12 +- + arch/powerpc/platforms/powermac/smp.c | 10 +- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 23 +- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/eeh.c | 82 ++- + arch/powerpc/platforms/pseries/eeh_driver.c | 22 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 5 +- + arch/powerpc/platforms/pseries/io_event_irq.c | 231 +++++ + arch/powerpc/platforms/pseries/kexec.c | 5 +- + arch/powerpc/platforms/pseries/lpar.c | 48 +- + arch/powerpc/platforms/pseries/plpar_wrappers.h | 27 - + arch/powerpc/platforms/pseries/ras.c | 4 +- + arch/powerpc/platforms/pseries/setup.c | 19 +- + arch/powerpc/platforms/pseries/smp.c | 23 +- + arch/powerpc/platforms/pseries/xics.c | 949 -------------------- + arch/powerpc/platforms/pseries/xics.h | 23 - + arch/powerpc/platforms/wsp/Kconfig | 28 + + arch/powerpc/platforms/wsp/Makefile | 6 + + arch/powerpc/platforms/wsp/ics.c | 712 +++++++++++++++ + arch/powerpc/platforms/wsp/ics.h | 20 + + arch/powerpc/platforms/wsp/opb_pic.c | 332 +++++++ + arch/powerpc/platforms/wsp/psr2.c | 95 ++ + arch/powerpc/platforms/wsp/scom_smp.c | 427 +++++++++ + arch/powerpc/platforms/wsp/scom_wsp.c | 77 ++ + arch/powerpc/platforms/wsp/setup.c | 36 + + arch/powerpc/platforms/wsp/smp.c | 87 ++ + arch/powerpc/platforms/wsp/wsp.h | 17 + + arch/powerpc/sysdev/Kconfig | 10 + + arch/powerpc/sysdev/Makefile | 6 + + arch/powerpc/sysdev/cpm1.c | 8 +- + arch/powerpc/sysdev/cpm2_pic.c | 10 +- + arch/powerpc/sysdev/ipic.c | 16 +- + arch/powerpc/sysdev/mmio_nvram.c | 2 + + arch/powerpc/sysdev/mpc8xx_pic.c | 10 +- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 12 +- + arch/powerpc/sysdev/mpic.c | 28 +- + arch/powerpc/sysdev/mv64x60_pic.c | 14 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 6 +- + arch/powerpc/sysdev/scom.c | 192 ++++ + arch/powerpc/sysdev/uic.c | 12 +- + arch/powerpc/sysdev/xics/Kconfig | 12 + + arch/powerpc/sysdev/xics/Makefile | 6 + + arch/powerpc/sysdev/xics/icp-hv.c | 184 ++++ + arch/powerpc/sysdev/xics/icp-native.c | 313 +++++++ + arch/powerpc/sysdev/xics/ics-rtas.c | 240 +++++ + arch/powerpc/sysdev/xics/xics-common.c | 469 ++++++++++ + arch/powerpc/sysdev/xilinx_intc.c | 8 +- + arch/powerpc/xmon/xmon.c | 36 +- + drivers/char/bsr.c | 2 +- + drivers/infiniband/hw/cxgb4/t4.h | 5 +- + drivers/of/irq.c | 2 +- + include/linux/of_irq.h | 1 + + 175 files changed, 6460 insertions(+), 1876 deletions(-) + create mode 100644 arch/powerpc/boot/epapr.c + rename arch/powerpc/{platforms/cell => include/asm}/io-workarounds.h (97%) + create mode 100644 arch/powerpc/include/asm/io_event_irq.h + create mode 100644 arch/powerpc/include/asm/reg_a2.h + create mode 100644 arch/powerpc/include/asm/scom.h + create mode 100644 arch/powerpc/include/asm/wsp.h + create mode 100644 arch/powerpc/include/asm/xics.h + create mode 100644 arch/powerpc/kernel/cpu_setup_a2.S + create mode 100644 arch/powerpc/kernel/cpu_setup_power7.S + create mode 100644 arch/powerpc/kernel/idle_power7.S + rename arch/powerpc/{platforms/cell => kernel}/io-workarounds.c (95%) + create mode 100644 arch/powerpc/platforms/pseries/io_event_irq.c + delete mode 100644 arch/powerpc/platforms/pseries/xics.c + delete mode 100644 arch/powerpc/platforms/pseries/xics.h + create mode 100644 arch/powerpc/platforms/wsp/Kconfig + create mode 100644 arch/powerpc/platforms/wsp/Makefile + create mode 100644 arch/powerpc/platforms/wsp/ics.c + create mode 100644 arch/powerpc/platforms/wsp/ics.h + create mode 100644 arch/powerpc/platforms/wsp/opb_pic.c + create mode 100644 arch/powerpc/platforms/wsp/psr2.c + create mode 100644 arch/powerpc/platforms/wsp/scom_smp.c + create mode 100644 arch/powerpc/platforms/wsp/scom_wsp.c + create mode 100644 arch/powerpc/platforms/wsp/setup.c + create mode 100644 arch/powerpc/platforms/wsp/smp.c + create mode 100644 arch/powerpc/platforms/wsp/wsp.h + create mode 100644 arch/powerpc/sysdev/scom.c + create mode 100644 arch/powerpc/sysdev/xics/Kconfig + create mode 100644 arch/powerpc/sysdev/xics/Makefile + create mode 100644 arch/powerpc/sysdev/xics/icp-hv.c + create mode 100644 arch/powerpc/sysdev/xics/icp-native.c + create mode 100644 arch/powerpc/sysdev/xics/ics-rtas.c + create mode 100644 arch/powerpc/sysdev/xics/xics-common.c +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Merge made by recursive. + arch/powerpc/boot/dts/charon.dts | 236 ++++++++++++++++++++++++++ + arch/powerpc/configs/52xx/tqm5200_defconfig | 20 ++- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 1 + + 3 files changed, 249 insertions(+), 8 deletions(-) + create mode 100644 arch/powerpc/boot/dts/charon.dts +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Removing drivers/s390/char/tape_block.c +Merge made by recursive. + arch/s390/Kconfig | 11 - + arch/s390/appldata/appldata_base.c | 2 - + arch/s390/include/asm/cmpxchg.h | 1 - + arch/s390/include/asm/elf.h | 12 - + arch/s390/include/asm/hugetlb.h | 17 +- + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/mmu.h | 3 - + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/percpu.h | 68 ++++++ + arch/s390/include/asm/pgalloc.h | 28 +-- + arch/s390/include/asm/pgtable.h | 38 --- + arch/s390/include/asm/processor.h | 1 + + arch/s390/include/asm/tlbflush.h | 13 +- + arch/s390/kernel/asm-offsets.c | 4 +- + arch/s390/kernel/entry.S | 1 + + arch/s390/kernel/entry64.S | 1 + + arch/s390/kernel/setup.c | 31 +--- + arch/s390/kernel/smp.c | 26 +- + arch/s390/kernel/time.c | 4 +- + arch/s390/kernel/topology.c | 16 +- + arch/s390/kernel/vdso32/Makefile | 3 + + arch/s390/kernel/vdso64/Makefile | 3 + + arch/s390/mm/extmem.c | 6 +- + arch/s390/mm/fault.c | 187 ++++++++------- + arch/s390/mm/hugetlbpage.c | 10 - + arch/s390/mm/pgtable.c | 68 +----- + drivers/crypto/Kconfig | 2 + + drivers/s390/block/dasd_alias.c | 4 - + drivers/s390/block/dasd_eckd.c | 11 +- + drivers/s390/char/Kconfig | 12 - + drivers/s390/char/Makefile | 1 - + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/raw3270.c | 2 - + drivers/s390/char/sclp_config.c | 14 +- + drivers/s390/char/sclp_sdias.c | 3 - + drivers/s390/char/tape_3590.c | 11 +- + drivers/s390/char/tape_block.c | 445 ----------------------------------- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/cio/device_fsm.c | 3 - + drivers/s390/cio/device_ops.c | 3 - + drivers/s390/cio/qdio_main.c | 2 +- + drivers/s390/crypto/ap_bus.c | 8 +- + 42 files changed, 241 insertions(+), 851 deletions(-) + delete mode 100644 drivers/s390/char/tape_block.c +Merging sh/sh-latest +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Auto-merging arch/sparc/kernel/smp_32.c +Auto-merging arch/sparc/kernel/time_32.c +Removing arch/sparc/lib/rwsem_32.S +Merge made by recursive. + arch/sparc/Kconfig | 6 +- + arch/sparc/include/asm/floppy_32.h | 40 ++- + arch/sparc/include/asm/irq_32.h | 6 +- + arch/sparc/include/asm/leon.h | 37 +-- + arch/sparc/include/asm/pcic.h | 12 +- + arch/sparc/include/asm/pgtable_32.h | 6 +- + arch/sparc/include/asm/pgtable_64.h | 3 + + arch/sparc/include/asm/setup.h | 12 + + arch/sparc/include/asm/smp_64.h | 4 + + arch/sparc/include/asm/system_32.h | 5 - + arch/sparc/include/asm/system_64.h | 4 - + arch/sparc/kernel/Makefile | 4 - + arch/sparc/kernel/cpu.c | 139 +++++++++- + arch/sparc/kernel/devices.c | 4 +- + arch/sparc/kernel/entry.S | 16 -- + arch/sparc/kernel/head_32.S | 51 ++-- + arch/sparc/kernel/irq.h | 45 ++-- + arch/sparc/kernel/irq_32.c | 503 ++++++++--------------------------- + arch/sparc/kernel/kernel.h | 5 +- + arch/sparc/kernel/leon_kernel.c | 365 +++++++++++++++++--------- + arch/sparc/kernel/leon_smp.c | 19 +- + arch/sparc/kernel/pcic.c | 83 ++++-- + arch/sparc/kernel/perf_event.c | 1 + + arch/sparc/kernel/prom_32.c | 1 - + arch/sparc/kernel/setup_32.c | 87 +------ + arch/sparc/kernel/setup_64.c | 78 ------ + arch/sparc/kernel/smp_32.c | 2 - + arch/sparc/kernel/sun4c_irq.c | 150 +++++++---- + arch/sparc/kernel/sun4d_irq.c | 485 ++++++++++++---------------------- + arch/sparc/kernel/sun4d_smp.c | 2 - + arch/sparc/kernel/sun4m_irq.c | 179 +++++++------ + arch/sparc/kernel/sun4m_smp.c | 18 +-- + arch/sparc/kernel/time_32.c | 10 +- + arch/sparc/lib/Makefile | 1 - + arch/sparc/lib/rwsem_32.S | 204 -------------- + 35 files changed, 1055 insertions(+), 1532 deletions(-) + delete mode 100644 arch/sparc/lib/rwsem_32.S +Merging tile/master +$ git merge tile/master +Auto-merging arch/tile/include/asm/vga.h +Merge made by recursive. + arch/tile/Kconfig | 8 + + arch/tile/configs/tile_defconfig | 1091 ++++++++++++++++++++++++ + arch/tile/include/arch/icache.h | 11 +- + arch/tile/include/arch/spr_def.h | 13 +- + arch/tile/include/asm/backtrace.h | 82 +-- + arch/tile/include/asm/cacheflush.h | 18 +- + arch/tile/include/asm/dma-mapping.h | 3 +- + arch/tile/include/asm/fb.h | 1 + + arch/tile/include/asm/io.h | 18 + + arch/tile/include/asm/irq.h | 2 + + arch/tile/include/asm/mmu_context.h | 4 +- + arch/tile/include/asm/opcode-tile_32.h | 7 + + arch/tile/include/asm/opcode-tile_64.h | 7 + + arch/tile/include/asm/page.h | 18 +- + arch/tile/include/asm/parport.h | 1 + + arch/tile/include/asm/pci.h | 3 +- + arch/tile/include/asm/processor.h | 2 + + arch/tile/include/asm/serial.h | 1 + + arch/tile/include/asm/stat.h | 2 +- + arch/tile/include/asm/swab.h | 6 - + arch/tile/include/asm/thread_info.h | 5 +- + arch/tile/include/asm/topology.h | 75 ++- + arch/tile/include/asm/traps.h | 4 + + arch/tile/include/{hv/pagesize.h => asm/vga.h} | 35 +- + arch/tile/include/hv/hypervisor.h | 12 +- + arch/tile/kernel/backtrace.c | 103 +-- + arch/tile/kernel/hardwall.c | 6 +- + arch/tile/kernel/intvec_32.S | 175 +--- + arch/tile/kernel/module.c | 8 +- + arch/tile/kernel/pci-dma.c | 2 +- + arch/tile/kernel/pci.c | 207 +++-- + arch/tile/kernel/process.c | 48 + + arch/tile/kernel/setup.c | 6 + + arch/tile/kernel/single_step.c | 8 + + arch/tile/kernel/stack.c | 14 +- + arch/tile/kernel/tile-desc_32.c | 11 +- + arch/tile/kernel/time.c | 2 + + arch/tile/kernel/tlb.c | 12 +- + arch/tile/lib/atomic_asm_32.S | 2 +- + arch/tile/lib/cacheflush.c | 18 + + arch/tile/mm/fault.c | 6 +- + drivers/net/tile/tilepro.c | 8 +- + include/asm-generic/audit_change_attr.h | 4 + + include/asm-generic/audit_dir_write.h | 14 + + include/asm-generic/audit_read.h | 5 + + include/asm-generic/audit_write.h | 2 + + lib/audit.c | 2 + + 47 files changed, 1650 insertions(+), 442 deletions(-) + create mode 100644 arch/tile/include/asm/fb.h + create mode 100644 arch/tile/include/asm/parport.h + create mode 100644 arch/tile/include/asm/serial.h + rename arch/tile/include/{hv/pagesize.h => asm/vga.h} (52%) +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Resolved 'drivers/net/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/net/Kconfig +CONFLICT (content): Merge conflict in drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e91c42e] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + arch/unicore32/Kconfig | 4 - + arch/unicore32/boot/compressed/Makefile | 2 +- + arch/unicore32/configs/debug_defconfig | 8 +- + arch/unicore32/kernel/Makefile | 1 - + drivers/net/Kconfig | 5 + + drivers/net/Makefile | 1 + + drivers/net/mac-puv3.c | 2068 ++++++++++++++++++++ + drivers/rtc/Kconfig | 9 + + drivers/rtc/Makefile | 1 + + .../kernel/rtc.c => drivers/rtc/rtc-puv3.c | 0 + 11 files changed, 2091 insertions(+), 10 deletions(-) + create mode 100644 drivers/net/mac-puv3.c + rename arch/unicore32/kernel/rtc.c => drivers/rtc/rtc-puv3.c (100%) +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/boot/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 5226e63] Merge remote-tracking 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 +Removing fs/cifs/smbdes.c +Merge made by recursive. + fs/cifs/Kconfig | 35 +++-- + fs/cifs/Makefile | 2 +- + fs/cifs/README | 12 -- + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifsacl.c | 450 ++++++++++++++++++++++++++++++++++++++++++++++--- + fs/cifs/cifsacl.h | 24 +++ + fs/cifs/cifsencrypt.c | 12 +- + fs/cifs/cifsfs.c | 115 +++++++------ + fs/cifs/cifsfs.h | 18 +- + fs/cifs/cifsglob.h | 10 +- + fs/cifs/cifspdu.h | 37 ++--- + fs/cifs/cifsproto.h | 28 ++-- + fs/cifs/cifssmb.c | 377 +++++++++++++++++++++++------------------- + fs/cifs/connect.c | 279 +++++++++++++++++++++---------- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 167 ++++++------------ + fs/cifs/inode.c | 127 +++++++++----- + fs/cifs/misc.c | 12 +- + fs/cifs/netmisc.c | 7 - + fs/cifs/sess.c | 9 +- + fs/cifs/smbdes.c | 418 --------------------------------------------- + fs/cifs/smbencrypt.c | 124 +++++++++++--- + fs/cifs/transport.c | 66 +++----- + fs/cifs/xattr.c | 20 +++ + fs/super.c | 3 +- + 26 files changed, 1291 insertions(+), 1071 deletions(-) + delete mode 100644 fs/cifs/smbdes.c +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/inode.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/ext2/super.c | 3 +- + fs/ext3/namei.c | 81 +++++++++++++++++++++++++++++++++++++++++++++-------- + fs/jbd/commit.c | 15 ++++----- + fs/jbd/journal.c | 16 ++++++++-- + fs/jbd2/commit.c | 6 ---- + 5 files changed, 90 insertions(+), 31 deletions(-) +Merging ext4/dev +$ git merge ext4/dev +Auto-merging fs/jbd2/commit.c +Merge made by recursive. + Documentation/filesystems/ext4.txt | 4 - + fs/ext4/balloc.c | 129 ------- + fs/ext4/ext4.h | 19 +- + fs/ext4/ext4_jbd2.c | 14 - + fs/ext4/ext4_jbd2.h | 5 - + fs/ext4/extents.c | 732 +++++++++++++++--------------------- + fs/ext4/fsync.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ext4/mballoc.c | 396 +++++++++++--------- + fs/ext4/mballoc.h | 6 - + fs/ext4/migrate.c | 2 +- + fs/ext4/namei.c | 80 ++++- + fs/ext4/page-io.c | 39 +-- + fs/ext4/super.c | 85 ++++- + fs/jbd2/commit.c | 9 +- + fs/jbd2/journal.c | 17 +- + 16 files changed, 700 insertions(+), 841 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Merge made by recursive. + fs/fat/cache.c | 7 +++++ + fs/fat/dir.c | 32 +++++++++++---------- + fs/fat/fat.h | 15 +++++----- + fs/fat/fatent.c | 4 +- + fs/fat/inode.c | 74 ++++++++++++++++++++++++------------------------- + fs/fat/misc.c | 44 ++++++++++++++++++++--------- + fs/fat/namei_msdos.c | 4 +- + fs/fat/namei_vfat.c | 4 +- + 8 files changed, 104 insertions(+), 80 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Auto-merging fs/gfs2/glock.c +Removing fs/gfs2/ops_inode.c +Merge made by recursive. + fs/gfs2/Makefile | 4 +- + fs/gfs2/aops.c | 8 +- + fs/gfs2/dir.c | 197 +++---- + fs/gfs2/dir.h | 4 +- + fs/gfs2/export.c | 2 +- + fs/gfs2/file.c | 46 +- + fs/gfs2/glock.c | 94 ++-- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 172 +++++- + fs/gfs2/glops.h | 2 + + fs/gfs2/incore.h | 8 +- + fs/gfs2/inode.c | 1554 ++++++++++++++++++++++++++++++++++++++++--------- + fs/gfs2/inode.h | 5 +- + fs/gfs2/log.c | 179 +++--- + fs/gfs2/log.h | 2 + + fs/gfs2/lops.c | 39 +- + fs/gfs2/main.c | 1 + + fs/gfs2/meta_io.c | 2 + + fs/gfs2/meta_io.h | 2 - + fs/gfs2/ops_fstype.c | 32 +- + fs/gfs2/ops_inode.c | 1344 ------------------------------------------- + fs/gfs2/rgrp.c | 20 +- + fs/gfs2/super.c | 138 +++++- + fs/gfs2/sys.c | 6 +- + fs/gfs2/trace_gfs2.h | 38 ++- + 25 files changed, 1918 insertions(+), 1984 deletions(-) + delete mode 100644 fs/gfs2/ops_inode.c +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 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/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 5402591] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/nfs4filelayout.c | 27 ++++++++++++++++----------- + fs/nfs/nfs4filelayout.h | 2 +- + fs/nfs/nfs4filelayoutdev.c | 34 +++++++++++++++++----------------- + fs/nfs/nfs4proc.c | 6 ++++++ + fs/nfs/pnfs.c | 34 ++++++++++++++++++++-------------- + fs/nfs/pnfs.h | 6 +++--- + fs/nfs/read.c | 4 ++-- + fs/nfs/write.c | 4 ++-- + include/linux/nfs_xdr.h | 1 + + 9 files changed, 68 insertions(+), 50 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/nfs4.h +Merge made by recursive. + fs/nfsd/export.c | 6 - + fs/nfsd/nfs3proc.c | 2 +- + fs/nfsd/nfs4proc.c | 73 ++++++++- + fs/nfsd/nfs4state.c | 38 ++++- + fs/nfsd/nfs4xdr.c | 9 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/vfs.c | 33 +++-- + fs/nfsd/vfs.h | 6 +- + include/linux/nfs4.h | 8 +- + include/linux/sunrpc/svcsock.h | 1 + + net/sunrpc/svcsock.c | 336 ++++++++++++++++++++++------------------ + 11 files changed, 319 insertions(+), 195 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/alloc.c | 12 +- + fs/nilfs2/bmap.c | 4 +- + fs/nilfs2/btnode.c | 19 +-- + fs/nilfs2/btnode.h | 4 - + fs/nilfs2/btree.c | 38 +++--- + fs/nilfs2/cpfile.c | 24 ++-- + fs/nilfs2/dat.c | 4 +- + fs/nilfs2/file.c | 1 - + fs/nilfs2/gcinode.c | 25 ++--- + fs/nilfs2/ifile.c | 4 +- + fs/nilfs2/inode.c | 23 +++- + fs/nilfs2/ioctl.c | 61 ++++++++++ + fs/nilfs2/mdt.c | 8 +- + fs/nilfs2/mdt.h | 9 +-- + fs/nilfs2/nilfs.h | 7 +- + fs/nilfs2/page.c | 79 +------------ + fs/nilfs2/page.h | 7 +- + fs/nilfs2/recovery.c | 12 +- + fs/nilfs2/segbuf.c | 17 +-- + fs/nilfs2/segment.c | 190 ++++++-------------------------- + fs/nilfs2/segment.h | 2 - + fs/nilfs2/sufile.c | 274 +++++++++++++++++++++++++++++++++++++++++---- + fs/nilfs2/sufile.h | 4 +- + fs/nilfs2/super.c | 131 +++++++++++++++++++++- + fs/nilfs2/the_nilfs.c | 24 +++- + fs/nilfs2/the_nilfs.h | 2 + + include/linux/nilfs2_fs.h | 4 +- + 27 files changed, 603 insertions(+), 386 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 +Merge made by recursive. + include/net/9p/9p.h | 10 +++++----- + include/net/9p/client.h | 2 +- + include/net/9p/transport.h | 3 ++- + net/9p/client.c | 10 +++++----- + net/9p/mod.c | 4 ++-- + net/9p/protocol.c | 1 + + 6 files changed, 16 insertions(+), 14 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 1 - + fs/xfs/linux-2.6/xfs_ioctl32.c | 3 +- + fs/xfs/linux-2.6/xfs_ioctl32.h | 1 + + fs/xfs/linux-2.6/xfs_linux.h | 1 + + fs/xfs/linux-2.6/xfs_trace.h | 76 ++--- + fs/xfs/xfs_ag.h | 1 - + fs/xfs/xfs_alloc.c | 843 ++++++++++++++++++++++++++++------------ + fs/xfs/xfs_alloc.h | 15 +- + fs/xfs/xfs_alloc_btree.c | 13 +- + fs/xfs/xfs_dfrag.c | 6 +- + fs/xfs/xfs_inode_item.c | 1 - + fs/xfs/xfs_log.c | 7 - + fs/xfs/xfs_log.h | 2 - + fs/xfs/xfs_log_cil.c | 5 +- + fs/xfs/xfs_log_priv.h | 2 + + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_trans.c | 6 +- + fs/xfs/xfs_types.h | 2 - + 18 files changed, 639 insertions(+), 350 deletions(-) +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 +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da56be0] Merge remote-tracking branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/pci.h | 2 - + arch/x86/kernel/pci-dma.c | 64 -------- + arch/x86/kernel/setup.c | 1 - + arch/x86/pci/direct.c | 17 +-- + arch/x86/pci/irq.c | 4 +- + drivers/acpi/pci_root.c | 14 ++- + drivers/pci/access.c | 18 ++- + drivers/pci/hotplug/acpiphp_glue.c | 7 + + drivers/pci/hotplug/pcihp_slot.c | 45 ++++++ + drivers/pci/pci.c | 309 ++++++++++++++++++++++++++++++++++++ + drivers/pci/pcie/aer/aer_inject.c | 2 +- + drivers/pci/pcie/aspm.c | 2 +- + drivers/pci/quirks.c | 14 ++- + include/linux/pci.h | 34 ++++ + include/linux/pci_ids.h | 3 + + include/linux/pci_regs.h | 17 ++ + 16 files changed, 463 insertions(+), 90 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Removing drivers/hid/hid-3m-pct.c +Removing drivers/hid/hid-cando.c +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-lgff.c +Removing drivers/hid/hid-mosart.c +Auto-merging drivers/hid/hid-picolcd.c +Removing drivers/hid/hid-stantum.c +Auto-merging drivers/hid/usbhid/hid-quirks.c +Auto-merging samples/Kconfig +Merge made by recursive. + Documentation/{usb => hid}/hiddev.txt | 0 + Documentation/hid/hidraw.txt | 119 +++++++++++++ + drivers/hid/Kconfig | 30 +--- + drivers/hid/Makefile | 4 - + drivers/hid/hid-3m-pct.c | 305 --------------------------------- + drivers/hid/hid-cando.c | 276 ----------------------------- + drivers/hid/hid-core.c | 4 + + drivers/hid/hid-ids.h | 12 ++ + drivers/hid/hid-lg.c | 2 + + drivers/hid/hid-lgff.c | 3 + + drivers/hid/hid-mosart.c | 296 -------------------------------- + drivers/hid/hid-multitouch.c | 171 ++++++++++++++++--- + drivers/hid/hid-picolcd.c | 4 +- + drivers/hid/hid-sony.c | 2 + + drivers/hid/hid-stantum.c | 286 ------------------------------- + drivers/hid/hidraw.c | 16 +- + drivers/hid/usbhid/hid-quirks.c | 2 + + drivers/hid/usbhid/hiddev.c | 6 +- + net/bluetooth/hidp/hidp.h | 2 +- + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/hidraw/Makefile | 10 + + samples/hidraw/hid-example.c | 178 +++++++++++++++++++ + 23 files changed, 507 insertions(+), 1229 deletions(-) + rename Documentation/{usb => hid}/hiddev.txt (100%) + create mode 100644 Documentation/hid/hidraw.txt + delete mode 100644 drivers/hid/hid-3m-pct.c + delete mode 100644 drivers/hid/hid-cando.c + delete mode 100644 drivers/hid/hid-mosart.c + delete mode 100644 drivers/hid/hid-stantum.c + create mode 100644 samples/hidraw/Makefile + create mode 100644 samples/hidraw/hid-example.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 1 + + Documentation/i2c/writing-clients | 2 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-i801.c | 49 +++++++++++++++------ + drivers/i2c/busses/i2c-parport-light.c | 10 ++-- + drivers/i2c/busses/i2c-parport.c | 30 ++++++------ + drivers/i2c/busses/i2c-parport.h | 74 +++++++++++++++----------------- + 7 files changed, 92 insertions(+), 75 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/i2c-sh_mobile.c +Merge made by recursive. + arch/arm/plat-nomadik/include/plat/i2c.h | 8 +- + drivers/i2c/busses/Kconfig | 10 +- + drivers/i2c/busses/i2c-eg20t.c | 2 + + drivers/i2c/busses/i2c-nomadik.c | 272 ++++++++++++++++++++---------- + drivers/i2c/busses/i2c-sh_mobile.c | 19 ++- + drivers/i2c/busses/i2c-tegra.c | 39 ++++- + include/linux/i2c/i2c-sh_mobile.h | 10 + + 7 files changed, 252 insertions(+), 108 deletions(-) + create mode 100644 include/linux/i2c/i2c-sh_mobile.h +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Merge made by recursive. + Documentation/hwmon/f71882fg | 4 + + Documentation/hwmon/fam15h_power | 37 ++++ + Documentation/hwmon/k10temp | 3 +- + Documentation/hwmon/max6650 | 21 ++- + MAINTAINERS | 7 + + arch/x86/Kconfig | 1 + + drivers/acpi/Kconfig | 11 - + drivers/acpi/Makefile | 1 - + drivers/char/i8k.c | 162 ++++++++++++++ + drivers/hwmon/Kconfig | 28 ++- + drivers/hwmon/Makefile | 2 + + .../power_meter.c => hwmon/acpi_power_meter.c} | 0 + drivers/hwmon/adcxx.c | 16 +- + drivers/hwmon/f71882fg.c | 115 +++++++++- + drivers/hwmon/fam15h_power.c | 229 ++++++++++++++++++++ + drivers/hwmon/ibmaem.c | 10 +- + drivers/hwmon/jc42.c | 2 +- + drivers/hwmon/k10temp.c | 11 +- + drivers/hwmon/k8temp.c | 8 +- + drivers/hwmon/lm70.c | 10 +- + drivers/hwmon/max6650.c | 78 +++----- + drivers/hwmon/sch5627.c | 46 ++++- + drivers/hwmon/ultra45_env.c | 4 +- + include/linux/i2c.h | 2 +- + 24 files changed, 690 insertions(+), 118 deletions(-) + create mode 100644 Documentation/hwmon/fam15h_power + rename drivers/{acpi/power_meter.c => hwmon/acpi_power_meter.c} (100%) + create mode 100644 drivers/hwmon/fam15h_power.c +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Merge made by recursive. + Documentation/hwmon/adm1275 | 60 +++ + Documentation/hwmon/max16065 | 98 +++++ + Documentation/hwmon/max6642 | 21 + + Documentation/hwmon/sht15 | 74 ++++ + Documentation/hwmon/ucd9000 | 110 +++++ + Documentation/hwmon/ucd9200 | 112 +++++ + drivers/hwmon/Kconfig | 59 +++ + drivers/hwmon/Makefile | 5 + + drivers/hwmon/adm1275.c | 121 ++++++ + drivers/hwmon/max16065.c | 717 +++++++++++++++++++++++++++++++ + drivers/hwmon/max34440.c | 6 +- + drivers/hwmon/max6642.c | 356 ++++++++++++++++ + drivers/hwmon/max8688.c | 4 +- + drivers/hwmon/pmbus.h | 10 +- + drivers/hwmon/pmbus_core.c | 970 +++++++++++++++++++----------------------- + drivers/hwmon/sht15.c | 747 +++++++++++++++++++++++++-------- + drivers/hwmon/ucd9000.c | 278 ++++++++++++ + drivers/hwmon/ucd9200.c | 210 +++++++++ + include/linux/sht15.h | 18 +- + 19 files changed, 3264 insertions(+), 712 deletions(-) + create mode 100644 Documentation/hwmon/adm1275 + create mode 100644 Documentation/hwmon/max16065 + create mode 100644 Documentation/hwmon/max6642 + create mode 100644 Documentation/hwmon/sht15 + create mode 100644 Documentation/hwmon/ucd9000 + create mode 100644 Documentation/hwmon/ucd9200 + create mode 100644 drivers/hwmon/adm1275.c + create mode 100644 drivers/hwmon/max16065.c + create mode 100644 drivers/hwmon/max6642.c + create mode 100644 drivers/hwmon/ucd9000.c + create mode 100644 drivers/hwmon/ucd9200.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/HOWTO | 2 +- + Documentation/dontdiff | 58 ++++++++++++++++++++++++++++++++++--------- + Documentation/sysctl/fs.txt | 7 ----- + 3 files changed, 47 insertions(+), 20 deletions(-) +Merging docs/docs-move +$ git merge docs/docs-move +Auto-merging Documentation/virtual/kvm/review-checklist.txt +Auto-merging Documentation/virtual/lguest/lguest.txt +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/00-INDEX | 2 -- + Documentation/virtual/00-INDEX | 10 ++++++++++ + Documentation/{ => virtual}/kvm/api.txt | 0 + Documentation/{ => virtual}/kvm/cpuid.txt | 0 + Documentation/{ => virtual}/kvm/locking.txt | 0 + Documentation/{ => virtual}/kvm/mmu.txt | 0 + Documentation/{ => virtual}/kvm/msr.txt | 0 + Documentation/{ => virtual}/kvm/ppc-pv.txt | 0 + .../{ => virtual}/kvm/review-checklist.txt | 2 +- + Documentation/{ => virtual}/kvm/timekeeping.txt | 0 + Documentation/{ => virtual}/lguest/.gitignore | 0 + Documentation/{ => virtual}/lguest/Makefile | 0 + Documentation/{ => virtual}/lguest/extract | 0 + Documentation/{ => virtual}/lguest/lguest.c | 0 + Documentation/{ => virtual}/lguest/lguest.txt | 3 ++- + .../{ => virtual}/uml/UserModeLinux-HOWTO.txt | 0 + MAINTAINERS | 4 ++-- + arch/x86/lguest/boot.c | 2 +- + drivers/lguest/Kconfig | 6 ++++-- + drivers/lguest/Makefile | 2 +- + drivers/vhost/vhost.c | 2 +- + 21 files changed, 22 insertions(+), 11 deletions(-) + create mode 100644 Documentation/virtual/00-INDEX + rename Documentation/{ => virtual}/kvm/api.txt (100%) + rename Documentation/{ => virtual}/kvm/cpuid.txt (100%) + rename Documentation/{ => virtual}/kvm/locking.txt (100%) + rename Documentation/{ => virtual}/kvm/mmu.txt (100%) + rename Documentation/{ => virtual}/kvm/msr.txt (100%) + rename Documentation/{ => virtual}/kvm/ppc-pv.txt (100%) + rename Documentation/{ => virtual}/kvm/review-checklist.txt (95%) + rename Documentation/{ => virtual}/kvm/timekeeping.txt (100%) + rename Documentation/{ => virtual}/lguest/.gitignore (100%) + rename Documentation/{ => virtual}/lguest/Makefile (100%) + rename Documentation/{ => virtual}/lguest/extract (100%) + rename Documentation/{ => virtual}/lguest/lguest.c (100%) + rename Documentation/{ => virtual}/lguest/lguest.txt (97%) + rename Documentation/{ => virtual}/uml/UserModeLinux-HOWTO.txt (100%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing drivers/media/dvb/frontends/drx397xD.c +Removing drivers/media/dvb/frontends/drx397xD.h +Removing drivers/media/dvb/frontends/drx397xD_fw.h +Merge made by recursive. + Documentation/DocBook/.gitignore | 1 + + Documentation/DocBook/media-entities.tmpl | 1 + + Documentation/DocBook/v4l/pixfmt-y10b.xml | 43 + + Documentation/DocBook/v4l/pixfmt.xml | 1 + + Documentation/DocBook/v4l/videodev2.h.xml | 3 + + Documentation/feature-removal-schedule.txt | 23 + + Documentation/ioctl/ioctl-number.txt | 2 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + Documentation/video4linux/Zoran | 1 - + Documentation/video4linux/gspca.txt | 1 + + Documentation/video4linux/uvcvideo.txt | 239 ++ + drivers/media/common/saa7146_core.c | 7 +- + drivers/media/common/tuners/Kconfig | 8 + + drivers/media/common/tuners/Makefile | 1 + + drivers/media/common/tuners/tda18212.c | 265 ++ + drivers/media/common/tuners/tda18212.h | 48 + + drivers/media/common/tuners/tda18212_priv.h | 44 + + drivers/media/common/tuners/tda18271-fe.c | 4 + + drivers/media/common/tuners/xc5000.c | 32 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- + drivers/media/dvb/bt8xx/bt878.c | 2 +- + drivers/media/dvb/dvb-core/dvb_demux.c | 117 +- + drivers/media/dvb/dvb-usb/Kconfig | 5 + + drivers/media/dvb/dvb-usb/a800.c | 17 +- + drivers/media/dvb/dvb-usb/anysee.c | 620 ++++- + drivers/media/dvb/dvb-usb/anysee.h | 23 +- + drivers/media/dvb/dvb-usb/au6610.c | 22 +- + drivers/media/dvb/dvb-usb/ce6230.c | 11 +- + drivers/media/dvb/dvb-usb/dib0700.h | 5 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 220 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 1 - + drivers/media/dvb/dvb-usb/dibusb-common.c | 2 +- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 31 +- + drivers/media/dvb/dvb-usb/dw2102.c | 10 +- + drivers/media/dvb/dvb-usb/ec168.c | 18 +- + drivers/media/dvb/dvb-usb/friio.c | 23 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 165 +- + drivers/media/dvb/dvb-usb/lmedm04.h | 5 +- + drivers/media/dvb/dvb-usb/m920x.c | 49 +- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 2 +- + drivers/media/dvb/dvb-usb/opera1.c | 33 +- + drivers/media/dvb/dvb-usb/vp702x-fe.c | 80 +- + drivers/media/dvb/dvb-usb/vp702x.c | 213 ++- + drivers/media/dvb/dvb-usb/vp702x.h | 7 + + drivers/media/dvb/dvb-usb/vp7045.c | 47 +- + drivers/media/dvb/frontends/Kconfig | 19 +- + drivers/media/dvb/frontends/Makefile | 6 +- + drivers/media/dvb/frontends/bsbe1-d01a.h | 146 + + drivers/media/dvb/frontends/bsru6.h | 2 +- + drivers/media/dvb/frontends/cx24116.c | 21 +- + drivers/media/dvb/frontends/cx24116.h | 3 + + drivers/media/dvb/frontends/cxd2820r.h | 118 + + drivers/media/dvb/frontends/cxd2820r_c.c | 338 +++ + drivers/media/dvb/frontends/cxd2820r_core.c | 914 ++++++ + drivers/media/dvb/frontends/cxd2820r_priv.h | 178 ++ + drivers/media/dvb/frontends/cxd2820r_t.c | 449 +++ + drivers/media/dvb/frontends/cxd2820r_t2.c | 423 +++ + drivers/media/dvb/frontends/dib9000.c | 4 +- + drivers/media/dvb/frontends/drx397xD.c | 1511 ---------- + drivers/media/dvb/frontends/drx397xD.h | 130 - + drivers/media/dvb/frontends/drx397xD_fw.h | 40 - + drivers/media/dvb/frontends/drxd.h | 61 + + drivers/media/dvb/frontends/drxd_firm.c | 929 ++++++ + drivers/media/dvb/frontends/drxd_firm.h | 115 + + drivers/media/dvb/frontends/drxd_hard.c | 3000 ++++++++++++++++++++ + drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++ + drivers/media/dvb/frontends/eds1547.h | 2 +- + drivers/media/dvb/frontends/ix2505v.c | 10 +- + drivers/media/dvb/frontends/stv0288.c | 2 +- + drivers/media/dvb/frontends/stv0299.c | 10 +- + drivers/media/dvb/frontends/z0194a.h | 2 +- + drivers/media/dvb/mantis/hopper_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 +- + drivers/media/dvb/mantis/mantis_vp1033.c | 2 +- + drivers/media/dvb/pt1/pt1.c | 5 +- + drivers/media/dvb/siano/smsusb.c | 3 +- + drivers/media/dvb/ttpci/Kconfig | 2 + + drivers/media/dvb/ttpci/budget-ci.c | 21 + + drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | 60 +- + drivers/media/radio/si470x/radio-si470x-common.c | 60 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 63 +- + drivers/media/radio/si470x/radio-si470x.h | 4 +- + drivers/media/radio/wl128x/fmdrv.h | 2 - + drivers/media/rc/keymaps/Makefile | 1 + + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 2 +- + drivers/media/rc/keymaps/rc-imon-mce.c | 2 +- + drivers/media/rc/keymaps/rc-imon-pad.c | 6 +- + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 2 +- + drivers/media/rc/keymaps/rc-rc6-mce.c | 4 +- + drivers/media/rc/keymaps/rc-tivo.c | 98 + + drivers/media/rc/mceusb.c | 16 +- + drivers/media/rc/nuvoton-cir.c | 62 +- + drivers/media/rc/nuvoton-cir.h | 17 +- + drivers/media/rc/rc-loopback.c | 6 + + drivers/media/rc/winbond-cir.c | 447 +++- + drivers/media/video/Kconfig | 7 + + drivers/media/video/Makefile | 1 + + drivers/media/video/bt8xx/bttv-driver.c | 2 +- + drivers/media/video/cpia2/cpia2_v4l.c | 2 +- + drivers/media/video/cx18/Kconfig | 4 + + drivers/media/video/cx18/cx18-cards.c | 18 +- + drivers/media/video/cx18/cx18-cards.h | 2 +- + drivers/media/video/cx18/cx18-driver.c | 27 +- + drivers/media/video/cx18/cx18-driver.h | 25 + + drivers/media/video/cx18/cx18-fileops.c | 73 + + drivers/media/video/cx18/cx18-fileops.h | 2 + + drivers/media/video/cx18/cx18-ioctl.c | 144 +- + drivers/media/video/cx18/cx18-mailbox.c | 58 + + drivers/media/video/cx18/cx18-streams.c | 175 ++- + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx18/cx23418.h | 6 + + drivers/media/video/cx231xx/cx231xx-cards.c | 40 + + drivers/media/video/cx231xx/cx231xx-dvb.c | 1 + + drivers/media/video/cx231xx/cx231xx.h | 1 + + drivers/media/video/cx23885/cx23885-cards.c | 1 + + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx88/cx88-blackbird.c | 41 +- + drivers/media/video/cx88/cx88-dvb.c | 2 + + drivers/media/video/cx88/cx88-input.c | 2 +- + drivers/media/video/cx88/cx88-mpeg.c | 42 +- + drivers/media/video/cx88/cx88-video.c | 7 +- + drivers/media/video/cx88/cx88.h | 11 +- + drivers/media/video/em28xx/Kconfig | 2 + + drivers/media/video/em28xx/em28xx-cards.c | 49 +- + drivers/media/video/em28xx/em28xx-core.c | 9 +- + drivers/media/video/em28xx/em28xx-dvb.c | 160 +- + drivers/media/video/em28xx/em28xx-i2c.c | 2 +- + drivers/media/video/em28xx/em28xx-reg.h | 1 + + drivers/media/video/em28xx/em28xx.h | 3 +- + drivers/media/video/fsl-viu.c | 56 +- + drivers/media/video/gspca/Kconfig | 9 + + drivers/media/video/gspca/Makefile | 2 + + drivers/media/video/gspca/jeilinj.c | 581 +++-- + drivers/media/video/gspca/kinect.c | 429 +++ + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 2 + + drivers/media/video/gspca/zc3xx.c | 42 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/mt9v032.c | 773 +++++ + drivers/media/video/pvrusb2/pvrusb2-std.c | 10 +- + drivers/media/video/pwc/pwc-v4l.c | 23 +- + drivers/media/video/s2255drv.c | 27 +- + drivers/media/video/saa7134/saa7134-cards.c | 54 + + drivers/media/video/saa7134/saa7134-core.c | 2 +- + drivers/media/video/saa7134/saa7134-dvb.c | 34 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/saa7164-core.c | 2 +- + drivers/media/video/soc_camera.c | 48 +- + drivers/media/video/tveeprom.c | 32 +- + drivers/media/video/usbvision/usbvision-cards.c | 33 +- + drivers/media/video/usbvision/usbvision-cards.h | 2 + + drivers/media/video/usbvision/usbvision-core.c | 165 +- + drivers/media/video/usbvision/usbvision-i2c.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 3 +- + drivers/media/video/usbvision/usbvision.h | 6 + + drivers/media/video/uvc/uvc_ctrl.c | 367 ++- + drivers/media/video/uvc/uvc_driver.c | 23 + + drivers/media/video/uvc/uvc_v4l2.c | 51 +- + drivers/media/video/uvc/uvcvideo.h | 57 +- + drivers/media/video/v4l2-device.c | 5 +- + drivers/media/video/v4l2-subdev.c | 14 +- + drivers/media/video/zoran/zoran_card.c | 10 +- + drivers/staging/lirc/lirc_sasem.c | 13 +- + drivers/staging/tm6000/CARDLIST | 16 + + drivers/staging/tm6000/tm6000-cards.c | 102 +- + drivers/staging/tm6000/tm6000-i2c.c | 33 +- + drivers/staging/tm6000/tm6000-video.c | 4 +- + drivers/staging/tm6000/tm6000.h | 2 + + include/linux/Kbuild | 1 + + include/linux/uvcvideo.h | 69 + + include/linux/videodev2.h | 3 + + include/media/mt9v032.h | 12 + + include/media/rc-map.h | 1 + + include/media/soc_camera_platform.h | 50 + + 174 files changed, 13843 insertions(+), 3054 deletions(-) + create mode 100644 Documentation/DocBook/v4l/pixfmt-y10b.xml + create mode 100644 Documentation/video4linux/uvcvideo.txt + create mode 100644 drivers/media/common/tuners/tda18212.c + create mode 100644 drivers/media/common/tuners/tda18212.h + create mode 100644 drivers/media/common/tuners/tda18212_priv.h + create mode 100644 drivers/media/dvb/frontends/bsbe1-d01a.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r_c.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_core.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_priv.h + create mode 100644 drivers/media/dvb/frontends/cxd2820r_t.c + create mode 100644 drivers/media/dvb/frontends/cxd2820r_t2.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.h + delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + create mode 100644 drivers/media/dvb/frontends/drxd.h + create mode 100644 drivers/media/dvb/frontends/drxd_firm.c + create mode 100644 drivers/media/dvb/frontends/drxd_firm.h + create mode 100644 drivers/media/dvb/frontends/drxd_hard.c + create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h + create mode 100644 drivers/media/rc/keymaps/rc-tivo.c + create mode 100644 drivers/media/video/gspca/kinect.c + create mode 100644 drivers/media/video/mt9v032.c + create mode 100644 drivers/staging/tm6000/CARDLIST + create mode 100644 include/linux/uvcvideo.h + create mode 100644 include/media/mt9v032.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging CREDITS +Auto-merging Documentation/kbuild/kbuild.txt +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/edac/cpc925_edac.c +Auto-merging drivers/edac/i5000_edac.c +Auto-merging drivers/edac/i5400_edac.c +Auto-merging drivers/edac/i7300_edac.c +Auto-merging drivers/edac/i7core_edac.c +Auto-merging drivers/edac/r82600_edac.c +Auto-merging drivers/media/video/cx231xx/cx231xx-avcore.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/pmcraid.h +Auto-merging drivers/scsi/wd33c93.c +Auto-merging drivers/tty/nozomi.c +Auto-merging init/Kconfig +Auto-merging scripts/gen_initramfs_list.sh +Merge made by recursive. + .gitignore | 1 + + CREDITS | 4 ++ + Documentation/DocBook/Makefile | 2 +- + Documentation/kbuild/kbuild.txt | 13 +++++ + Documentation/kbuild/kconfig-language.txt | 32 +++++++++++- + Documentation/kbuild/makefiles.txt | 53 ++++++++++++++++++ + MAINTAINERS | 5 +- + Makefile | 59 +++++++++++++++------ + drivers/edac/amd76x_edac.c | 2 +- + drivers/edac/amd8111_edac.c | 2 +- + drivers/edac/amd8131_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/e752x_edac.c | 2 +- + drivers/edac/e7xxx_edac.c | 2 +- + drivers/edac/edac_module.c | 2 +- + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5400_edac.c | 2 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82860_edac.c | 2 +- + drivers/edac/i82875p_edac.c | 2 +- + drivers/edac/i82975x_edac.c | 2 +- + drivers/edac/mpc85xx_edac.h | 2 +- + drivers/edac/mv64x60_edac.h | 2 +- + drivers/edac/ppc4xx_edac.c | 2 +- + drivers/edac/r82600_edac.c | 2 +- + drivers/media/radio/radio-maxiradio.c | 3 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 2 +- + drivers/scsi/aacraid/linit.c | 3 +- + drivers/scsi/in2000.c | 2 +- + drivers/scsi/pmcraid.c | 9 ++-- + drivers/scsi/pmcraid.h | 1 - + drivers/scsi/wd33c93.c | 7 +-- + drivers/staging/generic_serial/rio/rioinit.c | 2 +- + drivers/tty/cyclades.c | 3 +- + drivers/tty/nozomi.c | 3 +- + init/Kconfig | 30 ++++------ + scripts/.gitignore | 1 + + scripts/Kbuild.include | 10 ++++ + scripts/Makefile | 7 ++- + scripts/Makefile.asm-generic | 23 ++++++++ + scripts/Makefile.build | 74 ++++++++++++++++---------- + scripts/Makefile.headersinst | 10 +++- + scripts/Makefile.lib | 2 +- + scripts/basic/.gitignore | 2 - + scripts/basic/Makefile | 3 +- + scripts/checkversion.pl | 1 + + scripts/{basic => }/docproc.c | 0 + scripts/gen_initramfs_list.sh | 27 ++++++---- + scripts/kallsyms.c | 2 + + scripts/kconfig/Makefile | 38 ++++++++----- + scripts/kconfig/confdata.c | 8 +-- + scripts/kconfig/expr.h | 4 -- + scripts/kconfig/lex.zconf.c_shipped | 33 +++++++----- + scripts/kconfig/nconf.c | 14 +++--- + scripts/kconfig/zconf.l | 33 +++++++----- + scripts/mkcompile_h | 30 +++++------ + scripts/package/Makefile | 2 +- + scripts/package/mkspec | 2 +- + scripts/patch-kernel | 2 +- + usr/gen_init_cpio.c | 53 ++++++++++++++----- + 61 files changed, 434 insertions(+), 217 deletions(-) + create mode 100644 scripts/Makefile.asm-generic + rename scripts/{basic => }/docproc.c (100%) +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/core/cma.c | 207 +++++++++++++++++++--------- + drivers/infiniband/core/iwcm.c | 2 +- + drivers/infiniband/core/ucma.c | 7 + + drivers/infiniband/hw/cxgb4/cm.c | 46 ++----- + drivers/infiniband/hw/cxgb4/device.c | 115 +++++++++------- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 36 ++++-- + drivers/infiniband/hw/cxgb4/provider.c | 2 - + drivers/infiniband/hw/cxgb4/qp.c | 3 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 9 +- + drivers/infiniband/hw/nes/nes_cm.c | 16 +- + drivers/infiniband/hw/nes/nes_verbs.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 3 +- + drivers/infiniband/hw/qib/qib_pcie.c | 5 +- + include/rdma/iw_cm.h | 11 +-- + include/rdma/rdma_cm.h | 10 ++ + include/rdma/rdma_user_cm.h | 5 +- + 16 files changed, 278 insertions(+), 201 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging cpupowerutils/master +$ git merge cpupowerutils/master +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by recursive. + CREDITS | 17 +- + MAINTAINERS | 6 + + tools/power/cpupower/.gitignore | 22 + + tools/power/cpupower/Makefile | 279 ++++++ + tools/power/cpupower/README | 49 + + tools/power/cpupower/ToDo | 11 + + tools/power/cpupower/bench/Makefile | 29 + + tools/power/cpupower/bench/README-BENCH | 124 +++ + tools/power/cpupower/bench/benchmark.c | 194 ++++ + tools/power/cpupower/bench/benchmark.h | 29 + + tools/power/cpupower/bench/config.h | 36 + + tools/power/cpupower/bench/cpufreq-bench_plot.sh | 104 +++ + tools/power/cpupower/bench/cpufreq-bench_script.sh | 101 ++ + tools/power/cpupower/bench/example.cfg | 11 + + tools/power/cpupower/bench/main.c | 202 ++++ + tools/power/cpupower/bench/parse.c | 225 +++++ + tools/power/cpupower/bench/parse.h | 53 ++ + tools/power/cpupower/bench/system.c | 191 ++++ + tools/power/cpupower/bench/system.h | 29 + + tools/power/cpupower/debug/i386/Makefile | 20 + + tools/power/cpupower/debug/i386/centrino-decode.c | 113 +++ + tools/power/cpupower/debug/i386/dump_psb.c | 196 ++++ + tools/power/cpupower/debug/i386/intel_gsic.c | 78 ++ + .../power/cpupower/debug/i386/powernow-k8-decode.c | 96 ++ + tools/power/cpupower/debug/kernel/Makefile | 23 + + .../power/cpupower/debug/kernel/cpufreq-test_tsc.c | 113 +++ + tools/power/cpupower/debug/x86_64/Makefile | 14 + + .../power/cpupower/debug/x86_64/centrino-decode.c | 1 + + .../cpupower/debug/x86_64/powernow-k8-decode.c | 1 + + tools/power/cpupower/lib/cpufreq.c | 208 +++++ + tools/power/cpupower/lib/cpufreq.h | 223 +++++ + tools/power/cpupower/lib/sysfs.c | 672 ++++++++++++++ + tools/power/cpupower/lib/sysfs.h | 31 + + tools/power/cpupower/man/cpupower-frequency-info.1 | 76 ++ + tools/power/cpupower/man/cpupower-frequency-set.1 | 54 ++ + tools/power/cpupower/man/cpupower-info.1 | 19 + + tools/power/cpupower/man/cpupower-monitor.1 | 179 ++++ + tools/power/cpupower/man/cpupower-set.1 | 103 +++ + tools/power/cpupower/man/cpupower.1 | 72 ++ + tools/power/cpupower/po/cs.po | 944 +++++++++++++++++++ + tools/power/cpupower/po/de.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/fr.po | 947 +++++++++++++++++++ + tools/power/cpupower/po/it.po | 961 ++++++++++++++++++++ + tools/power/cpupower/po/pt.po | 957 +++++++++++++++++++ + tools/power/cpupower/utils/builtin.h | 18 + + tools/power/cpupower/utils/cpufreq-info.c | 678 ++++++++++++++ + tools/power/cpupower/utils/cpufreq-set.c | 358 ++++++++ + tools/power/cpupower/utils/cpuidle-info.c | 244 +++++ + tools/power/cpupower/utils/cpupower-info.c | 153 ++++ + tools/power/cpupower/utils/cpupower-set.c | 153 ++++ + tools/power/cpupower/utils/cpupower.c | 203 ++++ + tools/power/cpupower/utils/helpers/amd.c | 137 +++ + tools/power/cpupower/utils/helpers/bitmask.c | 292 ++++++ + tools/power/cpupower/utils/helpers/bitmask.h | 33 + + tools/power/cpupower/utils/helpers/cpuid.c | 143 +++ + tools/power/cpupower/utils/helpers/helpers.h | 180 ++++ + tools/power/cpupower/utils/helpers/misc.c | 35 + + tools/power/cpupower/utils/helpers/msr.c | 122 +++ + tools/power/cpupower/utils/helpers/pci.c | 44 + + tools/power/cpupower/utils/helpers/sysfs.c | 358 ++++++++ + tools/power/cpupower/utils/helpers/sysfs.h | 28 + + tools/power/cpupower/utils/helpers/topology.c | 108 +++ + .../cpupower/utils/idle_monitor/amd_fam14h_idle.c | 338 +++++++ + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 196 ++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 448 +++++++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 68 ++ + .../cpupower/utils/idle_monitor/idle_monitors.def | 7 + + .../cpupower/utils/idle_monitor/idle_monitors.h | 18 + + .../cpupower/utils/idle_monitor/mperf_monitor.c | 255 ++++++ + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 216 +++++ + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 190 ++++ + tools/power/cpupower/utils/version-gen.sh | 35 + + 72 files changed, 13831 insertions(+), 1 deletions(-) + create mode 100644 tools/power/cpupower/.gitignore + create mode 100644 tools/power/cpupower/Makefile + create mode 100644 tools/power/cpupower/README + create mode 100644 tools/power/cpupower/ToDo + create mode 100644 tools/power/cpupower/bench/Makefile + create mode 100644 tools/power/cpupower/bench/README-BENCH + create mode 100644 tools/power/cpupower/bench/benchmark.c + create mode 100644 tools/power/cpupower/bench/benchmark.h + create mode 100644 tools/power/cpupower/bench/config.h + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_plot.sh + create mode 100644 tools/power/cpupower/bench/cpufreq-bench_script.sh + create mode 100644 tools/power/cpupower/bench/example.cfg + create mode 100644 tools/power/cpupower/bench/main.c + create mode 100644 tools/power/cpupower/bench/parse.c + create mode 100644 tools/power/cpupower/bench/parse.h + create mode 100644 tools/power/cpupower/bench/system.c + create mode 100644 tools/power/cpupower/bench/system.h + create mode 100644 tools/power/cpupower/debug/i386/Makefile + create mode 100644 tools/power/cpupower/debug/i386/centrino-decode.c + create mode 100644 tools/power/cpupower/debug/i386/dump_psb.c + create mode 100644 tools/power/cpupower/debug/i386/intel_gsic.c + create mode 100644 tools/power/cpupower/debug/i386/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/debug/kernel/Makefile + create mode 100644 tools/power/cpupower/debug/kernel/cpufreq-test_tsc.c + create mode 100644 tools/power/cpupower/debug/x86_64/Makefile + create mode 120000 tools/power/cpupower/debug/x86_64/centrino-decode.c + create mode 120000 tools/power/cpupower/debug/x86_64/powernow-k8-decode.c + create mode 100644 tools/power/cpupower/lib/cpufreq.c + create mode 100644 tools/power/cpupower/lib/cpufreq.h + create mode 100644 tools/power/cpupower/lib/sysfs.c + create mode 100644 tools/power/cpupower/lib/sysfs.h + create mode 100644 tools/power/cpupower/man/cpupower-frequency-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-frequency-set.1 + create mode 100644 tools/power/cpupower/man/cpupower-info.1 + create mode 100644 tools/power/cpupower/man/cpupower-monitor.1 + create mode 100644 tools/power/cpupower/man/cpupower-set.1 + create mode 100644 tools/power/cpupower/man/cpupower.1 + create mode 100644 tools/power/cpupower/po/cs.po + create mode 100644 tools/power/cpupower/po/de.po + create mode 100644 tools/power/cpupower/po/fr.po + create mode 100644 tools/power/cpupower/po/it.po + create mode 100644 tools/power/cpupower/po/pt.po + create mode 100644 tools/power/cpupower/utils/builtin.h + create mode 100644 tools/power/cpupower/utils/cpufreq-info.c + create mode 100644 tools/power/cpupower/utils/cpufreq-set.c + create mode 100644 tools/power/cpupower/utils/cpuidle-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-info.c + create mode 100644 tools/power/cpupower/utils/cpupower-set.c + create mode 100644 tools/power/cpupower/utils/cpupower.c + create mode 100644 tools/power/cpupower/utils/helpers/amd.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.c + create mode 100644 tools/power/cpupower/utils/helpers/bitmask.h + create mode 100644 tools/power/cpupower/utils/helpers/cpuid.c + create mode 100644 tools/power/cpupower/utils/helpers/helpers.h + create mode 100644 tools/power/cpupower/utils/helpers/misc.c + create mode 100644 tools/power/cpupower/utils/helpers/msr.c + create mode 100644 tools/power/cpupower/utils/helpers/pci.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.c + create mode 100644 tools/power/cpupower/utils/helpers/sysfs.h + create mode 100644 tools/power/cpupower/utils/helpers/topology.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/amd_fam14h_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.def + create mode 100644 tools/power/cpupower/utils/idle_monitor/idle_monitors.h + create mode 100644 tools/power/cpupower/utils/idle_monitor/mperf_monitor.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/nhm_idle.c + create mode 100644 tools/power/cpupower/utils/idle_monitor/snb_idle.c + create mode 100755 tools/power/cpupower/utils/version-gen.sh +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-card.c | 27 +++++++----- + drivers/firewire/core-cdev.c | 7 +-- + drivers/firewire/core-device.c | 31 +++++++++----- + drivers/firewire/core-iso.c | 27 ++++++++----- + drivers/firewire/core-transaction.c | 19 +++++++-- + drivers/firewire/core.h | 2 + + drivers/firewire/net.c | 4 +- + drivers/firewire/ohci.c | 64 +++++++++++++++++++---------- + drivers/firewire/sbp2.c | 37 +++++------------ + drivers/media/dvb/firewire/firedtv-avc.c | 15 +------ + drivers/media/dvb/firewire/firedtv-fw.c | 1 + + include/linux/firewire.h | 6 ++- + sound/firewire/amdtp.c | 1 + + sound/firewire/cmp.c | 3 +- + sound/firewire/iso-resources.c | 12 +---- + sound/firewire/iso-resources.h | 1 - + 16 files changed, 140 insertions(+), 117 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/cdev.c | 14 +++++++------- + drivers/mtd/ubi/debug.c | 18 +++++++++--------- + drivers/mtd/ubi/io.c | 6 +++--- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/ubi-media.h | 6 +++--- + drivers/mtd/ubi/ubi.h | 4 ++-- + drivers/mtd/ubi/wl.c | 3 ++- + include/linux/mtd/ubi.h | 4 ++-- + include/mtd/ubi-user.h | 40 +++++++++++++++++++++------------------- + 9 files changed, 50 insertions(+), 47 deletions(-) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/user.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Merge made by recursive. + drivers/firmware/iscsi_ibft_find.c | 51 ++++++++++++++++++++++------------- + 1 files changed, 32 insertions(+), 19 deletions(-) +Merging scsi/master +$ git merge scsi/master +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/in2000.c +Auto-merging drivers/scsi/mpt2sas/mpt2sas_ctl.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging drivers/scsi/wd33c93.c +Merge made by recursive. + Documentation/scsi/LICENSE.qla2xxx | 292 +++++++++- + MAINTAINERS | 4 +- + drivers/message/fusion/mptbase.h | 4 +- + drivers/message/fusion/mptscsih.c | 13 +- + drivers/message/fusion/mptspi.c | 22 + + drivers/message/i2o/i2o_scsi.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 138 ++--- + drivers/scsi/be2iscsi/be.h | 10 +- + drivers/scsi/be2iscsi/be_cmds.c | 11 +- + drivers/scsi/be2iscsi/be_cmds.h | 10 +- + drivers/scsi/be2iscsi/be_iscsi.c | 13 +- + drivers/scsi/be2iscsi/be_iscsi.h | 13 +- + drivers/scsi/be2iscsi/be_main.c | 51 +- + drivers/scsi/be2iscsi/be_main.h | 15 +- + drivers/scsi/be2iscsi/be_mgmt.c | 17 +- + drivers/scsi/be2iscsi/be_mgmt.h | 13 +- + drivers/scsi/bfa/bfad.c | 61 ++- + drivers/scsi/bfa/bfad_debugfs.c | 33 +- + drivers/scsi/bfa/bfad_im.h | 25 - + drivers/scsi/bnx2fc/bnx2fc.h | 2 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 35 +- + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 3 + + drivers/scsi/bnx2fc/bnx2fc_io.c | 6 + + drivers/scsi/constants.c | 1 + + drivers/scsi/dc395x.c | 193 +++--- + drivers/scsi/device_handler/scsi_dh_alua.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 72 ++- + drivers/scsi/dpt_i2o.c | 6 +- + drivers/scsi/eata.c | 66 +- + drivers/scsi/eata_pio.c | 19 +- + drivers/scsi/esp_scsi.c | 6 +- + drivers/scsi/fcoe/fcoe.c | 202 ++---- + drivers/scsi/fcoe/fcoe_ctlr.c | 6 +- + drivers/scsi/fcoe/fcoe_transport.c | 56 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 3 +- + drivers/scsi/in2000.c | 29 +- + drivers/scsi/ipr.c | 155 ++++-- + drivers/scsi/ipr.h | 22 +- + drivers/scsi/libfc/fc_fcp.c | 57 +- + drivers/scsi/libfc/fc_lport.c | 1 - + drivers/scsi/lpfc/lpfc.h | 2 + + drivers/scsi/lpfc/lpfc_bsg.c | 59 +- + drivers/scsi/lpfc/lpfc_bsg.h | 130 ++++ + drivers/scsi/lpfc/lpfc_debugfs.c | 931 +++++++++++++++++++++------- + drivers/scsi/lpfc/lpfc_debugfs.h | 48 ++- + drivers/scsi/lpfc/lpfc_els.c | 44 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- + drivers/scsi/lpfc/lpfc_hw4.h | 18 +- + drivers/scsi/lpfc/lpfc_init.c | 19 +- + drivers/scsi/lpfc/lpfc_mbox.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 14 +- + drivers/scsi/lpfc/lpfc_sli.c | 32 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid.c | 20 +- + drivers/scsi/megaraid/megaraid_mbox.c | 37 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 13 +- + drivers/scsi/mesh.c | 3 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 42 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 49 ++- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 5 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 1 + + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 617 +++++++++++++++++-- + drivers/scsi/mvsas/Kconfig | 1 + + drivers/scsi/mvsas/Makefile | 1 + + drivers/scsi/mvsas/mv_64xx.c | 1 + + drivers/scsi/mvsas/mv_64xx.h | 1 + + drivers/scsi/mvsas/mv_94xx.c | 1 + + drivers/scsi/mvsas/mv_94xx.h | 1 + + drivers/scsi/mvsas/mv_chips.h | 1 + + drivers/scsi/mvsas/mv_defs.h | 3 + + drivers/scsi/mvsas/mv_init.c | 67 ++- + drivers/scsi/mvsas/mv_sas.c | 385 ++++++++---- + drivers/scsi/mvsas/mv_sas.h | 8 + + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_bsg.c | 2 +- + drivers/scsi/qla2xxx/qla_bsg.h | 2 +- + drivers/scsi/qla2xxx/qla_dbg.c | 2 +- + drivers/scsi/qla2xxx/qla_dbg.h | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 10 +- + drivers/scsi/qla2xxx/qla_dfs.c | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla2xxx/qla_gbl.h | 5 +- + drivers/scsi/qla2xxx/qla_gs.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 45 +- + drivers/scsi/qla2xxx/qla_inline.h | 21 +- + drivers/scsi/qla2xxx/qla_iocb.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 43 +- + drivers/scsi/qla2xxx/qla_mbx.c | 24 +- + drivers/scsi/qla2xxx/qla_mid.c | 4 +- + drivers/scsi/qla2xxx/qla_nx.c | 59 ++- + drivers/scsi/qla2xxx/qla_nx.h | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 43 ++- + drivers/scsi/qla2xxx/qla_settings.h | 2 +- + drivers/scsi/qla2xxx/qla_sup.c | 2 +- + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/scsi/qla4xxx/ql4_os.c | 5 +- + drivers/scsi/scsi_error.c | 6 + + drivers/scsi/scsi_proc.c | 58 ++- + drivers/scsi/scsi_tgt_lib.c | 6 +- + drivers/scsi/scsi_transport_fc.c | 11 +- + drivers/scsi/tmscsim.c | 22 +- + drivers/scsi/u14-34f.c | 61 +- + drivers/scsi/wd33c93.c | 45 +- + drivers/usb/storage/isd200.c | 1 - + 106 files changed, 3333 insertions(+), 1427 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Removing drivers/isdn/capi/capifs.c +Removing drivers/isdn/capi/capifs.h +Auto-merging drivers/net/arm/etherh.c +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/sfc/nic.h +Auto-merging drivers/net/sfc/siena.c +Auto-merging drivers/net/tile/tilepro.c +Removing drivers/net/wireless/ath/ar9170/Kconfig +Removing drivers/net/wireless/ath/ar9170/Makefile +Removing drivers/net/wireless/ath/ar9170/ar9170.h +Removing drivers/net/wireless/ath/ar9170/cmd.c +Removing drivers/net/wireless/ath/ar9170/cmd.h +Removing drivers/net/wireless/ath/ar9170/eeprom.h +Removing drivers/net/wireless/ath/ar9170/hw.h +Removing drivers/net/wireless/ath/ar9170/led.c +Removing drivers/net/wireless/ath/ar9170/mac.c +Removing drivers/net/wireless/ath/ar9170/main.c +Removing drivers/net/wireless/ath/ar9170/phy.c +Removing drivers/net/wireless/ath/ar9170/usb.c +Removing drivers/net/wireless/ath/ar9170/usb.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-core.c +Auto-merging drivers/net/wireless/iwlegacy/iwl-dev.h +Removing drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c +Removing drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h +Removing drivers/net/wireless/iwlwifi/iwl-agn-led.c +Removing drivers/net/wireless/iwlwifi/iwl-agn-led.h +Removing drivers/net/wireless/iwlwifi/iwl-spectrum.h +Auto-merging drivers/net/wireless/libertas/cmd.c +Removing drivers/net/wireless/rt2x00/rt2x00ht.c +Auto-merging drivers/scsi/bnx2fc/bnx2fc_fcoe.c +Auto-merging drivers/scsi/fcoe/fcoe.c +Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex +Auto-merging include/linux/ssb/ssb.h +Auto-merging net/9p/client.c +Auto-merging net/bluetooth/hidp/hidp.h +Auto-merging net/l2tp/l2tp_ip.c +Auto-merging net/mac80211/tx.c +Auto-merging net/sctp/ulpevent.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 21 - + Documentation/networking/batman-adv.txt | 11 +- + Documentation/networking/bonding.txt | 34 +- + Documentation/networking/igb.txt | 13 + + Documentation/sysctl/net.txt | 11 + + MAINTAINERS | 14 +- + arch/mips/txx9/generic/setup_tx4939.c | 21 +- + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 3 +- + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/Kbuild | 1 + + arch/x86/Kconfig | 1 + + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/x86/net/Makefile | 4 + + arch/x86/net/bpf_jit.S | 140 + + arch/x86/net/bpf_jit_comp.c | 654 + + drivers/atm/eni.c | 5 - + drivers/atm/he.c | 4 +- + drivers/atm/idt77252.c | 52 +- + drivers/atm/iphase.c | 14 +- + drivers/atm/solos-pci.c | 3 +- + drivers/bluetooth/Kconfig | 4 +- + drivers/bluetooth/ath3k.c | 3 - + drivers/bluetooth/btmrvl_sdio.c | 124 +- + drivers/bluetooth/btmrvl_sdio.h | 68 +- + drivers/bluetooth/hci_ath.c | 7 +- + drivers/bluetooth/hci_h4.c | 7 +- + drivers/bluetooth/hci_ldisc.c | 6 +- + drivers/ieee802154/fakehard.c | 10 - + drivers/infiniband/core/addr.c | 9 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 3 +- + drivers/infiniband/hw/nes/nes_hw.c | 5 +- + drivers/infiniband/hw/nes/nes_hw.h | 1 - + drivers/infiniband/hw/nes/nes_nic.c | 59 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 1 - + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 11 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 28 - + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 24 +- + drivers/isdn/capi/Kconfig | 15 - + drivers/isdn/capi/Makefile | 1 - + drivers/isdn/capi/capi.c | 24 +- + drivers/isdn/capi/capifs.c | 239 - + drivers/isdn/capi/capifs.h | 28 - + drivers/isdn/gigaset/bas-gigaset.c | 5 - + drivers/isdn/gigaset/ev-layer.c | 26 +- + drivers/isdn/hardware/eicon/debug.c | 3 +- + drivers/isdn/hardware/eicon/message.c | 23 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 5 +- + drivers/isdn/hisax/arcofi.c | 4 +- + drivers/isdn/hisax/elsa_cs.c | 2 - + drivers/isdn/hisax/elsa_ser.c | 3 +- + drivers/isdn/hisax/hfc_usb.c | 6 +- + drivers/isdn/hisax/ipacx.c | 4 +- + drivers/isdn/hisax/jade.c | 3 +- + drivers/isdn/hisax/l3dss1.c | 4 +- + drivers/isdn/hisax/l3ni1.c | 4 +- + drivers/isdn/hisax/teles_cs.c | 2 - + drivers/isdn/hysdn/hysdn_proclog.c | 11 +- + drivers/isdn/i4l/isdn_common.c | 11 +- + drivers/isdn/i4l/isdn_net.c | 2 - + drivers/isdn/i4l/isdn_tty.c | 2 - + drivers/isdn/mISDN/layer2.c | 20 +- + drivers/isdn/mISDN/socket.c | 3 + + drivers/net/3c509.c | 16 +- + drivers/net/3c59x.c | 4 +- + drivers/net/8139cp.c | 46 +- + drivers/net/acenic.c | 12 +- + drivers/net/arm/etherh.c | 5 +- + drivers/net/arm/ks8695net.c | 7 +- + drivers/net/atl1c/atl1c_ethtool.c | 17 +- + drivers/net/atl1c/atl1c_main.c | 25 +- + drivers/net/atl1e/atl1e_ethtool.c | 7 +- + drivers/net/atl1e/atl1e_main.c | 14 +- + drivers/net/atlx/atl1.c | 29 +- + drivers/net/atlx/atl2.c | 18 +- + drivers/net/b44.c | 13 +- + drivers/net/bcm63xx_enet.c | 7 +- + drivers/net/benet/be.h | 31 +- + drivers/net/benet/be_cmds.c | 116 +- + drivers/net/benet/be_cmds.h | 23 +- + drivers/net/benet/be_ethtool.c | 119 +- + drivers/net/benet/be_hw.h | 4 + + drivers/net/benet/be_main.c | 207 +- + drivers/net/bna/bfa_ioc.c | 13 +- + drivers/net/bna/bna_ctrl.c | 21 - + drivers/net/bna/bna_txrx.c | 7 +- + drivers/net/bna/bnad.c | 22 +- + drivers/net/bna/bnad.h | 2 - + drivers/net/bna/bnad_ethtool.c | 70 +- + drivers/net/bnx2.c | 184 +- + drivers/net/bnx2.h | 3 +- + drivers/net/bnx2x/bnx2x.h | 31 +- + drivers/net/bnx2x/bnx2x_cmn.c | 627 +- + drivers/net/bnx2x/bnx2x_cmn.h | 454 +- + drivers/net/bnx2x/bnx2x_dcb.c | 50 +- + drivers/net/bnx2x/bnx2x_dcb.h | 16 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 167 +- + drivers/net/bnx2x/bnx2x_fw_defs.h | 2 +- + drivers/net/bnx2x/bnx2x_fw_file_hdr.h | 2 +- + drivers/net/bnx2x/bnx2x_hsi.h | 4 +- + drivers/net/bnx2x/bnx2x_init.h | 2 +- + drivers/net/bnx2x/bnx2x_init_ops.h | 2 +- + drivers/net/bnx2x/bnx2x_link.c | 14 +- + drivers/net/bnx2x/bnx2x_main.c | 359 +- + drivers/net/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/bnx2x/bnx2x_stats.c | 2 +- + drivers/net/bnx2x/bnx2x_stats.h | 2 +- + drivers/net/bonding/Makefile | 3 - + drivers/net/bonding/bond_3ad.c | 43 +- + drivers/net/bonding/bond_3ad.h | 4 +- + drivers/net/bonding/bond_alb.c | 57 +- + drivers/net/bonding/bond_alb.h | 1 - + drivers/net/bonding/bond_main.c | 530 +- + drivers/net/bonding/bond_procfs.c | 2 - + drivers/net/bonding/bond_sysfs.c | 84 +- + drivers/net/bonding/bonding.h | 46 +- + drivers/net/cassini.c | 37 +- + drivers/net/chelsio/common.h | 5 - + drivers/net/chelsio/cxgb2.c | 59 +- + drivers/net/chelsio/sge.c | 13 +- + drivers/net/chelsio/tp.c | 5 - + drivers/net/chelsio/tp.h | 1 - + drivers/net/cnic.c | 62 +- + drivers/net/cnic.h | 1 + + drivers/net/cnic_if.h | 6 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cxgb3/adapter.h | 7 - + drivers/net/cxgb3/common.h | 1 - + drivers/net/cxgb3/cxgb3_main.c | 117 +- + drivers/net/cxgb3/sge.c | 7 +- + drivers/net/cxgb4/cxgb4.h | 6 - + drivers/net/cxgb4/cxgb4_main.c | 103 +- + drivers/net/cxgb4/sge.c | 4 +- + drivers/net/cxgb4vf/adapter.h | 6 - + drivers/net/cxgb4vf/cxgb4vf_main.c | 73 +- + drivers/net/cxgb4vf/sge.c | 4 +- + drivers/net/depca.c | 35 +- + drivers/net/dl2k.c | 29 +- + drivers/net/dm9000.c | 57 +- + drivers/net/dummy.c | 4 - + drivers/net/e100.c | 78 +- + drivers/net/e1000/e1000.h | 5 +- + drivers/net/e1000/e1000_ethtool.c | 60 +- + drivers/net/e1000/e1000_main.c | 42 +- + drivers/net/e1000e/82571.c | 22 +- + drivers/net/e1000e/e1000.h | 12 +- + drivers/net/e1000e/es2lan.c | 5 +- + drivers/net/e1000e/ethtool.c | 154 +- + drivers/net/e1000e/hw.h | 1 + + drivers/net/e1000e/ich8lan.c | 16 +- + drivers/net/e1000e/lib.c | 14 +- + drivers/net/e1000e/netdev.c | 213 +- + drivers/net/e1000e/phy.c | 4 +- + drivers/net/eepro.c | 2 +- + drivers/net/ehea/ehea_ethtool.c | 46 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/enc28j60.c | 5 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 5 +- + drivers/net/enic/enic_dev.c | 62 +- + drivers/net/enic/enic_dev.h | 7 +- + drivers/net/enic/enic_main.c | 274 +- + drivers/net/enic/enic_pp.c | 264 + + drivers/net/enic/enic_pp.h | 27 + + drivers/net/enic/enic_res.c | 4 +- + drivers/net/enic/vnic_dev.c | 97 +- + drivers/net/enic/vnic_dev.h | 6 +- + drivers/net/enic/vnic_devcmd.h | 57 +- + drivers/net/enic/vnic_vic.c | 5 +- + drivers/net/enic/vnic_vic.h | 13 +- + drivers/net/ewrk3.c | 58 +- + drivers/net/forcedeth.c | 113 +- + drivers/net/fs_enet/fs_enet-main.c | 2 - + drivers/net/gianfar.c | 16 +- + drivers/net/gianfar.h | 20 +- + drivers/net/gianfar_ethtool.c | 110 +- + drivers/net/greth.c | 46 +- + drivers/net/greth.h | 4 - + drivers/net/hamachi.c | 78 - + drivers/net/hamradio/bpqether.c | 4 - + drivers/net/hp100.c | 12 +- + drivers/net/ibm_newemac/core.c | 17 +- + drivers/net/ibmlana.c | 7 +- + drivers/net/ibmveth.c | 98 +- + drivers/net/ifb.c | 4 - + drivers/net/igb/e1000_82575.c | 11 +- + drivers/net/igb/igb.h | 2 +- + drivers/net/igb/igb_ethtool.c | 48 +- + drivers/net/igb/igb_main.c | 90 +- + drivers/net/igbvf/ethtool.c | 14 +- + drivers/net/ioc3-eth.c | 30 +- + drivers/net/irda/smsc-ircc2.c | 44 +- + drivers/net/ixgb/ixgb.h | 3 - + drivers/net/ixgb/ixgb_ethtool.c | 53 +- + drivers/net/ixgbe/ixgbe.h | 1 + + drivers/net/ixgbe/ixgbe_82598.c | 61 +- + drivers/net/ixgbe/ixgbe_82599.c | 175 +- + drivers/net/ixgbe/ixgbe_common.c | 510 +- + drivers/net/ixgbe/ixgbe_common.h | 12 +- + drivers/net/ixgbe/ixgbe_dcb_82598.c | 2 +- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 77 +- + drivers/net/ixgbe/ixgbe_dcb_82599.h | 2 + + drivers/net/ixgbe/ixgbe_dcb_nl.c | 109 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 190 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 4 +- + drivers/net/ixgbe/ixgbe_main.c | 65 +- + drivers/net/ixgbe/ixgbe_mbx.h | 3 - + drivers/net/ixgbe/ixgbe_phy.c | 20 +- + drivers/net/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ixgbe/ixgbe_type.h | 216 +- + drivers/net/ixgbe/ixgbe_x540.c | 317 +- + drivers/net/ixgbevf/ethtool.c | 8 +- + drivers/net/jme.c | 80 +- + drivers/net/jme.h | 2 - + drivers/net/ksz884x.c | 82 +- + drivers/net/loopback.c | 3 +- + drivers/net/macb.c | 11 +- + drivers/net/macvlan.c | 21 +- + drivers/net/mdio.c | 23 +- + drivers/net/mii.c | 31 +- + drivers/net/mlx4/en_ethtool.c | 49 +- + drivers/net/mlx4/en_netdev.c | 26 +- + drivers/net/mlx4/en_rx.c | 2 +- + drivers/net/mlx4/mlx4_en.h | 1 - + drivers/net/mv643xx_eth.c | 34 +- + drivers/net/myri10ge/myri10ge.c | 68 +- + drivers/net/natsemi.c | 11 +- + drivers/net/ne3210.c | 15 +- + drivers/net/netconsole.c | 82 +- + drivers/net/netxen/netxen_nic.h | 2 +- + drivers/net/netxen/netxen_nic_ethtool.c | 117 +- + drivers/net/netxen/netxen_nic_init.c | 3 +- + drivers/net/netxen/netxen_nic_main.c | 55 +- + drivers/net/niu.c | 63 +- + drivers/net/niu.h | 1 + + drivers/net/ns83820.c | 8 +- + drivers/net/pch_gbe/pch_gbe.h | 4 - + drivers/net/pch_gbe/pch_gbe_ethtool.c | 65 +- + drivers/net/pch_gbe/pch_gbe_main.c | 48 +- + drivers/net/pch_gbe/pch_gbe_param.c | 16 +- + drivers/net/pch_gbe/pch_gbe_phy.c | 4 +- + drivers/net/pcmcia/smc91c92_cs.c | 6 +- + drivers/net/pcnet32.c | 90 +- + drivers/net/phy/phy.c | 12 +- + drivers/net/pptp.c | 10 +- + drivers/net/ps3_gelic_net.c | 34 +- + drivers/net/ps3_gelic_net.h | 3 - + drivers/net/ps3_gelic_wireless.c | 4 - + drivers/net/qla3xxx.c | 4 +- + drivers/net/qlcnic/qlcnic.h | 240 +- + drivers/net/qlcnic/qlcnic_ctx.c | 159 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 348 +- + drivers/net/qlcnic/qlcnic_hw.c | 119 +- + drivers/net/qlcnic/qlcnic_init.c | 62 +- + drivers/net/qlcnic/qlcnic_main.c | 621 +- + drivers/net/qlge/qlge.h | 2 +- + drivers/net/qlge/qlge_ethtool.c | 74 +- + drivers/net/qlge/qlge_main.c | 25 +- + drivers/net/r8169.c | 1006 +- + drivers/net/s2io.c | 197 +- + drivers/net/s2io.h | 13 +- + drivers/net/sc92031.c | 8 +- + drivers/net/sfc/efx.c | 26 +- + drivers/net/sfc/ethtool.c | 111 +- + drivers/net/sfc/falcon.c | 4 +- + drivers/net/sfc/falcon_xmac.c | 2 +- + drivers/net/sfc/mac.h | 4 +- + drivers/net/sfc/mcdi_mac.c | 2 +- + drivers/net/sfc/mcdi_phy.c | 8 +- + drivers/net/sfc/mdio_10g.c | 4 +- + drivers/net/sfc/net_driver.h | 8 +- + drivers/net/sfc/nic.c | 6 +- + drivers/net/sfc/nic.h | 6 +- + drivers/net/sfc/phy.h | 8 +- + drivers/net/sfc/qt202x_phy.c | 2 +- + drivers/net/sfc/rx.c | 3 + + drivers/net/sfc/siena.c | 2 +- + drivers/net/sfc/tenxpress.c | 4 +- + drivers/net/sfc/txc43128_phy.c | 2 +- + drivers/net/skge.c | 93 +- + drivers/net/skge.h | 1 - + drivers/net/sky2.c | 195 +- + drivers/net/sky2.h | 1 - + drivers/net/smc-mca.c | 6 +- + drivers/net/smc911x.c | 4 +- + drivers/net/smc91x.c | 4 +- + drivers/net/smsc911x.c | 448 +- + drivers/net/smsc911x.h | 22 +- + drivers/net/spider_net.c | 15 +- + drivers/net/spider_net.h | 7 - + drivers/net/spider_net_ethtool.c | 23 +- + drivers/net/stmmac/dwmac1000_core.c | 5 +- + drivers/net/stmmac/stmmac.h | 1 - + drivers/net/stmmac/stmmac_ethtool.c | 23 +- + drivers/net/stmmac/stmmac_main.c | 86 +- + drivers/net/sungem.c | 18 +- + drivers/net/sunhme.c | 25 +- + drivers/net/tehuti.c | 28 +- + drivers/net/tg3.c | 2901 +++-- + drivers/net/tg3.h | 267 +- + drivers/net/tile/tilepro.c | 2 +- + drivers/net/tokenring/madgemc.c | 2 +- + drivers/net/tulip/21142.c | 14 +- + drivers/net/tulip/Makefile | 2 + + drivers/net/tulip/de2104x.c | 183 +- + drivers/net/tulip/de4x5.c | 4 +- + drivers/net/tulip/dmfe.c | 9 +- + drivers/net/tulip/eeprom.c | 4 +- + drivers/net/tulip/interrupt.c | 48 +- + drivers/net/tulip/media.c | 49 +- + drivers/net/tulip/pnic.c | 22 +- + drivers/net/tulip/pnic2.c | 16 +- + drivers/net/tulip/timer.c | 47 +- + drivers/net/tulip/tulip.h | 8 +- + drivers/net/tulip/tulip_core.c | 50 +- + drivers/net/tulip/uli526x.c | 71 +- + drivers/net/tulip/winbond-840.c | 81 +- + drivers/net/tulip/xircom_cb.c | 268 +- + drivers/net/tun.c | 69 +- + drivers/net/typhoon.c | 58 +- + drivers/net/ucc_geth_ethtool.c | 1 - + drivers/net/usb/Kconfig | 2 +- + drivers/net/usb/asix.c | 28 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/cdc_ncm.c | 13 +- + drivers/net/usb/dm9601.c | 6 +- + drivers/net/usb/plusb.c | 32 +- + drivers/net/usb/rndis_host.c | 39 +- + drivers/net/usb/rtl8150.c | 11 +- + drivers/net/usb/smsc75xx.c | 131 +- + drivers/net/usb/smsc95xx.c | 90 +- + drivers/net/usb/usbnet.c | 6 +- + drivers/net/veth.c | 47 +- + drivers/net/via-rhine.c | 242 +- + drivers/net/via-velocity.c | 28 +- + drivers/net/virtio_net.c | 46 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 43 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 71 +- + drivers/net/vmxnet3/vmxnet3_int.h | 11 +- + drivers/net/vxge/vxge-config.c | 48 +- + drivers/net/vxge/vxge-config.h | 70 +- + drivers/net/vxge/vxge-ethtool.c | 104 +- + drivers/net/vxge/vxge-main.c | 143 +- + drivers/net/vxge/vxge-main.h | 14 +- + drivers/net/vxge/vxge-traffic.h | 2 +- + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/dlci.c | 4 - + drivers/net/wan/hdlc_fr.c | 9 +- + drivers/net/wan/lapbether.c | 4 - + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/Kconfig | 1 - + drivers/net/wireless/ath/Makefile | 1 - + drivers/net/wireless/ath/ar9170/Kconfig | 20 - + drivers/net/wireless/ath/ar9170/Makefile | 3 - + drivers/net/wireless/ath/ar9170/ar9170.h | 258 - + drivers/net/wireless/ath/ar9170/cmd.c | 127 - + drivers/net/wireless/ath/ar9170/cmd.h | 92 - + drivers/net/wireless/ath/ar9170/eeprom.h | 179 - + drivers/net/wireless/ath/ar9170/hw.h | 430 - + drivers/net/wireless/ath/ar9170/led.c | 181 - + drivers/net/wireless/ath/ar9170/mac.c | 519 - + drivers/net/wireless/ath/ar9170/main.c | 2190 --- + drivers/net/wireless/ath/ar9170/phy.c | 1719 --- + drivers/net/wireless/ath/ar9170/usb.c | 1008 -- + drivers/net/wireless/ath/ar9170/usb.h | 82 - + drivers/net/wireless/ath/ath.h | 10 +- + drivers/net/wireless/ath/ath5k/ahb.c | 28 + + drivers/net/wireless/ath/ath5k/ath5k.h | 31 +- + drivers/net/wireless/ath/ath5k/attach.c | 7 +- + drivers/net/wireless/ath/ath5k/base.c | 71 +- + drivers/net/wireless/ath/ath5k/base.h | 7 +- + drivers/net/wireless/ath/ath5k/caps.c | 3 + + drivers/net/wireless/ath/ath5k/debug.c | 65 +- + drivers/net/wireless/ath/ath5k/debug.h | 17 - + drivers/net/wireless/ath/ath5k/desc.c | 158 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 158 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 9 + + drivers/net/wireless/ath/ath5k/pci.c | 32 + + drivers/net/wireless/ath/ath5k/pcu.c | 35 +- + drivers/net/wireless/ath/ath5k/qcu.c | 4 +- + drivers/net/wireless/ath/ath5k/reset.c | 5 + + drivers/net/wireless/ath/ath9k/Kconfig | 21 +- + drivers/net/wireless/ath/ath9k/Makefile | 6 +- + drivers/net/wireless/ath/ath9k/ahb.c | 18 +- + drivers/net/wireless/ath/ath9k/ani.c | 6 - + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 24 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.h | 6 + + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 178 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 387 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 61 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 189 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 24 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 53 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 25 +- + drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 1525 ++ + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 935 +-- + drivers/net/wireless/ath/ath9k/ath9k.h | 28 +- + drivers/net/wireless/ath/ath9k/beacon.c | 223 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 100 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 20 +- + drivers/net/wireless/ath/ath9k/common.c | 33 +- + drivers/net/wireless/ath/ath9k/common.h | 8 - + drivers/net/wireless/ath/ath9k/debug.c | 139 +- + drivers/net/wireless/ath/ath9k/debug.h | 11 + + drivers/net/wireless/ath/ath9k/eeprom.h | 6 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 26 + + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 34 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 11 + + drivers/net/wireless/ath/ath9k/gpio.c | 33 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 334 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 10 +- + drivers/net/wireless/ath/ath9k/htc.h | 296 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 333 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 960 ++ + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 216 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 165 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 415 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 788 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 50 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 25 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 5 +- + drivers/net/wireless/ath/ath9k/hw.c | 368 +- + drivers/net/wireless/ath/ath9k/hw.h | 88 +- + drivers/net/wireless/ath/ath9k/init.c | 55 +- + drivers/net/wireless/ath/ath9k/mac.c | 126 +- + drivers/net/wireless/ath/ath9k/mac.h | 1 - + drivers/net/wireless/ath/ath9k/main.c | 281 +- + drivers/net/wireless/ath/ath9k/phy.h | 18 +- + drivers/net/wireless/ath/ath9k/rc.c | 15 +- + drivers/net/wireless/ath/ath9k/recv.c | 13 +- + drivers/net/wireless/ath/ath9k/reg.h | 135 +- + drivers/net/wireless/ath/ath9k/wmi.c | 126 +- + drivers/net/wireless/ath/ath9k/wmi.h | 82 +- + drivers/net/wireless/ath/ath9k/xmit.c | 163 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 2 + + drivers/net/wireless/ath/carl9170/main.c | 92 +- + drivers/net/wireless/ath/carl9170/tx.c | 157 +- + drivers/net/wireless/ath/key.c | 38 +- + drivers/net/wireless/ath/regd.c | 8 +- + drivers/net/wireless/ath/regd_common.h | 2 + + drivers/net/wireless/b43/phy_n.c | 7 +- + drivers/net/wireless/hostap/hostap_main.c | 7 +- + drivers/net/wireless/iwlegacy/iwl-4965-lib.c | 3 - + drivers/net/wireless/iwlegacy/iwl-4965-rs.c | 1 - + drivers/net/wireless/iwlegacy/iwl-core.c | 20 +- + drivers/net/wireless/iwlegacy/iwl-core.h | 1 - + drivers/net/wireless/iwlegacy/iwl-dev.h | 4 +- + drivers/net/wireless/iwlegacy/iwl-hcmd.c | 4 +- + drivers/net/wireless/iwlegacy/iwl-helpers.h | 6 + + drivers/net/wireless/iwlegacy/iwl-tx.c | 52 +- + drivers/net/wireless/iwlegacy/iwl3945-base.c | 22 +- + drivers/net/wireless/iwlegacy/iwl4965-base.c | 47 +- + drivers/net/wireless/iwlwifi/Makefile | 5 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 59 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 168 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 99 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 135 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 47 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 1073 -- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 70 - + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 52 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 73 - + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 33 - + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 169 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 31 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 274 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 142 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 346 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 1098 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 91 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 812 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 270 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 115 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 43 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1074 ++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 315 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 106 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 195 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 42 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 39 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 294 + + drivers/net/wireless/iwlwifi/iwl-io.h | 498 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 19 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 358 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 375 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 92 - + drivers/net/wireless/iwlwifi/iwl-sta.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 96 +- + drivers/net/wireless/libertas/cfg.c | 45 +- + drivers/net/wireless/libertas/cmd.c | 245 +- + drivers/net/wireless/libertas/cmdresp.c | 19 +- + drivers/net/wireless/libertas/debugfs.c | 36 +- + drivers/net/wireless/libertas/decl.h | 8 +- + drivers/net/wireless/libertas/defs.h | 113 +- + drivers/net/wireless/libertas/dev.h | 20 +- + drivers/net/wireless/libertas/ethtool.c | 3 +- + drivers/net/wireless/libertas/host.h | 33 +- + drivers/net/wireless/libertas/if_cs.c | 35 +- + drivers/net/wireless/libertas/if_spi.c | 199 +- + drivers/net/wireless/libertas/if_spi.h | 68 +- + drivers/net/wireless/libertas/if_usb.c | 113 +- + drivers/net/wireless/libertas/if_usb.h | 14 +- + drivers/net/wireless/libertas/main.c | 99 +- + drivers/net/wireless/libertas/mesh.c | 210 +- + drivers/net/wireless/libertas/mesh.h | 6 +- + drivers/net/wireless/libertas/rx.c | 34 +- + drivers/net/wireless/libertas/tx.c | 34 +- + drivers/net/wireless/libertas/types.h | 18 +- + drivers/net/wireless/mac80211_hwsim.c | 11 +- + drivers/net/wireless/mwifiex/11n.c | 745 + + drivers/net/wireless/mwifiex/11n.h | 161 + + drivers/net/wireless/mwifiex/11n_aggr.c | 422 + + drivers/net/wireless/mwifiex/11n_aggr.h | 32 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 617 + + drivers/net/wireless/mwifiex/11n_rxreorder.h | 65 + + drivers/net/wireless/mwifiex/Kconfig | 21 + + drivers/net/wireless/mwifiex/Makefile | 41 + + drivers/net/wireless/mwifiex/README | 204 + + drivers/net/wireless/mwifiex/cfg80211.c | 1421 ++ + drivers/net/wireless/mwifiex/cfg80211.h | 31 + + drivers/net/wireless/mwifiex/cfp.c | 360 + + drivers/net/wireless/mwifiex/cmdevt.c | 1415 ++ + drivers/net/wireless/mwifiex/debugfs.c | 770 + + drivers/net/wireless/mwifiex/decl.h | 129 + + drivers/net/wireless/mwifiex/fw.h | 1206 ++ + drivers/net/wireless/mwifiex/init.c | 652 + + drivers/net/wireless/mwifiex/ioctl.h | 410 + + drivers/net/wireless/mwifiex/join.c | 1424 ++ + drivers/net/wireless/mwifiex/main.c | 1056 ++ + drivers/net/wireless/mwifiex/main.h | 1008 ++ + drivers/net/wireless/mwifiex/scan.c | 3025 ++++ + drivers/net/wireless/mwifiex/sdio.c | 1753 +++ + drivers/net/wireless/mwifiex/sdio.h | 305 + + drivers/net/wireless/mwifiex/sta_cmd.c | 1219 ++ + drivers/net/wireless/mwifiex/sta_cmdresp.c | 972 ++ + drivers/net/wireless/mwifiex/sta_event.c | 406 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 1605 ++ + drivers/net/wireless/mwifiex/sta_rx.c | 182 + + drivers/net/wireless/mwifiex/sta_tx.c | 198 + + drivers/net/wireless/mwifiex/txrx.c | 200 + + drivers/net/wireless/mwifiex/util.c | 227 + + drivers/net/wireless/mwifiex/util.h | 32 + + drivers/net/wireless/mwifiex/wmm.c | 1231 ++ + drivers/net/wireless/mwifiex/wmm.h | 110 + + drivers/net/wireless/mwl8k.c | 867 +- + drivers/net/wireless/p54/eeprom.c | 2 +- + drivers/net/wireless/p54/fwio.c | 31 + + drivers/net/wireless/p54/lmac.h | 1 + + drivers/net/wireless/p54/main.c | 31 + + drivers/net/wireless/p54/p54.h | 2 + + drivers/net/wireless/rt2x00/Kconfig | 26 +- + drivers/net/wireless/rt2x00/Makefile | 1 - + drivers/net/wireless/rt2x00/rt2400pci.c | 35 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 34 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 91 +- + drivers/net/wireless/rt2x00/rt2800.h | 106 + + drivers/net/wireless/rt2x00/rt2800lib.c | 364 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 1 + + drivers/net/wireless/rt2x00/rt2800pci.c | 267 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 624 +- + drivers/net/wireless/rt2x00/rt2x00.h | 122 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 108 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 43 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 139 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 133 - + drivers/net/wireless/rt2x00/rt2x00lib.h | 57 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 61 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 95 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 19 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 17 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 177 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 34 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 129 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 33 +- + drivers/net/wireless/rt2x00/rt61pci.c | 70 +- + drivers/net/wireless/rt2x00/rt73usb.c | 192 +- + drivers/net/wireless/rtlwifi/base.c | 733 +- + drivers/net/wireless/rtlwifi/base.h | 60 +- + drivers/net/wireless/rtlwifi/cam.c | 106 +- + drivers/net/wireless/rtlwifi/cam.h | 5 +- + drivers/net/wireless/rtlwifi/core.c | 416 +- + drivers/net/wireless/rtlwifi/core.h | 1 + + drivers/net/wireless/rtlwifi/efuse.c | 201 +- + drivers/net/wireless/rtlwifi/efuse.h | 5 +- + drivers/net/wireless/rtlwifi/pci.c | 608 +- + drivers/net/wireless/rtlwifi/pci.h | 19 +- + drivers/net/wireless/rtlwifi/ps.c | 261 +- + drivers/net/wireless/rtlwifi/ps.h | 9 + + drivers/net/wireless/rtlwifi/rc.c | 212 +- + drivers/net/wireless/rtlwifi/rc.h | 9 +- + drivers/net/wireless/rtlwifi/regd.c | 97 +- + drivers/net/wireless/rtlwifi/regd.h | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 525 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 2 + + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 115 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c | 128 +- + drivers/net/wireless/rtlwifi/rtl8192c/phy_common.h | 76 +- + drivers/net/wireless/rtlwifi/rtl8192ce/def.h | 27 - + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 2 + + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 509 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.h | 34 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.c | 19 +- + drivers/net/wireless/rtlwifi/rtl8192ce/led.h | 3 - + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 223 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.h | 55 +- + drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 58 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192ce/rf.h | 17 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 123 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.h | 14 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 180 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 11 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 13 +- + drivers/net/wireless/rtlwifi/rtl8192cu/hw.h | 5 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.c | 14 +- + drivers/net/wireless/rtlwifi/rtl8192cu/phy.h | 14 + + drivers/net/wireless/rtlwifi/rtl8192cu/rf.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/rf.h | 4 + + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 46 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.h | 5 +- + drivers/net/wireless/rtlwifi/usb.c | 19 +- + drivers/net/wireless/rtlwifi/usb.h | 2 + + drivers/net/wireless/rtlwifi/wifi.h | 173 +- + drivers/net/wireless/wl1251/cmd.h | 4 +- + drivers/net/wireless/wl1251/event.c | 6 +- + drivers/net/wireless/wl1251/main.c | 22 +- + drivers/net/wireless/wl1251/ps.c | 23 +- + drivers/net/wireless/wl1251/ps.h | 2 +- + drivers/net/wireless/wl1251/wl1251.h | 9 +- + drivers/net/wireless/wl12xx/Kconfig | 2 +- + drivers/net/wireless/wl12xx/acx.c | 93 +- + drivers/net/wireless/wl12xx/acx.h | 23 +- + drivers/net/wireless/wl12xx/boot.c | 285 +- + drivers/net/wireless/wl12xx/boot.h | 52 + + drivers/net/wireless/wl12xx/cmd.c | 99 +- + drivers/net/wireless/wl12xx/cmd.h | 34 + + drivers/net/wireless/wl12xx/conf.h | 29 +- + drivers/net/wireless/wl12xx/debugfs.c | 2 +- + drivers/net/wireless/wl12xx/event.c | 64 +- + drivers/net/wireless/wl12xx/event.h | 17 +- + drivers/net/wireless/wl12xx/ini.h | 98 +- + drivers/net/wireless/wl12xx/init.c | 51 +- + drivers/net/wireless/wl12xx/init.h | 1 + + drivers/net/wireless/wl12xx/io.c | 11 + + drivers/net/wireless/wl12xx/io.h | 3 + + drivers/net/wireless/wl12xx/main.c | 353 +- + drivers/net/wireless/wl12xx/ps.c | 3 - + drivers/net/wireless/wl12xx/reg.h | 15 +- + drivers/net/wireless/wl12xx/rx.c | 44 +- + drivers/net/wireless/wl12xx/scan.c | 17 +- + drivers/net/wireless/wl12xx/sdio.c | 27 +- + drivers/net/wireless/wl12xx/sdio_test.c | 20 +- + drivers/net/wireless/wl12xx/spi.c | 17 +- + drivers/net/wireless/wl12xx/testmode.c | 6 +- + drivers/net/wireless/wl12xx/tx.c | 234 +- + drivers/net/wireless/wl12xx/tx.h | 60 +- + drivers/net/wireless/wl12xx/wl12xx.h | 66 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 262 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 529 +- + drivers/net/wireless/zd1211rw/zd_rf.h | 2 +- + drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 198 +- + drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 240 +- + drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 78 +- + drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 86 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 4 +- + drivers/net/wireless/zd1211rw/zd_usb.h | 2 +- + drivers/net/xen-netback/common.h | 3 - + drivers/net/xen-netback/interface.c | 84 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/net/xen-netfront.c | 106 +- + drivers/s390/net/netiucv.c | 2 - + drivers/s390/net/qeth_core.h | 7 - + drivers/s390/net/qeth_l3_main.c | 117 +- + drivers/s390/net/qeth_l3_sys.c | 35 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 11 +- + drivers/scsi/cxgbi/libcxgbi.c | 10 +- + drivers/scsi/fcoe/fcoe.c | 11 +- + drivers/ssb/driver_chipcommon.c | 68 +- + drivers/ssb/driver_chipcommon_pmu.c | 2 + + drivers/ssb/driver_pcicore.c | 233 +- + drivers/ssb/main.c | 23 +- + drivers/ssb/scan.c | 2 +- + drivers/staging/hv/netvsc_drv.c | 3 +- + firmware/Makefile | 6 +- + firmware/WHENCE | 9 +- + firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ------------ + firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 ++++++++++++ + firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 ----------------- + firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 +++++++++++++++++ + firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 ------------------- + firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 ++++++++++++++++++++ + include/linux/ath9k_platform.h | 7 + + include/linux/can/core.h | 4 +- + include/linux/ethtool.h | 286 +- + include/linux/filter.h | 76 + + include/linux/ieee80211.h | 9 + + include/linux/if_ether.h | 1 + + include/linux/if_vlan.h | 11 +- + include/linux/mroute.h | 1 + + include/linux/net.h | 1 + + include/linux/netdevice.h | 34 +- + include/linux/netfilter/ipset/ip_set_getport.h | 2 + + include/linux/netfilter/x_tables.h | 96 +- + include/linux/nl80211.h | 69 +- + include/linux/pkt_sched.h | 15 + + include/linux/rfkill-regulator.h | 48 + + include/linux/skbuff.h | 2 +- + include/linux/smsc911x.h | 1 + + include/linux/socket.h | 2 + + include/linux/ssb/ssb.h | 2 +- + include/linux/ssb/ssb_driver_chipcommon.h | 11 +- + include/linux/ssb/ssb_regs.h | 2 +- + include/linux/stmmac.h | 2 + + include/linux/syscalls.h | 2 + + include/linux/tipc.h | 2 +- + include/linux/usb/rndis_host.h | 2 + + include/linux/wl12xx.h | 29 +- + include/net/addrconf.h | 25 +- + include/net/af_rxrpc.h | 3 - + include/net/af_unix.h | 2 - + include/net/atmclip.h | 2 - + include/net/bluetooth/hci.h | 51 +- + include/net/bluetooth/hci_core.h | 41 +- + include/net/bluetooth/l2cap.h | 177 +- + include/net/bluetooth/mgmt.h | 57 +- + include/net/caif/caif_dev.h | 27 +- + include/net/caif/cfctrl.h | 12 +- + include/net/caif/cfmuxl.h | 2 - + include/net/caif/cfpkt.h | 75 - + include/net/caif/cfsrvl.h | 3 +- + include/net/cfg80211.h | 76 +- + include/net/compat.h | 2 + + include/net/dst.h | 6 +- + include/net/flow.h | 25 +- + include/net/garp.h | 2 + + include/net/if_inet6.h | 7 +- + include/net/inet6_connection_sock.h | 2 +- + include/net/inet_connection_sock.h | 5 +- + include/net/inet_sock.h | 26 +- + include/net/inetpeer.h | 2 +- + include/net/ip.h | 29 +- + include/net/ip6_fib.h | 13 +- + include/net/ip6_route.h | 26 +- + include/net/ip_fib.h | 9 +- + include/net/ip_vs.h | 14 +- + include/net/ipv6.h | 11 +- + include/net/ipx.h | 2 - + include/net/mac80211.h | 33 + + include/net/ndisc.h | 9 +- + include/net/netevent.h | 2 - + include/net/netfilter/nf_conntrack.h | 2 - + include/net/netfilter/nf_conntrack_tuple.h | 4 - + include/net/netfilter/nf_nat.h | 4 - + include/net/phonet/pn_dev.h | 2 +- + include/net/rawv6.h | 4 - + include/net/route.h | 155 +- + include/net/sctp/command.h | 1 - + include/net/sctp/constants.h | 18 +- + include/net/sctp/sctp.h | 2 - + include/net/sctp/sm.h | 5 +- + include/net/sctp/structs.h | 21 +- + include/net/sctp/ulpevent.h | 3 + + include/net/sctp/user.h | 33 +- + include/net/sock.h | 54 + + include/net/transp_v6.h | 4 - + include/net/wimax.h | 5 - + include/net/xfrm.h | 15 +- + include/rdma/ib_addr.h | 13 +- + kernel/sys_ni.c | 2 + + net/802/garp.c | 22 +- + net/8021q/vlan.c | 38 +- + net/8021q/vlan.h | 2 - + net/8021q/vlan_core.c | 85 +- + net/8021q/vlan_dev.c | 225 +- + net/9p/client.c | 9 +- + net/Kconfig | 14 + + net/atm/lec.c | 4 - + net/ax25/af_ax25.c | 16 +- + net/ax25/ax25_iface.c | 3 +- + net/batman-adv/aggregation.c | 17 +- + net/batman-adv/aggregation.h | 4 +- + net/batman-adv/bat_debugfs.c | 4 +- + net/batman-adv/bat_sysfs.c | 16 +- + net/batman-adv/gateway_client.c | 296 +- + net/batman-adv/gateway_client.h | 2 +- + net/batman-adv/hard-interface.c | 107 +- + net/batman-adv/hard-interface.h | 18 + + net/batman-adv/icmp_socket.c | 37 +- + net/batman-adv/main.c | 20 +- + net/batman-adv/main.h | 44 +- + net/batman-adv/originator.c | 82 +- + net/batman-adv/originator.h | 1 + + net/batman-adv/packet.h | 5 +- + net/batman-adv/routing.c | 572 +- + net/batman-adv/routing.h | 6 +- + net/batman-adv/send.c | 53 +- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 463 +- + net/batman-adv/translation-table.c | 474 +- + net/batman-adv/translation-table.h | 24 +- + net/batman-adv/types.h | 56 +- + net/batman-adv/unicast.c | 20 +- + net/batman-adv/vis.c | 146 +- + net/bluetooth/bnep/bnep.h | 148 +- + net/bluetooth/bnep/core.c | 71 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/capi.c | 6 +- + net/bluetooth/cmtp/cmtp.h | 11 +- + net/bluetooth/cmtp/core.c | 28 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_conn.c | 78 +- + net/bluetooth/hci_core.c | 154 +- + net/bluetooth/hci_event.c | 262 +- + net/bluetooth/hci_sysfs.c | 71 +- + net/bluetooth/hidp/core.c | 96 +- + net/bluetooth/hidp/hidp.h | 6 +- + net/bluetooth/hidp/sock.c | 7 +- + net/bluetooth/l2cap_core.c | 1817 ++-- + net/bluetooth/l2cap_sock.c | 288 +- + net/bluetooth/mgmt.c | 609 +- + net/bluetooth/rfcomm/core.c | 21 +- + net/bluetooth/rfcomm/sock.c | 5 +- + net/bridge/br.c | 1 + + net/bridge/br_device.c | 100 +- + net/bridge/br_fdb.c | 311 +- + net/bridge/br_if.c | 104 +- + net/bridge/br_input.c | 5 +- + net/bridge/br_ioctl.c | 40 +- + net/bridge/br_multicast.c | 12 +- + net/bridge/br_netfilter.c | 4 +- + net/bridge/br_netlink.c | 60 +- + net/bridge/br_notify.c | 11 +- + net/bridge/br_private.h | 22 +- + net/bridge/br_private_stp.h | 13 + + net/bridge/br_stp.c | 48 + + net/bridge/br_stp_if.c | 21 +- + net/bridge/br_sysfs_br.c | 39 +- + net/bridge/br_sysfs_if.c | 26 +- + net/caif/caif_config_util.c | 6 +- + net/caif/caif_dev.c | 56 +- + net/caif/caif_socket.c | 35 +- + net/caif/cfcnfg.c | 2 +- + net/caif/cfctrl.c | 75 +- + net/caif/cfdgml.c | 7 +- + net/caif/cffrml.c | 8 +- + net/caif/cfmuxl.c | 45 +- + net/caif/cfpkt_skbuff.c | 178 +- + net/caif/cfserl.c | 7 +- + net/caif/cfsrvl.c | 7 +- + net/caif/cfutill.c | 7 +- + net/caif/cfveil.c | 5 +- + net/caif/cfvidl.c | 5 +- + net/can/af_can.c | 67 +- + net/can/bcm.c | 2 +- + net/can/raw.c | 2 +- + net/compat.c | 16 +- + net/core/dev.c | 177 +- + net/core/dst.c | 34 +- + net/core/ethtool.c | 104 +- + net/core/fib_rules.c | 3 +- + net/core/filter.c | 65 +- + net/core/net-sysfs.c | 24 +- + net/core/net_namespace.c | 12 +- + net/core/netpoll.c | 28 +- + net/core/pktgen.c | 199 +- + net/core/rtnetlink.c | 25 +- + net/core/sysctl_net_core.c | 9 + + net/core/utils.c | 24 + + net/dccp/ipv4.c | 50 +- + net/dccp/ipv6.c | 10 +- + net/dccp/output.c | 4 +- + net/decnet/dn_dev.c | 10 +- + net/decnet/dn_route.c | 15 +- + net/decnet/dn_table.c | 4 +- + net/dsa/slave.c | 1 - + net/econet/af_econet.c | 8 - + net/ipv4/af_inet.c | 31 +- + net/ipv4/ah4.c | 7 +- + net/ipv4/cipso_ipv4.c | 113 +- + net/ipv4/datagram.c | 22 +- + net/ipv4/devinet.c | 4 +- + net/ipv4/esp4.c | 7 +- + net/ipv4/fib_frontend.c | 16 +- + net/ipv4/fib_trie.c | 110 +- + net/ipv4/icmp.c | 113 +- + net/ipv4/igmp.c | 22 +- + net/ipv4/inet_connection_sock.c | 55 +- + net/ipv4/inet_diag.c | 2 +- + net/ipv4/inet_lro.c | 4 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_gre.c | 70 +- + net/ipv4/ip_input.c | 4 +- + net/ipv4/ip_options.c | 42 +- + net/ipv4/ip_output.c | 149 +- + net/ipv4/ip_sockglue.c | 37 +- + net/ipv4/ipcomp.c | 4 +- + net/ipv4/ipip.c | 36 +- + net/ipv4/ipmr.c | 39 +- + net/ipv4/netfilter/arp_tables.c | 18 +- + net/ipv4/netfilter/ip_tables.c | 28 +- + net/ipv4/netfilter/nf_nat_helper.c | 2 +- + net/ipv4/raw.c | 92 +- + net/ipv4/route.c | 323 +- + net/ipv4/syncookies.c | 22 +- + net/ipv4/tcp.c | 7 +- + net/ipv4/tcp_ipv4.c | 84 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv4/udp.c | 78 +- + net/ipv4/xfrm4_policy.c | 38 +- + net/ipv4/xfrm4_state.c | 2 +- + net/ipv6/addrconf.c | 18 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/anycast.c | 16 +- + net/ipv6/esp6.c | 5 +- + net/ipv6/icmp.c | 8 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/ip6_fib.c | 20 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6_output.c | 50 +- + net/ipv6/ip6_tunnel.c | 46 +- + net/ipv6/ip6mr.c | 4 +- + net/ipv6/ipcomp6.c | 5 +- + net/ipv6/mcast.c | 36 +- + net/ipv6/mip6.c | 8 +- + net/ipv6/ndisc.c | 51 +- + net/ipv6/netfilter.c | 10 +- + net/ipv6/netfilter/ip6_tables.c | 21 +- + net/ipv6/netfilter/ip6table_mangle.c | 3 +- + net/ipv6/raw.c | 18 +- + net/ipv6/reassembly.c | 4 +- + net/ipv6/route.c | 157 +- + net/ipv6/sit.c | 40 +- + net/ipv6/syncookies.c | 13 +- + net/ipv6/tcp_ipv6.c | 50 +- + net/ipv6/udp.c | 22 +- + net/ipv6/xfrm6_mode_beet.c | 2 - + net/ipv6/xfrm6_mode_tunnel.c | 6 +- + net/ipv6/xfrm6_policy.c | 2 +- + net/ipv6/xfrm6_tunnel.c | 10 +- + net/irda/ircomm/ircomm_tty.c | 14 +- + net/irda/irlap_event.c | 3 - + net/irda/irproc.c | 5 +- + net/key/af_key.c | 2 +- + net/l2tp/l2tp_core.c | 28 +- + net/l2tp/l2tp_ip.c | 52 +- + net/l2tp/l2tp_netlink.c | 3 +- + net/mac80211/Kconfig | 1 - + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/cfg.c | 55 +- + net/mac80211/debugfs.c | 89 +- + net/mac80211/debugfs_sta.c | 26 + + net/mac80211/driver-ops.h | 31 + + net/mac80211/driver-trace.h | 47 + + net/mac80211/ibss.c | 10 +- + net/mac80211/ieee80211_i.h | 12 +- + net/mac80211/iface.c | 4 - + net/mac80211/key.c | 21 +- + net/mac80211/main.c | 32 +- + net/mac80211/mesh.c | 17 +- + net/mac80211/mesh.h | 3 +- + net/mac80211/mesh_hwmp.c | 4 - + net/mac80211/mesh_pathtbl.c | 49 +- + net/mac80211/mesh_plink.c | 35 +- + net/mac80211/mlme.c | 26 +- + net/mac80211/pm.c | 16 +- + net/mac80211/rx.c | 77 +- + net/mac80211/sta_info.c | 33 +- + net/mac80211/sta_info.h | 6 +- + net/mac80211/status.c | 19 +- + net/mac80211/tkip.c | 4 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/tx.c | 17 +- + net/mac80211/util.c | 2 +- + net/mac80211/wep.c | 34 +- + net/mac80211/wep.h | 4 +- + net/mac80211/work.c | 6 +- + net/mac80211/wpa.c | 62 +- + net/netfilter/ipset/ip_set_getport.c | 16 +- + net/netfilter/ipset/ip_set_hash_ipport.c | 2 +- + net/netfilter/ipset/ip_set_hash_ipportip.c | 2 +- + net/netfilter/ipset/ip_set_hash_ipportnet.c | 2 +- + net/netfilter/ipset/ip_set_hash_netport.c | 2 +- + net/netfilter/ipvs/ip_vs_core.c | 24 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 - + net/netfilter/ipvs/ip_vs_xmit.c | 97 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nfnetlink_log.c | 2 - + net/netfilter/x_tables.c | 9 +- + net/netlabel/netlabel_cipso_v4.c | 4 - + net/netrom/af_netrom.c | 12 +- + net/packet/af_packet.c | 2 +- + net/phonet/pn_dev.c | 6 +- + net/phonet/pn_netlink.c | 4 +- + net/phonet/socket.c | 45 +- + net/rfkill/Kconfig | 11 + + net/rfkill/Makefile | 1 + + net/rfkill/rfkill-regulator.c | 164 + + net/rose/af_rose.c | 16 +- + net/rxrpc/ar-peer.c | 3 +- + net/sched/Kconfig | 11 + + net/sched/Makefile | 1 + + net/sched/sch_qfq.c | 1137 ++ + net/sched/sch_sfq.c | 2 +- + net/sctp/debug.c | 1 - + net/sctp/endpointola.c | 20 +- + net/sctp/input.c | 19 +- + net/sctp/ipv6.c | 185 +- + net/sctp/outqueue.c | 19 +- + net/sctp/protocol.c | 71 +- + net/sctp/sm_make_chunk.c | 62 +- + net/sctp/sm_sideeffect.c | 9 +- + net/sctp/sm_statefuns.c | 89 +- + net/sctp/sm_statetable.c | 78 +- + net/sctp/socket.c | 95 +- + net/sctp/transport.c | 27 +- + net/sctp/ulpevent.c | 30 +- + net/socket.c | 213 +- + net/tipc/addr.h | 7 +- + net/tipc/bcast.c | 22 +- + net/tipc/bearer.c | 45 +- + net/tipc/core.c | 3 +- + net/tipc/discover.c | 150 +- + net/tipc/discover.h | 11 +- + net/tipc/link.c | 104 +- + net/tipc/link.h | 1 + + net/tipc/msg.c | 25 +- + net/tipc/msg.h | 161 +- + net/tipc/port.c | 55 +- + net/tipc/port.h | 14 +- + net/tipc/socket.c | 27 +- + net/tipc/subscr.c | 4 +- + net/wireless/core.c | 17 + + net/wireless/mesh.c | 23 +- + net/wireless/mlme.c | 9 + + net/wireless/nl80211.c | 122 +- + net/wireless/nl80211.h | 7 + + net/wireless/reg.c | 72 +- + net/xfrm/xfrm_policy.c | 3 +- + net/xfrm/xfrm_state.c | 12 +- + 1074 files changed, 102563 insertions(+), 75730 deletions(-) + create mode 100644 arch/x86/net/Makefile + create mode 100644 arch/x86/net/bpf_jit.S + create mode 100644 arch/x86/net/bpf_jit_comp.c + delete mode 100644 drivers/isdn/capi/capifs.c + delete mode 100644 drivers/isdn/capi/capifs.h + create mode 100644 drivers/net/enic/enic_pp.c + create mode 100644 drivers/net/enic/enic_pp.h + delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig + delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile + delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h + delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c + delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h + delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h + delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h + delete mode 100644 drivers/net/wireless/ath/ar9170/led.c + delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c + delete mode 100644 drivers/net/wireless/ath/ar9170/main.c + delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c + delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c + delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar9340_initvals.h + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_debug.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.h + create mode 100644 drivers/net/wireless/mwifiex/11n.c + create mode 100644 drivers/net/wireless/mwifiex/11n.h + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h + create mode 100644 drivers/net/wireless/mwifiex/Kconfig + create mode 100644 drivers/net/wireless/mwifiex/Makefile + create mode 100644 drivers/net/wireless/mwifiex/README + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h + create mode 100644 drivers/net/wireless/mwifiex/cfp.c + create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c + create mode 100644 drivers/net/wireless/mwifiex/debugfs.c + create mode 100644 drivers/net/wireless/mwifiex/decl.h + create mode 100644 drivers/net/wireless/mwifiex/fw.h + create mode 100644 drivers/net/wireless/mwifiex/init.c + create mode 100644 drivers/net/wireless/mwifiex/ioctl.h + create mode 100644 drivers/net/wireless/mwifiex/join.c + create mode 100644 drivers/net/wireless/mwifiex/main.c + create mode 100644 drivers/net/wireless/mwifiex/main.h + create mode 100644 drivers/net/wireless/mwifiex/scan.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.h + create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c + create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c + create mode 100644 drivers/net/wireless/mwifiex/sta_event.c + create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c + create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c + create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c + create mode 100644 drivers/net/wireless/mwifiex/txrx.c + create mode 100644 drivers/net/wireless/mwifiex/util.c + create mode 100644 drivers/net/wireless/mwifiex/util.h + create mode 100644 drivers/net/wireless/mwifiex/wmm.c + create mode 100644 drivers/net/wireless/mwifiex/wmm.h + delete mode 100644 drivers/net/wireless/rt2x00/rt2x00ht.c + delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex + create mode 100644 include/linux/rfkill-regulator.h + create mode 100644 net/rfkill/rfkill-regulator.c + create mode 100644 net/sched/sch_qfq.c +Merging wireless/master +$ git merge wireless/master +Resolved 'drivers/net/wireless/iwlwifi/iwl-agn-tx.c' using previous resolution. +Resolved 'net/mac80211/sta_info.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/Kconfig +Auto-merging drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-tx.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-tx.c +Auto-merging drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/libertas/cmd.c +Auto-merging drivers/net/wireless/mwifiex/main.c +Auto-merging drivers/net/wireless/rt2x00/rt2800.h +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00usb.c +Auto-merging drivers/net/wireless/wl12xx/cmd.c +Auto-merging drivers/net/wireless/wl12xx/conf.h +Auto-merging include/linux/nl80211.h +Auto-merging include/linux/ssb/ssb.h +Auto-merging include/net/mac80211.h +Auto-merging net/bluetooth/l2cap_core.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/mesh_pathtbl.c +Auto-merging net/mac80211/rc80211_minstrel_ht.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/sta_info.h +CONFLICT (content): Merge conflict in net/mac80211/sta_info.h +Auto-merging net/mac80211/tx.c +Auto-merging net/wireless/reg.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master df76c55] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-bcma | 31 + + MAINTAINERS | 7 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/bcma/Kconfig | 33 + + drivers/bcma/Makefile | 7 + + drivers/bcma/README | 19 + + drivers/bcma/TODO | 3 + + drivers/bcma/bcma_private.h | 28 + + drivers/bcma/core.c | 51 + + drivers/bcma/driver_chipcommon.c | 89 + + drivers/bcma/driver_chipcommon_pmu.c | 134 ++ + drivers/bcma/driver_pci.c | 163 ++ + drivers/bcma/host_pci.c | 196 ++ + drivers/bcma/main.c | 247 +++ + drivers/bcma/scan.c | 360 ++++ + drivers/bcma/scan.h | 56 + + drivers/bluetooth/ath3k.c | 1 + + drivers/bluetooth/btusb.c | 1 + + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 10 - + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 28 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 11 - + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/beacon.c | 15 +- + drivers/net/wireless/ath/ath9k/calib.c | 21 +- + drivers/net/wireless/ath/ath9k/calib.h | 1 - + drivers/net/wireless/ath/ath9k/hw-ops.h | 6 - + drivers/net/wireless/ath/ath9k/hw.h | 2 - + drivers/net/wireless/ath/ath9k/mac.c | 9 +- + drivers/net/wireless/ath/ath9k/main.c | 40 +- + drivers/net/wireless/ath/ath9k/recv.c | 4 +- + drivers/net/wireless/ath/ath9k/xmit.c | 11 +- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 9 - + drivers/net/wireless/b43/main.c | 69 +- + drivers/net/wireless/b43/main.h | 1 + + drivers/net/wireless/b43/phy_n.c | 13 +- + drivers/net/wireless/b43legacy/main.c | 52 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 + + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-2000.c | 2 - + drivers/net/wireless/iwlwifi/iwl-5000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-6000.c | 4 - + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 7 - + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 105 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 143 +- + drivers/net/wireless/iwlwifi/iwl-agn.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 6 - + drivers/net/wireless/iwlwifi/iwl-dev.h | 34 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 20 +- + drivers/net/wireless/iwlwifi/iwl-sv-open.c | 469 +++++ + drivers/net/wireless/iwlwifi/iwl-testmode.h | 151 ++ + drivers/net/wireless/iwlwifi/iwl-tx.c | 22 +- + drivers/net/wireless/libertas/cfg.c | 16 +- + drivers/net/wireless/libertas/cmd.c | 40 +- + drivers/net/wireless/libertas/cmdresp.c | 27 +- + drivers/net/wireless/libertas/debugfs.c | 5 +- + drivers/net/wireless/libertas/defs.h | 7 - + drivers/net/wireless/libertas/if_cs.c | 57 +- + drivers/net/wireless/libertas/if_sdio.c | 37 +- + drivers/net/wireless/libertas/if_spi.c | 83 +- + drivers/net/wireless/libertas/if_usb.c | 44 +- + drivers/net/wireless/libertas/main.c | 72 +- + drivers/net/wireless/libertas/mesh.c | 8 +- + drivers/net/wireless/libertas/rx.c | 7 +- + drivers/net/wireless/mwifiex/11n.c | 7 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 13 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 15 +- + drivers/net/wireless/mwifiex/cfg80211.c | 48 +- + drivers/net/wireless/mwifiex/cmdevt.c | 51 +- + drivers/net/wireless/mwifiex/debugfs.c | 10 +- + drivers/net/wireless/mwifiex/fw.h | 21 +- + drivers/net/wireless/mwifiex/init.c | 59 +- + drivers/net/wireless/mwifiex/ioctl.h | 81 +- + drivers/net/wireless/mwifiex/join.c | 9 +- + drivers/net/wireless/mwifiex/main.c | 27 +- + drivers/net/wireless/mwifiex/main.h | 8 +- + drivers/net/wireless/mwifiex/scan.c | 30 +- + drivers/net/wireless/mwifiex/sdio.c | 35 +- + drivers/net/wireless/mwifiex/sta_cmd.c | 8 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 28 +- + drivers/net/wireless/mwifiex/sta_ioctl.c | 80 +- + drivers/net/wireless/mwifiex/sta_rx.c | 4 +- + drivers/net/wireless/mwifiex/sta_tx.c | 4 +- + drivers/net/wireless/mwifiex/txrx.c | 10 +- + drivers/net/wireless/mwifiex/util.c | 29 +- + drivers/net/wireless/mwifiex/wmm.c | 2 +- + drivers/net/wireless/mwl8k.c | 18 +- + drivers/net/wireless/p54/p54pci.c | 3 +- + drivers/net/wireless/rt2x00/Kconfig | 11 +- + drivers/net/wireless/rt2x00/rt2800.h | 2 + + drivers/net/wireless/rt2x00/rt2800lib.c | 5 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 8 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 6 +- + drivers/net/wireless/rtlwifi/Kconfig | 15 +- + drivers/net/wireless/rtlwifi/Makefile | 1 + + drivers/net/wireless/rtlwifi/efuse.c | 35 +- + drivers/net/wireless/rtlwifi/pci.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192se/Makefile | 15 + + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 598 ++++++ + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 733 +++++++ + drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 164 ++ + drivers/net/wireless/rtlwifi/rtl8192se/fw.c | 654 ++++++ + drivers/net/wireless/rtlwifi/rtl8192se/fw.h | 375 ++++ + drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2512 +++++++++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8192se/hw.h | 79 + + drivers/net/wireless/rtlwifi/rtl8192se/led.c | 149 ++ + drivers/net/wireless/rtlwifi/rtl8192se/led.h | 37 + + drivers/net/wireless/rtlwifi/rtl8192se/phy.c | 1740 ++++++++++++++++ + drivers/net/wireless/rtlwifi/rtl8192se/phy.h | 101 + + drivers/net/wireless/rtlwifi/rtl8192se/reg.h | 1188 +++++++++++ + drivers/net/wireless/rtlwifi/rtl8192se/rf.c | 546 +++++ + drivers/net/wireless/rtlwifi/rtl8192se/rf.h | 43 + + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 423 ++++ + drivers/net/wireless/rtlwifi/rtl8192se/sw.h | 36 + + drivers/net/wireless/rtlwifi/rtl8192se/table.c | 634 ++++++ + drivers/net/wireless/rtlwifi/rtl8192se/table.h | 49 + + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 976 +++++++++ + drivers/net/wireless/rtlwifi/rtl8192se/trx.h | 45 + + drivers/net/wireless/wl12xx/acx.c | 190 ++- + drivers/net/wireless/wl12xx/acx.h | 103 +- + drivers/net/wireless/wl12xx/boot.c | 6 +- + drivers/net/wireless/wl12xx/cmd.c | 18 +- + drivers/net/wireless/wl12xx/conf.h | 90 +- + drivers/net/wireless/wl12xx/debugfs.c | 239 +++ + drivers/net/wireless/wl12xx/event.c | 47 - + drivers/net/wireless/wl12xx/event.h | 12 +- + drivers/net/wireless/wl12xx/init.c | 110 +- + drivers/net/wireless/wl12xx/init.h | 2 + + drivers/net/wireless/wl12xx/main.c | 232 ++- + drivers/net/wireless/wl12xx/ps.c | 30 +- + drivers/net/wireless/wl12xx/rx.c | 36 +- + drivers/net/wireless/wl12xx/tx.c | 13 +- + drivers/net/wireless/wl12xx/tx.h | 2 +- + drivers/net/wireless/wl12xx/wl12xx.h | 2 + + drivers/ssb/driver_pcicore.c | 26 - + drivers/ssb/main.c | 25 + + drivers/ssb/scan.c | 5 +- + include/linux/bcma/bcma.h | 224 ++ + include/linux/bcma/bcma_driver_chipcommon.h | 302 +++ + include/linux/bcma/bcma_driver_pci.h | 89 + + include/linux/bcma/bcma_regs.h | 34 + + include/linux/ieee80211.h | 11 +- + include/linux/mod_devicetable.h | 17 + + include/linux/nl80211.h | 145 ++ + include/linux/ssb/ssb.h | 1 + + include/net/bluetooth/hci_core.h | 1 + + include/net/bluetooth/l2cap.h | 9 +- + include/net/cfg80211.h | 172 ++- + include/net/mac80211.h | 66 + + net/bluetooth/hci_conn.c | 17 + + net/bluetooth/hci_event.c | 5 +- + net/bluetooth/l2cap_core.c | 193 ++- + net/bluetooth/l2cap_sock.c | 72 +- + net/bluetooth/mgmt.c | 3 + + net/bluetooth/rfcomm/core.c | 2 +- + net/mac80211/cfg.c | 124 +- + net/mac80211/debugfs.c | 2 +- + net/mac80211/driver-ops.h | 56 +- + net/mac80211/driver-trace.h | 228 ++- + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/key.c | 8 +- + net/mac80211/key.h | 1 + + net/mac80211/main.c | 19 +- + net/mac80211/mesh.c | 47 +- + net/mac80211/mesh.h | 4 - + net/mac80211/mesh_hwmp.c | 18 +- + net/mac80211/mesh_pathtbl.c | 123 +- + net/mac80211/mesh_plink.c | 11 +- + net/mac80211/mlme.c | 22 +- + net/mac80211/pm.c | 13 +- + net/mac80211/rc80211_minstrel.c | 4 +- + net/mac80211/rc80211_minstrel_ht.c | 27 +- + net/mac80211/rx.c | 13 +- + net/mac80211/scan.c | 122 ++- + net/mac80211/sta_info.c | 6 +- + net/mac80211/sta_info.h | 23 - + net/mac80211/tx.c | 8 +- + net/mac80211/util.c | 19 + + net/wireless/core.c | 20 +- + net/wireless/core.h | 22 + + net/wireless/lib80211_crypt_wep.c | 3 +- + net/wireless/mlme.c | 10 + + net/wireless/nl80211.c | 565 +++++- + net/wireless/nl80211.h | 4 + + net/wireless/reg.c | 2 - + net/wireless/scan.c | 77 +- + net/wireless/sysfs.c | 2 +- + net/wireless/util.c | 25 + + scripts/mod/file2alias.c | 22 + + 195 files changed, 17376 insertions(+), 1781 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-bcma + create mode 100644 drivers/bcma/Kconfig + create mode 100644 drivers/bcma/Makefile + create mode 100644 drivers/bcma/README + create mode 100644 drivers/bcma/TODO + create mode 100644 drivers/bcma/bcma_private.h + create mode 100644 drivers/bcma/core.c + create mode 100644 drivers/bcma/driver_chipcommon.c + create mode 100644 drivers/bcma/driver_chipcommon_pmu.c + create mode 100644 drivers/bcma/driver_pci.c + create mode 100644 drivers/bcma/host_pci.c + create mode 100644 drivers/bcma/main.c + create mode 100644 drivers/bcma/scan.c + create mode 100644 drivers/bcma/scan.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-sv-open.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-testmode.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/Makefile + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/def.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/dm.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/dm.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/fw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/fw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/hw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/hw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/led.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/led.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/phy.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/phy.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/reg.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/rf.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/rf.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/sw.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/sw.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/table.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/table.h + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/trx.c + create mode 100644 drivers/net/wireless/rtlwifi/rtl8192se/trx.h + create mode 100644 include/linux/bcma/bcma.h + create mode 100644 include/linux/bcma/bcma_driver_chipcommon.h + create mode 100644 include/linux/bcma/bcma_driver_pci.h + create mode 100644 include/linux/bcma/bcma_regs.h +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Removing arch/s390/crypto/des_check_key.c +Auto-merging arch/s390/crypto/prng.c +Auto-merging drivers/crypto/Kconfig +Merge made by recursive. + .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ + arch/powerpc/boot/dts/p4080ds.dts | 86 +- + arch/s390/crypto/Makefile | 1 + + arch/s390/crypto/aes_s390.c | 383 +++++- + arch/s390/crypto/crypt_s390.h | 112 ++- + arch/s390/crypto/des_check_key.c | 132 -- + arch/s390/crypto/des_s390.c | 370 ++++-- + arch/s390/crypto/ghash_s390.c | 162 ++ + arch/s390/crypto/prng.c | 2 +- + arch/s390/crypto/sha1_s390.c | 2 +- + arch/s390/crypto/sha256_s390.c | 2 +- + arch/s390/crypto/sha512_s390.c | 2 +- + crypto/tcrypt.c | 4 + + crypto/testmgr.c | 16 + + crypto/testmgr.h | 60 + + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/hw_random/amd-rng.c | 9 + + drivers/crypto/Kconfig | 65 +- + drivers/crypto/Makefile | 2 + + drivers/crypto/caam/Kconfig | 72 + + drivers/crypto/caam/Makefile | 8 + + drivers/crypto/caam/caamalg.c | 1159 ++++++++++++++ + drivers/crypto/caam/compat.h | 35 + + drivers/crypto/caam/ctrl.c | 270 ++++ + drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ + drivers/crypto/caam/desc_constr.h | 204 +++ + drivers/crypto/caam/error.c | 248 +++ + drivers/crypto/caam/error.h | 11 + + drivers/crypto/caam/intern.h | 113 ++ + drivers/crypto/caam/jr.c | 517 +++++++ + drivers/crypto/caam/jr.h | 21 + + drivers/crypto/caam/regs.h | 663 ++++++++ + drivers/crypto/mv_cesa.c | 97 +- + drivers/crypto/omap-sham.c | 78 +- + drivers/crypto/padlock-sha.c | 269 ++++- + drivers/crypto/picoxcell_crypto.c | 64 +- + drivers/crypto/s5p-sss.c | 701 +++++++++ + 37 files changed, 7539 insertions(+), 405 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + delete mode 100644 arch/s390/crypto/des_check_key.c + create mode 100644 arch/s390/crypto/ghash_s390.c + create mode 100644 drivers/crypto/caam/Kconfig + create mode 100644 drivers/crypto/caam/Makefile + create mode 100644 drivers/crypto/caam/caamalg.c + create mode 100644 drivers/crypto/caam/compat.h + create mode 100644 drivers/crypto/caam/ctrl.c + create mode 100644 drivers/crypto/caam/desc.h + create mode 100644 drivers/crypto/caam/desc_constr.h + create mode 100644 drivers/crypto/caam/error.c + create mode 100644 drivers/crypto/caam/error.h + create mode 100644 drivers/crypto/caam/intern.h + create mode 100644 drivers/crypto/caam/jr.c + create mode 100644 drivers/crypto/caam/jr.h + create mode 100644 drivers/crypto/caam/regs.h + create mode 100644 drivers/crypto/s5p-sss.c +Merging sound/for-next +$ git merge sound/for-next +Auto-merging arch/arm/mach-tegra/include/mach/tegra_wm8903_pdata.h +Removing drivers/media/radio/radio-maestro.c +Auto-merging sound/firewire/iso-resources.c +Removing sound/soc/tegra/harmony.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 7 + + Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- + arch/arm/mach-tegra/Kconfig | 3 + + arch/arm/mach-tegra/board-harmony.c | 7 +- + .../mach/{harmony_audio.h => tegra_wm8903_pdata.h} | 5 +- + drivers/media/radio/Kconfig | 15 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/radio-maestro.c | 452 --- + .../staging/intel_sst/intel_sst_drv_interface.c | 1 - + drivers/staging/intel_sst/intelmid.c | 4 + + include/linux/mfd/wm8994/pdata.h | 49 + + include/sound/control.h | 1 + + include/sound/max98095.h | 54 + + include/sound/soc-dapm.h | 80 +- + include/sound/soc.h | 30 +- + include/sound/tea575x-tuner.h | 20 +- + include/sound/wm8915.h | 55 + + include/sound/wm8962.h | 22 + + sound/core/control.c | 64 + + sound/core/init.c | 2 +- + sound/firewire/Kconfig | 11 + + sound/firewire/Makefile | 2 + + sound/firewire/isight.c | 755 ++++ + sound/firewire/iso-resources.c | 5 + + sound/firewire/packets-buffer.c | 2 + + sound/i2c/other/Makefile | 2 +- + sound/i2c/other/tea575x-tuner.c | 146 +- + sound/pci/Kconfig | 23 +- + sound/pci/Makefile | 1 + + sound/pci/asihpi/asihpi.c | 328 +- + sound/pci/asihpi/hpi6000.c | 39 +- + sound/pci/asihpi/hpi6205.c | 95 +- + sound/pci/asihpi/hpi_internal.h | 19 +- + sound/pci/asihpi/hpicmn.c | 10 +- + sound/pci/asihpi/hpicmn.h | 2 + + sound/pci/asihpi/hpifunc.c | 27 - + sound/pci/asihpi/hpimsgx.c | 31 +- + sound/pci/asihpi/hpioctl.c | 63 +- + sound/pci/au88x0/au8810.h | 2 +- + sound/pci/au88x0/au8820.h | 2 +- + sound/pci/au88x0/au8830.h | 2 +- + sound/pci/au88x0/au88x0_pcm.c | 13 +- + sound/pci/emu10k1/emumixer.c | 10 +- + sound/pci/es1968.c | 78 + + sound/pci/fm801.c | 362 +-- + sound/pci/hda/hda_codec.c | 95 +- + sound/pci/hda/hda_codec.h | 4 +- + sound/pci/hda/hda_intel.c | 19 + + sound/pci/hda/hda_local.h | 10 +- + sound/pci/hda/patch_analog.c | 342 +- + sound/pci/hda/patch_ca0110.c | 16 +- + sound/pci/hda/patch_cirrus.c | 38 +- + sound/pci/hda/patch_cmedia.c | 40 +- + sound/pci/hda/patch_conexant.c | 190 +- + sound/pci/hda/patch_hdmi.c | 26 +- + sound/pci/hda/patch_realtek.c | 3626 ++++++++++---------- + sound/pci/hda/patch_si3054.c | 11 +- + sound/pci/hda/patch_sigmatel.c | 406 ++-- + sound/pci/hda/patch_via.c | 1526 +++++---- + sound/pci/lola/Makefile | 4 + + sound/pci/lola/lola.c | 791 +++++ + sound/pci/lola/lola.h | 527 +++ + sound/pci/lola/lola_clock.c | 323 ++ + sound/pci/lola/lola_mixer.c | 839 +++++ + sound/pci/lola/lola_pcm.c | 706 ++++ + sound/pci/lola/lola_proc.c | 222 ++ + sound/ppc/tumbler.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +- + sound/soc/blackfin/bf5xx-ac97.c | 166 +- + sound/soc/blackfin/bf5xx-ad1836.c | 42 +- + sound/soc/blackfin/bf5xx-ad193x.c | 56 +- + sound/soc/blackfin/bf5xx-ad1980.c | 45 +- + sound/soc/blackfin/bf5xx-ad73311.c | 42 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-i2s.c | 172 +- + sound/soc/blackfin/bf5xx-sport.c | 159 +- + sound/soc/blackfin/bf5xx-sport.h | 16 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 42 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-tdm.c | 110 +- + sound/soc/codecs/88pm860x-codec.c | 2 +- + sound/soc/codecs/Kconfig | 16 +- + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/ad193x.c | 23 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/ak4535.c | 19 +- + sound/soc/codecs/ak4671.c | 18 +- + sound/soc/codecs/cx20442.c | 18 +- + sound/soc/codecs/jz4740.c | 18 +- + sound/soc/codecs/max98088.c | 25 +- + sound/soc/codecs/max98095.c | 2400 +++++++++++++ + sound/soc/codecs/max98095.h | 299 ++ + sound/soc/codecs/sn95031.c | 17 +- + sound/soc/codecs/ssm2602.c | 464 ++-- + sound/soc/codecs/ssm2602.h | 6 - + sound/soc/codecs/tlv320aic23.c | 19 +- + sound/soc/codecs/tlv320dac33.c | 13 +- + sound/soc/codecs/wm1250-ev1.c | 108 + + sound/soc/codecs/wm8711.c | 18 +- + sound/soc/codecs/wm8728.c | 18 +- + sound/soc/codecs/wm8731.c | 22 +- + sound/soc/codecs/wm8903.c | 41 +- + sound/soc/codecs/wm8915.c | 2931 +++++++++++++++ + sound/soc/codecs/wm8915.h | 3717 ++++++++++++++++++++ + sound/soc/codecs/wm8958-dsp2.c | 1028 ++++++ + sound/soc/codecs/wm8962.c | 63 +- + sound/soc/codecs/wm8994.c | 364 +-- + sound/soc/codecs/wm8994.h | 97 + + sound/soc/codecs/wm9705.c | 18 +- + sound/soc/codecs/wm9712.c | 18 +- + sound/soc/codecs/wm9713.c | 19 +- + sound/soc/imx/imx-ssi.c | 6 - + sound/soc/jz4740/qi_lb60.c | 46 +- + sound/soc/mid-x86/sst_platform.c | 4 + + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/spitz.c | 41 +- + sound/soc/samsung/Kconfig | 15 + + sound/soc/samsung/Makefile | 4 + + sound/soc/samsung/goni_wm8994.c | 1 - + sound/soc/samsung/neo1973_wm8753.c | 1 - + sound/soc/samsung/smdk_wm8580pcm.c | 206 ++ + sound/soc/samsung/speyside.c | 332 ++ + sound/soc/sh/fsi.c | 188 +- + sound/soc/soc-cache.c | 574 +-- + sound/soc/soc-core.c | 183 +- + sound/soc/soc-dapm.c | 611 ++-- + sound/soc/soc-jack.c | 2 +- + sound/soc/soc-utils.c | 53 + + sound/soc/tegra/Kconfig | 38 +- + sound/soc/tegra/Makefile | 14 +- + sound/soc/tegra/harmony.c | 394 --- + sound/soc/tegra/tegra_asoc_utils.c | 9 +- + sound/soc/tegra/tegra_asoc_utils.h | 2 +- + sound/soc/tegra/tegra_wm8903.c | 475 +++ + sound/soc/tegra/trimslice.c | 228 ++ + sound/usb/6fire/control.c | 105 + + sound/usb/6fire/control.h | 17 + + sound/usb/6fire/firmware.c | 73 +- + sound/usb/6fire/pcm.c | 97 +- + sound/usb/Kconfig | 10 +- + sound/usb/mixer.c | 10 +- + sound/usb/mixer_quirks.c | 17 + + sound/usb/quirks-table.h | 6 + + sound/usb/quirks.c | 1 + + 148 files changed, 22380 insertions(+), 6798 deletions(-) + rename arch/arm/mach-tegra/include/mach/{harmony_audio.h => tegra_wm8903_pdata.h} (83%) + delete mode 100644 drivers/media/radio/radio-maestro.c + create mode 100644 include/sound/max98095.h + create mode 100644 include/sound/wm8915.h + create mode 100644 sound/firewire/isight.c + create mode 100644 sound/pci/lola/Makefile + create mode 100644 sound/pci/lola/lola.c + create mode 100644 sound/pci/lola/lola.h + create mode 100644 sound/pci/lola/lola_clock.c + create mode 100644 sound/pci/lola/lola_mixer.c + create mode 100644 sound/pci/lola/lola_pcm.c + create mode 100644 sound/pci/lola/lola_proc.c + create mode 100644 sound/soc/codecs/max98095.c + create mode 100644 sound/soc/codecs/max98095.h + create mode 100644 sound/soc/codecs/wm1250-ev1.c + create mode 100644 sound/soc/codecs/wm8915.c + create mode 100644 sound/soc/codecs/wm8915.h + create mode 100644 sound/soc/codecs/wm8958-dsp2.c + create mode 100644 sound/soc/samsung/smdk_wm8580pcm.c + create mode 100644 sound/soc/samsung/speyside.c + delete mode 100644 sound/soc/tegra/harmony.c + create mode 100644 sound/soc/tegra/tegra_wm8903.c + create mode 100644 sound/soc/tegra/trimslice.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + sound/soc/codecs/ssm2602.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 6 +- + sound/soc/codecs/wm8994.c | 25 +++++++ + sound/soc/soc-cache.c | 140 ++-------------------------------------- + 4 files changed, 36 insertions(+), 137 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + arch/arm/mach-davinci/cpufreq.c | 4 +- + arch/blackfin/mach-common/dpmc.c | 3 - + arch/ia64/kernel/cpufreq/acpi-cpufreq.c | 44 ++--- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 45 ++--- + arch/x86/kernel/cpu/cpufreq/cpufreq-nforce2.c | 6 +- + arch/x86/kernel/cpu/cpufreq/gx-suspmod.c | 21 +-- + arch/x86/kernel/cpu/cpufreq/longhaul.c | 11 +- + arch/x86/kernel/cpu/cpufreq/longrun.c | 17 +- + arch/x86/kernel/cpu/cpufreq/p4-clockmod.c | 10 +- + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 51 +++--- + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 33 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 100 +++++----- + arch/x86/kernel/cpu/cpufreq/powernow-k8.h | 2 - + arch/x86/kernel/cpu/cpufreq/sc520_freq.c | 6 +- + arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c | 23 +-- + arch/x86/kernel/cpu/cpufreq/speedstep-ich.c | 28 ++-- + arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 43 ++--- + arch/x86/kernel/cpu/cpufreq/speedstep-smi.c | 41 ++--- + drivers/acpi/processor_perflib.c | 6 +- + drivers/cpufreq/Kconfig | 13 -- + drivers/cpufreq/cpufreq.c | 215 ++++++---------------- + drivers/cpufreq/cpufreq_performance.c | 5 +- + drivers/cpufreq/cpufreq_powersave.c | 5 +- + drivers/cpufreq/cpufreq_stats.c | 24 ++- + drivers/cpufreq/cpufreq_userspace.c | 13 +- + drivers/cpufreq/freq_table.c | 19 +- + include/linux/cpufreq.h | 52 ++---- + 27 files changed, 331 insertions(+), 509 deletions(-) +Merging cpufreq-move/move-drivers +$ git merge cpufreq-move/move-drivers +Resolved 'drivers/cpufreq/cpufreq_stats.c' using previous resolution. +Auto-merging arch/x86/Kconfig +Removing arch/x86/kernel/cpu/cpufreq/Makefile +Auto-merging drivers/cpufreq/Kconfig +Auto-merging drivers/cpufreq/Kconfig.x86 +Auto-merging drivers/cpufreq/cpufreq_stats.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_stats.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 51651e7] Merge remote-tracking branch 'cpufreq-move/move-drivers' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig | 2 +- + arch/x86/kernel/cpu/Makefile | 1 - + arch/x86/kernel/cpu/cpufreq/Makefile | 21 ---------------- + drivers/cpufreq/Kconfig | 10 +++++++- + .../cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 | 13 +--------- + drivers/cpufreq/Makefile | 26 ++++++++++++++++++++ + .../kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c | 0 + .../cpu => drivers}/cpufreq/cpufreq-nforce2.c | 0 + .../kernel/cpu => drivers}/cpufreq/e_powersaver.c | 0 + .../x86/kernel/cpu => drivers}/cpufreq/elanfreq.c | 0 + .../kernel/cpu => drivers}/cpufreq/gx-suspmod.c | 0 + .../x86/kernel/cpu => drivers}/cpufreq/longhaul.c | 0 + .../x86/kernel/cpu => drivers}/cpufreq/longhaul.h | 0 + {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c | 0 + {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c | 0 + {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h | 0 + .../kernel/cpu => drivers}/cpufreq/p4-clockmod.c | 0 + .../kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c | 0 + .../kernel/cpu => drivers}/cpufreq/powernow-k6.c | 0 + .../kernel/cpu => drivers}/cpufreq/powernow-k7.c | 0 + .../kernel/cpu => drivers}/cpufreq/powernow-k7.h | 0 + .../kernel/cpu => drivers}/cpufreq/powernow-k8.c | 0 + .../kernel/cpu => drivers}/cpufreq/powernow-k8.h | 0 + .../kernel/cpu => drivers}/cpufreq/sc520_freq.c | 0 + .../cpu => drivers}/cpufreq/speedstep-centrino.c | 0 + .../kernel/cpu => drivers}/cpufreq/speedstep-ich.c | 0 + .../kernel/cpu => drivers}/cpufreq/speedstep-lib.c | 0 + .../kernel/cpu => drivers}/cpufreq/speedstep-lib.h | 0 + .../kernel/cpu => drivers}/cpufreq/speedstep-smi.c | 0 + 29 files changed, 37 insertions(+), 36 deletions(-) + delete mode 100644 arch/x86/kernel/cpu/cpufreq/Makefile + rename arch/x86/kernel/cpu/cpufreq/Kconfig => drivers/cpufreq/Kconfig.x86 (97%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/acpi-cpufreq.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/cpufreq-nforce2.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/e_powersaver.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/elanfreq.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/gx-suspmod.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/longhaul.h (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/longrun.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/mperf.h (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/p4-clockmod.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/pcc-cpufreq.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k6.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k7.h (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/powernow-k8.h (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/sc520_freq.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-centrino.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-ich.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.c (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-lib.h (100%) + rename {arch/x86/kernel/cpu => drivers}/cpufreq/speedstep-smi.c (100%) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/x86/lguest/boot.c +Merge made by recursive. + arch/s390/include/asm/cacheflush.h | 1 + + arch/s390/mm/pageattr.c | 5 ++ + arch/x86/lguest/boot.c | 1 + + drivers/block/virtio_blk.c | 91 +++++++++++++++++++++++++++++++---- + drivers/char/virtio_console.c | 5 -- + drivers/virtio/virtio_balloon.c | 21 +++----- + fs/debugfs/file.c | 17 ++----- + include/asm-generic/vmlinux.lds.h | 20 ++++---- + include/linux/bsearch.h | 9 ++++ + include/linux/module.h | 37 ++++++++------- + include/linux/moduleparam.h | 7 ++- + include/linux/string.h | 1 + + kernel/module.c | 86 ++++++++++++++++++++++------------ + kernel/params.c | 23 ++++----- + lib/Makefile | 3 +- + lib/bsearch.c | 53 +++++++++++++++++++++ + lib/string.c | 29 +++++++++++ + scripts/mod/modpost.c | 16 ++---- + scripts/mod/modpost.h | 27 +++-------- + scripts/module-common.lds | 11 ++++ + 20 files changed, 317 insertions(+), 146 deletions(-) + create mode 100644 include/linux/bsearch.h + create mode 100644 lib/bsearch.c +Merging input/next +$ git merge input/next +Auto-merging drivers/input/touchscreen/ads7846.c +Merge made by recursive. + Documentation/input/rotary-encoder.txt | 13 + + arch/arm/mach-tegra/include/mach/kbc.h | 4 +- + drivers/input/evdev.c | 19 +- + drivers/input/input-polldev.c | 56 +----- + drivers/input/input.c | 1 - + drivers/input/joydev.c | 1 - + drivers/input/keyboard/Kconfig | 12 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/gpio_keys.c | 11 +- + drivers/input/keyboard/mpr121_touchkey.c | 339 ++++++++++++++++++++++++++++ + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/input/keyboard/qt1070.c | 1 + + drivers/input/keyboard/sh_keysc.c | 53 ++--- + drivers/input/keyboard/tegra-kbc.c | 60 +++-- + drivers/input/misc/ati_remote2.c | 9 +- + drivers/input/misc/rotary_encoder.c | 119 +++++++--- + drivers/input/misc/twl4030-pwrbutton.c | 2 +- + drivers/input/mousedev.c | 1 - + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ads7846.c | 26 ++- + drivers/input/touchscreen/atmel_mxt_ts.c | 92 +++++--- + drivers/input/touchscreen/h3600_ts_input.c | 8 +- + drivers/input/touchscreen/max11801_ts.c | 272 ++++++++++++++++++++++ + include/linux/gpio_keys.h | 8 +- + include/linux/i2c/mpr121_touchkey.h | 20 ++ + include/linux/rotary_encoder.h | 1 + + include/linux/spi/ads7846.h | 3 +- + 28 files changed, 939 insertions(+), 212 deletions(-) + create mode 100644 drivers/input/keyboard/mpr121_touchkey.c + create mode 100644 drivers/input/touchscreen/max11801_ts.c + create mode 100644 include/linux/i2c/mpr121_touchkey.h +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. + Documentation/blockdev/cciss.txt | 15 + + block/blk-exec.c | 2 +- + block/blk-flush.c | 16 +- + block/blk-lib.c | 82 ++---- + block/blk-settings.c | 6 + + block/blk.h | 21 ++- + block/elevator.c | 7 +- + drivers/ata/libata-scsi.c | 13 +- + drivers/block/cciss.c | 571 ++++++++++++++++++++++++++++++-------- + drivers/block/cciss.h | 11 +- + drivers/block/cciss_cmd.h | 11 + + drivers/block/cciss_scsi.c | 41 ++-- + drivers/block/cciss_scsi.h | 4 - + drivers/block/paride/pcd.c | 1 + + drivers/cdrom/cdrom.c | 6 +- + drivers/cdrom/viocd.c | 3 +- + drivers/ide/ide-cd.c | 3 +- + drivers/scsi/sr.c | 2 +- + fs/block_dev.c | 44 ++- + fs/partitions/check.c | 8 +- + include/linux/blkdev.h | 8 + + include/linux/genhd.h | 2 +- + 22 files changed, 638 insertions(+), 239 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 +Auto-merging drivers/isdn/hisax/elsa_cs.c +Auto-merging drivers/isdn/hisax/teles_cs.c +Auto-merging drivers/net/pcmcia/smc91c92_cs.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Merge made by recursive. + drivers/ata/pata_pcmcia.c | 2 +- + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 2 +- + drivers/bluetooth/btuart_cs.c | 2 +- + drivers/bluetooth/dtl1_cs.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 2 +- + drivers/ide/ide-cs.c | 2 +- + drivers/isdn/hardware/avm/avm_cs.c | 2 +- + drivers/isdn/hisax/avma1_cs.c | 2 +- + drivers/isdn/hisax/elsa_cs.c | 2 +- + drivers/isdn/hisax/sedlbauer_cs.c | 2 +- + drivers/isdn/hisax/teles_cs.c | 2 +- + drivers/mmc/host/sdricoh_cs.c | 2 +- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/net/can/softing/softing_cs.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 2 +- + drivers/net/pcmcia/com20020_cs.c | 2 +- + drivers/net/pcmcia/fmvj18x_cs.c | 2 +- + drivers/net/pcmcia/ibmtr_cs.c | 2 +- + drivers/net/pcmcia/nmclan_cs.c | 2 +- + drivers/net/pcmcia/pcnet_cs.c | 2 +- + drivers/net/pcmcia/smc91c92_cs.c | 2 +- + drivers/net/pcmcia/xirc2ps_cs.c | 2 +- + drivers/net/wireless/airo_cs.c | 2 +- + drivers/net/wireless/atmel_cs.c | 4 ++-- + drivers/net/wireless/b43/pcmcia.c | 2 +- + drivers/net/wireless/hostap/hostap_cs.c | 2 +- + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 2 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 2 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/parport/parport_cs.c | 2 +- + drivers/pcmcia/ds.c | 6 +++--- + drivers/pcmcia/sa1100_generic.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 2 +- + drivers/scsi/pcmcia/fdomain_stub.c | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/pcmcia/qlogic_stub.c | 2 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/das08_cs.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 2 +- + drivers/staging/wlags49_h2/wl_cs.c | 2 +- + drivers/telephony/ixj_pcmcia.c | 2 +- + drivers/tty/ipwireless/main.c | 2 +- + drivers/tty/serial/serial_cs.c | 2 +- + drivers/usb/host/sl811_cs.c | 2 +- + include/pcmcia/ds.h | 2 +- + 58 files changed, 61 insertions(+), 61 deletions(-) +Merging battery/master +$ git merge battery/master +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 27 ++- + drivers/power/Kconfig | 9 + + drivers/power/Makefile | 1 + + drivers/power/gpio-charger.c | 15 + + drivers/power/isp1704_charger.c | 22 ++ + drivers/power/max8903_charger.c | 391 ++++++++++++++++++++++++++ + include/linux/power/isp1704_charger.h | 29 ++ + include/linux/power/max8903_charger.h | 57 ++++ + 8 files changed, 549 insertions(+), 2 deletions(-) + create mode 100644 drivers/power/max8903_charger.c + create mode 100644 include/linux/power/isp1704_charger.h + create mode 100644 include/linux/power/max8903_charger.h +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48e7ada] Merge remote-tracking 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 +Recorded preimage for 'drivers/mmc/host/tmio_mmc_pio.c' +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging drivers/mmc/card/mmc_test.c +Auto-merging drivers/mmc/core/bus.c +Auto-merging drivers/mmc/core/host.c +Auto-merging drivers/mmc/core/mmc.c +Auto-merging drivers/mmc/core/mmc_ops.c +Auto-merging drivers/mmc/core/sdio_irq.c +Auto-merging drivers/mmc/host/sdhci-pci.c +Auto-merging drivers/mmc/host/sdhci.c +Auto-merging drivers/mmc/host/tmio_mmc_pio.c +CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc_pio.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/mmc/host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mmc/host/tmio_mmc_pio.c'. +[master 08dc11e] Merge remote-tracking branch 'mmc/mmc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/mmc/00-INDEX | 2 + + Documentation/mmc/mmc-dev-attrs.txt | 10 + + Documentation/mmc/mmc-dev-parts.txt | 27 + + arch/arm/mach-tegra/include/mach/sdhci.h | 1 + + drivers/mmc/card/block.c | 659 +++++++++++++++++++++++--- + drivers/mmc/card/mmc_test.c | 116 +++--- + drivers/mmc/card/queue.c | 8 - + drivers/mmc/core/bus.c | 11 +- + drivers/mmc/core/core.c | 95 +++- + drivers/mmc/core/core.h | 4 +- + drivers/mmc/core/host.c | 4 +- + drivers/mmc/core/mmc.c | 39 ++- + drivers/mmc/core/mmc_ops.c | 80 ++-- + drivers/mmc/core/mmc_ops.h | 1 - + drivers/mmc/core/quirks.c | 89 ++-- + drivers/mmc/core/sd.c | 403 ++++++++++++++-- + drivers/mmc/core/sd.h | 2 +- + drivers/mmc/core/sd_ops.c | 51 +-- + drivers/mmc/core/sdio.c | 24 +- + drivers/mmc/core/sdio_irq.c | 33 ++- + drivers/mmc/core/sdio_ops.c | 18 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/dw_mmc.c | 6 +- + drivers/mmc/host/sdhci-pci.c | 49 +- + drivers/mmc/host/sdhci-tegra.c | 2 + + drivers/mmc/host/sdhci.c | 775 ++++++++++++++++++++++++++++-- + drivers/mmc/host/sdhci.h | 53 ++- + drivers/mmc/host/sh_mmcif.c | 126 +++++- + drivers/mmc/host/sh_mobile_sdhi.c | 50 ++- + drivers/mmc/host/tmio_mmc.c | 32 +- + drivers/mmc/host/tmio_mmc.h | 16 +- + drivers/mmc/host/tmio_mmc_dma.c | 21 +- + drivers/mmc/host/tmio_mmc_pio.c | 184 +++++++- + include/linux/Kbuild | 1 + + include/linux/mfd/tmio.h | 17 + + include/linux/mmc/Kbuild | 1 + + include/linux/mmc/card.h | 153 ++++++- + include/linux/mmc/core.h | 4 +- + include/linux/mmc/host.h | 42 ++- + include/linux/mmc/ioctl.h | 54 ++ + include/linux/mmc/mmc.h | 12 + + include/linux/mmc/sd.h | 7 + + include/linux/mmc/sdhci.h | 13 + + include/linux/mmc/sh_mobile_sdhi.h | 4 + + 45 files changed, 2794 insertions(+), 508 deletions(-) + create mode 100644 Documentation/mmc/mmc-dev-parts.txt + create mode 100644 include/linux/mmc/Kbuild + create mode 100644 include/linux/mmc/ioctl.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Resolved 'mm/slub.c' using previous resolution. +Auto-merging mm/slub.c +CONFLICT (content): Merge conflict in mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 24aa9e0] Merge remote-tracking branch 'slab/for-next' +$ git diff -M --stat --summary HEAD^.. + include/linux/slub_def.h | 2 - + mm/slub.c | 149 +++++++++++++++------------------------------ + 2 files changed, 50 insertions(+), 101 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Merge made by recursive. + drivers/md/bitmap.c | 10 +- + drivers/md/md.c | 23 ++- + drivers/md/multipath.c | 60 +++--- + drivers/md/multipath.h | 1 - + drivers/md/raid1.c | 506 ++++++++++++++++++++++++------------------------ + drivers/md/raid1.h | 4 +- + drivers/md/raid10.c | 424 +++++++++++++++++++--------------------- + drivers/md/raid5.c | 41 ++-- + 8 files changed, 535 insertions(+), 534 deletions(-) +Merging mfd/for-next +$ git merge mfd/for-next +Recorded preimage for 'drivers/mfd/twl4030-power.c' +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging drivers/mfd/asic3.c +Auto-merging drivers/mfd/twl4030-power.c +CONFLICT (content): Merge conflict in drivers/mfd/twl4030-power.c +Auto-merging drivers/mmc/host/tmio_mmc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/mfd/twl4030-power.c'. +[master a81ca80] Merge remote-tracking branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + drivers/dma/timb_dma.c | 3 +- + drivers/gpio/janz-ttl.c | 3 +- + drivers/gpio/rdc321x-gpio.c | 3 +- + drivers/gpio/timbgpio.c | 6 +- + drivers/i2c/busses/i2c-ocores.c | 3 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/input/misc/twl4030-vibra.c | 3 +- + drivers/leds/leds-88pm860x.c | 7 +- + drivers/leds/leds-mc13783.c | 7 +- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/video/timblogiw.c | 3 +- + drivers/mfd/88pm860x-core.c | 46 ++-- + drivers/mfd/Kconfig | 84 ++++-- + drivers/mfd/Makefile | 2 + + drivers/mfd/ab3100-core.c | 6 +- + drivers/mfd/ab3550-core.c | 6 +- + drivers/mfd/asic3.c | 6 +- + drivers/mfd/davinci_voicecodec.c | 6 +- + drivers/mfd/htc-pasic3.c | 5 +- + drivers/mfd/janz-cmodio.c | 3 +- + drivers/mfd/mc13xxx-core.c | 12 +- + drivers/mfd/mfd-core.c | 7 + + drivers/mfd/pm8921-core.c | 212 +++++++++++++++ + drivers/mfd/pm8xxx-irq.c | 371 ++++++++++++++++++++++++++ + drivers/mfd/rdc321x-southbridge.c | 6 +- + drivers/mfd/t7l66xb.c | 6 +- + drivers/mfd/tc6387xb.c | 3 +- + drivers/mfd/tc6393xb.c | 10 +- + drivers/mfd/timberdale.c | 81 ++++-- + drivers/mfd/tps6105x.c | 3 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/twl-core.c | 62 +++++ + drivers/mfd/twl4030-codec.c | 6 +- + drivers/mfd/twl4030-power.c | 4 +- + drivers/mfd/wl1273-core.c | 7 +- + drivers/mfd/wm831x-core.c | 13 +- + drivers/mfd/wm831x-irq.c | 27 +- + drivers/mfd/wm8400-core.c | 3 +- + drivers/mmc/host/tmio_mmc.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/net/can/janz-ican3.c | 3 +- + drivers/net/ks8842.c | 3 +- + drivers/power/max8925_power.c | 10 +- + drivers/regulator/88pm8607.c | 7 +- + drivers/regulator/ab3100.c | 3 +- + drivers/regulator/max8925-regulator.c | 11 +- + drivers/regulator/mc13783-regulator.c | 7 +- + drivers/regulator/mc13892-regulator.c | 7 +- + drivers/regulator/tps6105x-regulator.c | 4 +- + drivers/spi/xilinx_spi.c | 3 +- + drivers/video/backlight/88pm860x_bl.c | 7 +- + drivers/video/tmiofb.c | 12 +- + drivers/w1/masters/ds1wm.c | 12 +- + drivers/watchdog/rdc321x_wdt.c | 3 +- + include/linux/i2c/twl.h | 19 ++- + include/linux/mfd/abx500.h | 1 + + include/linux/mfd/core.h | 23 +-- + include/linux/mfd/pm8xxx/core.h | 81 ++++++ + include/linux/mfd/pm8xxx/irq.h | 59 ++++ + include/linux/mfd/pm8xxx/pm8921.h | 31 +++ + include/linux/mfd/wm831x/core.h | 26 -- + include/linux/mfd/wm831x/pdata.h | 4 + + sound/soc/codecs/cq93vc.c | 3 +- + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm8400.c | 2 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + 70 files changed, 1143 insertions(+), 264 deletions(-) + create mode 100644 drivers/mfd/pm8921-core.c + create mode 100644 drivers/mfd/pm8xxx-irq.c + create mode 100644 include/linux/mfd/pm8xxx/core.h + create mode 100644 include/linux/mfd/pm8xxx/irq.h + create mode 100644 include/linux/mfd/pm8xxx/pm8921.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/pci/pci.c +Auto-merging include/linux/pci.h +Merge made by recursive. + drivers/gpu/drm/drm_edid.c | 61 ++++++++- + drivers/gpu/drm/drm_fb_helper.c | 233 ++++++++---------------------- + drivers/gpu/drm/drm_irq.c | 9 +- + drivers/gpu/drm/drm_modes.c | 156 ++++++++++++++++++++ + drivers/gpu/drm/drm_stub.c | 21 +++ + drivers/gpu/drm/i915/intel_bios.c | 6 +- + drivers/gpu/drm/i915/intel_display.c | 8 +- + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 108 +++++++++++++-- + drivers/gpu/drm/radeon/radeon_combios.c | 117 +++++++++++++-- + drivers/gpu/drm/radeon/radeon_display.c | 5 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 4 - + drivers/gpu/drm/radeon/radeon_i2c.c | 2 + + drivers/gpu/vga/vga_switcheroo.c | 6 - + drivers/gpu/vga/vgaarb.c | 113 +++++++++++++-- + drivers/pci/pci.c | 25 ++-- + drivers/platform/x86/Kconfig | 7 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/mxm-wmi.c | 111 ++++++++++++++ + include/drm/drmP.h | 49 +++++-- + include/drm/drm_crtc.h | 6 +- + include/drm/drm_edid.h | 25 +++- + include/drm/drm_fb_helper.h | 18 +-- + include/linux/mxm-wmi.h | 33 +++++ + include/linux/pci.h | 7 +- + 25 files changed, 846 insertions(+), 286 deletions(-) + create mode 100644 drivers/platform/x86/mxm-wmi.c + create mode 100644 include/linux/mxm-wmi.h +Merging fbdev/master +$ git merge fbdev/master +Auto-merging drivers/video/Kconfig +Merge made by recursive. + drivers/video/Kconfig | 8 ++ + drivers/video/s3fb.c | 209 +++++++++++++++++++++++++++++++++++++++++++++++-- + 2 files changed, 210 insertions(+), 7 deletions(-) +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Auto-merging drivers/video/Kconfig +Auto-merging drivers/video/via/viafbdev.c +Auto-merging drivers/video/via/viafbdev.h +Merge made by recursive. + drivers/video/Kconfig | 11 + + drivers/video/via/Makefile | 2 +- + drivers/video/via/chip.h | 6 - + drivers/video/via/dvi.c | 160 +---------- + drivers/video/via/dvi.h | 2 +- + drivers/video/via/global.c | 4 - + drivers/video/via/global.h | 2 - + drivers/video/via/hw.c | 624 ++++++++++++++--------------------------- + drivers/video/via/hw.h | 15 +- + drivers/video/via/lcd.c | 23 +- + drivers/video/via/lcd.h | 2 +- + drivers/video/via/share.h | 17 +- + drivers/video/via/via-core.c | 9 +- + drivers/video/via/via_clock.c | 349 +++++++++++++++++++++++ + drivers/video/via/via_clock.h | 76 +++++ + drivers/video/via/viafbdev.c | 23 +- + drivers/video/via/viafbdev.h | 4 - + drivers/video/via/viamode.c | 46 +--- + drivers/video/via/viamode.h | 9 - + 19 files changed, 688 insertions(+), 696 deletions(-) + create mode 100644 drivers/video/via/via_clock.c + create mode 100644 drivers/video/via/via_clock.h +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Resolved 'drivers/video/omap2/dss/dss_features.c' using previous resolution. +Resolved 'drivers/video/omap2/dss/dss_features.h' using previous resolution. +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging drivers/video/omap2/dss/dsi.c +Auto-merging drivers/video/omap2/dss/dss.c +Auto-merging drivers/video/omap2/dss/dss_features.c +CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.c +Auto-merging drivers/video/omap2/dss/dss_features.h +CONFLICT (content): Merge conflict in drivers/video/omap2/dss/dss_features.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7769af3] Merge remote-tracking branch 'omap_dss2/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/board-4430sdp.c | 153 ++++- + arch/arm/mach-omap2/display.c | 75 ++- + arch/arm/plat-omap/include/plat/display.h | 57 ++- + arch/arm/plat-omap/include/plat/nokia-dsi-panel.h | 6 +- + drivers/video/omap2/displays/panel-generic-dpi.c | 54 ++- + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 4 +- + drivers/video/omap2/displays/panel-taal.c | 424 +++++++++++- + .../video/omap2/displays/panel-tpo-td043mtea1.c | 8 +- + drivers/video/omap2/dss/Kconfig | 33 +- + drivers/video/omap2/dss/core.c | 7 +- + drivers/video/omap2/dss/dispc.c | 12 +- + drivers/video/omap2/dss/display.c | 44 +- + drivers/video/omap2/dss/dpi.c | 83 ++-- + drivers/video/omap2/dss/dsi.c | 731 +++++++++++++++----- + drivers/video/omap2/dss/dss.c | 68 ++- + drivers/video/omap2/dss/dss.h | 25 +- + drivers/video/omap2/dss/dss_features.c | 39 +- + drivers/video/omap2/dss/dss_features.h | 34 +- + drivers/video/omap2/dss/hdmi.c | 27 +- + drivers/video/omap2/dss/overlay.c | 41 +- + drivers/video/omap2/dss/venc.c | 21 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 12 +- + drivers/video/omap2/omapfb/omapfb-main.c | 105 ++- + drivers/video/omap2/omapfb/omapfb-sysfs.c | 21 +- + 24 files changed, 1587 insertions(+), 497 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/mc13892-regulator.c +Auto-merging drivers/regulator/tps6105x-regulator.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9ccbe68] Merge remote-tracking branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/regulator/machine.txt | 4 +- + drivers/mfd/Kconfig | 8 + + drivers/mfd/Makefile | 1 + + drivers/mfd/tps65910-gpio.c | 91 ++++ + drivers/mfd/tps65910-irq.c | 187 +++++++ + drivers/mfd/tps65910.c | 227 +++++++++ + drivers/regulator/Kconfig | 6 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 62 ++-- + drivers/regulator/mc13892-regulator.c | 16 +- + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/tps65910-regulator.c | 705 ++++++++++++++++++++++++++ + drivers/regulator/twl-regulator.c | 209 ++++++-- + drivers/regulator/wm831x-dcdc.c | 2 - + drivers/regulator/wm8400-regulator.c | 12 +- + include/linux/mfd/tps65910.h | 774 +++++++++++++++++++++++++++++ + include/linux/regulator/machine.h | 7 +- + 17 files changed, 2213 insertions(+), 100 deletions(-) + create mode 100644 drivers/mfd/tps65910-gpio.c + create mode 100644 drivers/mfd/tps65910-irq.c + create mode 100644 drivers/mfd/tps65910.c + create mode 100644 drivers/regulator/tps65910-regulator.c + create mode 100644 include/linux/mfd/tps65910.h +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + fs/binfmt_flat.c | 8 +++ + include/linux/capability.h | 7 +-- + include/linux/init_task.h | 7 --- + include/linux/key.h | 13 +++++ + include/linux/kmod.h | 3 + + kernel/capability.c | 4 -- + kernel/cred.c | 6 +- + kernel/kmod.c | 100 ++++++++++++++++++++++++++++++++++++++ + kernel/sysctl.c | 6 ++ + net/dns_resolver/dns_key.c | 10 ++-- + security/Kconfig | 1 + + security/commoncap.c | 13 ++--- + security/keys/internal.h | 4 +- + security/keys/keyctl.c | 6 ++ + security/keys/keyring.c | 37 +++++++++----- + security/keys/proc.c | 2 +- + security/keys/process_keys.c | 12 +++-- + security/keys/request_key.c | 3 +- + security/keys/request_key_auth.c | 3 +- + security/keys/user_defined.c | 4 +- + security/tomoyo/common.c | 17 +++++-- + security/tomoyo/file.c | 1 - + security/tomoyo/memory.c | 1 + + security/tomoyo/mount.c | 1 + + security/tomoyo/util.c | 2 +- + 25 files changed, 207 insertions(+), 64 deletions(-) +Merging selinux/master +$ git merge selinux/master +Resolved 'lib/flex_array.c' using previous resolution. +Resolved 'security/selinux/avc.c' using previous resolution. +Resolved 'security/selinux/hooks.c' using previous resolution. +Resolved 'security/smack/smack_lsm.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging lib/flex_array.c +CONFLICT (content): Merge conflict in lib/flex_array.c +Auto-merging security/selinux/avc.c +CONFLICT (content): Merge conflict in security/selinux/avc.c +Auto-merging security/selinux/hooks.c +CONFLICT (content): Merge conflict in security/selinux/hooks.c +Auto-merging security/selinux/ss/policydb.c +Auto-merging security/selinux/ss/services.c +Auto-merging security/smack/smack_lsm.c +CONFLICT (content): Merge conflict in security/smack/smack_lsm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ff401f7] Merge remote-tracking branch 'selinux/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 +- + include/linux/lsm_audit.h | 11 +- + lib/flex_array.c | 26 +++- + security/lsm_audit.c | 59 +++++---- + security/selinux/avc.c | 2 +- + security/selinux/hooks.c | 92 ++++++++----- + security/selinux/include/security.h | 9 +- + security/selinux/netnode.c | 1 + + security/selinux/selinuxfs.c | 28 ++++- + security/selinux/ss/policydb.c | 248 +++++++++++++++++++++++----------- + security/selinux/ss/policydb.h | 12 ++- + security/selinux/ss/services.c | 72 ++++++----- + security/smack/smack.h | 11 +- + security/smack/smack_lsm.c | 48 ++++--- + 14 files changed, 398 insertions(+), 224 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging CREDITS +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-at91/at91cap9_devices.c +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Auto-merging arch/arm/mach-at91/at91sam9rl_devices.c +Auto-merging arch/mips/include/asm/cpu.h +Auto-merging arch/mips/mm/c-r4k.c +Auto-merging drivers/leds/leds-mc13783.c +Auto-merging drivers/md/raid5.c +Auto-merging drivers/media/dvb/dvb-usb/dw2102.c +Auto-merging drivers/media/video/usbvision/usbvision-video.c +Auto-merging drivers/net/atlx/atl1.c +Auto-merging drivers/net/s2io.c +Auto-merging drivers/net/ucc_geth_ethtool.c +Auto-merging drivers/net/usb/usbnet.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-calib.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/rtlwifi/core.c +Auto-merging drivers/net/wireless/rtlwifi/rtl8192ce/hw.c +Auto-merging drivers/regulator/mc13783-regulator.c +Auto-merging drivers/scsi/be2iscsi/be_main.c +Auto-merging drivers/scsi/constants.c +Auto-merging drivers/scsi/esp_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_bsg.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/vsprintf.c +Auto-merging mm/page_alloc.c +Auto-merging security/selinux/selinuxfs.c +Merge made by recursive. + CREDITS | 2 +- + .../devicetree/bindings/powerpc/nintendo/wii.txt | 2 +- + Documentation/feature-removal-schedule.txt | 2 +- + Documentation/stable_api_nonsense.txt | 2 +- + Documentation/sysctl/vm.txt | 4 +- + MAINTAINERS | 3 +- + arch/Kconfig | 3 -- + arch/arm/mach-at91/at91cap9_devices.c | 2 +- + arch/arm/mach-at91/at91sam9g45_devices.c | 2 +- + arch/arm/mach-at91/at91sam9rl_devices.c | 2 +- + arch/arm/mach-msm/include/mach/msm_iomap.h | 2 +- + arch/arm/mach-omap2/control.h | 2 +- + arch/arm/mach-tegra/tegra2_clocks.c | 2 +- + arch/arm/mach-ux500/mbox-db5500.c | 6 +--- + arch/arm/plat-iop/time.c | 1 - + arch/arm/plat-mxc/cpufreq.c | 4 +- + arch/ia64/hp/common/sba_iommu.c | 2 +- + arch/m68k/include/asm/MC68EZ328.h | 2 +- + arch/m68k/include/asm/MC68VZ328.h | 2 +- + arch/mips/fw/arc/cmdline.c | 2 +- + arch/mips/fw/arc/env.c | 2 +- + arch/mips/fw/arc/identify.c | 2 +- + arch/mips/fw/arc/init.c | 2 +- + arch/mips/fw/arc/misc.c | 2 +- + arch/mips/fw/arc/salone.c | 2 +- + arch/mips/fw/arc/time.c | 2 +- + arch/mips/fw/arc/tree.c | 2 +- + arch/mips/include/asm/asmmacro-32.h | 2 +- + arch/mips/include/asm/asmmacro-64.h | 2 +- + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/r4kcache.h | 2 +- + arch/mips/include/asm/sgialib.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 2 +- + arch/mips/kernel/r2300_switch.S | 2 +- + arch/mips/kernel/r4k_fpu.S | 2 +- + arch/mips/kernel/r4k_switch.S | 2 +- + arch/mips/kernel/r6000_fpu.S | 2 +- + arch/mips/mm/c-r3k.c | 2 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/c-tx39.c | 2 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-r5k.c | 2 +- + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/rb532/gpio.c | 2 +- + arch/mips/sgi-ip22/ip22-hpc.c | 2 +- + arch/mips/sgi-ip22/ip22-int.c | 2 +- + arch/mips/sgi-ip22/ip22-mc.c | 2 +- + arch/mips/sgi-ip22/ip22-setup.c | 2 +- + arch/powerpc/include/asm/pte-hash64-64k.h | 2 +- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/s390/hypfs/hypfs.h | 2 +- + arch/um/drivers/mmapper_kern.c | 2 +- + arch/x86/xen/pci-swiotlb-xen.c | 2 +- + arch/xtensa/configs/s6105_defconfig | 1 - + drivers/acpi/acpica/utresrc.c | 2 +- + drivers/acpi/video.c | 2 +- + drivers/base/memory.c | 9 +++--- + drivers/dma/dmatest.c | 4 +- + drivers/firmware/efivars.c | 2 +- + drivers/firmware/iscsi_ibft.c | 4 +- + drivers/gpio/ab8500-gpio.c | 7 ++--- + drivers/gpio/langwell_gpio.c | 2 +- + drivers/gpu/drm/radeon/radeon_fence.c | 2 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/ttm/ttm_object.c | 2 +- + drivers/leds/leds-mc13783.c | 2 +- + drivers/macintosh/therm_pm72.c | 4 +- + drivers/md/raid5.c | 2 +- + drivers/media/dvb/dvb-usb/dw2102.c | 2 +- + drivers/media/video/msp3400-driver.c | 2 +- + drivers/media/video/saa7164/saa7164-encoder.c | 2 +- + drivers/media/video/saa7164/saa7164-vbi.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 5 ++- + drivers/message/fusion/mptbase.c | 22 +++++++--------- + drivers/message/i2o/README.ioctl | 2 +- + drivers/misc/bh1780gli.c | 8 +++--- + drivers/misc/cs5535-mfgpt.c | 4 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 +- + drivers/misc/spear13xx_pcie_gadget.c | 4 +- + drivers/net/atlx/atl1.c | 5 ++- + drivers/net/can/pch_can.c | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/irda/ali-ircc.c | 2 +- + drivers/net/s2io.c | 2 +- + drivers/net/sgiseeq.c | 2 +- + drivers/net/sgiseeq.h | 2 +- + drivers/net/ucc_geth_ethtool.c | 2 +- + drivers/net/usb/usbnet.c | 2 +- + drivers/net/wan/pc300_drv.c | 2 +- + drivers/net/wireless/airo.c | 27 ++++++++++--------- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 8 +++--- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlegacy/iwl-4965-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 2 +- + drivers/net/wireless/rtlwifi/core.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 4 +- + drivers/power/intel_mid_battery.c | 2 +- + drivers/regulator/max8998.c | 4 +- + drivers/regulator/mc13783-regulator.c | 2 +- + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.c | 2 +- + drivers/scsi/aic7xxx/aicasm/aicasm_symbol.h | 2 +- + drivers/scsi/be2iscsi/be_main.c | 4 +- + drivers/scsi/constants.c | 2 +- + drivers/scsi/esp_scsi.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_hw.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/nsp32_debug.c | 2 +- + drivers/scsi/pcmcia/nsp_debug.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 4 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 2 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/target/target_core_alua.c | 4 +- + drivers/target/target_core_transport.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/serial/bfin_sport_uart.c | 3 +- + drivers/tty/serial/mfd.c | 4 +- + drivers/tty/serial/mrst_max3110.c | 2 +- + drivers/tty/tty_ioctl.c | 2 +- + drivers/usb/host/imx21-dbg.c | 2 +- + drivers/usb/host/uhci-hcd.c | 7 +++-- + drivers/usb/misc/usbtest.c | 2 +- + drivers/usb/storage/ene_ub6250.c | 4 +- + drivers/video/console/newport_con.c | 2 +- + drivers/video/msm/mddi.c | 2 +- + drivers/video/mxsfb.c | 2 +- + drivers/watchdog/bcm63xx_wdt.c | 2 +- + drivers/xen/evtchn.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/btrfs/relocation.c | 2 +- + fs/freevxfs/vxfs_inode.c | 2 +- + fs/logfs/readwrite.c | 2 +- + fs/nfsd/stats.c | 2 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/partitions/ldm.c | 2 +- + fs/squashfs/Kconfig | 4 +- + fs/squashfs/cache.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/xfs/xfs_inode.c | 2 +- + include/linux/leds-regulator.h | 2 +- + include/linux/posix-clock.h | 2 +- + include/net/genetlink.h | 2 +- + include/net/netlink.h | 2 +- + include/video/newport.h | 2 +- + kernel/Kconfig.locks | 2 +- + kernel/auditsc.c | 27 ++++++++++++------- + kernel/pm_qos_params.c | 2 +- + lib/Kconfig.debug | 3 +- + lib/vsprintf.c | 9 ++---- + mm/hugetlb.c | 2 +- + mm/page_alloc.c | 2 +- + net/netfilter/ipset/ip_set_bitmap_ip.c | 2 +- + net/sunrpc/addr.c | 2 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 2 +- + security/selinux/selinuxfs.c | 8 +++--- + tools/perf/util/ui/browsers/annotate.c | 1 - + tools/power/x86/turbostat/turbostat.c | 2 +- + 164 files changed, 241 insertions(+), 244 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Resolved 'arch/x86/Kconfig' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-omap2/Makefile +Removing arch/arm/mach-omap2/pm_bus.c +Auto-merging arch/arm/plat-omap/gpio.c +Auto-merging arch/powerpc/platforms/powermac/pic.c +Auto-merging arch/powerpc/sysdev/ipic.c +Auto-merging arch/powerpc/sysdev/mpic.c +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging include/linux/kmod.h +Auto-merging kernel/kmod.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2370961] Merge remote-tracking branch 'suspend/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + Documentation/kernel-parameters.txt | 2 +- + arch/arm/common/vic.c | 69 ++--- + arch/arm/include/asm/mach/time.h | 1 - + arch/arm/kernel/leds.c | 28 +- + arch/arm/kernel/time.c | 35 +-- + arch/arm/mach-exynos4/pm.c | 45 ++-- + arch/arm/mach-integrator/integrator_ap.c | 26 +-- + arch/arm/mach-omap1/pm_bus.c | 69 ++--- + arch/arm/mach-omap2/Makefile | 6 +- + arch/arm/mach-omap2/pm_bus.c | 85 ------ + arch/arm/mach-pxa/balloon3.c | 1 - + arch/arm/mach-pxa/clock-pxa2xx.c | 18 +- + arch/arm/mach-pxa/clock-pxa3xx.c | 17 +- + arch/arm/mach-pxa/clock.h | 7 +- + arch/arm/mach-pxa/cm-x270.c | 1 - + arch/arm/mach-pxa/cm-x2xx.c | 23 +- + arch/arm/mach-pxa/colibri-evalboard.c | 1 - + arch/arm/mach-pxa/colibri-pxa270-income.c | 1 - + arch/arm/mach-pxa/colibri-pxa270.c | 1 - + arch/arm/mach-pxa/generic.h | 8 +- + arch/arm/mach-pxa/irq.c | 17 +- + arch/arm/mach-pxa/lpd270.c | 20 +- + arch/arm/mach-pxa/lubbock.c | 21 +- + arch/arm/mach-pxa/mainstone.c | 22 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 12 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 21 +- + arch/arm/mach-pxa/mioa701.c | 43 +--- + arch/arm/mach-pxa/palmld.c | 1 - + arch/arm/mach-pxa/palmtreo.c | 1 - + arch/arm/mach-pxa/palmz72.c | 24 +- + arch/arm/mach-pxa/pxa25x.c | 25 +-- + arch/arm/mach-pxa/pxa27x.c | 25 +-- + arch/arm/mach-pxa/pxa3xx.c | 25 +-- + arch/arm/mach-pxa/pxa95x.c | 20 +- + arch/arm/mach-pxa/raumfeld.c | 1 - + arch/arm/mach-pxa/smemc.c | 29 +-- + arch/arm/mach-pxa/trizeps4.c | 1 - + arch/arm/mach-pxa/viper.c | 12 +- + arch/arm/mach-pxa/vpac270.c | 1 - + arch/arm/mach-s3c2410/irq.c | 30 +-- + arch/arm/mach-s3c2410/mach-bast.c | 17 +- + arch/arm/mach-s3c2410/pm.c | 13 +- + arch/arm/mach-s3c2410/s3c2410.c | 5 + + arch/arm/mach-s3c2412/irq.c | 2 - + arch/arm/mach-s3c2412/mach-jive.c | 19 +- + arch/arm/mach-s3c2412/pm.c | 27 +- + arch/arm/mach-s3c2412/s3c2412.c | 4 + + arch/arm/mach-s3c2416/irq.c | 2 - + arch/arm/mach-s3c2416/pm.c | 27 +- + arch/arm/mach-s3c2416/s3c2416.c | 5 + + arch/arm/mach-s3c2440/mach-osiris.c | 18 +- + arch/arm/mach-s3c2440/s3c2440.c | 8 + + arch/arm/mach-s3c2440/s3c2442.c | 6 + + arch/arm/mach-s3c2440/s3c244x-irq.c | 4 - + arch/arm/mach-s3c2440/s3c244x.c | 62 ++-- + arch/arm/mach-s3c64xx/irq-pm.c | 18 +- + arch/arm/mach-s5pv210/pm.c | 25 ++- + arch/arm/mach-sa1100/irq.c | 19 +- + arch/arm/mach-shmobile/pm_runtime.c | 145 ++-------- + arch/arm/plat-omap/gpio.c | 35 +-- + arch/arm/plat-omap/omap_device.c | 23 ++ + arch/arm/plat-pxa/gpio.c | 17 +- + arch/arm/plat-pxa/mfp.c | 1 - + arch/arm/plat-s3c24xx/dma.c | 68 ++--- + arch/arm/plat-s3c24xx/irq-pm.c | 7 +- + arch/arm/plat-s5p/irq-pm.c | 7 +- + arch/arm/plat-samsung/include/plat/cpu.h | 6 + + arch/arm/plat-samsung/include/plat/pm.h | 6 +- + arch/arm/vfp/vfpmodule.c | 19 +- + arch/avr32/mach-at32ap/intc.c | 38 +-- + arch/blackfin/kernel/nmi.c | 30 +-- + arch/powerpc/include/asm/mpic.h | 3 - + arch/powerpc/platforms/cell/spu_base.c | 28 ++- + arch/powerpc/platforms/powermac/pic.c | 42 +-- + arch/powerpc/sysdev/ipic.c | 36 +-- + arch/powerpc/sysdev/mpic.c | 48 ++-- + arch/sh/Kconfig | 1 - + arch/sh/kernel/cpu/shmobile/pm_runtime.c | 33 ++- + arch/unicore32/kernel/irq.c | 23 +- + arch/x86/Kconfig | 1 - + arch/x86/kernel/acpi/sleep.c | 5 - + arch/x86/kernel/apm_32.c | 4 - + drivers/base/Kconfig | 7 - + drivers/base/base.h | 2 - + drivers/base/dd.c | 6 +- + drivers/base/firmware_class.c | 5 + + drivers/base/platform.c | 138 ++-------- + drivers/base/power/Makefile | 1 + + drivers/base/power/clock_ops.c | 431 ++++++++++++++++++++++++++++ + drivers/base/power/main.c | 64 ++--- + drivers/base/power/runtime.c | 29 +-- + drivers/base/power/sysfs.c | 4 +- + drivers/base/power/wakeup.c | 1 - + drivers/base/sys.c | 202 +------------- + drivers/xen/manage.c | 8 +- + include/linux/device.h | 7 - + include/linux/kmod.h | 1 + + include/linux/platform_device.h | 63 ++++- + include/linux/pm.h | 9 +- + include/linux/pm_runtime.h | 42 +++ + include/linux/sysdev.h | 11 - + kernel/freezer.c | 4 +- + kernel/kexec.c | 9 +- + kernel/kmod.c | 16 +- + kernel/power/Kconfig | 4 + + kernel/power/hibernate.c | 18 +- + kernel/power/suspend.c | 10 +- + kernel/sys.c | 3 - + 109 files changed, 1207 insertions(+), 1598 deletions(-) + delete mode 100644 arch/arm/mach-omap2/pm_bus.c + create mode 100644 drivers/base/power/clock_ops.c +Merging apm/for-next +$ git merge apm/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 5 +++-- + drivers/char/apm-emulation.c | 3 ++- + 2 files changed, 5 insertions(+), 3 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/mark.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 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 arch/powerpc/kernel/prom.c +Merge made by recursive. + arch/microblaze/kernel/prom.c | 2 +- + arch/mips/include/asm/prom.h | 3 - + arch/mips/kernel/prom.c | 3 +- + arch/powerpc/kernel/prom.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 10 ++--- + drivers/of/fdt.c | 8 ++-- + drivers/of/platform.c | 54 ++++++++++++++++++++++++-- + include/linux/of_platform.h | 3 + + 8 files changed, 65 insertions(+), 20 deletions(-) +Merging spi/spi/next +$ git merge spi/spi/next +Auto-merging drivers/spi/dw_spi.c +Auto-merging drivers/spi/dw_spi.h +Merge made by recursive. + drivers/spi/dw_spi.c | 202 ++++++++++++++++--------------------------------- + drivers/spi/dw_spi.h | 2 - + 2 files changed, 66 insertions(+), 138 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Recorded preimage for 'arch/mips/kernel/i8253.c' +Recorded preimage for 'arch/x86/kernel/i8253.c' +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/blackfin/mach-common/smp.c +Auto-merging arch/mips/cavium-octeon/smp.c +Auto-merging arch/mips/kernel/i8253.c +CONFLICT (content): Merge conflict in arch/mips/kernel/i8253.c +Auto-merging arch/mips/sgi-ip27/ip27-timer.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/sparc/kernel/smp_32.c +Auto-merging arch/x86/Kconfig +Removing arch/x86/include/asm/srat.h +Auto-merging arch/x86/kernel/i8253.c +CONFLICT (content): Merge conflict in arch/x86/kernel/i8253.c +Auto-merging arch/x86/kernel/probe_roms.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/x86_init.c +Auto-merging arch/x86/lguest/boot.c +Auto-merging arch/x86/mm/amdtopology.c +Auto-merging arch/x86/mm/srat.c +Removing arch/x86/mm/srat_32.c +Auto-merging drivers/cpufreq/Kconfig.x86 +Auto-merging drivers/net/ixgbe/ixgbe_main.c +Auto-merging drivers/net/macvlan.c +Auto-merging drivers/rtc/Kconfig +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/capability.h +Auto-merging include/linux/init_task.h +Removing include/linux/jump_label_ref.h +Auto-merging include/net/sctp/sctp.h +Auto-merging init/Kconfig +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging net/batman-adv/gateway_client.c +Auto-merging net/batman-adv/originator.c +Auto-merging net/batman-adv/soft-interface.c +Auto-merging net/core/net-sysfs.c +Auto-merging net/core/net_namespace.c +Auto-merging net/decnet/dn_dev.c +Auto-merging net/ipv4/fib_trie.c +Auto-merging net/ipv4/igmp.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv6/mcast.c +Auto-merging net/ipv6/sit.c +Auto-merging net/mac80211/work.c +Auto-merging net/phonet/pn_dev.c +Auto-merging net/sctp/ipv6.c +Auto-merging net/sctp/protocol.c +Auto-merging net/socket.c +Auto-merging security/keys/user_defined.c +Auto-merging tools/perf/config/feature-tests.mak +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/mips/kernel/i8253.c'. +Recorded resolution for 'arch/x86/kernel/i8253.c'. +[master 0876f46] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/00-INDEX | 2 +- + Documentation/RCU/stallwarn.txt | 23 +- + Documentation/RCU/trace.txt | 295 +++- + Documentation/filesystems/proc.txt | 1 - + Documentation/trace/kprobetrace.txt | 1 - + arch/alpha/kernel/smp.c | 3 +- + arch/alpha/kernel/time.c | 3 +- + arch/arm/kernel/smp.c | 5 +- + arch/blackfin/kernel/time-ts.c | 35 +- + arch/blackfin/mach-common/smp.c | 3 + + arch/cris/arch-v32/kernel/smp.c | 13 +- + arch/ia64/kernel/cyclone.c | 6 +- + arch/ia64/kernel/irq_ia64.c | 2 + + arch/ia64/kernel/time.c | 9 +- + arch/ia64/sn/kernel/sn2/timer.c | 6 +- + arch/ia64/xen/irq_xen.c | 10 +- + arch/m32r/kernel/smp.c | 4 +- + arch/microblaze/kernel/timer.c | 6 +- + arch/mips/alchemy/common/time.c | 3 +- + arch/mips/cavium-octeon/csrc-octeon.c | 3 +- + arch/mips/cavium-octeon/smp.c | 2 + + arch/mips/include/asm/jump_label.h | 22 +- + arch/mips/include/asm/time.h | 6 - + arch/mips/jz4740/time.c | 3 +- + arch/mips/kernel/cevt-txx9.c | 3 +- + arch/mips/kernel/csrc-bcm1480.c | 3 +- + arch/mips/kernel/csrc-ioasic.c | 4 +- + arch/mips/kernel/csrc-powertv.c | 35 +- + arch/mips/kernel/csrc-r4k.c | 4 +- + arch/mips/kernel/csrc-sb1250.c | 3 +- + arch/mips/kernel/smtc.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 5 +- + arch/mips/mti-malta/malta-int.c | 2 + + arch/mips/pmc-sierra/yosemite/smp.c | 4 + + arch/mips/sgi-ip27/ip27-irq.c | 2 + + arch/mips/sgi-ip27/ip27-timer.c | 3 +- + arch/mips/sibyte/bcm1480/smp.c | 7 +- + arch/mips/sibyte/sb1250/smp.c | 7 +- + arch/mn10300/kernel/smp.c | 5 +- + arch/parisc/kernel/smp.c | 5 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/jump_label.h | 37 + + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/jump_label.c | 59 + + arch/s390/kernel/smp.c | 6 +- + arch/sh/kernel/smp.c | 2 + + arch/sparc/include/asm/jump_label.h | 25 +- + arch/sparc/include/asm/topology_64.h | 6 +- + arch/sparc/kernel/smp_32.c | 4 +- + arch/sparc/kernel/smp_64.c | 1 + + arch/tile/kernel/smp.c | 6 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/Kconfig | 48 +- + arch/x86/Kconfig.cpu | 16 +- + arch/x86/Makefile_32.cpu | 2 +- + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/alternative.h | 9 - + arch/x86/include/asm/amd_iommu_proto.h | 13 +- + arch/x86/include/asm/amd_iommu_types.h | 28 +- + arch/x86/include/asm/amd_nb.h | 1 - + arch/x86/include/asm/apic.h | 9 +- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/dma.h | 12 +- + arch/x86/include/asm/efi.h | 1 + + arch/x86/include/asm/jump_label.h | 27 +- + arch/x86/include/asm/mach_traps.h | 18 +- + arch/x86/include/asm/mce.h | 2 - + arch/x86/include/asm/mmzone_32.h | 20 - + arch/x86/include/asm/mmzone_64.h | 23 - + arch/x86/include/asm/module.h | 2 +- + arch/x86/include/asm/nops.h | 146 ++- + arch/x86/include/asm/numa.h | 32 +- + arch/x86/include/asm/numa_32.h | 10 - + arch/x86/include/asm/numa_64.h | 36 - + arch/x86/include/asm/numaq.h | 7 +- + arch/x86/include/asm/olpc_ofw.h | 9 +- + arch/x86/include/asm/percpu.h | 29 +- + arch/x86/include/asm/probe_roms.h | 8 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/include/asm/srat.h | 39 - + arch/x86/include/asm/system.h | 85 +- + arch/x86/include/asm/topology.h | 8 - + arch/x86/include/asm/uv/uv_hub.h | 2 + + arch/x86/include/asm/uv/uv_mmrs.h | 16 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/alternative.c | 194 ++- + arch/x86/kernel/amd_iommu.c | 526 ++++--- + arch/x86/kernel/amd_iommu_init.c | 48 +- + arch/x86/kernel/apb_timer.c | 10 +- + arch/x86/kernel/aperture_64.c | 34 +- + arch/x86/kernel/apic/apic.c | 69 +- + arch/x86/kernel/apic/apic_noop.c | 9 - + arch/x86/kernel/apic/bigsmp_32.c | 1 - + arch/x86/kernel/apic/es7000_32.c | 7 - + arch/x86/kernel/apic/numaq_32.c | 34 +- + arch/x86/kernel/apic/probe_32.c | 1 - + arch/x86/kernel/apic/summit_32.c | 1 - + arch/x86/kernel/apic/x2apic_uv_x.c | 48 +- + arch/x86/kernel/cpu/mcheck/mce.c | 25 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 10 +- + arch/x86/kernel/cpu/perf_event.c | 15 +- + arch/x86/kernel/cpu/perf_event_amd.c | 14 +- + arch/x86/kernel/cpu/perf_event_intel.c | 37 +- + arch/x86/kernel/cpu/perf_event_p4.c | 7 +- + arch/x86/kernel/ftrace.c | 4 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/jump_label.c | 5 +- + arch/x86/kernel/kprobes.c | 5 +- + arch/x86/kernel/kvmclock.c | 6 +- + arch/x86/kernel/module.c | 1 + + arch/x86/kernel/mpparse.c | 6 +- + arch/x86/kernel/pci-iommu_table.c | 18 +- + arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++ + arch/x86/kernel/process.c | 4 +- + arch/x86/kernel/reboot.c | 24 +- + arch/x86/kernel/setup.c | 6 +- + arch/x86/kernel/smp.c | 5 +- + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/lguest/boot.c | 4 +- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/mm/Makefile | 4 +- + arch/x86/mm/{amdtopology_64.c => amdtopology.c} | 21 +- + arch/x86/mm/init_32.c | 1 + + arch/x86/mm/init_64.c | 8 - + arch/x86/mm/ioremap.c | 14 +- + arch/x86/mm/numa.c | 550 +++++++- + arch/x86/mm/numa_32.c | 398 ++---- + arch/x86/mm/numa_64.c | 644 +-------- + arch/x86/mm/numa_emulation.c | 16 +- + arch/x86/mm/numa_internal.h | 8 + + arch/x86/mm/{srat_64.c => srat.c} | 82 +- + arch/x86/mm/srat_32.c | 288 ---- + arch/x86/platform/efi/efi.c | 78 +- + arch/x86/platform/efi/efi_64.c | 34 +- + arch/x86/platform/mrst/mrst.c | 4 +- + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 +- + arch/x86/platform/olpc/olpc_dt.c | 19 + + arch/x86/platform/uv/uv_time.c | 6 +- + arch/x86/xen/smp.c | 5 +- + arch/x86/xen/time.c | 6 +- + drivers/acpi/processor_throttling.c | 32 +- + drivers/char/hpet.c | 6 +- + drivers/clocksource/cyclone.c | 10 +- + drivers/cpufreq/Kconfig.x86 | 4 +- + drivers/firmware/edd.c | 22 +- + drivers/net/ixgbe/ixgbe_main.c | 7 +- + drivers/net/macvlan.c | 10 +- + drivers/pci/intel-iommu.c | 1 + + drivers/pci/iov.c | 1 + + drivers/pci/pci.h | 37 - + drivers/rtc/Kconfig | 7 +- + drivers/rtc/class.c | 23 +- + drivers/rtc/rtc-davinci.c | 5 +- + drivers/rtc/rtc-ds1286.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 5 +- + drivers/rtc/rtc-m41t80.c | 5 +- + drivers/rtc/rtc-max8925.c | 5 +- + drivers/rtc/rtc-max8998.c | 5 +- + drivers/rtc/rtc-mc13xxx.c | 8 +- + drivers/rtc/rtc-msm6242.c | 3 +- + drivers/rtc/rtc-mxc.c | 19 +- + drivers/rtc/rtc-pcap.c | 4 +- + drivers/rtc/rtc-rp5c01.c | 5 +- + fs/timerfd.c | 57 +- + include/asm-generic/vmlinux.lds.h | 14 +- + include/linux/alarmtimer.h | 40 + + include/linux/capability.h | 7 +- + include/linux/dynamic_debug.h | 2 - + include/linux/ftrace.h | 8 +- + include/linux/hrtimer.h | 18 +- + include/linux/init_task.h | 1 - + include/linux/interrupt.h | 1 - + include/linux/jump_label.h | 89 +- + include/linux/jump_label_ref.h | 44 - + include/linux/mutex.h | 2 +- + include/linux/pci-ats.h | 52 + + include/linux/perf_event.h | 121 +- + include/linux/posix-timers.h | 2 + + include/linux/rbtree.h | 8 + + include/linux/rcupdate.h | 70 +- + include/linux/rcutiny.h | 8 + + include/linux/rcutree.h | 13 + + include/linux/sched.h | 61 +- + include/linux/seqlock.h | 4 +- + include/linux/time.h | 9 + + include/linux/timerfd.h | 3 +- + include/linux/timerqueue.h | 2 +- + include/linux/tracepoint.h | 22 +- + include/net/sctp/sctp.h | 1 - + include/trace/events/irq.h | 3 +- + init/Kconfig | 7 +- + kernel/Makefile | 6 +- + kernel/cgroup.c | 27 +- + kernel/cpuset.c | 2 +- + kernel/events/Makefile | 6 + + kernel/{perf_event.c => events/core.c} | 64 +- + kernel/{ => events}/hw_breakpoint.c | 0 + kernel/fork.c | 5 +- + kernel/hrtimer.c | 161 ++- + kernel/hung_task.c | 2 +- + kernel/irq/Kconfig | 4 + + kernel/irq/Makefile | 2 +- + kernel/jump_label.c | 539 +++---- + kernel/lockdep.c | 206 +++- + kernel/mutex-debug.c | 2 +- + kernel/mutex-debug.h | 2 +- + kernel/mutex.c | 9 +- + kernel/mutex.h | 2 +- + kernel/rcupdate.c | 32 +- + kernel/rcutiny.c | 45 +- + kernel/rcutiny_plugin.h | 203 ++-- + kernel/rcutorture.c | 26 +- + kernel/rcutree.c | 656 +++++++-- + kernel/rcutree.h | 113 ++- + kernel/rcutree_plugin.h | 575 ++++++-- + kernel/rcutree_trace.c | 192 +++- + kernel/sched.c | 1642 +++++++++------------ + kernel/sched_debug.c | 6 +- + kernel/sched_fair.c | 126 ++- + kernel/sched_features.h | 6 + + kernel/sched_idletask.c | 2 +- + kernel/sched_rt.c | 54 +- + kernel/sched_stoptask.c | 5 +- + kernel/softirq.c | 2 +- + kernel/time/Makefile | 2 +- + kernel/time/alarmtimer.c | 702 +++++++++ + kernel/time/clocksource.c | 4 +- + kernel/time/tick-broadcast.c | 16 +- + kernel/time/timekeeping.c | 73 +- + kernel/trace/ftrace.c | 359 ++--- + kernel/trace/trace.c | 15 +- + kernel/trace/trace_kprobe.c | 1 - + kernel/trace/trace_output.c | 3 + + kernel/trace/trace_printk.c | 120 ++- + kernel/tracepoint.c | 23 +- + lib/Kconfig.debug | 47 +- + lib/dma-debug.c | 18 +- + net/batman-adv/gateway_client.c | 10 +- + net/batman-adv/originator.c | 10 +- + net/batman-adv/soft-interface.c | 10 +- + net/core/dev_addr_lists.c | 12 +- + net/core/drop_monitor.c | 12 +- + net/core/gen_estimator.c | 9 +- + net/core/net-sysfs.c | 34 +- + net/core/net_namespace.c | 10 +- + net/decnet/dn_dev.c | 7 +- + net/ipv4/fib_semantics.c | 12 +- + net/ipv4/fib_trie.c | 7 +- + net/ipv4/igmp.c | 32 +- + net/ipv6/addrconf.c | 16 +- + net/ipv6/mcast.c | 8 +- + net/ipv6/sit.c | 7 +- + net/mac80211/agg-tx.c | 14 +- + net/mac80211/work.c | 10 +- + net/netfilter/nf_conntrack_extend.c | 8 +- + net/netfilter/xt_osf.c | 11 +- + net/netlabel/netlabel_unlabeled.c | 42 +- + net/netlink/af_netlink.c | 8 +- + net/phonet/pn_dev.c | 10 +- + net/sched/act_api.c | 7 +- + net/sched/act_police.c | 8 +- + net/sctp/bind_addr.c | 2 +- + net/sctp/ipv6.c | 2 +- + net/sctp/protocol.c | 9 +- + net/socket.c | 11 +- + security/keys/user_defined.c | 16 +- + security/selinux/netif.c | 18 +- + tools/perf/Documentation/perf-script-perl.txt | 1 - + tools/perf/Documentation/perf-script-python.txt | 1 - + tools/perf/Documentation/perf-script.txt | 52 +- + tools/perf/Makefile | 107 +- + tools/perf/builtin-script.c | 296 +++- + tools/perf/builtin-stat.c | 284 ++++- + tools/perf/{ => config}/feature-tests.mak | 16 +- + tools/perf/config/utilities.mak | 188 +++ + tools/perf/util/parse-events.c | 120 +- + tools/perf/util/probe-finder.c | 73 + + tools/perf/util/probe-finder.h | 2 + + tools/perf/util/python.c | 3 + + tools/perf/util/session.c | 12 + + tools/perf/util/session.h | 3 + + tools/perf/util/symbol.c | 629 ++++---- + tools/perf/util/symbol.h | 78 +- + tools/perf/util/trace-event-parse.c | 1 - + 287 files changed, 8126 insertions(+), 6035 deletions(-) + create mode 100644 arch/s390/include/asm/jump_label.h + create mode 100644 arch/s390/kernel/jump_label.c + create mode 100644 arch/x86/include/asm/probe_roms.h + delete mode 100644 arch/x86/include/asm/srat.h + rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) + rename arch/x86/mm/{amdtopology_64.c => amdtopology.c} (90%) + rename arch/x86/mm/{srat_64.c => srat.c} (67%) + delete mode 100644 arch/x86/mm/srat_32.c + create mode 100644 include/linux/alarmtimer.h + delete mode 100644 include/linux/jump_label_ref.h + create mode 100644 include/linux/pci-ats.h + create mode 100644 kernel/events/Makefile + rename kernel/{perf_event.c => events/core.c} (99%) + rename kernel/{ => events}/hw_breakpoint.c (100%) + create mode 100644 kernel/time/alarmtimer.c + rename tools/perf/{ => config}/feature-tests.mak (86%) + create mode 100644 tools/perf/config/utilities.mak +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging Documentation/virtual/kvm/api.txt +Auto-merging arch/powerpc/kernel/asm-offsets.c +Merge made by recursive. + Documentation/virtual/kvm/api.txt | 34 +- + arch/ia64/kvm/vti.h | 26 +- + arch/powerpc/include/asm/kvm.h | 184 ++++ + arch/powerpc/include/asm/kvm_44x.h | 1 - + arch/powerpc/include/asm/kvm_e500.h | 2 + + arch/powerpc/include/asm/kvm_host.h | 5 + + arch/powerpc/include/asm/kvm_ppc.h | 9 + + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kvm/44x.c | 10 + + arch/powerpc/kvm/44x_emulate.c | 2 - + arch/powerpc/kvm/booke.c | 154 +++- + arch/powerpc/kvm/booke_interrupts.S | 1 - + arch/powerpc/kvm/e500.c | 76 ++ + arch/powerpc/kvm/e500_emulate.c | 7 +- + arch/powerpc/kvm/e500_tlb.c | 13 +- + arch/powerpc/kvm/emulate.c | 15 +- + arch/powerpc/kvm/powerpc.c | 21 + + arch/powerpc/kvm/timing.c | 31 +- + arch/x86/include/asm/kvm_emulate.h | 193 +++- + arch/x86/include/asm/kvm_host.h | 55 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/kvm/emulate.c | 1806 +++++++++++++++++++++++------------ + arch/x86/kvm/i8254.h | 2 - + arch/x86/kvm/irq.h | 2 - + arch/x86/kvm/mmu.c | 16 +- + arch/x86/kvm/paging_tmpl.h | 83 ++- + arch/x86/kvm/svm.c | 585 +++++++++--- + arch/x86/kvm/vmx.c | 228 ++++- + arch/x86/kvm/x86.c | 570 ++++++++---- + arch/x86/kvm/x86.h | 2 +- + include/linux/kvm.h | 6 + + include/linux/kvm_host.h | 30 +- + virt/kvm/ioapic.c | 2 +- + virt/kvm/kvm_main.c | 26 +- + 34 files changed, 3080 insertions(+), 1119 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/s390/oprofile/init.c +Merge made by recursive. + arch/alpha/oprofile/common.c | 5 +---- + arch/avr32/oprofile/op_model_avr32.c | 5 +---- + arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- + arch/ia64/oprofile/init.c | 2 +- + arch/m32r/oprofile/init.c | 4 +--- + arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- + arch/mips/oprofile/common.c | 2 +- + arch/mn10300/oprofile/op_model_null.c | 5 +---- + arch/parisc/oprofile/init.c | 4 +--- + arch/powerpc/oprofile/common.c | 4 +--- + arch/s390/oprofile/init.c | 2 +- + arch/sparc/oprofile/init.c | 4 +--- + arch/x86/oprofile/init.c | 2 +- + 13 files changed, 13 insertions(+), 34 deletions(-) +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Auto-merging include/linux/sched.h +Auto-merging include/linux/tracehook.h +Auto-merging kernel/exit.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/signal.c +Merge made by recursive. + arch/x86/kernel/signal.c | 14 +- + fs/exec.c | 1 + + include/linux/sched.h | 17 +- + include/linux/signal.h | 9 +- + include/linux/tracehook.h | 27 -- + kernel/compat.c | 47 +--- + kernel/exit.c | 84 +++++-- + kernel/ptrace.c | 118 ++++++--- + kernel/signal.c | 678 ++++++++++++++++++++++++++++++--------------- + 9 files changed, 635 insertions(+), 360 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging arch/x86/xen/smp.c +Auto-merging arch/x86/xen/time.c +Merge made by recursive. + arch/x86/include/asm/xen/page.h | 5 +- + arch/x86/include/asm/xen/pci.h | 16 ++++ + arch/x86/pci/xen.c | 94 +++++++++++++++++++++- + arch/x86/xen/enlighten.c | 20 +++--- + arch/x86/xen/irq.c | 2 +- + arch/x86/xen/mmu.c | 36 +++++----- + arch/x86/xen/p2m.c | 43 ++++++++-- + arch/x86/xen/setup.c | 10 ++- + arch/x86/xen/smp.c | 8 +- + arch/x86/xen/time.c | 8 +- + arch/x86/xen/xen-ops.h | 2 +- + drivers/block/xen-blkfront.c | 51 +++++++++---- + drivers/xen/Makefile | 24 +++--- + drivers/xen/balloon.c | 25 +++---- + drivers/xen/events.c | 158 ++++++++++++++++++++++++++----------- + drivers/xen/gntalloc.c | 14 +++- + drivers/xen/gntdev.c | 16 ++++- + drivers/xen/grant-table.c | 31 ++++++-- + drivers/xen/sys-hypervisor.c | 2 +- + include/xen/events.h | 9 ++- + include/xen/interface/io/blkif.h | 13 +++ + 21 files changed, 430 insertions(+), 157 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/x86/include/asm/percpu.h' using previous resolution. +Auto-merging arch/mips/kernel/vmlinux.lds.S +Auto-merging arch/parisc/kernel/vmlinux.lds.S +Auto-merging arch/x86/include/asm/percpu.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/percpu.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging kernel/workqueue.c +Auto-merging mm/percpu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c3c82c9] Merge remote-tracking branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/vmlinux.lds.S | 2 +- + 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/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/include/asm/percpu.h | 7 ++++++- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- + kernel/workqueue.c | 4 +--- + mm/percpu.c | 6 ++++-- + 21 files changed, 36 insertions(+), 32 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Resolved 'drivers/platform/x86/Kconfig' using previous resolution. +Resolved 'drivers/platform/x86/Makefile' using previous resolution. +Resolved 'drivers/platform/x86/eeepc-laptop.c' using previous resolution. +Resolved 'drivers/platform/x86/sony-laptop.c' using previous resolution. +Removing Documentation/laptops/acer-wmi.txt +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/Kconfig +CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/Makefile +CONFLICT (content): Merge conflict in drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/eeepc-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/sony-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aa0f6ad] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/laptops/acer-wmi.txt | 184 --------- + MAINTAINERS | 11 +- + drivers/platform/x86/Kconfig | 11 +- + drivers/platform/x86/Makefile | 3 +- + drivers/platform/x86/acer-wmi.c | 40 +- + drivers/platform/x86/acerhdf.c | 4 +- + drivers/platform/x86/asus-laptop.c | 34 +- + drivers/platform/x86/asus-wmi.c | 22 +- + drivers/platform/x86/asus_acpi.c | 77 ++--- + drivers/platform/x86/compal-laptop.c | 22 +- + drivers/platform/x86/dell-laptop.c | 12 +- + drivers/platform/x86/dell-wmi-aio.c | 3 +- + drivers/platform/x86/dell-wmi.c | 17 +- + drivers/platform/x86/eeepc-laptop.c | 18 +- + drivers/platform/x86/eeepc-wmi.c | 14 +- + drivers/platform/x86/fujitsu-laptop.c | 39 +- + drivers/platform/x86/hdaps.c | 19 +- + drivers/platform/x86/hp-wmi.c | 43 +-- + drivers/platform/x86/ibm_rtl.c | 23 +- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_menlow.c | 5 +- + drivers/platform/x86/intel_mid_powerbtn.c | 72 ++-- + drivers/platform/x86/intel_mid_thermal.c | 607 ++++++++++++++--------------- + drivers/platform/x86/intel_oaktrail.c | 396 +++++++++++++++++++ + drivers/platform/x86/intel_pmic_gpio.c | 14 +- + drivers/platform/x86/msi-laptop.c | 9 +- + drivers/platform/x86/msi-wmi.c | 45 +-- + drivers/platform/x86/sony-laptop.c | 104 +++--- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 490 ++++++++++-------------- + drivers/platform/x86/topstar-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 59 ++-- + drivers/platform/x86/toshiba_bluetooth.c | 11 +- + drivers/platform/x86/wmi.c | 10 +- + drivers/platform/x86/xo15-ebook.c | 5 +- + 35 files changed, 1252 insertions(+), 1182 deletions(-) + delete mode 100644 Documentation/laptops/acer-wmi.txt + create mode 100644 drivers/platform/x86/intel_oaktrail.c +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging namespace/master +$ git merge namespace/master +Resolved 'arch/m68k/kernel/entry_mm.S' using previous resolution. +Auto-merging arch/m68k/include/asm/unistd.h +Auto-merging arch/m68k/kernel/entry_mm.S +CONFLICT (content): Merge conflict in arch/m68k/kernel/entry_mm.S +Auto-merging arch/m68k/kernel/syscalltable.S +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/scall64-64.S +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging net/core/net_namespace.c +Auto-merging net/core/rtnetlink.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9e0ecdd] Merge remote-tracking branch 'namespace/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/unistd.h | 3 +- + arch/alpha/kernel/systbls.S | 1 + + arch/arm/include/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + arch/avr32/include/asm/unistd.h | 3 +- + arch/avr32/kernel/syscall_table.S | 1 + + arch/blackfin/include/asm/unistd.h | 3 +- + arch/blackfin/mach-common/entry.S | 1 + + arch/cris/arch-v10/kernel/entry.S | 1 + + arch/cris/arch-v32/kernel/entry.S | 1 + + arch/cris/include/asm/unistd.h | 3 +- + arch/frv/include/asm/unistd.h | 3 +- + arch/frv/kernel/entry.S | 1 + + arch/h8300/include/asm/unistd.h | 3 +- + arch/h8300/kernel/syscalls.S | 1 + + arch/ia64/include/asm/unistd.h | 3 +- + arch/ia64/kernel/entry.S | 1 + + arch/m32r/include/asm/unistd.h | 3 +- + arch/m32r/kernel/syscall_table.S | 1 + + arch/m68k/include/asm/unistd.h | 3 +- + arch/m68k/kernel/syscalltable.S | 1 + + arch/microblaze/include/asm/unistd.h | 3 +- + arch/microblaze/kernel/syscall_table.S | 1 + + arch/mips/include/asm/unistd.h | 15 ++- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mn10300/include/asm/unistd.h | 3 +- + arch/mn10300/kernel/entry.S | 1 + + arch/parisc/include/asm/unistd.h | 4 +- + arch/parisc/kernel/syscall_table.S | 1 + + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 3 +- + arch/s390/include/asm/unistd.h | 3 +- + arch/s390/kernel/syscalls.S | 1 + + arch/sh/include/asm/unistd_32.h | 3 +- + arch/sh/include/asm/unistd_64.h | 3 +- + arch/sh/kernel/syscalls_32.S | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/xtensa/include/asm/unistd.h | 4 +- + fs/proc/Makefile | 1 + + fs/proc/base.c | 20 ++-- + fs/proc/inode.c | 7 + + fs/proc/internal.h | 18 +++ + fs/proc/namespaces.c | 198 ++++++++++++++++++++++++++++++++ + include/asm-generic/unistd.h | 4 +- + include/linux/if_link.h | 1 + + include/linux/proc_fs.h | 21 ++++ + include/linux/syscalls.h | 1 + + include/net/net_namespace.h | 1 + + ipc/namespace.c | 37 ++++++ + kernel/nsproxy.c | 42 +++++++ + kernel/utsname.c | 39 ++++++ + net/core/net_namespace.c | 65 +++++++++++ + net/core/rtnetlink.c | 5 +- + 63 files changed, 525 insertions(+), 42 deletions(-) + create mode 100644 fs/proc/namespaces.c +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/memory.c +Auto-merging drivers/base/platform.c +Auto-merging drivers/firmware/efivars.c +Auto-merging include/linux/device.h +Auto-merging kernel/sys.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-firmware-dmi | 18 +- + Documentation/ABI/testing/sysfs-firmware-gsmi | 58 ++ + Documentation/ABI/testing/sysfs-firmware-log | 7 + + Documentation/ABI/testing/sysfs-kernel-fscaps | 8 + + Documentation/DocBook/device-drivers.tmpl | 6 +- + Documentation/driver-model/bus.txt | 19 +- + Documentation/driver-model/class.txt | 17 +- + Documentation/driver-model/device.txt | 91 +--- + Documentation/driver-model/driver.txt | 18 +- + Documentation/ja_JP/HOWTO | 129 ++--- + Documentation/zh_CN/email-clients.txt | 210 ++++++ + arch/x86/include/asm/bios_ebda.h | 28 +- + drivers/base/core.c | 7 +- + drivers/base/dd.c | 12 +- + drivers/base/memory.c | 29 +- + drivers/base/platform.c | 38 +- + drivers/char/Kconfig | 2 +- + drivers/char/mem.c | 42 +- + drivers/char/raw.c | 34 +- + drivers/firmware/Kconfig | 2 + + drivers/firmware/Makefile | 2 + + drivers/firmware/efivars.c | 21 +- + drivers/firmware/google/Kconfig | 31 + + drivers/firmware/google/Makefile | 3 + + drivers/firmware/google/gsmi.c | 940 +++++++++++++++++++++++++ + drivers/firmware/google/memconsole.c | 166 +++++ + drivers/misc/ti-st/Kconfig | 2 +- + drivers/misc/ti-st/st_core.c | 23 +- + drivers/misc/ti-st/st_kim.c | 1 + + drivers/uio/uio.c | 16 +- + drivers/uio/uio_netx.c | 19 + + drivers/uio/uio_pdrv_genirq.c | 4 + + fs/sysfs/group.c | 6 +- + include/linux/device.h | 164 +++++- + include/linux/ti_wilink_st.h | 3 +- + kernel/ksysfs.c | 10 + + kernel/sys.c | 2 + + 37 files changed, 1846 insertions(+), 342 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-gsmi + create mode 100644 Documentation/ABI/testing/sysfs-firmware-log + create mode 100644 Documentation/ABI/testing/sysfs-kernel-fscaps + create mode 100644 Documentation/zh_CN/email-clients.txt + create mode 100644 drivers/firmware/google/Kconfig + create mode 100644 drivers/firmware/google/Makefile + create mode 100644 drivers/firmware/google/gsmi.c + create mode 100644 drivers/firmware/google/memconsole.c +Merging tty/tty-next +$ git merge tty/tty-next +Resolved 'drivers/bluetooth/hci_ldisc.c' using previous resolution. +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Auto-merging drivers/bluetooth/hci_ldisc.c +CONFLICT (content): Merge conflict in drivers/bluetooth/hci_ldisc.c +Auto-merging drivers/misc/ti-st/st_core.c +Auto-merging drivers/net/can/slcan.c +Auto-merging drivers/net/slip.c +Auto-merging drivers/parport/parport_pc.c +Auto-merging drivers/tty/cyclades.c +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/tty/nozomi.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/atmel_serial.c +Auto-merging drivers/tty/serial/imx.c +Auto-merging drivers/tty/tty_ioctl.c +Auto-merging sound/soc/codecs/cx20442.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0547f9c] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + drivers/bluetooth/hci_ldisc.c | 15 +- + drivers/input/serio/serport.c | 10 +- + drivers/isdn/gigaset/ser-gigaset.c | 8 +- + drivers/misc/Kconfig | 12 +- + drivers/misc/pch_phub.c | 153 +++- + drivers/misc/ti-st/st_core.c | 6 +- + drivers/net/caif/caif_serial.c | 6 +- + drivers/net/can/slcan.c | 9 +- + drivers/net/hamradio/6pack.c | 8 +- + drivers/net/hamradio/mkiss.c | 11 +- + drivers/net/irda/irtty-sir.c | 16 +- + drivers/net/ppp_async.c | 6 +- + drivers/net/ppp_synctty.c | 6 +- + drivers/net/slip.c | 11 +- + drivers/net/wan/x25_asy.c | 7 +- + drivers/parport/parport_pc.c | 2 +- + drivers/tty/amiserial.c | 2 - + drivers/tty/cyclades.c | 5 +- + drivers/tty/ipwireless/Makefile | 2 - + drivers/tty/moxa.c | 18 +- + drivers/tty/n_gsm.c | 41 +- + drivers/tty/n_hdlc.c | 18 +- + drivers/tty/n_r3964.c | 10 +- + drivers/tty/n_tty.c | 61 +-- + drivers/tty/nozomi.c | 29 +- + drivers/tty/pty.c | 35 +- + drivers/tty/rocket.c | 47 -- + drivers/tty/serial/21285.c | 2 - + drivers/tty/serial/8250.c | 2 - + drivers/tty/serial/8250.h | 2 - + drivers/tty/serial/8250_accent.c | 2 - + drivers/tty/serial/8250_boca.c | 2 - + drivers/tty/serial/8250_exar_st16c554.c | 2 - + drivers/tty/serial/8250_fourport.c | 2 - + drivers/tty/serial/8250_hub6.c | 2 - + drivers/tty/serial/8250_mca.c | 2 - + drivers/tty/serial/8250_pci.c | 21 +- + drivers/tty/serial/8250_pnp.c | 2 - + drivers/tty/serial/Kconfig | 27 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_uart.c | 26 +- + drivers/tty/serial/amba-pl010.c | 2 - + drivers/tty/serial/amba-pl011.c | 2 - + drivers/tty/serial/atmel_serial.c | 2 - + drivers/tty/serial/clps711x.c | 2 - + drivers/tty/serial/cpm_uart/cpm_uart.h | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_cpm1.c | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_cpm1.h | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.c | 2 - + drivers/tty/serial/cpm_uart/cpm_uart_cpm2.h | 2 - + drivers/tty/serial/ifx6x60.c | 2 - + drivers/tty/serial/imx.c | 2 - + drivers/tty/serial/msm_serial.c | 2 +- + drivers/tty/serial/msm_serial.h | 2 - + drivers/tty/serial/msm_smd_tty.c | 3 +- + drivers/tty/serial/netx-serial.c | 2 - + drivers/tty/serial/pch_uart.c | 8 + + drivers/tty/serial/pmac_zilog.c | 2 - + drivers/tty/serial/pxa.c | 2 - + drivers/tty/serial/s3c2400.c | 3 +- + drivers/tty/serial/s3c2410.c | 3 +- + drivers/tty/serial/s3c2412.c | 3 +- + drivers/tty/serial/s3c2440.c | 3 +- + drivers/tty/serial/s3c24a0.c | 3 +- + drivers/tty/serial/s3c6400.c | 3 +- + drivers/tty/serial/s5pv210.c | 3 +- + drivers/tty/serial/sa1100.c | 2 - + drivers/tty/serial/samsung.c | 3 +- + drivers/tty/serial/samsung.h | 3 +- + drivers/tty/serial/sb1250-duart.c | 2 - + drivers/tty/serial/serial_core.c | 90 +-- + drivers/tty/serial/serial_ks8695.c | 2 - + drivers/tty/serial/serial_txx9.c | 2 - + drivers/tty/serial/sh-sci.c | 2 - + drivers/tty/serial/vt8500_serial.c | 2 - + drivers/tty/serial/xilinx_uartps.c | 1113 +++++++++++++++++++++++++++ + drivers/tty/synclink.c | 2 - + drivers/tty/tty_buffer.c | 15 +- + drivers/tty/tty_io.c | 53 +- + drivers/tty/tty_ioctl.c | 2 - + drivers/tty/tty_ldisc.c | 13 + + drivers/tty/tty_mutex.c | 3 - + drivers/tty/vt/keyboard.c | 2 - + drivers/tty/vt/selection.c | 5 +- + drivers/tty/vt/vc_screen.c | 2 - + drivers/tty/vt/vt.c | 13 +- + drivers/tty/vt/vt_ioctl.c | 25 +- + include/linux/serial_core.h | 3 + + include/linux/tty.h | 2 + + include/linux/tty_ldisc.h | 9 +- + sound/soc/codecs/cx20442.c | 8 +- + 92 files changed, 1581 insertions(+), 512 deletions(-) + create mode 100644 drivers/tty/serial/xilinx_uartps.c +Merging usb/usb-next +$ git merge usb/usb-next +Resolved 'arch/arm/mach-exynos4/mach-nuri.c' using previous resolution. +Auto-merging arch/arm/mach-exynos4/Kconfig +Auto-merging arch/arm/mach-exynos4/Makefile +Auto-merging arch/arm/mach-exynos4/mach-nuri.c +CONFLICT (content): Merge conflict in arch/arm/mach-exynos4/mach-nuri.c +Auto-merging drivers/Makefile +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/usb/host/uhci-hcd.c +Auto-merging drivers/usb/misc/usbtest.c +Removing drivers/usb/serial/sam-ba.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea0235e] Merge remote-tracking branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/callbacks.txt | 8 +- + Documentation/usb/linux-cdc-acm.inf | 4 +- + Documentation/usb/linux.inf | 6 +- + arch/arm/mach-exynos4/Kconfig | 1 + + arch/arm/mach-exynos4/Makefile | 2 + + arch/arm/mach-exynos4/cpu.c | 7 +- + arch/arm/mach-exynos4/include/mach/map.h | 4 + + arch/arm/mach-exynos4/include/mach/regs-pmu.h | 3 + + arch/arm/mach-exynos4/include/mach/regs-usb-phy.h | 64 + + arch/arm/mach-exynos4/mach-nuri.c | 16 + + arch/arm/mach-exynos4/usb-phy.c | 136 ++ + arch/arm/mach-s3c2410/include/mach/map.h | 4 + + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 25 + + arch/arm/mach-s3c2416/mach-smdk2416.c | 27 + + arch/arm/plat-s3c24xx/devs.c | 41 + + arch/arm/plat-s3c24xx/include/plat/udc.h | 17 + + arch/arm/plat-s5p/Kconfig | 5 + + arch/arm/plat-s5p/Makefile | 1 + + arch/arm/plat-s5p/dev-ehci.c | 57 + + arch/arm/plat-s5p/include/plat/ehci.h | 21 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 2 +- + arch/arm/plat-s5p/include/plat/usb-phy.h | 22 + + arch/arm/plat-samsung/include/plat/devs.h | 3 + + arch/mips/ath79/Kconfig | 5 + + drivers/Makefile | 5 +- + drivers/hid/hid-core.c | 20 +- + drivers/hid/hid-ids.h | 21 +- + drivers/usb/Kconfig | 4 + + drivers/usb/Makefile | 6 + + drivers/usb/class/cdc-acm.c | 479 +++---- + drivers/usb/class/cdc-acm.h | 24 +- + drivers/usb/class/cdc-wdm.c | 14 + + drivers/usb/core/config.c | 2 +- + drivers/usb/core/devices.c | 22 +- + drivers/usb/core/file.c | 8 - + drivers/usb/core/hcd.c | 1 + + drivers/usb/core/hub.c | 131 ++- + drivers/usb/core/sysfs.c | 13 +- + drivers/usb/core/usb.c | 3 +- + drivers/usb/core/usb.h | 2 +- + drivers/usb/early/ehci-dbgp.c | 5 +- + drivers/usb/gadget/Kconfig | 35 + + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/ci13xxx_udc.c | 75 +- + drivers/usb/gadget/composite.c | 62 +- + drivers/usb/gadget/dbgp.c | 14 +- + drivers/usb/gadget/dummy_hcd.c | 21 +- + drivers/usb/gadget/f_mass_storage.c | 68 +- + drivers/usb/gadget/file_storage.c | 55 +- + drivers/usb/gadget/fsl_qe_udc.h | 2 +- + drivers/usb/gadget/fsl_udc_core.c | 438 +++++- + drivers/usb/gadget/fsl_usb2_udc.h | 6 + + drivers/usb/gadget/gadget_chips.h | 17 + + drivers/usb/gadget/printer.c | 2 + + drivers/usb/gadget/s3c-hsotg.c | 226 ++- + drivers/usb/gadget/s3c-hsudc.c | 1349 +++++++++++++++++ + drivers/usb/gadget/storage_common.c | 18 +- + drivers/usb/host/Kconfig | 47 +- + drivers/usb/host/ehci-ath79.c | 202 +++ + drivers/usb/host/ehci-atmel.c | 2 +- + drivers/usb/host/ehci-au1xxx.c | 12 +- + drivers/usb/host/ehci-cns3xxx.c | 2 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-fsl.c | 221 +++- + drivers/usb/host/ehci-fsl.h | 4 + + drivers/usb/host/ehci-grlib.c | 242 +++ + drivers/usb/host/ehci-hcd.c | 17 +- + drivers/usb/host/ehci-hub.c | 10 +- + drivers/usb/host/ehci-ixp4xx.c | 2 +- + drivers/usb/host/ehci-msm.c | 2 +- + drivers/usb/host/ehci-mxc.c | 2 +- + drivers/usb/host/ehci-octeon.c | 2 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-orion.c | 2 +- + drivers/usb/host/ehci-pci.c | 2 +- + drivers/usb/host/ehci-pmcmsp.c | 2 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci-ps3.c | 2 +- + drivers/usb/host/ehci-q.c | 4 + + drivers/usb/host/ehci-s5p.c | 202 +++ + drivers/usb/host/ehci-sh.c | 2 +- + drivers/usb/host/ehci-spear.c | 2 +- + drivers/usb/host/ehci-tegra.c | 74 +- + drivers/usb/host/ehci-vt8500.c | 3 +- + drivers/usb/host/ehci-w90x900.c | 2 +- + drivers/usb/host/ehci-xilinx-of.c | 2 +- + drivers/usb/host/ehci.h | 15 + + drivers/usb/host/isp1760-hcd.c | 1583 +++++++++----------- + drivers/usb/host/isp1760-hcd.h | 78 +- + drivers/usb/host/octeon2-common.c | 45 +- + drivers/usb/host/ohci-ath79.c | 151 ++ + drivers/usb/host/ohci-hcd.c | 5 + + drivers/usb/host/ohci-s3c2410.c | 58 +- + drivers/usb/host/pci-quirks.c | 151 +- + drivers/usb/host/sl811-hcd.c | 8 +- + drivers/usb/host/u132-hcd.c | 3 +- + drivers/usb/host/uhci-debug.c | 17 +- + drivers/usb/host/uhci-grlib.c | 194 +++ + drivers/usb/host/uhci-hcd.c | 442 +++---- + drivers/usb/host/uhci-hcd.h | 109 ++ + drivers/usb/host/uhci-hub.c | 41 +- + drivers/usb/host/uhci-pci.c | 301 ++++ + drivers/usb/host/xhci-dbg.c | 51 +- + drivers/usb/host/xhci-hub.c | 231 ++-- + drivers/usb/host/xhci-mem.c | 133 +- + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/host/xhci-ring.c | 509 +++++--- + drivers/usb/host/xhci.c | 134 +- + drivers/usb/host/xhci.h | 145 +- + drivers/usb/misc/ftdi-elan.c | 3 +- + drivers/usb/misc/ldusb.c | 52 +- + drivers/usb/misc/usbtest.c | 131 ++- + drivers/usb/musb/am35x.c | 11 +- + drivers/usb/musb/blackfin.c | 7 +- + drivers/usb/musb/da8xx.c | 11 +- + drivers/usb/musb/davinci.c | 5 +- + drivers/usb/musb/musb_core.c | 65 +- + drivers/usb/musb/musb_debug.h | 2 - + drivers/usb/musb/musb_gadget.c | 9 +- + drivers/usb/musb/musb_host.c | 2 +- + drivers/usb/musb/musb_virthub.c | 5 +- + drivers/usb/musb/omap2430.c | 7 +- + drivers/usb/musb/tusb6010.c | 16 +- + drivers/usb/otg/Kconfig | 8 + + drivers/usb/otg/Makefile | 2 + + drivers/usb/otg/fsl_otg.c | 1169 +++++++++++++++ + drivers/usb/otg/fsl_otg.h | 406 +++++ + drivers/usb/otg/gpio_vbus.c | 14 +- + drivers/usb/otg/isp1301_omap.c | 26 +- + drivers/usb/otg/langwell_otg.c | 40 +- + drivers/usb/otg/msm_otg.c | 673 ++++++++- + drivers/usb/otg/otg.c | 35 + + drivers/usb/otg/otg_fsm.c | 349 +++++ + drivers/usb/otg/otg_fsm.h | 154 ++ + drivers/usb/otg/twl4030-usb.c | 9 +- + drivers/usb/otg/twl6030-usb.c | 2 +- + drivers/usb/renesas_usbhs/Kconfig | 16 + + drivers/usb/renesas_usbhs/Makefile | 9 + + drivers/usb/renesas_usbhs/common.c | 437 ++++++ + drivers/usb/renesas_usbhs/common.h | 230 +++ + drivers/usb/renesas_usbhs/mod.c | 328 ++++ + drivers/usb/renesas_usbhs/mod.h | 137 ++ + drivers/usb/renesas_usbhs/mod_gadget.c | 1384 +++++++++++++++++ + drivers/usb/renesas_usbhs/pipe.c | 874 +++++++++++ + drivers/usb/renesas_usbhs/pipe.h | 104 ++ + drivers/usb/serial/Kconfig | 9 - + drivers/usb/serial/Makefile | 1 - + drivers/usb/serial/cp210x.c | 6 +- + drivers/usb/serial/ftdi_sio.c | 1 + + drivers/usb/serial/ftdi_sio_ids.h | 5 + + drivers/usb/serial/garmin_gps.c | 20 +- + drivers/usb/serial/moto_modem.c | 1 + + drivers/usb/serial/option.c | 8 +- + drivers/usb/serial/sam-ba.c | 206 --- + include/linux/fsl_devices.h | 16 + + include/linux/usb.h | 6 +- + include/linux/usb/ch9.h | 2 +- + include/linux/usb/composite.h | 16 +- + include/linux/usb/ehci_def.h | 15 +- + include/linux/usb/gadget.h | 4 +- + include/linux/usb/msm_hsusb.h | 79 +- + include/linux/usb/msm_hsusb_hw.h | 2 + + include/linux/usb/otg.h | 6 + + include/linux/usb/renesas_usbhs.h | 156 ++ + 164 files changed, 13497 insertions(+), 2901 deletions(-) + create mode 100644 arch/arm/mach-exynos4/include/mach/regs-usb-phy.h + create mode 100644 arch/arm/mach-exynos4/usb-phy.c + create mode 100644 arch/arm/plat-s5p/dev-ehci.c + create mode 100644 arch/arm/plat-s5p/include/plat/ehci.h + create mode 100644 arch/arm/plat-s5p/include/plat/usb-phy.h + create mode 100644 drivers/usb/gadget/s3c-hsudc.c + create mode 100644 drivers/usb/host/ehci-ath79.c + create mode 100644 drivers/usb/host/ehci-grlib.c + create mode 100644 drivers/usb/host/ehci-s5p.c + create mode 100644 drivers/usb/host/ohci-ath79.c + create mode 100644 drivers/usb/host/uhci-grlib.c + create mode 100644 drivers/usb/host/uhci-pci.c + create mode 100644 drivers/usb/otg/fsl_otg.c + create mode 100644 drivers/usb/otg/fsl_otg.h + create mode 100644 drivers/usb/otg/otg_fsm.c + create mode 100644 drivers/usb/otg/otg_fsm.h + create mode 100644 drivers/usb/renesas_usbhs/Kconfig + create mode 100644 drivers/usb/renesas_usbhs/Makefile + create mode 100644 drivers/usb/renesas_usbhs/common.c + create mode 100644 drivers/usb/renesas_usbhs/common.h + create mode 100644 drivers/usb/renesas_usbhs/mod.c + create mode 100644 drivers/usb/renesas_usbhs/mod.h + create mode 100644 drivers/usb/renesas_usbhs/mod_gadget.c + create mode 100644 drivers/usb/renesas_usbhs/pipe.c + create mode 100644 drivers/usb/renesas_usbhs/pipe.h + delete mode 100644 drivers/usb/serial/sam-ba.c + create mode 100644 include/linux/usb/renesas_usbhs.h +Merging staging/staging-next +$ git merge staging/staging-next +Removing drivers/staging/ath6kl/include/a_types.h +Removing drivers/staging/ath6kl/include/athendpack.h +Removing drivers/staging/ath6kl/include/athstartpack.h +Removing drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h +Removing drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h +Removing drivers/staging/ath6kl/include/common/a_hci.h +Removing drivers/staging/ath6kl/include/common/btcoexGpio.h +Removing drivers/staging/ath6kl/include/common/dset_internal.h +Removing drivers/staging/ath6kl/include/common/dsetid.h +Removing drivers/staging/ath6kl/include/common/gpio.h +Removing drivers/staging/ath6kl/include/common/ini_dset.h +Removing drivers/staging/ath6kl/include/common/regDb.h +Removing drivers/staging/ath6kl/include/common/regdump.h +Removing drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h +Removing drivers/staging/ath6kl/include/common/regulatory/reg_dbvalues.h +Removing drivers/staging/ath6kl/include/common/wlan_dset.h +Removing drivers/staging/ath6kl/include/common/wmi_thin.h +Removing drivers/staging/ath6kl/include/gpio_api.h +Removing drivers/staging/ath6kl/include/target_reg_table.h +Removing drivers/staging/ath6kl/os/linux/ar6000_android.c +Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c +Removing drivers/staging/ath6kl/os/linux/eeprom.c +Removing drivers/staging/ath6kl/os/linux/include/athtypes_linux.h +Removing drivers/staging/ath6kl/os/linux/ioctl.c +Removing drivers/staging/ath6kl/os/linux/wireless_ext.c +Auto-merging drivers/staging/brcm80211/brcmfmac/bcmchip.h +Removing drivers/staging/brcm80211/brcmfmac/bcmutils.c +Removing drivers/staging/brcm80211/brcmfmac/bcmwifi.c +Removing drivers/staging/brcm80211/brcmfmac/hndpmu.c +Removing drivers/staging/brcm80211/brcmfmac/sbutils.c +Removing drivers/staging/brcm80211/brcmfmac/siutils.c +Auto-merging drivers/staging/brcm80211/brcmsmac/aiutils.c +Auto-merging drivers/staging/brcm80211/brcmsmac/bcmotp.c +Auto-merging drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h +Auto-merging drivers/staging/brcm80211/brcmsmac/hnddma.c +Auto-merging drivers/staging/brcm80211/brcmsmac/nicpci.c +Auto-merging drivers/staging/brcm80211/brcmsmac/nvram.c +Auto-merging drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pmu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_pmu.h +Removing drivers/staging/brcm80211/util/aiutils.c +Removing drivers/staging/brcm80211/util/bcmsrom.c +Removing drivers/staging/brcm80211/util/qmath.c +Removing drivers/staging/brcm80211/util/sbpcmcia.h +Removing drivers/staging/brcm80211/util/sbsocram.h +Removing drivers/staging/brcm80211/util/sbutils.c +Removing drivers/staging/gma500/psb_buffer.c +Removing drivers/staging/gma500/psb_fence.c +Removing drivers/staging/gma500/psb_pvr_glue.c +Removing drivers/staging/gma500/psb_pvr_glue.h +Removing drivers/staging/gma500/psb_sgx.c +Removing drivers/staging/gma500/psb_sgx.h +Removing drivers/staging/gma500/psb_ttm_fence.c +Removing drivers/staging/gma500/psb_ttm_fence_api.h +Removing drivers/staging/gma500/psb_ttm_fence_driver.h +Removing drivers/staging/gma500/psb_ttm_fence_user.c +Removing drivers/staging/gma500/psb_ttm_fence_user.h +Removing drivers/staging/gma500/psb_ttm_glue.c +Removing drivers/staging/gma500/psb_ttm_placement_user.c +Removing drivers/staging/gma500/psb_ttm_placement_user.h +Removing drivers/staging/gma500/psb_ttm_userobj_api.h +Removing drivers/staging/hv/blkvsc.c +Auto-merging drivers/staging/hv/netvsc_drv.c +Auto-merging drivers/staging/intel_sst/intel_sst_drv_interface.c +Auto-merging drivers/staging/intel_sst/intelmid.c +CONFLICT (content): Merge conflict in drivers/staging/intel_sst/intelmid.c +Auto-merging drivers/staging/intel_sst/intelmid_v1_control.c +Auto-merging drivers/staging/intel_sst/intelmid_v2_control.c +Removing drivers/staging/intel_sst/jack.h +Auto-merging drivers/staging/olpc_dcon/olpc_dcon_xo_1.c +Removing drivers/staging/rt2860/Kconfig +Removing drivers/staging/rt2860/Makefile +Removing drivers/staging/rt2860/TODO +Removing drivers/staging/rt2860/ap.h +Removing drivers/staging/rt2860/chip/mac_pci.h +Removing drivers/staging/rt2860/chip/mac_usb.h +Removing drivers/staging/rt2860/chip/rt2860.h +Removing drivers/staging/rt2860/chip/rt2870.h +Removing drivers/staging/rt2860/chip/rt3070.h +Removing drivers/staging/rt2860/chip/rt3090.h +Removing drivers/staging/rt2860/chip/rt30xx.h +Removing drivers/staging/rt2860/chip/rtmp_mac.h +Removing drivers/staging/rt2860/chip/rtmp_phy.h +Removing drivers/staging/rt2860/chips/rt3070.c +Removing drivers/staging/rt2860/chips/rt3090.c +Removing drivers/staging/rt2860/chips/rt30xx.c +Removing drivers/staging/rt2860/chlist.h +Removing drivers/staging/rt2860/common/action.c +Removing drivers/staging/rt2860/common/action.h +Removing drivers/staging/rt2860/common/ba_action.c +Removing drivers/staging/rt2860/common/cmm_aes.c +Removing drivers/staging/rt2860/common/cmm_asic.c +Removing drivers/staging/rt2860/common/cmm_cfg.c +Removing drivers/staging/rt2860/common/cmm_data.c +CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_pci.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_pci.c left in tree. +CONFLICT (delete/modify): drivers/staging/rt2860/common/cmm_data_usb.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/rt2860/common/cmm_data_usb.c left in tree. +Removing drivers/staging/rt2860/common/cmm_info.c +Removing drivers/staging/rt2860/common/cmm_mac_pci.c +Removing drivers/staging/rt2860/common/cmm_mac_usb.c +Removing drivers/staging/rt2860/common/cmm_sanity.c +Removing drivers/staging/rt2860/common/cmm_sync.c +Removing drivers/staging/rt2860/common/cmm_tkip.c +Removing drivers/staging/rt2860/common/cmm_wep.c +Removing drivers/staging/rt2860/common/cmm_wpa.c +Removing drivers/staging/rt2860/common/crypt_hmac.c +Removing drivers/staging/rt2860/common/crypt_md5.c +Removing drivers/staging/rt2860/common/crypt_sha2.c +Removing drivers/staging/rt2860/common/dfs.c +Removing drivers/staging/rt2860/common/ee_efuse.c +Removing drivers/staging/rt2860/common/ee_prom.c +Removing drivers/staging/rt2860/common/eeprom.c +Removing drivers/staging/rt2860/common/mlme.c +Removing drivers/staging/rt2860/common/rt_channel.c +Removing drivers/staging/rt2860/common/rt_rf.c +Removing drivers/staging/rt2860/common/rtmp_init.c +Removing drivers/staging/rt2860/common/rtmp_mcu.c +Removing drivers/staging/rt2860/common/rtmp_timer.c +Removing drivers/staging/rt2860/common/spectrum.c +Removing drivers/staging/rt2860/crypt_hmac.h +Removing drivers/staging/rt2860/crypt_md5.h +Removing drivers/staging/rt2860/crypt_sha2.h +Removing drivers/staging/rt2860/dfs.h +Removing drivers/staging/rt2860/eeprom.h +Removing drivers/staging/rt2860/iface/rtmp_pci.h +Removing drivers/staging/rt2860/iface/rtmp_usb.h +Removing drivers/staging/rt2860/mlme.h +Removing drivers/staging/rt2860/oid.h +Removing drivers/staging/rt2860/pci_main_dev.c +Removing drivers/staging/rt2860/rt_config.h +Removing drivers/staging/rt2860/rt_linux.c +Removing drivers/staging/rt2860/rt_linux.h +Removing drivers/staging/rt2860/rt_main_dev.c +Removing drivers/staging/rt2860/rt_pci_rbus.c +Removing drivers/staging/rt2860/rt_usb.c +Removing drivers/staging/rt2860/rtmp.h +Removing drivers/staging/rt2860/rtmp_chip.h +Removing drivers/staging/rt2860/rtmp_ckipmic.h +Removing drivers/staging/rt2860/rtmp_def.h +Removing drivers/staging/rt2860/rtmp_dot11.h +Removing drivers/staging/rt2860/rtmp_iface.h +Removing drivers/staging/rt2860/rtmp_mcu.h +Removing drivers/staging/rt2860/rtmp_os.h +Removing drivers/staging/rt2860/rtmp_timer.h +Removing drivers/staging/rt2860/rtmp_type.h +Removing drivers/staging/rt2860/rtusb_io.h +Removing drivers/staging/rt2860/spectrum.h +Removing drivers/staging/rt2860/spectrum_def.h +Removing drivers/staging/rt2860/sta/assoc.c +Removing drivers/staging/rt2860/sta/auth.c +Removing drivers/staging/rt2860/sta/auth_rsp.c +Removing drivers/staging/rt2860/sta/connect.c +Removing drivers/staging/rt2860/sta/rtmp_data.c +Removing drivers/staging/rt2860/sta/sanity.c +Removing drivers/staging/rt2860/sta/sync.c +Removing drivers/staging/rt2860/sta/wpa.c +Removing drivers/staging/rt2860/sta_ioctl.c +Removing drivers/staging/rt2860/usb_main_dev.c +Removing drivers/staging/rt2860/wpa.h +Removing drivers/staging/rt2870/Kconfig +Removing drivers/staging/rt2870/Makefile +Removing drivers/staging/rt2870/TODO +Removing drivers/staging/rt2870/aironet.h +Removing drivers/staging/rt2870/ap.h +Removing drivers/staging/rt2870/chips/rt3070.c +Removing drivers/staging/rt2870/chips/rt30xx.c +Removing drivers/staging/rt2870/chlist.h +Removing drivers/staging/rt2870/common/acction.c +Removing drivers/staging/rt2870/common/action.c +Removing drivers/staging/rt2870/common/action.h +Removing drivers/staging/rt2870/common/ba_action.c +Removing drivers/staging/rt2870/common/cmm_aes.c +Removing drivers/staging/rt2870/common/cmm_asic.c +Removing drivers/staging/rt2870/common/cmm_cfg.c +Removing drivers/staging/rt2870/common/cmm_data.c +Removing drivers/staging/rt2870/common/cmm_data_usb.c +Removing drivers/staging/rt2870/common/cmm_info.c +Removing drivers/staging/rt2870/common/cmm_mac_usb.c +Removing drivers/staging/rt2870/common/cmm_profile.c +Removing drivers/staging/rt2870/common/cmm_sanity.c +Removing drivers/staging/rt2870/common/cmm_sync.c +Removing drivers/staging/rt2870/common/cmm_tkip.c +Removing drivers/staging/rt2870/common/cmm_wep.c +Removing drivers/staging/rt2870/common/cmm_wpa.c +Removing drivers/staging/rt2870/common/crypt_hmac.c +Removing drivers/staging/rt2870/common/crypt_md5.c +Removing drivers/staging/rt2870/common/crypt_sha2.c +Removing drivers/staging/rt2870/common/dfs.c +Removing drivers/staging/rt2870/common/ee_efuse.c +Removing drivers/staging/rt2870/common/eeprom.c +Removing drivers/staging/rt2870/common/md5.c +Removing drivers/staging/rt2870/common/mlme.c +Removing drivers/staging/rt2870/common/rt_channel.c +Removing drivers/staging/rt2870/common/rt_rf.c +Removing drivers/staging/rt2870/common/rtmp_init.c +Removing drivers/staging/rt2870/common/rtmp_mcu.c +Removing drivers/staging/rt2870/common/rtmp_timer.c +Removing drivers/staging/rt2870/common/rtmp_tkip.c +Removing drivers/staging/rt2870/common/rtmp_wep.c +Removing drivers/staging/rt2870/common/rtusb_bulk.c +Removing drivers/staging/rt2870/common/rtusb_data.c +Removing drivers/staging/rt2870/common/rtusb_io.c +Removing drivers/staging/rt2870/common/spectrum.c +Removing drivers/staging/rt2870/dfs.h +Removing drivers/staging/rt2870/md5.h +Removing driversRecorded preimage for 'drivers/staging/usbip/vhci_sysfs.c' +Resolved 'drivers/staging/intel_sst/intelmid.c' using previous resolution. +/staging/rt2870/mlme.h +Removing drivers/staging/rt2870/oid.h +Removing drivers/staging/rt2870/rt28xx.h +Removing drivers/staging/rt2870/rt_config.h +Removing drivers/staging/rt2870/rt_linux.c +Removing drivers/staging/rt2870/rt_linux.h +Removing drivers/staging/rt2870/rt_main_dev.c +Removing drivers/staging/rt2870/rt_profile.c +Removing drivers/staging/rt2870/rt_usb.c +Removing drivers/staging/rt2870/rtmp.h +Removing drivers/staging/rt2870/rtmp_ckipmic.h +Removing drivers/staging/rt2870/rtmp_def.h +Removing drivers/staging/rt2870/rtmp_type.h +Removing drivers/staging/rt2870/spectrum.h +Removing drivers/staging/rt2870/spectrum_def.h +Removing drivers/staging/rt2870/sta/aironet.c +Removing drivers/staging/rt2870/sta/assoc.c +Removing drivers/staging/rt2870/sta/auth.c +Removing drivers/staging/rt2870/sta/auth_rsp.c +Removing drivers/staging/rt2870/sta/connect.c +Removing drivers/staging/rt2870/sta/rtmp_data.c +Removing drivers/staging/rt2870/sta/sanity.c +Removing drivers/staging/rt2870/sta/sync.c +Removing drivers/staging/rt2870/sta/wpa.c +Removing drivers/staging/rt2870/sta_ioctl.c +Removing drivers/staging/rt2870/usb_main_dev.c +Removing drivers/staging/rt2870/wpa.h +Auto-merging drivers/staging/rts_pstor/ms.c +Auto-merging drivers/staging/rts_pstor/sd.c +Auto-merging drivers/staging/rts_pstor/xd.c +Auto-merging drivers/staging/usbip/vhci_hcd.c +Auto-merging drivers/staging/usbip/vhci_sysfs.c +CONFLICT (content): Merge conflict in drivers/staging/usbip/vhci_sysfs.c +Auto-merging kernel/module.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/rt2860/common/cmm_data_pci.c drivers/staging/rt2860/common/cmm_data_usb.c +drivers/staging/intel_sst/intelmid.c: needs merge +drivers/staging/rt2860/common/cmm_data_pci.c: needs merge +drivers/staging/rt2860/common/cmm_data_usb.c: needs merge +drivers/staging/usbip/vhci_sysfs.c: needs merge +rm 'drivers/staging/rt2860/common/cmm_data_pci.c' +rm 'drivers/staging/rt2860/common/cmm_data_usb.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/usbip/vhci_sysfs.c'. +[master 757435f] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 7 +- + drivers/staging/ath6kl/Kconfig | 6 - + drivers/staging/ath6kl/Makefile | 39 +- + drivers/staging/ath6kl/bmi/include/bmi_internal.h | 3 +- + drivers/staging/ath6kl/bmi/src/bmi.c | 8 +- + .../hif/sdio/linux_sdio/include/hif_internal.h | 1 - + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 382 +- + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 5 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 3 - + drivers/staging/ath6kl/htc2/AR6000/ar6k_events.c | 3 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox.c | 1 - + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 3 +- + drivers/staging/ath6kl/htc2/htc.c | 10 +- + drivers/staging/ath6kl/htc2/htc_internal.h | 9 - + drivers/staging/ath6kl/htc2/htc_recv.c | 6 - + drivers/staging/ath6kl/htc2/htc_send.c | 5 - + drivers/staging/ath6kl/include/a_config.h | 22 - + drivers/staging/ath6kl/include/a_debug.h | 29 - + drivers/staging/ath6kl/include/a_drv.h | 22 - + drivers/staging/ath6kl/include/a_drv_api.h | 28 - + drivers/staging/ath6kl/include/a_osapi.h | 29 - + drivers/staging/ath6kl/include/a_types.h | 58 - + drivers/staging/ath6kl/include/ar6000_api.h | 22 - + drivers/staging/ath6kl/include/athendpack.h | 52 - + drivers/staging/ath6kl/include/athstartpack.h | 55 - + drivers/staging/ath6kl/include/bmi.h | 1 - + .../ath6kl/include/common/AR6002/AR6002_regdump.h | 60 - + .../common/AR6002/hw2.0/hw/analog_intf_reg.h | 64 - + .../include/common/AR6002/hw2.0/hw/analog_reg.h | 1932 ----- + .../include/common/AR6002/hw2.0/hw/apb_map.h | 13 - + .../include/common/AR6002/hw2.0/hw/gpio_reg.h | 977 --- + .../include/common/AR6002/hw2.0/hw/mbox_host_reg.h | 386 - + .../include/common/AR6002/hw2.0/hw/mbox_reg.h | 481 -- + .../include/common/AR6002/hw2.0/hw/rtc_reg.h | 1163 --- + .../ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h | 186 - + .../include/common/AR6002/hw2.0/hw/uart_reg.h | 327 - + .../include/common/AR6002/hw2.0/hw/vmc_reg.h | 76 - + .../common/AR6002/hw4.0/hw/analog_intf_ares_reg.h | 3291 -------- + .../AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h | 3674 --------- + .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 37 - + .../include/common/AR6002/hw4.0/hw/apb_map.h | 8 - + .../include/common/AR6002/hw4.0/hw/bb_lc_reg.h | 7076 ----------------- + .../include/common/AR6002/hw4.0/hw/efuse_reg.h | 108 - + .../common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h | 1253 --- + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 1094 --- + .../include/common/AR6002/hw4.0/hw/mac_dma_reg.h | 605 -- + .../include/common/AR6002/hw4.0/hw/mac_pcu_reg.h | 3065 -------- + .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 13 - + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 8 - + .../common/AR6002/hw4.0/hw/mbox_wlan_host_reg.h | 51 - + .../include/common/AR6002/hw4.0/hw/mbox_wlan_reg.h | 49 - + .../include/common/AR6002/hw4.0/hw/rdma_reg.h | 564 -- + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 788 -- + .../include/common/AR6002/hw4.0/hw/rtc_wlan_reg.h | 1903 ----- + .../ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h | 209 - + .../include/common/AR6002/hw4.0/hw/uart_reg.h | 220 - + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 37 - + .../common/AR6002/hw4.0/hw/umbox_wlan_reg.h | 322 - + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 167 - + .../include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h | 195 - + drivers/staging/ath6kl/include/common/a_hci.h | 682 -- + drivers/staging/ath6kl/include/common/bmi_msg.h | 8 - + drivers/staging/ath6kl/include/common/btcoexGpio.h | 86 - + drivers/staging/ath6kl/include/common/dbglog.h | 8 - + .../staging/ath6kl/include/common/dset_internal.h | 63 - + drivers/staging/ath6kl/include/common/dsetid.h | 134 - + .../staging/ath6kl/include/common/epping_test.h | 9 - + drivers/staging/ath6kl/include/common/gmboxif.h | 8 - + drivers/staging/ath6kl/include/common/gpio.h | 45 - + drivers/staging/ath6kl/include/common/gpio_reg.h | 9 + + drivers/staging/ath6kl/include/common/htc.h | 9 - + drivers/staging/ath6kl/include/common/ini_dset.h | 82 - + drivers/staging/ath6kl/include/common/regDb.h | 29 - + drivers/staging/ath6kl/include/common/regdump.h | 59 - + .../include/common/regulatory/reg_dbschema.h | 237 - + .../include/common/regulatory/reg_dbvalues.h | 504 -- + drivers/staging/ath6kl/include/common/targaddrs.h | 234 +- + drivers/staging/ath6kl/include/common/wlan_dset.h | 33 - + drivers/staging/ath6kl/include/common/wmi.h | 135 +- + drivers/staging/ath6kl/include/common/wmi_thin.h | 347 - + drivers/staging/ath6kl/include/common/wmix.h | 8 - + drivers/staging/ath6kl/include/common_drv.h | 4 - + drivers/staging/ath6kl/include/gpio_api.h | 59 - + drivers/staging/ath6kl/include/hif.h | 3 +- + drivers/staging/ath6kl/include/target_reg_table.h | 244 - + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 23 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 28 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 6 - + drivers/staging/ath6kl/miscdrv/common_drv.c | 126 +- + drivers/staging/ath6kl/miscdrv/credit_dist.c | 1 - + drivers/staging/ath6kl/os/linux/ar6000_android.c | 388 - + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 793 +-- + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 77 - + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 479 -- + drivers/staging/ath6kl/os/linux/cfg80211.c | 193 +- + drivers/staging/ath6kl/os/linux/eeprom.c | 574 -- + .../staging/ath6kl/os/linux/export_hci_transport.c | 1 - + drivers/staging/ath6kl/os/linux/hci_bridge.c | 5 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 152 +- + .../ath6kl/os/linux/include/ar6xapi_linux.h | 8 - + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 4 +- + .../ath6kl/os/linux/include/athtypes_linux.h | 51 - + .../staging/ath6kl/os/linux/include/config_linux.h | 7 - + .../staging/ath6kl/os/linux/include/osapi_linux.h | 49 +- + .../staging/ath6kl/os/linux/include/wlan_config.h | 10 - + .../ath6kl/os/linux/include/wmi_filter_linux.h | 2 +- + drivers/staging/ath6kl/os/linux/ioctl.c | 4767 ------------ + drivers/staging/ath6kl/os/linux/netbuf.c | 1 - + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2723 ------- + drivers/staging/ath6kl/reorder/rcv_aggr.c | 15 +- + drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 - + drivers/staging/ath6kl/wlan/src/wlan_node.c | 11 +- + drivers/staging/ath6kl/wlan/src/wlan_recv_beacon.c | 1 - + drivers/staging/ath6kl/wlan/src/wlan_utils.c | 1 - + drivers/staging/ath6kl/wmi/wmi.c | 248 +- + drivers/staging/brcm80211/Kconfig | 21 +- + drivers/staging/brcm80211/Makefile | 1 + + drivers/staging/brcm80211/README | 102 +- + drivers/staging/brcm80211/TODO | 56 +- + drivers/staging/brcm80211/brcmfmac/Makefile | 11 +- + drivers/staging/brcm80211/brcmfmac/README | 35 - + .../{util/siutils_priv.h => brcmfmac/bcmchip.h} | 33 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 38 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 10 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 50 +- + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 7 +- + drivers/staging/brcm80211/brcmfmac/bcmutils.c | 1 - + drivers/staging/brcm80211/brcmfmac/bcmwifi.c | 1 - + drivers/staging/brcm80211/brcmfmac/dhd.h | 10 + + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 16 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 48 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 67 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1132 ++- + drivers/staging/brcm80211/brcmfmac/hndpmu.c | 1 - + drivers/staging/brcm80211/brcmfmac/sbutils.c | 1 - + drivers/staging/brcm80211/brcmfmac/siutils.c | 1 - + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 + + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 60 +- + drivers/staging/brcm80211/brcmsmac/Makefile | 20 +- + .../{util/siutils.c => brcmsmac/aiutils.c} | 1642 ++-- + drivers/staging/brcm80211/brcmsmac/aiutils.h | 546 ++ + .../staging/brcm80211/{util => brcmsmac}/bcmotp.c | 127 +- + drivers/staging/brcm80211/brcmsmac/bcmsrom.c | 714 ++ + .../brcm80211/{util => brcmsmac}/bcmsrom_tbl.h | 70 - + drivers/staging/brcm80211/brcmsmac/d11.h | 2 + + .../staging/brcm80211/{util => brcmsmac}/hnddma.c | 99 +- + .../staging/brcm80211/{util => brcmsmac}/nicpci.c | 77 +- + .../{util/nvram/nvram_ro.c => brcmsmac/nvram.c} | 81 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 182 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h | 5 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_int.h | 4 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c | 51 +- + drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 173 +- + .../staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c | 296 + + .../qmath.h => brcmsmac/phy/wlc_phy_qmath.h} | 38 - + drivers/staging/brcm80211/brcmsmac/wl_dbg.h | 24 +- + drivers/staging/brcm80211/brcmsmac/wl_export.h | 1 + + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 432 +- + drivers/staging/brcm80211/brcmsmac/wl_mac80211.h | 1 + + drivers/staging/brcm80211/brcmsmac/wlc_alloc.c | 71 +- + drivers/staging/brcm80211/brcmsmac/wlc_alloc.h | 2 - + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 336 +- + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h | 3 - + drivers/staging/brcm80211/brcmsmac/wlc_antsel.c | 15 +- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 628 +- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.h | 1 - + drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h | 3 - + drivers/staging/brcm80211/brcmsmac/wlc_channel.c | 63 +- + drivers/staging/brcm80211/brcmsmac/wlc_key.h | 10 +- + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 1297 ++-- + drivers/staging/brcm80211/brcmsmac/wlc_main.h | 17 +- + drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c | 9 +- + .../{util/hndpmu.c => brcmsmac/wlc_pmu.c} | 3192 +++----- + .../{include/hndpmu.h => brcmsmac/wlc_pmu.h} | 54 +- + drivers/staging/brcm80211/brcmsmac/wlc_pub.h | 16 +- + drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 20 +- + drivers/staging/brcm80211/brcmsmac/wlc_rate.h | 15 +- + drivers/staging/brcm80211/brcmsmac/wlc_scb.h | 2 - + drivers/staging/brcm80211/brcmsmac/wlc_stf.c | 62 +- + drivers/staging/brcm80211/include/bcmdefs.h | 12 - + drivers/staging/brcm80211/include/bcmdevs.h | 72 +- + drivers/staging/brcm80211/include/bcmnvram.h | 4 + + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 2 +- + drivers/staging/brcm80211/include/bcmutils.h | 180 +- + drivers/staging/brcm80211/include/bcmwifi.h | 6 +- + .../staging/brcm80211/{util => include}/pci_core.h | 0 + drivers/staging/brcm80211/include/pcicfg.h | 510 +-- + drivers/staging/brcm80211/include/wlioctl.h | 2 - + drivers/staging/brcm80211/util/Makefile | 29 + + drivers/staging/brcm80211/util/aiutils.c | 705 -- + drivers/staging/brcm80211/util/bcmsrom.c | 2088 ----- + drivers/staging/brcm80211/util/bcmutils.c | 480 +- + drivers/staging/brcm80211/util/bcmwifi.c | 13 +- + drivers/staging/brcm80211/util/qmath.c | 681 -- + drivers/staging/brcm80211/util/sbpcmcia.h | 217 - + drivers/staging/brcm80211/util/sbsocram.h | 175 - + drivers/staging/brcm80211/util/sbutils.c | 476 -- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 16 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 4 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 2 +- + drivers/staging/comedi/drivers/jr3_pci.c | 27 +- + drivers/staging/comedi/drivers/ni_660x.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 6 +- + drivers/staging/comedi/drivers/ni_tio.c | 6 +- + drivers/staging/comedi/drivers/pcl724.c | 2 +- + drivers/staging/comedi/drivers/pcl818.c | 2 +- + drivers/staging/comedi/drivers/pcm3724.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 2 +- + drivers/staging/crystalhd/bc_dts_types.h | 1 - + drivers/staging/crystalhd/crystalhd_misc.c | 4 +- + drivers/staging/cx25821/cx25821-video.c | 3 +- + drivers/staging/easycap/easycap_main.c | 229 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 158 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 19 - + drivers/staging/gma500/Makefile | 15 +- + drivers/staging/gma500/mrst.h | 217 + + drivers/staging/gma500/mrst_crtc.c | 619 ++ + drivers/staging/gma500/mrst_lvds.c | 371 + + drivers/staging/gma500/psb_2d.c | 9 +- + drivers/staging/gma500/psb_bl.c | 118 +- + drivers/staging/gma500/psb_buffer.c | 450 -- + drivers/staging/gma500/psb_drm.h | 122 - + drivers/staging/gma500/psb_drv.c | 765 +-- + drivers/staging/gma500/psb_drv.h | 462 +- + drivers/staging/gma500/psb_fb.c | 363 +- + drivers/staging/gma500/psb_fb.h | 16 +- + drivers/staging/gma500/psb_fence.c | 122 - + drivers/staging/gma500/psb_gem.c | 287 + + drivers/staging/gma500/psb_gtt.c | 1224 +--- + drivers/staging/gma500/psb_gtt.h | 83 +- + drivers/staging/gma500/psb_intel_display.c | 147 +- + drivers/staging/gma500/psb_intel_drv.h | 13 +- + drivers/staging/gma500/psb_intel_lvds.c | 50 +- + drivers/staging/gma500/psb_intel_sdvo.c | 4 +- + drivers/staging/gma500/psb_irq.c | 178 +- + drivers/staging/gma500/{psb_reset.c => psb_lid.c} | 0 + drivers/staging/gma500/psb_mmu.c | 61 - + drivers/staging/gma500/psb_powermgmt.c | 755 +-- + drivers/staging/gma500/psb_powermgmt.h | 55 +- + drivers/staging/gma500/psb_pvr_glue.c | 73 - + drivers/staging/gma500/psb_pvr_glue.h | 25 - + drivers/staging/gma500/psb_sgx.c | 238 - + drivers/staging/gma500/psb_sgx.h | 32 - + drivers/staging/gma500/psb_ttm_fence.c | 605 -- + drivers/staging/gma500/psb_ttm_fence_api.h | 272 - + drivers/staging/gma500/psb_ttm_fence_driver.h | 302 - + drivers/staging/gma500/psb_ttm_fence_user.c | 237 - + drivers/staging/gma500/psb_ttm_fence_user.h | 140 - + drivers/staging/gma500/psb_ttm_glue.c | 349 - + drivers/staging/gma500/psb_ttm_placement_user.c | 628 -- + drivers/staging/gma500/psb_ttm_placement_user.h | 252 - + drivers/staging/gma500/psb_ttm_userobj_api.h | 85 - + drivers/staging/hv/Kconfig | 4 +- + drivers/staging/hv/Makefile | 2 +- + drivers/staging/hv/blkvsc.c | 102 - + drivers/staging/hv/blkvsc_drv.c | 1540 ++--- + drivers/staging/hv/channel.c | 224 +- + drivers/staging/hv/channel_mgmt.c | 151 +- + drivers/staging/hv/channel_mgmt.h | 6 +- + drivers/staging/hv/connection.c | 102 +- + drivers/staging/hv/hv.c | 105 +- + drivers/staging/hv/hv_kvp.c | 9 +- + drivers/staging/hv/hv_mouse.c | 463 +- + drivers/staging/hv/hv_timesource.c | 3 +- + drivers/staging/hv/hv_util.c | 31 +- + drivers/staging/hv/netvsc.c | 985 +-- + drivers/staging/hv/netvsc.h | 3 +- + drivers/staging/hv/netvsc_api.h | 14 + + drivers/staging/hv/netvsc_drv.c | 108 +- + drivers/staging/hv/ring_buffer.c | 521 +- + drivers/staging/hv/ring_buffer.h | 24 +- + drivers/staging/hv/rndis_filter.c | 124 +- + drivers/staging/hv/storvsc.c | 540 +- + drivers/staging/hv/storvsc_api.h | 120 +- + drivers/staging/hv/storvsc_drv.c | 985 ++-- + drivers/staging/hv/vmbus_api.h | 26 +- + drivers/staging/hv/vmbus_drv.c | 1088 ++-- + drivers/staging/hv/vmbus_private.h | 4 - + drivers/staging/hv/vstorage.h | 5 + + drivers/staging/iio/Documentation/device.txt | 2 +- + drivers/staging/iio/Documentation/generic_buffer.c | 2 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 13 + + .../staging/iio/Documentation/sysfs-bus-iio-light | 13 + + .../iio/Documentation/sysfs-bus-iio-light-tsl2583 | 20 + + drivers/staging/iio/accel/adis16201_core.c | 28 +- + drivers/staging/iio/accel/adis16201_trigger.c | 45 +- + drivers/staging/iio/accel/adis16203_core.c | 28 +- + drivers/staging/iio/accel/adis16203_trigger.c | 46 +- + drivers/staging/iio/accel/adis16204_core.c | 28 +- + drivers/staging/iio/accel/adis16204_trigger.c | 46 +- + drivers/staging/iio/accel/adis16209_core.c | 28 +- + drivers/staging/iio/accel/adis16209_trigger.c | 45 +- + drivers/staging/iio/accel/adis16220_core.c | 2 +- + drivers/staging/iio/accel/adis16240_core.c | 28 +- + drivers/staging/iio/accel/adis16240_trigger.c | 46 +- + drivers/staging/iio/accel/kxsd9.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_core.c | 4 +- + drivers/staging/iio/accel/sca3000_core.c | 2 +- + drivers/staging/iio/accel/sca3000_ring.c | 8 +- + drivers/staging/iio/adc/Kconfig | 12 + + drivers/staging/iio/adc/Makefile | 1 + + drivers/staging/iio/adc/ad7150.c | 2 +- + drivers/staging/iio/adc/ad7152.c | 2 +- + drivers/staging/iio/adc/ad7291.c | 2 +- + drivers/staging/iio/adc/ad7298_core.c | 2 +- + drivers/staging/iio/adc/ad7314.c | 2 +- + drivers/staging/iio/adc/ad7476_core.c | 2 +- + drivers/staging/iio/adc/ad7606_core.c | 2 +- + drivers/staging/iio/adc/ad7745.c | 2 +- + drivers/staging/iio/adc/ad7780.c | 329 + + drivers/staging/iio/adc/ad7780.h | 30 + + drivers/staging/iio/adc/ad7816.c | 2 +- + drivers/staging/iio/adc/ad7887_core.c | 2 +- + drivers/staging/iio/adc/ad799x_core.c | 2 +- + drivers/staging/iio/adc/adt7310.c | 2 +- + drivers/staging/iio/adc/adt7410.c | 2 +- + drivers/staging/iio/adc/adt75.c | 2 +- + drivers/staging/iio/adc/max1363.h | 2 - + drivers/staging/iio/adc/max1363_core.c | 189 +- + drivers/staging/iio/adc/max1363_ring.c | 21 +- + drivers/staging/iio/addac/adt7316.c | 8 +- + drivers/staging/iio/dac/Kconfig | 21 + + drivers/staging/iio/dac/Makefile | 2 + + drivers/staging/iio/dac/ad5446.c | 9 +- + drivers/staging/iio/dac/ad5446.h | 1 + + drivers/staging/iio/dac/ad5504.c | 426 + + drivers/staging/iio/dac/ad5504.h | 74 + + drivers/staging/iio/dac/ad5624r_spi.c | 2 +- + drivers/staging/iio/dac/ad5791.c | 440 ++ + drivers/staging/iio/dac/ad5791.h | 116 + + drivers/staging/iio/dac/max517.c | 2 +- + drivers/staging/iio/dds/Kconfig | 4 +- + drivers/staging/iio/dds/ad5930.c | 2 +- + drivers/staging/iio/dds/ad9832.c | 2 +- + drivers/staging/iio/dds/ad9834.c | 33 +- + drivers/staging/iio/dds/ad9834.h | 8 +- + drivers/staging/iio/dds/ad9850.c | 2 +- + drivers/staging/iio/dds/ad9852.c | 2 +- + drivers/staging/iio/dds/ad9910.c | 2 +- + drivers/staging/iio/dds/ad9951.c | 2 +- + drivers/staging/iio/gyro/Kconfig | 10 + + drivers/staging/iio/gyro/Makefile | 3 + + drivers/staging/iio/gyro/adis16060_core.c | 2 +- + drivers/staging/iio/gyro/adis16080_core.c | 2 +- + drivers/staging/iio/gyro/adis16130_core.c | 2 +- + drivers/staging/iio/gyro/adis16260_core.c | 27 +- + drivers/staging/iio/gyro/adis16260_trigger.c | 46 +- + drivers/staging/iio/gyro/adxrs450.h | 58 + + drivers/staging/iio/gyro/adxrs450_core.c | 451 ++ + drivers/staging/iio/gyro/gyro.h | 3 + + drivers/staging/iio/iio.h | 17 +- + drivers/staging/iio/imu/adis16300_core.c | 28 +- + drivers/staging/iio/imu/adis16300_trigger.c | 48 +- + drivers/staging/iio/imu/adis16350_core.c | 28 +- + drivers/staging/iio/imu/adis16350_trigger.c | 48 +- + drivers/staging/iio/imu/adis16400_core.c | 28 +- + drivers/staging/iio/imu/adis16400_trigger.c | 47 +- + drivers/staging/iio/industrialio-core.c | 15 +- + drivers/staging/iio/industrialio-ring.c | 12 +- + drivers/staging/iio/industrialio-trigger.c | 27 +- + drivers/staging/iio/kfifo_buf.c | 8 +- + drivers/staging/iio/kfifo_buf.h | 10 +- + drivers/staging/iio/light/Kconfig | 6 + + drivers/staging/iio/light/Makefile | 1 + + drivers/staging/iio/light/isl29018.c | 2 +- + drivers/staging/iio/light/tsl2563.c | 72 +- + drivers/staging/iio/light/tsl2583.c | 960 +++ + drivers/staging/iio/magnetometer/ak8975.c | 122 +- + drivers/staging/iio/magnetometer/hmc5843.c | 2 +- + drivers/staging/iio/meter/ade7753.c | 2 +- + drivers/staging/iio/meter/ade7754.c | 2 +- + drivers/staging/iio/meter/ade7758_core.c | 32 +- + drivers/staging/iio/meter/ade7758_trigger.c | 48 +- + drivers/staging/iio/meter/ade7759.c | 2 +- + drivers/staging/iio/meter/ade7854.c | 2 +- + drivers/staging/iio/resolver/ad2s120x.c | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 2 +- + drivers/staging/iio/resolver/ad2s90.c | 2 +- + drivers/staging/iio/ring_generic.h | 10 +- + drivers/staging/iio/ring_sw.c | 13 +- + drivers/staging/iio/ring_sw.h | 14 +- + drivers/staging/iio/sysfs.h | 1 + + drivers/staging/iio/trigger.h | 7 - + drivers/staging/iio/trigger/Kconfig | 1 + + drivers/staging/intel_sst/intel_sst.c | 129 +- + drivers/staging/intel_sst/intel_sst.h | 33 +- + .../staging/intel_sst/intel_sst_app_interface.c | 45 +- + drivers/staging/intel_sst/intel_sst_common.h | 9 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 24 +- + drivers/staging/intel_sst/intel_sst_dsp.c | 14 +- + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 7 + + drivers/staging/intel_sst/intel_sst_ioctl.h | 8 + + drivers/staging/intel_sst/intel_sst_ipc.c | 74 +- + drivers/staging/intel_sst/intel_sst_pvt.c | 2 +- + drivers/staging/intel_sst/intel_sst_stream.c | 15 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 8 +- + drivers/staging/intel_sst/intelmid.c | 473 +- + drivers/staging/intel_sst/intelmid.h | 38 +- + drivers/staging/intel_sst/intelmid_adc_control.h | 193 + + drivers/staging/intel_sst/intelmid_ctrl.c | 304 +- + drivers/staging/intel_sst/intelmid_msic_control.c | 833 ++- + drivers/staging/intel_sst/intelmid_pvt.c | 1 - + drivers/staging/intel_sst/intelmid_snd_control.h | 9 + + drivers/staging/intel_sst/intelmid_v0_control.c | 109 +- + drivers/staging/intel_sst/intelmid_v1_control.c | 141 +- + drivers/staging/intel_sst/intelmid_v2_control.c | 219 +- + drivers/staging/intel_sst/jack.h | 10 - + drivers/staging/keucr/common.h | 2 + + drivers/staging/keucr/init.c | 3 - + drivers/staging/keucr/init.h | 10 +- + drivers/staging/keucr/ms.c | 7 +- + drivers/staging/keucr/msscsi.c | 29 +- + drivers/staging/keucr/scsiglue.c | 35 +- + drivers/staging/keucr/smcommon.h | 2 +- + drivers/staging/keucr/smil.h | 14 + + drivers/staging/keucr/smilecc.c | 49 +- + drivers/staging/keucr/smilmain.c | 144 +- + drivers/staging/keucr/smilsub.c | 66 +- + drivers/staging/keucr/smscsi.c | 2 - + drivers/staging/keucr/transport.c | 140 +- + drivers/staging/keucr/transport.h | 3 - + drivers/staging/keucr/usb.c | 95 +- + drivers/staging/lirc/lirc_parallel.c | 27 +- + drivers/staging/lirc/lirc_serial.c | 2 +- + drivers/staging/lirc/lirc_sir.c | 30 +- + drivers/staging/octeon/ethernet-mdio.c | 2 - + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 22 +- + drivers/staging/rt2860/Kconfig | 10 - + drivers/staging/rt2860/Makefile | 52 - + drivers/staging/rt2860/TODO | 16 - + drivers/staging/rt2860/ap.h | 68 - + drivers/staging/rt2860/chip/mac_pci.h | 355 - + drivers/staging/rt2860/chip/mac_usb.h | 345 - + drivers/staging/rt2860/chip/rt2860.h | 54 - + drivers/staging/rt2860/chip/rt2870.h | 46 - + drivers/staging/rt2860/chip/rt3070.h | 67 - + drivers/staging/rt2860/chip/rt3090.h | 72 - + drivers/staging/rt2860/chip/rt30xx.h | 47 - + drivers/staging/rt2860/chip/rtmp_mac.h | 1308 ---- + drivers/staging/rt2860/chip/rtmp_phy.h | 516 -- + drivers/staging/rt2860/chips/rt3070.c | 169 - + drivers/staging/rt2860/chips/rt3090.c | 121 - + drivers/staging/rt2860/chips/rt30xx.c | 516 -- + drivers/staging/rt2860/chlist.h | 113 - + drivers/staging/rt2860/common/action.c | 606 -- + drivers/staging/rt2860/common/action.h | 56 - + drivers/staging/rt2860/common/ba_action.c | 1650 ---- + drivers/staging/rt2860/common/cmm_aes.c | 1311 ---- + drivers/staging/rt2860/common/cmm_asic.c | 2565 ------ + drivers/staging/rt2860/common/cmm_cfg.c | 258 - + drivers/staging/rt2860/common/cmm_data.c | 2361 ------ + drivers/staging/rt2860/common/cmm_data_pci.c | 1096 --- + drivers/staging/rt2860/common/cmm_data_usb.c | 951 --- + drivers/staging/rt2860/common/cmm_info.c | 955 --- + drivers/staging/rt2860/common/cmm_mac_pci.c | 1661 ---- + drivers/staging/rt2860/common/cmm_mac_usb.c | 1162 --- + drivers/staging/rt2860/common/cmm_sanity.c | 1205 --- + drivers/staging/rt2860/common/cmm_sync.c | 718 -- + drivers/staging/rt2860/common/cmm_tkip.c | 833 -- + drivers/staging/rt2860/common/cmm_wep.c | 473 -- + drivers/staging/rt2860/common/cmm_wpa.c | 3010 -------- + drivers/staging/rt2860/common/crypt_hmac.c | 187 - + drivers/staging/rt2860/common/crypt_md5.c | 339 - + drivers/staging/rt2860/common/crypt_sha2.c | 269 - + drivers/staging/rt2860/common/dfs.c | 68 - + drivers/staging/rt2860/common/ee_efuse.c | 351 - + drivers/staging/rt2860/common/ee_prom.c | 197 - + drivers/staging/rt2860/common/eeprom.c | 91 - + drivers/staging/rt2860/common/mlme.c | 6068 --------------- + drivers/staging/rt2860/common/rt_channel.c | 1705 ---- + drivers/staging/rt2860/common/rt_rf.c | 187 - + drivers/staging/rt2860/common/rtmp_init.c | 3536 --------- + drivers/staging/rt2860/common/rtmp_mcu.c | 336 - + drivers/staging/rt2860/common/rtmp_timer.c | 302 - + drivers/staging/rt2860/common/spectrum.c | 2205 ------ + drivers/staging/rt2860/crypt_hmac.h | 65 - + drivers/staging/rt2860/crypt_md5.h | 73 - + drivers/staging/rt2860/crypt_sha2.h | 73 - + drivers/staging/rt2860/dfs.h | 39 - + drivers/staging/rt2860/eeprom.h | 67 - + drivers/staging/rt2860/iface/rtmp_pci.h | 80 - + drivers/staging/rt2860/iface/rtmp_usb.h | 196 - + drivers/staging/rt2860/mlme.h | 1050 --- + drivers/staging/rt2860/oid.h | 779 -- + drivers/staging/rt2860/pci_main_dev.c | 1192 --- + drivers/staging/rt2860/rt_config.h | 71 - + drivers/staging/rt2860/rt_linux.c | 1367 ---- + drivers/staging/rt2860/rt_linux.h | 835 -- + drivers/staging/rt2860/rt_main_dev.c | 736 -- + drivers/staging/rt2860/rt_pci_rbus.c | 837 -- + drivers/staging/rt2860/rt_usb.c | 794 -- + drivers/staging/rt2860/rtmp.h | 4332 ----------- + drivers/staging/rt2860/rtmp_chip.h | 258 - + drivers/staging/rt2860/rtmp_ckipmic.h | 63 - + drivers/staging/rt2860/rtmp_def.h | 1427 ---- + drivers/staging/rt2860/rtmp_dot11.h | 100 - + drivers/staging/rt2860/rtmp_iface.h | 75 - + drivers/staging/rt2860/rtmp_mcu.h | 49 - + drivers/staging/rt2860/rtmp_os.h | 90 - + drivers/staging/rt2860/rtmp_timer.h | 148 - + drivers/staging/rt2860/rtmp_type.h | 89 - + drivers/staging/rt2860/rtusb_io.h | 185 - + drivers/staging/rt2860/spectrum.h | 189 - + drivers/staging/rt2860/spectrum_def.h | 202 - + drivers/staging/rt2860/sta/assoc.c | 1602 ---- + drivers/staging/rt2860/sta/auth.c | 517 -- + drivers/staging/rt2860/sta/auth_rsp.c | 142 - + drivers/staging/rt2860/sta/connect.c | 2613 ------- + drivers/staging/rt2860/sta/rtmp_data.c | 2552 ------ + drivers/staging/rt2860/sta/sanity.c | 362 - + drivers/staging/rt2860/sta/sync.c | 1968 ----- + drivers/staging/rt2860/sta/wpa.c | 374 - + drivers/staging/rt2860/sta_ioctl.c | 2912 ------- + drivers/staging/rt2860/usb_main_dev.c | 927 --- + drivers/staging/rt2860/wpa.h | 390 - + drivers/staging/rt2870/Kconfig | 9 - + drivers/staging/rt2870/Makefile | 55 - + drivers/staging/rt2870/TODO | 17 - + drivers/staging/rt2870/aironet.h | 1 - + drivers/staging/rt2870/ap.h | 1 - + drivers/staging/rt2870/chips/rt3070.c | 1 - + drivers/staging/rt2870/chips/rt30xx.c | 1 - + drivers/staging/rt2870/chlist.h | 1 - + drivers/staging/rt2870/common/acction.c | 1 - + drivers/staging/rt2870/common/action.c | 1 - + drivers/staging/rt2870/common/action.h | 1 - + drivers/staging/rt2870/common/ba_action.c | 1 - + drivers/staging/rt2870/common/cmm_aes.c | 1 - + drivers/staging/rt2870/common/cmm_asic.c | 1 - + drivers/staging/rt2870/common/cmm_cfg.c | 1 - + drivers/staging/rt2870/common/cmm_data.c | 1 - + drivers/staging/rt2870/common/cmm_data_usb.c | 1 - + drivers/staging/rt2870/common/cmm_info.c | 1 - + drivers/staging/rt2870/common/cmm_mac_usb.c | 1 - + drivers/staging/rt2870/common/cmm_profile.c | 1 - + drivers/staging/rt2870/common/cmm_sanity.c | 1 - + drivers/staging/rt2870/common/cmm_sync.c | 1 - + drivers/staging/rt2870/common/cmm_tkip.c | 1 - + drivers/staging/rt2870/common/cmm_wep.c | 1 - + drivers/staging/rt2870/common/cmm_wpa.c | 1 - + drivers/staging/rt2870/common/crypt_hmac.c | 1 - + drivers/staging/rt2870/common/crypt_md5.c | 1 - + drivers/staging/rt2870/common/crypt_sha2.c | 1 - + drivers/staging/rt2870/common/dfs.c | 1 - + drivers/staging/rt2870/common/ee_efuse.c | 1 - + drivers/staging/rt2870/common/eeprom.c | 1 - + drivers/staging/rt2870/common/md5.c | 1 - + drivers/staging/rt2870/common/mlme.c | 1 - + drivers/staging/rt2870/common/rt_channel.c | 1 - + drivers/staging/rt2870/common/rt_rf.c | 1 - + drivers/staging/rt2870/common/rtmp_init.c | 1 - + drivers/staging/rt2870/common/rtmp_mcu.c | 1 - + drivers/staging/rt2870/common/rtmp_timer.c | 1 - + drivers/staging/rt2870/common/rtmp_tkip.c | 1 - + drivers/staging/rt2870/common/rtmp_wep.c | 1 - + drivers/staging/rt2870/common/rtusb_bulk.c | 1232 --- + drivers/staging/rt2870/common/rtusb_data.c | 262 - + drivers/staging/rt2870/common/rtusb_io.c | 2104 ----- + drivers/staging/rt2870/common/spectrum.c | 1 - + drivers/staging/rt2870/dfs.h | 1 - + drivers/staging/rt2870/md5.h | 1 - + drivers/staging/rt2870/mlme.h | 1 - + drivers/staging/rt2870/oid.h | 1 - + drivers/staging/rt2870/rt28xx.h | 1 - + drivers/staging/rt2870/rt_config.h | 1 - + drivers/staging/rt2870/rt_linux.c | 1 - + drivers/staging/rt2870/rt_linux.h | 1 - + drivers/staging/rt2870/rt_main_dev.c | 1 - + drivers/staging/rt2870/rt_profile.c | 1 - + drivers/staging/rt2870/rt_usb.c | 1 - + drivers/staging/rt2870/rtmp.h | 1 - + drivers/staging/rt2870/rtmp_ckipmic.h | 1 - + drivers/staging/rt2870/rtmp_def.h | 1 - + drivers/staging/rt2870/rtmp_type.h | 1 - + drivers/staging/rt2870/spectrum.h | 1 - + drivers/staging/rt2870/spectrum_def.h | 1 - + drivers/staging/rt2870/sta/aironet.c | 1 - + drivers/staging/rt2870/sta/assoc.c | 1 - + drivers/staging/rt2870/sta/auth.c | 1 - + drivers/staging/rt2870/sta/auth_rsp.c | 1 - + drivers/staging/rt2870/sta/connect.c | 1 - + drivers/staging/rt2870/sta/rtmp_data.c | 1 - + drivers/staging/rt2870/sta/sanity.c | 1 - + drivers/staging/rt2870/sta/sync.c | 1 - + drivers/staging/rt2870/sta/wpa.c | 1 - + drivers/staging/rt2870/sta_ioctl.c | 1 - + drivers/staging/rt2870/usb_main_dev.c | 1 - + drivers/staging/rt2870/wpa.h | 1 - + drivers/staging/rtl8712/ieee80211.h | 26 +- + drivers/staging/rtl8712/if_ether.h | 4 +- + drivers/staging/rtl8712/ip.h | 34 +- + drivers/staging/rtl8712/mlme_osdep.h | 4 +- + drivers/staging/rtl8712/osdep_service.h | 3 +- + drivers/staging/rtl8712/recv_osdep.h | 4 +- + drivers/staging/rtl8712/rtl8712_event.h | 25 +- + drivers/staging/rtl8712/rtl8712_hal.h | 100 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.h | 11 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 7 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 26 +- + drivers/staging/rtl8712/rtl871x_event.h | 12 +- + drivers/staging/rtl8712/rtl871x_io.c | 6 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 9 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 2 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 5 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.h | 16 +- + drivers/staging/rtl8712/rtl871x_mp.c | 8 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 10 +- + drivers/staging/rtl8712/rtl871x_recv.c | 16 +- + drivers/staging/rtl8712/rtl871x_recv.h | 4 +- + drivers/staging/rtl8712/rtl871x_rf.h | 2 +- + drivers/staging/rtl8712/rtl871x_security.h | 51 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 3 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 3 +- + drivers/staging/rtl8712/wifi.h | 63 +- + drivers/staging/rtl8712/wlan_bssdef.h | 212 +- + drivers/staging/rts_pstor/ms.c | 52 +- + drivers/staging/rts_pstor/rtsx.c | 4 +- + drivers/staging/rts_pstor/rtsx.h | 3 - + drivers/staging/rts_pstor/sd.c | 1 + + drivers/staging/rts_pstor/spi.c | 34 +- + drivers/staging/rts_pstor/xd.c | 4 +- + drivers/staging/sbe-2t3e3/dc.c | 33 +- + drivers/staging/sep/sep_driver.c | 9 +- + drivers/staging/sm7xx/TODO | 2 - + drivers/staging/sm7xx/smtcfb.c | 198 +- + drivers/staging/tty/istallion.c | 2 +- + drivers/staging/usbip/Kconfig | 52 +- + drivers/staging/usbip/Makefile | 15 +- + drivers/staging/usbip/stub.h | 33 +- + drivers/staging/usbip/stub_dev.c | 59 +- + drivers/staging/usbip/stub_main.c | 36 +- + drivers/staging/usbip/stub_rx.c | 57 +- + drivers/staging/usbip/stub_tx.c | 70 +- + drivers/staging/usbip/usbip_common.c | 149 +- + drivers/staging/usbip/usbip_common.h | 111 +- + drivers/staging/usbip/usbip_event.c | 19 +- + drivers/staging/usbip/vhci.h | 38 +- + drivers/staging/usbip/vhci_hcd.c | 215 +- + drivers/staging/usbip/vhci_rx.c | 51 +- + drivers/staging/usbip/vhci_sysfs.c | 21 +- + drivers/staging/usbip/vhci_tx.c | 38 +- + drivers/staging/vt6655/bssdb.c | 8 +- + drivers/staging/vt6655/device.h | 2 +- + drivers/staging/vt6655/device_main.c | 14 +- + drivers/staging/vt6655/dpc.c | 10 +- + drivers/staging/vt6655/ioctl.c | 44 +- + drivers/staging/vt6655/power.c | 2 +- + drivers/staging/vt6655/rxtx.c | 4 +- + drivers/staging/vt6655/wcmd.c | 14 +- + drivers/staging/vt6655/wmgr.c | 46 +- + drivers/staging/vt6655/wpactl.c | 10 +- + drivers/staging/vt6656/bssdb.c | 8 +- + drivers/staging/vt6656/dpc.c | 10 +- + drivers/staging/vt6656/ioctl.c | 44 +- + drivers/staging/vt6656/main_usb.c | 4 +- + drivers/staging/vt6656/rxtx.c | 4 +- + drivers/staging/vt6656/wcmd.c | 8 +- + drivers/staging/vt6656/wmgr.c | 48 +- + drivers/staging/vt6656/wpactl.c | 10 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 2 +- + .../westbridge/astoria/block/cyasblkdev_block.c | 2 +- + drivers/staging/winbond/mto.c | 10 - + drivers/staging/winbond/phy_calibration.c | 8 +- + drivers/staging/winbond/wb35tx.c | 3 +- + drivers/staging/xgifb/XGI_main.h | 792 +- + drivers/staging/xgifb/XGI_main_26.c | 1259 ++-- + drivers/staging/xgifb/XGIfb.h | 142 +- + drivers/staging/xgifb/vb_def.h | 1269 ++-- + drivers/staging/xgifb/vb_ext.c | 138 +- + drivers/staging/xgifb/vb_ext.h | 25 +- + drivers/staging/xgifb/vb_init.c | 527 +- + drivers/staging/xgifb/vb_init.h | 7 +- + drivers/staging/xgifb/vb_setmode.c | 1885 +++-- + drivers/staging/xgifb/vb_setmode.h | 97 +- + drivers/staging/xgifb/vb_struct.h | 823 +-- + drivers/staging/xgifb/vb_table.h | 8147 ++++++++++---------- + drivers/staging/xgifb/vb_util.c | 2 +- + drivers/staging/xgifb/vgatypes.h | 113 +- + kernel/module.c | 4 +- + 687 files changed, 28120 insertions(+), 151684 deletions(-) + delete mode 100644 drivers/staging/ath6kl/include/a_types.h + delete mode 100644 drivers/staging/ath6kl/include/athendpack.h + delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/AR6002_regdump.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_intf_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/analog_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/apb_map.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/gpio_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_host_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/mbox_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/rtc_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/si_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/uart_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw2.0/hw/vmc_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_ares_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_athr_wlan_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/analog_intf_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/bb_lc_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/efuse_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_athr_wlan_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/gpio_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_dma_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/mac_pcu_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/rdma_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/si_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/umbox_wlan_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/AR6002/hw4.0/hw/vmc_wlan_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/a_hci.h + delete mode 100644 drivers/staging/ath6kl/include/common/btcoexGpio.h + delete mode 100644 drivers/staging/ath6kl/include/common/dset_internal.h + delete mode 100644 drivers/staging/ath6kl/include/common/dsetid.h + delete mode 100644 drivers/staging/ath6kl/include/common/gpio.h + create mode 100644 drivers/staging/ath6kl/include/common/gpio_reg.h + delete mode 100644 drivers/staging/ath6kl/include/common/ini_dset.h + delete mode 100644 drivers/staging/ath6kl/include/common/regDb.h + delete mode 100644 drivers/staging/ath6kl/include/common/regdump.h + delete mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbschema.h + delete mode 100644 drivers/staging/ath6kl/include/common/regulatory/reg_dbvalues.h + delete mode 100644 drivers/staging/ath6kl/include/common/wlan_dset.h + delete mode 100644 drivers/staging/ath6kl/include/common/wmi_thin.h + delete mode 100644 drivers/staging/ath6kl/include/gpio_api.h + delete mode 100644 drivers/staging/ath6kl/include/target_reg_table.h + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c + delete mode 100644 drivers/staging/ath6kl/os/linux/eeprom.c + delete mode 100644 drivers/staging/ath6kl/os/linux/include/athtypes_linux.h + delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c + delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c + rename drivers/staging/brcm80211/{util/siutils_priv.h => brcmfmac/bcmchip.h} (52%) + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmutils.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/bcmwifi.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/hndpmu.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/sbutils.c + delete mode 100644 drivers/staging/brcm80211/brcmfmac/siutils.c + rename drivers/staging/brcm80211/{util/siutils.c => brcmsmac/aiutils.c} (56%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/aiutils.h + rename drivers/staging/brcm80211/{util => brcmsmac}/bcmotp.c (90%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/bcmsrom.c + rename drivers/staging/brcm80211/{util => brcmsmac}/bcmsrom_tbl.h (89%) + rename drivers/staging/brcm80211/{util => brcmsmac}/hnddma.c (94%) + rename drivers/staging/brcm80211/{util => brcmsmac}/nicpci.c (92%) + rename drivers/staging/brcm80211/{util/nvram/nvram_ro.c => brcmsmac/nvram.c} (80%) + create mode 100644 drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c + rename drivers/staging/brcm80211/{include/qmath.h => brcmsmac/phy/wlc_phy_qmath.h} (63%) + rename drivers/staging/brcm80211/{util/hndpmu.c => brcmsmac/wlc_pmu.c} (67%) + rename drivers/staging/brcm80211/{include/hndpmu.h => brcmsmac/wlc_pmu.h} (77%) + rename drivers/staging/brcm80211/{util => include}/pci_core.h (100%) + create mode 100644 drivers/staging/brcm80211/util/Makefile + delete mode 100644 drivers/staging/brcm80211/util/aiutils.c + delete mode 100644 drivers/staging/brcm80211/util/bcmsrom.c + delete mode 100644 drivers/staging/brcm80211/util/qmath.c + delete mode 100644 drivers/staging/brcm80211/util/sbpcmcia.h + delete mode 100644 drivers/staging/brcm80211/util/sbsocram.h + delete mode 100644 drivers/staging/brcm80211/util/sbutils.c + create mode 100644 drivers/staging/gma500/mrst.h + create mode 100644 drivers/staging/gma500/mrst_crtc.c + create mode 100644 drivers/staging/gma500/mrst_lvds.c + delete mode 100644 drivers/staging/gma500/psb_buffer.c + delete mode 100644 drivers/staging/gma500/psb_fence.c + create mode 100644 drivers/staging/gma500/psb_gem.c + rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%) + delete mode 100644 drivers/staging/gma500/psb_pvr_glue.c + delete mode 100644 drivers/staging/gma500/psb_pvr_glue.h + delete mode 100644 drivers/staging/gma500/psb_sgx.c + delete mode 100644 drivers/staging/gma500/psb_sgx.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h + delete mode 100644 drivers/staging/hv/blkvsc.c + create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-light-tsl2583 + create mode 100644 drivers/staging/iio/adc/ad7780.c + create mode 100644 drivers/staging/iio/adc/ad7780.h + create mode 100644 drivers/staging/iio/dac/ad5504.c + create mode 100644 drivers/staging/iio/dac/ad5504.h + create mode 100644 drivers/staging/iio/dac/ad5791.c + create mode 100644 drivers/staging/iio/dac/ad5791.h + create mode 100644 drivers/staging/iio/gyro/adxrs450.h + create mode 100644 drivers/staging/iio/gyro/adxrs450_core.c + create mode 100644 drivers/staging/iio/light/tsl2583.c + create mode 100644 drivers/staging/intel_sst/intelmid_adc_control.h + delete mode 100644 drivers/staging/intel_sst/jack.h + delete mode 100644 drivers/staging/rt2860/Kconfig + delete mode 100644 drivers/staging/rt2860/Makefile + delete mode 100644 drivers/staging/rt2860/TODO + delete mode 100644 drivers/staging/rt2860/ap.h + delete mode 100644 drivers/staging/rt2860/chip/mac_pci.h + delete mode 100644 drivers/staging/rt2860/chip/mac_usb.h + delete mode 100644 drivers/staging/rt2860/chip/rt2860.h + delete mode 100644 drivers/staging/rt2860/chip/rt2870.h + delete mode 100644 drivers/staging/rt2860/chip/rt3070.h + delete mode 100644 drivers/staging/rt2860/chip/rt3090.h + delete mode 100644 drivers/staging/rt2860/chip/rt30xx.h + delete mode 100644 drivers/staging/rt2860/chip/rtmp_mac.h + delete mode 100644 drivers/staging/rt2860/chip/rtmp_phy.h + delete mode 100644 drivers/staging/rt2860/chips/rt3070.c + delete mode 100644 drivers/staging/rt2860/chips/rt3090.c + delete mode 100644 drivers/staging/rt2860/chips/rt30xx.c + delete mode 100644 drivers/staging/rt2860/chlist.h + delete mode 100644 drivers/staging/rt2860/common/action.c + delete mode 100644 drivers/staging/rt2860/common/action.h + delete mode 100644 drivers/staging/rt2860/common/ba_action.c + delete mode 100644 drivers/staging/rt2860/common/cmm_aes.c + delete mode 100644 drivers/staging/rt2860/common/cmm_asic.c + delete mode 100644 drivers/staging/rt2860/common/cmm_cfg.c + delete mode 100644 drivers/staging/rt2860/common/cmm_data.c + delete mode 100644 drivers/staging/rt2860/common/cmm_data_pci.c + delete mode 100644 drivers/staging/rt2860/common/cmm_data_usb.c + delete mode 100644 drivers/staging/rt2860/common/cmm_info.c + delete mode 100644 drivers/staging/rt2860/common/cmm_mac_pci.c + delete mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c + delete mode 100644 drivers/staging/rt2860/common/cmm_sanity.c + delete mode 100644 drivers/staging/rt2860/common/cmm_sync.c + delete mode 100644 drivers/staging/rt2860/common/cmm_tkip.c + delete mode 100644 drivers/staging/rt2860/common/cmm_wep.c + delete mode 100644 drivers/staging/rt2860/common/cmm_wpa.c + delete mode 100644 drivers/staging/rt2860/common/crypt_hmac.c + delete mode 100644 drivers/staging/rt2860/common/crypt_md5.c + delete mode 100644 drivers/staging/rt2860/common/crypt_sha2.c + delete mode 100644 drivers/staging/rt2860/common/dfs.c + delete mode 100644 drivers/staging/rt2860/common/ee_efuse.c + delete mode 100644 drivers/staging/rt2860/common/ee_prom.c + delete mode 100644 drivers/staging/rt2860/common/eeprom.c + delete mode 100644 drivers/staging/rt2860/common/mlme.c + delete mode 100644 drivers/staging/rt2860/common/rt_channel.c + delete mode 100644 drivers/staging/rt2860/common/rt_rf.c + delete mode 100644 drivers/staging/rt2860/common/rtmp_init.c + delete mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c + delete mode 100644 drivers/staging/rt2860/common/rtmp_timer.c + delete mode 100644 drivers/staging/rt2860/common/spectrum.c + delete mode 100644 drivers/staging/rt2860/crypt_hmac.h + delete mode 100644 drivers/staging/rt2860/crypt_md5.h + delete mode 100644 drivers/staging/rt2860/crypt_sha2.h + delete mode 100644 drivers/staging/rt2860/dfs.h + delete mode 100644 drivers/staging/rt2860/eeprom.h + delete mode 100644 drivers/staging/rt2860/iface/rtmp_pci.h + delete mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h + delete mode 100644 drivers/staging/rt2860/mlme.h + delete mode 100644 drivers/staging/rt2860/oid.h + delete mode 100644 drivers/staging/rt2860/pci_main_dev.c + delete mode 100644 drivers/staging/rt2860/rt_config.h + delete mode 100644 drivers/staging/rt2860/rt_linux.c + delete mode 100644 drivers/staging/rt2860/rt_linux.h + delete mode 100644 drivers/staging/rt2860/rt_main_dev.c + delete mode 100644 drivers/staging/rt2860/rt_pci_rbus.c + delete mode 100644 drivers/staging/rt2860/rt_usb.c + delete mode 100644 drivers/staging/rt2860/rtmp.h + delete mode 100644 drivers/staging/rt2860/rtmp_chip.h + delete mode 100644 drivers/staging/rt2860/rtmp_ckipmic.h + delete mode 100644 drivers/staging/rt2860/rtmp_def.h + delete mode 100644 drivers/staging/rt2860/rtmp_dot11.h + delete mode 100644 drivers/staging/rt2860/rtmp_iface.h + delete mode 100644 drivers/staging/rt2860/rtmp_mcu.h + delete mode 100644 drivers/staging/rt2860/rtmp_os.h + delete mode 100644 drivers/staging/rt2860/rtmp_timer.h + delete mode 100644 drivers/staging/rt2860/rtmp_type.h + delete mode 100644 drivers/staging/rt2860/rtusb_io.h + delete mode 100644 drivers/staging/rt2860/spectrum.h + delete mode 100644 drivers/staging/rt2860/spectrum_def.h + delete mode 100644 drivers/staging/rt2860/sta/assoc.c + delete mode 100644 drivers/staging/rt2860/sta/auth.c + delete mode 100644 drivers/staging/rt2860/sta/auth_rsp.c + delete mode 100644 drivers/staging/rt2860/sta/connect.c + delete mode 100644 drivers/staging/rt2860/sta/rtmp_data.c + delete mode 100644 drivers/staging/rt2860/sta/sanity.c + delete mode 100644 drivers/staging/rt2860/sta/sync.c + delete mode 100644 drivers/staging/rt2860/sta/wpa.c + delete mode 100644 drivers/staging/rt2860/sta_ioctl.c + delete mode 100644 drivers/staging/rt2860/usb_main_dev.c + delete mode 100644 drivers/staging/rt2860/wpa.h + delete mode 100644 drivers/staging/rt2870/Kconfig + delete mode 100644 drivers/staging/rt2870/Makefile + delete mode 100644 drivers/staging/rt2870/TODO + delete mode 100644 drivers/staging/rt2870/aironet.h + delete mode 100644 drivers/staging/rt2870/ap.h + delete mode 100644 drivers/staging/rt2870/chips/rt3070.c + delete mode 100644 drivers/staging/rt2870/chips/rt30xx.c + delete mode 100644 drivers/staging/rt2870/chlist.h + delete mode 100644 drivers/staging/rt2870/common/acction.c + delete mode 100644 drivers/staging/rt2870/common/action.c + delete mode 100644 drivers/staging/rt2870/common/action.h + delete mode 100644 drivers/staging/rt2870/common/ba_action.c + delete mode 100644 drivers/staging/rt2870/common/cmm_aes.c + delete mode 100644 drivers/staging/rt2870/common/cmm_asic.c + delete mode 100644 drivers/staging/rt2870/common/cmm_cfg.c + delete mode 100644 drivers/staging/rt2870/common/cmm_data.c + delete mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c + delete mode 100644 drivers/staging/rt2870/common/cmm_info.c + delete mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c + delete mode 100644 drivers/staging/rt2870/common/cmm_profile.c + delete mode 100644 drivers/staging/rt2870/common/cmm_sanity.c + delete mode 100644 drivers/staging/rt2870/common/cmm_sync.c + delete mode 100644 drivers/staging/rt2870/common/cmm_tkip.c + delete mode 100644 drivers/staging/rt2870/common/cmm_wep.c + delete mode 100644 drivers/staging/rt2870/common/cmm_wpa.c + delete mode 100644 drivers/staging/rt2870/common/crypt_hmac.c + delete mode 100644 drivers/staging/rt2870/common/crypt_md5.c + delete mode 100644 drivers/staging/rt2870/common/crypt_sha2.c + delete mode 100644 drivers/staging/rt2870/common/dfs.c + delete mode 100644 drivers/staging/rt2870/common/ee_efuse.c + delete mode 100644 drivers/staging/rt2870/common/eeprom.c + delete mode 100644 drivers/staging/rt2870/common/md5.c + delete mode 100644 drivers/staging/rt2870/common/mlme.c + delete mode 100644 drivers/staging/rt2870/common/rt_channel.c + delete mode 100644 drivers/staging/rt2870/common/rt_rf.c + delete mode 100644 drivers/staging/rt2870/common/rtmp_init.c + delete mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c + delete mode 100644 drivers/staging/rt2870/common/rtmp_timer.c + delete mode 100644 drivers/staging/rt2870/common/rtmp_tkip.c + delete mode 100644 drivers/staging/rt2870/common/rtmp_wep.c + delete mode 100644 drivers/staging/rt2870/common/rtusb_bulk.c + delete mode 100644 drivers/staging/rt2870/common/rtusb_data.c + delete mode 100644 drivers/staging/rt2870/common/rtusb_io.c + delete mode 100644 drivers/staging/rt2870/common/spectrum.c + delete mode 100644 drivers/staging/rt2870/dfs.h + delete mode 100644 drivers/staging/rt2870/md5.h + delete mode 100644 drivers/staging/rt2870/mlme.h + delete mode 100644 drivers/staging/rt2870/oid.h + delete mode 100644 drivers/staging/rt2870/rt28xx.h + delete mode 100644 drivers/staging/rt2870/rt_config.h + delete mode 100644 drivers/staging/rt2870/rt_linux.c + delete mode 100644 drivers/staging/rt2870/rt_linux.h + delete mode 100644 drivers/staging/rt2870/rt_main_dev.c + delete mode 100644 drivers/staging/rt2870/rt_profile.c + delete mode 100644 drivers/staging/rt2870/rt_usb.c + delete mode 100644 drivers/staging/rt2870/rtmp.h + delete mode 100644 drivers/staging/rt2870/rtmp_ckipmic.h + delete mode 100644 drivers/staging/rt2870/rtmp_def.h + delete mode 100644 drivers/staging/rt2870/rtmp_type.h + delete mode 100644 drivers/staging/rt2870/spectrum.h + delete mode 100644 drivers/staging/rt2870/spectrum_def.h + delete mode 100644 drivers/staging/rt2870/sta/aironet.c + delete mode 100644 drivers/staging/rt2870/sta/assoc.c + delete mode 100644 drivers/staging/rt2870/sta/auth.c + delete mode 100644 drivers/staging/rt2870/sta/auth_rsp.c + delete mode 100644 drivers/staging/rt2870/sta/connect.c + delete mode 100644 drivers/staging/rt2870/sta/rtmp_data.c + delete mode 100644 drivers/staging/rt2870/sta/sanity.c + delete mode 100644 drivers/staging/rt2870/sta/sync.c + delete mode 100644 drivers/staging/rt2870/sta/wpa.c + delete mode 100644 drivers/staging/rt2870/sta_ioctl.c + delete mode 100644 drivers/staging/rt2870/usb_main_dev.c + delete mode 100644 drivers/staging/rt2870/wpa.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/super.c +Merge made by recursive. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 278 ++++++++++++++++++++ + 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 | 122 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 23 ++ + mm/Makefile | 1 + + mm/cleancache.c | 244 +++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 6 + + 21 files changed, 1027 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 arm-dt/devicetree/arm-next +$ git merge arm-dt/devicetree/arm-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/kernel/setup.c +Auto-merging arch/arm/mm/init.c +Merge made by recursive. + Documentation/arm/Booting | 33 +++++- + Documentation/devicetree/booting-without-of.txt | 48 +++++++- + arch/arm/Kconfig | 7 + + arch/arm/include/asm/mach/arch.h | 9 ++ + arch/arm/include/asm/prom.h | 37 ++++++ + arch/arm/include/asm/setup.h | 4 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/devtree.c | 145 +++++++++++++++++++++++ + arch/arm/kernel/head-common.S | 24 +++- + arch/arm/kernel/head.S | 8 +- + arch/arm/kernel/setup.c | 90 +++++++++----- + arch/arm/mm/init.c | 11 ++ + 12 files changed, 367 insertions(+), 50 deletions(-) + create mode 100644 arch/arm/include/asm/prom.h + create mode 100644 arch/arm/kernel/devtree.c +Merging scsi-post-merge/merge-base:master +$ git am -3 ../patches/0001-clocksource-fix-up-for-generic-i8253-conversions.patch +Applying: clocksource: fix up for generic i8253 conversions diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..f451b06e2f09 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,22 @@ +Importing i2c based on 2.6.39-rc7 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 693d92a1bbc9e42681c42ed190bd42b636ca876f +HEAD is now at 693d92a Linux 2.6.39-rc7 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-writing-clients-fix-foo_driver-id_table.patch +i2c-i801-smbus-patch-for-intel-panther-point-deviceids.patch +i2c-i801-no-devices-on-idf-channels.patch +i2c-parport-cleanups.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + feddc5b...1437852 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.39-rc7 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.39-rc3-git8 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.39-rc4-245-g4175242 +Unchanged quilt series rr +Importing device-mapper based on v2.6.38-rc4-213-g055d219 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5ea703c5ee01 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110513 |