diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-17 13:48:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-17 13:48:46 +1100 |
commit | 2422975e332ec03897bd473b76e1ac1b507fbbf1 (patch) | |
tree | 3309f6880f3ee5a2fa1e0d6c03bf7358330ce8c8 | |
parent | efcc1bc5c2a8dbb84f07b11fcb948f0158b46dbb (diff) |
Add linux-next specific files for 20101117next-20101117
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 181 | ||||
-rw-r--r-- | Next/Trees | 183 | ||||
-rw-r--r-- | Next/merge.log | 3766 | ||||
-rw-r--r-- | Next/quilt-import.log | 35 | ||||
-rw-r--r-- | localversion-next | 1 |
5 files changed, 4166 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..695c9a15abfe --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,181 @@ +Name SHA1 +---- ---- +origin 45314915ed8089634144c975357bf5ba17f06ab9 +fixes 2bfc96a127bc1cc94d26bfaa40159966064f9c8c +arm-current 9395f6ea3c61d80ccc7a13668d27afbb8d9436ba +m68k-current e53beacd23d9cb47590da6a7a7f6d417b941a994 +powerpc-merge 93f68f1ef787d97ab688f78a01f446e85bb9a496 +sparc-current e69f58c037ab5b166b3858fa7b5d7fa470613e8f +scsi-rc-fixes 59055a94b2a4ce6506f3a70080fc6ad9f1cfcce0 +net-current 3b42a96dc7870c53d20b419185737d3b8f7a7b74 +sound-current e2e9566230e0c93d89948cbc799a191d35383d09 +pci-current 8c05cd08a7504b855c265263e84af61aabafa329 +wireless-current 9236d838c920e90708570d9bbd7bb82d30a38130 +kbuild-current e9203c988234aa512bd45ca32b52e21c7bbfc414 +driver-core.current 318af55ddd38bdaaa2b57f5c3bd394f3ce3a2610 +tty.current a80c49dbb6cd389fd5b0d79f850b56322475d00b +usb.current 02e2c51ba3e80acde600721ea784c3ef84da5ea1 +staging.current 3251627c943f1cfc5bfad7c38d4e8d85cf44c6d8 +cpufreq-current 320b2b8de12698082609ebbc1a17165727f4c893 +input-current 6f07d31e46639e4b1b23de6ee88c9e079a7bf32d +md-current f3ac8bf7ce1c5abd763ea762e95d1cdcf7799372 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current c054a076a1bd4731820a9c4d638b13d5c9bf5935 +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 849653372d3f98332bf84e9fb814d9f9a02eeda2 +rmobile-current 6800e4c0ea3e96cf78953b8b5743381cb1bb9e37 +fbdev-current e3a4d1d2de7251d4a00b04f50f6b3d2a1fc0fe5f +gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e +arm f1d05bd7f53ae14a3ca0c5966624e619b9045b1b +davinci 489e176c71f36654dcb8835926f7e5717b8b4c19 +i.MX 9b7907dca95860eda87f625f2e8edcbf7b47ecab +msm 178578fefe43e746c5d85174f562c25bf7f62dc0 +omap 440a4cf8f5acfefc7afecb0bcea378e2e853029c +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung d70c5240ae4e10d57a5cbd1c0b08b77c0465024d +s5p c0403fe76295c07817414e9e8fbfe7a78fd43013 +tegra f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 3d0ae3e55d62ee94d5d10b62a5b5e5fa5972f1b7 +cris 395bc5121828e570bd4bb6455c82b80e2f2b05b4 +ia64 d4429f608abde89e8bc1e24b43cd503feb95c496 +m68k e53beacd23d9cb47590da6a7a7f6d417b941a994 +m68knommu 86d1e7fef650aff4156386883b7ad6e1d7b235b1 +microblaze 473ff6609c0778c5939164c5c57676b74164be71 +mips 8fd01d6cfbf75465d84a4e533ed70c5f57b3ff51 +parisc 6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3 +powerpc 6a1c9dfe4186f18fed38421b35b40fb9260cbfe1 +4xx 2989b722c9c4694cf6c5aa378f9c8a14e106d320 +52xx-and-virtex e39d5ef678045d61812c1401f04fe8edb14d6359 +galak e0dc09ff9a28f37441c5e92a14de6abda8db49d6 +s390 e74370be8c1540d54037079a72cdd24403ed99a9 +sh 5c4986b8a9ddd9cf649abe38a102866f7809b1d2 +rmobile cf655c36fad7b6488a56f18ab56f7d608ca6552b +sparc 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +tile d02db4f8d79c5841ba32b326edb75ea6acd081ca +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph efa4c1206eaff047c474af2136748a58eb8cc33b +cifs 362d31297fafb150676f4d564ecc7f7f3e3b7fd4 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 66a595a5c4a0f7a4ea78fbeddfe4002c036b96f1 +ext3 4408ea41c0ab4b711d4da44dd954fb06dce6c3f8 +ext4 7ff9c073dd4d7200399076554f7ab9b876f196f6 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 0157443c56bcc50be4933ebdff3ece723dfd535c +gfs2 e99a321d5d6cc613077ddd93d7c40b2be0c2b8a7 +hfsplus 6f80dfe55fcbde1e588bc2cfa1273403b710872d +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 04e4bd1c67f941d81bff78a3b6b94194f081b7df +nfsd c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +nilfs2 02e93a0dcd53e54d720e78d606c813db424b73d7 +ocfs2 2decd65a2630633cee04d0b83fdcee46ad2989a1 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 5f3b321da1aa5936c85ed6dec67358239a9d3cfd +udf 581b7e9fc00789782cb3bdca58db49f6f0f66608 +v9fs f6614b7bb405a9b35dd28baea989a749492c46b2 +ubifs 18cb657ca1bafe635f368346a1676fb04c512edf +xfs ece413f59f257682de4a2e2e42af33b016af53f3 +vfs 99b7db7b8ffd6bb755eb0a175596421a0b581cb2 +pci 5e19c6fc65fa55bcf4d5af2447151f7e320ead54 +hid 5533867c7623aaabbefecfb58595a97ed3297ca3 +i2c c9a574324779070985f0a1845d1aa7edbbda62ae +bjdooks-i2c 9cc11dee3ddf140e39b0088688bfe5ee45d63b41 +jdelvare-hwmon 3eb9681b7eac3904c0aeb5ad70ab8d05d781d0f8 +hwmon-staging 4e596b3f24631c999541d0465bf33f10325e8efd +kernel-doc 58af35887cdbac4d285fdccd51087ee22ccec07a +v4l-dvb 6b101926f98b54549128db4d34f4a73b5f03fecc +kbuild 93676133c3f0b2fc281b4f2e82d05de3598a735b +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata a74350f1bd90cd818d4cbfe2342c8852809eec93 +infiniband c48c43e422c1404fd72c57d1d21a6f6d01e18900 +acpi e1742a3b2e6cf8d219beb56ef5ecea197774f6ea +idle-test c25d29952b2a8c9aaf00e081c9162a0e383030cd +ieee1394 7242604b89a42b030b48cc203837b3ea5f890191 +ubi 18cb657ca1bafe635f368346a1676fb04c512edf +kvm df8940eadf011db2d4bedecf6eb659d44494edb3 +dlm f92c8dd7a0eb18124521e2b549f88422e17f707b +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 151f52f09c5728ecfdd0c289da1a4b30bb416f2c +async_tx 964dc256bb91e990277010a3f6dc66daa130be8b +net b178bb3dfc30d9555bdd2401e95af98e23e83e10 +wireless a1d94d4820709e40519e26cb49f5fa3caf3011ab +bluetooth 7ca8f632c48031136145dbdf602f87655ff49943 +mtd 79346507ad48895f41b438fa562b1965721f36b9 +crypto 69435b94d01f49197b287eb5902fb8c5cee8fe1d +sound 211231d0b4e4a9ec59fe9800e76689af07a9013d +sound-asoc ce0df3d79a1b305cb39ea15a07235b5a6c3435b6 +cpufreq a69a0612c4cb7b08570d1b25b542cef478a2d79a +rr f58b91d22b16d48f0b4910b835ee0dba7987b263 +input 20a4c261ad9cec39942257b1f91765a4b238db05 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 82cc2e4b513e23a03df78b7f32ef957ef8180405 +device-mapper 82cc2e4b513e23a03df78b7f32ef957ef8180405 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 106665d937df6eff33c71997a52f7bc3aefa6c12 +battery e53beacd23d9cb47590da6a7a7f6d417b941a994 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 220e9ef656980ca7ac186b82cd60f361d960d21a +kgdb e99d11d19977c74b18411cdb59cdebb788237a6e +slab 98072e4d977aabe6a39abb95951cd8bf2c2202d5 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f3ac8bf7ce1c5abd763ea762e95d1cdcf7799372 +mfd 0f48285755991b73c14b6eeeee464590f490ac25 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 01d5a1fa340d62b8f8540d040f4ee0537abbab90 +fbdev 27d29dc4be07aafae270992f8d6e400f8912a33d +viafb b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 +omap_dss2 18016e35d448d35739f8640b51476709c07e95db +voltage f013a13800ed0f5abf31b95ec995f6316f8c4500 +security-testing 074e61ec3751da9ab88ee66d3818574556c03489 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 8f21dd55b61da1e23ae4be6a3d152b0c89076c34 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu eecfd57f6429d9d8e10be186566ef99fced55163 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd fe2fd9ed5bf184f797412be8b86f4589d1b77bb8 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 2f55ac072f5344519348c0c94b3d2f4cca46847b +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 00fafcda1773245a5292f953321ec3f0668c8c28 +fsnotify 3aa13e3ff6700929c0e3a1a4cdc51c82139707e4 +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac c7a471ec6528ede2acd45bb5e37c0f8a094ec001 +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 97ff46cb69da22037346670ae515217c658ace02 +spi 65289d6345d93abd860e43fd2119ac176d6cc697 +tip 6df94c0aff950aec1e3d4689f88fa56fa9f67099 +rcu e2070a1fe8c382e58685b564bc33ba81346467f8 +oprofile c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +xen 36735b58be4dd54e16648c03069c8b35bfe0bf84 +swiotlb-xen 723ee043b152e4ed7d901fb791a513bc60bb9a9c +xen-pvhvm e0b58be59e4e278480b120ba827b8cfee7c7ddbd +edac-amd f9ff4f7cf54eb18909adc55d97580531a80195b7 +percpu 71c0993943c5663f67a908dfd21a571674a71793 +workqueues 229aebb873e29726b91e076161649cf45154b0bf +sfi 82acf2a8fe4764e21a7ad406590453b004751e58 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 7f80d734b3b5d23b9851cc03cc20733bca2c724e +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 319684b1cd15f24120b9513b38a949539c0b7938 +tty 83abd0d897ad3b7d064c8d8594ec5cc8520d6646 +usb ad78acafeed26f62c9e644f96eecb7c19bd78bb4 +staging 2e3161390130f50fdbb4b989c667f42e5008107f +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-trivial 2a48fc0ab24241755dc93bfd4f01d68efab47f5a +bkl-llseek 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f +bkl-vfs 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 +bkl-config 5845e588d437f9b2c459706b44f9e9b4311e7885 +irqflags df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge 2bfc96a127bc1cc94d26bfaa40159966064f9c8c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..8402d5ee2c42 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,183 @@ +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 +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 +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +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 +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..c5a11f22a403 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3766 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6800e4c Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 +Merging origin/master +$ git merge origin/master +Updating 6800e4c..4531491 +Fast-forward + Makefile | 2 +- + arch/ia64/hp/sim/simscsi.c | 4 +- + arch/s390/Kconfig.debug | 12 ++++++ + arch/s390/include/asm/page.h | 5 ++ + arch/s390/kernel/kprobes.c | 70 +++++++++++++++++++++++++-------- + arch/s390/mm/gup.c | 7 +-- + drivers/ata/libata-scsi.c | 4 +- + drivers/block/cciss_scsi.c | 8 ++- + drivers/firewire/sbp2.c | 4 +- + drivers/infiniband/ulp/srp/ib_srp.c | 4 +- + drivers/message/fusion/mptfc.c | 7 ++- + drivers/message/fusion/mptsas.c | 4 +- + drivers/message/fusion/mptspi.c | 4 +- + drivers/message/i2o/i2o_scsi.c | 6 ++- + drivers/pci/pci-sysfs.c | 2 +- + drivers/s390/char/tape_core.c | 68 +++++++++++++++++++++++++++---- + drivers/s390/char/vmlogrdr.c | 36 +++++++++++------ + drivers/s390/cio/device.c | 11 +++++- + drivers/s390/scsi/zfcp_scsi.c | 4 +- + drivers/scsi/3w-9xxx.c | 4 +- + drivers/scsi/3w-sas.c | 4 +- + drivers/scsi/3w-xxxx.c | 4 +- + drivers/scsi/53c700.c | 8 ++- + drivers/scsi/BusLogic.c | 3 +- + drivers/scsi/BusLogic.h | 2 +- + drivers/scsi/NCR5380.c | 3 +- + drivers/scsi/NCR5380.h | 2 +- + drivers/scsi/NCR53c406a.c | 4 +- + drivers/scsi/a100u2w.c | 4 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/advansys.c | 4 +- + drivers/scsi/aha152x.c | 4 +- + drivers/scsi/aha1542.c | 4 +- + drivers/scsi/aha1542.h | 2 +- + drivers/scsi/aha1740.c | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- + drivers/scsi/aic7xxx_old.c | 4 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 7 ++- + drivers/scsi/arm/acornscsi.c | 4 +- + drivers/scsi/arm/fas216.c | 10 +++- + drivers/scsi/arm/fas216.h | 18 ++++----- + drivers/scsi/atari_NCR5380.c | 4 +- + drivers/scsi/atari_scsi.c | 17 -------- + drivers/scsi/atp870u.c | 4 +- + drivers/scsi/bfa/bfad_im.c | 7 ++- + drivers/scsi/dc395x.c | 3 +- + drivers/scsi/dpt_i2o.c | 4 +- + drivers/scsi/dpti.h | 2 +- + drivers/scsi/dtc.h | 2 +- + drivers/scsi/eata.c | 7 ++- + drivers/scsi/eata_pio.c | 4 +- + drivers/scsi/esp_scsi.c | 4 +- + drivers/scsi/fd_mcs.c | 4 +- + drivers/scsi/fdomain.c | 4 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 4 +- + drivers/scsi/g_NCR5380.h | 2 +- + drivers/scsi/gdth.c | 6 ++- + drivers/scsi/hpsa.c | 7 ++- + drivers/scsi/hptiop.c | 4 +- + drivers/scsi/ibmmca.c | 6 ++- + drivers/scsi/ibmvscsi/ibmvfc.c | 4 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 4 +- + drivers/scsi/imm.c | 4 +- + drivers/scsi/in2000.c | 4 +- + drivers/scsi/in2000.h | 2 +- + drivers/scsi/initio.c | 4 +- + drivers/scsi/ipr.c | 4 +- + drivers/scsi/ips.c | 6 ++- + drivers/scsi/libfc/fc_fcp.c | 4 +- + drivers/scsi/libiscsi.c | 4 +- + drivers/scsi/libsas/sas_scsi_host.c | 4 +- + drivers/scsi/lpfc/lpfc_scsi.c | 4 +- + drivers/scsi/mac53c94.c | 4 +- + drivers/scsi/megaraid.c | 6 ++- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/megaraid_mbox.c | 7 ++- + drivers/scsi/megaraid/megaraid_sas.c | 4 +- + drivers/scsi/mesh.c | 4 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 4 +- + drivers/scsi/ncr53c8xx.c | 4 +- + drivers/scsi/nsp32.c | 7 ++- + drivers/scsi/pas16.h | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 4 +- + drivers/scsi/pcmcia/nsp_cs.h | 3 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 4 +- + drivers/scsi/pmcraid.c | 4 +- + drivers/scsi/ppa.c | 4 +- + drivers/scsi/ps3rom.c | 4 +- + drivers/scsi/qla1280.c | 4 +- + drivers/scsi/qla2xxx/qla_os.c | 7 ++- + drivers/scsi/qla4xxx/ql4_os.c | 7 ++- + drivers/scsi/qlogicfas408.c | 4 +- + drivers/scsi/qlogicfas408.h | 3 +- + drivers/scsi/qlogicpti.c | 4 +- + drivers/scsi/scsi.c | 18 ++------ + drivers/scsi/scsi_debug.c | 4 +- + drivers/scsi/scsi_error.c | 6 +-- + drivers/scsi/stex.c | 4 +- + drivers/scsi/sun3_NCR5380.c | 4 +- + drivers/scsi/sun3_scsi.h | 3 +- + drivers/scsi/sym53c416.c | 4 +- + drivers/scsi/sym53c416.h | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +- + drivers/scsi/t128.h | 3 +- + drivers/scsi/tmscsim.c | 4 +- + drivers/scsi/u14-34f.c | 6 ++- + drivers/scsi/ultrastor.c | 4 +- + drivers/scsi/ultrastor.h | 3 +- + drivers/scsi/vmw_pvscsi.c | 4 +- + drivers/scsi/wd33c93.c | 6 ++- + drivers/scsi/wd33c93.h | 3 +- + drivers/scsi/wd7000.c | 4 +- + drivers/staging/hv/storvsc_drv.c | 7 ++- + drivers/staging/keucr/scsiglue.c | 4 +- + drivers/usb/image/microtek.c | 6 ++- + drivers/usb/storage/scsiglue.c | 4 +- + drivers/usb/storage/uas.c | 4 +- + include/linux/libata.h | 2 +- + include/linux/security.h | 9 ++-- + include/scsi/libfc.h | 3 +- + include/scsi/libiscsi.h | 3 +- + include/scsi/libsas.h | 3 +- + include/scsi/scsi_host.h | 23 ++++++++++- + kernel/futex.c | 3 +- + kernel/futex_compat.c | 3 +- + kernel/printk.c | 15 +++++++- + kernel/sysctl.c | 2 +- + kernel/trace/Kconfig | 2 +- + security/capability.c | 5 ++ + security/commoncap.c | 21 ---------- + security/security.c | 4 +- + security/selinux/hooks.c | 6 +-- + security/smack/smack_lsm.c | 8 +--- + 135 files changed, 549 insertions(+), 288 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Recorded preimage for 'drivers/scsi/scsi_error.c' +Recorded preimage for 'include/scsi/scsi_host.h' +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/block/cciss_scsi.c +Auto-merging drivers/message/fusion/mptfc.c +Auto-merging drivers/scsi/53c700.c +Auto-merging drivers/scsi/arcmsr/arcmsr_hba.c +Auto-merging drivers/scsi/arm/fas216.c +Auto-merging drivers/scsi/bfa/bfad_im.c +Auto-merging drivers/scsi/eata.c +Auto-merging drivers/scsi/gdth.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/ibmmca.c +Auto-merging drivers/scsi/ips.c +Auto-merging drivers/scsi/megaraid.c +Auto-merging drivers/scsi/megaraid/megaraid_mbox.c +Auto-merging drivers/scsi/nsp32.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/scsi/qla4xxx/ql4_os.c +Auto-merging drivers/scsi/scsi.c +Auto-merging drivers/scsi/scsi_error.c +CONFLICT (content): Merge conflict in drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/u14-34f.c +Auto-merging drivers/staging/hv/storvsc_drv.c +Auto-merging drivers/usb/image/microtek.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging include/scsi/scsi_host.h +CONFLICT (content): Merge conflict in include/scsi/scsi_host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/scsi/scsi_error.c'. +Recorded resolution for 'include/scsi/scsi_host.h'. +[master 21287a3] Merge remote branch 'scsi-rc-fixes/master' +$ git diff -M --stat --summary HEAD^.. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + include/linux/rtnetlink.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/oss/dev_table.c | 6 ++---- + sound/oss/midibuf.c | 4 ++-- + sound/oss/pss.c | 6 +++--- + sound/oss/sequencer.c | 4 ++-- + sound/pci/ctxfi/ctpcm.c | 16 ++++++++++------ + sound/pci/hda/patch_sigmatel.c | 14 ++++++++++++-- + sound/pci/mixart/mixart_hwdep.h | 10 ++++++++++ + sound/spi/at73c213.c | 2 +- + 8 files changed, 42 insertions(+), 20 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/ath9k/eeprom_9287.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 9 ++++ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/init.c | 3 +- + drivers/net/wireless/ath/ath9k/reg.h | 8 +++- + drivers/net/wireless/ath/carl9170/usb.c | 4 +- + include/net/cfg80211.h | 2 +- + net/wireless/chan.c | 52 +++++++++++++++++++++++++ + 8 files changed, 75 insertions(+), 7 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 +Removing Documentation/driver-model/interface.txt +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/driver-model/interface.txt | 129 ------------------------------ + MAINTAINERS | 2 +- + drivers/uio/uio.c | 2 +- + drivers/uio/uio_cif.c | 2 +- + drivers/uio/uio_netx.c | 2 +- + include/linux/cpu.h | 5 - + include/linux/node.h | 5 - + include/linux/uio_driver.h | 2 +- + 8 files changed, 5 insertions(+), 144 deletions(-) + delete mode 100644 Documentation/driver-model/interface.txt +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Merge made by recursive. + drivers/serial/8250.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Merge made by recursive. + drivers/usb/atm/ueagle-atm.c | 7 +-- + drivers/usb/gadget/atmel_usba_udc.c | 2 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-hcd.c | 10 ++-- + drivers/usb/host/ehci-mem.c | 26 +++++++++++- + drivers/usb/host/ehci-pci.c | 13 ++++++ + drivers/usb/host/ehci-sched.c | 21 +++++++++- + drivers/usb/host/ehci.h | 2 + + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/xhci-mem.c | 4 +- + drivers/usb/host/xhci-ring.c | 1 - + drivers/usb/host/xhci.c | 73 ++++++++++++++++++++++++++++++----- + drivers/usb/host/xhci.h | 5 ++ + drivers/usb/misc/cypress_cy7c63.c | 6 +-- + drivers/usb/misc/trancevibrator.c | 2 +- + drivers/usb/misc/usbled.c | 2 +- + drivers/usb/misc/usbsevseg.c | 10 ++--- + drivers/usb/otg/langwell_otg.c | 9 ++-- + drivers/usb/storage/sierra_ms.c | 2 +- + 19 files changed, 151 insertions(+), 48 deletions(-) +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Merge made by recursive. + drivers/staging/asus_oled/asus_oled.c | 8 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/frontier/tranzport.c | 2 +- + drivers/staging/iio/accel/adis16220_core.c | 2 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 2 +- + drivers/staging/line6/control.c | 204 ++++++++++---------- + drivers/staging/line6/midi.c | 4 +- + drivers/staging/line6/pcm.c | 4 +- + drivers/staging/line6/pod.c | 32 ++-- + drivers/staging/line6/toneport.c | 4 +- + drivers/staging/line6/variax.c | 12 +- + drivers/staging/quickstart/quickstart.c | 10 +- + drivers/staging/rtl8187se/r8185b_init.c | 32 +++- + drivers/staging/rtl8712/usb_halinit.c | 2 +- + drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- + drivers/staging/speakup/fakekey.c | 1 - + drivers/staging/udlfb/udlfb.c | 2 +- + drivers/staging/zram/zram_sysfs.c | 4 +- + 18 files changed, 175 insertions(+), 156 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/tablet/aiptek.c | 28 ++++---- + drivers/tty/sysrq.c | 169 ++++++++++++++++++++++++++++++----------- + 2 files changed, 138 insertions(+), 59 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Removing Documentation/sh/clk.txt +Merge made by recursive. + Documentation/DocBook/sh.tmpl | 4 --- + Documentation/sh/clk.txt | 32 ------------------------------ + arch/arm/mach-shmobile/clock-sh7372.c | 6 +--- + arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 2 +- + drivers/sh/clk/core.c | 13 ++--------- + drivers/sh/clk/cpg.c | 5 +-- + include/linux/sh_clk.h | 34 ++----------------------------- + 7 files changed, 11 insertions(+), 85 deletions(-) + delete mode 100644 Documentation/sh/clk.txt +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 +Merge made by recursive. + drivers/video/sh_mobile_lcdcfb.c | 4 ++-- + include/video/da8xx-fb.h | 1 - + 2 files changed, 2 insertions(+), 3 deletions(-) +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++ + arch/arm/common/Makefile | 1 + + arch/arm/{plat-versatile => common}/timer-sp.c | 4 +- + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/domain.h | 31 +++- + arch/arm/include/asm/futex.h | 9 +- + .../plat => include/asm/hardware}/timer-sp.h | 0 + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 2 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 267 ++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 +- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++- + arch/arm/lib/uaccess.S | 83 +++--- + arch/arm/mach-integrator/integrator_cp.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 51 ++-- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- + arch/arm/mach-vexpress/v2m.c | 2 +- + arch/arm/mm/Kconfig | 35 +++ + arch/arm/mm/mmu.c | 6 +- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + arch/arm/plat-versatile/Makefile | 1 - + drivers/mmc/host/mmci.c | 180 +++++++++++-- + drivers/mmc/host/mmci.h | 9 + + drivers/rtc/rtc-sa1100.c | 63 ++++- + 32 files changed, 730 insertions(+), 163 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + rename arch/arm/{plat-versatile => common}/timer-sp.c (98%) + rename arch/arm/{plat-versatile/include/plat => include/asm/hardware}/timer-sp.h (100%) + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 3 + + arch/arm/mach-imx/devices.c | 8 +- + arch/arm/mach-imx/dma-v1.c | 2 +- + arch/arm/mach-imx/eukrea_mbimx27-baseboard.c | 6 - + arch/arm/mach-imx/mm-imx1.c | 7 +- + arch/arm/mach-imx/mm-imx21.c | 21 +-- + arch/arm/mach-imx/mm-imx27.c | 21 +-- + arch/arm/mach-imx/pm-imx27.c | 3 + + arch/arm/mach-mx25/devices-imx25.h | 4 +- + arch/arm/mach-mx25/devices.c | 8 +- + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- + arch/arm/mach-mx25/mach-mx25_3ds.c | 2 +- + arch/arm/mach-mx25/mm.c | 27 +-- + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/Makefile | 3 - + arch/arm/mach-mx3/devices.c | 72 ++++---- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 2 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 2 +- + arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- + arch/arm/mach-mx3/mach-pcm043.c | 16 +- + arch/arm/mach-mx3/mm.c | 63 +++---- + arch/arm/mach-mx5/Kconfig | 6 +- + arch/arm/mach-mx5/board-cpuimx51.c | 4 +- + arch/arm/mach-mx5/board-cpuimx51sd.c | 4 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 5 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 45 ++++- + arch/arm/mach-mx5/board-mx51_efikamx.c | 245 ++++++++++++++++++++++++- + arch/arm/mach-mx5/cpu.c | 3 + + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 +- + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx5/mm.c | 35 +--- + arch/arm/mach-mxc91231/mm.c | 53 +----- + arch/arm/plat-mxc/Kconfig | 11 +- + arch/arm/plat-mxc/Makefile | 5 +- + arch/arm/plat-mxc/{irq.c => avic.c} | 0 + arch/arm/plat-mxc/devices/platform-imx-dma.c | 8 - + arch/arm/plat-mxc/devices/platform-spi_imx.c | 1 + + arch/arm/plat-mxc/include/mach/common.h | 2 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 24 +-- + arch/arm/plat-mxc/include/mach/hardware.h | 87 +++++++++- + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 ++- + arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++++- + arch/arm/plat-mxc/include/mach/mx1.h | 133 +------------- + arch/arm/plat-mxc/include/mach/mx21.h | 44 +----- + arch/arm/plat-mxc/include/mach/mx25.h | 23 +-- + arch/arm/plat-mxc/include/mach/mx27.h | 79 +-------- + arch/arm/plat-mxc/include/mach/mx2x.h | 149 --------------- + arch/arm/plat-mxc/include/mach/mx31.h | 49 +----- + arch/arm/plat-mxc/include/mach/mx35.h | 34 +--- + arch/arm/plat-mxc/include/mach/mx3x.h | 182 +------------------ + arch/arm/plat-mxc/include/mach/mx51.h | 42 +---- + arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +-- + arch/arm/plat-mxc/iomux-v3.c | 22 +- + arch/arm/plat-mxc/system.c | 8 + + drivers/video/mx3fb.c | 4 + + 59 files changed, 638 insertions(+), 1053 deletions(-) + rename arch/arm/plat-mxc/{irq.c => avic.c} (100%) +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap1/Kconfig | 11 +- + arch/arm/mach-omap1/Makefile | 4 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 - + arch/arm/mach-omap1/serial.c | 6 +- + arch/arm/mach-omap2/Kconfig | 15 + + arch/arm/mach-omap2/Makefile | 3 + + arch/arm/mach-omap2/board-4430sdp.c | 14 + + arch/arm/mach-omap2/board-am3517crane.c | 69 ++ + arch/arm/mach-omap2/board-omap4panda.c | 16 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 12 +- + arch/arm/mach-omap2/cm-regbits-24xx.h | 4 + + arch/arm/mach-omap2/mux.c | 369 ++++-- + arch/arm/mach-omap2/mux.h | 83 ++- + 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 | 145 +++- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 155 +++- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 233 ++++ + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 237 ++++ + arch/arm/mach-omap2/prm-regbits-34xx.h | 3 + + arch/arm/mach-omap2/serial.c | 15 +- + arch/arm/plat-omap/gpio.c | 5 + + arch/arm/plat-omap/i2c.c | 124 +-- + arch/arm/plat-omap/include/plat/i2c.h | 13 + + arch/arm/plat-omap/include/plat/l4_3xxx.h | 24 + + arch/arm/plat-omap/include/plat/omap-serial.h | 3 - + arch/arm/plat-omap/include/plat/uncompress.h | 1 + + arch/arm/plat-omap/mcbsp.c | 16 +- + drivers/i2c/busses/i2c-omap.c | 69 +- + drivers/input/serio/Kconfig | 1 - + drivers/serial/omap-serial.c | 6 +- + include/linux/i2c-omap.h | 5 + + include/linux/serial_reg.h | 12 + + 36 files changed, 3314 insertions(+), 313 deletions(-) + create mode 100644 arch/arm/mach-omap2/board-am3517crane.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 +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 8 ++++---- + arch/arm/mach-s3c64xx/mach-mini6410.c | 2 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 2 +- + arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 6 +++--- + arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 6 +++--- + arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c | 6 +++--- + 6 files changed, 15 insertions(+), 15 deletions(-) +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +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/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/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 + + 96 files changed, 8439 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 +Already up-to-date. +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/lib/memmove.c | 2 +- + 1 files changed, 1 insertions(+), 1 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 +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +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 | 128 ++++++----- + arch/s390/Kconfig.debug | 6 +- + arch/s390/defconfig | 152 +++++-------- + arch/s390/include/asm/hardirq.h | 16 -- + arch/s390/include/asm/kprobes.h | 20 +-- + arch/s390/include/asm/timex.h | 20 ++ + arch/s390/kernel/kprobes.c | 465 +++++++++++++++++++-------------------- + arch/s390/kvm/Kconfig | 7 +- + arch/s390/lib/delay.c | 2 - + drivers/s390/block/Kconfig | 24 ++- + drivers/s390/char/Kconfig | 69 ++++--- + drivers/s390/net/Kconfig | 51 +++-- + 12 files changed, 467 insertions(+), 493 deletions(-) +Merging sh/sh-latest +$ git merge sh/sh-latest +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 +Already up-to-date! +Merge made by recursive. +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 d06ad07] 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/addr.c +Auto-merging fs/ceph/super.c +Merge made by recursive. + fs/ceph/addr.c | 6 ++-- + fs/ceph/caps.c | 17 +++++++----- + fs/ceph/dir.c | 26 ++++++++++++++++++- + fs/ceph/export.c | 2 +- + fs/ceph/file.c | 52 +++++++++++++++++++++++++------------- + fs/ceph/inode.c | 53 +++++++++++++++++++++++++------------- + fs/ceph/mds_client.c | 39 +++++++++++++++++++--------- + fs/ceph/mds_client.h | 3 ++ + fs/ceph/super.c | 3 +- + fs/ceph/super.h | 6 ++-- + include/linux/ceph/ceph_fs.h | 16 +++++++++-- + include/linux/ceph/libceph.h | 3 +- + include/linux/ceph/messenger.h | 1 + + include/linux/ceph/osd_client.h | 7 +++- + net/ceph/messenger.c | 13 ++++----- + net/ceph/osd_client.c | 25 ++++++++++++------ + net/ceph/pagevec.c | 3 +- + 17 files changed, 186 insertions(+), 89 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at d06ad07 Merge remote branch 'xtensa/master' +Merging refs/next/20101116/ceph +$ git merge refs/next/20101116/ceph +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Kconfig | 1 + + fs/cifs/cifsacl.c | 44 ++++++++++++++++++++++++++------------------ + fs/cifs/cifsproto.h | 2 +- + fs/cifs/file.c | 4 +++- + fs/cifs/inode.c | 12 ++++++------ + fs/cifs/readdir.c | 29 ++++++++++++++++------------- + 6 files changed, 53 insertions(+), 39 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 +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 31 ++++++++++++++++++------------- + fs/gfs2/glock.h | 2 ++ + fs/gfs2/inode.c | 9 --------- + fs/gfs2/ops_inode.c | 18 +----------------- + fs/gfs2/xattr.c | 23 +---------------------- + 5 files changed, 22 insertions(+), 61 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/options.c | 26 ++++++++++++++++++++++++++ + fs/hfsplus/super.c | 8 +++----- + 3 files changed, 30 insertions(+), 5 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 bae47be] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/lockd/host.c | 11 ++--- + fs/nfs/dir.c | 100 ++++++++++++++++++++++++++++--------------- + fs/nfs/nfs2xdr.c | 4 +- + fs/nfs/nfs3xdr.c | 4 +- + fs/nfs/nfs4proc.c | 4 +- + fs/nfs/nfs4xdr.c | 2 +- + fs/nfs/super.c | 8 +++- + include/linux/lockd/lockd.h | 1 + + include/linux/nfs_fs.h | 6 --- + net/sunrpc/stats.c | 4 +- + 10 files changed, 86 insertions(+), 58 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/super.c | 23 ++++++++++++++++------- + 1 files changed, 16 insertions(+), 7 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +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 +Recorded preimage for 'drivers/pci/pci-sysfs.c' +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/pci-sysfs.c +CONFLICT (content): Merge conflict in drivers/pci/pci-sysfs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/pci-sysfs.c'. +[master 5591f1e] 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 +Resolved 'drivers/hid/hid-input.c' using previous resolution. +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-input.c +CONFLICT (content): Merge conflict in drivers/hid/hid-input.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9aab0c2] Merge remote branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/hid/Kconfig | 10 +++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 49 +++++++++++- + drivers/hid/hid-core.c | 13 +++ + drivers/hid/hid-egalax.c | 2 +- + drivers/hid/hid-emsff.c | 162 +++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 9 ++ + drivers/hid/hid-input.c | 2 +- + drivers/input/mouse/bcm5974.c | 40 ++++++++++ + 9 files changed, 281 insertions(+), 7 deletions(-) + create mode 100644 drivers/hid/hid-emsff.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/busses/i2c-nforce2.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 +++++ + Documentation/hwmon/adm9240 | 2 +- + Documentation/hwmon/w83793 | 2 +- + drivers/hwmon/adm9240.c | 32 +++++++++++++++-- + drivers/hwmon/it87.c | 30 +++++++-------- + 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 | 33 ++++++++++++++++-- + 11 files changed, 183 insertions(+), 92 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/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 | 10 +- + 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 +- + 27 files changed, 771 insertions(+), 1263 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/DocBook/uio-howto.tmpl | 6 ++-- + Documentation/development-process/2.Process | 33 ++++++++++++++------ + .../configfs/configfs_example_explicit.c | 2 +- + Documentation/gpio.txt | 10 ++++++ + Documentation/hwmon/lm93 | 2 +- + Documentation/hwmon/max6650 | 2 +- + MAINTAINERS | 2 + + scripts/kernel-doc | 12 +++++-- + 8 files changed, 50 insertions(+), 19 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/rc-map.c +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/video/ir-kbd-i2c.c +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-technisat-usb2.c | 93 ++ + drivers/media/IR/rc-map.c | 107 -- + drivers/media/Kconfig | 2 +- + drivers/media/Makefile | 2 +- + drivers/media/common/tuners/max2165.c | 10 +- + drivers/media/dvb/dm1105/Kconfig | 3 +- + drivers/media/dvb/dm1105/dm1105.c | 42 +- + drivers/media/dvb/dvb-usb/Kconfig | 8 + + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/af9015.c | 16 +- + drivers/media/dvb/dvb-usb/anysee.c | 2 +- + drivers/media/dvb/dvb-usb/dib0700.h | 2 +- + drivers/media/dvb/dvb-usb/dib0700_core.c | 8 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 144 +-- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 1 + + drivers/media/dvb/dvb-usb/dvb-usb-remote.c | 77 +- + drivers/media/dvb/dvb-usb/dvb-usb.h | 12 +- + drivers/media/dvb/dvb-usb/gp8psk.c | 28 + + drivers/media/dvb/dvb-usb/gp8psk.h | 8 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 200 ++-- + drivers/media/dvb/dvb-usb/technisat-usb2.c | 809 ++++++++++ + 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/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/stv090x.c | 22 + + drivers/media/dvb/frontends/stv090x.h | 15 + + drivers/media/dvb/mantis/mantis_common.h | 4 +- + drivers/media/dvb/mantis/mantis_input.c | 72 +- + drivers/media/dvb/siano/smscoreapi.c | 2 +- + drivers/media/dvb/siano/smsir.c | 52 +- + drivers/media/dvb/siano/smsir.h | 3 +- + drivers/media/dvb/ttpci/Kconfig | 3 +- + drivers/media/dvb/ttpci/budget-ci.c | 49 +- + drivers/media/radio/si4713-i2c.c | 74 +- + drivers/media/radio/si4713-i2c.h | 5 +- + drivers/media/{IR => rc}/Kconfig | 21 +- + drivers/media/{IR => rc}/Makefile | 7 +- + drivers/media/{IR => rc}/ene_ir.c | 129 +- + drivers/media/{IR => rc}/ene_ir.h | 3 +- + drivers/media/{IR => rc}/imon.c | 67 +- + drivers/media/rc/ir-functions.c | 120 ++ + drivers/media/{IR => rc}/ir-jvc-decoder.c | 15 +- + drivers/media/{IR => rc}/ir-lirc-codec.c | 123 +- + drivers/media/{IR => rc}/ir-nec-decoder.c | 17 +- + drivers/media/{IR => rc}/ir-rc5-decoder.c | 15 +- + drivers/media/{IR => rc}/ir-rc5-sz-decoder.c | 15 +- + drivers/media/{IR => rc}/ir-rc6-decoder.c | 19 +- + drivers/media/{IR => rc}/ir-sony-decoder.c | 13 +- + drivers/media/{IR => rc}/keymaps/Kconfig | 0 + drivers/media/{IR => rc}/keymaps/Makefile | 1 + + .../{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c | 0 + drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c | 0 + drivers/media/{IR => rc}/keymaps/rc-anysee.c | 0 + .../media/{IR => rc}/keymaps/rc-apac-viewcomp.c | 0 + drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c | 0 + .../{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c | 0 + .../media/{IR => rc}/keymaps/rc-avermedia-a16d.c | 0 + .../{IR => rc}/keymaps/rc-avermedia-cardbus.c | 0 + .../media/{IR => rc}/keymaps/rc-avermedia-dvbt.c | 0 + .../media/{IR => rc}/keymaps/rc-avermedia-m135a.c | 0 + .../{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c | 0 + .../media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c | 0 + drivers/media/{IR => rc}/keymaps/rc-avermedia.c | 0 + drivers/media/{IR => rc}/keymaps/rc-avertv-303.c | 0 + .../{IR => rc}/keymaps/rc-azurewave-ad-tu700.c | 0 + .../media/{IR => rc}/keymaps/rc-behold-columbus.c | 0 + drivers/media/{IR => rc}/keymaps/rc-behold.c | 0 + .../media/{IR => rc}/keymaps/rc-budget-ci-old.c | 0 + drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c | 0 + drivers/media/{IR => rc}/keymaps/rc-cinergy.c | 0 + drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c | 0 + drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c | 0 + .../{IR => rc}/keymaps/rc-digitalnow-tinytwin.c | 0 + drivers/media/{IR => rc}/keymaps/rc-digittrade.c | 0 + drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c | 0 + .../media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c | 0 + .../{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c | 0 + drivers/media/{IR => rc}/keymaps/rc-em-terratec.c | 0 + .../{IR => rc}/keymaps/rc-encore-enltv-fm53.c | 0 + drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c | 0 + .../media/{IR => rc}/keymaps/rc-encore-enltv2.c | 0 + drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c | 0 + drivers/media/{IR => rc}/keymaps/rc-eztv.c | 0 + drivers/media/{IR => rc}/keymaps/rc-flydvb.c | 0 + drivers/media/{IR => rc}/keymaps/rc-flyvideo.c | 0 + .../media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c | 0 + .../media/{IR => rc}/keymaps/rc-gadmei-rm008z.c | 0 + .../{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c | 0 + drivers/media/{IR => rc}/keymaps/rc-gotview7135.c | 0 + .../media/{IR => rc}/keymaps/rc-hauppauge-new.c | 0 + drivers/media/{IR => rc}/keymaps/rc-imon-mce.c | 0 + drivers/media/{IR => rc}/keymaps/rc-imon-pad.c | 0 + .../media/{IR => rc}/keymaps/rc-iodata-bctv7e.c | 0 + drivers/media/{IR => rc}/keymaps/rc-kaiomy.c | 0 + drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c | 0 + .../{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c | 0 + .../media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c | 0 + drivers/media/{IR => rc}/keymaps/rc-lirc.c | 0 + drivers/media/{IR => rc}/keymaps/rc-lme2510.c | 0 + drivers/media/{IR => rc}/keymaps/rc-manli.c | 0 + .../media/{IR => rc}/keymaps/rc-msi-digivox-ii.c | 0 + .../media/{IR => rc}/keymaps/rc-msi-digivox-iii.c | 0 + .../{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c | 0 + .../media/{IR => rc}/keymaps/rc-msi-tvanywhere.c | 0 + drivers/media/{IR => rc}/keymaps/rc-nebula.c | 0 + .../keymaps/rc-nec-terratec-cinergy-xs.c | 0 + drivers/media/{IR => rc}/keymaps/rc-norwood.c | 0 + drivers/media/{IR => rc}/keymaps/rc-npgtech.c | 0 + drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c | 0 + .../media/{IR => rc}/keymaps/rc-pinnacle-color.c | 0 + .../media/{IR => rc}/keymaps/rc-pinnacle-grey.c | 0 + .../media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c | 0 + .../media/{IR => rc}/keymaps/rc-pixelview-mk12.c | 0 + .../media/{IR => rc}/keymaps/rc-pixelview-new.c | 0 + drivers/media/{IR => rc}/keymaps/rc-pixelview.c | 0 + .../{IR => rc}/keymaps/rc-powercolor-real-angel.c | 0 + drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c | 0 + drivers/media/{IR => rc}/keymaps/rc-purpletv.c | 0 + drivers/media/{IR => rc}/keymaps/rc-pv951.c | 0 + .../{IR => rc}/keymaps/rc-rc5-hauppauge-new.c | 0 + drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c | 0 + drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c | 21 +- + .../{IR => rc}/keymaps/rc-real-audio-220-32-keys.c | 0 + drivers/media/{IR => rc}/keymaps/rc-streamzap.c | 0 + drivers/media/{IR => rc}/keymaps/rc-tbs-nec.c | 0 + .../{IR => rc}/keymaps/rc-terratec-cinergy-xs.c | 0 + .../media/{IR => rc}/keymaps/rc-terratec-slim.c | 0 + drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c | 0 + .../{IR => rc}/keymaps/rc-total-media-in-hand.c | 0 + drivers/media/{IR => rc}/keymaps/rc-trekstor.c | 0 + drivers/media/{IR => rc}/keymaps/rc-tt-1500.c | 0 + drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c | 0 + .../media/{IR => rc}/keymaps/rc-videomate-s350.c | 0 + .../media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c | 0 + .../{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c | 0 + drivers/media/{IR => rc}/keymaps/rc-winfast.c | 0 + drivers/media/{IR => rc}/lirc_dev.c | 0 + drivers/media/{IR => rc}/mceusb.c | 182 +-- + drivers/media/{IR => rc}/nuvoton-cir.c | 95 +- + drivers/media/{IR => rc}/nuvoton-cir.h | 3 +- + .../media/{IR/ir-core-priv.h => rc/rc-core-priv.h} | 26 +- + drivers/media/rc/rc-main.c | 1135 ++++++++++++++ + drivers/media/{IR/ir-raw-event.c => rc/rc-raw.c} | 193 ++-- + drivers/media/{IR => rc}/streamzap.c | 66 +- + drivers/media/rc/winbond-cir.c | 932 ++++++++++++ + drivers/media/video/Kconfig | 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-input.c | 73 +- + drivers/media/video/bt8xx/bttvp.h | 1 - + drivers/media/video/cafe_ccic.c | 5 +- + drivers/media/video/cx18/Kconfig | 3 +- + drivers/media/video/cx231xx/Kconfig | 19 +- + drivers/media/video/cx231xx/Makefile | 5 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 1 + + drivers/media/video/cx231xx/cx231xx-cards.c | 59 +- + 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 | 22 +- + drivers/media/video/cx23885/cx23885-input.c | 64 +- + drivers/media/video/cx23885/cx23885.h | 3 +- + drivers/media/video/cx88/Kconfig | 3 +- + drivers/media/video/cx88/cx88-input.c | 233 +-- + drivers/media/video/em28xx/Kconfig | 5 +- + drivers/media/video/em28xx/em28xx-cards.c | 66 +- + drivers/media/video/em28xx/em28xx-dvb.c | 16 + + drivers/media/video/em28xx/em28xx-input.c | 72 +- + drivers/media/video/em28xx/em28xx.h | 2 + + drivers/media/video/gspca/cpia1.c | 10 +- + drivers/media/video/gspca/gspca.c | 16 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- + drivers/media/video/gspca/ov519.c | 10 +- + 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 | 2 +- + drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 4 +- + drivers/media/video/gspca/t613.c | 2 +- + drivers/media/video/gspca/tv8532.c | 2 +- + drivers/media/video/gspca/xirlink_cit.c | 194 ++- + drivers/media/video/gspca/zc3xx.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 59 +- + drivers/media/video/ivtv/Kconfig | 3 +- + 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 | 123 +- + drivers/media/video/saa7134/saa7134-tvaudio.c | 12 +- + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/tlg2300/Kconfig | 4 +- + drivers/staging/cx25821/Kconfig | 4 +- + drivers/staging/go7007/Kconfig | 4 +- + drivers/staging/tm6000/tm6000-input.c | 98 +- + include/media/ir-common.h | 38 +- + include/media/ir-core.h | 201 ++-- + include/media/ir-kbd-i2c.h | 9 +- + include/media/rc-map.h | 1 + + include/media/si4713.h | 3 +- + 220 files changed, 6577 insertions(+), 5423 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 + create mode 100644 drivers/media/IR/keymaps/rc-technisat-usb2.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 (88%) + rename drivers/media/{IR => rc}/Makefile (81%) + 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 (97%) + create mode 100644 drivers/media/rc/ir-functions.c + rename drivers/media/{IR => rc}/ir-jvc-decoder.c (91%) + rename drivers/media/{IR => rc}/ir-lirc-codec.c (72%) + rename drivers/media/{IR => rc}/ir-nec-decoder.c (92%) + rename drivers/media/{IR => rc}/ir-rc5-decoder.c (91%) + rename drivers/media/{IR => rc}/ir-rc5-sz-decoder.c (89%) + rename drivers/media/{IR => rc}/ir-rc6-decoder.c (92%) + rename drivers/media/{IR => rc}/ir-sony-decoder.c (92%) + rename drivers/media/{IR => rc}/keymaps/Kconfig (100%) + rename drivers/media/{IR => rc}/keymaps/Makefile (98%) + rename drivers/media/{IR => rc}/keymaps/rc-adstech-dvb-t-pci.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-alink-dtu-m.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-anysee.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-apac-viewcomp.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-asus-pc39.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-ati-tv-wonder-hd-600.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-a16d.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-cardbus.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-dvbt.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m135a.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-m733a-rm-k6.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia-rm-ks.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avermedia.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-avertv-303.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-azurewave-ad-tu700.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-behold-columbus.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-behold.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-budget-ci-old.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-cinergy-1400.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-cinergy.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-dib0700-nec.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-dib0700-rc5.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-digitalnow-tinytwin.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-digittrade.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-dm1105-nec.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvb-t.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-dntv-live-dvbt-pro.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-em-terratec.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv-fm53.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-encore-enltv2.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-evga-indtube.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-eztv.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-flydvb.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-flyvideo.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-fusionhdtv-mce.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-gadmei-rm008z.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-genius-tvgo-a11mce.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-gotview7135.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-hauppauge-new.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-imon-mce.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-imon-pad.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-iodata-bctv7e.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-kaiomy.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-kworld-315u.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-kworld-plus-tv-analog.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-leadtek-y04g0051.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-lirc.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-lme2510.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-manli.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-ii.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-digivox-iii.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere-plus.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-msi-tvanywhere.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-nebula.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-nec-terratec-cinergy-xs.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-norwood.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-npgtech.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pctv-sedna.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-color.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-grey.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pinnacle-pctv-hd.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview-mk12.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview-new.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pixelview.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-powercolor-real-angel.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-proteus-2309.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-purpletv.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-pv951.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-rc5-hauppauge-new.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-rc5-tv.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-rc6-mce.c (82%) + rename drivers/media/{IR => rc}/keymaps/rc-real-audio-220-32-keys.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-streamzap.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-tbs-nec.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-terratec-cinergy-xs.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-terratec-slim.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-tevii-nec.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-total-media-in-hand.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-trekstor.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-tt-1500.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-twinhan1027.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-videomate-s350.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-videomate-tv-pvr.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-winfast-usbii-deluxe.c (100%) + rename drivers/media/{IR => rc}/keymaps/rc-winfast.c (100%) + rename drivers/media/{IR => rc}/lirc_dev.c (100%) + rename drivers/media/{IR => rc}/mceusb.c (91%) + 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} (85%) + create mode 100644 drivers/media/rc/rc-main.c + rename drivers/media/{IR/ir-raw-event.c => rc/rc-raw.c} (63%) + rename drivers/media/{IR => rc}/streamzap.c (92%) + create mode 100644 drivers/media/rc/winbond-cir.c + create mode 100644 drivers/media/video/cx231xx/cx231xx-input.c +$ git reset --hard HEAD^ +HEAD is now at 4d42c7f Merge branch 'quilt/kernel-doc' +Merging refs/next/20101112/v4l-dvb +$ git merge refs/next/20101112/v4l-dvb +Already up-to-date. +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/basic/fixdep.c | 109 ++++++++++++++++++++++++++-------------------- + scripts/package/builddeb | 6 ++- + 2 files changed, 65 insertions(+), 50 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 +- + 5 files changed, 545 insertions(+), 6 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. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +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 +Already up-to-date. +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 +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Auto-merging drivers/net/wireless/ath/ath9k/eeprom_9287.c +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/carl9170/usb.c +Auto-merging include/net/cfg80211.h +Merge made by recursive. + Documentation/networking/stmmac.txt | 48 +- + arch/arm/mach-omap2/board-omap3pandora.c | 32 +- + drivers/block/aoe/aoecmd.c | 6 +- + drivers/infiniband/core/addr.c | 8 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 4 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 2 +- + 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 | 243 ++-- + drivers/net/arm/w90p910_ether.c | 2 +- + drivers/net/at1700.c | 2 +- + drivers/net/atarilance.c | 2 +- + drivers/net/bnx2x/bnx2x_link.c | 4 +- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/bonding/bond_main.c | 8 +- + drivers/net/can/mscan/mscan.c | 2 +- + drivers/net/cnic.c | 2 +- + 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/e1000e/netdev.c | 2 +- + drivers/net/eepro.c | 2 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 4 +- + drivers/net/ixgbe/ixgbe_sriov.c | 2 +- + drivers/net/ks8851.c | 33 + + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 2 +- + drivers/net/macvlan.c | 80 +- + drivers/net/qlge/qlge.h | 4 +- + drivers/net/qlge/qlge_dbg.c | 21 +- + drivers/net/qlge/qlge_ethtool.c | 19 +- + drivers/net/qlge/qlge_mpi.c | 2 +- + drivers/net/sh_eth.c | 244 ++-- + drivers/net/usb/hso.c | 1 - + drivers/net/usb/ipheth.c | 2 +- + drivers/net/vxge/vxge-config.c | 1451 ++++++++++++------------ + drivers/net/vxge/vxge-config.h | 135 ++- + drivers/net/vxge/vxge-ethtool.c | 90 ++- + drivers/net/vxge/vxge-main.c | 535 +++++++-- + 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/ath/ath5k/base.c | 24 +- + drivers/net/wireless/ath/ath5k/debug.c | 30 +- + drivers/net/wireless/ath/ath5k/desc.h | 18 +- + drivers/net/wireless/ath/ath5k/phy.c | 8 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 14 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 123 +-- + drivers/net/wireless/ath/ath9k/ar9002_phy.c | 8 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 20 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 69 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.h | 6 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 14 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 14 +- + drivers/net/wireless/ath/ath9k/beacon.c | 12 +- + drivers/net/wireless/ath/ath9k/common.c | 15 +- + drivers/net/wireless/ath/ath9k/common.h | 14 +- + drivers/net/wireless/ath/ath9k/debug.c | 48 +- + drivers/net/wireless/ath/ath9k/debug.h | 5 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 3 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 9 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 27 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 62 +- + drivers/net/wireless/ath/ath9k/gpio.c | 10 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 70 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 9 +- + drivers/net/wireless/ath/ath9k/hw.c | 9 +- + drivers/net/wireless/ath/ath9k/hw.h | 16 +- + drivers/net/wireless/ath/ath9k/init.c | 88 +- + drivers/net/wireless/ath/ath9k/mac.c | 86 +- + drivers/net/wireless/ath/ath9k/mac.h | 13 +- + drivers/net/wireless/ath/ath9k/main.c | 167 +-- + drivers/net/wireless/ath/ath9k/pci.c | 40 +- + drivers/net/wireless/ath/ath9k/rc.c | 31 +- + drivers/net/wireless/ath/ath9k/recv.c | 42 +- + drivers/net/wireless/ath/ath9k/virtual.c | 3 +- + drivers/net/wireless/ath/ath9k/xmit.c | 102 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 5 +- + 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 | 2 +- + drivers/net/wireless/ath/carl9170/version.h | 6 +- + drivers/net/wireless/ath/debug.h | 2 + + drivers/net/wireless/ath/key.c | 9 +- + drivers/net/wireless/b43/b43.h | 13 + + drivers/net/wireless/b43/dma.c | 5 - + drivers/net/wireless/b43/phy_n.c | 14 +- + drivers/net/wireless/b43/radio_2055.c | 8 +- + drivers/net/wireless/b43/radio_2056.c | 51 + + drivers/net/wireless/b43/radio_2056.h | 1081 ++++++++++++++++++- + drivers/net/wireless/b43legacy/rfkill.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 3 + + drivers/net/wireless/iwlwifi/Makefile | 7 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 352 ++++++- + drivers/net/wireless/iwlwifi/iwl-5000.c | 26 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 230 ++-- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 53 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 619 ++++++++++ + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 493 ++------- + drivers/net/wireless/iwlwifi/iwl-agn.h | 41 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 841 +++----------- + drivers/net/wireless/iwlwifi/iwl-core.h | 70 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + + drivers/net/wireless/iwlwifi/iwl-dev.h | 3 + + drivers/net/wireless/iwlwifi/iwl-led.c | 2 + + drivers/net/wireless/iwlwifi/iwl-legacy.c | 662 +++++++++++ + drivers/net/wireless/iwlwifi/iwl-legacy.h | 79 ++ + drivers/net/wireless/iwlwifi/iwl-power.c | 95 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 3 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 47 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 49 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 49 +- + drivers/net/wireless/mac80211_hwsim.c | 5 +- + drivers/net/wireless/mwl8k.c | 7 +- + 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 | 61 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 43 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 16 +- + drivers/net/wireless/rt2x00/rt2800pci.h | 12 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 66 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 4 +- + drivers/net/wireless/rt2x00/rt2x00.h | 1 + + drivers/net/wireless/rt2x00/rt2x00config.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 37 +- + 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 | 39 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 33 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 2 - + 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 | 12 +- + drivers/net/wireless/wl12xx/wl1271.h | 13 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 83 ++ + drivers/net/wireless/wl12xx/wl1271_acx.h | 89 ++- + drivers/net/wireless/wl12xx/wl1271_boot.c | 10 +- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 215 ++-- + drivers/net/wireless/wl12xx/wl1271_event.c | 2 - + drivers/net/wireless/wl12xx/wl1271_main.c | 220 +++- + drivers/net/wireless/wl12xx/wl1271_rx.c | 28 +- + drivers/net/wireless/wl12xx/wl1271_rx.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_scan.c | 5 +- + drivers/net/wireless/wl12xx/wl1271_testmode.c | 12 + + drivers/net/wireless/wl12xx/wl1271_tx.c | 132 ++- + drivers/net/wireless/wl12xx/wl1271_tx.h | 3 +- + drivers/net/wireless/zd1201.c | 1 + + drivers/net/wireless/zd1211rw/zd_usb.c | 2 + + drivers/net/znet.c | 2 +- + drivers/ssb/pcihost_wrapper.c | 7 + + include/linux/bitops.h | 11 + + include/linux/dccp.h | 2 + + include/linux/if_bridge.h | 4 +- + include/linux/if_macvlan.h | 34 +- + include/linux/igmp.h | 12 +- + include/linux/inetdevice.h | 5 +- + include/linux/netdevice.h | 16 +- + include/linux/nl80211.h | 6 +- + include/linux/rfkill.h | 31 - + include/linux/wl12xx.h | 8 + + include/net/caif/cfctrl.h | 2 +- + include/net/cfg80211.h | 15 +- + include/net/dn_dev.h | 27 +- + include/net/dn_route.h | 10 + + include/net/dst.h | 8 +- + include/net/flow.h | 2 + + include/net/inet_sock.h | 2 +- + include/net/neighbour.h | 10 +- + include/net/netlink.h | 21 +- + include/net/route.h | 12 +- + include/net/sock.h | 57 +- + include/net/xfrm.h | 6 + + lib/nlattr.c | 22 +- + net/8021q/vlan.c | 10 +- + 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/bridge/br.c | 4 - + 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 | 13 +- + 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/core/dev.c | 77 +- + net/core/net-sysfs.c | 7 +- + net/dccp/ackvec.c | 618 +++++------ + net/dccp/ackvec.h | 151 ++- + net/dccp/ccids/ccid2.c | 143 +-- + net/dccp/ccids/ccid2.h | 2 + + net/dccp/dccp.h | 11 +- + net/dccp/input.c | 33 +- + net/dccp/options.c | 100 ++- + net/dccp/output.c | 15 + + 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 | 72 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/igmp.c | 225 ++-- + net/ipv4/ip_gre.c | 14 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/route.c | 57 +- + net/ipv4/tcp.c | 16 +- + net/ipv4/udp.c | 4 +- + net/ipv4/xfrm4_policy.c | 39 +- + net/ipv6/addrconf.c | 6 +- + net/ipv6/mcast.c | 2 +- + net/ipv6/udp.c | 4 +- + net/mac80211/aes_ccm.c | 3 +- + net/mac80211/aes_cmac.c | 3 +- + net/mac80211/debugfs.c | 60 +- + net/mac80211/debugfs.h | 2 + + net/mac80211/debugfs_key.c | 19 +- + net/mac80211/debugfs_sta.c | 26 +- + net/mac80211/rc80211_minstrel_ht.c | 16 +- + net/netfilter/ipvs/ip_vs_xmit.c | 8 +- + net/packet/af_packet.c | 85 ++- + net/rfkill/core.c | 14 - + net/socket.c | 11 +- + net/unix/af_unix.c | 34 +- + net/wireless/reg.c | 134 ++- + 264 files changed, 8807 insertions(+), 5538 deletions(-) + 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 +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.h +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/reg.h +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/libertas/dev.h +Auto-merging drivers/net/wireless/libertas/main.c +Auto-merging drivers/net/wireless/rt2x00/Kconfig +Auto-merging include/net/cfg80211.h +Auto-merging net/wireless/nl80211.c +Merge made by recursive. + drivers/net/wireless/ath/ath5k/base.c | 46 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 47 + + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 17 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2735 +++++++++++++++++++++++- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 27 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 28 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 47 + + drivers/net/wireless/ath/ath9k/ath9k.h | 42 +- + drivers/net/wireless/ath/ath9k/beacon.c | 19 + + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 3 + + drivers/net/wireless/ath/ath9k/hw.h | 41 + + drivers/net/wireless/ath/ath9k/main.c | 30 +- + drivers/net/wireless/ath/ath9k/rc.c | 20 +- + drivers/net/wireless/ath/ath9k/rc.h | 6 - + drivers/net/wireless/ath/ath9k/reg.h | 3 + + drivers/net/wireless/ath/ath9k/virtual.c | 5 +- + drivers/net/wireless/ath/ath9k/xmit.c | 629 +++--- + drivers/net/wireless/ath/debug.c | 9 +- + drivers/net/wireless/b43/main.c | 48 +- + drivers/net/wireless/b43legacy/main.c | 47 +- + drivers/net/wireless/iwlwifi/Makefile | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 33 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 - + drivers/net/wireless/iwlwifi/iwl-scan.c | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 9 +- + 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/mwl8k.c | 677 +++++-- + drivers/net/wireless/rndis_wlan.c | 197 ++- + drivers/net/wireless/rt2x00/Kconfig | 72 +- + drivers/net/wireless/rt2x00/rt2800.h | 1 + + drivers/net/wireless/rt2x00/rt2800lib.c | 9 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 49 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 212 +- + drivers/net/wireless/rt2x00/rt2x00.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 6 +- + drivers/ssb/pci.c | 52 +- + include/linux/nl80211.h | 29 + + include/net/cfg80211.h | 5 + + include/net/mac80211.h | 43 +- + net/mac80211/cfg.c | 26 + + net/mac80211/driver-ops.h | 37 + + net/mac80211/driver-trace.h | 71 + + net/mac80211/ibss.c | 1 + + net/mac80211/ieee80211_i.h | 7 + + net/mac80211/mlme.c | 24 + + net/mac80211/rate.c | 19 +- + net/mac80211/rx.c | 2 - + net/mac80211/sta_info.c | 17 +- + net/mac80211/tx.c | 16 +- + net/mac80211/util.c | 40 +- + net/mac80211/wme.c | 11 +- + net/wireless/nl80211.c | 36 +- + 58 files changed, 4573 insertions(+), 1038 deletions(-) +Merging bluetooth/master +$ git merge bluetooth/master +Recorded preimage for 'drivers/net/wireless/ath/ath5k/base.c' +Recorded preimage for 'drivers/net/wireless/iwlwifi/Makefile' +Resolved 'drivers/net/wireless/iwlwifi/iwl-1000.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-3945.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-5000.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-6000.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-agn-rxon.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-agn.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-core.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-core.h' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-legacy.c' using previous resolution. +Resolved 'drivers/net/wireless/iwlwifi/iwl-legacy.h' using previous resolution. +Auto-merging drivers/net/wireless/ath/ath5k/base.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath5k/base.c +Auto-merging drivers/net/wireless/ath/ath9k/ar5008_phy.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_eeprom.c +Auto-merging drivers/net/wireless/ath/ath9k/ar9003_phy.c +Auto-merging drivers/net/wireless/ath/ath9k/ath9k.h +Auto-merging drivers/net/wireless/ath/ath9k/common.h +Auto-merging drivers/net/wireless/ath/ath9k/eeprom_9287.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.c +Auto-merging drivers/net/wireless/ath/ath9k/hw.h +Auto-merging drivers/net/wireless/ath/ath9k/init.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/rc.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/ath/carl9170/carl9170.h +Auto-merging drivers/net/wireless/ath/carl9170/main.c +Auto-merging drivers/net/wireless/iwlwifi/Makefile +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/Makefile +Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-lib.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.h +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-legacy.c +CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-legacy.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-legacy.h +CONFLICT (add/add): Merge conflict in drivers/net/wireless/iwlwifi/iwl-legacy.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging include/linux/nl80211.h +Auto-merging include/net/cfg80211.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/ath/ath5k/base.c'. +Recorded resolution for 'drivers/net/wireless/iwlwifi/Makefile'. +Recorded resolution for 'drivers/net/wireless/iwlwifi/iwl-4965.c'. +[master 3dfb21c] Merge remote branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + drivers/ssb/driver_pcicore.c | 7 +++++++ + net/bluetooth/bnep/core.c | 1 + + net/bluetooth/cmtp/core.c | 1 + + net/bluetooth/hidp/core.c | 2 +- + 4 files changed, 10 insertions(+), 1 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Merge made by recursive. + arch/x86/crypto/aesni-intel_asm.S | 1192 ++++++++++++++++++++++++++++++++++++ + arch/x86/crypto/aesni-intel_glue.c | 518 ++++++++++++++++- + crypto/cast5.c | 74 +-- + crypto/shash.c | 8 +- + crypto/tcrypt.c | 11 + + crypto/testmgr.c | 24 + + crypto/testmgr.h | 361 +++++++++++ + 7 files changed, 2135 insertions(+), 53 deletions(-) +Merging sound/for-next +$ git merge sound/for-next +Removing sound/pci/oxygen/hifier.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- + include/sound/alc5623.h | 15 + + sound/pci/Kconfig | 17 +- + sound/pci/oxygen/Makefile | 2 - + sound/pci/oxygen/hifier.c | 239 ----- + sound/pci/oxygen/oxygen.c | 71 ++- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/alc5623.c | 1118 +++++++++++++++++++++++ + sound/soc/codecs/alc5623.h | 161 ++++ + sound/soc/codecs/wm8993.c | 2 + + sound/soc/codecs/wm8994.c | 3 + + sound/soc/codecs/wm_hubs.c | 69 +- + sound/soc/codecs/wm_hubs.h | 3 + + sound/soc/kirkwood/Kconfig | 9 + + sound/soc/kirkwood/Makefile | 2 + + sound/soc/kirkwood/kirkwood-t5325.c | 141 +++ + 18 files changed, 1577 insertions(+), 296 deletions(-) + create mode 100644 include/sound/alc5623.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/kirkwood/kirkwood-t5325.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + arch/arm/mach-kirkwood/openrd-setup.c | 2 +- + include/linux/mfd/wm8350/audio.h | 3 - + include/sound/soc-dapm.h | 49 +- + include/sound/soc.h | 72 ++- + include/trace/events/asoc.h | 176 +++++ + sound/soc/Kconfig | 2 + + sound/soc/atmel/Kconfig | 5 +- + sound/soc/atmel/playpaq_wm8510.c | 11 +- + sound/soc/atmel/sam9g20_wm8731.c | 17 +- + sound/soc/atmel/snd-soc-afeb9260.c | 13 +- + sound/soc/codecs/88pm860x-codec.c | 9 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 6 +- + sound/soc/codecs/ad193x.c | 6 +- + sound/soc/codecs/ak4535.c | 9 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 9 +- + sound/soc/codecs/alc5623.c | 23 +- + sound/soc/codecs/cq93vc.c | 2 +- + sound/soc/codecs/cs42l51.c | 5 +- + sound/soc/codecs/cx20442.c | 15 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/jz4740.c | 10 +- + sound/soc/codecs/max98088.c | 12 +- + sound/soc/codecs/ssm2602.c | 9 +- + sound/soc/codecs/stac9766.c | 3 +- + sound/soc/codecs/tlv320aic23.c | 9 +- + sound/soc/codecs/tlv320aic3x.c | 23 +- + sound/soc/codecs/tlv320dac33.c | 15 +- + sound/soc/codecs/tpa6130a2.c | 5 +- + sound/soc/codecs/twl4030.c | 13 +- + sound/soc/codecs/twl6040.c | 12 +- + sound/soc/codecs/uda134x.c | 2 +- + sound/soc/codecs/uda1380.c | 13 +- + sound/soc/codecs/wm2000.c | 5 +- + sound/soc/codecs/wm8350.c | 37 +- + sound/soc/codecs/wm8400.c | 11 +- + sound/soc/codecs/wm8510.c | 11 +- + sound/soc/codecs/wm8523.c | 11 +- + sound/soc/codecs/wm8580.c | 13 +- + sound/soc/codecs/wm8711.c | 9 +- + sound/soc/codecs/wm8728.c | 11 +- + sound/soc/codecs/wm8731.c | 14 +- + sound/soc/codecs/wm8741.c | 9 +- + sound/soc/codecs/wm8750.c | 11 +- + sound/soc/codecs/wm8753.c | 29 +- + sound/soc/codecs/wm8770.c | 750 ++++++++++++++++++ + sound/soc/codecs/wm8770.h | 51 ++ + sound/soc/codecs/wm8776.c | 10 +- + sound/soc/codecs/wm8804.c | 6 +- + sound/soc/codecs/wm8900.c | 11 +- + sound/soc/codecs/wm8903.c | 11 +- + sound/soc/codecs/wm8904.c | 35 +- + sound/soc/codecs/wm8940.c | 6 +- + sound/soc/codecs/wm8955.c | 11 +- + sound/soc/codecs/wm8960.c | 25 +- + sound/soc/codecs/wm8961.c | 11 +- + sound/soc/codecs/wm8962.c | 40 +- + sound/soc/codecs/wm8971.c | 29 +- + sound/soc/codecs/wm8974.c | 11 +- + sound/soc/codecs/wm8978.c | 11 +- + sound/soc/codecs/wm8985.c | 11 +- + sound/soc/codecs/wm8988.c | 9 +- + sound/soc/codecs/wm8990.c | 11 +- + sound/soc/codecs/wm8993.c | 11 +- + sound/soc/codecs/wm8994.c | 15 +- + sound/soc/codecs/wm9081.c | 9 +- + sound/soc/codecs/wm9090.c | 17 +- + sound/soc/codecs/wm9705.c | 6 +- + sound/soc/codecs/wm9712.c | 9 +- + sound/soc/codecs/wm9713.c | 8 +- + sound/soc/codecs/wm_hubs.c | 20 +- + sound/soc/davinci/davinci-evm.c | 21 +- + sound/soc/ep93xx/snappercl15.c | 5 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- + sound/soc/imx/eukrea-tlv320.c | 8 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 221 +++--- + sound/soc/imx/imx-ssi.c | 48 +- + sound/soc/imx/imx-ssi.h | 4 + + sound/soc/imx/phycore-ac97.c | 5 +- + sound/soc/imx/wm1133-ev1.c | 7 +- + sound/soc/jz4740/qi_lb60.c | 13 +- + sound/soc/kirkwood/Kconfig | 2 +- + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- + sound/soc/kirkwood/kirkwood-t5325.c | 13 +- + sound/soc/omap/am3517evm.c | 13 +- + sound/soc/omap/ams-delta.c | 82 +- + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap3pandora.c | 44 +- + sound/soc/omap/osk5912.c | 13 +- + sound/soc/omap/rx51.c | 25 +- + sound/soc/omap/sdp3430.c | 43 +- + sound/soc/omap/sdp4430.c | 19 +- + sound/soc/omap/zoom2.c | 35 +- + sound/soc/pxa/corgi.c | 56 +- + sound/soc/pxa/e740_wm9705.c | 29 +- + sound/soc/pxa/e750_wm9705.c | 29 +- + sound/soc/pxa/e800_wm9712.c | 7 +- + sound/soc/pxa/magician.c | 39 +- + sound/soc/pxa/mioa701_wm9713.c | 17 +- + sound/soc/pxa/palm27x.c | 33 +- + sound/soc/pxa/poodle.c | 30 +- + sound/soc/pxa/saarb.c | 17 +- + sound/soc/pxa/spitz.c | 74 +- + sound/soc/pxa/tavorevb3.c | 17 +- + sound/soc/pxa/tosa.c | 42 +- + sound/soc/pxa/z2.c | 15 +- + sound/soc/pxa/zylonite.c | 11 +- + sound/soc/s3c24xx/Kconfig | 1 + + sound/soc/s3c24xx/aquila_wm8994.c | 25 +- + sound/soc/s3c24xx/goni_wm8994.c | 21 +- + sound/soc/s3c24xx/jive_wm8750.c | 19 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 41 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 123 ++-- + sound/soc/s3c24xx/rx1950_uda1380.c | 31 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 15 +- + sound/soc/s3c24xx/smartq_wm8987.c | 21 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 16 +- + sound/soc/s6000/s6105-ipcam.c | 40 +- + sound/soc/sh/migor.c | 5 +- + sound/soc/sh/sh7760-ac97.c | 2 +- + sound/soc/soc-cache.c | 1002 +++++++++++++++++++++++- + sound/soc/soc-core.c | 181 +++-- + sound/soc/soc-dapm.c | 579 ++++++++------ + sound/soc/soc-jack.c | 23 +- + 127 files changed, 3695 insertions(+), 1433 deletions(-) + create mode 100644 include/trace/events/asoc.h + create mode 100644 sound/soc/codecs/wm8770.c + create mode 100644 sound/soc/codecs/wm8770.h +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Merge made by recursive. + Documentation/lguest/lguest.c | 66 ++++++++++++++++++++++++++++++++++---- + Documentation/lguest/lguest.txt | 5 +++ + drivers/char/virtio_console.c | 37 +++++---------------- + drivers/virtio/virtio.c | 6 ++-- + drivers/virtio/virtio_ring.c | 3 -- + include/linux/module.h | 2 +- + 6 files changed, 77 insertions(+), 42 deletions(-) +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/joystick/xpad.c | 103 +++--- + drivers/input/misc/pcf8574_keypad.c | 19 +- + drivers/input/mouse/hgpk.c | 695 +++++++++++++++++++++++++++++++---- + drivers/input/mouse/hgpk.h | 31 ++- + drivers/input/mouse/psmouse-base.c | 1 + + drivers/macintosh/mac_hid.c | 8 + + 6 files changed, 729 insertions(+), 128 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Merge made by recursive. + drivers/block/xen-blkfront.c | 55 +++++++++++++++++++++++++---------------- + fs/ioprio.c | 31 ++++------------------- + 2 files changed, 39 insertions(+), 47 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +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/mmci.c +Auto-merging drivers/mmc/host/mmci.h +Merge made by recursive. + arch/arm/mach-dove/common.c | 4 +- + drivers/mmc/core/Kconfig | 11 ++ + drivers/mmc/core/core.c | 49 ++++++++- + drivers/mmc/core/core.h | 2 + + drivers/mmc/core/debugfs.c | 5 + + drivers/mmc/core/host.c | 207 +++++++++++++++++++++++++++++++++++- + drivers/mmc/core/host.h | 21 ++++ + drivers/mmc/core/mmc.c | 8 +- + drivers/mmc/host/Kconfig | 11 ++ + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/mmci.c | 35 ++++-- + drivers/mmc/host/mmci.h | 1 + + drivers/mmc/host/mxcmmc.c | 52 ++++++++- + drivers/mmc/host/sdhci-dove.c | 70 ++++++++++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 12 ++- + drivers/mmc/host/sdhci-pci.c | 31 ++++-- + drivers/mmc/host/sdhci-pltfm.c | 3 + + drivers/mmc/host/sdhci-pltfm.h | 1 + + drivers/mmc/host/sdhci.c | 10 ++ + drivers/mmc/host/sdhci.h | 4 + + drivers/mmc/host/ushc.c | 30 ++++-- + include/linux/mmc/host.h | 10 ++ + include/linux/pci_ids.h | 1 + + 23 files changed, 535 insertions(+), 44 deletions(-) + create mode 100644 drivers/mmc/host/sdhci-dove.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Auto-merging mm/slub.c +Merge made by recursive. + Documentation/vm/Makefile | 2 +- + include/linux/slub_def.h | 55 +++++++++++++-------------- + mm/slub.c | 30 +++++++++++--- + {Documentation/vm => tools/slub}/slabinfo.c | 6 +- + 4 files changed, 53 insertions(+), 40 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 +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +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/radeon/radeon_display.c | 40 ++- + drivers/gpu/drm/radeon/radeon_drv.c | 8 + + drivers/gpu/drm/radeon/radeon_kms.c | 21 ++ + drivers/gpu/drm/radeon/radeon_mode.h | 7 +- + drivers/gpu/drm/radeon/radeon_pm.c | 6 +- + include/drm/drmP.h | 93 +++++ + include/drm/drm_crtc.h | 9 + + 10 files changed, 717 insertions(+), 53 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 +Merge made by recursive. + arch/arm/mach-shmobile/board-ap4evb.c | 24 ++ + drivers/video/Kconfig | 26 ++ + drivers/video/Makefile | 3 + + drivers/video/fbmon.c | 88 +++++++ + drivers/video/modedb.c | 43 ++++ + 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 + + 20 files changed, 1677 insertions(+), 110 deletions(-) + 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 +Merge made by recursive. + drivers/regulator/88pm8607.c | 3 +- + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 5 +- + drivers/regulator/core.c | 59 +++++++++++--- + 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 | 14 ++- + 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 | 15 ++- + drivers/regulator/twl-regulator.c | 17 +++-- + 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 | 3 +- + include/trace/events/regulator.h | 141 ++++++++++++++++++++++++++++++++ + 28 files changed, 383 insertions(+), 94 deletions(-) + create mode 100644 include/trace/events/regulator.h +Merging security-testing/next +$ git merge security-testing/next +Auto-merging include/linux/kernel.h +Merge made by recursive. + include/linux/kernel.h | 2 ++ + 1 files changed, 2 insertions(+), 0 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/bcm63xx_wdt.c | 42 +++++++++++---------------------------- + 1 files changed, 12 insertions(+), 30 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 'arch/blackfin/mach-bf538/include/mach/defBF539.h' using previous resolution. +Resolved 'drivers/scsi/bfa/bfa_fcpim.c' using previous resolution. +Auto-merging Documentation/lguest/lguest.txt +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/mach-imx/pm-imx27.c +Auto-merging arch/arm/mach-omap2/serial.c +CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree. +CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree. +Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h +Auto-merging arch/blackfin/mach-bf538/include/mach/defBF539.h +CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/media/video/zoran/zoran.h +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/vxge/vxge-traffic.h +Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.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/sym53c8xx_2/sym_glue.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 lib/nlattr.c +Auto-merging net/core/dev.c +Auto-merging net/decnet/dn_dev.c +Auto-merging sound/soc/codecs/max98088.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +MAINTAINERS: needs merge +arch/blackfin/mach-bf518/include/mach/defBF51x_base.h: needs merge +arch/blackfin/mach-bf527/include/mach/defBF52x_base.h: needs merge +arch/blackfin/mach-bf538/include/mach/defBF539.h: needs merge +drivers/scsi/bfa/bfa_fcpim.c: needs merge +rm 'arch/blackfin/mach-bf518/include/mach/defBF51x_base.h' +rm 'arch/blackfin/mach-bf527/include/mach/defBF52x_base.h' +$ git commit -v -a +[master 75d2aed] 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/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/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/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/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/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/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/clocksource.c | 2 +- + kernel/trace/trace_entries.h | 2 +- + lib/nlattr.c | 2 +- + lib/swiotlb.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/s3c24xx/smdk_spdif.c | 6 +++--- + 279 files changed, 360 insertions(+), 354 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 +Merge made by recursive. + Documentation/power/opp.txt | 3 +++ + drivers/base/power/main.c | 34 ++++++++++++++++++++++++++++++---- + kernel/pm_qos_params.c | 4 ++-- + kernel/power/Kconfig | 4 ++++ + 4 files changed, 39 insertions(+), 6 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Merge made by recursive. + fs/namei.c | 3 + + fs/notify/fanotify/fanotify.c | 24 ++++++----- + fs/notify/fanotify/fanotify_user.c | 78 +++++++++++++++++++++++------------ + fs/notify/mark.c | 36 ++++++----------- + include/linux/fanotify.h | 7 ++- + include/linux/fsnotify.h | 3 - + include/linux/fsnotify_backend.h | 13 +++++- + 7 files changed, 97 insertions(+), 67 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 'include/linux/Kbuild' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 184c9ae] 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 | 3 ++- + 1 files changed, 2 insertions(+), 1 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 arch/x86/Kconfig +Auto-merging arch/x86/kernel/head_32.S +Auto-merging kernel/sched.c +Merge made by recursive. + arch/x86/Kconfig | 2 + + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/fixmap.h | 4 + + arch/x86/include/asm/i387.h | 24 + + arch/x86/include/asm/io_apic.h | 7 +- + arch/x86/include/asm/microcode.h | 6 + + arch/x86/include/asm/mrst-vrtc.h | 9 + + arch/x86/include/asm/mrst.h | 14 +- + arch/x86/kernel/apic/apic.c | 102 +++-- + arch/x86/kernel/apic/io_apic.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 +++-- + arch/x86/kernel/head_32.S | 6 + + arch/x86/kernel/microcode_amd.c | 34 +- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/setup.c | 5 +- + arch/x86/kernel/trampoline_64.S | 2 +- + arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} | 49 ++- + arch/x86/mm/setup_nx.c | 2 +- + arch/x86/oprofile/op_model_amd.c | 1 + + arch/x86/platform/mrst/Makefile | 1 + + arch/x86/platform/mrst/mrst.c | 544 +++++++++++++++++++- + arch/x86/platform/mrst/vrtc.c | 166 ++++++ + drivers/platform/x86/intel_scu_ipc.c | 5 + + drivers/rtc/Kconfig | 12 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-mrst.c | 578 +++++++++++++++++++++ + include/linux/hrtimer.h | 1 - + include/linux/interrupt.h | 6 +- + include/linux/rcupdate.h | 2 +- + include/linux/sched.h | 6 +- + include/linux/sfi.h | 8 +- + include/linux/timer.h | 32 +- + include/linux/workqueue.h | 8 + + kernel/futex.c | 235 ++++----- + kernel/irq/manage.c | 4 +- + kernel/kthread.c | 2 +- + kernel/lockdep_proc.c | 16 +- + kernel/posix-cpu-timers.c | 12 +- + kernel/posix-timers.c | 10 +- + kernel/profile.c | 6 +- + kernel/sched.c | 45 ++- + kernel/sched_fair.c | 40 ++- + kernel/sched_stoptask.c | 4 +- + kernel/softirq.c | 4 +- + kernel/time/timecompare.c | 5 +- + kernel/time/timekeeping.c | 9 +- + kernel/timer.c | 46 +-- + kernel/trace/trace_selftest.c | 2 +- + kernel/watchdog.c | 2 +- + 50 files changed, 1840 insertions(+), 384 deletions(-) + create mode 100644 arch/x86/include/asm/mrst-vrtc.h + rename arch/x86/kernel/{verify_cpu_64.S => verify_cpu.S} (65%) + create mode 100644 arch/x86/platform/mrst/vrtc.c + create mode 100644 drivers/rtc/rtc-mrst.c +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging include/linux/init_task.h +Auto-merging include/linux/rcupdate.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 +Merge made by recursive. + arch/x86/include/asm/xen/interface.h | 6 +++--- + arch/x86/include/asm/xen/interface_32.h | 5 +++++ + arch/x86/include/asm/xen/interface_64.h | 13 +------------ + arch/x86/include/asm/xen/page.h | 7 ++++--- + arch/x86/xen/enlighten.c | 19 ++++++++++++++++++- + arch/x86/xen/mmu.c | 17 ++++++++++++++++- + arch/x86/xen/setup.c | 8 -------- + drivers/xen/events.c | 11 +++++++---- + drivers/xen/xenfs/privcmd.c | 13 +++++-------- + drivers/xen/xenfs/super.c | 6 +++--- + include/xen/interface/memory.h | 13 +++++++++++++ + include/xen/privcmd.h | 5 +---- + 12 files changed, 76 insertions(+), 47 deletions(-) +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Already up-to-date. +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 +Merge made by recursive. + drivers/edac/Makefile | 8 +- + drivers/edac/amd64_edac.c | 4 +- + drivers/edac/mce_amd.c | 433 ++++++++++++++++++++++++++++++++++---------- + drivers/edac/mce_amd.h | 14 +- + drivers/edac/mce_amd_inj.c | 9 +- + 5 files changed, 353 insertions(+), 115 deletions(-) +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by recursive. + mm/percpu.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 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 +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Merge made by recursive. + drivers/base/class.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging tty/tty-next +$ git merge tty/tty-next +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 | 119 +++ + arch/parisc/kernel/pdc_cons.c | 8 +- + drivers/serial/Kconfig | 16 + + drivers/serial/Makefile | 2 + + drivers/serial/cpm_uart/cpm_uart.h | 6 - + drivers/serial/cpm_uart/cpm_uart_core.c | 19 + + drivers/serial/ifx6x60.c | 1403 +++++++++++++++++++++++++++++++ + drivers/serial/ifx6x60.h | 129 +++ + drivers/serial/mpc52xx_uart.c | 6 +- + 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 - + 21 files changed, 2639 insertions(+), 105 deletions(-) + create mode 100644 Documentation/serial/serial-rs485.txt + create mode 100644 drivers/serial/ifx6x60.c + create mode 100644 drivers/serial/ifx6x60.h + 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 +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/gadget/imx_udc.c +Auto-merging drivers/usb/host/ehci-hcd.c +Auto-merging include/linux/usb.h +Merge made by recursive. + Documentation/usb/power-management.txt | 113 +- + drivers/usb/Kconfig | 3 + + 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 | 22 + + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/amd5536udc.c | 1 - + drivers/usb/gadget/composite.c | 2 +- + 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 | 39 +- + drivers/usb/gadget/gadget_chips.h | 7 + + drivers/usb/gadget/imx_udc.c | 4 +- + drivers/usb/gadget/imx_udc.h | 3 - + drivers/usb/gadget/mass_storage.c | 2 +- + drivers/usb/gadget/pch_udc.c | 2941 ++++++++++++++++++++++++++++++++ + drivers/usb/host/ehci-hcd.c | 10 + + drivers/usb/host/ehci-spear.c | 212 +++ + drivers/usb/host/ehci-vt8500.c | 172 ++ + drivers/usb/host/ohci-hcd.c | 5 + + drivers/usb/host/ohci-spear.c | 240 +++ + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/serial/ssu100.c | 56 +- + drivers/uwb/umc-dev.c | 7 +- + include/linux/usb.h | 7 +- + include/linux/usb/ch11.h | 47 + + include/linux/usb/hcd.h | 4 + + 36 files changed, 4463 insertions(+), 942 deletions(-) + create mode 100644 drivers/usb/gadget/pch_udc.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 +$ git reset --hard HEAD^ +HEAD is now at 879dcdb Merge remote branch 'tty/tty-next' +Merging refs/next/20101116/usb +$ git merge refs/next/20101116/usb +Auto-merging drivers/usb/gadget/imx_udc.c +Auto-merging drivers/usb/host/ehci-hcd.c +Merge made by recursive. + drivers/usb/Kconfig | 1 + + drivers/usb/gadget/amd5536udc.c | 1 - + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/dummy_hcd.c | 251 +++++++++-------- + drivers/usb/gadget/f_mass_storage.c | 524 +++++++++++++++++++---------------- + drivers/usb/gadget/file_storage.c | 29 +- + drivers/usb/gadget/imx_udc.c | 4 +- + drivers/usb/gadget/imx_udc.h | 3 - + drivers/usb/gadget/mass_storage.c | 2 +- + drivers/usb/host/ehci-hcd.c | 5 + + drivers/usb/host/ehci-vt8500.c | 172 ++++++++++++ + drivers/usb/serial/ssu100.c | 56 +---- + include/linux/usb/ch11.h | 47 +++ + include/linux/usb/hcd.h | 4 + + 14 files changed, 670 insertions(+), 431 deletions(-) + create mode 100644 drivers/usb/host/ehci-vt8500.c +Merging staging/staging-next +$ git merge staging/staging-next +Auto-merging drivers/staging/asus_oled/asus_oled.c +Removing drivers/staging/bcm/Arp.c +Removing drivers/staging/bcm/Debug.c +Removing drivers/staging/bcm/HostMibs.h +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/epivers.h +Removing drivers/staging/brcm80211/include/linuxver.h +Auto-merging drivers/staging/comedi/drivers/usbdux.c +Auto-merging drivers/staging/intel_sst/intel_sst_stream_encoded.c +Auto-merging drivers/staging/udlfb/udlfb.c +Removing drivers/staging/winbond/wbhal_f.h +Merge made by recursive. + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + 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/vis.c | 3 +- + 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 | 316 +-- + drivers/staging/bcm/InterfaceInit.h | 27 +- + 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 | 63 +- + 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 | 534 +--- + 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 | 38 +- + 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 | 3 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 26 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 3 +- + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 2 + + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 1 + + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 1 + + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 57 +- + .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 1 + + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 24 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 9 +- + drivers/staging/brcm80211/include/bcmdefs.h | 56 +- + drivers/staging/brcm80211/include/bcmutils.h | 1 - + drivers/staging/brcm80211/include/d11.h | 7 - + drivers/staging/brcm80211/include/epivers.h | 44 - + drivers/staging/brcm80211/include/linux_osl.h | 44 +- + drivers/staging/brcm80211/include/linuxver.h | 38 - + drivers/staging/brcm80211/include/osl.h | 2 - + drivers/staging/brcm80211/include/wlioctl.h | 341 +--- + drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 6 +- + drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 6 +- + drivers/staging/brcm80211/phy/wlc_phy_n.c | 6 +- + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 + + drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 3 + + drivers/staging/brcm80211/sys/wl_mac80211.c | 68 +- + drivers/staging/brcm80211/sys/wlc_alloc.c | 7 +- + drivers/staging/brcm80211/sys/wlc_ampdu.c | 5 +- + drivers/staging/brcm80211/sys/wlc_antsel.c | 7 +- + drivers/staging/brcm80211/sys/wlc_bmac.c | 7 +- + drivers/staging/brcm80211/sys/wlc_channel.c | 7 +- + drivers/staging/brcm80211/sys/wlc_event.c | 7 +- + drivers/staging/brcm80211/sys/wlc_mac80211.c | 12 +- + drivers/staging/brcm80211/sys/wlc_mac80211.h | 6 - + drivers/staging/brcm80211/sys/wlc_phy_shim.c | 7 +- + drivers/staging/brcm80211/sys/wlc_pub.h | 8 +- + drivers/staging/brcm80211/sys/wlc_rate.c | 4 +- + drivers/staging/brcm80211/sys/wlc_stf.c | 6 +- + drivers/staging/brcm80211/util/aiutils.c | 6 +- + drivers/staging/brcm80211/util/bcmotp.c | 3 +- + drivers/staging/brcm80211/util/bcmsrom.c | 3 +- + drivers/staging/brcm80211/util/bcmutils.c | 5 +- + drivers/staging/brcm80211/util/bcmwifi.c | 4 + + drivers/staging/brcm80211/util/hnddma.c | 3 +- + drivers/staging/brcm80211/util/hndpmu.c | 6 +- + drivers/staging/brcm80211/util/linux_osl.c | 142 +- + drivers/staging/brcm80211/util/nicpci.c | 2 +- + drivers/staging/brcm80211/util/sbutils.c | 3 + + drivers/staging/brcm80211/util/siutils.c | 6 +- + 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 | 11 + + 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 | 30 +- + .../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 | 19 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 45 +- + drivers/staging/go7007/go7007-driver.c | 2 +- + 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 | 16 +- + drivers/staging/hv/vmbus.c | 32 +- + drivers/staging/hv/vmbus_drv.c | 53 +- + 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 | 77 +- + drivers/staging/iio/adc/Makefile | 11 + + 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/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 | 11 + + drivers/staging/iio/dac/Makefile | 5 + + drivers/staging/iio/dac/ad5624r.h | 21 + + drivers/staging/iio/dac/ad5624r_spi.c | 313 +++ + 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_core.c | 2 +- + 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/intel_sst.c | 50 +- + .../staging/intel_sst/intel_sst_app_interface.c | 138 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 66 +- + drivers/staging/intel_sst/intel_sst_dsp.c | 67 +- + drivers/staging/intel_sst/intel_sst_ipc.c | 144 +- + drivers/staging/intel_sst/intel_sst_pvt.c | 36 +- + drivers/staging/intel_sst/intel_sst_stream.c | 18 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 205 +- + drivers/staging/intel_sst/intelmid.c | 157 +- + drivers/staging/intel_sst/intelmid_ctrl.c | 15 +- + drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- + drivers/staging/intel_sst/intelmid_pvt.c | 27 +- + drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- + drivers/staging/intel_sst/intelmid_v1_control.c | 28 +- + drivers/staging/intel_sst/intelmid_v2_control.c | 94 +- + drivers/staging/keucr/ms.c | 10 +- + drivers/staging/keucr/smilmain.c | 4 +- + drivers/staging/keucr/smilsub.c | 4 +- + drivers/staging/msm/Makefile | 4 +- + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- + 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 | 5 +- + drivers/staging/rt2860/chips/rt30xx.c | 9 +- + 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/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 4 +- + drivers/staging/rtl8192u/r819xU_phy.c | 2 +- + 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/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/lld_emu.c | 6 +- + 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 | 59 +- + 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/core.h | 2 +- + drivers/staging/winbond/mds.c | 8 +- + drivers/staging/winbond/mds_f.h | 3 +- + drivers/staging/winbond/mto.c | 4 +- + drivers/staging/winbond/phy_calibration.c | 4 +- + drivers/staging/winbond/phy_calibration.h | 2 +- + drivers/staging/winbond/reg.c | 4 +- + drivers/staging/winbond/wb35reg_f.h | 2 +- + drivers/staging/winbond/wb35reg_s.h | 74 + + drivers/staging/winbond/wb35rx.c | 4 +- + drivers/staging/winbond/wb35rx_f.h | 2 +- + drivers/staging/winbond/wb35tx.c | 8 +- + drivers/staging/winbond/wb35tx_f.h | 1 - + drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 11 - + drivers/staging/winbond/wbhal_f.h | 81 - + drivers/staging/winbond/wbusb.c | 16 +- + 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 - + 380 files changed, 36609 insertions(+), 11402 deletions(-) + 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/epivers.h + delete mode 100644 drivers/staging/brcm80211/include/linuxver.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 + 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/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/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/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/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 + rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (98%) + delete mode 100644 drivers/staging/winbond/wbhal_f.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 +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/input/input.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/staging/Kconfig +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/host/isp1362-hcd.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/locks.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging include/linux/hardirq.h +Auto-merging include/linux/tty.h +Auto-merging sound/core/pcm_native.c +Merge made by recursive. + arch/blackfin/kernel/process.c | 1 - + arch/frv/kernel/process.c | 1 - + arch/h8300/kernel/process.c | 1 - + arch/m68k/kernel/process.c | 1 - + arch/m68knommu/kernel/process.c | 1 - + arch/mn10300/kernel/process.c | 1 - + arch/parisc/hpux/sys_hpux.c | 1 - + arch/parisc/kernel/sys_parisc32.c | 1 - + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/sys_ppc32.c | 1 - + arch/s390/kernel/compat_linux.c | 1 - + arch/sparc/kernel/leon_smp.c | 1 - + arch/sparc/kernel/sys_sparc32.c | 1 - + arch/sparc/kernel/sys_sparc_32.c | 1 - + arch/sparc/kernel/unaligned_32.c | 1 - + arch/sparc/kernel/windows.c | 1 - + arch/tile/kernel/compat.c | 1 - + arch/tile/kernel/compat_signal.c | 1 - + arch/tile/kernel/signal.c | 1 - + arch/tile/kernel/smpboot.c | 1 - + arch/tile/kernel/sys.c | 1 - + arch/tile/mm/fault.c | 1 - + arch/tile/mm/hugetlbpage.c | 1 - + arch/um/kernel/exec.c | 1 - + arch/x86/ia32/sys_ia32.c | 1 - + arch/x86/kernel/cpuid.c | 1 - + arch/x86/kernel/msr.c | 1 - + block/compat_ioctl.c | 1 - + block/ioctl.c | 1 - + drivers/block/drbd/drbd_receiver.c | 1 - + drivers/block/drbd/drbd_worker.c | 1 - + drivers/char/agp/frontend.c | 1 - + drivers/char/amiserial.c | 1 - + drivers/char/briq_panel.c | 1 - + drivers/char/hpet.c | 1 - + drivers/char/hw_random/core.c | 1 - + drivers/char/istallion.c | 1 - + drivers/char/serial167.c | 1 - + drivers/char/specialix.c | 1 - + drivers/char/stallion.c | 1 - + drivers/char/sx.c | 1 - + drivers/char/uv_mmtimer.c | 1 - + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/drm_fops.c | 1 - + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/hid/hidraw.c | 1 - + drivers/hid/usbhid/hiddev.c | 1 - + drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 - + drivers/input/input.c | 1 - + drivers/input/serio/serio_raw.c | 1 - + drivers/media/dvb/dvb-core/dvb_ca_en50221.c | 1 - + drivers/media/dvb/dvb-core/dvb_frontend.c | 1 - + drivers/media/dvb/ngene/ngene-core.c | 1 - + drivers/media/dvb/ngene/ngene-dvb.c | 1 - + drivers/media/dvb/ngene/ngene-i2c.c | 1 - + drivers/media/radio/radio-mr800.c | 1 - + drivers/media/radio/si470x/radio-si470x.h | 1 - + drivers/media/video/bt8xx/bttv-driver.c | 1 - + drivers/media/video/cx88/cx88-blackbird.c | 1 - + drivers/media/video/cx88/cx88-video.c | 1 - + drivers/media/video/pwc/pwc-if.c | 1 - + drivers/media/video/s2255drv.c | 1 - + drivers/media/video/saa7134/saa7134-empress.c | 1 - + drivers/media/video/saa7164/saa7164.h | 1 - + drivers/media/video/usbvision/usbvision-video.c | 1 - + drivers/media/video/v4l2-compat-ioctl32.c | 1 - + drivers/net/wireless/orinoco/orinoco_usb.c | 1 - + drivers/parisc/eisa_eeprom.c | 1 - + drivers/pci/proc.c | 1 - + drivers/pnp/isapnp/proc.c | 1 - + drivers/s390/block/dasd_eer.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/tape_char.c | 1 - + drivers/s390/char/vmlogrdr.c | 1 - + drivers/s390/char/vmur.c | 1 - + drivers/s390/crypto/zcrypt_api.c | 1 - + drivers/scsi/hpsa.c | 1 - + drivers/scsi/pm8001/pm8001_sas.h | 1 - + drivers/scsi/sd.c | 1 - + drivers/serial/crisv10.c | 1 - + drivers/serial/serial_core.c | 1 - + drivers/staging/Kconfig | 10 ++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + drivers/staging/easycap/easycap.h | 1 - + .../staging/intel_sst/intel_sst_app_interface.c | 1 - + drivers/staging/rtl8712/osdep_service.h | 1 - + drivers/staging/speakup/buffers.c | 1 - + drivers/staging/stradis/Kconfig | 2 +- + drivers/usb/core/devices.c | 1 - + drivers/usb/core/devio.c | 1 - + drivers/usb/core/file.c | 1 - + drivers/usb/core/inode.c | 1 - + drivers/usb/gadget/f_fs.c | 1 - + drivers/usb/gadget/f_hid.c | 1 - + drivers/usb/host/isp1362-hcd.c | 1 - + drivers/usb/host/uhci-debug.c | 1 - + drivers/usb/mon/mon_bin.c | 1 - + drivers/usb/mon/mon_stat.c | 1 - + drivers/usb/serial/usb-serial.c | 1 - + drivers/video/console/vgacon.c | 1 - + drivers/xen/xenfs/privcmd.c | 1 - + drivers/zorro/proc.c | 1 - + fs/block_dev.c | 1 - + fs/ceph/inode.c | 1 - + fs/ceph/mds_client.c | 1 - + fs/compat_ioctl.c | 1 - + fs/ecryptfs/super.c | 1 - + fs/ext3/super.c | 1 - + fs/ioctl.c | 1 - + fs/lockd/clntlock.c | 1 - + fs/lockd/clntproc.c | 1 - + fs/lockd/svc4proc.c | 1 - + fs/lockd/svclock.c | 1 - + fs/lockd/svcproc.c | 1 - + fs/locks.c | 1 - + fs/namespace.c | 1 - + fs/ncpfs/dir.c | 1 - + fs/ncpfs/file.c | 1 - + fs/ncpfs/inode.c | 1 - + fs/ncpfs/ioctl.c | 1 - + fs/nfs/callback.c | 1 - + fs/nfs/delegation.c | 1 - + fs/nfs/super.c | 1 - + fs/nfsd/nfs4state.c | 8 ++++---- + fs/ocfs2/super.c | 1 - + fs/proc/inode.c | 1 - + fs/read_write.c | 1 - + fs/reiserfs/inode.c | 1 - + fs/reiserfs/ioctl.c | 1 - + fs/reiserfs/journal.c | 1 - + fs/reiserfs/super.c | 1 - + include/linux/hardirq.h | 1 - + include/linux/reiserfs_fs.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + include/linux/tty.h | 1 - + init/main.c | 1 - + kernel/trace/trace.c | 1 - + lib/Kconfig.debug | 9 --------- + net/irda/af_irda.c | 1 - + net/irda/irnet/irnet_ppp.c | 1 - + net/sunrpc/svc_xprt.c | 1 - + sound/core/info.c | 1 - + sound/core/pcm_native.c | 1 - + sound/core/sound.c | 1 - + sound/sound_core.c | 1 - + 146 files changed, 26 insertions(+), 185 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Recorded preimage for 'fs/ocfs2/super.c' +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 +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/ocfs2/super.c'. +[master abce827] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git revert dd0dd411f7178a20ea93a3cfa39123f078a07e25 +Finished one revert. +[master efcc1bc] Revert "iwlwifi: fix modular legacy build errors" + 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..24692dbb8719 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,35 @@ +Importing i2c based on 2.6.37-rc2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard e53beacd23d9cb47590da6a7a7f6d417b941a994 +HEAD is now at e53beac Linux 2.6.37-rc2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-nforce2-remove-unnecessary-cast-of-pci_get_drvdata.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 2955869...c9a5743 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.37-rc2 +$ cd ../quilt-tmp +$ git reset --hard e53beacd23d9cb47590da6a7a7f6d417b941a994 +HEAD is now at e53beac Linux 2.6.37-rc2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-adm9240-implement-standard-intrusion-detection-interface.patch +hwmon-w83792d-implement-standard-intrusion-detection-interface.patch +hwmon-w83793-implement-standard-intrusion-detection-interface.patch +hwmon-schedule-removal-old-intrusion-detection-interface.patch +hwmon-it87-use-pr_fmt-and-pr_level.patch +hwmon-lm78-use-pr_fmt-and-pr_level.patch +hwmon-pc87360-use-pr_fmt-and-pr_level.patch +hwmon-pc87427-use-pr_fmt-and-pr_level.patch +hwmon-w83781d-use-pr_fmt-and-pr_level.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + d9faceb...3eb9681 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.37-rc1-git8 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.37-rc1-116-g151f52f +Unchanged quilt series rr +Importing device-mapper based on block/for-next +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..6fa222790ea4 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20101117 |