diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-10 13:52:58 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-10 13:52:58 +1100 |
| commit | 1b1497f23beed4e02bfaac7f18c9934c9dcb0ee3 (patch) | |
| tree | f28a731ea4b0d0d54adc907e763ede27cd542928 | |
| parent | d1a756428f9d718894292df1fb5aa1bdbf644a57 (diff) | |
Add linux-next specific files for 20101210next-20101210
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 183 | ||||
| -rw-r--r-- | Next/Trees | 185 | ||||
| -rw-r--r-- | Next/merge.log | 6248 | ||||
| -rw-r--r-- | Next/quilt-import.log | 10 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6627 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7a0686396149 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,183 @@ +Name SHA1 +---- ---- +origin 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 +fixes c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc +arm-current 2cedcc4f122934c3ad38dfb2a400b98a62703e6d +m68k-current cf7d7e5a1980d1116ee152d25dac382b112b9c17 +powerpc-merge f2e785ed5fb8e5fe5063ee2ba1c8f150396c53c6 +sparc-current e69f58c037ab5b166b3858fa7b5d7fa470613e8f +scsi-rc-fixes 7c03b87048f2467087ae7e51392e5fb57ea8f58b +net-current f19872575ff7819a3723154657a497d9bca66b33 +sound-current d70ab7f7ee0692efc880d772dc5c212174d67e3b +pci-current 8c05cd08a7504b855c265263e84af61aabafa329 +wireless-current 0a54917c3fc295cb61f3fb52373c173fd3b69f48 +kbuild-current 307991055b0ce65d53dc1eb501c456c10eb36360 +driver-core.current 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 +tty.current cf7d7e5a1980d1116ee152d25dac382b112b9c17 +usb.current cf7d7e5a1980d1116ee152d25dac382b112b9c17 +staging.current cf7d7e5a1980d1116ee152d25dac382b112b9c17 +cpufreq-current 948e1f8f08692e35255aea6e417dc62e347a63c7 +input-current 47d092352c132a2d0ee4156b5dca263eaad2c17f +md-current 589a594be1fb8815b3f18e517be696c48664f728 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current c054a076a1bd4731820a9c4d638b13d5c9bf5935 +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current a9fc749224bfb69686322643678f89e00303ee21 +rmobile-current 540565257101f7c52b6fc5a57651f7505f8d20fe +fbdev-current 16cdd4336fdca9b50f991b591005b5f6416f82c4 +gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e +arm 292d10a14990483e5628291bd1c626a28d729659 +davinci c232d82568977bc1238257134b86e2125f5c2131 +i.MX c239165b9be2fc89e065a3461494cf84ea50a0f8 +msm 6fdafc44bbce6651c67886fe355065b23f42e269 +omap a2814df2ff73a75d6d8be5ed27118ab123a46ff5 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung d70c5240ae4e10d57a5cbd1c0b08b77c0465024d +s5p 8d0417d8315b3f2fd3435ddfcac0176c81756e22 +tegra 145d43d75daa1a5bc7ce4992c6f36128e44cac56 +ux500-core 7c1a70e99819d723cde610d83de48a8ab01ec609 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 4939c1a1e052291e6df220c0c68d452fd5e6a87f +cris 395bc5121828e570bd4bb6455c82b80e2f2b05b4 +ia64 d4429f608abde89e8bc1e24b43cd503feb95c496 +m68k 7d7a4abed71c38baa864dc9c915c6e4d556a0a52 +m68knommu 07bc9e5c9e614c05dd3492fb242b14aa8231c212 +microblaze 8cb473da3fe634fb30c1e5be8840b00f499103a8 +mips 8fd01d6cfbf75465d84a4e533ed70c5f57b3ff51 +parisc 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9 +powerpc 98b14d6b290d96b24ae993ceaccc59b2aa4b130c +4xx ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 +52xx-and-virtex e39d5ef678045d61812c1401f04fe8edb14d6359 +galak e0dc09ff9a28f37441c5e92a14de6abda8db49d6 +s390 3613810da4f6e37055050b20b0316b82193cf047 +sh 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e +rmobile 2818b19102fdc414248f772c46af176d36520ae7 +sparc 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +tile 3edabee2ed22ee4f98f4b4bb38a41059226a8446 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph cba1a66d511d46c426ea02c322293b48f3b88cf2 +cifs 545c988b2018a593f24d291b66776a0d08525acd +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 66a595a5c4a0f7a4ea78fbeddfe4002c036b96f1 +ext3 c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +ext4 e681c047e47c0abe67bf95857f23814372793cb0 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71 +gfs2 bcd7278d8a423a255e45f4d10afe564328f1885f +hfsplus 34a2d313c51f47cae50ccb89f4196462665f2c48 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 2df485a774ba59c3f43bfe84107672c1d9b731a0 +nfsd 1205065764f2eda3216ebe213143f69891ee3460 +nilfs2 4c8ed1b9e75c49e15aca5192d93c36e8115a19a1 +ocfs2 226291aa4641fa13cb5dec3bcb3379faa83009e2 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 5f3b321da1aa5936c85ed6dec67358239a9d3cfd +udf 7a1390f6c1e89bdc556709485ceb66c9a1d7f7e3 +v9fs 59e57c622c3502346e8f930421ebc482d639520c +ubifs e53beacd23d9cb47590da6a7a7f6d417b941a994 +xfs c76febef574fd86566bbdf1a73a547a439115c25 +vfs 99b7db7b8ffd6bb755eb0a175596421a0b581cb2 +pci 5e19c6fc65fa55bcf4d5af2447151f7e320ead54 +hid 16162b1a73d2e73ceb189a0941946471f38386b5 +i2c 437c5335bf87711116b51b673958a4044ef9731e +bjdooks-i2c b8696d44f20b4a3d892002fad5b3b849a2e5b14a +jdelvare-hwmon 536a31c6d84e4f4d8d448d98a3ff97a16b81676b +hwmon-staging 48e428aa8e5d672d287987b011380eb01576c208 +kernel-doc 31c16d186b0e4f472e7824795794f5e4bc0c77f6 +v4l-dvb af4c52a75b2ffd0ad7514acc681759d2e44a5d46 +kbuild 9d12d2ebe2e1dbc74ba521f64acac3793ae48df2 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata cb6d5b42c897373c6f0584184ffa36e2f4f32b92 +infiniband 59e57c622c3502346e8f930421ebc482d639520c +acpi 397e68b13c97cc0e0311afd3d66aabb472e1d210 +idle-test 5948babf548d6f1abd1961e8164b45b5bbf0370f +ieee1394 cf42803610a1f3ed07d929082ad0890caf631a3a +ubi 7ac760c2f78ddd8e1bd633767b01becfbbf96720 +kvm 699bbe452950704ef52d5294def9275ddcbec31f +dlm f92c8dd7a0eb18124521e2b549f88422e17f707b +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 429ef7ccca48c17391b3a841247d0975beefe228 +async_tx 0a4bbddde29c038f2c51a7abb03d6d07e679d8af +wireless b7613370db5ba66ad81e41cd3a5417fde4d5e03c +net defb3519a64141608725e2dac5a5aa9a3c644bae +bluetooth a40c406cbdd28dcca3483065bc2ba794cf5aaab7 +mtd 4ccb3b4497ce01fab4933704fe21581e30fda1a5 +crypto 507cad355fc9e426f2846c46a4edca2d22d25f44 +sound 7cb1fa5e6909373ed8515821f5ec728f6d80d4ff +sound-asoc 07a9e2b2fbdda631eeff54e4b8ebcaaea71be538 +cpufreq 62bfdfa1de1361b2fb8201c72def1bbca5e7a395 +rr f58b91d22b16d48f0b4910b835ee0dba7987b263 +input 43af097c63c61fc4ae81b8f6ceb3aaecad1f15db +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 82cc2e4b513e23a03df78b7f32ef957ef8180405 +device-mapper 22a5b566c8c442b0b35b3b106795e2f2b3578096 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 106665d937df6eff33c71997a52f7bc3aefa6c12 +battery 8477cedb49c69ce64b603d76c7776811eec0f9d7 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 6827462886e4eaf229040146d1ec017440d6b51e +kgdb 651b02233b5599e53732f282d87163e108456f34 +slab 8165984acf825917437debae519209073c32a5a7 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 589a594be1fb8815b3f18e517be696c48664f728 +mfd 125331c753c42bc3f74a723a14a40f723740e493 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 1040cc0dae5d3a8e58d42843ec687f7286dc554c +fbdev cffd9348a3ae87ac98a4b3c03a5359e28ad50b93 +viafb b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 +omap_dss2 18016e35d448d35739f8640b51476709c07e95db +voltage 6c16b619c13357232bfd304d1c9e347c8b862981 +security-testing 38ef4c2e437d11b5922723504b62824e96761459 +selinux 73ff5fc0a86b28b77e02a6963b388d1dbfa0a263 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 9f8a4c809d177dfef42eacc0d37d5fe479c7287c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu eecfd57f6429d9d8e10be186566ef99fced55163 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd fe2fd9ed5bf184f797412be8b86f4589d1b77bb8 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 747fecab32e47180e2668c2b22b25752d371e636 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend dd9970e4386cbed63b68604c304bb32edc0913f3 +fsnotify 26552d4aa4117cd3ea8cbe13ebf317da652e6bfd +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 97ff46cb69da22037346670ae515217c658ace02 +spi 65289d6345d93abd860e43fd2119ac176d6cc697 +tip e5aba2cd41fac5ffb659b65b6643791e0ee0d078 +rcu 8b182b783fe0ec6600632a2dad0187e5986a7d92 +oprofile c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +xen d43b1135a6f695417d8f1424ac71985f263c30cc +swiotlb-xen 055c5e151501d1c48e61690a2713fd3207f00994 +xen-pvhvm e0b58be59e4e278480b120ba827b8cfee7c7ddbd +edac-amd 295839e770f95a272d25dc707183cb5f9ba14c1c +percpu 5d201a6821425cb331a1dd5ccaba47fc75692e2b +workqueues 698fd6a2c3ca05ec796072defb5c415289a86cdc +sfi 82acf2a8fe4764e21a7ad406590453b004751e58 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 0a7bf96046bd34a1019d2ae96d9948d2f118dab5 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core c6c0ac664c86ff6408fadbed4913938c8a732e26 +tty 16c63f8ea49c3fcb9eac7ebc511f5c821d3c55c2 +usb fe4bfb30fe5788100a70c0ed96ddd8c6186eb9c4 +staging 1226056d9608d241db4b558a0d88a347ad5c66ae +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-trivial 2a48fc0ab24241755dc93bfd4f01d68efab47f5a +bkl-llseek 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f +bkl-vfs 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 +bkl-config a3ba01b63468c925518da2da0ac3be11358f60cb +irqflags df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge 2bfc96a127bc1cc94d26bfaa40159966064f9c8c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d429d335284b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,185 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#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 +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#master +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-trivial git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#trivial +bkl-llseek git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#llseek +bkl-vfs git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#vfs +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +irqflags git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags.git#master +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..c26574680c4a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6248 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6313e3c Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +Merging origin/master +$ git merge origin/master +Already up-to-date. +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Updating 6313e3c..7c03b87 +Fast-forward + block/bsg.c | 8 ++++++++ + drivers/s390/scsi/zfcp_erp.c | 11 ++++++++--- + drivers/s390/scsi/zfcp_fsf.c | 11 ++++++----- + drivers/s390/scsi/zfcp_scsi.c | 7 ++----- + drivers/scsi/hpsa.c | 8 +------- + drivers/scsi/osd/osd_initiator.c | 4 ++-- + drivers/scsi/pmcraid.c | 4 +++- + drivers/scsi/pmcraid.h | 6 ++---- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_iocb.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 5 +++-- + drivers/scsi/qla2xxx/qla_nx.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 3 ++- + drivers/scsi/qla2xxx/qla_version.h | 4 ++-- + drivers/scsi/scsi_error.c | 26 ++------------------------ + drivers/scsi/scsi_lib.c | 5 ----- + 16 files changed, 43 insertions(+), 62 deletions(-) +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/bluetooth/ath3k.c | 4 + + drivers/bluetooth/btusb.c | 12 +++- + drivers/net/b44.c | 11 ++-- + drivers/net/benet/be_cmds.c | 2 +- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/caif/caif_shm_u5500.c | 2 +- + drivers/net/caif/caif_shmcore.c | 2 +- + drivers/net/cxgb4/t4_hw.c | 2 +- + drivers/net/ehea/ehea_ethtool.c | 9 +++ + drivers/net/ehea/ehea_main.c | 7 ++- + drivers/net/ifb.c | 2 + + drivers/net/ixgbe/ixgbe_main.c | 3 + + drivers/net/sfc/efx.c | 43 +++++++++----- + drivers/net/sfc/net_driver.h | 2 + + drivers/net/sfc/nic.c | 6 ++ + drivers/net/stmmac/stmmac_main.c | 4 +- + drivers/net/tulip/dmfe.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 73 ++++++++++++----------- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 9 +-- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 6 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 27 +++++---- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 11 ++-- + drivers/net/wireless/ath/ath9k/hw.c | 3 +- + drivers/net/wireless/ath/ath9k/init.c | 9 +-- + drivers/net/wireless/ath/ath9k/main.c | 16 ++++- + drivers/net/wireless/ath/ath9k/reg.h | 6 +- + drivers/net/wireless/ath/carl9170/fw.c | 3 +- + drivers/net/wireless/ath/carl9170/main.c | 3 +- + drivers/net/wireless/ath/carl9170/tx.c | 2 +- + drivers/net/wireless/libertas/if_sdio.c | 1 - + drivers/net/wireless/libertas/if_spi.c | 1 - + drivers/net/wireless/libertas/main.c | 2 - + drivers/net/wireless/orinoco/main.c | 12 ++-- + drivers/net/wireless/orinoco/scan.c | 8 +++ + drivers/net/wireless/orinoco/scan.h | 1 + + include/linux/snmp.h | 1 + + include/net/sock.h | 4 +- + net/bluetooth/sco.c | 6 +- + net/core/filter.c | 19 ++---- + net/econet/af_econet.c | 6 +- + net/ipv4/proc.c | 1 + + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 42 ++++++++------ + net/ipv6/ip6_tunnel.c | 7 ++ + net/ipv6/sit.c | 3 +- + net/l2tp/l2tp_ip.c | 6 ++- + net/llc/af_llc.c | 5 +- + net/mac80211/rx.c | 6 ++ + net/mac80211/tx.c | 7 ++- + net/x25/x25_link.c | 1 + + 51 files changed, 263 insertions(+), 169 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + include/linux/mfd/wm8994/pdata.h | 2 +- + sound/pci/hda/hda_eld.c | 24 ++++++++++-------------- + sound/pci/hda/hda_intel.c | 1 + + sound/pci/hda/patch_conexant.c | 35 ++++++++++++++++++----------------- + sound/pci/hda/patch_hdmi.c | 1 - + sound/pci/hda/patch_realtek.c | 1 + + sound/soc/codecs/wm8580.c | 8 ++++---- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/soc-core.c | 14 +++++++++----- + 10 files changed, 46 insertions(+), 44 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/ath5k/base.c | 13 +++++++---- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 12 +++++++--- + drivers/net/wireless/ath/ath9k/hif_usb.c | 7 ++++++ + drivers/net/wireless/ath/ath9k/htc.h | 3 ++ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 6 +++++ + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 4 +- + drivers/net/wireless/ath/ath9k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/main.c | 26 +++++++++--------------- + drivers/net/wireless/ath/ath9k/recv.c | 9 +++++++- + drivers/net/wireless/ath/ath9k/xmit.c | 22 +++++--------------- + drivers/net/wireless/orinoco/main.c | 6 +++++ + drivers/net/wireless/orinoco/orinoco_cs.c | 14 ++++++------ + drivers/net/wireless/orinoco/spectrum_cs.c | 14 ++++++------ + drivers/net/wireless/orinoco/wext.c | 4 +- + net/mac80211/tx.c | 21 +++++++++++++++++-- + 16 files changed, 100 insertions(+), 66 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +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 +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Merge made by recursive. + drivers/md/md.c | 39 ++++++++++++++++++++------------------- + drivers/md/raid10.c | 2 +- + 2 files changed, 21 insertions(+), 20 deletions(-) +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +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 +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removing arch/arm/include/asm/smp_mpidr.h +Auto-merging arch/arm/mach-s3c2412/Kconfig +Removing arch/sh/kernel/clkdev.c +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 + + arch/arm/Kconfig | 83 +- + arch/arm/Kconfig.debug | 4 +- + arch/arm/boot/compressed/Makefile | 4 + + arch/arm/boot/compressed/head-shmobile.S | 53 + + arch/arm/common/Kconfig | 4 - + arch/arm/common/Makefile | 1 + + arch/arm/common/gic.c | 69 +- + arch/arm/{plat-versatile => common}/timer-sp.c | 4 +- + arch/arm/include/asm/assembler.h | 35 +- + arch/arm/include/asm/cache.h | 2 + + arch/arm/include/asm/clkdev.h | 22 +- + arch/arm/include/asm/domain.h | 31 +- + arch/arm/include/asm/elf.h | 2 + + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/hardirq.h | 18 + + arch/arm/include/asm/hardware/entry-macro-gic.S | 75 + + arch/arm/include/asm/hardware/gic.h | 7 +- + .../plat => include/asm/hardware}/timer-sp.h | 0 + arch/arm/include/asm/io.h | 13 +- + arch/arm/include/asm/kexec.h | 18 +- + arch/arm/include/asm/mach/irq.h | 2 +- + arch/arm/include/asm/module.h | 15 +- + arch/arm/include/asm/page.h | 6 +- + arch/arm/include/asm/pgalloc.h | 52 +- + arch/arm/include/asm/pgtable.h | 321 ++-- + arch/arm/include/asm/smp.h | 17 +- + arch/arm/include/asm/smp_mpidr.h | 17 - + arch/arm/include/asm/system.h | 5 + + arch/arm/include/asm/tlb.h | 1 + + arch/arm/include/asm/traps.h | 25 +- + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 5 +- + arch/arm/kernel/entry-armv.S | 10 +- + arch/arm/kernel/entry-common.S | 202 ++- + arch/arm/kernel/fiq.c | 10 +- + arch/arm/kernel/ftrace.c | 103 +- + arch/arm/kernel/head.S | 50 +- + arch/arm/kernel/irq.c | 27 +- + arch/arm/kernel/machine_kexec.c | 30 + + arch/arm/kernel/module.c | 109 +- + arch/arm/kernel/perf_event.c | 2466 +------------------- + arch/arm/kernel/perf_event_v6.c | 672 ++++++ + arch/arm/kernel/perf_event_v7.c | 906 +++++++ + arch/arm/kernel/perf_event_xscale.c | 807 +++++++ + arch/arm/kernel/setup.c | 16 +- + arch/arm/kernel/smp.c | 282 ++-- + arch/arm/kernel/smp_twd.c | 5 +- + arch/arm/kernel/swp_emulate.c | 267 +++ + arch/arm/kernel/traps.c | 26 +- + arch/arm/kernel/vmlinux.lds.S | 2 + + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 +- + arch/arm/lib/uaccess.S | 83 +- + arch/arm/mach-bcmring/clock.c | 3 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-cns3xxx/Kconfig | 1 + + arch/arm/mach-cns3xxx/core.c | 7 +- + arch/arm/mach-cns3xxx/core.h | 1 - + arch/arm/mach-cns3xxx/include/mach/entry-macro.S | 66 +- + arch/arm/mach-davinci/clock.h | 2 +- + arch/arm/mach-davinci/include/mach/io.h | 4 +- + arch/arm/mach-ep93xx/clock.c | 2 +- + arch/arm/mach-imx/clock-imx1.c | 3 +- + arch/arm/mach-imx/clock-imx21.c | 2 +- + arch/arm/mach-imx/clock-imx27.c | 2 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/core.c | 3 +- + arch/arm/mach-integrator/impd1.c | 3 +- + arch/arm/mach-integrator/integrator_cp.c | 5 +- + arch/arm/mach-iop13xx/include/mach/io.h | 4 +- + arch/arm/mach-iop32x/include/mach/io.h | 4 +- + arch/arm/mach-iop33x/include/mach/io.h | 4 +- + arch/arm/mach-ixp23xx/include/mach/io.h | 4 +- + arch/arm/mach-ixp4xx/include/mach/io.h | 4 +- + arch/arm/mach-kirkwood/include/mach/io.h | 4 +- + arch/arm/mach-ks8695/Kconfig | 1 + + arch/arm/mach-lpc32xx/clock.c | 3 +- + arch/arm/mach-mmp/clock.h | 2 +- + arch/arm/mach-msm/Kconfig | 2 + + arch/arm/mach-msm/board-msm8x60.c | 7 +- + arch/arm/mach-msm/include/mach/smp.h | 4 +- + arch/arm/mach-mx25/clock.c | 3 +- + arch/arm/mach-mx3/clock-imx31.c | 2 +- + arch/arm/mach-mx3/clock-imx35.c | 3 +- + arch/arm/mach-mx5/clock-mx51.c | 2 +- + arch/arm/mach-mxc91231/clock.c | 2 +- + arch/arm/mach-nomadik/clock.c | 2 +- + arch/arm/mach-nuc93x/clock.h | 2 +- + arch/arm/mach-omap1/clock.c | 2 +- + arch/arm/mach-omap2/dpll3xxx.c | 2 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 93 +- + arch/arm/mach-omap2/include/mach/omap4-common.h | 1 - + arch/arm/mach-omap2/omap-hotplug.c | 14 +- + arch/arm/mach-omap2/omap-smp.c | 68 +- + arch/arm/mach-omap2/omap4-common.c | 11 +- + arch/arm/mach-orion5x/include/mach/io.h | 4 +- + arch/arm/mach-pnx4008/clock.c | 3 +- + arch/arm/mach-pxa/Kconfig | 1 + + arch/arm/mach-pxa/clock.c | 2 +- + arch/arm/mach-pxa/clock.h | 2 +- + arch/arm/mach-realview/core.c | 8 +- + arch/arm/mach-realview/core.h | 1 - + arch/arm/mach-realview/hotplug.c | 18 +- + arch/arm/mach-realview/include/mach/entry-macro.S | 65 +- + arch/arm/mach-realview/include/mach/smp.h | 5 +- + arch/arm/mach-realview/platsmp.c | 97 +- + arch/arm/mach-realview/realview_eb.c | 14 +- + arch/arm/mach-realview/realview_pb1176.c | 11 +- + arch/arm/mach-realview/realview_pb11mp.c | 10 +- + arch/arm/mach-realview/realview_pba8.c | 6 +- + arch/arm/mach-realview/realview_pbx.c | 13 +- + arch/arm/mach-s3c2412/Kconfig | 2 +- + arch/arm/mach-s5pv310/cpu.c | 6 +- + arch/arm/mach-s5pv310/hotplug.c | 18 +- + arch/arm/mach-s5pv310/include/mach/smp.h | 7 +- + arch/arm/mach-s5pv310/platsmp.c | 48 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 51 +- + arch/arm/mach-shmobile/Kconfig | 6 +- + arch/arm/mach-shmobile/board-ap4evb.c | 1 + + arch/arm/mach-shmobile/clock-sh7367.c | 2 +- + arch/arm/mach-shmobile/clock-sh7372.c | 2 +- + arch/arm/mach-shmobile/clock-sh7377.c | 2 +- + .../arm/mach-shmobile/include/mach/head-ap4evb.txt | 87 + + arch/arm/mach-shmobile/include/mach/zboot.h | 20 + + arch/arm/mach-shmobile/include/mach/zboot_macros.h | 65 + + arch/arm/mach-tcc8k/clock.c | 3 +- + arch/arm/mach-tegra/clock.c | 2 +- + arch/arm/mach-tegra/clock.h | 2 +- + arch/arm/mach-tegra/hotplug.c | 18 +- + arch/arm/mach-tegra/include/mach/entry-macro.S | 66 +- + arch/arm/mach-tegra/include/mach/io.h | 4 +- + arch/arm/mach-tegra/include/mach/smp.h | 12 +- + arch/arm/mach-tegra/irq.c | 4 +- + arch/arm/mach-tegra/platsmp.c | 35 +- + arch/arm/mach-tegra/tegra2_clocks.c | 3 +- + arch/arm/mach-u300/clock.c | 2 +- + arch/arm/mach-ux500/clock.c | 3 +- + arch/arm/mach-ux500/cpu.c | 4 +- + arch/arm/mach-ux500/hotplug.c | 18 +- + arch/arm/mach-ux500/include/mach/entry-macro.S | 68 +- + arch/arm/mach-ux500/include/mach/smp.h | 5 +- + arch/arm/mach-ux500/platsmp.c | 59 +- + arch/arm/mach-versatile/Kconfig | 1 + + arch/arm/mach-versatile/core.c | 5 +- + arch/arm/mach-vexpress/core.h | 2 - + arch/arm/mach-vexpress/ct-ca9x4.c | 12 +- + arch/arm/mach-vexpress/include/mach/entry-macro.S | 62 +- + arch/arm/mach-vexpress/include/mach/smp.h | 5 +- + arch/arm/mach-vexpress/platsmp.c | 56 +- + arch/arm/mach-vexpress/v2m.c | 5 +- + arch/arm/mach-w90x900/clock.h | 2 +- + arch/arm/mm/Kconfig | 35 + + arch/arm/mm/Makefile | 4 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/fault-armv.c | 2 +- + arch/arm/mm/fault.c | 31 +- + arch/arm/mm/idmap.c | 90 + + arch/arm/mm/mm.h | 4 +- + arch/arm/mm/mmu.c | 90 +- + arch/arm/mm/pgd.c | 57 +- + arch/arm/mm/proc-macros.S | 37 +- + arch/arm/mm/proc-v7.S | 27 +- + arch/arm/mm/proc-xscale.S | 4 +- + arch/arm/plat-omap/Kconfig | 4 +- + arch/arm/plat-omap/include/plat/clkdev_omap.h | 2 +- + arch/arm/plat-omap/include/plat/io.h | 4 +- + arch/arm/plat-omap/include/plat/smp.h | 5 +- + arch/arm/plat-spear/include/plat/clock.h | 2 +- + arch/arm/plat-stmp3xxx/clock.c | 2 +- + arch/arm/plat-versatile/Makefile | 1 - + arch/arm/plat-versatile/sched-clock.c | 1 + + arch/sh/Kconfig | 2 +- + arch/sh/boards/mach-highlander/setup.c | 2 +- + arch/sh/include/asm/clkdev.h | 38 +- + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/clkdev.c | 171 -- + arch/sh/kernel/cpu/clock-cpg.c | 2 +- + arch/sh/kernel/cpu/clock.c | 16 - + arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-shx3.c | 2 +- + drivers/Kconfig | 2 + + drivers/Makefile | 2 + + drivers/amba/bus.c | 39 + + drivers/clk/Kconfig | 4 + + drivers/clk/Makefile | 2 + + {arch/arm/common => drivers/clk}/clkdev.c | 13 +- + drivers/mmc/host/mmci.c | 210 ++- + drivers/mmc/host/mmci.h | 9 + + drivers/rtc/rtc-sa1100.c | 63 +- + fs/proc/vmcore.c | 2 +- + include/linux/amba/bus.h | 8 + + include/linux/clkdev.h | 36 + + include/linux/crash_dump.h | 9 +- + scripts/recordmcount.c | 7 +- + scripts/recordmcount.h | 5 +- + 207 files changed, 5053 insertions(+), 4500 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/boot/compressed/head-shmobile.S + rename arch/arm/{plat-versatile => common}/timer-sp.c (98%) + create mode 100644 arch/arm/include/asm/hardware/entry-macro-gic.S + rename arch/arm/{plat-versatile/include/plat => include/asm/hardware}/timer-sp.h (100%) + delete mode 100644 arch/arm/include/asm/smp_mpidr.h + create mode 100644 arch/arm/kernel/perf_event_v6.c + create mode 100644 arch/arm/kernel/perf_event_v7.c + create mode 100644 arch/arm/kernel/perf_event_xscale.c + create mode 100644 arch/arm/kernel/swp_emulate.c + create mode 100644 arch/arm/mach-shmobile/include/mach/head-ap4evb.txt + create mode 100644 arch/arm/mach-shmobile/include/mach/zboot.h + create mode 100644 arch/arm/mach-shmobile/include/mach/zboot_macros.h + create mode 100644 arch/arm/mm/idmap.c + delete mode 100644 arch/sh/kernel/clkdev.c + create mode 100644 drivers/clk/Kconfig + create mode 100644 drivers/clk/Makefile + rename {arch/arm/common => drivers/clk}/clkdev.c (93%) + create mode 100644 include/linux/clkdev.h +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/Kconfig | 4 +++- + arch/arm/mach-davinci/aemif.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 14 +++++++------- + arch/arm/mach-davinci/clock.c | 4 ++-- + arch/arm/mach-davinci/devices-tnetv107x.c | 15 ++++++++++++++- + arch/arm/mach-davinci/psc.c | 13 ++++--------- + arch/arm/mach-davinci/time.c | 24 +++++++++++++++++++++++- + arch/arm/mach-davinci/tnetv107x.c | 23 ++++++++++++----------- + 8 files changed, 66 insertions(+), 33 deletions(-) +Merging i.MX/for-next +$ git merge i.MX/for-next +Renaming arch/arm/mach-mx25/clock.c => arch/arm/mach-imx/clock-imx25.c +Auto-merging arch/arm/mach-imx/clock-imx25.c +Renaming arch/arm/mach-mx5/clock-mx51.c => arch/arm/mach-mx5/clock-mx51-mx53.c +Auto-merging arch/arm/mach-mx5/clock-mx51-mx53.c +Auto-merging arch/arm/mach-imx/clock-imx21.c +Auto-merging arch/arm/mach-imx/clock-imx27.c +Removing arch/arm/mach-imx/devices.c +Removing arch/arm/mach-imx/devices.h +Removing arch/arm/mach-mx25/Kconfig +Removing arch/arm/mach-mx25/Makefile +Removing arch/arm/mach-mx25/Makefile.boot +Removing arch/arm/mach-mx25/devices-imx25.h +Removing arch/arm/mach-mx25/devices.c +Removing arch/arm/mach-mx25/devices.h +Auto-merging arch/arm/mach-mx3/clock-imx31.c +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Removing arch/arm/plat-mxc/devices/platform-esdhc.c +Merge made by recursive. + arch/arm/Makefile | 2 +- + arch/arm/configs/mx3_defconfig | 1 + + arch/arm/mach-imx/Kconfig | 133 ++++- + arch/arm/mach-imx/Makefile | 8 +- + arch/arm/mach-imx/Makefile.boot | 4 + + arch/arm/mach-imx/clock-imx21.c | 2 +- + .../{mach-mx25/clock.c => mach-imx/clock-imx25.c} | 2 +- + arch/arm/mach-imx/clock-imx27.c | 24 +- + arch/arm/mach-imx/cpu-imx27.c | 14 +- + arch/arm/mach-imx/devices-imx21.h | 24 + + arch/arm/mach-imx/devices-imx25.h | 87 +++ + arch/arm/mach-imx/devices-imx27.h | 35 ++ + arch/arm/mach-imx/devices.c | 553 -------------------- + arch/arm/mach-imx/devices.h | 29 - + arch/arm/mach-imx/dma-v1.c | 4 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 17 +- + .../eukrea_mbimxsd25-baseboard.c} | 10 +- + arch/arm/mach-imx/mach-cpuimx27.c | 21 +- + .../mach-eukrea_cpuimx25.c} | 19 +- + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 12 +- + arch/arm/mach-imx/mach-imx27lite.c | 1 - + arch/arm/mach-imx/mach-mx1ads.c | 1 - + arch/arm/mach-imx/mach-mx21ads.c | 20 +- + arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c | 22 +- + arch/arm/mach-imx/mach-mx27_3ds.c | 12 +- + arch/arm/mach-imx/mach-mx27ads.c | 17 +- + arch/arm/mach-imx/mach-mxt_td60.c | 11 +- + arch/arm/mach-imx/mach-pca100.c | 33 +- + arch/arm/mach-imx/mach-pcm038.c | 16 +- + arch/arm/mach-imx/mach-scb9328.c | 1 - + arch/arm/mach-imx/mm-imx1.c | 7 +- + arch/arm/mach-imx/mm-imx21.c | 21 +- + arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} | 27 +- + arch/arm/mach-imx/mm-imx27.c | 21 +- + arch/arm/mach-imx/pcm970-baseboard.c | 12 +- + arch/arm/mach-imx/pm-imx27.c | 3 + + arch/arm/mach-mx25/Kconfig | 34 -- + arch/arm/mach-mx25/Makefile | 5 - + arch/arm/mach-mx25/Makefile.boot | 3 - + arch/arm/mach-mx25/devices-imx25.h | 54 -- + arch/arm/mach-mx25/devices.c | 308 ----------- + arch/arm/mach-mx25/devices.h | 13 - + arch/arm/mach-mx3/Kconfig | 82 +++- + arch/arm/mach-mx3/Makefile | 7 +- + arch/arm/mach-mx3/clock-imx31.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 2 +- + arch/arm/mach-mx3/cpu.c | 31 +- + arch/arm/mach-mx3/devices-imx31.h | 27 + + arch/arm/mach-mx3/devices-imx35.h | 41 ++- + arch/arm/mach-mx3/devices.c | 271 +--------- + arch/arm/mach-mx3/devices.h | 10 - + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 4 +- + arch/arm/mach-mx3/mach-armadillo5x0.c | 14 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 22 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 17 +- + arch/arm/mach-mx3/mach-mx31lilly.c | 9 +- + arch/arm/mach-mx3/mach-mx31lite.c | 5 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 24 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 15 +- + arch/arm/mach-mx3/mach-pcm037.c | 23 +- + arch/arm/mach-mx3/mach-pcm043.c | 34 +- + arch/arm/mach-mx3/mm.c | 84 ++-- + arch/arm/mach-mx3/mx31lilly-db.c | 5 +- + arch/arm/mach-mx3/mx31lite-db.c | 8 +- + arch/arm/mach-mx3/mx31moboard-devboard.c | 20 +- + arch/arm/mach-mx3/mx31moboard-marxbot.c | 21 +- + arch/arm/mach-mx3/mx31moboard-smartbot.c | 16 +- + arch/arm/mach-mx5/Kconfig | 22 +- + arch/arm/mach-mx5/Makefile | 2 +- + arch/arm/mach-mx5/board-cpuimx51.c | 14 +- + arch/arm/mach-mx5/board-cpuimx51sd.c | 32 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 61 ++- + arch/arm/mach-mx5/board-mx51_efikamx.c | 245 +++++++++- + .../mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} | 86 +++- + arch/arm/mach-mx5/cpu.c | 118 +++-- + arch/arm/mach-mx5/crm_regs.h | 6 +- + arch/arm/mach-mx5/devices-imx51.h | 11 +- + arch/arm/mach-mx5/devices.c | 42 +- + arch/arm/mach-mx5/devices.h | 1 - + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 16 +- + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 8 +- + arch/arm/mach-mx5/mm.c | 75 ++-- + arch/arm/mach-mxc91231/mm.c | 53 +-- + arch/arm/plat-mxc/Kconfig | 15 +- + arch/arm/plat-mxc/Makefile | 5 +- + arch/arm/plat-mxc/audmux-v2.c | 4 +- + arch/arm/plat-mxc/{irq.c => avic.c} | 32 +- + arch/arm/plat-mxc/cpufreq.c | 1 - + arch/arm/plat-mxc/devices.c | 23 +- + arch/arm/plat-mxc/devices/Kconfig | 54 ++- + arch/arm/plat-mxc/devices/Makefile | 16 +- + arch/arm/plat-mxc/devices/platform-esdhc.c | 71 --- + arch/arm/plat-mxc/devices/platform-fec.c | 8 +- + arch/arm/plat-mxc/devices/platform-flexcan.c | 48 ++- + arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c | 56 ++ + arch/arm/plat-mxc/devices/platform-imx-dma.c | 127 ++++- + arch/arm/plat-mxc/devices/platform-imx-fb.c | 52 ++ + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 16 +- + arch/arm/plat-mxc/devices/platform-imx-keypad.c | 62 +++ + arch/arm/plat-mxc/devices/platform-imx-ssi.c | 17 +- + arch/arm/plat-mxc/devices/platform-imx-uart.c | 16 +- + arch/arm/plat-mxc/devices/platform-imx2-wdt.c | 68 +++ + arch/arm/plat-mxc/devices/platform-imx21-hcd.c | 41 ++ + arch/arm/plat-mxc/devices/platform-imx_udc.c | 75 +++ + arch/arm/plat-mxc/devices/platform-imxdi_rtc.c | 41 ++ + arch/arm/plat-mxc/devices/platform-mx1-camera.c | 42 ++ + arch/arm/plat-mxc/devices/platform-mx2-camera.c | 64 +++ + arch/arm/plat-mxc/devices/platform-mxc-ehci.c | 69 +++ + arch/arm/plat-mxc/devices/platform-mxc-mmc.c | 72 +++ + arch/arm/plat-mxc/devices/platform-mxc_nand.c | 10 +- + arch/arm/plat-mxc/devices/platform-mxc_pwm.c | 60 +++ + arch/arm/plat-mxc/devices/platform-mxc_rnga.c | 56 ++ + arch/arm/plat-mxc/devices/platform-mxc_w1.c | 50 ++ + .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 74 +++ + arch/arm/plat-mxc/devices/platform-spi_imx.c | 16 +- + arch/arm/plat-mxc/ehci.c | 22 +- + arch/arm/plat-mxc/gpio.c | 97 ++++- + arch/arm/plat-mxc/include/mach/common.h | 7 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 23 +- + arch/arm/plat-mxc/include/mach/devices-common.h | 174 ++++++- + arch/arm/plat-mxc/include/mach/entry-macro.S | 14 +- + arch/arm/plat-mxc/include/mach/gpio.h | 5 + + arch/arm/plat-mxc/include/mach/hardware.h | 88 +++- + arch/arm/plat-mxc/include/mach/imxfb.h | 3 + + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 +- + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 303 +++++++++++ + arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++- + arch/arm/plat-mxc/include/mach/memory.h | 5 +- + arch/arm/plat-mxc/include/mach/mx1.h | 155 +----- + arch/arm/plat-mxc/include/mach/mx21.h | 50 +-- + arch/arm/plat-mxc/include/mach/mx25.h | 46 +- + arch/arm/plat-mxc/include/mach/mx27.h | 105 +--- + arch/arm/plat-mxc/include/mach/mx2x.h | 149 ------ + arch/arm/plat-mxc/include/mach/mx31.h | 87 +--- + arch/arm/plat-mxc/include/mach/mx35.h | 51 +-- + arch/arm/plat-mxc/include/mach/mx3x.h | 198 +------- + arch/arm/plat-mxc/include/mach/mx51.h | 69 +--- + arch/arm/plat-mxc/include/mach/mx53.h | 353 +++++++++++++ + arch/arm/plat-mxc/include/mach/mxc.h | 16 + + arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +- + arch/arm/plat-mxc/include/mach/sdma.h | 46 ++ + arch/arm/plat-mxc/iomux-v3.c | 22 +- + arch/arm/plat-mxc/irq-common.c | 60 +++ + arch/arm/plat-mxc/irq-common.h | 29 + + arch/arm/plat-mxc/ssi-fiq.S | 2 + + arch/arm/plat-mxc/system.c | 10 +- + arch/arm/plat-mxc/tzic.c | 46 ++- + drivers/dma/imx-sdma.c | 174 +++---- + drivers/regulator/mc13783-regulator.c | 30 +- + drivers/usb/gadget/fsl_mxc_udc.c | 4 +- + drivers/watchdog/imx2_wdt.c | 2 +- + include/linux/mfd/mc13783.h | 67 ++-- + 154 files changed, 4037 insertions(+), 3167 deletions(-) + rename arch/arm/{mach-mx25/clock.c => mach-imx/clock-imx25.c} (99%) + create mode 100644 arch/arm/mach-imx/devices-imx25.h + delete mode 100644 arch/arm/mach-imx/devices.c + delete mode 100644 arch/arm/mach-imx/devices.h + rename arch/arm/{mach-mx25/eukrea_mbimxsd-baseboard.c => mach-imx/eukrea_mbimxsd25-baseboard.c} (96%) + rename arch/arm/{mach-mx25/mach-cpuimx25.c => mach-imx/mach-eukrea_cpuimx25.c} (89%) + rename arch/arm/{mach-mx25 => mach-imx}/mach-mx25_3ds.c (90%) + rename arch/arm/{mach-mx25/mm.c => mach-imx/mm-imx25.c} (69%) + delete mode 100644 arch/arm/mach-mx25/Kconfig + delete mode 100644 arch/arm/mach-mx25/Makefile + delete mode 100644 arch/arm/mach-mx25/Makefile.boot + delete mode 100644 arch/arm/mach-mx25/devices-imx25.h + delete mode 100644 arch/arm/mach-mx25/devices.c + delete mode 100644 arch/arm/mach-mx25/devices.h + rename arch/arm/mach-mx5/{clock-mx51.c => clock-mx51-mx53.c} (92%) + rename arch/arm/plat-mxc/{irq.c => avic.c} (89%) + delete mode 100644 arch/arm/plat-mxc/devices/platform-esdhc.c + create mode 100644 arch/arm/plat-mxc/devices/platform-fsl-usb2-udc.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imx-fb.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imx-keypad.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imx2-wdt.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imx21-hcd.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imx_udc.c + create mode 100644 arch/arm/plat-mxc/devices/platform-imxdi_rtc.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mx1-camera.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mx2-camera.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-ehci.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc-mmc.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_pwm.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_rnga.c + create mode 100644 arch/arm/plat-mxc/devices/platform-mxc_w1.c + create mode 100644 arch/arm/plat-mxc/devices/platform-sdhci-esdhc-imx.c + create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx53.h + create mode 100644 arch/arm/plat-mxc/include/mach/mx53.h + create mode 100644 arch/arm/plat-mxc/irq-common.c + create mode 100644 arch/arm/plat-mxc/irq-common.h +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/mach-msm/Kconfig +Merge made by recursive. + arch/arm/mach-msm/Kconfig | 8 + + arch/arm/mach-msm/Makefile | 4 +- + arch/arm/mach-msm/devices-msm8x60-iommu.c | 243 +++++++------ + arch/arm/mach-msm/gpio-v2.c | 426 +++++++++++++++++++++++ + arch/arm/mach-msm/include/mach/iommu.h | 15 +- + arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h | 22 ++- + arch/arm/mach-msm/include/mach/irqs-8x60.h | 7 +- + arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 3 + + arch/arm/mach-msm/io.c | 1 + + arch/arm/mach-msm/iommu.c | 144 ++++++-- + arch/arm/mach-msm/iommu_dev.c | 4 +- + arch/arm/mach-msm/sirc.c | 3 - + arch/arm/mach-msm/smd.c | 17 +- + arch/arm/mach-msm/smd_debug.c | 2 + + 14 files changed, 739 insertions(+), 160 deletions(-) + create mode 100644 arch/arm/mach-msm/gpio-v2.c +Merging omap/for-next +$ git merge omap/for-next +Removing arch/arm/configs/ams_delta_defconfig +Removing arch/arm/configs/htcherald_defconfig +Removing arch/arm/configs/n770_defconfig +Removing arch/arm/configs/omap_generic_1510_defconfig +Removing arch/arm/configs/omap_generic_1610_defconfig +Removing arch/arm/configs/omap_generic_1710_defconfig +Removing arch/arm/configs/omap_h2_1610_defconfig +Removing arch/arm/configs/omap_innovator_1510_defconfig +Removing arch/arm/configs/omap_innovator_1610_defconfig +Removing arch/arm/configs/omap_osk_5912_defconfig +Removing arch/arm/configs/omap_perseus2_730_defconfig +Removing arch/arm/configs/palmte_defconfig +Removing arch/arm/configs/palmtt_defconfig +Removing arch/arm/configs/palmz71_defconfig +Removing arch/arm/configs/sx1_defconfig +Removing arch/arm/mach-omap2/board-zoom2.c +Auto-merging arch/arm/mach-omap2/include/mach/entry-macro.S +Merge made by recursive. + arch/arm/configs/ams_delta_defconfig | 121 -- + arch/arm/configs/htcherald_defconfig | 73 - + arch/arm/configs/n770_defconfig | 138 -- + arch/arm/configs/omap1_defconfig | 286 ++++ + arch/arm/configs/omap_generic_1510_defconfig | 84 - + arch/arm/configs/omap_generic_1610_defconfig | 87 -- + arch/arm/configs/omap_generic_1710_defconfig | 75 - + arch/arm/configs/omap_h2_1610_defconfig | 109 -- + arch/arm/configs/omap_innovator_1510_defconfig | 102 -- + arch/arm/configs/omap_innovator_1610_defconfig | 58 - + arch/arm/configs/omap_osk_5912_defconfig | 87 -- + arch/arm/configs/omap_perseus2_730_defconfig | 65 - + arch/arm/configs/palmte_defconfig | 48 - + arch/arm/configs/palmtt_defconfig | 56 - + arch/arm/configs/palmz71_defconfig | 53 - + arch/arm/configs/sx1_defconfig | 110 -- + arch/arm/mach-omap1/Kconfig | 11 +- + arch/arm/mach-omap1/Makefile | 10 +- + arch/arm/mach-omap1/board-ams-delta.c | 9 +- + arch/arm/mach-omap1/board-fsample.c | 22 +- + arch/arm/mach-omap1/board-h2.c | 4 +- + arch/arm/mach-omap1/board-h3.c | 22 +- + arch/arm/mach-omap1/board-htcherald.c | 2 - + arch/arm/mach-omap1/board-innovator.c | 4 +- + arch/arm/mach-omap1/board-nokia770.c | 1 - + arch/arm/mach-omap1/board-osk.c | 6 +- + arch/arm/mach-omap1/board-palmte.c | 1 - + arch/arm/mach-omap1/board-palmz71.c | 1 - + arch/arm/mach-omap1/board-perseus2.c | 22 +- + arch/arm/mach-omap1/board-sx1.c | 1 - + arch/arm/mach-omap1/board-voiceblue.c | 7 +- + arch/arm/mach-omap1/clock_data.c | 4 +- + arch/arm/mach-omap1/devices.c | 4 + + arch/arm/mach-omap1/flash.c | 1 + + arch/arm/mach-omap1/gpio15xx.c | 99 ++ + arch/arm/mach-omap1/gpio16xx.c | 200 +++ + arch/arm/mach-omap1/gpio7xx.c | 262 ++++ + arch/arm/mach-omap1/include/mach/entry-macro.S | 29 +- + arch/arm/mach-omap1/io.c | 39 + + arch/arm/mach-omap1/irq.c | 5 + + arch/arm/mach-omap1/lcd_dma.c | 3 + + arch/arm/mach-omap1/leds.c | 3 + + arch/arm/mach-omap1/mailbox.c | 5 +- + arch/arm/mach-omap1/mcbsp.c | 5 +- + arch/arm/mach-omap1/mux.c | 2 +- + arch/arm/mach-omap1/pm.c | 3 + + arch/arm/mach-omap1/pm_bus.c | 3 + + arch/arm/mach-omap1/serial.c | 11 +- + arch/arm/mach-omap1/time.c | 1 + + arch/arm/mach-omap2/Kconfig | 19 +- + arch/arm/mach-omap2/Makefile | 9 +- + arch/arm/mach-omap2/board-2430sdp.c | 3 - + arch/arm/mach-omap2/board-3430sdp.c | 3 - + arch/arm/mach-omap2/board-3630sdp.c | 3 - + arch/arm/mach-omap2/board-4430sdp.c | 15 +- + arch/arm/mach-omap2/board-am3517crane.c | 67 + + arch/arm/mach-omap2/board-am3517evm.c | 3 - + arch/arm/mach-omap2/board-apollon.c | 5 +- + arch/arm/mach-omap2/board-cm-t35.c | 1 - + arch/arm/mach-omap2/board-cm-t3517.c | 1 - + arch/arm/mach-omap2/board-devkit8000.c | 1 - + arch/arm/mach-omap2/board-h4.c | 3 - + arch/arm/mach-omap2/board-igep0020.c | 38 +- + arch/arm/mach-omap2/board-igep0030.c | 3 - + arch/arm/mach-omap2/board-ldp.c | 5 +- + arch/arm/mach-omap2/board-n8x0.c | 29 +- + arch/arm/mach-omap2/board-omap3beagle.c | 3 - + arch/arm/mach-omap2/board-omap3evm.c | 3 - + arch/arm/mach-omap2/board-omap3logic.c | 3 - + arch/arm/mach-omap2/board-omap3pandora.c | 3 - + arch/arm/mach-omap2/board-omap3stalker.c | 3 - + arch/arm/mach-omap2/board-omap3touchbook.c | 3 - + arch/arm/mach-omap2/board-omap4panda.c | 17 +- + arch/arm/mach-omap2/board-overo.c | 3 - + arch/arm/mach-omap2/board-rx51-peripherals.c | 40 +- + arch/arm/mach-omap2/board-rx51.c | 3 - + arch/arm/mach-omap2/board-zoom-peripherals.c | 2 +- + .../arm/mach-omap2/{board-zoom3.c => board-zoom.c} | 101 +- + arch/arm/mach-omap2/board-zoom2.c | 117 -- + arch/arm/mach-omap2/cm-regbits-24xx.h | 4 + + arch/arm/mach-omap2/gpio.c | 104 ++ + arch/arm/mach-omap2/include/mach/entry-macro.S | 44 +- + arch/arm/mach-omap2/io.c | 64 +- + arch/arm/mach-omap2/mux.c | 369 +++-- + arch/arm/mach-omap2/mux.h | 85 +- + arch/arm/mach-omap2/mux2420.c | 10 +- + arch/arm/mach-omap2/mux2430.c | 10 +- + arch/arm/mach-omap2/mux34xx.c | 9 +- + arch/arm/mach-omap2/mux44xx.c | 1625 ++++++++++++++++++++ + arch/arm/mach-omap2/mux44xx.h | 298 ++++ + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 373 +++++- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 433 ++++++- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 592 +++++++ + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 578 +++++++ + arch/arm/mach-omap2/pm-debug.c | 34 +- + arch/arm/mach-omap2/prm-regbits-34xx.h | 3 + + arch/arm/mach-omap2/serial.c | 27 +- + arch/arm/mach-omap2/timer-gp.c | 3 +- + arch/arm/plat-omap/counter_32k.c | 3 +- + arch/arm/plat-omap/dma.c | 2 +- + arch/arm/plat-omap/gpio.c | 665 +++------ + arch/arm/plat-omap/i2c.c | 126 +- + arch/arm/plat-omap/include/plat/gpio.h | 46 +- + arch/arm/plat-omap/include/plat/i2c.h | 13 + + arch/arm/plat-omap/include/plat/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/l4_3xxx.h | 24 + + arch/arm/plat-omap/include/plat/omap-serial.h | 12 - + arch/arm/plat-omap/include/plat/uncompress.h | 1 + + arch/arm/plat-omap/io.c | 58 - + arch/arm/plat-omap/mcbsp.c | 16 +- + arch/arm/plat-omap/sram.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 69 +- + drivers/input/serio/Kconfig | 1 - + drivers/mtd/nand/omap2.c | 1 - + drivers/serial/8250.c | 26 +- + drivers/serial/omap-serial.c | 40 +- + include/linux/i2c-omap.h | 5 + + include/linux/serial_reg.h | 19 + + 118 files changed, 6114 insertions(+), 2545 deletions(-) + delete mode 100644 arch/arm/configs/ams_delta_defconfig + delete mode 100644 arch/arm/configs/htcherald_defconfig + delete mode 100644 arch/arm/configs/n770_defconfig + create mode 100644 arch/arm/configs/omap1_defconfig + delete mode 100644 arch/arm/configs/omap_generic_1510_defconfig + delete mode 100644 arch/arm/configs/omap_generic_1610_defconfig + delete mode 100644 arch/arm/configs/omap_generic_1710_defconfig + delete mode 100644 arch/arm/configs/omap_h2_1610_defconfig + delete mode 100644 arch/arm/configs/omap_innovator_1510_defconfig + delete mode 100644 arch/arm/configs/omap_innovator_1610_defconfig + delete mode 100644 arch/arm/configs/omap_osk_5912_defconfig + delete mode 100644 arch/arm/configs/omap_perseus2_730_defconfig + delete mode 100644 arch/arm/configs/palmte_defconfig + delete mode 100644 arch/arm/configs/palmtt_defconfig + delete mode 100644 arch/arm/configs/palmz71_defconfig + delete mode 100644 arch/arm/configs/sx1_defconfig + create mode 100644 arch/arm/mach-omap1/gpio15xx.c + create mode 100644 arch/arm/mach-omap1/gpio16xx.c + create mode 100644 arch/arm/mach-omap1/gpio7xx.c + create mode 100644 arch/arm/mach-omap2/board-am3517crane.c + rename arch/arm/mach-omap2/{board-zoom3.c => board-zoom.c} (75%) + delete mode 100644 arch/arm/mach-omap2/board-zoom2.c + create mode 100644 arch/arm/mach-omap2/gpio.c + create mode 100644 arch/arm/mach-omap2/mux44xx.c + create mode 100644 arch/arm/mach-omap2/mux44xx.h + create mode 100644 arch/arm/plat-omap/include/plat/l4_3xxx.h +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Merge made by recursive. +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/mach-s5pv310/cpu.c +Merge made by recursive. + arch/arm/mach-s3c64xx/clock.c | 2 +- + arch/arm/mach-s3c64xx/dev-audio.c | 60 +++-- + arch/arm/mach-s3c64xx/irq-eint.c | 37 ++-- + arch/arm/mach-s5p6442/dev-audio.c | 44 +++- + arch/arm/mach-s5p64x0/Makefile | 4 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 2 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 8 +- + arch/arm/mach-s5p64x0/dev-audio.c | 55 ++--- + arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} | 221 +++++++++++++-- + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 57 +--- + arch/arm/mach-s5pc100/dev-audio.c | 54 +++- + arch/arm/mach-s5pv210/Kconfig | 2 + + arch/arm/mach-s5pv210/clock.c | 10 +- + arch/arm/mach-s5pv210/dev-audio.c | 56 +++- + arch/arm/mach-s5pv210/mach-smdkv210.c | 74 +++++ + arch/arm/mach-s5pv310/Kconfig | 1 + + arch/arm/mach-s5pv310/Makefile | 3 +- + arch/arm/mach-s5pv310/cpu.c | 2 +- + arch/arm/mach-s5pv310/dev-audio.c | 364 ++++++++++++++++++++++++ + arch/arm/mach-s5pv310/dma.c | 168 +++++++++++ + arch/arm/mach-s5pv310/include/mach/dma.h | 26 ++ + arch/arm/mach-s5pv310/include/mach/irqs.h | 3 + + arch/arm/mach-s5pv310/include/mach/map.h | 21 ++ + arch/arm/mach-s5pv310/irq-eint.c | 2 +- + arch/arm/plat-s3c24xx/Kconfig | 2 +- + arch/arm/plat-s3c24xx/irq.c | 2 +- + arch/arm/plat-s5p/irq-eint.c | 4 +- + arch/arm/plat-samsung/gpiolib.c | 7 + + arch/arm/plat-samsung/include/plat/audio.h | 24 ++ + arch/arm/plat-samsung/include/plat/devs.h | 9 + + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + + arch/arm/plat-samsung/include/plat/pm.h | 4 +- + arch/arm/plat-samsung/irq-uart.c | 36 ++-- + arch/arm/plat-samsung/irq-vic-timer.c | 22 +- + arch/arm/plat-samsung/pm.c | 6 +- + 35 files changed, 1167 insertions(+), 227 deletions(-) + rename arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} (58%) + create mode 100644 arch/arm/mach-s5pv310/dev-audio.c + create mode 100644 arch/arm/mach-s5pv310/dma.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h +Merging tegra/for-next +$ git merge tegra/for-next +Merge made by recursive. + arch/arm/mach-tegra/timer.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-ux500/clock.c +Auto-merging arch/arm/mach-ux500/cpu.c +Removing arch/arm/mach-ux500/devices-db5500.c +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/mach-ux500/Makefile | 7 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 79 +++++++- + arch/arm/mach-ux500/board-mop500.c | 86 ++++++--- + arch/arm/mach-ux500/board-mop500.h | 8 + + arch/arm/mach-ux500/board-u5500-sdi.c | 49 +++++ + arch/arm/mach-ux500/board-u5500.c | 19 +- + arch/arm/mach-ux500/clock.c | 170 +++++++--------- + arch/arm/mach-ux500/cpu-db5500.c | 38 +++- + arch/arm/mach-ux500/cpu-db8500.c | 58 ++++-- + arch/arm/mach-ux500/cpu.c | 13 +- + arch/arm/mach-ux500/cpufreq.c | 211 ++++++++++++++++++++ + arch/arm/mach-ux500/devices-common.c | 145 ++++++++++++++ + arch/arm/mach-ux500/devices-common.h | 82 ++++++++ + arch/arm/mach-ux500/devices-db5500.c | 46 ----- + arch/arm/mach-ux500/devices-db5500.h | 66 ++++++ + arch/arm/mach-ux500/devices-db8500.c | 167 ---------------- + arch/arm/mach-ux500/devices-db8500.h | 98 +++++++++ + arch/arm/mach-ux500/devices.c | 63 ------ + arch/arm/mach-ux500/dma-db5500.c | 120 +++++++++++ + arch/arm/mach-ux500/include/mach/db5500-regs.h | 4 + + arch/arm/mach-ux500/include/mach/db8500-regs.h | 3 +- + arch/arm/mach-ux500/include/mach/devices.h | 17 -- + arch/arm/mach-ux500/include/mach/gpio.h | 38 ---- + arch/arm/mach-ux500/include/mach/hardware.h | 2 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 17 ++- + arch/arm/mach-ux500/include/mach/irqs.h | 44 ---- + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 +++ + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 15 +- + arch/arm/mach-ux500/include/mach/prcmu.h | 15 ++- + arch/arm/mach-ux500/include/mach/setup.h | 7 +- + arch/arm/mach-ux500/include/mach/uncompress.h | 23 ++- + arch/arm/mach-ux500/prcmu.c | 179 ++++++++++++++++- + arch/arm/plat-nomadik/gpio.c | 52 ++++- + arch/arm/plat-nomadik/include/plat/pincfg.h | 70 +++++-- + 35 files changed, 1440 insertions(+), 602 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-u5500-sdi.c + create mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/devices-common.c + create mode 100644 arch/arm/mach-ux500/devices-common.h + delete mode 100644 arch/arm/mach-ux500/devices-db5500.c + create mode 100644 arch/arm/mach-ux500/devices-db5500.h + create mode 100644 arch/arm/mach-ux500/devices-db8500.h + create mode 100644 arch/arm/mach-ux500/dma-db5500.c + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Removing arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h +Removing arch/blackfin/mach-bf518/include/mach/defBF51x_base.h +Removing arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h +Removing arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +Removing arch/blackfin/mach-bf533/include/mach/fio_flag.h +Merge made by recursive. + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ + arch/blackfin/include/asm/bfin_dma.h | 91 + + arch/blackfin/include/asm/bfin_serial.h | 263 +++ + arch/blackfin/include/asm/dma.h | 37 +- + arch/blackfin/include/asm/io.h | 268 +--- + arch/blackfin/include/mach-common/ports-a.h | 25 + + arch/blackfin/include/mach-common/ports-b.h | 25 + + arch/blackfin/include/mach-common/ports-c.h | 25 + + arch/blackfin/include/mach-common/ports-d.h | 25 + + arch/blackfin/include/mach-common/ports-e.h | 25 + + arch/blackfin/include/mach-common/ports-f.h | 25 + + arch/blackfin/include/mach-common/ports-g.h | 25 + + arch/blackfin/include/mach-common/ports-h.h | 25 + + arch/blackfin/include/mach-common/ports-i.h | 25 + + arch/blackfin/include/mach-common/ports-j.h | 25 + + arch/blackfin/mach-bf518/dma.c | 2 +- + .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 + + .../mach-bf518/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf518/include/mach/blackfin.h | 68 +- + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1038 ++++++++++- + arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 5 +- + arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 5 +- + arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 5 +- + .../mach-bf518/include/mach/cdefBF51x_base.h | 1061 ---------- + arch/blackfin/mach-bf518/include/mach/defBF512.h | 1388 +++++++++++++- + .../mach-bf518/include/mach/defBF51x_base.h | 1495 -------------- + arch/blackfin/mach-bf518/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf527/boards/ad7160eval.c | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 1 + + arch/blackfin/mach-bf527/boards/ezbrd.c | 1 + + arch/blackfin/mach-bf527/boards/ezkit.c | 1 + + arch/blackfin/mach-bf527/dma.c | 2 +- + .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 + + .../mach-bf527/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf527/include/mach/blackfin.h | 48 +- + arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1092 ++++++++++- + arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 +- + arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 7 +- + .../mach-bf527/include/mach/cdefBF52x_base.h | 1113 ----------- + arch/blackfin/mach-bf527/include/mach/defBF522.h | 1393 +++++++++++++- + arch/blackfin/mach-bf527/include/mach/defBF525.h | 2 +- + arch/blackfin/mach-bf527/include/mach/defBF527.h | 2 +- + .../mach-bf527/include/mach/defBF52x_base.h | 1506 -------------- + arch/blackfin/mach-bf527/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf533/boards/blackstamp.c | 15 +- + arch/blackfin/mach-bf533/boards/ip0x.c | 9 - + arch/blackfin/mach-bf533/boards/stamp.c | 20 +- + arch/blackfin/mach-bf533/dma.c | 2 +- + .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 + + .../mach-bf533/include/mach/bfin_serial_5xx.h | 74 +- + arch/blackfin/mach-bf533/include/mach/blackfin.h | 30 +- + arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 63 +- + arch/blackfin/mach-bf533/include/mach/defBF532.h | 128 +-- + arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 - + arch/blackfin/mach-bf533/include/mach/gpio.h | 2 + + arch/blackfin/mach-bf537/dma.c | 2 +- + .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 + + .../mach-bf537/include/mach/bfin_serial_5xx.h | 72 +- + arch/blackfin/mach-bf537/include/mach/blackfin.h | 38 +- + arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 27 +- + arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 111 +- + arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 +- + arch/blackfin/mach-bf537/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf538/dma.c | 18 +- + .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 + + .../mach-bf538/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf538/include/mach/blackfin.h | 37 +- + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 504 ++--- + arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 8 +- + arch/blackfin/mach-bf538/include/mach/defBF538.h | 1825 +++++++++++++++++ + arch/blackfin/mach-bf538/include/mach/defBF539.h | 2095 +------------------- + arch/blackfin/mach-bf538/include/mach/gpio.h | 5 + + arch/blackfin/mach-bf548/boards/cm_bf548.c | 1 + + arch/blackfin/mach-bf548/boards/ezkit.c | 1 + + arch/blackfin/mach-bf548/dma.c | 2 +- + .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 + + .../mach-bf548/include/mach/bfin_serial_5xx.h | 60 +- + arch/blackfin/mach-bf548/include/mach/blackfin.h | 70 +- + arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 10 +- + .../mach-bf548/include/mach/cdefBF54x_base.h | 23 +- + arch/blackfin/mach-bf548/include/mach/defBF542.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF544.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF548.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF549.h | 7 +- + .../mach-bf548/include/mach/defBF54x_base.h | 321 +--- + arch/blackfin/mach-bf548/include/mach/gpio.h | 11 + + arch/blackfin/mach-bf561/dma.c | 18 +- + .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 + + .../mach-bf561/include/mach/bfin_serial_5xx.h | 74 +- + arch/blackfin/mach-bf561/include/mach/blackfin.h | 26 +- + arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 503 ++--- + arch/blackfin/mach-bf561/include/mach/defBF561.h | 408 ++--- + arch/blackfin/mach-bf561/include/mach/gpio.h | 2 + + arch/blackfin/mach-bf561/smp.c | 4 +- + drivers/net/irda/bfin_sir.h | 2 + + include/asm-generic/io.h | 30 + + 102 files changed, 8445 insertions(+), 9942 deletions(-) + create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig + create mode 100644 arch/blackfin/include/asm/bfin_dma.h + create mode 100644 arch/blackfin/include/asm/bfin_serial.h + create mode 100644 arch/blackfin/include/mach-common/ports-a.h + create mode 100644 arch/blackfin/include/mach-common/ports-b.h + create mode 100644 arch/blackfin/include/mach-common/ports-c.h + create mode 100644 arch/blackfin/include/mach-common/ports-d.h + create mode 100644 arch/blackfin/include/mach-common/ports-e.h + create mode 100644 arch/blackfin/include/mach-common/ports-f.h + create mode 100644 arch/blackfin/include/mach-common/ports-g.h + create mode 100644 arch/blackfin/include/mach-common/ports-h.h + create mode 100644 arch/blackfin/include/mach-common/ports-i.h + create mode 100644 arch/blackfin/include/mach-common/ports-j.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h + create mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF52x_base.h + create mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h + create mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h + create mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Merge made by recursive. + arch/m68k/include/asm/sun3_pgtable.h | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/mcfcache.h +Removing arch/m68knommu/mm/fault.c +Removing arch/m68knommu/mm/memory.c +Merge made by recursive. + arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/entry_no.h | 59 +++++---- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/io_no.h | 1 - + arch/m68k/include/asm/m5206sim.h | 14 ++- + arch/m68k/include/asm/m520xsim.h | 17 +++- + arch/m68k/include/asm/m523xsim.h | 11 ++ + arch/m68k/include/asm/m5249sim.h | 10 ++ + arch/m68k/include/asm/m5272sim.h | 8 + + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 11 ++ + arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ + arch/m68k/include/asm/m5307sim.h | 43 +++---- + arch/m68k/include/asm/m532xsim.h | 33 ++---- + arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ + arch/m68k/include/asm/m5407sim.h | 42 +----- + arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ + arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- + arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- + arch/m68k/include/asm/mcfcache.h | 150 ---------------------- + arch/m68k/include/asm/mcfsim.h | 4 +- + arch/m68k/include/asm/mcfuart.h | 45 +------- + arch/m68k/include/asm/processor.h | 13 +- + arch/m68knommu/Kconfig | 99 +++++++++++++-- + arch/m68knommu/Makefile | 6 +- + arch/m68knommu/kernel/setup.c | 72 +++-------- + arch/m68knommu/mm/Makefile | 2 +- + arch/m68knommu/mm/fault.c | 57 -------- + arch/m68knommu/mm/kmap.c | 9 -- + arch/m68knommu/mm/memory.c | 33 ----- + arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 + arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- + arch/m68knommu/platform/coldfire/Makefile | 4 +- + arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ + arch/m68knommu/platform/coldfire/entry.S | 56 ++------- + arch/m68knommu/platform/coldfire/head.S | 26 +++- + 37 files changed, 722 insertions(+), 617 deletions(-) + create mode 100644 arch/m68k/include/asm/m52xxacr.h + create mode 100644 arch/m68k/include/asm/m53xxacr.h + create mode 100644 arch/m68k/include/asm/m54xxacr.h + rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) + rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (73%) + delete mode 100644 arch/m68k/include/asm/mcfcache.h + delete mode 100644 arch/m68knommu/mm/fault.c + delete mode 100644 arch/m68knommu/mm/memory.c + rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) + rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) + create mode 100644 arch/m68knommu/platform/coldfire/cache.c +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/kernel/vmlinux.lds.S | 16 +++------------- + arch/microblaze/lib/memmove.c | 2 +- + 2 files changed, 4 insertions(+), 14 deletions(-) +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + Documentation/kernel-parameters.txt | 8 + + Documentation/powerpc/booting-without-of.txt | 4 +- + Documentation/powerpc/dts-bindings/4xx/cpm.txt | 52 +++ + arch/powerpc/Kconfig | 16 +- + arch/powerpc/boot/dts/canyonlands.dts | 31 +- + arch/powerpc/boot/dts/kilauea.dts | 9 + + arch/powerpc/configs/40x/kilauea_defconfig | 5 + + arch/powerpc/configs/44x/canyonlands_defconfig | 3 + + arch/powerpc/include/asm/bitops.h | 9 + + arch/powerpc/include/asm/cputable.h | 9 +- + arch/powerpc/include/asm/cputhreads.h | 15 +- + arch/powerpc/include/asm/device.h | 6 + + arch/powerpc/include/asm/firmware.h | 3 +- + arch/powerpc/include/asm/hvcall.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 5 +- + arch/powerpc/include/asm/machdep.h | 6 +- + arch/powerpc/include/asm/mmzone.h | 5 + + arch/powerpc/include/asm/nvram.h | 52 +-- + arch/powerpc/include/asm/ppc-opcode.h | 8 + + arch/powerpc/include/asm/processor.h | 2 - + arch/powerpc/include/asm/prom.h | 2 +- + arch/powerpc/include/asm/topology.h | 10 + + arch/powerpc/include/asm/vdso_datapage.h | 2 - + arch/powerpc/kernel/Makefile | 9 +- + arch/powerpc/kernel/asm-offsets.c | 1 - + arch/powerpc/kernel/cputable.c | 22 +- + arch/powerpc/kernel/crash_dump.c | 33 ++ + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/entry_32.S | 1 + + arch/powerpc/kernel/exceptions-64s.S | 1 + + arch/powerpc/kernel/fpu.S | 1 + + arch/powerpc/kernel/head_40x.S | 1 + + arch/powerpc/kernel/head_44x.S | 1 + + arch/powerpc/kernel/head_64.S | 7 +- + arch/powerpc/kernel/head_8xx.S | 1 + + arch/powerpc/kernel/head_fsl_booke.S | 1 + + arch/powerpc/kernel/iommu.c | 14 +- + arch/powerpc/kernel/misc.S | 5 - + arch/powerpc/kernel/misc_32.S | 1 + + arch/powerpc/kernel/misc_64.S | 1 + + arch/powerpc/kernel/nvram_64.c | 481 ++++++++--------------- + arch/powerpc/kernel/pci_64.c | 3 +- + arch/powerpc/kernel/ppc_ksyms.c | 7 + + arch/powerpc/kernel/ppc_save_regs.S | 1 + + arch/powerpc/kernel/ptrace.c | 22 +- + arch/powerpc/kernel/ptrace32.c | 7 + + arch/powerpc/kernel/rtas.c | 3 + + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 19 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kernel/vector.S | 1 + + arch/powerpc/kernel/vio.c | 15 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/hweight_64.S | 110 +++++ + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/mmu_context_nohash.c | 12 +- + arch/powerpc/mm/numa.c | 303 ++++++++++++++- + arch/powerpc/mm/pgtable_32.c | 3 +- + arch/powerpc/mm/pgtable_64.c | 2 + + arch/powerpc/platforms/44x/Makefile | 5 +- + arch/powerpc/platforms/cell/beat_iommu.c | 3 +- + arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 3 +- + arch/powerpc/platforms/chrp/time.c | 4 + + arch/powerpc/platforms/iseries/mf.c | 62 --- + arch/powerpc/platforms/pasemi/iommu.c | 19 +- + arch/powerpc/platforms/powermac/setup.c | 9 + + arch/powerpc/platforms/pseries/Kconfig | 10 + + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/hvCall.S | 1 + + arch/powerpc/platforms/pseries/iommu.c | 49 +-- + arch/powerpc/platforms/pseries/lpar.c | 12 + + arch/powerpc/platforms/pseries/nvram.c | 205 ++++++++++ + arch/powerpc/platforms/pseries/pseries_energy.c | 326 +++++++++++++++ + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/dart_iommu.c | 9 +- + arch/powerpc/sysdev/ppc4xx_cpm.c | 346 ++++++++++++++++ + arch/powerpc/sysdev/tsi108_dev.c | 8 +- + drivers/char/hvc_vio.c | 2 +- + drivers/macintosh/macio_asic.c | 7 +- + drivers/macintosh/therm_pm72.c | 30 +-- + drivers/of/address.c | 54 ++-- + drivers/ps3/Makefile | 2 +- + drivers/rtc/rtc-cmos.c | 3 +- + include/linux/of_address.h | 6 +- + 85 files changed, 1884 insertions(+), 661 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/4xx/cpm.txt + create mode 100644 arch/powerpc/lib/hweight_64.S + create mode 100644 arch/powerpc/platforms/pseries/pseries_energy.c + create mode 100644 arch/powerpc/sysdev/ppc4xx_cpm.c +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/sysdev/mpc8xxx_gpio.c +Merge made by recursive. + arch/powerpc/platforms/Kconfig | 7 ++- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++++++++++++++++++++++---- + 2 files changed, 71 insertions(+), 11 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/Kconfig | 129 +++++----- + arch/s390/Kconfig.debug | 6 +- + arch/s390/defconfig | 152 ++++------- + arch/s390/hypfs/Makefile | 2 +- + arch/s390/hypfs/hypfs.h | 33 +++- + arch/s390/hypfs/hypfs_dbfs.c | 116 +++++++++ + arch/s390/hypfs/hypfs_diag.c | 82 ++----- + arch/s390/hypfs/hypfs_vm.c | 62 ++--- + arch/s390/hypfs/inode.c | 18 +- + arch/s390/include/asm/ccwdev.h | 2 + + arch/s390/include/asm/cputime.h | 2 +- + arch/s390/include/asm/dasd.h | 1 + + arch/s390/include/asm/ftrace.h | 11 +- + arch/s390/include/asm/hardirq.h | 16 -- + arch/s390/include/asm/irq.h | 33 ++- + arch/s390/include/asm/kprobes.h | 20 +-- + arch/s390/include/asm/processor.h | 3 +- + arch/s390/include/asm/ptrace.h | 50 ++++- + arch/s390/include/asm/qdio.h | 1 + + arch/s390/include/asm/s390_ext.h | 29 +-- + arch/s390/include/asm/smp.h | 3 +- + arch/s390/include/asm/system.h | 4 +- + arch/s390/include/asm/thread_info.h | 10 +- + arch/s390/include/asm/timex.h | 20 ++ + arch/s390/kernel/asm-offsets.c | 14 +- + arch/s390/kernel/compat_ptrace.h | 53 ++--- + arch/s390/kernel/entry.S | 270 ++++++++++---------- + arch/s390/kernel/entry.h | 2 +- + arch/s390/kernel/entry64.S | 69 +++--- + arch/s390/kernel/ftrace.c | 236 +++++++++--------- + arch/s390/kernel/irq.c | 40 +++- + arch/s390/kernel/kprobes.c | 470 +++++++++++++++++------------------ + arch/s390/kernel/mcount.S | 30 +-- + arch/s390/kernel/mcount64.S | 27 +-- + arch/s390/kernel/nmi.c | 3 +- + arch/s390/kernel/process.c | 11 +- + arch/s390/kernel/ptrace.c | 282 ++++++++++++++-------- + arch/s390/kernel/s390_ext.c | 125 ++++------ + arch/s390/kernel/signal.c | 2 +- + arch/s390/kernel/smp.c | 43 ++-- + arch/s390/kernel/time.c | 3 + + arch/s390/kernel/traps.c | 9 +- + arch/s390/kernel/vtime.c | 1 + + arch/s390/kvm/Kconfig | 7 +- + arch/s390/lib/delay.c | 2 - + arch/s390/mm/fault.c | 35 ++-- + drivers/s390/block/Kconfig | 24 ++- + drivers/s390/block/dasd.c | 290 +++++++++++++++------ + drivers/s390/block/dasd_3990_erp.c | 16 +- + drivers/s390/block/dasd_devmap.c | 100 ++++++++ + drivers/s390/block/dasd_diag.c | 3 + + drivers/s390/block/dasd_eckd.c | 470 +++++++++++++++++++++++++++-------- + drivers/s390/block/dasd_eckd.h | 15 +- + drivers/s390/block/dasd_eer.c | 1 + + drivers/s390/block/dasd_erp.c | 3 +- + drivers/s390/block/dasd_fba.c | 21 +- + drivers/s390/block/dasd_int.h | 35 +++- + drivers/s390/char/Kconfig | 69 ++++-- + drivers/s390/char/con3215.c | 2 + + drivers/s390/char/raw3270.c | 2 + + drivers/s390/char/sclp.c | 18 +- + drivers/s390/char/tape_core.c | 2 + + drivers/s390/char/vmur.c | 2 + + drivers/s390/cio/chsc.c | 19 ++ + drivers/s390/cio/chsc.h | 18 ++ + drivers/s390/cio/css.c | 8 + + drivers/s390/cio/device_ops.c | 40 +++ + drivers/s390/cio/itcw.c | 62 ++++- + drivers/s390/cio/qdio.h | 7 +- + drivers/s390/cio/qdio_debug.c | 1 + + drivers/s390/cio/qdio_main.c | 17 +- + drivers/s390/cio/qdio_setup.c | 1 + + drivers/s390/cio/qdio_thinint.c | 56 +---- + drivers/s390/crypto/ap_bus.c | 63 +++++ + drivers/s390/crypto/ap_bus.h | 2 + + drivers/s390/crypto/zcrypt_api.c | 12 +- + drivers/s390/crypto/zcrypt_api.h | 1 + + drivers/s390/crypto/zcrypt_cex2a.c | 82 +++++-- + drivers/s390/crypto/zcrypt_cex2a.h | 25 ++ + drivers/s390/crypto/zcrypt_pcica.c | 1 + + drivers/s390/crypto/zcrypt_pcicc.c | 1 + + drivers/s390/crypto/zcrypt_pcixcc.c | 17 ++- + drivers/s390/kvm/kvm_virtio.c | 3 + + drivers/s390/net/Kconfig | 51 +++-- + drivers/s390/net/claw.c | 2 + + drivers/s390/net/ctcm_main.c | 2 + + drivers/s390/net/lcs.c | 2 + + drivers/s390/net/qeth_core_main.c | 4 +- + drivers/s390/scsi/zfcp_qdio.c | 2 + + net/iucv/iucv.c | 2 + + 90 files changed, 2522 insertions(+), 1591 deletions(-) + create mode 100644 arch/s390/hypfs/hypfs_dbfs.c +Merging sh/sh-latest +$ git merge sh/sh-latest +Auto-merging arch/sh/Kconfig +Auto-merging arch/sh/kernel/Makefile +Removing arch/sh/kernel/io_generic.c +Merge made by recursive. + arch/sh/Kconfig | 20 +- + arch/sh/boards/board-secureedge5410.c | 2 - + arch/sh/boards/mach-se/7206/setup.c | 6 + + arch/sh/boards/mach-se/board-se7619.c | 6 + + arch/sh/drivers/pci/pci.c | 3 +- + arch/sh/include/asm/io.h | 345 +++++++++++++++++--------------- + arch/sh/include/asm/io_generic.h | 25 --- + arch/sh/include/asm/machvec.h | 21 -- + arch/sh/kernel/Makefile | 6 +- + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/proc.c | 148 ++++++++++++++ + arch/sh/kernel/cpu/sh2/clock-sh7619.c | 22 +- + arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 20 +- + arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 21 +- + arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 20 +- + arch/sh/kernel/io_generic.c | 180 ----------------- + arch/sh/kernel/iomap.c | 165 +++++++++++++++ + arch/sh/kernel/ioport.c | 43 ++++ + arch/sh/kernel/machvec.c | 22 -- + arch/sh/kernel/setup.c | 144 ------------- + 20 files changed, 605 insertions(+), 616 deletions(-) + create mode 100644 arch/sh/kernel/cpu/proc.c + delete mode 100644 arch/sh/kernel/io_generic.c + create mode 100644 arch/sh/kernel/iomap.c + create mode 100644 arch/sh/kernel/ioport.c +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Resolved 'arch/arm/mach-shmobile/Kconfig' using previous resolution. +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-shmobile/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/arm/mm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b91e302] Merge remote branch 'rmobile/rmobile-latest' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + arch/arm/Kconfig | 9 +- + arch/arm/configs/ag5evm_defconfig | 83 + + arch/arm/configs/mackerel_defconfig | 138 + + arch/arm/mach-shmobile/Kconfig | 33 +- + arch/arm/mach-shmobile/Makefile | 4 + + arch/arm/mach-shmobile/board-ag5evm.c | 263 ++ + arch/arm/mach-shmobile/board-ap4evb.c | 10 + + arch/arm/mach-shmobile/board-mackerel.c | 418 +++ + arch/arm/mach-shmobile/clock-sh73a0.c | 121 + + arch/arm/mach-shmobile/include/mach/common.h | 5 + + .../mach-shmobile/include/mach/entry-macro-gic.S | 89 + + .../mach-shmobile/include/mach/entry-macro-intc.S | 39 + + arch/arm/mach-shmobile/include/mach/entry-macro.S | 30 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 3 + + arch/arm/mach-shmobile/include/mach/sh7372.h | 2 + + arch/arm/mach-shmobile/include/mach/sh73a0.h | 446 ++++ + arch/arm/mach-shmobile/pfc-sh73a0.c | 2679 ++++++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7372.c | 10 + + arch/arm/mach-shmobile/setup-sh73a0.c | 349 +++ + arch/arm/mm/Kconfig | 2 +- + arch/sh/include/mach-common/mach/romimage.h | 2 +- + arch/sh/include/mach-ecovec24/mach/romimage.h | 2 +- + arch/sh/include/mach-kfr2r09/mach/romimage.h | 2 +- + drivers/mmc/host/Kconfig | 6 + + drivers/mmc/host/sh_mmcif.c | 449 +++- + drivers/serial/sh-sci.h | 7 + + include/linux/mmc/sh_mmcif.h | 60 +- + 28 files changed, 5076 insertions(+), 186 deletions(-) + create mode 100644 arch/arm/configs/ag5evm_defconfig + create mode 100644 arch/arm/configs/mackerel_defconfig + create mode 100644 arch/arm/mach-shmobile/board-ag5evm.c + create mode 100644 arch/arm/mach-shmobile/board-mackerel.c + create mode 100644 arch/arm/mach-shmobile/clock-sh73a0.c + create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-gic.S + create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro-intc.S + create mode 100644 arch/arm/mach-shmobile/include/mach/sh73a0.h + create mode 100644 arch/arm/mach-shmobile/pfc-sh73a0.c + create mode 100644 arch/arm/mach-shmobile/setup-sh73a0.c +$ git am -3 ../patches/0001-rmobile-merge-fixup-for-clkdev-changes.patch +Applying: rmobile: merge fixup for clkdev changes +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/Kconfig +$ git add . +$ git commit -v -a --amend +[master 9d0f651] Merge remote branch 'rmobile/rmobile-latest' +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 64dacca] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/super.c +Merge made by recursive. + fs/ceph/dir.c | 20 ++++++++++++++++++++ + fs/ceph/export.c | 2 +- + fs/ceph/inode.c | 4 ++++ + fs/ceph/mds_client.c | 32 +++++++++++++++++++++----------- + fs/ceph/mds_client.h | 1 + + fs/ceph/super.c | 3 ++- + fs/ceph/super.h | 2 ++ + include/linux/ceph/ceph_fs.h | 16 +++++++++++++--- + net/ceph/ceph_hash.c | 3 +++ + 9 files changed, 67 insertions(+), 16 deletions(-) +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Makefile | 4 +- + fs/cifs/README | 9 +++ + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsacl.c | 3 - + fs/cifs/cifsacl.h | 4 - + fs/cifs/cifsfs.c | 3 +- + fs/cifs/cifsglob.h | 12 +++- + fs/cifs/cifsproto.h | 5 +- + fs/cifs/cifssmb.c | 183 +++++++++++++++++++++++++------------------------- + fs/cifs/connect.c | 42 ++++++++---- + fs/cifs/file.c | 2 - + fs/cifs/inode.c | 21 +++--- + fs/cifs/readdir.c | 12 --- + 13 files changed, 157 insertions(+), 144 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Merge made by recursive. + fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- + fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- + fs/ecryptfs/file.c | 28 +++++++++++++--------------- + fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ + fs/ecryptfs/keystore.c | 26 +++++++++++++------------- + fs/ecryptfs/kthread.c | 19 +++++++++++++++---- + fs/ecryptfs/main.c | 12 +++++++----- + fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- + include/linux/magic.h | 1 + + 9 files changed, 100 insertions(+), 88 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Merge made by recursive. + fs/fuse/dev.c | 156 +++++++++++++++++++++++++++++++++++++++++++++++--- + fs/fuse/dir.c | 53 ++++++++--------- + fs/fuse/file.c | 130 +++++++++++++++++++++++++++++++++++++----- + fs/fuse/fuse_i.h | 27 ++++++--- + fs/fuse/inode.c | 30 ++++------ + include/linux/fuse.h | 26 ++++++++- + 6 files changed, 343 insertions(+), 79 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/bmap.c | 11 ++++++-- + fs/gfs2/glock.c | 71 ++++++++++++++++++++++++-------------------------- + fs/gfs2/glock.h | 28 ++++---------------- + fs/gfs2/incore.h | 12 +++++--- + fs/gfs2/inode.c | 9 ------ + fs/gfs2/lock_dlm.c | 15 +++-------- + fs/gfs2/ops_inode.c | 18 +------------ + fs/gfs2/quota.c | 13 ++++++++- + fs/gfs2/rgrp.c | 57 +++++++++------------------------------- + fs/gfs2/rgrp.h | 1 + + fs/gfs2/xattr.c | 23 +---------------- + 11 files changed, 86 insertions(+), 172 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/bnode.c | 2 +- + fs/hfsplus/brec.c | 2 +- + fs/hfsplus/btree.c | 2 +- + fs/hfsplus/catalog.c | 10 ++- + fs/hfsplus/dir.c | 1 + + fs/hfsplus/extents.c | 50 ++++++++++----- + fs/hfsplus/hfsplus_fs.h | 83 +++++++++++++----------- + fs/hfsplus/inode.c | 63 ++++++++++++------- + fs/hfsplus/ioctl.c | 4 +- + fs/hfsplus/options.c | 37 +++++++++++ + fs/hfsplus/part_tbl.c | 124 ++++++++++++++++++++--------------- + fs/hfsplus/super.c | 96 ++++++++++++++++------------ + fs/hfsplus/wrapper.c | 163 ++++++++++++++++++++++++++++++----------------- + 13 files changed, 400 insertions(+), 237 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 544bb00] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging Documentation/filesystems/vfs.txt +Merge made by recursive. + Documentation/filesystems/Locking | 7 +++- + Documentation/filesystems/vfs.txt | 7 +++ + fs/nfs/dir.c | 76 +++++++++++++++++-------------------- + fs/nfs/file.c | 2 + + fs/nfs/inode.c | 1 + + fs/nfs/nfs4proc.c | 9 ++++ + fs/nfs/pagelist.c | 4 +- + fs/nfs/read.c | 1 - + fs/nfs/super.c | 4 -- + fs/nfs/write.c | 3 +- + include/linux/fs.h | 1 + + include/linux/nfs_fs.h | 1 + + include/linux/nfs_page.h | 1 + + mm/filemap.c | 5 ++ + mm/truncate.c | 4 ++ + mm/vmscan.c | 7 +++ + 16 files changed, 83 insertions(+), 50 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4state.c +Auto-merging net/sunrpc/svc_xprt.c +Merge made by recursive. + fs/nfsd/nfs4state.c | 11 ++++-- + fs/nfsd/nfs4xdr.c | 22 ++++++++---- + net/sunrpc/svc_xprt.c | 87 +++++++++++++++++++++++-------------------------- + 3 files changed, 64 insertions(+), 56 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 1 + + fs/nilfs2/bmap.c | 45 +++++++++++++++++++++++++++++++++++---------- + fs/nilfs2/ifile.c | 11 +++-------- + fs/nilfs2/inode.c | 19 +++++-------------- + fs/nilfs2/mdt.c | 6 ------ + fs/nilfs2/segment.c | 30 +++++------------------------- + fs/nilfs2/super.c | 23 ++++++++++++++++------- + 7 files changed, 65 insertions(+), 70 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 +Merge made by recursive. + fs/udf/balloc.c | 3 +- + fs/udf/dir.c | 5 --- + fs/udf/file.c | 11 +++--- + fs/udf/ialloc.c | 21 +++-------- + fs/udf/inode.c | 51 +++++++++++--------------- + fs/udf/namei.c | 101 ++++++++++++++-------------------------------------- + fs/udf/partition.c | 27 ++++++++++---- + fs/udf/super.c | 67 +++++++++++++++++++++------------- + fs/udf/symlink.c | 12 ++++--- + fs/udf/udf_i.h | 13 +++++++ + fs/udf/udf_sb.h | 22 +++++++++-- + fs/udf/udfdecl.h | 4 ++- + 12 files changed, 162 insertions(+), 175 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Resolved 'drivers/pci/pci-sysfs.c' using previous resolution. +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/pci-sysfs.c +CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/proc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2f69aff] Merge remote branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/pci/msi.c | 5 +++-- + drivers/pci/msi.h | 6 ------ + include/linux/pci_regs.h | 8 ++++++++ + 3 files changed, 11 insertions(+), 8 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 108 +++ + drivers/base/core.c | 41 +- + drivers/hid/Kconfig | 17 + + drivers/hid/Makefile | 14 +- + drivers/hid/hid-apple.c | 49 +- + drivers/hid/hid-core.c | 21 +- + drivers/hid/hid-emsff.c | 162 ++++ + drivers/hid/hid-ids.h | 11 + + drivers/hid/hid-input.c | 4 +- + drivers/hid/hid-picolcd.c | 6 +- + drivers/hid/hid-prodikeys.c | 6 +- + drivers/hid/hid-roccat-kone.c | 383 ++++------ + drivers/hid/hid-roccat-kone.h | 19 +- + drivers/hid/hid-roccat-koneplus.c | 837 ++++++++++++++++++++ + drivers/hid/hid-roccat-koneplus.h | 224 ++++++ + drivers/hid/hid-roccat-pyra.c | 393 +++------- + drivers/hid/hid-roccat-pyra.h | 23 +- + drivers/hid/hid-roccat.c | 43 +- + drivers/hid/hid-roccat.h | 5 +- + drivers/hid/hid-topseed.c | 1 + + drivers/hid/hid-wacom.c | 2 +- + drivers/hid/hidraw.c | 21 +- + drivers/hid/usbhid/Makefile | 6 +- + drivers/hid/usbhid/hid-quirks.c | 2 +- + drivers/hid/usbhid/hiddev.c | 239 +++--- + drivers/input/mouse/bcm5974.c | 40 + + include/linux/device.h | 1 + + include/linux/hid.h | 43 + + 28 files changed, 1979 insertions(+), 742 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus + create mode 100644 drivers/hid/hid-emsff.c + create mode 100644 drivers/hid/hid-roccat-koneplus.c + create mode 100644 drivers/hid/hid-roccat-koneplus.h +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/i2c/muxes/gpio-i2cmux | 65 ++++++++++++ + MAINTAINERS | 8 ++ + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/muxes/Kconfig | 12 +++ + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/gpio-i2cmux.c | 184 +++++++++++++++++++++++++++++++++++ + include/linux/gpio-i2cmux.h | 38 +++++++ + 7 files changed, 309 insertions(+), 1 deletions(-) + create mode 100644 Documentation/i2c/muxes/gpio-i2cmux + create mode 100644 drivers/i2c/muxes/gpio-i2cmux.c + create mode 100644 include/linux/gpio-i2cmux.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Merge made by recursive. + drivers/i2c/busses/Kconfig | 8 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-eg20t.c | 900 ++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 909 insertions(+), 0 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-eg20t.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 +++ + Documentation/hwmon/adm9240 | 2 +- + Documentation/hwmon/w83627hf | 22 +++++++ + Documentation/hwmon/w83793 | 2 +- + drivers/hwmon/adm1026.c | 20 +++--- + drivers/hwmon/adm9240.c | 32 +++++++++- + drivers/hwmon/fschmd.c | 5 +- + drivers/hwmon/it87.c | 91 ++++++++++++++++++---------- + drivers/hwmon/lm78.c | 14 ++-- + drivers/hwmon/pc87360.c | 53 +++++++--------- + drivers/hwmon/pc87427.c | 26 ++++---- + drivers/hwmon/w83781d.c | 29 ++++----- + drivers/hwmon/w83792d.c | 44 +++++++++++++- + drivers/hwmon/w83793.c | 38 ++++++++++-- + 14 files changed, 262 insertions(+), 126 deletions(-) +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Merge made by recursive. + drivers/hwmon/abituguru.c | 36 +- + drivers/hwmon/abituguru3.c | 45 +- + drivers/hwmon/adt7470.c | 4 +- + drivers/hwmon/applesmc.c | 1632 +++++++++++++++--------------------------- + drivers/hwmon/asb100.c | 9 +- + drivers/hwmon/asus_atk0110.c | 7 +- + drivers/hwmon/coretemp.c | 11 +- + drivers/hwmon/dme1737.c | 12 +- + drivers/hwmon/f71805f.c | 29 +- + drivers/hwmon/f71882fg.c | 23 +- + drivers/hwmon/hp_accel.c | 13 +- + drivers/hwmon/hwmon-vid.c | 11 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/ibmaem.c | 4 +- + drivers/hwmon/lis3lv02d.c | 23 +- + drivers/hwmon/lm70.c | 5 +- + drivers/hwmon/lm95241.c | 495 ++++++------- + drivers/hwmon/pcf8591.c | 5 +- + drivers/hwmon/pkgtemp.c | 7 +- + drivers/hwmon/sis5595.c | 10 +- + drivers/hwmon/smsc47b397.c | 13 +- + drivers/hwmon/smsc47m1.c | 31 +- + drivers/hwmon/via-cputemp.c | 35 +- + drivers/hwmon/via686a.c | 10 +- + drivers/hwmon/vt1211.c | 30 +- + drivers/hwmon/vt8231.c | 10 +- + drivers/hwmon/w83627ehf.c | 23 +- + drivers/hwmon/w83627hf.c | 17 +- + 28 files changed, 1015 insertions(+), 1539 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/dontdiff | 26 ++++++++++++++++++++++++++ + Documentation/kernel-docs.txt | 27 ++------------------------- + 2 files changed, 28 insertions(+), 25 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Removing drivers/input/misc/winbond-cir.c +Removing drivers/media/IR/ir-functions.c +Removing drivers/media/IR/ir-keytable.c +Removing drivers/media/IR/ir-sysfs.c +Removing drivers/media/IR/keymaps/rc-tbs-nec.c +Removing drivers/media/IR/rc-map.c +Auto-merging drivers/media/dvb/frontends/Kconfig +Removing drivers/media/dvb/frontends/s921_core.c +Removing drivers/media/dvb/frontends/s921_core.h +Removing drivers/media/dvb/frontends/s921_module.c +Removing drivers/media/dvb/frontends/s921_module.h +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/video/Kconfig +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging include/linux/input.h +Removing include/media/ir-common.h +Removing include/media/ir-core.h +Merge made by recursive. + Documentation/dvb/lmedm04.txt | 2 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/input/misc/Kconfig | 18 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/winbond-cir.c | 1608 ------------------- + drivers/media/IR/ir-functions.c | 356 ----- + drivers/media/IR/ir-keytable.c | 710 --------- + drivers/media/IR/ir-sysfs.c | 362 ----- + drivers/media/IR/keymaps/rc-tbs-nec.c | 73 - + drivers/media/IR/rc-map.c | 107 -- + drivers/media/Kconfig | 2 +- + drivers/media/Makefile | 2 +- + drivers/media/common/saa7146_hlp.c | 8 +- + drivers/media/common/saa7146_video.c | 16 +- + drivers/media/common/tuners/max2165.c | 10 +- + drivers/media/dvb/dm1105/Kconfig | 3 +- + drivers/media/dvb/dm1105/dm1105.c | 44 +- + drivers/media/dvb/dvb-usb/Kconfig | 10 +- + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/a800.c | 6 +- + drivers/media/dvb/dvb-usb/af9005-remote.c | 16 +- + drivers/media/dvb/dvb-usb/af9005.c | 16 +- + drivers/media/dvb/dvb-usb/af9005.h | 4 +- + drivers/media/dvb/dvb-usb/af9015.c | 22 +- + drivers/media/dvb/dvb-usb/anysee.c | 4 +- + drivers/media/dvb/dvb-usb/az6027.c | 6 +- + drivers/media/dvb/dvb-usb/cinergyT2-core.c | 6 +- + drivers/media/dvb/dvb-usb/cxusb.c | 62 +- + drivers/media/dvb/dvb-usb/dib0700.h | 2 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 18 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 146 +- + drivers/media/dvb/dvb-usb/dibusb-common.c | 4 +- + drivers/media/dvb/dvb-usb/dibusb-mb.c | 16 +- + drivers/media/dvb/dvb-usb/dibusb-mc.c | 4 +- + drivers/media/dvb/dvb-usb/dibusb.h | 2 +- + drivers/media/dvb/dvb-usb/digitv.c | 14 +- + drivers/media/dvb/dvb-usb/dtt200u.c | 18 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 103 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 29 +- + drivers/media/dvb/dvb-usb/dw2102.c | 54 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 28 + + drivers/media/dvb/dvb-usb/gp8psk.h | 8 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 202 ++-- + drivers/media/dvb/dvb-usb/m920x.c | 24 +- + drivers/media/dvb/dvb-usb/nova-t-usb2.c | 18 +- + drivers/media/dvb/dvb-usb/opera1.c | 16 +- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 807 ++++++++++ + drivers/media/dvb/dvb-usb/vp702x.c | 12 +- + drivers/media/dvb/dvb-usb/vp7045.c | 12 +- + drivers/media/dvb/frontends/Kconfig | 10 +- + drivers/media/dvb/frontends/Makefile | 2 +- + drivers/media/dvb/frontends/atbm8830.c | 8 +- + drivers/media/dvb/frontends/au8522_decoder.c | 51 +- + drivers/media/dvb/frontends/au8522_priv.h | 2 + + drivers/media/dvb/frontends/ix2505v.c | 2 +- + drivers/media/dvb/frontends/lgs8gxx.c | 11 +- + drivers/media/dvb/frontends/mb86a20s.c | 615 +++++++ + drivers/media/dvb/frontends/mb86a20s.h | 52 + + drivers/media/dvb/frontends/s921.c | 548 +++++++ + drivers/media/dvb/frontends/s921.h | 47 + + drivers/media/dvb/frontends/s921_core.c | 216 --- + drivers/media/dvb/frontends/s921_core.h | 114 -- + drivers/media/dvb/frontends/s921_module.c | 192 --- + drivers/media/dvb/frontends/s921_module.h | 49 - + drivers/media/dvb/frontends/stb0899_drv.c | 2 +- + drivers/media/dvb/frontends/stb6100.c | 198 ++- + drivers/media/dvb/frontends/stv090x.c | 22 + + drivers/media/dvb/frontends/stv090x.h | 15 + + drivers/media/dvb/mantis/Kconfig | 2 +- + drivers/media/dvb/mantis/hopper_cards.c | 2 + + drivers/media/dvb/mantis/hopper_vp3028.c | 6 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 + + drivers/media/dvb/mantis/mantis_common.h | 4 +- + drivers/media/dvb/mantis/mantis_dvb.c | 17 +- + drivers/media/dvb/mantis/mantis_input.c | 76 +- + drivers/media/dvb/mantis/mantis_ioc.c | 4 +- + drivers/media/dvb/mantis/mantis_ioc.h | 2 +- + drivers/media/dvb/mantis/mantis_vp1033.c | 2 +- + drivers/media/dvb/mantis/mantis_vp1034.c | 10 +- + drivers/media/dvb/mantis/mantis_vp1041.c | 6 +- + drivers/media/dvb/mantis/mantis_vp2033.c | 4 +- + drivers/media/dvb/mantis/mantis_vp2040.c | 4 +- + drivers/media/dvb/mantis/mantis_vp3030.c | 8 +- + drivers/media/dvb/ngene/ngene-core.c | 5 +- + drivers/media/dvb/siano/Kconfig | 2 +- + drivers/media/dvb/siano/smscoreapi.c | 2 +- + drivers/media/dvb/siano/smsir.c | 52 +- + drivers/media/dvb/siano/smsir.h | 5 +- + drivers/media/dvb/ttpci/Kconfig | 3 +- + drivers/media/dvb/ttpci/budget-ci.c | 53 +- + drivers/media/radio/radio-aimslab.c | 16 +- + drivers/media/radio/radio-aztech.c | 6 +- + drivers/media/radio/radio-cadet.c | 12 +- + drivers/media/radio/radio-gemtek-pci.c | 6 +- + drivers/media/radio/radio-gemtek.c | 14 +- + drivers/media/radio/radio-maestro.c | 14 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-miropcm20.c | 6 +- + drivers/media/radio/radio-rtrack2.c | 10 +- + drivers/media/radio/radio-sf16fmi.c | 7 +- + drivers/media/radio/radio-sf16fmr2.c | 11 +- + drivers/media/radio/radio-si4713.c | 3 +- + drivers/media/radio/radio-tea5764.c | 49 +- + drivers/media/radio/radio-terratec.c | 8 +- + drivers/media/radio/radio-timb.c | 5 +- + drivers/media/radio/radio-trust.c | 18 +- + drivers/media/radio/radio-typhoon.c | 16 +- + drivers/media/radio/radio-zoltrix.c | 30 +- + drivers/media/radio/si4713-i2c.c | 74 +- + drivers/media/radio/si4713-i2c.h | 5 +- + drivers/media/{IR => rc}/Kconfig | 57 +- + drivers/media/{IR => rc}/Makefile | 7 +- + drivers/media/{IR => rc}/ene_ir.c | 131 +- + drivers/media/{IR => rc}/ene_ir.h | 3 +- + drivers/media/{IR => rc}/imon.c | 105 +- + drivers/media/{IR => rc}/ir-jvc-decoder.c | 17 +- + drivers/media/{IR => rc}/ir-lirc-codec.c | 127 +- + drivers/media/{IR => rc}/ir-nec-decoder.c | 19 +- + drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} | 197 ++-- + drivers/media/{IR => rc}/ir-rc5-decoder.c | 17 +- + drivers/media/{IR => rc}/ir-rc5-sz-decoder.c | 17 +- + drivers/media/{IR => rc}/ir-rc6-decoder.c | 21 +- + drivers/media/{IR => rc}/ir-sony-decoder.c | 15 +- + drivers/media/{IR => rc}/keymaps/Kconfig | 2 +- + drivers/media/{IR => rc}/keymaps/Makefile | 1 + + .../{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-anysee.c | 10 +- + .../media/{IR => rc}/keymaps/rc-apac-viewcomp.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c | 10 +- + .../{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c | 10 +- + .../media/{IR => rc}/keymaps/rc-avermedia-a16d.c | 10 +- + .../{IR => rc}/keymaps/rc-avermedia-cardbus.c | 10 +- + .../media/{IR => rc}/keymaps/rc-avermedia-dvbt.c | 10 +- + .../media/{IR => rc}/keymaps/rc-avermedia-m135a.c | 10 +- + .../{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c | 10 +- + .../media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-avermedia.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-avertv-303.c | 10 +- + .../{IR => rc}/keymaps/rc-azurewave-ad-tu700.c | 10 +- + .../media/{IR => rc}/keymaps/rc-behold-columbus.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-behold.c | 78 +- + .../media/{IR => rc}/keymaps/rc-budget-ci-old.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-cinergy.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c | 10 +- + .../{IR => rc}/keymaps/rc-digitalnow-tinytwin.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-digittrade.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c | 10 +- + .../media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c | 10 +- + .../{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-em-terratec.c | 10 +- + .../{IR => rc}/keymaps/rc-encore-enltv-fm53.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c | 10 +- + .../media/{IR => rc}/keymaps/rc-encore-enltv2.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-eztv.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-flydvb.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-flyvideo.c | 10 +- + .../media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c | 10 +- + .../media/{IR => rc}/keymaps/rc-gadmei-rm008z.c | 10 +- + .../{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-gotview7135.c | 10 +- + .../media/{IR => rc}/keymaps/rc-hauppauge-new.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-imon-mce.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-imon-pad.c | 10 +- + .../media/{IR => rc}/keymaps/rc-iodata-bctv7e.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-kaiomy.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c | 10 +- + .../{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c | 10 +- + .../media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-lirc.c | 12 +- + drivers/media/{IR => rc}/keymaps/rc-lme2510.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-manli.c | 10 +- + .../media/{IR => rc}/keymaps/rc-msi-digivox-ii.c | 10 +- + .../media/{IR => rc}/keymaps/rc-msi-digivox-iii.c | 10 +- + .../{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c | 10 +- + .../media/{IR => rc}/keymaps/rc-msi-tvanywhere.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-nebula.c | 10 +- + .../keymaps/rc-nec-terratec-cinergy-xs.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-norwood.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-npgtech.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c | 10 +- + .../media/{IR => rc}/keymaps/rc-pinnacle-color.c | 10 +- + .../media/{IR => rc}/keymaps/rc-pinnacle-grey.c | 10 +- + .../media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c | 10 +- + .../media/{IR => rc}/keymaps/rc-pixelview-mk12.c | 10 +- + .../media/{IR => rc}/keymaps/rc-pixelview-new.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-pixelview.c | 10 +- + .../{IR => rc}/keymaps/rc-powercolor-real-angel.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-purpletv.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-pv951.c | 10 +- + .../{IR => rc}/keymaps/rc-rc5-hauppauge-new.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c | 31 +- + .../{IR => rc}/keymaps/rc-real-audio-220-32-keys.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-streamzap.c | 10 +- + drivers/media/rc/keymaps/rc-tbs-nec.c | 75 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 93 ++ + .../{IR => rc}/keymaps/rc-terratec-cinergy-xs.c | 10 +- + .../media/{IR => rc}/keymaps/rc-terratec-slim.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c | 10 +- + .../{IR => rc}/keymaps/rc-total-media-in-hand.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-trekstor.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-tt-1500.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c | 10 +- + .../media/{IR => rc}/keymaps/rc-videomate-s350.c | 10 +- + .../media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c | 10 +- + .../{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c | 10 +- + drivers/media/{IR => rc}/keymaps/rc-winfast.c | 10 +- + drivers/media/{IR => rc}/lirc_dev.c | 33 +- + drivers/media/{IR => rc}/mceusb.c | 241 ++-- + drivers/media/{IR => rc}/nuvoton-cir.c | 104 +- + drivers/media/{IR => rc}/nuvoton-cir.h | 3 +- + .../media/{IR/ir-core-priv.h => rc/rc-core-priv.h} | 34 +- + drivers/media/rc/rc-main.c | 1135 +++++++++++++ + drivers/media/{IR => rc}/streamzap.c | 86 +- + drivers/media/rc/winbond-cir.c | 932 +++++++++++ + drivers/media/video/Kconfig | 12 +- + drivers/media/video/Makefile | 1 + + drivers/media/video/arv.c | 2 +- + drivers/media/video/au0828/au0828-video.c | 106 ++- + drivers/media/video/au0828/au0828.h | 6 +- + drivers/media/video/bt8xx/Kconfig | 4 +- + drivers/media/video/bt8xx/bttv-driver.c | 6 - + drivers/media/video/bt8xx/bttv-input.c | 226 ++- + drivers/media/video/bt8xx/bttv.h | 1 - + drivers/media/video/bt8xx/bttvp.h | 34 +- + drivers/media/video/bw-qcam.c | 2 +- + drivers/media/video/c-qcam.c | 2 +- + drivers/media/video/cafe_ccic.c | 7 +- + drivers/media/video/cx18/Kconfig | 3 +- + drivers/media/video/cx18/cx18-alsa-pcm.c | 8 +- + drivers/media/video/cx18/cx18-cards.c | 63 +- + drivers/media/video/cx18/cx18-driver.c | 2 + + drivers/media/video/cx18/cx18-driver.h | 4 +- + drivers/media/video/cx18/cx18-dvb.c | 32 + + drivers/media/video/cx18/cx18-i2c.c | 2 +- + drivers/media/video/cx18/cx18-streams.c | 2 +- + drivers/media/video/cx231xx/Kconfig | 19 +- + drivers/media/video/cx231xx/Makefile | 5 +- + drivers/media/video/cx231xx/cx231xx-417.c | 4 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 1 + + drivers/media/video/cx231xx/cx231xx-cards.c | 65 +- + drivers/media/video/cx231xx/cx231xx-core.c | 4 +- + drivers/media/video/cx231xx/cx231xx-dvb.c | 40 + + drivers/media/video/cx231xx/cx231xx-input.c | 101 ++ + drivers/media/video/cx231xx/cx231xx.h | 26 +- + drivers/media/video/cx23885/Kconfig | 2 +- + drivers/media/video/cx23885/cx23885-input.c | 70 +- + drivers/media/video/cx23885/cx23885.h | 5 +- + drivers/media/video/cx23885/cx23888-ir.c | 2 +- + drivers/media/video/cx25840/cx25840-ir.c | 2 +- + drivers/media/video/cx88/Kconfig | 3 +- + drivers/media/video/cx88/cx88-blackbird.c | 2 +- + drivers/media/video/cx88/cx88-cards.c | 2 +- + drivers/media/video/cx88/cx88-input.c | 241 +-- + drivers/media/video/davinci/vpfe_capture.c | 2 +- + drivers/media/video/em28xx/Kconfig | 5 +- + drivers/media/video/em28xx/em28xx-cards.c | 68 +- + drivers/media/video/em28xx/em28xx-dvb.c | 16 + + drivers/media/video/em28xx/em28xx-input.c | 78 +- + drivers/media/video/em28xx/em28xx.h | 4 +- + drivers/media/video/et61x251/et61x251_core.c | 2 +- + drivers/media/video/gspca/cpia1.c | 12 +- + drivers/media/video/gspca/gspca.c | 16 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- + drivers/media/video/gspca/ov519.c | 1679 ++++++++++++-------- + drivers/media/video/gspca/pac207.c | 4 +- + drivers/media/video/gspca/sonixb.c | 4 +- + drivers/media/video/gspca/sonixj.c | 18 +- + drivers/media/video/gspca/spca561.c | 2 +- + drivers/media/video/gspca/stv06xx/stv06xx.c | 57 +- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 11 +- + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.c | 18 +- + drivers/media/video/gspca/stv06xx/stv06xx_pb0100.h | 3 + + drivers/media/video/gspca/stv06xx/stv06xx_sensor.h | 4 + + drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 21 +- + drivers/media/video/gspca/stv06xx/stv06xx_st6422.h | 3 + + drivers/media/video/gspca/stv06xx/stv06xx_vv6410.h | 9 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/tv8532.c | 2 +- + drivers/media/video/gspca/w996Xcf.c | 325 ++--- + drivers/media/video/gspca/xirlink_cit.c | 194 ++- + drivers/media/video/gspca/zc3xx.c | 2 +- + drivers/media/video/imx074.c | 1 - + drivers/media/video/ir-kbd-i2c.c | 75 +- + drivers/media/video/ivtv/Kconfig | 3 +- + drivers/media/video/ivtv/ivtv-i2c.c | 6 +- + drivers/media/video/meye.c | 14 +- + drivers/media/video/mt9m001.c | 1 - + drivers/media/video/mt9m111.c | 1 - + drivers/media/video/mt9t031.c | 1 - + drivers/media/video/mt9v022.c | 1 - + drivers/media/video/mx2_camera.c | 2 - + drivers/media/video/mx3_camera.c | 3 +- + drivers/media/video/pms.c | 2 +- + drivers/media/video/pwc/pwc-ctrl.c | 7 +- + drivers/media/video/pwc/pwc-if.c | 68 +- + drivers/media/video/pwc/pwc-v4l.c | 13 +- + drivers/media/video/pwc/pwc.h | 1 - + drivers/media/video/rj54n1cb0c.c | 1 - + drivers/media/video/s5p-fimc/fimc-core.c | 2 +- + drivers/media/video/saa7134/Kconfig | 2 +- + drivers/media/video/saa7134/saa7134-cards.c | 110 ++ + drivers/media/video/saa7134/saa7134-dvb.c | 69 + + drivers/media/video/saa7134/saa7134-input.c | 430 +----- + drivers/media/video/saa7134/saa7134-tvaudio.c | 12 +- + drivers/media/video/saa7134/saa7134.h | 25 +- + drivers/media/video/saa7164/saa7164-api.c | 123 +- + drivers/media/video/saa7164/saa7164-buffer.c | 92 +- + drivers/media/video/saa7164/saa7164-bus.c | 16 +- + drivers/media/video/saa7164/saa7164-cards.c | 2 +- + drivers/media/video/saa7164/saa7164-cmd.c | 10 +- + drivers/media/video/saa7164/saa7164-core.c | 40 +- + drivers/media/video/saa7164/saa7164-encoder.c | 33 +- + drivers/media/video/saa7164/saa7164-fw.c | 8 +- + drivers/media/video/saa7164/saa7164-i2c.c | 4 +- + drivers/media/video/saa7164/saa7164-vbi.c | 37 +- + drivers/media/video/saa7164/saa7164.h | 17 +- + drivers/media/video/sh_vou.c | 13 +- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/sr030pc30.c | 2 +- + drivers/media/video/tea6415c.c | 2 +- + drivers/media/video/timblogiw.c | 894 +++++++++++ + drivers/media/video/tlg2300/Kconfig | 4 +- + drivers/media/video/uvc/uvc_ctrl.c | 48 +- + drivers/media/video/uvc/uvc_queue.c | 133 ++- + drivers/media/video/uvc/uvc_v4l2.c | 185 +-- + drivers/media/video/uvc/uvc_video.c | 3 - + drivers/media/video/uvc/uvcvideo.h | 10 +- + drivers/media/video/v4l2-dev.c | 69 +- + drivers/media/video/v4l2-device.c | 1 + + drivers/media/video/videobuf-dma-sg.c | 3 +- + drivers/media/video/w9966.c | 2 +- + drivers/mfd/timberdale.c | 61 +- + drivers/mfd/timberdale.h | 2 +- + drivers/staging/cx25821/Kconfig | 4 +- + drivers/staging/cx25821/cx25821-alsa.c | 71 +- + drivers/staging/cx25821/cx25821-audio-upstream.c | 66 +- + drivers/staging/cx25821/cx25821-cards.c | 2 + + drivers/staging/cx25821/cx25821-core.c | 191 ++-- + drivers/staging/cx25821/cx25821-i2c.c | 19 +- + drivers/staging/cx25821/cx25821-medusa-video.c | 7 +- + .../staging/cx25821/cx25821-video-upstream-ch2.c | 63 +- + drivers/staging/cx25821/cx25821-video-upstream.c | 90 +- + drivers/staging/cx25821/cx25821-video.c | 90 +- + drivers/staging/cx25821/cx25821-video.h | 11 +- + drivers/staging/cx25821/cx25821.h | 9 +- + drivers/staging/go7007/Kconfig | 4 +- + drivers/staging/tm6000/Kconfig | 2 +- + drivers/staging/tm6000/tm6000-cards.c | 7 - + drivers/staging/tm6000/tm6000-core.c | 27 +- + drivers/staging/tm6000/tm6000-i2c.c | 39 +- + drivers/staging/tm6000/tm6000-input.c | 100 +- + include/linux/input.h | 2 + + include/media/ir-common.h | 107 -- + include/media/ir-core.h | 214 --- + include/media/ir-kbd-i2c.h | 13 +- + include/media/lirc_dev.h | 6 +- + include/media/rc-core.h | 220 +++ + include/media/rc-map.h | 43 +- + include/media/saa7146.h | 2 +- + include/media/si4713.h | 3 +- + include/media/timb_radio.h | 1 - + include/media/timb_video.h | 33 + + include/media/v4l2-device.h | 2 + + 370 files changed, 11209 insertions(+), 8756 deletions(-) + delete mode 100644 drivers/input/misc/winbond-cir.c + delete mode 100644 drivers/media/IR/ir-functions.c + delete mode 100644 drivers/media/IR/ir-keytable.c + delete mode 100644 drivers/media/IR/ir-sysfs.c + delete mode 100644 drivers/media/IR/keymaps/rc-tbs-nec.c + delete mode 100644 drivers/media/IR/rc-map.c + create mode 100644 drivers/media/dvb/dvb-usb/technisat-usb2.c + create mode 100644 drivers/media/dvb/frontends/mb86a20s.c + create mode 100644 drivers/media/dvb/frontends/mb86a20s.h + create mode 100644 drivers/media/dvb/frontends/s921.c + create mode 100644 drivers/media/dvb/frontends/s921.h + delete mode 100644 drivers/media/dvb/frontends/s921_core.c + delete mode 100644 drivers/media/dvb/frontends/s921_core.h + delete mode 100644 drivers/media/dvb/frontends/s921_module.c + delete mode 100644 drivers/media/dvb/frontends/s921_module.h + rename drivers/media/{IR => rc}/Kconfig (81%) + rename drivers/media/{IR => rc}/Makefile (78%) + rename drivers/media/{IR => rc}/ene_ir.c (91%) + rename drivers/media/{IR => rc}/ene_ir.h (99%) + rename drivers/media/{IR => rc}/imon.c (96%) + rename drivers/media/{IR => rc}/ir-jvc-decoder.c (91%) + rename drivers/media/{IR => rc}/ir-lirc-codec.c (71%) + rename drivers/media/{IR => rc}/ir-nec-decoder.c (92%) + rename drivers/media/{IR/ir-raw-event.c => rc/ir-raw.c} (61%) + rename drivers/media/{IR => rc}/ir-rc5-decoder.c (91%) + rename drivers/media/{IR => rc}/ir-rc5-sz-decoder.c (88%) + rename drivers/media/{IR => rc}/ir-rc6-decoder.c (92%) + rename drivers/media/{IR => rc}/ir-sony-decoder.c (91%) + rename drivers/media/{IR => rc}/keymaps/Kconfig (96%) + rename drivers/media/{IR => rc}/keymaps/Makefile (98%) + rename drivers/media/{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-anysee.c (94%) + rename drivers/media/{IR => rc}/keymaps/rc-apac-viewcomp.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-a16d.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-cardbus.c (91%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-dvbt.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m135a.c (94%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-avertv-303.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-azurewave-ad-tu700.c (93%) + rename drivers/media/{IR => rc}/keymaps/rc-behold-columbus.c (91%) + rename drivers/media/{IR => rc}/keymaps/rc-behold.c (68%) + rename drivers/media/{IR => rc}/keymaps/rc-budget-ci-old.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-cinergy.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c (93%) + rename drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c (96%) + rename drivers/media/{IR => rc}/keymaps/rc-digitalnow-tinytwin.c (93%) + rename drivers/media/{IR => rc}/keymaps/rc-digittrade.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-em-terratec.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv-fm53.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv2.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c (85%) + rename drivers/media/{IR => rc}/keymaps/rc-eztv.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-flydvb.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-flyvideo.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-gadmei-rm008z.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-gotview7135.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-hauppauge-new.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-imon-mce.c (95%) + rename drivers/media/{IR => rc}/keymaps/rc-imon-pad.c (95%) + rename drivers/media/{IR => rc}/keymaps/rc-iodata-bctv7e.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-kaiomy.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-lirc.c (79%) + rename drivers/media/{IR => rc}/keymaps/rc-lme2510.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-manli.c (94%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-ii.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-iii.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-nebula.c (91%) + rename drivers/media/{IR => rc}/keymaps/rc-nec-terratec-cinergy-xs.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-norwood.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-npgtech.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-color.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-grey.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview-mk12.c (90%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview-new.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-powercolor-real-angel.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-purpletv.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-pv951.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-rc5-hauppauge-new.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c (91%) + rename drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c (76%) + rename drivers/media/{IR => rc}/keymaps/rc-real-audio-220-32-keys.c (86%) + rename drivers/media/{IR => rc}/keymaps/rc-streamzap.c (91%) + create mode 100644 drivers/media/rc/keymaps/rc-tbs-nec.c + create mode 100644 drivers/media/rc/keymaps/rc-technisat-usb2.c + rename drivers/media/{IR => rc}/keymaps/rc-terratec-cinergy-xs.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-terratec-slim.c (91%) + rename drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-total-media-in-hand.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-trekstor.c (92%) + rename drivers/media/{IR => rc}/keymaps/rc-tt-1500.c (89%) + rename drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-videomate-s350.c (88%) + rename drivers/media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c (87%) + rename drivers/media/{IR => rc}/keymaps/rc-winfast.c (92%) + rename drivers/media/{IR => rc}/lirc_dev.c (97%) + rename drivers/media/{IR => rc}/mceusb.c (89%) + rename drivers/media/{IR => rc}/nuvoton-cir.c (95%) + rename drivers/media/{IR => rc}/nuvoton-cir.h (99%) + rename drivers/media/{IR/ir-core-priv.h => rc/rc-core-priv.h} (83%) + create mode 100644 drivers/media/rc/rc-main.c + rename drivers/media/{IR => rc}/streamzap.c (90%) + create mode 100644 drivers/media/rc/winbond-cir.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c + create mode 100644 drivers/media/video/timblogiw.c + delete mode 100644 include/media/ir-common.h + delete mode 100644 include/media/ir-core.h + create mode 100644 include/media/rc-core.h + create mode 100644 include/media/timb_video.h +$ git am -3 ../patches/0001-media-const-and-__devinitdata-do-not-mix.patch +Applying: media: const and __devinitdata do not mix +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/video/timblogiw.c +$ git add . +$ git commit -v -a --amend +[master 2dd703c] Merge remote branch 'v4l-dvb/master' +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + Documentation/coccinelle.txt | 4 + + Documentation/kbuild/kconfig-language.txt | 1 - + scripts/.gitignore | 1 + + scripts/basic/fixdep.c | 109 ++++++++++++++++------------- + scripts/coccinelle/misc/doubleinit.cocci | 6 +- + scripts/coccinelle/null/deref_null.cocci | 39 ++++------- + scripts/config | 2 +- + scripts/genksyms/parse.c_shipped | 2 +- + scripts/genksyms/parse.y | 2 +- + scripts/package/builddeb | 41 ++++++++++- + scripts/tags.sh | 2 +- + usr/gen_init_cpio.c | 8 ++ + 12 files changed, 133 insertions(+), 84 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/Kconfig | 8 + + drivers/ata/Makefile | 1 + + drivers/ata/acard-ahci.c | 528 +++++++++++++++++++++++++++++++++++ + drivers/ata/ahci.h | 3 + + drivers/ata/libahci.c | 11 +- + drivers/ata/libata-scsi.c | 60 ++--- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 3 +- + include/linux/libata.h | 6 +- + 9 files changed, 574 insertions(+), 48 deletions(-) + create mode 100644 drivers/ata/acard-ahci.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/apei/erst.c | 34 ++++---- + drivers/acpi/bus.c | 153 +++++++++++++++++--------------- + drivers/acpi/fan.c | 27 ++----- + drivers/acpi/internal.h | 5 +- + drivers/acpi/power.c | 102 ++++++++++++---------- + drivers/acpi/scan.c | 27 +++++- + drivers/acpi/thermal.c | 5 +- + drivers/platform/x86/fujitsu-laptop.c | 4 +- + include/acpi/acpi_bus.h | 5 +- + include/acpi/video.h | 5 +- + include/linux/video_output.h | 14 +++ + 11 files changed, 212 insertions(+), 169 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 2d1a3db Merge remote branch 'libata/NEXT' +Merging refs/next/20101201/acpi +$ git merge refs/next/20101201/acpi +Merge made by recursive. + drivers/pnp/Makefile | 6 ++++-- + drivers/pnp/core.c | 7 +------ + drivers/pnp/isapnp/Makefile | 6 +++--- + drivers/pnp/pnpacpi/Makefile | 3 ++- + drivers/pnp/pnpbios/Makefile | 5 +++-- + include/acpi/video.h | 3 +++ + 6 files changed, 16 insertions(+), 14 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Merge made by recursive. + drivers/idle/intel_idle.c | 12 +++--------- + 1 files changed, 3 insertions(+), 9 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-card.c | 6 +++--- + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-device.c | 30 +++++++++++++++++++----------- + drivers/firewire/core-transaction.c | 18 ++++++++++++++---- + drivers/firewire/core.h | 2 ++ + drivers/firewire/nosy.c | 3 +-- + 6 files changed, 40 insertions(+), 21 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/kernel/entry_32.S +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging mm/filemap.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + Documentation/kvm/api.txt | 178 +++++++++++++++++++ + Documentation/kvm/cpuid.txt | 3 + + Documentation/kvm/msr.txt | 36 ++++- + arch/ia64/include/asm/kvm_host.h | 4 + + arch/ia64/kvm/kvm-ia64.c | 28 +--- + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/powerpc.c | 20 +-- + arch/s390/kvm/kvm-s390.c | 23 +-- + arch/x86/include/asm/kvm_emulate.h | 5 +- + arch/x86/include/asm/kvm_host.h | 30 +++- + arch/x86/include/asm/kvm_para.h | 24 +++ + arch/x86/include/asm/traps.h | 1 + + arch/x86/include/asm/vmx.h | 1 + + arch/x86/kernel/entry_32.S | 10 + + arch/x86/kernel/entry_64.S | 3 + + arch/x86/kernel/kvm.c | 315 ++++++++++++++++++++++++++++++++++ + arch/x86/kernel/kvmclock.c | 13 +-- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 121 ++++++------- + arch/x86/kvm/lapic.c | 3 +- + arch/x86/kvm/mmu.c | 111 ++++++++++--- + arch/x86/kvm/paging_tmpl.h | 36 +++-- + arch/x86/kvm/svm.c | 121 ++++++++------ + arch/x86/kvm/vmx.c | 85 ++++++---- + arch/x86/kvm/x86.c | 254 ++++++++++++++++++++++++---- + fs/ncpfs/mmap.c | 2 + + include/linux/kvm.h | 1 + + include/linux/kvm_host.h | 71 +++++++-- + include/linux/kvm_types.h | 7 + + include/linux/mm.h | 5 + + include/trace/events/kvm.h | 121 +++++++++++++ + mm/filemap.c | 3 + + mm/memory.c | 31 +++- + mm/shmem.c | 8 +- + virt/kvm/Kconfig | 3 + + virt/kvm/assigned-dev.c | 125 +++++--------- + virt/kvm/async_pf.c | 216 +++++++++++++++++++++++ + virt/kvm/async_pf.h | 36 ++++ + virt/kvm/kvm_main.c | 322 ++++++++++++++++++++++++++--------- + 41 files changed, 1926 insertions(+), 461 deletions(-) + create mode 100644 virt/kvm/async_pf.c + create mode 100644 virt/kvm/async_pf.h +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/lowcomms.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- + 1 files changed, 44 insertions(+), 4 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/scsi_error.c +Merge made by recursive. + drivers/scsi/bfa/bfa_cb_ioim.h | 2 +- + drivers/scsi/bfa/bfa_defs_svc.h | 8 +- + drivers/scsi/bfa/bfa_fc.h | 56 ++-- + drivers/scsi/bfa/bfa_fcbuild.c | 44 ++-- + drivers/scsi/bfa/bfa_fcbuild.h | 28 +- + drivers/scsi/bfa/bfa_fcs.h | 14 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 232 +++++++------ + drivers/scsi/bfa/bfa_fcs_rport.c | 10 +- + drivers/scsi/bfa/bfa_ioc.c | 5 +- + drivers/scsi/bfa/bfa_ioc.h | 10 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 2 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 2 +- + drivers/scsi/bfa/bfa_port.c | 2 +- + drivers/scsi/bfa/bfa_svc.c | 4 +- + drivers/scsi/bfa/bfad.c | 4 +- + drivers/scsi/bfa/bfad_attr.c | 8 +- + drivers/scsi/bfa/bfad_debugfs.c | 42 ++- + drivers/scsi/bfa/bfad_drv.h | 6 +- + drivers/scsi/bfa/bfi.h | 4 +- + drivers/scsi/bfa/bfi_ms.h | 50 ++-- + drivers/scsi/bnx2i/57xx_iscsi_constants.h | 3 +- + drivers/scsi/bnx2i/57xx_iscsi_hsi.h | 3 +- + drivers/scsi/bnx2i/bnx2i.h | 15 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 96 ++++-- + drivers/scsi/bnx2i/bnx2i_init.c | 108 +----- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 148 +++++--- + drivers/scsi/bnx2i/bnx2i_sysfs.c | 3 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fcoe/libfcoe.c | 300 +++++++++++++---- + drivers/scsi/ipr.c | 54 +++- + drivers/scsi/ipr.h | 2 + + drivers/scsi/libfc/fc_exch.c | 48 +++- + drivers/scsi/libfc/fc_fcp.c | 147 ++++++--- + drivers/scsi/libfc/fc_libfc.h | 16 +- + drivers/scsi/libfc/fc_lport.c | 16 +- + drivers/scsi/libfc/fc_rport.c | 3 +- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/libsas/sas_port.c | 18 +- + drivers/scsi/lpfc/lpfc.h | 26 ++- + drivers/scsi/lpfc/lpfc_attr.c | 104 +++--- + drivers/scsi/lpfc/lpfc_bsg.c | 9 +- + drivers/scsi/lpfc/lpfc_crtn.h | 17 +- + drivers/scsi/lpfc/lpfc_ct.c | 48 ++-- + drivers/scsi/lpfc/lpfc_disc.h | 17 + + drivers/scsi/lpfc/lpfc_els.c | 308 +++++++++++++++-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 199 ++++++++--- + drivers/scsi/lpfc/lpfc_hw.h | 222 +++++++------ + drivers/scsi/lpfc/lpfc_hw4.h | 135 ++++++-- + drivers/scsi/lpfc/lpfc_init.c | 225 ++++++++---- + drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- + drivers/scsi/lpfc/lpfc_mbox.c | 64 +++-- + drivers/scsi/lpfc/lpfc_mem.c | 10 +- + drivers/scsi/lpfc/lpfc_scsi.c | 82 ++++- + drivers/scsi/lpfc/lpfc_sli.c | 538 ++++++++++++++++++++++++++--- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 3 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 10 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 20 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 3 + + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 8 +- + drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 6 +- + drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 49 +++- + drivers/scsi/mpt2sas/mpt2sas_base.c | 199 ++++++++++-- + drivers/scsi/mpt2sas/mpt2sas_base.h | 27 ++- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 343 ++++++++----------- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 185 ++++++++--- + drivers/scsi/qla4xxx/ql4_dbg.c | 2 +- + drivers/scsi/qla4xxx/ql4_dbg.h | 2 +- + drivers/scsi/qla4xxx/ql4_def.h | 5 +- + drivers/scsi/qla4xxx/ql4_fw.h | 2 +- + drivers/scsi/qla4xxx/ql4_glbl.h | 2 +- + drivers/scsi/qla4xxx/ql4_init.c | 2 +- + drivers/scsi/qla4xxx/ql4_inline.h | 2 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 2 +- + drivers/scsi/qla4xxx/ql4_isr.c | 9 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 22 +- + drivers/scsi/qla4xxx/ql4_nvram.c | 2 +- + drivers/scsi/qla4xxx/ql4_nvram.h | 2 +- + drivers/scsi/qla4xxx/ql4_nx.c | 62 +++- + drivers/scsi/qla4xxx/ql4_nx.h | 6 +- + drivers/scsi/qla4xxx/ql4_os.c | 30 ++- + drivers/scsi/qla4xxx/ql4_version.h | 4 +- + drivers/scsi/scsi_error.c | 61 ++-- + drivers/scsi/sd.c | 90 ++++-- + include/scsi/libfc.h | 10 +- + include/scsi/libfcoe.h | 8 + + include/scsi/libiscsi.h | 1 + + include/scsi/libsas.h | 2 + + 93 files changed, 3293 insertions(+), 1446 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/imx-sdma.c +Merge made by recursive. + drivers/dma/Makefile | 4 ++-- + drivers/dma/fsldma.c | 4 +++- + drivers/dma/imx-dma.c | 2 +- + drivers/dma/imx-sdma.c | 4 ++-- + drivers/dma/intel_mid_dma.c | 41 +++++++++++++++++++++++++++-------------- + drivers/dma/ioat/Makefile | 2 +- + drivers/dma/pch_dma.c | 15 ++++++++------- + drivers/dma/ppc4xx/adma.c | 5 ++--- + 8 files changed, 46 insertions(+), 31 deletions(-) +Merging wireless/master +$ git merge wireless/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Removing drivers/net/wireless/ath/debug.h +Auto-merging drivers/net/wireless/rt2x00/Kconfig +Auto-merging net/mac80211/Kconfig +Merge made by recursive. + Documentation/DocBook/80211.tmpl | 70 +- + MAINTAINERS | 6 + + arch/arm/mach-omap2/board-omap3pandora.c | 32 +- + drivers/net/wireless/ath/ar9170/cmd.c | 2 +- + drivers/net/wireless/ath/ar9170/usb.c | 6 +- + drivers/net/wireless/ath/ath.h | 111 + + drivers/net/wireless/ath/ath5k/Kconfig | 18 +- + drivers/net/wireless/ath/ath5k/Makefile | 2 + + drivers/net/wireless/ath/ath5k/ahb.c | 219 + + drivers/net/wireless/ath/ath5k/ani.c | 40 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 286 +- + drivers/net/wireless/ath/ath5k/attach.c | 28 +- + drivers/net/wireless/ath/ath5k/base.c | 909 ++-- + drivers/net/wireless/ath/ath5k/base.h | 5 +- + drivers/net/wireless/ath/ath5k/caps.c | 6 - + drivers/net/wireless/ath/ath5k/debug.c | 34 +- + drivers/net/wireless/ath/ath5k/debug.h | 2 + + drivers/net/wireless/ath/ath5k/desc.c | 24 +- + drivers/net/wireless/ath/ath5k/desc.h | 18 +- + drivers/net/wireless/ath/ath5k/dma.c | 180 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 127 +- + drivers/net/wireless/ath/ath5k/eeprom.h | 2 +- + drivers/net/wireless/ath/ath5k/initvals.c | 409 +- + drivers/net/wireless/ath/ath5k/led.c | 11 +- + drivers/net/wireless/ath/ath5k/pci.c | 327 ++ + drivers/net/wireless/ath/ath5k/pcu.c | 571 ++- + drivers/net/wireless/ath/ath5k/phy.c | 676 ++- + drivers/net/wireless/ath/ath5k/qcu.c | 696 ++- + drivers/net/wireless/ath/ath5k/reg.h | 31 +- + drivers/net/wireless/ath/ath5k/reset.c | 1221 ++--- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 1169 ++--- + drivers/net/wireless/ath/ath5k/sysfs.c | 4 +- + drivers/net/wireless/ath/ath9k/ahb.c | 7 +- + drivers/net/wireless/ath/ath9k/ani.c | 107 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 292 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 220 +- + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 6 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 143 +- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 20 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 494 ++- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3121 ++++++++++- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 29 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 278 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 111 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_paprd.c | 41 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 316 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 70 +- + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 943 +++ + drivers/net/wireless/ath/ath9k/ath9k.h | 59 +- + drivers/net/wireless/ath/ath9k/beacon.c | 107 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 23 - + drivers/net/wireless/ath/ath9k/btcoex.h | 1 - + drivers/net/wireless/ath/ath9k/calib.c | 59 +- + drivers/net/wireless/ath/ath9k/common.c | 19 +- + drivers/net/wireless/ath/ath9k/common.h | 15 +- + drivers/net/wireless/ath/ath9k/debug.c | 83 +- + drivers/net/wireless/ath/ath9k/debug.h | 21 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 93 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 82 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 142 +- + drivers/net/wireless/ath/ath9k/gpio.c | 30 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 182 +- + drivers/net/wireless/ath/ath9k/hif_usb.h | 2 + + drivers/net/wireless/ath/ath9k/htc.h | 4 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 24 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 15 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 104 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 204 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 42 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 5 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 22 +- + drivers/net/wireless/ath/ath9k/hw.c | 239 +- + drivers/net/wireless/ath/ath9k/hw.h | 65 +- + drivers/net/wireless/ath/ath9k/init.c | 157 +- + drivers/net/wireless/ath/ath9k/mac.c | 201 +- + drivers/net/wireless/ath/ath9k/mac.h | 14 +- + drivers/net/wireless/ath/ath9k/main.c | 390 +- + drivers/net/wireless/ath/ath9k/pci.c | 94 +- + drivers/net/wireless/ath/ath9k/phy.h | 1 + + drivers/net/wireless/ath/ath9k/rc.c | 78 +- + drivers/net/wireless/ath/ath9k/rc.h | 6 - + drivers/net/wireless/ath/ath9k/recv.c | 110 +- + drivers/net/wireless/ath/ath9k/reg.h | 30 +- + drivers/net/wireless/ath/ath9k/virtual.c | 15 +- + drivers/net/wireless/ath/ath9k/wmi.c | 12 +- + drivers/net/wireless/ath/ath9k/xmit.c | 814 ++-- + drivers/net/wireless/ath/carl9170/carl9170.h | 5 +- + drivers/net/wireless/ath/carl9170/cmd.c | 2 +- + drivers/net/wireless/ath/carl9170/fwcmd.h | 13 +- + drivers/net/wireless/ath/carl9170/hw.h | 7 +- + drivers/net/wireless/ath/carl9170/mac.c | 56 +- + drivers/net/wireless/ath/carl9170/main.c | 19 +- + drivers/net/wireless/ath/carl9170/phy.c | 17 +- + drivers/net/wireless/ath/carl9170/phy.h | 24 +- + drivers/net/wireless/ath/carl9170/tx.c | 80 +- + drivers/net/wireless/ath/carl9170/usb.c | 5 +- + drivers/net/wireless/ath/carl9170/version.h | 6 +- + drivers/net/wireless/ath/debug.c | 15 - + drivers/net/wireless/ath/debug.h | 90 - + drivers/net/wireless/ath/key.c | 37 +- + drivers/net/wireless/ath/main.c | 20 + + drivers/net/wireless/atmel.c | 6 +- + drivers/net/wireless/b43/Kconfig | 13 +- + drivers/net/wireless/b43/Makefile | 8 +- + drivers/net/wireless/b43/b43.h | 13 + + drivers/net/wireless/b43/dma.c | 5 - + drivers/net/wireless/b43/main.c | 60 +- + drivers/net/wireless/b43/phy_common.c | 22 +- + drivers/net/wireless/b43/phy_common.h | 8 + + drivers/net/wireless/b43/phy_n.c | 429 ++- + drivers/net/wireless/b43/phy_n.h | 2 +- + drivers/net/wireless/b43/radio_2055.c | 502 +- + drivers/net/wireless/b43/radio_2056.c | 6019 ++++++++++++++++++++ + drivers/net/wireless/b43/radio_2056.h | 1081 ++++- + drivers/net/wireless/b43/rfkill.c | 19 +- + drivers/net/wireless/b43/tables_nphy.c | 224 +- + drivers/net/wireless/b43legacy/main.c | 47 +- + drivers/net/wireless/b43legacy/rfkill.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 3 + + drivers/net/wireless/iwlwifi/Makefile | 11 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 36 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 35 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 369 ++- + drivers/net/wireless/iwlwifi/iwl-5000.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 186 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 230 +- + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 41 + + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 115 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 635 +++ + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 155 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 69 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 594 +-- + drivers/net/wireless/iwlwifi/iwl-agn.h | 61 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 26 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 954 +--- + drivers/net/wireless/iwlwifi/iwl-core.h | 91 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 33 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 45 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-legacy.c | 662 +++ + drivers/net/wireless/iwlwifi/iwl-legacy.h | 79 + + drivers/net/wireless/iwlwifi/iwl-power.c | 190 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 3 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 47 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 1 + + drivers/net/wireless/iwlwifi/iwl-tx.c | 64 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 88 +- + drivers/net/wireless/iwmc3200wifi/commands.c | 2 +- + drivers/net/wireless/libertas/cfg.c | 4 +- + drivers/net/wireless/libertas/cmd.c | 8 + + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/if_usb.c | 13 +- + drivers/net/wireless/libertas/main.c | 3 +- + drivers/net/wireless/libertas/rx.c | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 5 +- + drivers/net/wireless/mwl8k.c | 670 ++- + drivers/net/wireless/orinoco/wext.c | 8 + + drivers/net/wireless/p54/p54usb.c | 2 +- + drivers/net/wireless/ray_cs.c | 18 +- + drivers/net/wireless/rndis_wlan.c | 206 +- + drivers/net/wireless/rt2x00/Kconfig | 72 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 14 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 6 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 20 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 4 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 22 +- + drivers/net/wireless/rt2x00/rt2800.h | 62 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 54 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 66 +- + drivers/net/wireless/rt2x00/rt2800pci.h | 12 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 278 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 4 +- + drivers/net/wireless/rt2x00/rt2x00.h | 4 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 54 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 52 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 45 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 33 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 2 - + drivers/net/wireless/rt2x00/rt2x00soc.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 25 +- + drivers/net/wireless/rt2x00/rt61pci.c | 28 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 22 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 140 +- + drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 22 - + drivers/net/wireless/wl1251/main.c | 15 +- + drivers/net/wireless/wl1251/sdio.c | 101 +- + drivers/net/wireless/wl1251/spi.c | 9 + + drivers/net/wireless/wl1251/wl1251.h | 1 + + drivers/net/wireless/wl12xx/Kconfig | 54 +- + drivers/net/wireless/wl12xx/Makefile | 17 +- + .../net/wireless/wl12xx/{wl1271_acx.c => acx.c} | 95 +- + .../net/wireless/wl12xx/{wl1271_acx.h => acx.h} | 99 +- + .../net/wireless/wl12xx/{wl1271_boot.c => boot.c} | 20 +- + .../net/wireless/wl12xx/{wl1271_boot.h => boot.h} | 2 +- + .../net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} | 12 +- + .../net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} | 54 +- + .../net/wireless/wl12xx/{wl1271_conf.h => conf.h} | 4 +- + .../wl12xx/{wl1271_debugfs.c => debugfs.c} | 225 +- + .../wl12xx/{wl1271_debugfs.h => debugfs.h} | 6 +- + .../wireless/wl12xx/{wl1271_event.c => event.c} | 14 +- + .../wireless/wl12xx/{wl1271_event.h => event.h} | 4 +- + .../net/wireless/wl12xx/{wl1271_ini.h => ini.h} | 4 +- + .../net/wireless/wl12xx/{wl1271_init.c => init.c} | 10 +- + .../net/wireless/wl12xx/{wl1271_init.h => init.h} | 6 +- + drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} | 4 +- + drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} | 6 +- + .../net/wireless/wl12xx/{wl1271_main.c => main.c} | 391 +- + drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} | 6 +- + drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} | 8 +- + .../net/wireless/wl12xx/{wl1271_reg.h => reg.h} | 0 + drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} | 38 +- + drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} | 6 +- + .../net/wireless/wl12xx/{wl1271_scan.c => scan.c} | 13 +- + .../net/wireless/wl12xx/{wl1271_scan.h => scan.h} | 6 +- + .../net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} | 4 +- + .../net/wireless/wl12xx/{wl1271_spi.c => spi.c} | 6 +- + .../wl12xx/{wl1271_testmode.c => testmode.c} | 18 +- + .../wl12xx/{wl1271_testmode.h => testmode.h} | 4 +- + drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} | 142 +- + drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} | 7 +- + drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} | 21 +- + drivers/net/wireless/zd1201.c | 3 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 2 + + drivers/ssb/main.c | 30 + + drivers/ssb/pci.c | 96 +- + drivers/ssb/pcihost_wrapper.c | 7 + + include/linux/average.h | 30 + + include/linux/bitops.h | 11 + + include/linux/ieee80211.h | 3 + + include/linux/nl80211.h | 81 +- + include/linux/rfkill.h | 31 - + include/linux/ssb/ssb.h | 4 + + include/linux/ssb/ssb_regs.h | 40 + + include/linux/wl12xx.h | 8 + + include/net/bluetooth/hci.h | 16 +- + include/net/bluetooth/hci_core.h | 14 +- + include/net/bluetooth/l2cap.h | 22 +- + include/net/bluetooth/rfcomm.h | 18 +- + include/net/bluetooth/sco.h | 20 +- + include/net/cfg80211.h | 108 +- + include/net/mac80211.h | 78 +- + include/net/regulatory.h | 7 + + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/average.c | 61 + + net/bluetooth/bnep/core.c | 1 + + net/bluetooth/cmtp/core.c | 1 + + net/bluetooth/hci_conn.c | 23 +- + net/bluetooth/hci_core.c | 66 +- + net/bluetooth/hci_event.c | 177 +- + net/bluetooth/hci_sock.c | 17 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap.c | 94 +- + net/bluetooth/rfcomm/core.c | 8 +- + net/bluetooth/rfcomm/sock.c | 24 +- + net/bluetooth/rfcomm/tty.c | 28 +- + net/bluetooth/sco.c | 22 +- + net/mac80211/Kconfig | 1 + + net/mac80211/aes_ccm.c | 3 +- + net/mac80211/aes_cmac.c | 3 +- + net/mac80211/agg-rx.c | 8 +- + net/mac80211/cfg.c | 190 +- + net/mac80211/debugfs.c | 60 +- + net/mac80211/debugfs.h | 2 + + net/mac80211/debugfs_key.c | 19 +- + net/mac80211/debugfs_netdev.c | 2 + + net/mac80211/debugfs_sta.c | 55 +- + net/mac80211/driver-ops.h | 37 + + net/mac80211/driver-trace.h | 71 + + net/mac80211/ibss.c | 2 + + net/mac80211/ieee80211_i.h | 29 +- + net/mac80211/iface.c | 30 +- + net/mac80211/key.c | 9 +- + net/mac80211/main.c | 5 +- + net/mac80211/mesh.c | 36 +- + net/mac80211/mesh.h | 23 - + net/mac80211/mesh_hwmp.c | 9 +- + net/mac80211/mesh_pathtbl.c | 7 +- + net/mac80211/mlme.c | 227 +- + net/mac80211/rate.c | 18 +- + net/mac80211/rc80211_minstrel_ht.c | 19 +- + net/mac80211/rx.c | 25 +- + net/mac80211/sta_info.c | 19 +- + net/mac80211/sta_info.h | 35 +- + net/mac80211/status.c | 51 +- + net/mac80211/tx.c | 23 +- + net/mac80211/util.c | 40 +- + net/mac80211/wme.c | 11 +- + net/mac80211/work.c | 27 +- + net/rfkill/core.c | 14 - + net/wireless/Makefile | 2 +- + net/wireless/core.c | 23 +- + net/wireless/core.h | 17 +- + net/wireless/lib80211.c | 8 +- + net/wireless/lib80211_crypt_tkip.c | 16 +- + net/wireless/mesh.c | 140 + + net/wireless/mlme.c | 21 +- + net/wireless/nl80211.c | 374 ++- + net/wireless/nl80211.h | 4 + + net/wireless/reg.c | 259 +- + net/wireless/util.c | 12 +- + net/wireless/wext-core.c | 10 +- + 323 files changed, 26912 insertions(+), 10669 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath5k/ahb.c + create mode 100644 drivers/net/wireless/ath/ath5k/pci.c + create mode 100644 drivers/net/wireless/ath/ath9k/ar9485_initvals.h + delete mode 100644 drivers/net/wireless/ath/debug.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-rxon.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-legacy.h + rename drivers/net/wireless/wl12xx/{wl1271_acx.c => acx.c} (92%) + rename drivers/net/wireless/wl12xx/{wl1271_acx.h => acx.h} (90%) + rename drivers/net/wireless/wl12xx/{wl1271_boot.c => boot.c} (97%) + rename drivers/net/wireless/wl12xx/{wl1271_boot.h => boot.h} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_cmd.c => cmd.c} (99%) + rename drivers/net/wireless/wl12xx/{wl1271_cmd.h => cmd.h} (91%) + rename drivers/net/wireless/wl12xx/{wl1271_conf.h => conf.h} (99%) + rename drivers/net/wireless/wl12xx/{wl1271_debugfs.c => debugfs.c} (74%) + rename drivers/net/wireless/wl12xx/{wl1271_debugfs.h => debugfs.h} (93%) + rename drivers/net/wireless/wl12xx/{wl1271_event.c => event.c} (97%) + rename drivers/net/wireless/wl12xx/{wl1271_event.h => event.h} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_ini.h => ini.h} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_init.c => init.c} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_init.h => init.h} (93%) + rename drivers/net/wireless/wl12xx/{wl1271_io.c => io.c} (99%) + rename drivers/net/wireless/wl12xx/{wl1271_io.h => io.h} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_main.c => main.c} (90%) + rename drivers/net/wireless/wl12xx/{wl1271_ps.c => ps.c} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_ps.h => ps.h} (92%) + rename drivers/net/wireless/wl12xx/{wl1271_reg.h => reg.h} (100%) + rename drivers/net/wireless/wl12xx/{wl1271_rx.c => rx.c} (87%) + rename drivers/net/wireless/wl12xx/{wl1271_rx.h => rx.h} (96%) + rename drivers/net/wireless/wl12xx/{wl1271_scan.c => scan.c} (98%) + rename drivers/net/wireless/wl12xx/{wl1271_scan.h => scan.h} (97%) + rename drivers/net/wireless/wl12xx/{wl1271_sdio.c => sdio.c} (99%) + rename drivers/net/wireless/wl12xx/{wl1271_spi.c => spi.c} (99%) + rename drivers/net/wireless/wl12xx/{wl1271_testmode.c => testmode.c} (94%) + rename drivers/net/wireless/wl12xx/{wl1271_testmode.h => testmode.h} (93%) + rename drivers/net/wireless/wl12xx/{wl1271_tx.c => tx.c} (85%) + rename drivers/net/wireless/wl12xx/{wl1271_tx.h => tx.h} (97%) + rename drivers/net/wireless/wl12xx/{wl1271.h => wl12xx.h} (96%) + create mode 100644 include/linux/average.h + create mode 100644 lib/average.c + create mode 100644 net/wireless/mesh.c +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/ath/ath9k/ar9003_eeprom.c' using previous resolution. +Auto-merging drivers/infiniband/hw/mlx4/main.c +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/s390/net/lcs.c +Removing include/net/tipc/tipc.h +Removing include/net/tipc/tipc_bearer.h +Removing include/net/tipc/tipc_msg.h +Removing include/net/tipc/tipc_port.h +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ed3f18] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/networking/LICENSE.qlcnic | 327 ++++ + Documentation/networking/dccp.txt | 20 + + Documentation/networking/ip-sysctl.txt | 24 +- + Documentation/networking/stmmac.txt | 48 +- + drivers/atm/fore200e.c | 2 +- + drivers/atm/lanai.c | 7 +- + drivers/block/aoe/aoecmd.c | 6 +- + drivers/infiniband/core/addr.c | 14 +- + drivers/infiniband/hw/mlx4/main.c | 6 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- + drivers/isdn/hisax/avm_pci.c | 2 +- + drivers/isdn/hisax/callc.c | 4 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/hfc_2bds0.c | 4 +- + drivers/isdn/hisax/hfc_2bs0.c | 2 +- + drivers/isdn/hisax/hfc_pci.c | 4 +- + drivers/isdn/hisax/hfc_sx.c | 6 +- + drivers/isdn/hisax/hisax.h | 2 + + drivers/isdn/hisax/ipacx.c | 2 +- + drivers/isdn/hisax/isar.c | 6 +- + drivers/isdn/hisax/isdnl1.h | 1 + + drivers/isdn/hisax/isdnl3.c | 2 +- + drivers/isdn/hisax/netjet.c | 10 +- + drivers/isdn/hisax/st5481_d.c | 6 +- + drivers/isdn/i4l/isdn_concap.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 20 +- + drivers/isdn/i4l/isdn_ppp.c | 26 +- + drivers/isdn/mISDN/layer1.c | 10 +- + drivers/isdn/mISDN/layer2.c | 12 +- + drivers/isdn/mISDN/tei.c | 23 +- + drivers/net/3c507.c | 2 +- + drivers/net/3c515.c | 2 +- + drivers/net/82596.c | 2 +- + drivers/net/Kconfig | 255 ++-- + drivers/net/arm/am79c961a.c | 9 - + drivers/net/arm/w90p910_ether.c | 2 +- + drivers/net/at1700.c | 2 +- + drivers/net/atarilance.c | 2 +- + drivers/net/ax88796.c | 8 +- + drivers/net/benet/be.h | 39 +- + drivers/net/benet/be_cmds.c | 69 +- + drivers/net/benet/be_cmds.h | 42 +- + drivers/net/benet/be_hw.h | 39 +- + drivers/net/benet/be_main.c | 242 ++- + drivers/net/bnx2.c | 54 +- + drivers/net/bnx2.h | 2 + + drivers/net/bnx2x/bnx2x.h | 11 +- + drivers/net/bnx2x/bnx2x_cmn.c | 43 +- + drivers/net/bnx2x/bnx2x_cmn.h | 10 + + drivers/net/bnx2x/bnx2x_ethtool.c | 67 +- + drivers/net/bnx2x/bnx2x_hsi.h | 42 +- + drivers/net/bnx2x/bnx2x_link.c | 4 +- + drivers/net/bnx2x/bnx2x_main.c | 354 ++++- + drivers/net/bnx2x/bnx2x_reg.h | 5 + + drivers/net/bonding/bond_3ad.c | 3 +- + drivers/net/bonding/bond_main.c | 18 +- + drivers/net/bonding/bonding.h | 2 +- + drivers/net/can/Kconfig | 21 + + drivers/net/can/Makefile | 1 + + drivers/net/can/mscan/mscan.c | 2 +- + drivers/net/can/pch_can.c | 939 +++++------- + drivers/net/can/sja1000/sja1000_of_platform.c | 8 +- + drivers/net/can/slcan.c | 756 +++++++++ + drivers/net/cnic.c | 2 +- + drivers/net/cris/eth_v10.c | 34 +- + drivers/net/cxgb3/cxgb3_main.c | 3 +- + drivers/net/cxgb3/cxgb3_offload.c | 6 +- + drivers/net/cxgb4/cxgb4_main.c | 6 +- + drivers/net/cxgb4vf/adapter.h | 2 +- + drivers/net/cxgb4vf/cxgb4vf_main.c | 32 +- + drivers/net/cxgb4vf/sge.c | 9 +- + drivers/net/cxgb4vf/t4vf_hw.c | 5 +- + drivers/net/dm9000.c | 2 +- + drivers/net/e1000/e1000_main.c | 6 +- + drivers/net/e1000e/82571.c | 143 ++- + drivers/net/e1000e/defines.h | 1 + + drivers/net/e1000e/netdev.c | 57 +- + drivers/net/eepro.c | 2 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 4 +- + drivers/net/ethoc.c | 160 ++- + drivers/net/fec_mpc52xx.c | 19 +- + drivers/net/forcedeth.c | 1134 ++++++-------- + drivers/net/igb/igb_main.c | 6 +- + drivers/net/igbvf/Makefile | 2 +- + drivers/net/igbvf/defines.h | 2 +- + drivers/net/igbvf/ethtool.c | 2 +- + drivers/net/igbvf/igbvf.h | 3 +- + drivers/net/igbvf/mbx.c | 2 +- + drivers/net/igbvf/mbx.h | 2 +- + drivers/net/igbvf/netdev.c | 17 +- + drivers/net/igbvf/regs.h | 2 +- + drivers/net/igbvf/vf.c | 2 +- + drivers/net/igbvf/vf.h | 2 +- + drivers/net/iseries_veth.c | 2 +- + drivers/net/ixgb/ixgb_main.c | 6 +- + drivers/net/ixgbe/Makefile | 2 +- + drivers/net/ixgbe/ixgbe.h | 122 +- + drivers/net/ixgbe/ixgbe_82598.c | 58 +- + drivers/net/ixgbe/ixgbe_82599.c | 136 +-- + drivers/net/ixgbe/ixgbe_common.c | 192 ++- + drivers/net/ixgbe/ixgbe_common.h | 8 +- + drivers/net/ixgbe/ixgbe_dcb.c | 17 +- + drivers/net/ixgbe/ixgbe_dcb.h | 3 +- + drivers/net/ixgbe/ixgbe_dcb_82598.c | 12 +- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 12 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 55 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 266 +++-- + drivers/net/ixgbe/ixgbe_fcoe.c | 15 +- + drivers/net/ixgbe/ixgbe_main.c | 2048 ++++++++++++++----------- + drivers/net/ixgbe/ixgbe_mbx.c | 40 +- + drivers/net/ixgbe/ixgbe_mbx.h | 2 +- + drivers/net/ixgbe/ixgbe_phy.c | 52 + + drivers/net/ixgbe/ixgbe_phy.h | 5 + + drivers/net/ixgbe/ixgbe_sriov.c | 5 +- + drivers/net/ixgbe/ixgbe_type.h | 32 + + drivers/net/ixgbe/ixgbe_x540.c | 722 +++++++++ + drivers/net/ixgbevf/Makefile | 2 +- + drivers/net/ixgbevf/defines.h | 2 +- + drivers/net/ixgbevf/ixgbevf.h | 2 +- + drivers/net/ixgbevf/ixgbevf_main.c | 19 +- + drivers/net/ixgbevf/mbx.c | 2 +- + drivers/net/ixgbevf/mbx.h | 2 +- + drivers/net/ixgbevf/regs.h | 2 +- + drivers/net/ixgbevf/vf.c | 2 +- + drivers/net/ixgbevf/vf.h | 2 +- + drivers/net/jme.c | 16 +- + drivers/net/ks8851.c | 33 + + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 2 +- + drivers/net/lib8390.c | 24 +- + drivers/net/macvlan.c | 113 +- + drivers/net/ne-h8300.c | 12 +- + drivers/net/netxen/netxen_nic_init.c | 7 +- + drivers/net/netxen/netxen_nic_main.c | 6 +- + drivers/net/pch_gbe/pch_gbe_ethtool.c | 19 +- + drivers/net/pch_gbe/pch_gbe_main.c | 12 +- + drivers/net/pcmcia/axnet_cs.c | 18 +- + drivers/net/phy/phy.c | 4 +- + drivers/net/ppp_generic.c | 12 +- + drivers/net/pptp.c | 3 +- + drivers/net/qla3xxx.c | 8 +- + drivers/net/qlcnic/qlcnic.h | 42 +- + drivers/net/qlcnic/qlcnic_ctx.c | 28 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 130 +-- + drivers/net/qlcnic/qlcnic_hdr.h | 25 +- + drivers/net/qlcnic/qlcnic_hw.c | 76 +- + drivers/net/qlcnic/qlcnic_init.c | 123 +-- + drivers/net/qlcnic/qlcnic_main.c | 92 +- + drivers/net/qlge/qlge.h | 4 +- + drivers/net/qlge/qlge_dbg.c | 21 +- + drivers/net/qlge/qlge_ethtool.c | 19 +- + drivers/net/qlge/qlge_main.c | 8 +- + drivers/net/qlge/qlge_mpi.c | 2 +- + drivers/net/s2io.c | 3 +- + drivers/net/sc92031.c | 3 +- + drivers/net/sfc/efx.c | 14 +- + drivers/net/sfc/ethtool.c | 60 - + drivers/net/sfc/falcon.c | 183 ++- + drivers/net/sfc/falcon_boards.c | 120 ++- + drivers/net/sfc/falcon_xmac.c | 14 +- + drivers/net/sfc/filter.c | 3 +- + drivers/net/sfc/mcdi.c | 3 +- + drivers/net/sfc/mcdi_phy.c | 1 - + drivers/net/sfc/mdio_10g.c | 1 - + drivers/net/sfc/mtd.c | 98 +- + drivers/net/sfc/net_driver.h | 17 +- + drivers/net/sfc/nic.c | 48 +- + drivers/net/sfc/nic.h | 12 +- + drivers/net/sfc/qt202x_phy.c | 6 + + drivers/net/sfc/siena.c | 10 +- + drivers/net/sfc/spi.h | 5 + + drivers/net/sfc/tenxpress.c | 2 - + drivers/net/sfc/tx.c | 8 +- + drivers/net/sh_eth.c | 244 ++-- + drivers/net/stmmac/stmmac.h | 40 +- + drivers/net/stmmac/stmmac_ethtool.c | 16 +- + drivers/net/stmmac/stmmac_main.c | 223 ++-- + drivers/net/stmmac/stmmac_mdio.c | 8 +- + drivers/net/tg3.c | 283 +++-- + drivers/net/tg3.h | 42 +- + drivers/net/usb/Kconfig | 19 + + drivers/net/usb/Makefile | 1 + + drivers/net/usb/cdc_ncm.c | 1213 +++++++++++++++ + drivers/net/usb/hso.c | 1 - + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/pegasus.c | 4 +- + drivers/net/usb/usbnet.c | 45 +- + drivers/net/via-rhine.c | 326 ++++- + drivers/net/vmxnet3/vmxnet3_drv.c | 951 +++++++++--- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 174 ++- + drivers/net/vmxnet3/vmxnet3_int.h | 73 +- + drivers/net/vxge/vxge-config.c | 1488 +++++++++--------- + drivers/net/vxge/vxge-config.h | 135 ++- + drivers/net/vxge/vxge-ethtool.c | 112 +- + drivers/net/vxge/vxge-main.c | 580 ++++++-- + drivers/net/vxge/vxge-main.h | 81 +- + drivers/net/vxge/vxge-reg.h | 33 +- + drivers/net/vxge/vxge-traffic.h | 28 - + drivers/net/vxge/vxge-version.h | 31 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 1 + + drivers/net/xilinx_emaclite.c | 36 +- + drivers/net/znet.c | 2 +- + drivers/s390/net/lcs.c | 10 +- + drivers/s390/net/qeth_core_sys.c | 2 +- + drivers/s390/net/qeth_l2_main.c | 11 +- + drivers/s390/net/qeth_l3_main.c | 23 +- + include/linux/dccp.h | 23 + + include/linux/filter.h | 56 +- + include/linux/if_bridge.h | 4 +- + include/linux/if_link.h | 28 + + include/linux/if_macvlan.h | 34 +- + include/linux/igmp.h | 14 +- + include/linux/inetdevice.h | 15 +- + include/linux/ipv6.h | 2 +- + include/linux/mdio.h | 5 + + include/linux/netdevice.h | 77 +- + include/linux/netfilter.h | 2 + + include/linux/skbuff.h | 3 +- + include/linux/stmmac.h | 6 +- + include/linux/usb/usbnet.h | 6 + + include/net/addrconf.h | 2 - + include/net/caif/cfctrl.h | 2 +- + include/net/dn_dev.h | 27 +- + include/net/dn_route.h | 10 + + include/net/dst.h | 34 +- + include/net/flow.h | 2 + + include/net/if_inet6.h | 3 +- + include/net/inet6_connection_sock.h | 3 + + include/net/inet_connection_sock.h | 2 +- + include/net/inet_sock.h | 2 +- + include/net/inetpeer.h | 32 +- + include/net/ip6_fib.h | 2 + + include/net/ip6_route.h | 13 +- + include/net/ndisc.h | 3 - + include/net/neighbour.h | 10 +- + include/net/netlink.h | 21 +- + include/net/netns/generic.h | 2 +- + include/net/route.h | 24 +- + include/net/rtnetlink.h | 35 + + include/net/scm.h | 5 +- + include/net/sctp/command.h | 3 - + include/net/sctp/constants.h | 14 - + include/net/sctp/structs.h | 2 - + include/net/snmp.h | 4 +- + include/net/sock.h | 60 +- + include/net/tcp.h | 9 +- + include/net/timewait_sock.h | 8 + + include/net/tipc/tipc.h | 186 --- + include/net/tipc/tipc_bearer.h | 138 -- + include/net/tipc/tipc_msg.h | 207 --- + include/net/tipc/tipc_port.h | 101 -- + include/net/x25.h | 2 + + include/net/xfrm.h | 6 + + lib/nlattr.c | 22 +- + net/8021q/vlan.c | 13 +- + net/8021q/vlan.h | 22 +- + net/8021q/vlan_core.c | 4 +- + net/8021q/vlan_dev.c | 197 +-- + net/8021q/vlan_netlink.c | 20 - + net/8021q/vlanproc.c | 5 - + net/9p/protocol.c | 33 +- + net/Kconfig | 5 + + net/atm/br2684.c | 2 +- + net/atm/clip.c | 3 +- + net/atm/lec.c | 3 +- + net/bluetooth/Makefile | 2 +- + net/bridge/br.c | 4 - + net/bridge/br_device.c | 2 +- + net/bridge/br_fdb.c | 15 +- + net/bridge/br_forward.c | 4 +- + net/bridge/br_if.c | 7 +- + net/bridge/br_input.c | 10 +- + net/bridge/br_multicast.c | 78 +- + net/bridge/br_netfilter.c | 24 +- + net/bridge/br_netlink.c | 10 +- + net/bridge/br_notify.c | 6 +- + net/bridge/br_private.h | 21 +- + net/bridge/br_stp_bpdu.c | 8 +- + net/bridge/netfilter/ebtable_broute.c | 3 +- + net/bridge/netfilter/ebtables.c | 11 +- + net/caif/Makefile | 8 +- + net/can/Makefile | 6 +- + net/ceph/Makefile | 2 +- + net/core/datagram.c | 2 +- + net/core/dev.c | 205 ++- + net/core/ethtool.c | 4 +- + net/core/filter.c | 444 +++--- + net/core/net-sysfs.c | 429 +++++- + net/core/net-sysfs.h | 4 +- + net/core/netpoll.c | 3 +- + net/core/pktgen.c | 39 +- + net/core/request_sock.c | 1 + + net/core/rtnetlink.c | 166 ++- + net/core/scm.c | 10 +- + net/core/skbuff.c | 34 +- + net/core/timestamping.c | 4 +- + net/dccp/Makefile | 4 +- + net/dccp/ackvec.c | 616 ++++----- + net/dccp/ackvec.h | 151 ++- + net/dccp/ccids/ccid2.c | 143 +-- + net/dccp/ccids/ccid2.h | 2 + + net/dccp/dccp.h | 24 +- + net/dccp/input.c | 33 +- + net/dccp/ipv4.c | 13 +- + net/dccp/options.c | 100 ++- + net/dccp/output.c | 22 +- + net/dccp/proto.c | 71 +- + net/dccp/qpolicy.c | 137 ++ + net/decnet/af_decnet.c | 2 +- + net/decnet/dn_dev.c | 100 +- + net/decnet/dn_fib.c | 6 +- + net/decnet/dn_neigh.c | 2 +- + net/decnet/dn_route.c | 107 +- + net/decnet/dn_rules.c | 2 +- + net/dns_resolver/Makefile | 2 +- + net/econet/Makefile | 2 +- + net/ieee802154/af_ieee802154.c | 6 +- + net/ipv4/af_inet.c | 18 +- + net/ipv4/arp.c | 31 +- + net/ipv4/devinet.c | 91 ++ + net/ipv4/fib_frontend.c | 28 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/icmp.c | 32 +- + net/ipv4/igmp.c | 282 ++-- + net/ipv4/inet_connection_sock.c | 15 +- + net/ipv4/inetpeer.c | 167 ++- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 50 +- + net/ipv4/ip_output.c | 25 +- + net/ipv4/ipconfig.c | 32 +- + net/ipv4/ipip.c | 21 +- + net/ipv4/ipmr.c | 20 +- + net/ipv4/netfilter.c | 8 +- + net/ipv4/netfilter/Makefile | 6 +- + net/ipv4/raw.c | 7 +- + net/ipv4/route.c | 157 +-- + net/ipv4/syncookies.c | 15 +- + net/ipv4/tcp.c | 16 +- + net/ipv4/tcp_input.c | 22 +- + net/ipv4/tcp_ipv4.c | 72 +- + net/ipv4/tcp_minisocks.c | 63 +- + net/ipv4/tcp_output.c | 12 +- + net/ipv4/tcp_probe.c | 4 +- + net/ipv4/udp.c | 16 +- + net/ipv4/xfrm4_policy.c | 47 +- + net/ipv6/addrconf.c | 114 +- + net/ipv6/inet6_connection_sock.c | 54 +- + net/ipv6/ip6_tunnel.c | 2 - + net/ipv6/ip6mr.c | 4 +- + net/ipv6/mcast.c | 77 +- + net/ipv6/ndisc.c | 29 +- + net/ipv6/netfilter.c | 6 +- + net/ipv6/netfilter/Makefile | 4 +- + net/ipv6/reassembly.c | 36 +- + net/ipv6/route.c | 110 +- + net/ipv6/sit.c | 14 +- + net/ipv6/tcp_ipv6.c | 149 ++- + net/ipv6/udp.c | 4 +- + net/irda/ircomm/Makefile | 4 +- + net/irda/irlan/Makefile | 2 +- + net/irda/irnet/Makefile | 2 +- + net/l2tp/l2tp_ip.c | 12 +- + net/lapb/Makefile | 2 +- + net/llc/af_llc.c | 6 +- + net/netfilter/core.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 6 +- + net/netfilter/ipvs/ip_vs_xmit.c | 42 +- + net/netfilter/xt_TEE.c | 12 +- + net/packet/af_packet.c | 145 ++- + net/phonet/Makefile | 4 +- + net/rds/Makefile | 8 +- + net/rxrpc/Makefile | 4 +- + net/rxrpc/ar-peer.c | 10 +- + net/sched/sch_generic.c | 12 +- + net/sched/sch_teql.c | 3 +- + net/sctp/socket.c | 2 +- + net/socket.c | 11 +- + net/sunrpc/auth_gss/Makefile | 4 +- + net/tipc/addr.c | 2 - + net/tipc/bcast.c | 8 - + net/tipc/bearer.c | 12 +- + net/tipc/bearer.h | 71 +- + net/tipc/cluster.c | 7 - + net/tipc/config.c | 16 +- + net/tipc/config.h | 1 - + net/tipc/core.c | 41 - + net/tipc/core.h | 14 +- + net/tipc/discover.c | 2 - + net/tipc/discover.h | 2 - + net/tipc/eth_media.c | 6 +- + net/tipc/link.c | 14 - + net/tipc/link.h | 1 - + net/tipc/msg.c | 2 - + net/tipc/msg.h | 168 ++- + net/tipc/name_distr.c | 2 - + net/tipc/name_table.c | 5 - + net/tipc/net.c | 5 - + net/tipc/node.c | 7 - + net/tipc/node_subscr.c | 2 - + net/tipc/port.c | 115 +-- + net/tipc/port.h | 130 ++- + net/tipc/socket.c | 7 +- + net/tipc/subscr.c | 8 +- + net/tipc/user_reg.c | 50 +- + net/tipc/user_reg.h | 3 + + net/tipc/zone.c | 3 - + net/unix/af_unix.c | 34 +- + net/wanrouter/Makefile | 2 +- + net/x25/af_x25.c | 95 +- + net/x25/x25_link.c | 8 +- + net/xfrm/xfrm_policy.c | 6 +- + security/selinux/hooks.c | 12 +- + 415 files changed, 15323 insertions(+), 9289 deletions(-) + create mode 100644 Documentation/networking/LICENSE.qlcnic + create mode 100644 drivers/net/can/slcan.c + create mode 100644 drivers/net/ixgbe/ixgbe_x540.c + create mode 100644 drivers/net/usb/cdc_ncm.c + delete mode 100644 include/net/tipc/tipc.h + delete mode 100644 include/net/tipc/tipc_bearer.h + delete mode 100644 include/net/tipc/tipc_msg.h + delete mode 100644 include/net/tipc/tipc_port.h + create mode 100644 net/dccp/qpolicy.c +Merging bluetooth/master +$ git merge bluetooth/master +Resolved 'net/bluetooth/Makefile' using previous resolution. +Auto-merging net/bluetooth/Makefile +CONFLICT (content): Merge conflict in net/bluetooth/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c3440cb] Merge remote branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + include/net/bluetooth/bluetooth.h | 1 + + include/net/bluetooth/hci.h | 4 ++ + include/net/bluetooth/hci_core.h | 4 ++ + include/net/bluetooth/mgmt.h | 46 +++++++++++++++++ + net/bluetooth/Makefile | 2 +- + net/bluetooth/hci_sock.c | 49 ++++++++++++++++--- + net/bluetooth/l2cap.c | 8 +++- + net/bluetooth/mgmt.c | 99 +++++++++++++++++++++++++++++++++++++ + 8 files changed, 204 insertions(+), 9 deletions(-) + create mode 100644 include/net/bluetooth/mgmt.h + create mode 100644 net/bluetooth/mgmt.c +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/Kconfig | 19 ++++--- + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 54 ++++++++++---------- + drivers/mtd/chips/cfi_cmdset_0002.c | 94 +++++++++++++++++----------------- + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/fwh_lock.h | 2 +- + drivers/mtd/devices/m25p80.c | 33 +++++++++++- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/amd76xrom.c | 7 +-- + drivers/mtd/maps/bcm963xx-flash.c | 5 ++ + drivers/mtd/maps/ck804xrom.c | 7 +-- + drivers/mtd/maps/esb2rom.c | 9 +-- + drivers/mtd/maps/ichxrom.c | 9 +-- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/maps/scx200_docflash.c | 5 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/mtdchar.c | 10 ++-- + drivers/mtd/mtdpart.c | 10 ++-- + drivers/mtd/nand/fsl_elbc_nand.c | 2 + + drivers/mtd/nand/fsmc_nand.c | 89 +++++++++++++++++++++++++-------- + drivers/mtd/nand/jz4740_nand.c | 57 +--------------------- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/mtd/nand/nand_base.c | 11 +++- + drivers/mtd/nand/nand_bbt.c | 3 +- + drivers/mtd/nand/nandsim.c | 39 +++++++------- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/onenand/omap2.c | 12 +++- + drivers/mtd/onenand/onenand_base.c | 51 +++++++++++++------ + drivers/mtd/onenand/onenand_bbt.c | 6 ++- + drivers/mtd/onenand/samsung.c | 7 ++- + drivers/mtd/ubi/vtbl.c | 6 +-- + fs/jffs2/build.c | 5 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/xattr.c | 12 ++-- + include/linux/mtd/cfi.h | 3 +- + include/linux/mtd/fsmc.h | 26 ++-------- + include/linux/mtd/nand.h | 2 + + include/linux/mtd/onenand.h | 12 +++++ + include/linux/mtd/partitions.h | 2 +- + 39 files changed, 336 insertions(+), 293 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging include/linux/Kbuild +Auto-merging include/linux/socket.h +Auto-merging net/core/sock.c +Merge made by recursive. + arch/x86/crypto/aesni-intel_asm.S | 1392 +++++++++++++++++++++++++++++++++++- + arch/x86/crypto/aesni-intel_glue.c | 540 ++++++++++++++- + crypto/Kconfig | 33 +- + crypto/Makefile | 17 +- + crypto/af_alg.c | 483 +++++++++++++ + crypto/algif_hash.c | 319 +++++++++ + crypto/algif_skcipher.c | 632 ++++++++++++++++ + crypto/authenc.c | 22 +- + crypto/cast5.c | 74 +-- + crypto/deflate.c | 3 +- + crypto/eseqiv.c | 18 +- + crypto/gcm.c | 19 +- + crypto/shash.c | 8 +- + crypto/tcrypt.c | 11 + + crypto/testmgr.c | 24 + + crypto/testmgr.h | 361 ++++++++++ + crypto/zlib.c | 3 +- + drivers/crypto/omap-aes.c | 260 ++++---- + drivers/crypto/omap-sham.c | 379 ++++++----- + include/crypto/if_alg.h | 92 +++ + include/crypto/scatterwalk.h | 15 + + include/linux/Kbuild | 1 + + include/linux/if_alg.h | 40 + + include/linux/socket.h | 5 +- + net/core/sock.c | 6 +- + 25 files changed, 4313 insertions(+), 444 deletions(-) + create mode 100644 crypto/af_alg.c + create mode 100644 crypto/algif_hash.c + create mode 100644 crypto/algif_skcipher.c + create mode 100644 include/crypto/if_alg.h + create mode 100644 include/linux/if_alg.h +Merging sound/for-next +$ git merge sound/for-next +Resolved 'sound/soc/sh/fsi.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/sh/boards/mach-se/7724/setup.c +Removing sound/pci/oxygen/hifier.c +Removing sound/soc/s3c24xx/Kconfig +Removing sound/soc/s3c24xx/Makefile +Removing sound/soc/s3c24xx/aquila_wm8994.c +Removing sound/soc/s3c24xx/s3c64xx-i2s-v4.c +Removing sound/soc/s3c24xx/s3c64xx-i2s.c +Removing sound/soc/s3c24xx/s3c64xx-i2s.h +Auto-merging sound/soc/sh/fsi.c +CONFLICT (content): Merge conflict in sound/soc/sh/fsi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 75dfa8d] Merge remote branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 - + MAINTAINERS | 2 +- + arch/arm/mach-kirkwood/openrd-setup.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- + arch/arm/mach-s3c64xx/dev-audio.c | 15 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s5pc100/dev-audio.c | 2 +- + arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + + arch/arm/mach-s5pv210/dev-audio.c | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 5 + + arch/arm/plat-s3c24xx/devs.c | 19 +- + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/dev-asocdma.c | 25 + + arch/arm/plat-samsung/include/plat/devs.h | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 5 + + drivers/gpio/wm8994-gpio.c | 24 + + drivers/mfd/wm8994-core.c | 93 +- + include/linux/mfd/wm8994/core.h | 8 + + include/linux/mfd/wm8994/pdata.h | 17 + + include/linux/mfd/wm8994/registers.h | 302 ++ + include/sound/alc5623.h | 15 + + include/sound/asound.h | 3 + + include/sound/hdsp.h | 1 + + include/sound/minors.h | 4 +- + include/sound/pcm.h | 1 + + include/sound/soc-dai.h | 4 +- + include/sound/soc-dapm.h | 50 +- + include/sound/soc.h | 112 +- + include/trace/events/asoc.h | 235 ++ + sound/ac97_bus.c | 4 +- + sound/core/pcm_lib.c | 22 + + sound/core/pcm_native.c | 3 + + sound/core/seq/seq.c | 4 + + sound/core/sound.c | 18 +- + sound/core/timer.c | 7 +- + sound/pci/Kconfig | 19 +- + sound/pci/hda/hda_intel.c | 9 +- + sound/pci/hda/patch_conexant.c | 29 +- + sound/pci/hda/patch_hdmi.c | 43 +- + sound/pci/hda/patch_realtek.c | 132 +- + sound/pci/hda/patch_sigmatel.c | 3 +- + sound/pci/ice1712/delta.c | 49 +- + sound/pci/ice1712/delta.h | 11 + + sound/pci/oxygen/Makefile | 2 - + sound/pci/oxygen/hifier.c | 239 -- + sound/pci/oxygen/oxygen.c | 133 +- + sound/pci/oxygen/oxygen.h | 4 + + sound/pci/oxygen/oxygen_lib.c | 18 +- + sound/pci/oxygen/oxygen_mixer.c | 55 + + sound/pci/oxygen/oxygen_pcm.c | 14 +- + sound/pci/oxygen/xonar.h | 2 + + sound/pci/oxygen/xonar_cs43xx.c | 70 +- + sound/pci/oxygen/xonar_lib.c | 6 +- + sound/pci/oxygen/xonar_pcm179x.c | 234 +- + sound/pci/oxygen/xonar_wm87x6.c | 73 +- + sound/pci/rme9652/hdsp.c | 538 +++- + sound/soc/Kconfig | 4 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/playpaq_wm8510.c | 12 +- + sound/soc/atmel/sam9g20_wm8731.c | 18 +- + sound/soc/atmel/snd-soc-afeb9260.c | 14 +- + sound/soc/au1x/db1200.c | 1 - + sound/soc/blackfin/bf5xx-ad1836.c | 1 - + sound/soc/blackfin/bf5xx-ad193x.c | 1 - + sound/soc/blackfin/bf5xx-ad73311.c | 1 - + sound/soc/blackfin/bf5xx-ssm2602.c | 1 - + sound/soc/codecs/88pm860x-codec.c | 22 +- + sound/soc/codecs/Kconfig | 13 + + sound/soc/codecs/Makefile | 8 +- + sound/soc/codecs/ad1836.c | 7 +- + sound/soc/codecs/ad193x.c | 7 +- + sound/soc/codecs/ad1980.c | 1 - + sound/soc/codecs/ak4535.c | 20 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 10 +- + sound/soc/codecs/alc5623.c | 1117 +++++++ + sound/soc/codecs/alc5623.h | 161 + + sound/soc/codecs/cq93vc.c | 4 +- + sound/soc/codecs/cs42l51.c | 6 +- + sound/soc/codecs/cx20442.c | 15 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/jz4740.c | 11 +- + sound/soc/codecs/max98088.c | 13 +- + sound/soc/codecs/ssm2602.c | 10 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 1 - + sound/soc/codecs/tlv320aic3x.c | 56 +- + sound/soc/codecs/tlv320dac33.c | 16 +- + sound/soc/codecs/tpa6130a2.c | 12 +- + sound/soc/codecs/twl4030.c | 51 +- + sound/soc/codecs/twl6040.c | 13 +- + sound/soc/codecs/uda134x.c | 3 +- + sound/soc/codecs/uda1380.c | 14 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm2000.c | 6 +- + sound/soc/codecs/wm8350.c | 29 +- + sound/soc/codecs/wm8400.c | 12 +- + sound/soc/codecs/wm8510.c | 12 +- + sound/soc/codecs/wm8523.c | 12 +- + sound/soc/codecs/wm8580.c | 24 +- + sound/soc/codecs/wm8711.c | 10 +- + sound/soc/codecs/wm8728.c | 12 +- + sound/soc/codecs/wm8731.c | 101 +- + sound/soc/codecs/wm8737.c | 754 +++++ + sound/soc/codecs/wm8737.h | 322 ++ + sound/soc/codecs/wm8741.c | 10 +- + sound/soc/codecs/wm8750.c | 12 +- + sound/soc/codecs/wm8753.c | 30 +- + sound/soc/codecs/wm8770.c | 749 +++++ + sound/soc/codecs/wm8770.h | 51 + + sound/soc/codecs/wm8776.c | 10 +- + sound/soc/codecs/wm8804.c | 7 +- + sound/soc/codecs/wm8900.c | 12 +- + sound/soc/codecs/wm8903.c | 12 +- + sound/soc/codecs/wm8904.c | 39 +- + sound/soc/codecs/wm8940.c | 7 +- + sound/soc/codecs/wm8955.c | 15 +- + sound/soc/codecs/wm8960.c | 29 +- + sound/soc/codecs/wm8961.c | 12 +- + sound/soc/codecs/wm8962.c | 36 +- + sound/soc/codecs/wm8971.c | 30 +- + sound/soc/codecs/wm8974.c | 12 +- + sound/soc/codecs/wm8978.c | 12 +- + sound/soc/codecs/wm8985.c | 12 +- + sound/soc/codecs/wm8988.c | 10 +- + sound/soc/codecs/wm8990.c | 12 +- + sound/soc/codecs/wm8993.c | 14 +- + sound/soc/codecs/wm8994-tables.c | 3147 ++++++++++++++++++++ + sound/soc/codecs/wm8994.c | 2512 +++++----------- + sound/soc/codecs/wm8994.h | 14 + + sound/soc/codecs/wm9081.c | 10 +- + sound/soc/codecs/wm9090.c | 18 +- + sound/soc/codecs/wm9705.c | 7 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/codecs/wm9713.c | 9 +- + sound/soc/codecs/wm_hubs.c | 108 +- + sound/soc/codecs/wm_hubs.h | 3 + + sound/soc/davinci/davinci-evm.c | 22 +- + sound/soc/davinci/davinci-sffsdr.c | 1 - + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 6 +- + sound/soc/imx/eukrea-tlv320.c | 1 - + sound/soc/imx/imx-ssi.c | 4 +- + sound/soc/imx/phycore-ac97.c | 1 - + sound/soc/imx/wm1133-ev1.c | 8 +- + sound/soc/jz4740/jz4740-i2s.c | 1 - + sound/soc/jz4740/qi_lb60.c | 14 +- + sound/soc/kirkwood/Kconfig | 11 +- + sound/soc/kirkwood/Makefile | 2 + + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- + sound/soc/kirkwood/kirkwood-t5325.c | 141 + + sound/soc/nuc900/nuc900-audio.c | 1 - + sound/soc/omap/am3517evm.c | 14 +- + sound/soc/omap/ams-delta.c | 82 +- + sound/soc/omap/igep0020.c | 1 - + sound/soc/omap/n810.c | 43 +- + sound/soc/omap/omap2evm.c | 1 - + sound/soc/omap/omap3beagle.c | 1 - + sound/soc/omap/omap3evm.c | 1 - + sound/soc/omap/omap3pandora.c | 45 +- + sound/soc/omap/osk5912.c | 14 +- + sound/soc/omap/overo.c | 1 - + sound/soc/omap/rx51.c | 26 +- + sound/soc/omap/sdp3430.c | 44 +- + sound/soc/omap/sdp4430.c | 20 +- + sound/soc/omap/zoom2.c | 36 +- + sound/soc/pxa/corgi.c | 52 +- + sound/soc/pxa/e740_wm9705.c | 30 +- + sound/soc/pxa/e750_wm9705.c | 30 +- + sound/soc/pxa/e800_wm9712.c | 8 +- + sound/soc/pxa/em-x270.c | 1 - + sound/soc/pxa/magician.c | 36 +- + sound/soc/pxa/mioa701_wm9713.c | 18 +- + sound/soc/pxa/palm27x.c | 34 +- + sound/soc/pxa/poodle.c | 26 +- + sound/soc/pxa/raumfeld.c | 1 - + sound/soc/pxa/saarb.c | 18 +- + sound/soc/pxa/spitz.c | 70 +- + sound/soc/pxa/tavorevb3.c | 18 +- + sound/soc/pxa/tosa.c | 38 +- + sound/soc/pxa/z2.c | 16 +- + sound/soc/pxa/zylonite.c | 12 +- + sound/soc/s3c24xx/Kconfig | 171 -- + sound/soc/s3c24xx/Makefile | 55 - + sound/soc/s3c24xx/aquila_wm8994.c | 295 -- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- + sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- + sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - + sound/soc/s6000/s6105-ipcam.c | 41 +- + sound/soc/samsung/Kconfig | 155 + + sound/soc/samsung/Makefile | 51 + + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- + sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- + sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 134 +- + sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- + sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 64 +- + sound/soc/samsung/i2s.c | 1256 ++++++++ + sound/soc/samsung/i2s.h | 29 + + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 26 +- + sound/soc/{s3c24xx => samsung}/lm4857.h | 0 + sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 9 +- + .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 72 +- + sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 130 +- + sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- + sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- + sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 + sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 16 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- + .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 22 +- + .../s3c24xx_simtec_tlv320aic23.c | 22 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 5 +- + sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 64 +- + sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 9 +- + sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 21 +- + .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 173 +- + sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 25 +- + sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- + sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- + sound/soc/sh/fsi-ak4642.c | 140 +- + sound/soc/sh/fsi.c | 207 +- + sound/soc/sh/migor.c | 6 +- + sound/soc/sh/sh7760-ac97.c | 3 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_dai.c | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/soc-cache.c | 1046 +++++++- + sound/soc/soc-core.c | 534 +++- + sound/soc/soc-dapm.c | 584 +++-- + sound/soc/soc-jack.c | 31 +- + 240 files changed, 14330 insertions(+), 5253 deletions(-) + create mode 100644 arch/arm/plat-samsung/dev-asocdma.c + create mode 100644 include/sound/alc5623.h + create mode 100644 include/trace/events/asoc.h + delete mode 100644 sound/pci/oxygen/hifier.c + create mode 100644 sound/soc/codecs/alc5623.c + create mode 100644 sound/soc/codecs/alc5623.h + create mode 100644 sound/soc/codecs/wm8737.c + create mode 100644 sound/soc/codecs/wm8737.h + create mode 100644 sound/soc/codecs/wm8770.c + create mode 100644 sound/soc/codecs/wm8770.h + create mode 100644 sound/soc/codecs/wm8994-tables.c + create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c + delete mode 100644 sound/soc/s3c24xx/Kconfig + delete mode 100644 sound/soc/s3c24xx/Makefile + delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h + create mode 100644 sound/soc/samsung/Kconfig + create mode 100644 sound/soc/samsung/Makefile + rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) + rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) + rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (74%) + rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) + rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (84%) + create mode 100644 sound/soc/samsung/i2s.c + create mode 100644 sound/soc/samsung/i2s.h + rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (88%) + rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) + rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (92%) + rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (88%) + rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (83%) + rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) + rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) + rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) + rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (95%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (87%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (86%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) + rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (82%) + rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (92%) + rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (95%) + rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (56%) + rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (90%) + rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) + rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Already up-to-date. +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + Documentation/lguest/lguest.c | 66 ++++++++++++++++++++++++++++++++++---- + Documentation/lguest/lguest.txt | 5 +++ + 2 files changed, 64 insertions(+), 7 deletions(-) +Merging input/next +$ git merge input/next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/tablet/wacom_wac.c +Auto-merging include/linux/input.h +Merge made by recursive. + Documentation/input/cma3000_d0x.txt | 115 +++++ + Documentation/input/multi-touch-protocol.txt | 14 +- + MAINTAINERS | 2 + + arch/arm/plat-spear/include/plat/keyboard.h | 141 ++++++ + drivers/hid/Kconfig | 3 +- + drivers/hid/hid-3m-pct.c | 36 +-- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-egalax.c | 127 ++--- + drivers/hid/hid-ids.h | 1 + + drivers/input/Makefile | 2 +- + drivers/input/apm-power.c | 14 +- + drivers/input/evbug.c | 18 +- + drivers/input/evdev.c | 15 +- + drivers/input/ff-core.c | 11 +- + drivers/input/ff-memless.c | 31 +- + drivers/input/gameport/gameport.c | 152 +++--- + drivers/input/input-mt.c | 153 ++++++ + drivers/input/input-polldev.c | 5 +- + drivers/input/input.c | 70 +--- + drivers/input/joydev.c | 4 +- + drivers/input/joystick/iforce/Makefile | 15 +- + drivers/input/joystick/xpad.c | 123 +++-- + drivers/input/keyboard/Kconfig | 19 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/spear-keyboard.c | 344 +++++++++++++ + drivers/input/keyboard/tca6416-keypad.c | 13 +- + drivers/input/misc/Kconfig | 24 + + drivers/input/misc/Makefile | 2 + + drivers/input/misc/cma3000_d0x.c | 398 +++++++++++++++ + drivers/input/misc/cma3000_d0x.h | 42 ++ + drivers/input/misc/cma3000_d0x_i2c.c | 143 ++++++ + drivers/input/misc/pcf8574_keypad.c | 19 +- + drivers/input/misc/uinput.c | 4 +- + drivers/input/mouse/hgpk.c | 695 +++++++++++++++++++++++--- + drivers/input/mouse/hgpk.h | 31 ++- + drivers/input/mouse/psmouse-base.c | 1 + + drivers/input/mousedev.c | 10 +- + drivers/input/serio/ams_delta_serio.c | 1 - + drivers/input/serio/ct82c710.c | 8 +- + drivers/input/serio/hil_mlc.c | 5 + + drivers/input/serio/hp_sdc_mlc.c | 18 +- + drivers/input/serio/i8042-x86ia64io.h | 30 +- + drivers/input/serio/i8042.c | 92 ++-- + drivers/input/serio/i8042.h | 14 +- + drivers/input/serio/ps2mult.c | 2 +- + drivers/input/serio/serio.c | 155 +++---- + drivers/input/tablet/wacom_wac.c | 26 +- + drivers/input/tablet/wacom_wac.h | 4 - + drivers/input/touchscreen/qt602240_ts.c | 21 +- + drivers/input/touchscreen/wacom_w8001.c | 25 +- + drivers/input/xen-kbdfront.c | 10 +- + drivers/macintosh/mac_hid.c | 8 + + include/linux/input-mt.h | 56 ++ + include/linux/input.h | 22 +- + include/linux/input/cma3000.h | 59 +++ + 55 files changed, 2645 insertions(+), 710 deletions(-) + create mode 100644 Documentation/input/cma3000_d0x.txt + create mode 100644 arch/arm/plat-spear/include/plat/keyboard.h + create mode 100644 drivers/input/input-mt.c + create mode 100644 drivers/input/keyboard/spear-keyboard.c + create mode 100644 drivers/input/misc/cma3000_d0x.c + create mode 100644 drivers/input/misc/cma3000_d0x.h + create mode 100644 drivers/input/misc/cma3000_d0x_i2c.c + create mode 100644 include/linux/input-mt.h + create mode 100644 include/linux/input/cma3000.h +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date! +Merge made by recursive. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/Kconfig | 10 ++ + drivers/power/Makefile | 1 + + drivers/power/ds2760_battery.c | 2 +- + drivers/power/gpio-charger.c | 185 +++++++++++++++++++++++++++++++++ + drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++++++++++------- + drivers/power/jz4740-battery.c | 12 ++ + include/linux/power/gpio-charger.h | 41 ++++++++ + 7 files changed, 411 insertions(+), 41 deletions(-) + create mode 100644 drivers/power/gpio-charger.c + create mode 100644 include/linux/power/gpio-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 +Auto-merging drivers/leds/leds-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d497672] Merge remote branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/Kconfig +Merge made by recursive. + arch/arm/mach-dove/common.c | 4 +- + drivers/mmc/core/Kconfig | 11 ++ + drivers/mmc/core/core.c | 62 ++++++++++++- + drivers/mmc/core/core.h | 3 + + drivers/mmc/core/debugfs.c | 5 + + drivers/mmc/core/host.c | 205 +++++++++++++++++++++++++++++++++++++++- + drivers/mmc/core/host.h | 21 ++++ + drivers/mmc/core/mmc.c | 2 + + drivers/mmc/core/sd.c | 5 +- + drivers/mmc/core/sdio.c | 2 + + drivers/mmc/host/Kconfig | 11 ++ + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/mxcmmc.c | 53 +++++++++-- + drivers/mmc/host/sdhci-dove.c | 70 ++++++++++++++ + drivers/mmc/host/sdhci-pci.c | 159 ++++++++++++++++++++++++++++++- + drivers/mmc/host/sdhci-pltfm.c | 3 + + drivers/mmc/host/sdhci-pltfm.h | 1 + + drivers/mmc/host/sdhci.c | 28 +++++- + drivers/mmc/host/sdhci.h | 2 +- + include/linux/mmc/host.h | 13 +++ + include/linux/mmc/sdhci.h | 4 + + include/linux/pci_ids.h | 7 ++ + 23 files changed, 648 insertions(+), 26 deletions(-) + create mode 100644 drivers/mmc/host/sdhci-dove.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + kernel/debug/kdb/kdb_main.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging mm/slub.c +Merge made by recursive. + Documentation/vm/Makefile | 2 +- + include/linux/slab_def.h | 33 ++++++---------- + include/linux/slub_def.h | 55 +++++++++++++-------------- + mm/slab.c | 38 +++++++++++------- + mm/slub.c | 30 +++++++++++--- + {Documentation/vm => tools/slub}/slabinfo.c | 6 +- + 6 files changed, 89 insertions(+), 75 deletions(-) + rename {Documentation/vm => tools/slub}/slabinfo.c (99%) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/mfd/wm8994-core.c' using previous resolution. +Auto-merging drivers/mfd/wm8994-core.c +CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0127ca8] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/rdc321x-gpio.c | 2 +- + drivers/mfd/Kconfig | 8 + + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-debugfs.c | 1016 +++++++++++++++++++------------------- + drivers/mfd/cs5535-mfd.c | 151 ++++++ + drivers/mfd/ezx-pcap.c | 5 +- + drivers/mfd/mc13xxx-core.c | 2 +- + drivers/mfd/mfd-core.c | 4 + + drivers/mfd/sm501.c | 9 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/wm831x-core.c | 19 +- + drivers/mfd/wm831x-i2c.c | 1 + + drivers/mfd/wm831x-irq.c | 42 +- + drivers/mfd/wm831x-spi.c | 18 + + drivers/mfd/wm8350-irq.c | 32 +- + drivers/mfd/wm8994-core.c | 48 +- + drivers/mfd/wm8994-irq.c | 32 +- + drivers/watchdog/rdc321x_wdt.c | 2 +- + include/linux/mfd/core.h | 6 + + include/linux/mfd/wm831x/core.h | 1 + + 20 files changed, 795 insertions(+), 606 deletions(-) + create mode 100644 drivers/mfd/cs5535-mfd.c +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_crtc_helper.c +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/radeon/r600.c +Auto-merging drivers/gpu/drm/radeon/radeon_atombios.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/radeon/radeon_object.c +Merge made by recursive. + drivers/gpu/drm/drm_crtc_helper.c | 13 +- + drivers/gpu/drm/drm_irq.c | 563 +++++++++++++- + drivers/gpu/drm/drm_stub.c | 10 + + drivers/gpu/drm/nouveau/nouveau_gem.c | 12 +- + drivers/gpu/drm/radeon/ObjectID.h | 48 ++ + drivers/gpu/drm/radeon/atombios.h | 997 +++++++++++++++++++++++-- + drivers/gpu/drm/radeon/evergreen.c | 598 ++++++++++----- + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 27 +- + drivers/gpu/drm/radeon/evergreen_reg.h | 6 + + drivers/gpu/drm/radeon/evergreend.h | 8 +- + drivers/gpu/drm/radeon/r100.c | 74 ++- + drivers/gpu/drm/radeon/r500_reg.h | 4 + + drivers/gpu/drm/radeon/r600.c | 135 ++-- + drivers/gpu/drm/radeon/r600d.h | 9 + + drivers/gpu/drm/radeon/radeon.h | 66 ++- + drivers/gpu/drm/radeon/radeon_asic.c | 92 +++- + drivers/gpu/drm/radeon/radeon_asic.h | 10 + + drivers/gpu/drm/radeon/radeon_atombios.c | 1078 +++++++++++++++------------ + drivers/gpu/drm/radeon/radeon_cs.c | 17 +- + drivers/gpu/drm/radeon/radeon_device.c | 7 +- + drivers/gpu/drm/radeon/radeon_display.c | 304 +++++++- + drivers/gpu/drm/radeon/radeon_drv.c | 11 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 79 ++- + drivers/gpu/drm/radeon/radeon_family.h | 1 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 41 +- + drivers/gpu/drm/radeon/radeon_kms.c | 21 + + drivers/gpu/drm/radeon/radeon_mode.h | 13 +- + drivers/gpu/drm/radeon/radeon_object.c | 55 +-- + drivers/gpu/drm/radeon/radeon_object.h | 7 +- + drivers/gpu/drm/radeon/radeon_pm.c | 10 +- + drivers/gpu/drm/radeon/radeon_reg.h | 1 + + drivers/gpu/drm/radeon/rs600.c | 116 +++- + drivers/gpu/drm/radeon/rv770.c | 131 ++++- + drivers/gpu/drm/radeon/rv770d.h | 10 + + drivers/gpu/drm/ttm/ttm_bo.c | 156 +++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 136 +++- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 29 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 169 ++++- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 +- + include/drm/drmP.h | 93 +++ + include/drm/drm_crtc.h | 9 + + include/drm/drm_pciids.h | 4 + + include/drm/ttm/ttm_bo_api.h | 50 ++- + include/drm/ttm/ttm_bo_driver.h | 152 +++-- + include/drm/ttm/ttm_execbuf_util.h | 11 +- + include/linux/kref.h | 2 + + lib/kref.c | 30 + + 48 files changed, 4290 insertions(+), 1129 deletions(-) +Merging fbdev/master +$ git merge fbdev/master +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging drivers/video/sh_mobile_lcdcfb.c +Auto-merging include/linux/fb.h +Merge made by recursive. + arch/arm/mach-shmobile/board-ap4evb.c | 31 ++- + drivers/video/Kconfig | 92 ++++ + drivers/video/Makefile | 5 + + drivers/video/bf537-lq035.c | 914 +++++++++++++++++++++++++++++++++ + drivers/video/bfin_adv7393fb.c | 832 ++++++++++++++++++++++++++++++ + drivers/video/bfin_adv7393fb.h | 321 ++++++++++++ + drivers/video/fbmon.c | 88 ++++ + drivers/video/modedb.c | 47 ++ + drivers/video/sh_mipi_dsi.c | 103 +++- + drivers/video/sh_mobile_hdmi.c | 219 ++++++--- + drivers/video/sh_mobile_lcdcfb.c | 26 +- + drivers/video/via/via-core.c | 96 ++++- + drivers/video/via/via-gpio.c | 29 + + drivers/video/via/viafbdev.c | 34 +- + drivers/video/via/viafbdev.h | 2 - + drivers/video/vt8500lcdfb.c | 447 ++++++++++++++++ + drivers/video/vt8500lcdfb.h | 34 ++ + drivers/video/wm8505fb.c | 422 +++++++++++++++ + drivers/video/wm8505fb_regs.h | 76 +++ + drivers/video/wmt_ge_rops.c | 192 +++++++ + drivers/video/wmt_ge_rops.h | 5 + + include/linux/fb.h | 3 + + include/linux/via-core.h | 15 + + include/video/sh_mobile_hdmi.h | 3 + + 24 files changed, 3900 insertions(+), 136 deletions(-) + create mode 100644 drivers/video/bf537-lq035.c + create mode 100644 drivers/video/bfin_adv7393fb.c + create mode 100644 drivers/video/bfin_adv7393fb.h + create mode 100644 drivers/video/vt8500lcdfb.c + create mode 100644 drivers/video/vt8500lcdfb.h + create mode 100644 drivers/video/wm8505fb.c + create mode 100644 drivers/video/wm8505fb_regs.h + create mode 100644 drivers/video/wmt_ge_rops.c + create mode 100644 drivers/video/wmt_ge_rops.h +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/regulator/core.c' using previous resolution. +Auto-merging drivers/regulator/core.c +CONFLICT (content): Merge conflict in drivers/regulator/core.c +Auto-merging drivers/regulator/mc13783-regulator.c +Auto-merging drivers/regulator/twl-regulator.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master da518bc] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/regulator/88pm8607.c | 3 +- + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 5 +- + drivers/regulator/core.c | 255 +++++++++++++++++--------------- + drivers/regulator/da903x.c | 17 ++- + drivers/regulator/isl6271a-regulator.c | 6 +- + drivers/regulator/lp3971.c | 10 +- + drivers/regulator/lp3972.c | 10 +- + drivers/regulator/max1586.c | 30 ++-- + drivers/regulator/max8649.c | 3 +- + drivers/regulator/max8660.c | 14 ++- + drivers/regulator/max8925-regulator.c | 3 +- + drivers/regulator/max8952.c | 3 +- + drivers/regulator/max8998.c | 8 +- + drivers/regulator/mc13783-regulator.c | 46 ++++--- + drivers/regulator/pcap-regulator.c | 7 +- + drivers/regulator/pcf50633-regulator.c | 5 +- + drivers/regulator/tps65023-regulator.c | 9 +- + drivers/regulator/tps6507x-regulator.c | 10 +- + drivers/regulator/tps6586x-regulator.c | 48 ++++-- + drivers/regulator/twl-regulator.c | 11 +- + drivers/regulator/wm831x-dcdc.c | 17 ++- + drivers/regulator/wm831x-ldo.c | 41 ++++-- + drivers/regulator/wm8350-regulator.c | 8 +- + drivers/regulator/wm8400-regulator.c | 8 +- + drivers/regulator/wm8994-regulator.c | 6 +- + include/linux/regulator/driver.h | 5 +- + include/trace/events/regulator.h | 141 ++++++++++++++++++ + 28 files changed, 506 insertions(+), 228 deletions(-) + create mode 100644 include/trace/events/regulator.h +Merging security-testing/next +$ git merge security-testing/next +Auto-merging kernel/printk.c +Merge made by recursive. + Documentation/keys-trusted-encrypted.txt | 145 ++++ + Documentation/sysctl/kernel.txt | 2 +- + drivers/char/tpm/tpm.c | 20 +- + drivers/char/tpm/tpm.h | 5 + + include/keys/encrypted-type.h | 29 + + include/keys/trusted-type.h | 31 + + include/linux/capability.h | 7 +- + include/linux/kernel.h | 3 + + include/linux/security.h | 3 +- + include/linux/tpm.h | 4 + + include/linux/tpm_command.h | 28 + + include/linux/xattr.h | 4 + + kernel/printk.c | 14 +- + lib/hexdump.c | 16 + + security/Kconfig | 31 + + security/keys/Makefile | 2 + + security/keys/encrypted_defined.c | 908 +++++++++++++++++++++++ + security/keys/encrypted_defined.h | 56 ++ + security/keys/trusted_defined.c | 1152 ++++++++++++++++++++++++++++++ + security/keys/trusted_defined.h | 134 ++++ + security/selinux/include/classmap.h | 2 +- + security/smack/smack.h | 45 ++ + security/smack/smack_access.c | 58 ++- + security/smack/smack_lsm.c | 354 +++++++--- + security/smack/smackfs.c | 41 +- + 25 files changed, 2952 insertions(+), 142 deletions(-) + create mode 100644 Documentation/keys-trusted-encrypted.txt + create mode 100644 include/keys/encrypted-type.h + create mode 100644 include/keys/trusted-type.h + create mode 100644 include/linux/tpm_command.h + create mode 100644 security/keys/encrypted_defined.c + create mode 100644 security/keys/encrypted_defined.h + create mode 100644 security/keys/trusted_defined.c + create mode 100644 security/keys/trusted_defined.h +Merging selinux/master +$ git merge selinux/master +Auto-merging security/selinux/hooks.c +Merge made by recursive. + include/linux/flex_array.h | 2 +- + security/selinux/hooks.c | 5 +- + security/selinux/selinuxfs.c | 649 ++++++++++++++++------------------ + security/selinux/ss/conditional.c | 6 +- + security/selinux/ss/mls.c | 25 +- + security/selinux/ss/policydb.c | 701 +++++++++++++++++++------------------ + security/selinux/ss/policydb.h | 19 +- + security/selinux/ss/services.c | 425 +++++++++++------------ + security/selinux/ss/sidtab.c | 39 ++- + security/selinux/ss/sidtab.h | 2 + + 10 files changed, 942 insertions(+), 931 deletions(-) +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/Kconfig | 9 +++-- + drivers/watchdog/f71808e_wdt.c | 66 ++++++++++++++++++++++++++++++-------- + drivers/watchdog/w83627hf_wdt.c | 8 +++-- + 3 files changed, 62 insertions(+), 21 deletions(-) +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 +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/scsi/bfa/bfa_fcpim.c' using previous resolution. +Renaming sound/soc/s3c24xx/smdk_spdif.c => sound/soc/samsung/smdk_spdif.c +Auto-merging sound/soc/samsung/smdk_spdif.c +Auto-merging Documentation/kvm/api.txt +Auto-merging Documentation/lguest/lguest.txt +Auto-merging Documentation/networking/dccp.txt +Auto-merging Documentation/powerpc/booting-without-of.txt +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/mach-imx/pm-imx27.c +Auto-merging arch/arm/mach-msm/io.c +Auto-merging arch/arm/mach-omap1/pm.c +Auto-merging arch/arm/mach-omap2/pm24xx.c +Auto-merging arch/arm/mach-omap2/pm34xx.c +Auto-merging arch/arm/mach-omap2/serial.c +Auto-merging arch/arm/plat-samsung/pm.c +Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h +Auto-merging drivers/base/power/main.c +Auto-merging drivers/dma/intel_mid_dma.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_backlight.c +Auto-merging drivers/gpu/drm/radeon/atombios.h +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/isdn/hisax/isar.c +Auto-merging drivers/media/video/cx25840/cx25840-ir.c +Auto-merging drivers/media/video/saa7164/saa7164-core.c +Auto-merging drivers/media/video/via-camera.c +Auto-merging drivers/media/video/zoran/zoran.h +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/bnx2x/bnx2x_reg.h +Auto-merging drivers/net/bonding/bond_3ad.c +Auto-merging drivers/net/e1000/e1000_main.c +Auto-merging drivers/net/e1000e/82571.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/ixgbe/ixgbe_82599.c +Auto-merging drivers/net/vxge/vxge-traffic.h +Auto-merging drivers/net/wireless/ath/ath5k/reg.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/s390/net/lcs.c +Auto-merging drivers/scsi/a100u2w.c +Auto-merging drivers/scsi/bfa/bfa_fcpim.c +CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c +Auto-merging drivers/scsi/bfa/bfa_fcs_lport.c +Auto-merging drivers/scsi/dc395x.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging drivers/scsi/megaraid.h +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/sym53c8xx_2/sym_glue.c +Auto-merging drivers/spi/atmel_spi.c +Auto-merging drivers/staging/olpc_dcon/olpc_dcon.c +Auto-merging drivers/staging/samsung-laptop/samsung-laptop.c +Auto-merging drivers/staging/stradis/stradis.c +Auto-merging drivers/usb/misc/iowarrior.c +Auto-merging drivers/usb/musb/musb_gadget.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/mfd/core.h +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/power/suspend.c +Auto-merging kernel/power/swap.c +Auto-merging kernel/sched.c +Auto-merging lib/nlattr.c +Auto-merging mm/page_alloc.c +Auto-merging net/Kconfig +Auto-merging net/core/dev.c +Auto-merging net/decnet/dn_dev.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/soc/codecs/max98088.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fccd33e] Merge remote branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/cgroups/cgroup_event_listener.c | 2 +- + Documentation/cgroups/memcg_test.txt | 2 +- + Documentation/kdump/kdump.txt | 15 +++++++++------ + Documentation/ko_KR/HOWTO | 4 ++-- + Documentation/kprobes.txt | 2 +- + Documentation/kvm/api.txt | 2 +- + Documentation/lguest/lguest.txt | 7 +++++-- + Documentation/networking/bridge.txt | 4 ++-- + Documentation/networking/caif/spi_porting.txt | 2 +- + Documentation/networking/dccp.txt | 4 ++-- + Documentation/networking/generic_netlink.txt | 2 +- + Documentation/powerpc/booting-without-of.txt | 2 +- + Documentation/scheduler/00-INDEX | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/timers/timer_stats.txt | 2 +- + Documentation/zh_CN/HOWTO | 4 ++-- + Documentation/zh_CN/SubmittingDrivers | 2 +- + MAINTAINERS | 10 +++++----- + arch/arm/common/it8152.c | 2 +- + arch/arm/common/vic.c | 2 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +++--- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- + arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- + .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- + .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-gemini/include/mach/hardware.h | 2 +- + arch/arm/mach-imx/pm-imx27.c | 2 +- + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap2/cpuidle34xx.c | 2 +- + arch/arm/mach-omap2/pm24xx.c | 2 +- + arch/arm/mach-omap2/pm34xx.c | 2 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-pnx4008/pm.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-spear3xx/spear300.c | 4 ++-- + arch/arm/mach-spear3xx/spear310.c | 2 +- + arch/arm/mach-spear3xx/spear320.c | 2 +- + arch/arm/mach-spear3xx/spear3xx.c | 6 +++--- + arch/arm/mach-spear6xx/spear6xx.c | 4 ++-- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-u300/include/mach/coh901318.h | 4 ++-- + arch/arm/mm/flush.c | 1 - + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- + arch/arm/plat-samsung/pm.c | 2 +- + arch/avr32/mach-at32ap/pm.c | 2 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- + arch/blackfin/mach-common/pm.c | 2 +- + arch/cris/arch-v32/lib/nand_init.S | 2 +- + arch/cris/include/asm/etraxgpio.h | 2 +- + arch/h8300/Kconfig.debug | 2 +- + arch/ia64/kvm/mmio.c | 2 +- + arch/mips/alchemy/common/power.c | 2 +- + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 4 ++-- + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/jz4740/pm.c | 2 +- + arch/mips/loongson/common/pm.c | 2 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/powertv/memory.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/powerpc/include/asm/8xx_immap.h | 4 ++-- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- + arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- + arch/powerpc/platforms/83xx/suspend.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 4 ++-- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/powerpc/sysdev/fsl_pmc.c | 2 +- + arch/sh/boards/mach-hp6xx/pm.c | 2 +- + arch/sh/kernel/cpu/shmobile/pm.c | 2 +- + arch/sh/mm/cache-sh5.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/kernel/amd_iommu.c | 4 ++-- + arch/x86/kernel/early_printk_mrst.c | 2 +- + arch/x86/kernel/head_32.S | 2 +- + block/cfq-iosched.c | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/sleep.c | 8 ++++---- + drivers/acpi/video.c | 2 +- + drivers/ata/libata-core.c | 4 ++-- + drivers/ata/sata_vsc.c | 2 +- + drivers/atm/idt77252.h | 2 +- + drivers/atm/iphase.c | 4 ++-- + drivers/base/bus.c | 2 +- + drivers/base/power/main.c | 2 +- + drivers/dma/intel_mid_dma.c | 6 +++--- + drivers/edac/amd8131_edac.h | 2 +- + drivers/edac/cell_edac.c | 4 ++-- + drivers/edac/edac_core.h | 2 +- + drivers/edac/ppc4xx_edac.c | 6 +++--- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++-- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 4 ++-- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/isdn/gigaset/bas-gigaset.c | 4 ++-- + drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- + drivers/isdn/gigaset/usb-gigaset.c | 4 ++-- + drivers/isdn/hardware/mISDN/ipac.h | 4 ++-- + drivers/isdn/hardware/mISDN/isar.h | 2 +- + drivers/macintosh/via-pmu-backlight.c | 4 ++-- + drivers/macintosh/via-pmu.c | 2 +- + drivers/media/video/cx25840/cx25840-ir.c | 2 +- + drivers/media/video/davinci/vpif.h | 2 +- + drivers/media/video/davinci/vpss.c | 2 +- + drivers/media/video/omap/omap_vout.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 4 ++-- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/via-camera.c | 2 -- + drivers/media/video/zoran/zoran.h | 2 +- + drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/arm-charlcd.c | 2 +- + drivers/mmc/card/block.c | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/au1xmmc.c | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 ++-- + drivers/mtd/nand/nand_base.c | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 6 +++--- + drivers/net/chelsio/subr.c | 2 +- + drivers/net/cxgb3/mc5.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 2 +- + drivers/net/e1000/e1000_main.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/ich8lan.c | 2 +- + drivers/net/e1000e/phy.c | 2 +- + drivers/net/eepro.c | 2 +- + drivers/net/irda/donauboe.h | 2 +- + drivers/net/ixgbe/ixgbe_82599.c | 4 ++-- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/tehuti.c | 6 +++--- + drivers/net/tun.c | 2 +- + drivers/net/vxge/vxge-traffic.h | 2 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wimax/i2400m/driver.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wireless/ath/ath5k/reg.h | 6 +++--- + drivers/net/wireless/b43/phy_g.c | 2 +- + drivers/net/wireless/b43legacy/phy.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- + drivers/net/wireless/prism54/islpci_dev.c | 6 +++--- + drivers/net/wireless/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/pcmcia/m32r_cfc.h | 2 +- + drivers/pcmcia/m32r_pcc.h | 2 +- + drivers/pcmcia/m8xx_pcmcia.c | 2 +- + drivers/platform/x86/acer-wmi.c | 2 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/asus_acpi.c | 2 +- + drivers/platform/x86/dell-laptop.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 4 ++-- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/power/s3c_adc_battery.c | 4 ++-- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/scsi/zfcp_cfdc.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++-- + drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++--- + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/dc395x.c | 8 ++++---- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/scsi/scsi_sysfs.c | 6 ++++-- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/spi/atmel_spi.c | 4 ++-- + drivers/spi/spidev.c | 2 +- + drivers/staging/msm/msm_fb_bl.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- + drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- + drivers/staging/stradis/stradis.c | 2 +- + drivers/telephony/ixj.c | 3 ++- + drivers/usb/gadget/imx_udc.c | 2 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/ldusb.c | 2 +- + drivers/usb/musb/musb_gadget.c | 4 ++-- + drivers/usb/wusbcore/wa-rpipe.c | 2 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/atyfb_base.c | 2 +- + drivers/video/aty/radeon_backlight.c | 2 +- + drivers/video/backlight/88pm860x_bl.c | 2 +- + drivers/video/backlight/max8925_bl.c | 2 +- + drivers/video/nvidia/nv_backlight.c | 2 +- + drivers/video/omap2/displays/panel-taal.c | 2 +- + drivers/video/riva/fbdev.c | 2 +- + drivers/video/sstfb.c | 2 +- + fs/coda/inode.c | 2 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 4 ++-- + fs/ext4/inode.c | 6 +++--- + fs/notify/fanotify/Kconfig | 2 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/suballoc.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/actbl1.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/firewire-cdev.h | 2 +- + include/linux/mfd/core.h | 2 +- + include/linux/suspend.h | 8 ++++---- + include/linux/u64_stats_sync.h | 12 ++++++------ + include/net/sctp/user.h | 4 ++-- + include/scsi/fc/fc_fcp.h | 4 ++-- + kernel/audit.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/kexec.c | 2 +- + kernel/perf_event.c | 2 +- + kernel/power/hibernate.c | 4 ++-- + kernel/power/suspend.c | 4 ++-- + kernel/power/swap.c | 2 +- + kernel/sched.c | 2 +- + kernel/sysctl_binary.c | 2 +- + kernel/time.c | 4 ++-- + kernel/time/clocksource.c | 2 +- + kernel/trace/trace_entries.h | 2 +- + lib/nlattr.c | 2 +- + lib/swiotlb.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/sparse-vmemmap.c | 2 +- + net/Kconfig | 4 +++- + net/core/dev.c | 2 +- + net/dccp/Kconfig | 4 +++- + net/decnet/dn_dev.c | 2 +- + net/ipv4/Kconfig | 4 +++- + net/ipv4/tcp_output.c | 2 +- + net/sched/Kconfig | 2 +- + scripts/kconfig/confdata.c | 2 +- + scripts/mod/modpost.c | 2 +- + security/apparmor/include/match.h | 2 +- + sound/core/init.c | 2 +- + sound/core/pcm_native.c | 2 +- + sound/isa/opl3sa2.c | 2 +- + sound/pci/ca0106/ca0106.h | 2 +- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/emu10k1/p16v.h | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/rme9652/hdspm.c | 6 +++--- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/samsung/smdk_spdif.c | 6 +++--- + 287 files changed, 385 insertions(+), 374 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/base/power/main.c +Auto-merging include/linux/suspend.h +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/power/suspend.c +Merge made by recursive. + Documentation/power/drivers-testing.txt | 8 ++-- + Documentation/power/runtime_pm.txt | 31 ++++++++++++++++++++ + drivers/base/power/generic_ops.c | 4 +- + drivers/base/power/main.c | 16 ++++++++-- + drivers/base/power/runtime.c | 47 +++++++++++++++++++++++++------ + drivers/base/power/wakeup.c | 20 ++++++------ + include/linux/pm.h | 1 + + include/linux/pm_runtime.h | 7 ++++ + include/linux/suspend.h | 4 +- + kernel/freezer.c | 9 ++++- + kernel/power/Makefile | 5 +-- + kernel/power/hibernate.c | 7 ++-- + kernel/power/process.c | 8 ++++- + kernel/power/suspend.c | 2 +- + kernel/power/user.c | 2 +- + 15 files changed, 128 insertions(+), 43 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/namei.c | 3 + + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 ++-- + fs/notify/fanotify/fanotify.c | 30 ++++--- + fs/notify/fanotify/fanotify_user.c | 168 ++++++++++++++++++++++++------------ + fs/notify/group.c | 1 + + fs/notify/inotify/inotify_user.c | 1 + + fs/notify/mark.c | 36 +++----- + include/linux/fanotify.h | 15 +++- + include/linux/fsnotify.h | 3 - + include/linux/fsnotify_backend.h | 16 +++- + 13 files changed, 182 insertions(+), 111 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bb62e0e] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4389 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +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/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/kernel/perf_event.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Removing arch/x86/kernel/apic/nmi.c +Auto-merging arch/x86/kernel/head_32.S +Auto-merging kernel/perf_event.c +Auto-merging kernel/printk.c +Auto-merging kernel/sched.c +Auto-merging kernel/sysctl_binary.c +Auto-merging lib/Makefile +Auto-merging scripts/tags.sh +Merge made by recursive. + CREDITS | 2 - + Documentation/kernel-parameters.txt | 12 +- + Documentation/x86/boot.txt | 1 + + MAINTAINERS | 2 +- + arch/Kconfig | 3 + + arch/alpha/include/asm/perf_event.h | 6 - + arch/alpha/kernel/irq_alpha.c | 2 - + arch/alpha/kernel/perf_event.c | 9 +- + arch/arm/kernel/perf_event.c | 2 +- + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/powerpc/kernel/e500-pmu.c | 2 +- + arch/powerpc/kernel/mpc7450-pmu.c | 2 +- + arch/powerpc/kernel/power4-pmu.c | 2 +- + arch/powerpc/kernel/power5+-pmu.c | 2 +- + arch/powerpc/kernel/power5-pmu.c | 2 +- + arch/powerpc/kernel/power6-pmu.c | 2 +- + arch/powerpc/kernel/power7-pmu.c | 2 +- + arch/powerpc/kernel/ppc970-pmu.c | 2 +- + arch/s390/Kconfig | 1 + + arch/s390/include/asm/mutex.h | 2 + + arch/sh/kernel/cpu/sh4/perf_event.c | 2 +- + arch/sh/kernel/cpu/sh4a/perf_event.c | 2 +- + arch/sparc/include/asm/perf_event.h | 4 - + arch/sparc/kernel/nmi.c | 2 - + arch/sparc/kernel/perf_event.c | 7 +- + arch/x86/Kconfig | 41 +- + arch/x86/Kconfig.debug | 11 + + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/include/asm/alternative.h | 7 + + arch/x86/include/asm/amd_nb.h | 49 +- + arch/x86/include/asm/apic.h | 3 +- + arch/x86/include/asm/bootparam.h | 1 + + arch/x86/include/asm/fixmap.h | 4 + + arch/x86/include/asm/i387.h | 24 + + arch/x86/include/asm/io_apic.h | 9 +- + arch/x86/include/asm/kdebug.h | 2 +- + arch/x86/include/asm/microcode.h | 6 + + arch/x86/include/asm/mrst-vrtc.h | 9 + + arch/x86/include/asm/mrst.h | 14 +- + arch/x86/include/asm/nmi.h | 51 -- + arch/x86/include/asm/pci.h | 1 + + arch/x86/include/asm/perf_event.h | 2 - + arch/x86/include/asm/perf_event_p4.h | 63 ++- + arch/x86/include/asm/setup.h | 6 + + arch/x86/include/asm/smpboot_hooks.h | 1 - + arch/x86/include/asm/stacktrace.h | 33 +- + arch/x86/include/asm/timer.h | 6 - + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/acpi/boot.c | 48 +-- + arch/x86/kernel/alternative.c | 49 ++- + arch/x86/kernel/amd_nb.c | 135 +++-- + arch/x86/kernel/apb_timer.c | 1 + + arch/x86/kernel/aperture_64.c | 10 +- + arch/x86/kernel/apic/Makefile | 5 +- + arch/x86/kernel/apic/apic.c | 160 +++--- + arch/x86/kernel/apic/hw_nmi.c | 27 +- + arch/x86/kernel/apic/io_apic.c | 108 ++-- + arch/x86/kernel/apic/nmi.c | 567 --------------- + arch/x86/kernel/cpu/common.c | 1 - + arch/x86/kernel/cpu/intel_cacheinfo.c | 147 ++--- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 ++-- + arch/x86/kernel/cpu/perf_event.c | 24 +- + arch/x86/kernel/cpu/perf_event_amd.c | 16 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 642 ----------------- + arch/x86/kernel/dumpstack.c | 12 +- + arch/x86/kernel/dumpstack_32.c | 25 +- + arch/x86/kernel/dumpstack_64.c | 24 +- + arch/x86/kernel/early_printk.c | 3 +- + arch/x86/kernel/ftrace.c | 3 + + arch/x86/kernel/head32.c | 3 + + arch/x86/kernel/head_32.S | 6 + + arch/x86/kernel/kprobes.c | 113 +++- + arch/x86/kernel/microcode_amd.c | 34 +- + arch/x86/kernel/mpparse.c | 114 +--- + arch/x86/kernel/pci-gart_64.c | 34 +- + arch/x86/kernel/process.c | 3 +- + arch/x86/kernel/reboot_fixups_32.c | 16 + + arch/x86/kernel/setup.c | 13 +- + arch/x86/kernel/smpboot.c | 22 +- + arch/x86/kernel/stacktrace.c | 8 +- + arch/x86/kernel/time.c | 18 - + arch/x86/kernel/trampoline_64.S | 2 +- + arch/x86/kernel/traps.c | 27 +- + arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} | 49 ++- + arch/x86/kernel/vmlinux.lds.S | 8 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/{k8topology_64.c => amdtopology_64.c} | 13 +- + arch/x86/mm/init.c | 3 +- + arch/x86/mm/init_32.c | 20 +- + arch/x86/mm/kmemcheck/error.c | 2 +- + arch/x86/mm/numa_64.c | 22 +- + arch/x86/mm/pageattr.c | 33 +- + arch/x86/mm/setup_nx.c | 2 +- + arch/x86/oprofile/backtrace.c | 2 +- + arch/x86/oprofile/nmi_timer_int.c | 3 - + arch/x86/oprofile/op_model_amd.c | 1 + + arch/x86/pci/Makefile | 1 + + arch/x86/pci/ce4100.c | 315 +++++++++ + arch/x86/pci/pcbios.c | 23 + + arch/x86/platform/Makefile | 2 + + arch/x86/platform/ce4100/Makefile | 1 + + arch/x86/platform/ce4100/ce4100.c | 132 ++++ + arch/x86/platform/iris/Makefile | 1 + + arch/x86/platform/iris/iris.c | 91 +++ + arch/x86/platform/mrst/Makefile | 2 + + .../{kernel => platform/mrst}/early_printk_mrst.c | 0 + arch/x86/platform/mrst/mrst.c | 576 ++++++++++++++- + arch/x86/platform/mrst/vrtc.c | 165 +++++ + arch/x86/platform/sfi/sfi.c | 13 +- + drivers/acpi/acpica/nsinit.c | 2 - + drivers/char/agp/amd64-agp.c | 33 +- + drivers/edac/amd64_edac.c | 4 +- + drivers/platform/x86/intel_scu_ipc.c | 5 + + drivers/rtc/Kconfig | 12 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-mrst.c | 582 +++++++++++++++ + drivers/watchdog/hpwdt.c | 7 +- + fs/proc/base.c | 79 +++ + include/linux/ftrace_event.h | 10 + + include/linux/hrtimer.h | 1 - + include/linux/init_task.h | 9 +- + include/linux/interrupt.h | 6 +- + include/linux/kprobes.h | 4 +- + include/linux/module.h | 11 +- + include/linux/mutex.h | 4 + + include/linux/nmi.h | 4 - + include/linux/perf_event.h | 21 +- + include/linux/sched.h | 42 +- + include/linux/sfi.h | 8 +- + include/linux/stacktrace.h | 4 +- + include/linux/syscalls.h | 10 +- + include/linux/timer.h | 32 +- + include/linux/timerlist.h | 37 + + include/linux/tracepoint.h | 4 + + include/linux/workqueue.h | 8 + + include/trace/events/syscalls.h | 4 + + include/trace/ftrace.h | 7 + + init/Kconfig | 13 + + init/main.c | 1 + + kernel/cpu.c | 18 +- + kernel/fork.c | 6 +- + kernel/futex.c | 235 +++---- + kernel/irq/manage.c | 4 +- + kernel/kprobes.c | 565 ++++++++++----- + kernel/kthread.c | 2 +- + kernel/lockdep_proc.c | 16 +- + kernel/module.c | 171 +++++- + kernel/mutex.c | 2 +- + kernel/perf_event.c | 467 +++++++++---- + kernel/posix-timers.c | 10 +- + kernel/printk.c | 8 +- + kernel/sched.c | 737 ++++++++------------ + kernel/sched_autogroup.c | 229 ++++++ + kernel/sched_autogroup.h | 32 + + kernel/sched_clock.c | 2 +- + kernel/sched_debug.c | 91 +-- + kernel/sched_fair.c | 305 +++++++-- + kernel/sched_features.h | 2 - + kernel/sched_rt.c | 24 + + kernel/softirq.c | 4 +- + kernel/sys.c | 4 +- + kernel/sysctl.c | 53 +- + kernel/sysctl_binary.c | 1 - + kernel/time/timecompare.c | 5 +- + kernel/time/timekeeping.c | 9 +- + kernel/timer.c | 54 +- + kernel/trace/trace_event_perf.c | 31 +- + kernel/trace/trace_selftest.c | 2 +- + kernel/watchdog.c | 11 +- + lib/Makefile | 2 +- + lib/timerlist.c | 118 ++++ + scripts/tags.sh | 4 +- + tools/perf/Documentation/perf-annotate.txt | 37 +- + tools/perf/Documentation/perf-buildid-list.txt | 3 + + tools/perf/Documentation/perf-diff.txt | 19 +- + tools/perf/Documentation/perf-kvm.txt | 8 +- + tools/perf/Documentation/perf-lock.txt | 15 + + tools/perf/Documentation/perf-probe.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 22 +- + tools/perf/Documentation/perf-report.txt | 49 ++- + tools/perf/Documentation/perf-sched.txt | 18 +- + .../{perf-trace-perl.txt => perf-script-perl.txt} | 28 +- + ...erf-trace-python.txt => perf-script-python.txt} | 88 ++-- + .../{perf-trace.txt => perf-script.txt} | 61 +- + tools/perf/Documentation/perf-stat.txt | 44 +- + tools/perf/Documentation/perf-test.txt | 2 +- + tools/perf/Documentation/perf-top.txt | 28 +- + tools/perf/MANIFEST | 1 + + tools/perf/Makefile | 19 +- + tools/perf/bench/mem-memcpy-arch.h | 12 + + tools/perf/bench/mem-memcpy-x86-64-asm-def.h | 4 + + tools/perf/bench/mem-memcpy-x86-64-asm.S | 2 + + tools/perf/bench/mem-memcpy.c | 219 +++++-- + tools/perf/builtin-annotate.c | 6 +- + tools/perf/builtin-diff.c | 13 +- + tools/perf/builtin-inject.c | 39 +- + tools/perf/builtin-kmem.c | 24 +- + tools/perf/builtin-lock.c | 21 +- + tools/perf/builtin-record.c | 39 +- + tools/perf/builtin-report.c | 15 +- + tools/perf/builtin-sched.c | 30 +- + tools/perf/{builtin-trace.c => builtin-script.c} | 117 ++-- + tools/perf/builtin-stat.c | 325 +++++++-- + tools/perf/builtin-timechart.c | 43 +- + tools/perf/builtin-top.c | 18 +- + tools/perf/builtin.h | 2 +- + tools/perf/command-list.txt | 2 +- + tools/perf/feature-tests.mak | 4 +- + tools/perf/perf.c | 2 +- + .../perf/scripts/python/Perf-Trace-Util/Context.c | 2 +- + tools/perf/util/build-id.c | 7 +- + tools/perf/util/debug.c | 42 +- + tools/perf/util/debug.h | 2 + + tools/perf/util/event.c | 343 ++++++---- + tools/perf/util/event.h | 27 +- + tools/perf/util/header.c | 43 +- + tools/perf/util/header.h | 2 + + tools/perf/util/hist.h | 2 + + tools/perf/util/include/asm/cpufeature.h | 9 + + tools/perf/util/include/asm/dwarf2.h | 11 + + tools/perf/util/include/linux/bitops.h | 5 + + tools/perf/util/include/linux/linkage.h | 13 + + tools/perf/util/parse-events.c | 12 +- + tools/perf/util/parse-options.h | 4 + + tools/perf/util/probe-finder.h | 6 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/session.c | 511 +++++++++----- + tools/perf/util/session.h | 20 +- + tools/perf/util/sort.c | 6 +- + tools/perf/util/symbol.c | 2 +- + tools/perf/util/ui/util.c | 16 +- + 232 files changed, 7027 insertions(+), 4098 deletions(-) + create mode 100644 arch/x86/include/asm/mrst-vrtc.h + delete mode 100644 arch/x86/kernel/apic/nmi.c + rename arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} (65%) + rename arch/x86/mm/{k8topology_64.c => amdtopology_64.c} (94%) + create mode 100644 arch/x86/pci/ce4100.c + create mode 100644 arch/x86/platform/ce4100/Makefile + create mode 100644 arch/x86/platform/ce4100/ce4100.c + create mode 100644 arch/x86/platform/iris/Makefile + create mode 100644 arch/x86/platform/iris/iris.c + rename arch/x86/{kernel => platform/mrst}/early_printk_mrst.c (100%) + create mode 100644 arch/x86/platform/mrst/vrtc.c + create mode 100644 drivers/rtc/rtc-mrst.c + create mode 100644 include/linux/timerlist.h + create mode 100644 kernel/sched_autogroup.c + create mode 100644 kernel/sched_autogroup.h + create mode 100644 lib/timerlist.c + rename tools/perf/Documentation/{perf-trace-perl.txt => perf-script-perl.txt} (90%) + rename tools/perf/Documentation/{perf-trace-python.txt => perf-script-python.txt} (89%) + rename tools/perf/Documentation/{perf-trace.txt => perf-script.txt} (62%) + create mode 100644 tools/perf/bench/mem-memcpy-arch.h + create mode 100644 tools/perf/bench/mem-memcpy-x86-64-asm-def.h + create mode 100644 tools/perf/bench/mem-memcpy-x86-64-asm.S + rename tools/perf/{builtin-trace.c => builtin-script.c} (84%) + create mode 100644 tools/perf/util/include/asm/cpufeature.h + create mode 100644 tools/perf/util/include/asm/dwarf2.h + create mode 100644 tools/perf/util/include/linux/linkage.h +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging include/linux/init_task.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/sched.c +Merge made by recursive. + Documentation/RCU/trace.txt | 144 +++++++++++++-- + include/linux/init_task.h | 9 +- + include/linux/rcupdate.h | 2 - + include/linux/rcutiny.h | 13 +- + include/linux/rcutree.h | 2 + + include/linux/sched.h | 11 +- + init/Kconfig | 40 ++++- + kernel/rcutiny.c | 105 +++++++---- + kernel/rcutiny_plugin.h | 431 +++++++++++++++++++++++++++++++++++++++++-- + kernel/rcutorture.c | 270 ++++++++++++++++++++++++++- + kernel/rcutree.c | 85 +++------ + kernel/rcutree.h | 16 +-- + kernel/rcutree_plugin.h | 93 +++++++++- + kernel/rcutree_trace.c | 12 +- + kernel/sched.c | 69 ------- + kernel/srcu.c | 8 +- + 16 files changed, 1071 insertions(+), 239 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/xen/events.c +Merge made by recursive. + drivers/xen/Kconfig | 7 + + drivers/xen/Makefile | 2 + + drivers/xen/gntdev.c | 647 +++++++++++++++++++++++++++++++++++++++++++++ + include/xen/gntdev.h | 119 +++++++++ + include/xen/grant_table.h | 39 +++- + 5 files changed, 813 insertions(+), 1 deletions(-) + create mode 100644 drivers/xen/gntdev.c + create mode 100644 include/xen/gntdev.h +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Merge made by recursive. + drivers/xen/events.c | 27 +++++++++++++++++++++------ + 1 files changed, 21 insertions(+), 6 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_core.h +Merge made by recursive. + drivers/edac/Kconfig | 8 +- + drivers/edac/amd64_edac.c | 829 +++++++++++++++++------------------------ + drivers/edac/amd64_edac.h | 86 ++--- + drivers/edac/amd64_edac_inj.c | 25 +- + drivers/edac/cpc925_edac.c | 9 +- + drivers/edac/e752x_edac.c | 8 +- + drivers/edac/edac_core.h | 11 +- + drivers/edac/edac_mc.c | 14 +- + drivers/edac/edac_mc_sysfs.c | 57 ++-- + drivers/edac/i5100_edac.c | 9 +- + drivers/edac/mce_amd.c | 450 +++++++++++++++++------ + drivers/edac/mce_amd.h | 14 +- + drivers/edac/mce_amd_inj.c | 9 +- + 13 files changed, 805 insertions(+), 724 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/kernel/apic/apic.c +Auto-merging arch/x86/kernel/apic/io_apic.c +CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree. +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging arch/x86/kernel/kprobes.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/xen/time.c +Auto-merging drivers/xen/events.c +Auto-merging include/linux/kprobes.h +Auto-merging kernel/fork.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/printk.c +Auto-merging kernel/rcutree.c +Auto-merging kernel/softirq.c +Auto-merging kernel/watchdog.c +Auto-merging mm/percpu.c +Auto-merging mm/slab.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/x86/kernel/apic/nmi.c +arch/x86/kernel/apic/nmi.c: needs merge +rm 'arch/x86/kernel/apic/nmi.c' +$ git commit -v -a +[master c319a29] Merge remote branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/asm/debugreg.h | 2 +- + arch/x86/include/asm/percpu.h | 43 +++++++++++++++++ + arch/x86/include/asm/processor.h | 3 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 4 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 8 ++-- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 4 +- + arch/x86/kernel/cpu/mcheck/mce.c | 20 ++++---- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 2 +- + arch/x86/kernel/cpu/perf_event.c | 27 +++++------- + arch/x86/kernel/cpu/perf_event_intel.c | 4 +- + arch/x86/kernel/ftrace.c | 6 +- + arch/x86/kernel/hw_breakpoint.c | 12 +++--- + arch/x86/kernel/irq.c | 6 +- + arch/x86/kernel/irq_32.c | 4 +- + arch/x86/kernel/kprobes.c | 14 +++--- + arch/x86/kernel/process.c | 4 +- + arch/x86/kernel/smpboot.c | 14 +++--- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kvm/x86.c | 8 ++-- + arch/x86/oprofile/nmi_int.c | 2 +- + arch/x86/oprofile/op_model_ppro.c | 8 ++-- + arch/x86/xen/enlighten.c | 4 +- + arch/x86/xen/multicalls.h | 2 +- + arch/x86/xen/spinlock.c | 8 ++-- + arch/x86/xen/time.c | 8 ++-- + drivers/acpi/processor_idle.c | 6 +- + drivers/char/random.c | 2 +- + drivers/connector/cn_proc.c | 5 +- + drivers/cpuidle/cpuidle.c | 2 +- + drivers/s390/cio/cio.c | 2 +- + drivers/staging/lirc/lirc_serial.c | 4 +- + drivers/staging/speakup/fakekey.c | 11 +--- + drivers/xen/events.c | 10 ++-- + fs/buffer.c | 37 +++++++-------- + include/asm-generic/irq_regs.h | 8 ++-- + include/linux/elevator.h | 12 +---- + include/linux/highmem.h | 13 +++-- + include/linux/kernel_stat.h | 2 +- + include/linux/kprobes.h | 4 +- + include/linux/percpu.h | 71 +++++++++++++++++++++++++++++ + kernel/exit.c | 2 +- + kernel/fork.c | 2 +- + kernel/hrtimer.c | 2 +- + kernel/kprobes.c | 8 ++-- + kernel/rcutree.c | 4 +- + kernel/softirq.c | 42 +++++++++--------- + kernel/taskstats.c | 5 +- + kernel/time/tick-common.c | 2 +- + kernel/time/tick-oneshot.c | 4 +- + kernel/watchdog.c | 36 +++++++------- + lib/percpu_counter.c | 8 +-- + mm/percpu.c | 8 +--- + mm/slab.c | 6 +- + mm/vmstat.c | 48 +++++++++++--------- + 57 files changed, 345 insertions(+), 248 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 +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/eeepc-wmi.c +Auto-merging drivers/platform/x86/intel_scu_ipc.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/wmi.c +Merge made by recursive. + MAINTAINERS | 8 + + drivers/platform/x86/Kconfig | 12 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/classmate-laptop.c | 19 +- + drivers/platform/x86/eeepc-laptop.c | 11 + + drivers/platform/x86/eeepc-wmi.c | 609 ++++++++++++++++++++++++++---- + drivers/platform/x86/intel_scu_ipc.c | 4 +- + drivers/platform/x86/intel_scu_ipcutil.c | 133 +++++++ + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/platform/x86/wmi.c | 135 ++++--- + 10 files changed, 789 insertions(+), 145 deletions(-) + create mode 100644 drivers/platform/x86/intel_scu_ipcutil.c +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/bus.c +Auto-merging drivers/base/core.c +Auto-merging include/linux/device.h +Merge made by recursive. + drivers/base/base.h | 62 +++++++++++++++++++---------------------------- + drivers/base/bus.c | 13 ++++----- + drivers/base/class.c | 42 ++++++++++++++++---------------- + drivers/base/core.c | 24 ++++++++++-------- + fs/sysfs/group.c | 10 +------ + include/linux/device.h | 7 ++--- + 6 files changed, 70 insertions(+), 88 deletions(-) +Merging tty/tty-next +$ git merge tty/tty-next +Auto-merging drivers/serial/8250_pci.c +Auto-merging drivers/tty/n_gsm.c +Auto-merging kernel/printk.c +Merge made by recursive. + Documentation/filesystems/proc.txt | 24 + + Documentation/serial/00-INDEX | 2 + + Documentation/serial/serial-rs485.txt | 120 +++ + arch/parisc/kernel/pdc_cons.c | 8 +- + drivers/char/Kconfig | 9 + + drivers/char/Makefile | 1 + + drivers/char/hvc_dcc.c | 133 +++ + drivers/serial/8250_pci.c | 36 + + drivers/serial/Kconfig | 24 + + drivers/serial/Makefile | 3 + + drivers/serial/cpm_uart/cpm_uart.h | 6 - + drivers/serial/cpm_uart/cpm_uart_core.c | 19 + + drivers/serial/ifx6x60.c | 1406 ++++++++++++++++++++++++++++++ + drivers/serial/ifx6x60.h | 129 +++ + drivers/serial/mpc52xx_uart.c | 6 +- + drivers/serial/pch_uart.c | 1450 +++++++++++++++++++++++++++++++ + drivers/serial/vt8500_serial.c | 648 ++++++++++++++ + drivers/tty/n_gsm.c | 213 +++-- + drivers/video/xen-fbfront.c | 2 +- + fs/proc/Makefile | 1 + + fs/proc/proc_console.c | 114 +++ + include/linux/console.h | 6 + + include/linux/serial_core.h | 5 +- + include/linux/spi/ifx_modem.h | 14 + + include/linux/tty_driver.h | 1 + + kernel/printk.c | 6 - + 26 files changed, 4281 insertions(+), 105 deletions(-) + create mode 100644 Documentation/serial/serial-rs485.txt + create mode 100644 drivers/char/hvc_dcc.c + create mode 100644 drivers/serial/ifx6x60.c + create mode 100644 drivers/serial/ifx6x60.h + create mode 100644 drivers/serial/pch_uart.c + create mode 100644 drivers/serial/vt8500_serial.c + create mode 100644 fs/proc/proc_console.c + create mode 100644 include/linux/spi/ifx_modem.h +Merging usb/usb-next +$ git merge usb/usb-next +Resolved 'arch/sh/Kconfig' using previous resolution. +Resolved 'drivers/usb/musb/blackfin.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/Kconfig +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Auto-merging arch/blackfin/mach-bf527/boards/cm_bf527.c +Auto-merging arch/blackfin/mach-bf527/boards/ezbrd.c +Auto-merging arch/blackfin/mach-bf527/boards/ezkit.c +Auto-merging arch/blackfin/mach-bf548/boards/cm_bf548.c +Auto-merging arch/blackfin/mach-bf548/boards/ezkit.c +Auto-merging arch/sh/Kconfig +CONFLICT (content): Merge conflict in arch/sh/Kconfig +Auto-merging drivers/media/video/tlg2300/pd-main.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/gadget/imx_udc.c +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/host/ehci-dbg.c +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging drivers/usb/host/ehci-mxc.c +Auto-merging drivers/usb/host/ehci-pci.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/musb/blackfin.c +CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_core.h +Auto-merging drivers/usb/musb/musb_gadget.c +Auto-merging drivers/usb/musb/musbhsdma.c +Auto-merging drivers/usb/serial/option.c +Auto-merging include/linux/usb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 88ec782] Merge remote branch 'usb/usb-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/usb/power-management.txt | 113 +- + arch/arm/mach-davinci/usb.c | 2 + + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/board-4430sdp.c | 20 + + arch/arm/mach-omap2/clock3xxx_data.c | 5 + + arch/arm/mach-omap2/clock44xx_data.c | 5 + + arch/arm/mach-omap2/usb-ehci.c | 144 ++- + arch/arm/mach-omap2/usb-musb.c | 2 + + arch/arm/plat-omap/include/plat/omap44xx.h | 5 + + arch/arm/plat-omap/include/plat/usb.h | 1 + + arch/blackfin/mach-bf527/boards/cm_bf527.c | 2 + + arch/blackfin/mach-bf527/boards/ezbrd.c | 2 + + arch/blackfin/mach-bf527/boards/ezkit.c | 2 + + arch/blackfin/mach-bf548/boards/cm_bf548.c | 2 + + arch/blackfin/mach-bf548/boards/ezkit.c | 2 + + arch/sh/Kconfig | 5 + + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 35 +- + drivers/media/video/tlg2300/pd-main.c | 3 +- + drivers/net/wimax/i2400m/usb.c | 2 +- + drivers/staging/bcm/InterfaceInit.c | 2 +- + drivers/usb/Kconfig | 8 +- + drivers/usb/core/driver.c | 150 +-- + drivers/usb/core/hcd-pci.c | 1 - + drivers/usb/core/hcd.c | 1 - + drivers/usb/core/hub.c | 11 +- + drivers/usb/core/message.c | 1 + + drivers/usb/core/quirks.c | 15 - + drivers/usb/core/sysfs.c | 84 +- + drivers/usb/core/usb.c | 3 +- + drivers/usb/core/usb.h | 2 - + drivers/usb/gadget/Kconfig | 35 + + drivers/usb/gadget/Makefile | 3 + + drivers/usb/gadget/amd5536udc.c | 1 - + drivers/usb/gadget/composite.c | 10 +- + drivers/usb/gadget/dummy_hcd.c | 251 ++-- + drivers/usb/gadget/f_fs.c | 433 ++--- + drivers/usb/gadget/f_mass_storage.c | 524 +++--- + drivers/usb/gadget/file_storage.c | 29 +- + drivers/usb/gadget/g_ffs.c | 41 +- + drivers/usb/gadget/gadget_chips.h | 7 + + drivers/usb/gadget/imx_udc.c | 4 +- + drivers/usb/gadget/imx_udc.h | 3 - + drivers/usb/gadget/langwell_udc.c | 23 + + drivers/usb/gadget/mass_storage.c | 2 +- + drivers/usb/gadget/mv_udc.h | 294 +++ + drivers/usb/gadget/mv_udc_core.c | 2149 ++++++++++++++++++++ + drivers/usb/gadget/mv_udc_phy.c | 214 ++ + drivers/usb/gadget/pch_udc.c | 2941 ++++++++++++++++++++++++++++ + drivers/usb/gadget/u_audio.c | 10 +- + drivers/usb/host/Kconfig | 8 + + drivers/usb/host/ehci-atmel.c | 3 + + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-hcd.c | 17 +- + drivers/usb/host/ehci-mxc.c | 3 + + drivers/usb/host/ehci-omap.c | 314 +++- + drivers/usb/host/ehci-pci.c | 7 + + drivers/usb/host/ehci-sh.c | 243 +++ + drivers/usb/host/ehci-spear.c | 212 ++ + drivers/usb/host/ehci-vt8500.c | 172 ++ + drivers/usb/host/ehci-w90x900.c | 3 + + drivers/usb/host/ehci-xilinx-of.c | 1 + + drivers/usb/host/ohci-hcd.c | 5 + + drivers/usb/host/ohci-sh.c | 2 +- + drivers/usb/host/ohci-spear.c | 240 +++ + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/mon/mon_bin.c | 34 +- + drivers/usb/musb/blackfin.c | 2 +- + drivers/usb/musb/cppi_dma.c | 2 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_core.c | 4 +- + drivers/usb/musb/musb_core.h | 2 +- + drivers/usb/musb/musb_gadget.c | 13 +- + drivers/usb/musb/musbhsdma.c | 2 +- + drivers/usb/musb/omap2430.c | 6 +- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/otg/twl4030-usb.c | 3 +- + drivers/usb/serial/option.c | 1 + + drivers/usb/serial/ssu100.c | 56 +- + drivers/usb/serial/usb-wwan.h | 2 + + drivers/usb/serial/usb_wwan.c | 78 + + drivers/uwb/i1480/i1480-est.c | 2 +- + drivers/uwb/umc-dev.c | 7 +- + drivers/uwb/whc-rc.c | 2 +- + include/linux/usb.h | 7 +- + include/linux/usb/ch11.h | 47 + + include/linux/usb/ch9.h | 10 + + include/linux/usb/hcd.h | 4 + + 87 files changed, 8065 insertions(+), 1062 deletions(-) + create mode 100644 drivers/usb/gadget/mv_udc.h + create mode 100644 drivers/usb/gadget/mv_udc_core.c + create mode 100644 drivers/usb/gadget/mv_udc_phy.c + create mode 100644 drivers/usb/gadget/pch_udc.c + create mode 100644 drivers/usb/host/ehci-sh.c + create mode 100644 drivers/usb/host/ehci-spear.c + create mode 100644 drivers/usb/host/ehci-vt8500.c + create mode 100644 drivers/usb/host/ohci-spear.c +Merging staging/staging-next +$ git merge staging/staging-next +Removing drivers/staging/adis16255/Kconfig +Removing drivers/staging/adis16255/Makefile +Removing drivers/staging/adis16255/adis16255.c +Removing drivers/staging/adis16255/adis16255.h +Removing drivers/staging/bcm/Arp.c +Removing drivers/staging/bcm/Debug.c +Removing drivers/staging/bcm/HostMibs.h +Auto-merging drivers/staging/bcm/InterfaceInit.c +Removing drivers/staging/bcm/Interfacemain.h +Removing drivers/staging/bcm/Osal_Misc.c +Removing drivers/staging/bcm/osal_misc.h +Removing drivers/staging/brcm80211/include/bcm_rpc.h +Removing drivers/staging/brcm80211/include/bcm_rpc_tp.h +Removing drivers/staging/brcm80211/include/bcm_xdr.h +Removing drivers/staging/brcm80211/include/dbus.h +Removing drivers/staging/brcm80211/include/epivers.h +Removing drivers/staging/brcm80211/include/linux_osl.h +Removing drivers/staging/brcm80211/include/linuxver.h +Removing drivers/staging/brcm80211/sys/wlc_rpc.h +Removing drivers/staging/brcm80211/sys/wlc_rpctx.h +Removing drivers/staging/hv/vmbus.c +Removing drivers/staging/winbond/mlmetxrx.c +Removing drivers/staging/winbond/mlmetxrx_f.h +Removing drivers/staging/winbond/sysdef.h +Removing drivers/staging/winbond/wbhal_f.h +Removing drivers/staging/winbond/wblinux_f.h +Removing drivers/staging/winbond/wbusb_s.h +Auto-merging drivers/usb/serial/option.c +Merge made by recursive. + drivers/staging/Kconfig | 8 +- + drivers/staging/Makefile | 4 +- + drivers/staging/adis16255/Kconfig | 11 - + drivers/staging/adis16255/Makefile | 1 - + drivers/staging/adis16255/adis16255.c | 468 --- + drivers/staging/adis16255/adis16255.h | 12 - + drivers/staging/asus_oled/asus_oled.c | 2 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 4 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- + drivers/staging/autofs/dirhash.c | 87 +- + drivers/staging/batman-adv/Makefile | 19 +- + drivers/staging/batman-adv/README | 6 +- + drivers/staging/batman-adv/TODO | 6 +- + drivers/staging/batman-adv/aggregation.c | 18 +- + drivers/staging/batman-adv/bat_debugfs.c | 33 +- + drivers/staging/batman-adv/bat_sysfs.c | 425 ++-- + drivers/staging/batman-adv/gateway_client.c | 477 +++ + drivers/staging/batman-adv/gateway_client.h | 36 + + drivers/staging/batman-adv/gateway_common.c | 177 + + drivers/staging/batman-adv/gateway_common.h | 38 + + drivers/staging/batman-adv/hard-interface.c | 51 +- + drivers/staging/batman-adv/hard-interface.h | 13 +- + drivers/staging/batman-adv/hash.c | 237 +-- + drivers/staging/batman-adv/hash.h | 219 +- + drivers/staging/batman-adv/icmp_socket.c | 26 +- + drivers/staging/batman-adv/main.c | 46 +- + drivers/staging/batman-adv/main.h | 9 +- + drivers/staging/batman-adv/originator.c | 75 +- + drivers/staging/batman-adv/originator.h | 28 + + drivers/staging/batman-adv/packet.h | 4 +- + drivers/staging/batman-adv/routing.c | 188 +- + drivers/staging/batman-adv/routing.h | 2 + + drivers/staging/batman-adv/send.c | 48 +- + drivers/staging/batman-adv/soft-interface.c | 319 ++- + drivers/staging/batman-adv/soft-interface.h | 5 +- + drivers/staging/batman-adv/sysfs-class-net-mesh | 28 + + drivers/staging/batman-adv/translation-table.c | 128 +- + drivers/staging/batman-adv/types.h | 46 +- + drivers/staging/batman-adv/unicast.c | 158 +- + drivers/staging/batman-adv/unicast.h | 12 +- + drivers/staging/batman-adv/vis.c | 146 +- + drivers/staging/bcm/Adapter.h | 134 +- + drivers/staging/bcm/Arp.c | 94 - + drivers/staging/bcm/Bcmchar.c | 967 ++---- + drivers/staging/bcm/Bcmnet.c | 404 +-- + drivers/staging/bcm/CmHost.c | 139 +- + drivers/staging/bcm/CmHost.h | 3 - + drivers/staging/bcm/DDRInit.c | 17 +- + drivers/staging/bcm/Debug.c | 41 - + drivers/staging/bcm/Debug.h | 88 +- + drivers/staging/bcm/HandleControlPacket.c | 39 +- + drivers/staging/bcm/HostMibs.h | 7 - + drivers/staging/bcm/IPv6Protocol.c | 10 +- + drivers/staging/bcm/IPv6ProtocolHdr.h | 3 - + drivers/staging/bcm/InterfaceDld.c | 136 +- + drivers/staging/bcm/InterfaceIdleMode.c | 20 +- + drivers/staging/bcm/InterfaceIdleMode.h | 2 - + drivers/staging/bcm/InterfaceInit.c | 854 ++--- + drivers/staging/bcm/InterfaceInit.h | 28 +- + drivers/staging/bcm/InterfaceIsr.c | 44 +- + drivers/staging/bcm/InterfaceMisc.c | 29 +- + drivers/staging/bcm/InterfaceMisc.h | 3 - + drivers/staging/bcm/InterfaceRx.c | 40 +- + drivers/staging/bcm/InterfaceTx.c | 74 +- + drivers/staging/bcm/InterfaceTx.h | 6 - + drivers/staging/bcm/Interfacemain.h | 10 - + drivers/staging/bcm/LeakyBucket.c | 72 +- + drivers/staging/bcm/Macros.h | 40 +- + drivers/staging/bcm/Makefile | 4 +- + drivers/staging/bcm/Misc.c | 536 +--- + drivers/staging/bcm/Osal_Misc.c | 27 - + drivers/staging/bcm/PHSModule.c | 234 +- + drivers/staging/bcm/PHSModule.h | 45 - + drivers/staging/bcm/Protocol.h | 6 +- + drivers/staging/bcm/Prototypes.h | 122 +- + drivers/staging/bcm/Qos.c | 106 +- + drivers/staging/bcm/TODO | 25 +- + drivers/staging/bcm/Transmit.c | 393 +-- + drivers/staging/bcm/cntrl_SignalingInterface.h | 254 -- + drivers/staging/bcm/headers.h | 40 +- + drivers/staging/bcm/hostmibs.c | 35 +- + drivers/staging/bcm/led_control.c | 135 +- + drivers/staging/bcm/nvm.c | 642 +--- + drivers/staging/bcm/nvm.h | 80 - + drivers/staging/bcm/osal_misc.h | 49 - + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 12 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 270 +-- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 59 +- + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 4 +- + drivers/staging/brcm80211/brcmfmac/dhd.h | 19 +- + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 6 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 38 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 10 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 118 +- + .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 7 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 348 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 28 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 45 +- + drivers/staging/brcm80211/include/bcm_rpc.h | 79 - + drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 - + drivers/staging/brcm80211/include/bcm_xdr.h | 60 - + drivers/staging/brcm80211/include/bcmdefs.h | 63 +- + drivers/staging/brcm80211/include/bcmsdbus.h | 6 +- + drivers/staging/brcm80211/include/bcmsdh.h | 12 +- + drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 6 +- + drivers/staging/brcm80211/include/bcmsrom.h | 8 +- + drivers/staging/brcm80211/include/bcmutils.h | 60 +- + drivers/staging/brcm80211/include/d11.h | 7 - + drivers/staging/brcm80211/include/dbus.h | 353 -- + drivers/staging/brcm80211/include/epivers.h | 44 - + drivers/staging/brcm80211/include/hnddma.h | 6 +- + drivers/staging/brcm80211/include/hndpmu.h | 44 +- + drivers/staging/brcm80211/include/linux_osl.h | 407 --- + drivers/staging/brcm80211/include/linuxver.h | 38 - + drivers/staging/brcm80211/include/nicpci.h | 12 +- + drivers/staging/brcm80211/include/osl.h | 209 +- + drivers/staging/brcm80211/include/rpc_osl.h | 2 +- + drivers/staging/brcm80211/include/siutils.h | 28 +- + drivers/staging/brcm80211/include/wlioctl.h | 341 +-- + drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 63 +- + drivers/staging/brcm80211/phy/wlc_phy_hal.h | 6 - + drivers/staging/brcm80211/phy/wlc_phy_int.h | 4 +- + drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 13 +- + drivers/staging/brcm80211/phy/wlc_phy_n.c | 59 +- + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 + + drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 3 + + drivers/staging/brcm80211/sys/wl_export.h | 8 +- + drivers/staging/brcm80211/sys/wl_mac80211.c | 797 +---- + drivers/staging/brcm80211/sys/wl_mac80211.h | 48 +- + drivers/staging/brcm80211/sys/wl_ucode.h | 12 + + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 13 +- + drivers/staging/brcm80211/sys/wlc_alloc.c | 49 +- + drivers/staging/brcm80211/sys/wlc_alloc.h | 12 +- + drivers/staging/brcm80211/sys/wlc_ampdu.c | 161 +- + drivers/staging/brcm80211/sys/wlc_ampdu.h | 16 +- + drivers/staging/brcm80211/sys/wlc_antsel.c | 13 +- + drivers/staging/brcm80211/sys/wlc_antsel.h | 5 +- + drivers/staging/brcm80211/sys/wlc_bmac.c | 510 ++-- + drivers/staging/brcm80211/sys/wlc_bmac.h | 182 +- + drivers/staging/brcm80211/sys/wlc_bsscfg.h | 3 +- + drivers/staging/brcm80211/sys/wlc_cfg.h | 24 - + drivers/staging/brcm80211/sys/wlc_channel.c | 47 +- + drivers/staging/brcm80211/sys/wlc_event.c | 7 +- + drivers/staging/brcm80211/sys/wlc_event.h | 2 +- + drivers/staging/brcm80211/sys/wlc_mac80211.c | 893 ++--- + drivers/staging/brcm80211/sys/wlc_mac80211.h | 268 +- + drivers/staging/brcm80211/sys/wlc_phy_shim.c | 11 +- + drivers/staging/brcm80211/sys/wlc_pub.h | 30 +- + drivers/staging/brcm80211/sys/wlc_rate.c | 6 +- + drivers/staging/brcm80211/sys/wlc_rpc.h | 527 --- + drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 - + drivers/staging/brcm80211/sys/wlc_scb.h | 2 +- + drivers/staging/brcm80211/sys/wlc_stf.c | 60 +- + drivers/staging/brcm80211/sys/wlc_stf.h | 31 +- + drivers/staging/brcm80211/sys/wlc_types.h | 9 +- + drivers/staging/brcm80211/util/aiutils.c | 25 +- + drivers/staging/brcm80211/util/bcmotp.c | 22 +- + drivers/staging/brcm80211/util/bcmsrom.c | 80 +- + drivers/staging/brcm80211/util/bcmutils.c | 112 +- + drivers/staging/brcm80211/util/bcmwifi.c | 4 + + drivers/staging/brcm80211/util/hnddma.c | 130 +- + drivers/staging/brcm80211/util/hndpmu.c | 174 +- + drivers/staging/brcm80211/util/linux_osl.c | 247 +-- + drivers/staging/brcm80211/util/nicpci.c | 125 +- + drivers/staging/brcm80211/util/nvram/nvram_ro.c | 4 +- + drivers/staging/brcm80211/util/sbutils.c | 13 +- + drivers/staging/brcm80211/util/siutils.c | 206 +- + drivers/staging/comedi/drivers.c | 4 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 2 +- + drivers/staging/cptm1217/Kconfig | 12 + + drivers/staging/cptm1217/Makefile | 2 + + drivers/staging/cptm1217/TODO | 5 + + drivers/staging/cptm1217/clearpad_tm1217.c | 675 ++++ + drivers/staging/cptm1217/cp_tm1217.h | 9 + + drivers/staging/crystalhd/crystalhd_hw.c | 2 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 6 +- + drivers/staging/easycap/Kconfig | 1 - + drivers/staging/easycap/Makefile | 1 + + drivers/staging/easycap/README | 93 +- + drivers/staging/easycap/easycap.h | 186 +- + drivers/staging/easycap/easycap_debug.h | 2 + + drivers/staging/easycap/easycap_ioctl.c | 2286 +++++++------ + drivers/staging/easycap/easycap_low.c | 895 +++-- + drivers/staging/easycap/easycap_main.c | 2782 ++++++++++------ + drivers/staging/easycap/easycap_settings.c | 272 ++- + drivers/staging/easycap/easycap_sound.c | 603 +++-- + drivers/staging/easycap/easycap_testcard.c | 372 ++- + drivers/staging/et131x/et131x_initpci.c | 2 +- + drivers/staging/frontier/alphatrack.c | 4 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 54 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 8 +- + drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 125 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 234 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 415 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 14 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 21 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 45 +- + drivers/staging/go7007/go7007-driver.c | 2 +- + drivers/staging/hv/Makefile | 2 +- + drivers/staging/hv/blkvsc.c | 52 +- + drivers/staging/hv/blkvsc_drv.c | 117 +- + drivers/staging/hv/channel.c | 338 +- + drivers/staging/hv/channel_mgmt.c | 194 +- + drivers/staging/hv/channel_mgmt.h | 244 +- + drivers/staging/hv/connection.c | 56 +- + drivers/staging/hv/hv.c | 346 +- + drivers/staging/hv/hv.h | 36 +- + drivers/staging/hv/hv_api.h | 278 +- + drivers/staging/hv/hv_utils.c | 12 +- + drivers/staging/hv/netvsc.c | 24 +- + drivers/staging/hv/netvsc_drv.c | 3 + + drivers/staging/hv/osd.c | 74 +- + drivers/staging/hv/osd.h | 18 +- + drivers/staging/hv/ring_buffer.c | 404 ++-- + drivers/staging/hv/ring_buffer.h | 56 +- + drivers/staging/hv/rndis_filter.c | 10 +- + drivers/staging/hv/storvsc.c | 584 ++-- + drivers/staging/hv/storvsc_api.h | 54 +- + drivers/staging/hv/storvsc_drv.c | 95 +- + drivers/staging/hv/vmbus.c | 274 -- + drivers/staging/hv/vmbus_api.h | 24 - + drivers/staging/hv/vmbus_drv.c | 337 ++- + drivers/staging/hv/vmbus_private.h | 7 +- + drivers/staging/hv/vstorage.h | 106 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 627 +++-- + drivers/staging/iio/Kconfig | 6 +- + drivers/staging/iio/Makefile | 7 +- + drivers/staging/iio/TODO | 4 + + drivers/staging/iio/accel/Kconfig | 27 + + drivers/staging/iio/accel/Makefile | 12 + + drivers/staging/iio/accel/accel.h | 20 + + drivers/staging/iio/accel/adis16201.h | 150 + + drivers/staging/iio/accel/adis16201_core.c | 659 ++++ + drivers/staging/iio/accel/adis16201_ring.c | 218 ++ + drivers/staging/iio/accel/adis16201_trigger.c | 122 + + drivers/staging/iio/accel/adis16203.h | 143 + + drivers/staging/iio/accel/adis16203_core.c | 568 +++ + drivers/staging/iio/accel/adis16203_ring.c | 211 ++ + drivers/staging/iio/accel/adis16203_trigger.c | 122 + + drivers/staging/iio/accel/adis16204.h | 151 + + drivers/staging/iio/accel/adis16204_core.c | 613 ++++ + drivers/staging/iio/accel/adis16204_ring.c | 206 ++ + drivers/staging/iio/accel/adis16204_trigger.c | 122 + + drivers/staging/iio/accel/adis16209_ring.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- + drivers/staging/iio/adc/Kconfig | 91 +- + drivers/staging/iio/adc/Makefile | 15 + + drivers/staging/iio/adc/ad7150.c | 877 +++++ + drivers/staging/iio/adc/ad7152.c | 610 ++++ + drivers/staging/iio/adc/ad7291.c | 1039 ++++++ + drivers/staging/iio/adc/ad7298.c | 501 +++ + drivers/staging/iio/adc/ad7314.c | 308 ++ + drivers/staging/iio/adc/ad7745.c | 734 ++++ + drivers/staging/iio/adc/ad7816.c | 535 +++ + drivers/staging/iio/adc/ad7887.h | 105 + + drivers/staging/iio/adc/ad7887_core.c | 305 ++ + drivers/staging/iio/adc/ad7887_ring.c | 266 ++ + drivers/staging/iio/adc/adt7310.c | 952 +++++ + drivers/staging/iio/adc/adt7410.c | 915 +++++ + drivers/staging/iio/adc/adt75.c | 732 ++++ + drivers/staging/iio/addac/Kconfig | 25 + + drivers/staging/iio/addac/Makefile | 7 + + drivers/staging/iio/addac/adt7316-i2c.c | 170 + + drivers/staging/iio/addac/adt7316-spi.c | 180 + + drivers/staging/iio/addac/adt7316.c | 2402 +++++++++++++ + drivers/staging/iio/addac/adt7316.h | 33 + + drivers/staging/iio/dac/Kconfig | 21 + + drivers/staging/iio/dac/Makefile | 6 + + drivers/staging/iio/dac/ad5446.c | 323 ++ + drivers/staging/iio/dac/ad5446.h | 96 + + drivers/staging/iio/dac/ad5624r.h | 21 + + drivers/staging/iio/dac/ad5624r_spi.c | 300 ++ + drivers/staging/iio/dac/dac.h | 6 + + drivers/staging/iio/dds/Kconfig | 46 + + drivers/staging/iio/dds/Makefile | 10 + + drivers/staging/iio/dds/ad5930.c | 170 + + drivers/staging/iio/dds/ad9832.c | 264 ++ + drivers/staging/iio/dds/ad9850.c | 156 + + drivers/staging/iio/dds/ad9852.c | 305 ++ + drivers/staging/iio/dds/ad9910.c | 440 +++ + drivers/staging/iio/dds/ad9951.c | 249 ++ + drivers/staging/iio/gyro/Kconfig | 38 +- + drivers/staging/iio/gyro/Makefile | 12 + + drivers/staging/iio/gyro/adis16060.h | 101 + + drivers/staging/iio/gyro/adis16060_core.c | 319 ++ + drivers/staging/iio/gyro/adis16080.h | 102 + + drivers/staging/iio/gyro/adis16080_core.c | 271 ++ + drivers/staging/iio/gyro/adis16130.h | 108 + + drivers/staging/iio/gyro/adis16130_core.c | 313 ++ + drivers/staging/iio/gyro/adis16251.h | 185 + + drivers/staging/iio/gyro/adis16251_core.c | 777 +++++ + drivers/staging/iio/gyro/adis16260.h | 3 + + drivers/staging/iio/gyro/adis16260_core.c | 142 +- + drivers/staging/iio/gyro/adis16260_platform_data.h | 19 + + drivers/staging/iio/gyro/gyro.h | 9 + + drivers/staging/iio/imu/adis16350_core.c | 1 + + drivers/staging/iio/meter/Kconfig | 61 + + drivers/staging/iio/meter/Makefile | 15 + + drivers/staging/iio/meter/ade7753.c | 730 ++++ + drivers/staging/iio/meter/ade7753.h | 140 + + drivers/staging/iio/meter/ade7754.c | 756 ++++ + drivers/staging/iio/meter/ade7754.h | 161 + + drivers/staging/iio/meter/ade7758.h | 171 + + drivers/staging/iio/meter/ade7758_core.c | 866 +++++ + drivers/staging/iio/meter/ade7758_ring.c | 212 ++ + drivers/staging/iio/meter/ade7758_trigger.c | 125 + + drivers/staging/iio/meter/ade7759.c | 670 ++++ + drivers/staging/iio/meter/ade7759.h | 122 + + drivers/staging/iio/meter/ade7854-i2c.c | 272 ++ + drivers/staging/iio/meter/ade7854-spi.c | 360 ++ + drivers/staging/iio/meter/ade7854.c | 680 ++++ + drivers/staging/iio/meter/ade7854.h | 245 ++ + drivers/staging/iio/meter/meter.h | 396 +++ + drivers/staging/iio/resolver/Kconfig | 54 + + drivers/staging/iio/resolver/Makefile | 7 + + drivers/staging/iio/resolver/ad2s120x.c | 310 ++ + drivers/staging/iio/resolver/ad2s1210.c | 872 +++++ + drivers/staging/iio/resolver/ad2s90.c | 159 + + drivers/staging/iio/sysfs.h | 6 + + drivers/staging/intel_sst/Kconfig | 1 + + drivers/staging/intel_sst/intel_sst.c | 116 +- + drivers/staging/intel_sst/intel_sst.h | 8 +- + .../staging/intel_sst/intel_sst_app_interface.c | 314 ++- + drivers/staging/intel_sst/intel_sst_common.h | 10 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 209 +- + drivers/staging/intel_sst/intel_sst_dsp.c | 70 +- + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 113 +- + drivers/staging/intel_sst/intel_sst_ioctl.h | 15 +- + drivers/staging/intel_sst/intel_sst_ipc.c | 194 +- + drivers/staging/intel_sst/intel_sst_pvt.c | 36 +- + drivers/staging/intel_sst/intel_sst_stream.c | 20 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 214 +- + drivers/staging/intel_sst/intelmid.c | 192 +- + drivers/staging/intel_sst/intelmid.h | 5 - + drivers/staging/intel_sst/intelmid_ctrl.c | 28 +- + drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- + drivers/staging/intel_sst/intelmid_pvt.c | 54 +- + drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- + drivers/staging/intel_sst/intelmid_v1_control.c | 70 +- + drivers/staging/intel_sst/intelmid_v2_control.c | 96 +- + drivers/staging/keucr/init.c | 420 ++-- + drivers/staging/keucr/init.h | 3 + + drivers/staging/keucr/ms.c | 10 +- + drivers/staging/keucr/smilmain.c | 4 +- + drivers/staging/keucr/smilsub.c | 4 +- + drivers/staging/memrar/memrar.h | 19 + + drivers/staging/msm/Makefile | 4 +- + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- + drivers/staging/msm/tvenc.c | 5 +- + drivers/staging/pohmelfs/crypto.c | 6 +- + drivers/staging/rt2860/chip/mac_pci.h | 7 +- + drivers/staging/rt2860/chip/mac_usb.h | 5 +- + drivers/staging/rt2860/chip/rtmp_mac.h | 19 +- + drivers/staging/rt2860/chips/rt3090.c | 8 +- + drivers/staging/rt2860/chips/rt30xx.c | 11 +- + drivers/staging/rt2860/common/ba_action.c | 12 +- + drivers/staging/rt2860/common/cmm_data_pci.c | 4 +- + drivers/staging/rt2860/mlme.h | 41 +- + drivers/staging/rt2860/oid.h | 13 +- + drivers/staging/rt2860/pci_main_dev.c | 17 +- + drivers/staging/rt2860/rt_linux.c | 14 +- + drivers/staging/rt2860/rt_linux.h | 5 +- + drivers/staging/rt2860/rt_main_dev.c | 16 +- + drivers/staging/rt2860/rt_pci_rbus.c | 7 +- + drivers/staging/rt2860/rt_usb.c | 13 +- + drivers/staging/rt2860/rtmp.h | 71 +- + drivers/staging/rt2860/rtmp_def.h | 37 +- + drivers/staging/rt2860/rtmp_timer.h | 13 +- + drivers/staging/rt2860/spectrum.h | 12 +- + drivers/staging/rt2860/sta/assoc.c | 13 +- + drivers/staging/rt2860/sta/auth.c | 7 +- + drivers/staging/rt2860/sta/connect.c | 35 +- + drivers/staging/rt2860/sta/rtmp_data.c | 33 +- + drivers/staging/rt2860/sta/sanity.c | 5 +- + drivers/staging/rt2860/sta/sync.c | 19 +- + drivers/staging/rt2860/sta/wpa.c | 5 +- + drivers/staging/rt2860/sta_ioctl.c | 25 +- + drivers/staging/rt2860/usb_main_dev.c | 8 +- + drivers/staging/rt2860/wpa.h | 5 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/r8192E_core.c | 4 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192u/Makefile | 1 - + drivers/staging/rtl8192u/dot11d.h | 2 - + drivers/staging/rtl8192u/ieee80211/Makefile | 2 - + drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 - + drivers/staging/rtl8192u/ieee80211/dot11d.h | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 8 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 12 - + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 44 - + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 4 - + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 27 +- + drivers/staging/rtl8192u/r8192U_wx.c | 6 - + drivers/staging/rtl8192u/r819xU_phy.c | 6 +- + drivers/staging/rtl8712/TODO | 1 - + drivers/staging/rtl8712/osdep_service.h | 25 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/usb_intf.c | 2 +- + drivers/staging/sep/Kconfig | 10 + + drivers/staging/sep/Makefile | 2 + + drivers/staging/sep/TODO | 12 + + drivers/staging/sep/sep_dev.h | 156 + + drivers/staging/sep/sep_driver.c | 3656 ++++++++++++++++++++ + drivers/staging/sep/sep_driver_api.h | 309 ++ + drivers/staging/sep/sep_driver_config.h | 234 ++ + drivers/staging/sep/sep_driver_hw_defs.h | 234 ++ + drivers/staging/solo6x10/Kconfig | 2 +- + drivers/staging/solo6x10/TODO | 4 - + drivers/staging/solo6x10/solo6010-core.c | 42 +- + drivers/staging/solo6x10/solo6010-disp.c | 6 +- + drivers/staging/solo6x10/solo6010-enc.c | 6 +- + drivers/staging/solo6x10/solo6010-g723.c | 22 +- + drivers/staging/solo6x10/solo6010-gpio.c | 4 +- + drivers/staging/solo6x10/solo6010-i2c.c | 13 +- + drivers/staging/solo6x10/solo6010-osd-font.h | 60 +- + drivers/staging/solo6x10/solo6010-p2m.c | 156 +- + drivers/staging/solo6x10/solo6010-tw28.c | 118 +- + drivers/staging/solo6x10/solo6010-v4l2-enc.c | 370 ++- + drivers/staging/solo6x10/solo6010-v4l2.c | 197 +- + drivers/staging/solo6x10/solo6010.h | 39 +- + drivers/staging/speakup/spk_types.h | 2 +- + drivers/staging/spectra/ffsport.c | 61 +- + drivers/staging/spectra/ffsport.h | 1 + + drivers/staging/spectra/flash.c | 4 +- + drivers/staging/spectra/lld_emu.c | 6 +- + drivers/staging/spectra/lld_nand.c | 177 +- + drivers/staging/ste_rmi4/Kconfig | 9 + + drivers/staging/ste_rmi4/Makefile | 4 + + drivers/staging/ste_rmi4/TODO | 7 + + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1179 +++++++ + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 50 + + drivers/staging/tidspbridge/core/tiomap3430.c | 4 +- + drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- + drivers/staging/udlfb/udlfb.c | 5 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 233 +- + drivers/staging/vme/bridges/vme_ca91cx42.h | 2 +- + drivers/staging/vme/bridges/vme_tsi148.c | 262 +- + drivers/staging/vme/bridges/vme_tsi148.h | 2 +- + drivers/staging/vme/devices/vme_user.c | 79 +- + drivers/staging/vme/vme.c | 116 +- + drivers/staging/vme/vme_bridge.h | 2 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6655/wpa2.c | 4 +- + drivers/staging/vt6656/baseband.c | 2 +- + drivers/staging/vt6656/card.c | 2 +- + drivers/staging/vt6656/dpc.c | 4 +- + drivers/staging/vt6656/iwctl.c | 2 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/rxtx.c | 3 +- + drivers/staging/vt6656/tkip.c | 37 +- + drivers/staging/vt6656/wpa2.c | 4 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 10 +- + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/core.h | 2 +- + drivers/staging/winbond/mac_structures.h | 545 --- + drivers/staging/winbond/mds.c | 70 +- + drivers/staging/winbond/mds_f.h | 3 +- + drivers/staging/winbond/mds_s.h | 4 - + drivers/staging/winbond/mlmetxrx.c | 62 - + drivers/staging/winbond/mlmetxrx_f.h | 23 - + drivers/staging/winbond/mto.c | 5 +- + drivers/staging/winbond/phy_calibration.c | 5 +- + drivers/staging/winbond/phy_calibration.h | 2 +- + drivers/staging/winbond/reg.c | 36 +- + drivers/staging/winbond/sysdef.h | 31 - + drivers/staging/winbond/wb35reg.c | 33 +- + drivers/staging/winbond/wb35reg_f.h | 2 +- + drivers/staging/winbond/wb35reg_s.h | 77 +- + drivers/staging/winbond/wb35rx.c | 30 +- + drivers/staging/winbond/wb35rx_f.h | 2 +- + drivers/staging/winbond/wb35tx.c | 31 +- + drivers/staging/winbond/wb35tx_f.h | 1 - + drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 14 +- + drivers/staging/winbond/wbhal_f.h | 81 - + drivers/staging/winbond/wblinux_f.h | 17 - + drivers/staging/winbond/wbusb.c | 50 +- + drivers/staging/winbond/wbusb_s.h | 18 - + drivers/staging/wlags49_h2/wl_pci.c | 2 +- + drivers/staging/wlags49_h2/wl_profile.c | 2 +- + drivers/staging/wlags49_h2/wl_sysfs.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 45 +- + drivers/staging/wlan-ng/p80211conv.h | 6 +- + drivers/staging/wlan-ng/p80211netdev.c | 6 +- + drivers/staging/wlan-ng/p80211netdev.h | 10 +- + drivers/staging/wlan-ng/p80211types.h | 4 +- + drivers/staging/wlan-ng/prism2mgmt.c | 26 +- + drivers/staging/xgifb/XGI_main_26.c | 9 +- + drivers/staging/zram/zram_drv.c | 3 +- + drivers/usb/serial/option.c | 1 - + include/linux/rar_register.h | 16 + + 508 files changed, 49096 insertions(+), 20617 deletions(-) + delete mode 100644 drivers/staging/adis16255/Kconfig + delete mode 100644 drivers/staging/adis16255/Makefile + delete mode 100644 drivers/staging/adis16255/adis16255.c + delete mode 100644 drivers/staging/adis16255/adis16255.h + create mode 100644 drivers/staging/batman-adv/gateway_client.c + create mode 100644 drivers/staging/batman-adv/gateway_client.h + create mode 100644 drivers/staging/batman-adv/gateway_common.c + create mode 100644 drivers/staging/batman-adv/gateway_common.h + delete mode 100644 drivers/staging/bcm/Arp.c + delete mode 100644 drivers/staging/bcm/Debug.c + delete mode 100644 drivers/staging/bcm/HostMibs.h + delete mode 100644 drivers/staging/bcm/Interfacemain.h + delete mode 100644 drivers/staging/bcm/Osal_Misc.c + delete mode 100644 drivers/staging/bcm/osal_misc.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h + delete mode 100644 drivers/staging/brcm80211/include/dbus.h + delete mode 100644 drivers/staging/brcm80211/include/epivers.h + delete mode 100644 drivers/staging/brcm80211/include/linux_osl.h + delete mode 100644 drivers/staging/brcm80211/include/linuxver.h + delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h + delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.h + create mode 100644 drivers/staging/cptm1217/Kconfig + create mode 100644 drivers/staging/cptm1217/Makefile + create mode 100644 drivers/staging/cptm1217/TODO + create mode 100644 drivers/staging/cptm1217/clearpad_tm1217.c + create mode 100644 drivers/staging/cptm1217/cp_tm1217.h + delete mode 100644 drivers/staging/hv/vmbus.c + create mode 100644 drivers/staging/iio/accel/adis16201.h + create mode 100644 drivers/staging/iio/accel/adis16201_core.c + create mode 100644 drivers/staging/iio/accel/adis16201_ring.c + create mode 100644 drivers/staging/iio/accel/adis16201_trigger.c + create mode 100644 drivers/staging/iio/accel/adis16203.h + create mode 100644 drivers/staging/iio/accel/adis16203_core.c + create mode 100644 drivers/staging/iio/accel/adis16203_ring.c + create mode 100644 drivers/staging/iio/accel/adis16203_trigger.c + create mode 100644 drivers/staging/iio/accel/adis16204.h + create mode 100644 drivers/staging/iio/accel/adis16204_core.c + create mode 100644 drivers/staging/iio/accel/adis16204_ring.c + create mode 100644 drivers/staging/iio/accel/adis16204_trigger.c + create mode 100644 drivers/staging/iio/adc/ad7150.c + create mode 100644 drivers/staging/iio/adc/ad7152.c + create mode 100644 drivers/staging/iio/adc/ad7291.c + create mode 100644 drivers/staging/iio/adc/ad7298.c + create mode 100644 drivers/staging/iio/adc/ad7314.c + create mode 100644 drivers/staging/iio/adc/ad7745.c + create mode 100644 drivers/staging/iio/adc/ad7816.c + create mode 100644 drivers/staging/iio/adc/ad7887.h + create mode 100644 drivers/staging/iio/adc/ad7887_core.c + create mode 100644 drivers/staging/iio/adc/ad7887_ring.c + create mode 100644 drivers/staging/iio/adc/adt7310.c + create mode 100644 drivers/staging/iio/adc/adt7410.c + create mode 100644 drivers/staging/iio/adc/adt75.c + create mode 100644 drivers/staging/iio/addac/Kconfig + create mode 100644 drivers/staging/iio/addac/Makefile + create mode 100644 drivers/staging/iio/addac/adt7316-i2c.c + create mode 100644 drivers/staging/iio/addac/adt7316-spi.c + create mode 100644 drivers/staging/iio/addac/adt7316.c + create mode 100644 drivers/staging/iio/addac/adt7316.h + create mode 100644 drivers/staging/iio/dac/Kconfig + create mode 100644 drivers/staging/iio/dac/Makefile + create mode 100644 drivers/staging/iio/dac/ad5446.c + create mode 100644 drivers/staging/iio/dac/ad5446.h + create mode 100644 drivers/staging/iio/dac/ad5624r.h + create mode 100644 drivers/staging/iio/dac/ad5624r_spi.c + create mode 100644 drivers/staging/iio/dac/dac.h + create mode 100644 drivers/staging/iio/dds/Kconfig + create mode 100644 drivers/staging/iio/dds/Makefile + create mode 100644 drivers/staging/iio/dds/ad5930.c + create mode 100644 drivers/staging/iio/dds/ad9832.c + create mode 100644 drivers/staging/iio/dds/ad9850.c + create mode 100644 drivers/staging/iio/dds/ad9852.c + create mode 100644 drivers/staging/iio/dds/ad9910.c + create mode 100644 drivers/staging/iio/dds/ad9951.c + create mode 100644 drivers/staging/iio/gyro/adis16060.h + create mode 100644 drivers/staging/iio/gyro/adis16060_core.c + create mode 100644 drivers/staging/iio/gyro/adis16080.h + create mode 100644 drivers/staging/iio/gyro/adis16080_core.c + create mode 100644 drivers/staging/iio/gyro/adis16130.h + create mode 100644 drivers/staging/iio/gyro/adis16130_core.c + create mode 100644 drivers/staging/iio/gyro/adis16251.h + create mode 100644 drivers/staging/iio/gyro/adis16251_core.c + create mode 100644 drivers/staging/iio/gyro/adis16260_platform_data.h + create mode 100644 drivers/staging/iio/meter/Kconfig + create mode 100644 drivers/staging/iio/meter/Makefile + create mode 100644 drivers/staging/iio/meter/ade7753.c + create mode 100644 drivers/staging/iio/meter/ade7753.h + create mode 100644 drivers/staging/iio/meter/ade7754.c + create mode 100644 drivers/staging/iio/meter/ade7754.h + create mode 100644 drivers/staging/iio/meter/ade7758.h + create mode 100644 drivers/staging/iio/meter/ade7758_core.c + create mode 100644 drivers/staging/iio/meter/ade7758_ring.c + create mode 100644 drivers/staging/iio/meter/ade7758_trigger.c + create mode 100644 drivers/staging/iio/meter/ade7759.c + create mode 100644 drivers/staging/iio/meter/ade7759.h + create mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + create mode 100644 drivers/staging/iio/meter/ade7854-spi.c + create mode 100644 drivers/staging/iio/meter/ade7854.c + create mode 100644 drivers/staging/iio/meter/ade7854.h + create mode 100644 drivers/staging/iio/meter/meter.h + create mode 100644 drivers/staging/iio/resolver/Kconfig + create mode 100644 drivers/staging/iio/resolver/Makefile + create mode 100644 drivers/staging/iio/resolver/ad2s120x.c + create mode 100644 drivers/staging/iio/resolver/ad2s1210.c + create mode 100644 drivers/staging/iio/resolver/ad2s90.c + create mode 100644 drivers/staging/sep/Kconfig + create mode 100644 drivers/staging/sep/Makefile + create mode 100644 drivers/staging/sep/TODO + create mode 100644 drivers/staging/sep/sep_dev.h + create mode 100644 drivers/staging/sep/sep_driver.c + create mode 100644 drivers/staging/sep/sep_driver_api.h + create mode 100644 drivers/staging/sep/sep_driver_config.h + create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h + create mode 100644 drivers/staging/ste_rmi4/Kconfig + create mode 100644 drivers/staging/ste_rmi4/Makefile + create mode 100644 drivers/staging/ste_rmi4/TODO + create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c + create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h + create mode 100644 drivers/staging/vme/bridges/Module.symvers + delete mode 100644 drivers/staging/winbond/mlmetxrx.c + delete mode 100644 drivers/staging/winbond/mlmetxrx_f.h + delete mode 100644 drivers/staging/winbond/sysdef.h + rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (98%) + delete mode 100644 drivers/staging/winbond/wbhal_f.h + delete mode 100644 drivers/staging/winbond/wblinux_f.h + delete mode 100644 drivers/staging/winbond/wbusb_s.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. +Resolved 'include/linux/hardirq.h' using previous resolution. +Resolved 'include/linux/smp_lock.h' using previous resolution. +Auto-merging arch/powerpc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/kernel/signal.c +Auto-merging block/compat_ioctl.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/char/amiserial.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/cx88/cx88-video.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/block/dasd_eer.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/cx25821/cx25821.h +Auto-merging drivers/staging/easycap/easycap.h +Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/host/isp1362-hcd.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ioctl.c +Auto-merging fs/locks.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/reiserfs/ioctl.c +Auto-merging include/linux/hardirq.h +CONFLICT (content): Merge conflict in include/linux/hardirq.h +Auto-merging include/linux/smp_lock.h +CONFLICT (content): Merge conflict in include/linux/smp_lock.h +Auto-merging include/linux/tty.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/sound.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0b5da44] Merge remote branch 'bkl-config/config' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/staging/Kconfig | 11 +++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + lib/Kconfig.debug | 9 --------- + 7 files changed, 21 insertions(+), 43 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1a7564] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..f25865dd3e84 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,10 @@ +Importing i2c based on 2.6.37-rc5-git2 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.37-rc5-git2 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.37-rc4 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.37-rc1-116-g151f52f +Unchanged quilt series rr +Importing device-mapper based on v2.6.37-rc4-12-g22a5b56 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1750356232ce --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20101210 |