diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-24 13:27:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-08-24 13:27:20 +1000 |
| commit | 1a28812945148ab65f806c884bffabb20d7931c4 (patch) | |
| tree | 69047d11df867db30085e777126f06baa7be4f87 | |
| parent | 15d2d559e7398b2552b8b31e19d41690236711a0 (diff) | |
Add linux-next specific files for 20100824next-20100824
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 172 | ||||
| -rw-r--r-- | Next/Trees | 174 | ||||
| -rw-r--r-- | Next/merge.log | 2584 | ||||
| -rw-r--r-- | Next/quilt-import.log | 134 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3065 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..58385dd3b8b7 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,172 @@ +Name SHA1 +---- ---- +origin 9ee47476d6734c9deb9ae9ab05d963302f6b6150 +fixes 145c3ae46b37993b0debb0b3da6256daea4a6ec5 +arm-current 3b89f56783a4ef796190ef1192c25e72e0b986b6 +m68k-current 9144e56ddcffbe6063e2d88ec953eb1aeb278a7f +powerpc-merge e32e78c5ee8aadef020fbaecbe6fb741ed9029fd +sparc-current 9b3bb86acabe0c05923cea1ed3b0bee9439fef4b +scsi-rc-fixes 8f83d7688026729c9d356d865f65a8996f090048 +net-current cca77b7c81876d819a5806f408b3c29b5b61a815 +sound-current e9a8a85d9f88313264d59d40815951a46ff9a4bb +pci-current 23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8 +wireless-current 6a017e043a8c5e4f1e7c1152bc6477da8066f5f6 +kbuild-current 8558f59edf935cf5ee5ffc29a9e9458fd9a71be1 +driver-core.current 58f999eeb3b67bced2308b39334e050d16403e46 +tty.current 278d10f1e74d21d3ee6cb7287938ab1af4a3d425 +usb.current fa48a9c4e7a3cc5cb14db5a1e56895a4d3679e22 +staging.current 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +cpufreq-current 3f6c4df7e1f05f2fdb3f20cac9c03f595a72b45d +input-current 5fc0d36c00e6a2d0a9f2a0a815cff5b9a13b080d +md-current 2c7d46ec192e4f2b350f67a0e185b9bce646cd6b +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 50b6e71ae83714be509b80727dbf90fa8b1c0717 +ide-curent cd078af65d5c2f19c0f378062b07a0a79b000723 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e +arm 054d5c9238f3c577ad51195c3ee7803613f322cc +davinci c9b61cca820d38ba34ee9a27e2fa22f5de4193cc +i.MX 28bbe2cf44e3134d4478c70bb6ff2e4a1e40dbba +msm d17cca95e4e31a4d964bd4785268eb8499c8a481 +omap 0758dc373deacab0d7d3b893656143e4b3370034 +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 0c1f3f99b5986fff46dd489fe2b0bc7ce1556199 +s5p 76be97c1fc945db08aae1f1b746012662d643e97 +tegra 76be97c1fc945db08aae1f1b746012662d643e97 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin f3411b16c790e52b5abe174b33c7d213dbf5c259 +cris 85d9865721c62a551547984e6cc8bd3ba732e294 +ia64 145e5aa269d54e4ea53fdb5e597007bd287fbe49 +m68k 9144e56ddcffbe6063e2d88ec953eb1aeb278a7f +m68knommu cac7df4bd2ddb175cd7584b8379f97a6af5c2c67 +microblaze 28a729ce5f6191c199cb82657f3d8a74f35c853b +mips fc1caf6eafb30ea185720e29f7f5eccca61ecd60 +parisc 210501aa570fdaa8b06e56fd1c04f31f2d3f368b +powerpc e32e78c5ee8aadef020fbaecbe6fb741ed9029fd +4xx e32e78c5ee8aadef020fbaecbe6fb741ed9029fd +52xx-and-virtex f6cec0ae58c17522a7bc4e2f39dae19f199ab534 +galak c4b6a77663f5879de20561144716cfb675815e82 +s390 e85a9f1e118a18cd3708fa437dfefd99b4d6106f +sh b9afa3e015273a52718e0a7efe198a0df76be880 +genesis 410d878bd05315a19894b8b4685107f2cd0712a5 +sparc 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +tile a5854dd7f30c3849edf9b9711362e2dd51d3f855 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 0c4056e6b0b4f864cdeb00398f290319e7494370 +cifs 24e6cf92fde1f140d8eb0bf7cd24c2c78149b6b2 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs fef1d15a4fbb9236c6bf61e641c77d53d6e4a4c3 +ext3 89a8505ae82dbb64c703f9b6a2c81626b0d67833 +ext4 6d0bf00512b3b1b5d09d9a44919983eec1cc6fd0 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 2d45ba381a74a743eeaa2b06c7c5c0d2bf73ba1a +gfs2 f6839838d9fb5c7e48d58a0db6025f30dc45bd4f +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 76be97c1fc945db08aae1f1b746012662d643e97 +nfsd 7fa53cc872332b265bc5ba1266f39586f218ad4a +nilfs2 f63d7d2eb44cfafbece9c916fb3537667e2d71c2 +ocfs2 bc844a4824161d0232eda7787a282b2eec1efcad +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 66048c381bb1e3a7c6fc69c28721843d6ec11c8c +udf 581b7e9fc00789782cb3bdca58db49f6f0f66608 +v9fs 2cb67f61280f24224855300a5bfe663ff010e6b4 +ubifs e36c886a0f9d624377977fa6cae309cfd7f362fa +xfs 6b0a2996a0c023d84bc27ec7528a6e54cb5ea264 +vfs 99b7db7b8ffd6bb755eb0a175596421a0b581cb2 +pci 6d97172e4f929f9a555988658ecffc3cd8c59c96 +hid e359105b4ae2df7b78ea750d1befb8cda66668c5 +i2c a140a3d027844a22ba89de73b9697d29994a40e6 +bjdooks-i2c f6e1901c4c596238abe6735bb20593f2734f757e +jdelvare-hwmon 01a6f2bd6980a07670dccfd3089d3944cb2bdbb8 +kernel-doc 9fe6206f400646a2322096b56c59891d530e8d51 +v4l-dvb 7f3b1489fc858655342f2a1cdaf2d49b183207f7 +kbuild c59514f96df8117fcedd04d5473d96a86a46a6fe +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 2834891f96a6cc876194ca94ead7219e80cc4665 +infiniband 76761141852dee712a43fc1279b6293f0cd800b6 +acpi 95ee46aa8698f2000647dfb362400fadbb5807cf +idle-test 4725fd3ce970c27a1678fb0809bfc7c2f4ac3e4f +ieee1394 2222bcb76790f4f61f39ec1514946a7593b07e02 +ubi e36c886a0f9d624377977fa6cae309cfd7f362fa +kvm 6b5d7a9f6f7ff0e096829c1d82f70d5a6066b889 +dlm f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 +swiotlb 9fe6206f400646a2322096b56c59891d530e8d51 +swiotlb-xen fe96eb404e33b59bb39f7050205f7c56c1c7d686 +ibft 4cde752587bab61cedf53fc59ca92787f8612ec0 +scsi 3c3e210877e89aa3bfbda22551876986c035c433 +async_tx 23054a9ce8ac8f3d0d63b21818b73f30a1cd76dc +net 21dc330157454046dd7c494961277d76e1c957fe +wireless bf219e9331d1b0adc712ce8607aa5cfa1ea34ce5 +mtd cfe3fdadb16162327773ef01a575a32000b8c7f4 +crypto 48fc267ee6f34f67db42a49f386fdd367cac6f8a +sound-asoc d89ccac5a242a6547bcb8073f1ff65bdfa042266 +sound 74623de6903c873d1bc51b9c9666bff1354e0a2a +cpufreq 1d1a9ba9934afd34ae57fc7b9a150b4b87bb573a +rr ad41a1e0cab07c5125456e8d38e5b1ab148d04aa +input 8905aaafb4b5d9764c5b4b54c7d03eb41bb0a7e9 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 52cc2eef31587b22ce9fbe77b064a031a9613ab0 +device-mapper da5cabf80e2433131bf0ed8993abc0f7ea618c73 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia f5acaebc85442067312856cafae589aaf6ecda8a +battery fd0964c5f1bdaa979a7ea5cfc9af2de9b0a1e766 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +kgdb c889a2c6cb16efc2e28a077610cb1d2a58c0a351 +slab 1ab335d8f85792e3b107ff8237d53cf64db714df +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 2c7d46ec192e4f2b350f67a0e185b9bce646cd6b +mfd dda191bce9e37b69860e2dd1e2dc6eb01dca2f20 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 96576a9e1a0cdb8a43d3af5846be0948f52b4460 +viafb cc92912003ec58bd9c5446b15a954b132fc0d682 +voltage f033f0a8de2d0d776693e72ce2b8226c2fefae24 +security-testing 77f7371ece501c3847f79bc013a20dcf371e1c15 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb 32d12e8cd19f86d424cab68a29c9f09a3fe97259 +watchdog 92fa5bd9a946b6e7aab6764e7312e4e3d9bed295 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu da5cabf80e2433131bf0ed8993abc0f7ea618c73 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 5002dd18c5940ce63b917d84f2b852c3b96009bb +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 681b3049dd13bc8ce579de3f017ff73deb658385 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 8d4b9d1bfef117862a2889dec4dac227068544c9 +bluetooth 41069ad92e4c890f44be03cb16473deb9ee7a572 +fsnotify 3ba67c8ac158264e429462d3cecd48f6984c08d4 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +catalin 046080645058faca2a829afb7f408a3499ef6139 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac f8c6d1e8a05e4a0b7ac15ca578699eb4953c2eb6 +devicetree 5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc +spi f2e613f6e820159a58402dce23d07d479a540be1 +limits f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 +omap_dss2 ece350d3949e9a60b39e4f9853be118e98d48fbc +xen 7cc88fdcff3cc7f0d5d2384ffd7f6d4ce9a745f1 +tip 2442ea5ea9120f4baca27652ca583c0453aefd0b +lost-spurious-irq fa7cd37f808c487f722d7a2ce9c0923a323922df +edac-amd c4799c7570475352c8c5de82ae938f7a02f206fa +oprofile da5cabf80e2433131bf0ed8993abc0f7ea618c73 +percpu 099a19d91ca429944743d51bef8fee240e94d8e3 +workqueues 9a919c46dfa48a9c1f465174609b90253eb8ffc1 +sfi e29df91e67428c1a651d18df6ec047fcb30282d3 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +drivers-x86 35989e9d7e19deb4b395aee7d120b1536337b4af +hwpoison 28957a5467bab9ed51a237d21e31055fad987887 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +bkl-core 5f202bd5ca64132cdd7f186656bc0221f257733d +bkl-procfs 99df95a22f7cfcf85405d4edc07c2d953542f0dd +bkl-ioctl b19dd42faf413b4705d4adb38521e82d73fa4249 +driver-core 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +tty 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +usb 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +staging-next f6cec0ae58c17522a7bc4e2f39dae19f199ab534 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +scsi-post-merge fc1caf6eafb30ea185720e29f7f5eccca61ecd60 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..d0f7af63ee32 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,174 @@ +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 quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +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#master +genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +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 +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/ +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 +swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.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 +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-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +lost-spurious-irq git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#lost-spurious-irq +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +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 +bkl-core git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/core +bkl-procfs git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/procfs +bkl-ioctl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#bkl/ioctl +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging-next git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..42d3a2bbd12b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2584 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3dc8d7f Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm +Merging origin/master +$ git merge origin/master +Updating 3dc8d7f..9ee4747 +Fast-forward + Makefile | 2 +- + lib/radix-tree.c | 63 +++++++++++++++++++++++++++++++++++++++++------------ + 2 files changed, 49 insertions(+), 16 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 +Merge made by recursive. + arch/m68k/include/asm/unistd.h | 5 ++++- + arch/m68k/kernel/entry.S | 3 +++ + arch/m68knommu/kernel/syscalltable.S | 3 +++ + 3 files changed, 10 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Removing arch/sparc/include/asm/rwsem-const.h +Removing arch/sparc/lib/rwsem_64.S +Merge made by recursive. + arch/sparc/include/asm/atomic_64.h | 8 +- + arch/sparc/include/asm/rwsem-const.h | 12 --- + arch/sparc/include/asm/rwsem.h | 120 +++++++++++++++++++++---- + arch/sparc/lib/Makefile | 2 +- + arch/sparc/lib/rwsem_64.S | 163 ---------------------------------- + 5 files changed, 108 insertions(+), 197 deletions(-) + delete mode 100644 arch/sparc/include/asm/rwsem-const.h + delete mode 100644 arch/sparc/lib/rwsem_64.S +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/ehea/ehea.h +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/ll_temac_main.c +Merge made by recursive. + drivers/isdn/hardware/avm/Kconfig | 3 +- + drivers/net/Kconfig | 10 + + drivers/net/Makefile | 1 + + drivers/net/bnx2x/bnx2x.h | 4 +- + drivers/net/bnx2x/bnx2x_main.c | 9 +- + drivers/net/e1000e/82571.c | 31 +- + drivers/net/e1000e/defines.h | 4 + + drivers/net/e1000e/lib.c | 10 + + drivers/net/ehea/ehea.h | 3 +- + drivers/net/ehea/ehea_main.c | 60 +- + drivers/net/ibmveth.c | 32 +- + drivers/net/ll_temac_main.c | 4 +- + drivers/net/netxen/netxen_nic.h | 4 +- + drivers/net/netxen/netxen_nic_init.c | 4 - + drivers/net/netxen/netxen_nic_main.c | 2 - + drivers/net/pxa168_eth.c | 1666 ++++++++++++++++++++++++ + drivers/net/qlcnic/qlcnic_main.c | 2 - + drivers/net/sh_eth.c | 2 +- + drivers/net/wireless/adm8211.c | 8 +- + drivers/net/wireless/at76c50x-usb.c | 22 +- + drivers/net/wireless/ath/ar9170/main.c | 4 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 8 - + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 32 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 45 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 45 - + drivers/net/wireless/iwlwifi/iwl-core.h | 3 - + drivers/net/wireless/iwlwifi/iwl-dev.h | 3 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 51 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/mwl8k.c | 34 +- + drivers/net/wireless/p54/eeprom.c | 6 +- + drivers/net/wireless/p54/fwio.c | 2 +- + drivers/net/wireless/p54/led.c | 4 +- + drivers/net/wireless/p54/p54pci.c | 2 +- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 6 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 4 +- + drivers/net/wireless/rtl818x/rtl8187_rtl8225.c | 4 +- + include/linux/if_ether.h | 2 +- + include/linux/if_fddi.h | 8 +- + include/linux/if_hippi.h | 8 +- + include/linux/if_pppox.h | 10 +- + include/linux/ipv6.h | 4 +- + include/linux/nbd.h | 2 +- + include/linux/ncp.h | 10 +- + include/linux/netfilter/xt_IDLETIMER.h | 2 +- + include/linux/netfilter/xt_ipvs.h | 2 + + include/linux/phonet.h | 4 +- + include/linux/pxa168_eth.h | 30 + + include/linux/rfkill.h | 2 +- + net/8021q/vlan_dev.c | 3 +- + net/ipv4/netfilter/arp_tables.c | 3 + + net/ipv4/netfilter/ip_tables.c | 3 + + net/ipv6/netfilter/ip6_tables.c | 3 + + net/irda/irlan/irlan_eth.c | 4 +- + net/netlink/af_netlink.c | 46 +- + net/rds/recv.c | 2 +- + 61 files changed, 2064 insertions(+), 246 deletions(-) + create mode 100644 drivers/net/pxa168_eth.c + create mode 100644 include/linux/pxa168_eth.h +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Merge made by recursive. + sound/pci/hda/hda_codec.c | 33 ++++++++++++++++++++------------- + sound/pci/hda/hda_codec.h | 2 +- + sound/pci/hda/hda_eld.c | 4 ++-- + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_hdmi.c | 21 +-------------------- + sound/pci/hda/patch_intelhdmi.c | 8 -------- + sound/pci/hda/patch_nvhdmi.c | 8 -------- + sound/pci/hda/patch_sigmatel.c | 15 +++++++++++++++ + sound/pci/intel8x0.c | 6 ++++++ + sound/soc/imx/imx-ssi.c | 3 +++ + 10 files changed, 49 insertions(+), 52 deletions(-) +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + arch/x86/include/asm/pci.h | 6 ++++-- + include/linux/pci.h | 3 +++ + 2 files changed, 7 insertions(+), 2 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Auto-merging Makefile +Merge made by recursive. + Makefile | 4 ++-- + firmware/Makefile | 2 +- + scripts/kconfig/confdata.c | 6 ++++-- + scripts/kconfig/symbol.c | 2 ++ + scripts/mkmakefile | 4 +++- + scripts/setlocalversion | 4 ++-- + 6 files changed, 14 insertions(+), 8 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Merge made by recursive. + drivers/base/firmware_class.c | 2 +- + include/linux/kobject.h | 35 +------------------------- + include/linux/kobject_ns.h | 56 +++++++++++++++++++++++++++++++++++++++++ + include/linux/sysfs.h | 1 + + lib/kobject_uevent.c | 4 +- + 5 files changed, 61 insertions(+), 37 deletions(-) + create mode 100644 include/linux/kobject_ns.h +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/char/ip2/ip2main.c | 4 +++- + drivers/char/rocket.c | 1 + + drivers/char/synclink_gt.c | 4 +++- + drivers/serial/68328serial.c | 29 +++++++++++------------------ + drivers/serial/8250_early.c | 4 ++-- + 5 files changed, 20 insertions(+), 22 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + arch/arm/mach-imx/mach-cpuimx27.c | 4 +- + arch/arm/mach-imx/mach-pca100.c | 4 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- + drivers/usb/gadget/composite.c | 4 +- + drivers/usb/gadget/m66592-udc.c | 1 + + drivers/usb/gadget/r8a66597-udc.c | 1 + + drivers/usb/gadget/uvc_v4l2.c | 2 +- + drivers/usb/host/isp1760-hcd.c | 2 + + drivers/usb/host/xhci-ring.c | 6 +- + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/iowarrior.c | 4 +- + drivers/usb/otg/twl4030-usb.c | 6 +- + drivers/usb/serial/cp210x.c | 4 +- + drivers/usb/serial/ftdi_sio.c | 5 +- + drivers/usb/serial/ftdi_sio_ids.h | 9 ++ + drivers/usb/serial/generic.c | 1 + + drivers/usb/serial/io_ti.c | 4 +- + drivers/usb/serial/navman.c | 1 + + drivers/usb/serial/option.c | 7 +- + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/serial/ssu100.c | 254 +++++++++++++++++++++++------------- + drivers/usb/serial/usb-serial.c | 23 +--- + include/linux/usb/composite.h | 1 + + 25 files changed, 228 insertions(+), 126 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Removing drivers/staging/sep/Kconfig +Removing drivers/staging/sep/Makefile +Removing drivers/staging/sep/TODO +Removing drivers/staging/sep/sep_dev.h +Removing drivers/staging/sep/sep_driver.c +Removing drivers/staging/sep/sep_driver_api.h +Removing drivers/staging/sep/sep_driver_config.h +Removing drivers/staging/sep/sep_driver_hw_defs.h +Merge made by recursive. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/batman-adv/bat_sysfs.c | 4 + + drivers/staging/batman-adv/hard-interface.c | 29 +- + drivers/staging/batman-adv/icmp_socket.c | 12 +- + drivers/staging/batman-adv/main.c | 7 +- + drivers/staging/batman-adv/originator.c | 14 +- + drivers/staging/batman-adv/routing.c | 16 +- + drivers/staging/batman-adv/types.h | 1 + + drivers/staging/sep/Kconfig | 10 - + drivers/staging/sep/Makefile | 2 - + drivers/staging/sep/TODO | 8 - + drivers/staging/sep/sep_dev.h | 110 -- + drivers/staging/sep/sep_driver.c | 2742 --------------------------- + drivers/staging/sep/sep_driver_api.h | 425 ----- + drivers/staging/sep/sep_driver_config.h | 225 --- + drivers/staging/sep/sep_driver_hw_defs.h | 232 --- + drivers/staging/spectra/ffsport.c | 29 +- + drivers/staging/spectra/flash.c | 420 +---- + 19 files changed, 70 insertions(+), 4219 deletions(-) + delete mode 100644 drivers/staging/sep/Kconfig + delete mode 100644 drivers/staging/sep/Makefile + delete mode 100644 drivers/staging/sep/TODO + delete mode 100644 drivers/staging/sep/sep_dev.h + delete mode 100644 drivers/staging/sep/sep_driver.c + delete mode 100644 drivers/staging/sep/sep_driver_api.h + delete mode 100644 drivers/staging/sep/sep_driver_config.h + delete mode 100644 drivers/staging/sep/sep_driver_hw_defs.h +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging drivers/char/hw_random/n2-drv.c +Merge made by recursive. + crypto/Kconfig | 8 ++++---- + crypto/ahash.c | 7 +++++-- + crypto/algboss.c | 8 ++++---- + crypto/testmgr.c | 4 ++-- + drivers/char/hw_random/n2-drv.c | 2 +- + 5 files changed, 16 insertions(+), 13 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/board-da830-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging arch/arm/mach-davinci/board-dm646x-evm.c +Merge made by recursive. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/Kconfig | 9 + + arch/arm/mach-imx/Makefile | 1 + + arch/arm/mach-imx/mach-imx27_visstrim_m10.c | 263 +++++++++++++++++++++++++++ + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/clock-imx35.c | 13 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 49 +++++- + arch/arm/plat-mxc/Kconfig | 12 ++ + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/epit.c | 242 ++++++++++++++++++++++++ + arch/arm/plat-mxc/include/mach/common.h | 1 + + 10 files changed, 587 insertions(+), 6 deletions(-) + create mode 100644 arch/arm/mach-imx/mach-imx27_visstrim_m10.c + create mode 100644 arch/arm/plat-mxc/epit.c +Merging msm/for-next +$ git merge msm/for-next +Already uptodate! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/configs/omap_4430sdp_defconfig | 3 + + arch/arm/mach-omap2/Makefile | 1 + + arch/arm/mach-omap2/board-n8x0.c | 49 ++++++++++++++++-------- + arch/arm/mach-omap2/board-omap4panda.c | 2 - + arch/arm/mach-omap2/clock3xxx_data.c | 14 +++--- + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/include/mach/entry-macro.S | 6 ++- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/omap-iommu.c | 2 - + arch/arm/mach-omap2/omap-smp.c | 3 +- + arch/arm/mach-omap2/pm34xx.c | 4 +- + arch/arm/plat-omap/gpio.c | 4 +- + arch/arm/plat-omap/include/plat/smp.h | 7 --- + 13 files changed, 56 insertions(+), 43 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/mach-s3c64xx/Makefile' using previous resolution. +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Resolved 'arch/arm/plat-samsung/Kconfig' using previous resolution. +Resolved 'drivers/input/touchscreen/s3c2410_ts.c' using previous resolution. +Renaming arch/arm/mach-s3c2410/include/mach/ts.h->arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/plat-samsung/include/plat/ts.h +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c64xx/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Kconfig +CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig +Auto-merging drivers/input/touchscreen/s3c2410_ts.c +CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 17d4a71] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-s3c64xx/dev-ts.c | 61 +++++++++++++++++++++++++++++++++ + arch/arm/mach-s3c64xx/mach-smdk6410.c | 5 +++ + 2 files changed, 66 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-s3c64xx/dev-ts.c +Merging s5p/for-next +$ git merge s5p/for-next +Already up-to-date. +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 +Merge made by recursive. + MAINTAINERS | 11 +++++++++++ + arch/blackfin/include/asm/bitops.h | 17 ++++++++++------- + arch/blackfin/include/asm/unistd.h | 5 ++++- + arch/blackfin/mach-common/entry.S | 3 +++ + 4 files changed, 28 insertions(+), 8 deletions(-) +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 +Merge made by recursive. + arch/m68k/include/asm/system_mm.h | 2 - + arch/m68k/include/asm/system_no.h | 9 -------- + arch/m68k/kernel/time.c | 2 - + arch/m68k/sun3/sun3ints.c | 8 ++---- + arch/m68knommu/kernel/ptrace.c | 18 ----------------- + arch/m68knommu/kernel/setup.c | 3 -- + arch/m68knommu/kernel/time.c | 16 ++++++++------ + arch/m68knommu/kernel/traps.c | 13 ------------ + arch/m68knommu/platform/68328/entry.S | 16 +++++++------- + arch/m68knommu/platform/68328/head-de2.S | 6 ----- + arch/m68knommu/platform/68328/head-ram.S | 27 -------------------------- + arch/m68knommu/platform/68360/entry.S | 7 +++++- + arch/m68knommu/platform/68VZ328/config.c | 5 ---- + arch/m68knommu/platform/coldfire/intc-2.c | 6 ++++- + arch/m68knommu/platform/coldfire/intc-simr.c | 2 + + drivers/serial/68328serial.h | 5 ---- + 16 files changed, 33 insertions(+), 112 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Auto-merging arch/microblaze/include/asm/page.h +Auto-merging drivers/serial/uartlite.c +Merge made by recursive. + arch/microblaze/Kconfig | 17 +++++++++++++++++ + arch/microblaze/include/asm/page.h | 3 --- + arch/microblaze/include/asm/prom.h | 1 + + arch/microblaze/include/asm/seccomp.h | 16 ++++++++++++++++ + arch/microblaze/include/asm/setup.h | 6 ++++++ + arch/microblaze/include/asm/thread_info.h | 20 ++++++++------------ + arch/microblaze/kernel/entry.S | 23 +++++++---------------- + arch/microblaze/kernel/exceptions.c | 8 +------- + arch/microblaze/kernel/kgdb.c | 3 +-- + arch/microblaze/kernel/setup.c | 6 ------ + arch/microblaze/kernel/timer.c | 2 +- + arch/microblaze/platform/generic/system.dts | 1 + + drivers/serial/uartlite.c | 26 +++++++++++++++++++++++++- + 13 files changed, 84 insertions(+), 48 deletions(-) + create mode 100644 arch/microblaze/include/asm/seccomp.h +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 +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/include/asm/hugetlb.h | 4 +++- + arch/s390/include/asm/mmu.h | 2 ++ + arch/s390/include/asm/mmu_context.h | 8 ++++++++ + arch/s390/include/asm/pgtable.h | 6 ++++-- + arch/s390/include/asm/tlb.h | 3 +-- + arch/s390/include/asm/tlbflush.h | 6 +++++- + arch/s390/kernel/entry.h | 4 ++-- + arch/s390/kernel/smp.c | 2 ++ + arch/s390/mm/init.c | 2 ++ + drivers/s390/char/tape_block.c | 1 + + 10 files changed, 30 insertions(+), 8 deletions(-) +Merging sh/master +$ git merge sh/master +Merge made by recursive. + arch/sh/Kconfig | 5 +- + arch/sh/boards/Kconfig | 16 + + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-sh2007.c | 133 +++ + arch/sh/boards/board-sh7757lcr.c | 374 +++++++ + arch/sh/configs/sh2007_defconfig | 213 ++++ + arch/sh/configs/sh7757lcr_defconfig | 85 ++ + arch/sh/drivers/dma/dma-api.c | 4 +- + arch/sh/drivers/pci/ops-sh7786.c | 27 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 32 +- + arch/sh/include/asm/Kbuild | 2 + + arch/sh/include/asm/elf.h | 27 +- + arch/sh/include/asm/fixmap.h | 4 +- + arch/sh/include/asm/irq.h | 2 +- + arch/sh/include/asm/kprobes.h | 1 - + arch/sh/include/asm/processor_32.h | 3 - + arch/sh/include/asm/processor_64.h | 3 - + arch/sh/include/asm/ptrace.h | 169 ++-- + arch/sh/include/asm/ptrace_32.h | 83 ++ + arch/sh/include/asm/ptrace_64.h | 20 + + arch/sh/include/asm/syscalls_32.h | 7 +- + arch/sh/include/asm/system_32.h | 13 +- + arch/sh/include/asm/tlbflush.h | 2 + + arch/sh/include/asm/unistd_32.h | 5 +- + arch/sh/include/asm/unistd_64.h | 5 +- + arch/sh/include/cpu-sh4/cpu/sh7757.h | 301 +++--- + arch/sh/include/mach-common/mach/sh2007.h | 117 +++ + arch/sh/kernel/Makefile | 2 +- + arch/sh/kernel/cpu/sh4/probe.c | 2 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 199 ++-- + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 1582 +++++++++++++++++------------ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 66 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 222 +++-- + arch/sh/kernel/kprobes.c | 100 +- + arch/sh/kernel/ptrace.c | 33 + + arch/sh/kernel/ptrace_32.c | 27 + + arch/sh/kernel/ptrace_64.c | 79 ++ + arch/sh/kernel/reboot.c | 4 + + arch/sh/kernel/syscalls_32.S | 3 + + arch/sh/kernel/syscalls_64.S | 3 + + arch/sh/mm/consistent.c | 3 +- + arch/sh/mm/init.c | 52 +- + arch/sh/mm/nommu.c | 4 + + arch/sh/mm/tlbflush_32.c | 16 + + arch/sh/mm/tlbflush_64.c | 5 + + arch/sh/tools/mach-types | 2 + + drivers/Makefile | 2 +- + drivers/clocksource/sh_cmt.c | 12 +- + drivers/i2c/busses/i2c-sh_mobile.c | 23 +- + drivers/serial/sh-sci.h | 17 +- + drivers/sh/clk.c | 9 +- + sound/soc/sh/siu_pcm.c | 2 + + 54 files changed, 2919 insertions(+), 1209 deletions(-) + create mode 100644 arch/sh/boards/board-sh2007.c + create mode 100644 arch/sh/boards/board-sh7757lcr.c + create mode 100644 arch/sh/configs/sh2007_defconfig + create mode 100644 arch/sh/configs/sh7757lcr_defconfig + create mode 100644 arch/sh/include/asm/ptrace_32.h + create mode 100644 arch/sh/include/asm/ptrace_64.h + create mode 100644 arch/sh/include/mach-common/mach/sh2007.h + create mode 100644 arch/sh/kernel/ptrace.c +Merging genesis/master +$ git merge genesis/master +Merge made by recursive. + arch/arm/mach-shmobile/Makefile | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 56 ++++++++--- + arch/arm/mach-shmobile/clock-sh7372.c | 9 +- + arch/arm/mach-shmobile/clock.c | 4 +- + arch/arm/mach-shmobile/pm_runtime.c | 169 +++++++++++++++++++++++++++++++++ + 5 files changed, 220 insertions(+), 20 deletions(-) + create mode 100644 arch/arm/mach-shmobile/pm_runtime.c +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 9a58dc8a] 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 +Resolved 'net/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Removing fs/ceph/README +Removing fs/ceph/ceph_strings.c +Auto-merging mm/page-writeback.c +Auto-merging net/Kconfig +Auto-merging net/Makefile +CONFLICT (content): Merge conflict in net/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1ae093] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 + + drivers/block/Kconfig | 16 + + drivers/block/Makefile | 1 + + drivers/block/rbd.c | 1843 +++++++++++++++++++++++++++++ + drivers/block/rbd_types.h | 73 ++ + fs/ceph/Kconfig | 14 +- + fs/ceph/Makefile | 11 +- + fs/ceph/README | 20 - + fs/ceph/addr.c | 73 +- + fs/ceph/caps.c | 35 +- + fs/ceph/ceph_frag.c | 3 +- + fs/ceph/ceph_strings.c | 193 --- + fs/ceph/debugfs.c | 407 ++----- + fs/ceph/dir.c | 55 +- + fs/ceph/export.c | 5 +- + fs/ceph/file.c | 207 +--- + fs/ceph/inode.c | 19 +- + fs/ceph/ioctl.c | 11 +- + fs/ceph/locks.c | 6 +- + fs/ceph/mds_client.c | 111 ++- + fs/ceph/mds_client.h | 20 +- + fs/ceph/mdsmap.c | 11 +- + fs/ceph/snap.c | 70 +- + fs/ceph/strings.c | 117 ++ + fs/ceph/super.c | 1154 ++++++++----------- + fs/ceph/super.h | 397 +++---- + fs/ceph/xattr.c | 15 +- + {fs => include/linux}/ceph/auth.h | 4 +- + {fs => include/linux}/ceph/buffer.h | 0 + {fs => include/linux}/ceph/ceph_debug.h | 5 +- + {fs => include/linux}/ceph/ceph_frag.h | 0 + {fs => include/linux}/ceph/ceph_fs.h | 0 + {fs => include/linux}/ceph/ceph_hash.h | 0 + {fs => include/linux}/ceph/crush/crush.h | 0 + {fs => include/linux}/ceph/crush/hash.h | 0 + {fs => include/linux}/ceph/crush/mapper.h | 0 + include/linux/ceph/debugfs.h | 33 + + {fs => include/linux}/ceph/decode.h | 5 + + include/linux/ceph/libceph.h | 249 ++++ + {fs => include/linux}/ceph/mdsmap.h | 0 + {fs => include/linux}/ceph/messenger.h | 12 +- + {fs => include/linux}/ceph/mon_client.h | 1 + + {fs => include/linux}/ceph/msgpool.h | 0 + {fs => include/linux}/ceph/msgr.h | 0 + {fs => include/linux}/ceph/osd_client.h | 67 ++ + {fs => include/linux}/ceph/osdmap.h | 2 + + {fs => include/linux}/ceph/pagelist.h | 2 +- + {fs => include/linux}/ceph/rados.h | 0 + {fs => include/linux}/ceph/types.h | 0 + mm/page-writeback.c | 1 + + net/Kconfig | 1 + + net/Makefile | 1 + + net/ceph/Kconfig | 27 + + net/ceph/Makefile | 37 + + {fs => net}/ceph/armor.c | 0 + {fs => net}/ceph/auth.c | 10 +- + {fs => net}/ceph/auth_none.c | 7 +- + {fs => net}/ceph/auth_none.h | 3 +- + {fs => net}/ceph/auth_x.c | 9 +- + {fs => net}/ceph/auth_x.h | 3 +- + {fs => net}/ceph/auth_x_protocol.h | 0 + {fs => net}/ceph/buffer.c | 9 +- + net/ceph/ceph_common.c | 529 +++++++++ + {fs => net}/ceph/ceph_fs.c | 5 +- + {fs => net}/ceph/ceph_hash.c | 2 +- + net/ceph/ceph_strings.c | 84 ++ + {fs => net}/ceph/crush/crush.c | 2 +- + {fs => net}/ceph/crush/hash.c | 2 +- + {fs => net}/ceph/crush/mapper.c | 4 +- + {fs => net}/ceph/crypto.c | 4 +- + {fs => net}/ceph/crypto.h | 4 +- + net/ceph/debugfs.c | 267 +++++ + {fs => net}/ceph/messenger.c | 296 ++++- + {fs => net}/ceph/mon_client.c | 73 +- + {fs => net}/ceph/msgpool.c | 4 +- + {fs => net}/ceph/osd_client.c | 400 +++++-- + {fs => net}/ceph/osdmap.c | 30 +- + {fs => net}/ceph/pagelist.c | 8 +- + net/ceph/pagevec.c | 223 ++++ + 79 files changed, 5250 insertions(+), 2073 deletions(-) + create mode 100644 drivers/block/rbd.c + create mode 100644 drivers/block/rbd_types.h + delete mode 100644 fs/ceph/README + delete mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/strings.c + rename {fs => include/linux}/ceph/auth.h (97%) + rename {fs => include/linux}/ceph/buffer.h (100%) + rename {fs => include/linux}/ceph/ceph_debug.h (86%) + rename {fs => include/linux}/ceph/ceph_frag.h (100%) + rename {fs => include/linux}/ceph/ceph_fs.h (100%) + rename {fs => include/linux}/ceph/ceph_hash.h (100%) + rename {fs => include/linux}/ceph/crush/crush.h (100%) + rename {fs => include/linux}/ceph/crush/hash.h (100%) + rename {fs => include/linux}/ceph/crush/mapper.h (100%) + create mode 100644 include/linux/ceph/debugfs.h + rename {fs => include/linux}/ceph/decode.h (96%) + create mode 100644 include/linux/ceph/libceph.h + rename {fs => include/linux}/ceph/mdsmap.h (100%) + rename {fs => include/linux}/ceph/messenger.h (95%) + rename {fs => include/linux}/ceph/mon_client.h (99%) + rename {fs => include/linux}/ceph/msgpool.h (100%) + rename {fs => include/linux}/ceph/msgr.h (100%) + rename {fs => include/linux}/ceph/osd_client.h (76%) + rename {fs => include/linux}/ceph/osdmap.h (97%) + rename {fs => include/linux}/ceph/pagelist.h (93%) + rename {fs => include/linux}/ceph/rados.h (100%) + rename {fs => include/linux}/ceph/types.h (100%) + create mode 100644 net/ceph/Kconfig + create mode 100644 net/ceph/Makefile + rename {fs => net}/ceph/armor.c (100%) + rename {fs => net}/ceph/auth.c (97%) + rename {fs => net}/ceph/auth_none.c (96%) + rename {fs => net}/ceph/auth_none.h (94%) + rename {fs => net}/ceph/auth_x.c (99%) + rename {fs => net}/ceph/auth_x.h (96%) + rename {fs => net}/ceph/auth_x_protocol.h (100%) + rename {fs => net}/ceph/buffer.c (86%) + create mode 100644 net/ceph/ceph_common.c + rename {fs => net}/ceph/ceph_fs.c (92%) + rename {fs => net}/ceph/ceph_hash.c (98%) + create mode 100644 net/ceph/ceph_strings.c + rename {fs => net}/ceph/crush/crush.c (98%) + rename {fs => net}/ceph/crush/hash.c (98%) + rename {fs => net}/ceph/crush/mapper.c (99%) + rename {fs => net}/ceph/crypto.c (99%) + rename {fs => net}/ceph/crypto.h (95%) + create mode 100644 net/ceph/debugfs.c + rename {fs => net}/ceph/messenger.c (89%) + rename {fs => net}/ceph/mon_client.c (94%) + rename {fs => net}/ceph/msgpool.c (95%) + rename {fs => net}/ceph/osd_client.c (84%) + rename {fs => net}/ceph/osdmap.c (97%) + rename {fs => net}/ceph/pagelist.c (83%) + create mode 100644 net/ceph/pagevec.c +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/Kconfig | 2 + + fs/cifs/asn1.c | 6 +- + fs/cifs/cifs_unicode.h | 18 ++- + fs/cifs/cifs_uniupr.h | 16 +- + fs/cifs/cifsencrypt.c | 418 ++++++++++++++++++++++++++++++++++-------------- + fs/cifs/cifsglob.h | 18 ++- + fs/cifs/cifspdu.h | 7 +- + fs/cifs/cifsproto.h | 12 +- + fs/cifs/cifssmb.c | 13 +- + fs/cifs/connect.c | 17 ++- + fs/cifs/dir.c | 161 +++++++++---------- + fs/cifs/file.c | 3 +- + fs/cifs/ntlmssp.h | 13 ++ + fs/cifs/sess.c | 131 +++++++++++---- + fs/cifs/transport.c | 6 +- + 15 files changed, 564 insertions(+), 277 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 | 2 +- + fs/ecryptfs/keystore.c | 2 ++ + fs/ecryptfs/kthread.c | 2 +- + fs/ecryptfs/messaging.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 6 insertions(+), 4 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Merge made by recursive. + fs/quota/Kconfig | 4 ++-- + fs/xfs/Kconfig | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) +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/Kconfig | 2 +- + fs/gfs2/aops.c | 20 ++--- + fs/gfs2/bmap.c | 255 +++++++++++++++++++++----------------------- + fs/gfs2/bmap.h | 20 ++-- + fs/gfs2/dir.c | 28 +++--- + fs/gfs2/file.c | 2 +- + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 2 +- + fs/gfs2/inode.c | 9 +- + fs/gfs2/inode.h | 15 +++ + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/ops_inode.c | 290 ++++++++++++++++++++++++++++++++++++++++++++----- + fs/gfs2/quota.c | 13 +-- + fs/gfs2/rgrp.c | 28 ++++- + fs/gfs2/super.c | 11 +- + fs/gfs2/trans.h | 1 + + 16 files changed, 475 insertions(+), 228 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 6dff2dd] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/the_nilfs.c | 4 ++-- + include/linux/nilfs2_fs.h | 1 + + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/jbd2/journal.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging include/linux/fs.h +Merge made by recursive. + fs/ext3/super.c | 4 +- + fs/ext4/super.c | 8 +- + fs/jbd2/journal.c | 4 + + fs/libfs.c | 29 ++++ + fs/ocfs2/aops.c | 9 +- + fs/ocfs2/aops.h | 3 +- + fs/ocfs2/blockcheck.c | 4 +- + fs/ocfs2/file.c | 49 +++---- + fs/ocfs2/inode.c | 6 +- + fs/ocfs2/inode.h | 11 +- + fs/ocfs2/ioctl.c | 356 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/ocfs2/journal.c | 9 +- + fs/ocfs2/journal.h | 3 +- + fs/ocfs2/mmap.c | 7 +- + fs/ocfs2/ocfs2.h | 23 ++- + fs/ocfs2/ocfs2_ioctl.h | 95 +++++++++++++ + fs/ocfs2/refcounttree.c | 43 ++++++- + fs/ocfs2/refcounttree.h | 7 +- + fs/ocfs2/super.c | 51 ++++++- + include/linux/fs.h | 2 + + 20 files changed, 645 insertions(+), 78 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/fid.c | 3 ++- + fs/9p/vfs_dir.c | 3 ++- + fs/9p/vfs_file.c | 23 +++++++++++++++++++---- + fs/9p/vfs_inode.c | 15 ++------------- + include/net/9p/9p.h | 4 ++++ + net/9p/client.c | 45 ++++++++++++++++++++++++++++----------------- + 6 files changed, 57 insertions(+), 36 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Merge made by recursive. + drivers/pci/pci.c | 2 +- + drivers/pci/proc.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/Kconfig | 12 + + drivers/hid/Makefile | 2 + + drivers/hid/hid-apple.c | 7 +- + drivers/hid/hid-cherry.c | 7 +- + drivers/hid/hid-core.c | 8 +- + drivers/hid/hid-cypress.c | 9 +- + drivers/hid/hid-elecom.c | 7 +- + drivers/hid/hid-ids.h | 7 + + drivers/hid/hid-input.c | 4 + + drivers/hid/hid-kye.c | 7 +- + drivers/hid/hid-lg.c | 9 +- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 7 +- + drivers/hid/hid-ortek.c | 7 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-prodikeys.c | 7 +- + drivers/hid/hid-samsung.c | 20 +- + drivers/hid/hid-sony.c | 7 +- + drivers/hid/hid-sunplus.c | 7 +- + drivers/hid/hid-uclogic.c | 623 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-waltop.c | 558 +++++++++++++++++++++++++++++++++++ + drivers/hid/hid-zydacron.c | 7 +- + drivers/hid/usbhid/hid-quirks.c | 6 +- + include/linux/hid.h | 4 +- + 24 files changed, 1289 insertions(+), 57 deletions(-) + create mode 100644 drivers/hid/hid-uclogic.c + create mode 100644 drivers/hid/hid-waltop.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + drivers/i2c/i2c-core.c | 30 ++++++++++++++++++------------ + drivers/i2c/i2c-dev.c | 13 ++++++------- + drivers/misc/bh1780gli.c | 1 - + drivers/regulator/ad5398.c | 1 - + drivers/regulator/isl6271a-regulator.c | 2 -- + drivers/rtc/rtc-ds3232.c | 2 -- + include/linux/i2c.h | 12 ++++++++---- + 7 files changed, 32 insertions(+), 29 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 +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 3 +- + drivers/hwmon/ads7871.c | 38 ++++++++++---------- + drivers/hwmon/coretemp.c | 1 - + drivers/hwmon/k8temp.c | 84 +++++++++++++++++++++++++++++----------------- + 4 files changed, 73 insertions(+), 53 deletions(-) +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/video/cx23885/cx23885-i2c.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.c +Auto-merging drivers/media/video/ivtv/ivtv-driver.h +Auto-merging drivers/media/video/ivtv/ivtv-i2c.c +Auto-merging drivers/media/video/v4l2-common.c +Auto-merging drivers/media/video/v4l2-dev.c +Merge made by recursive. +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/kconfig/Makefile | 5 +- + scripts/kconfig/confdata.c | 1 + + scripts/kconfig/nconf.c | 365 +++++++++++++++++++++++-------------------- + scripts/kconfig/nconf.gui.c | 22 ++-- + scripts/kconfig/nconf.h | 3 +- + 5 files changed, 213 insertions(+), 183 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already uptodate! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Removing drivers/ata/pata_winbond.c +Merge made by recursive. + Documentation/ABI/testing/sysfs-ata | 99 +++++ + drivers/ata/Kconfig | 1 + + drivers/ata/Makefile | 3 +- + drivers/ata/ahci.c | 11 + + drivers/ata/ahci.h | 1 + + drivers/ata/libahci.c | 16 +- + drivers/ata/libata-core.c | 62 +++- + drivers/ata/libata-eh.c | 35 +- + drivers/ata/libata-pmp.c | 18 +- + drivers/ata/libata-scsi.c | 117 +++--- + drivers/ata/libata-transport.c | 774 +++++++++++++++++++++++++++++++++++ + drivers/ata/libata-transport.h | 18 + + drivers/ata/libata.h | 7 + + drivers/ata/pata_cmd64x.c | 6 - + drivers/ata/pata_legacy.c | 15 +- + drivers/ata/pata_winbond.c | 282 ------------- + drivers/ata/sata_fsl.c | 8 +- + drivers/ata/sata_mv.c | 25 +- + drivers/ata/sata_nv.c | 57 +-- + include/linux/ata.h | 46 ++- + include/linux/libata.h | 5 + + 21 files changed, 1171 insertions(+), 435 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-ata + create mode 100644 drivers/ata/libata-transport.c + create mode 100644 drivers/ata/libata-transport.h + delete mode 100644 drivers/ata/pata_winbond.c +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/infiniband/hw/cxgb4/cq.c | 4 ++-- + drivers/infiniband/hw/cxgb4/mem.c | 2 +- + drivers/infiniband/hw/cxgb4/qp.c | 6 +++--- + drivers/infiniband/hw/nes/nes_verbs.c | 12 ++++++------ + 5 files changed, 13 insertions(+), 13 deletions(-) +Merging acpi/test +$ git merge acpi/test +Already up-to-date. +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-transaction.c | 13 ++++++++++--- + drivers/firewire/net.c | 28 +++++++++++++++------------- + drivers/firewire/sbp2.c | 23 +++++++++++++++-------- + drivers/ieee1394/ohci1394.c | 2 +- + 4 files changed, 41 insertions(+), 25 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging swiotlb-xen/master +$ git merge swiotlb-xen/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 +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/shdma.c +Merge made by recursive. + drivers/dma/Kconfig | 8 + + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 2025 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/dma/shdma.c | 3 +- + include/linux/amba/pl08x.h | 184 ++++ + include/linux/dmaengine.h | 2 +- + 6 files changed, 2221 insertions(+), 2 deletions(-) + create mode 100644 drivers/dma/amba-pl08x.c + create mode 100644 include/linux/amba/pl08x.h +Merging net/master +$ git merge net/master +Auto-merging MAINTAINERS +Auto-merging drivers/firewire/net.c +Merge made by recursive. + Documentation/networking/timestamping.txt | 22 +- + MAINTAINERS | 14 + + drivers/atm/iphase.c | 2 +- + drivers/firewire/net.c | 13 - + drivers/ieee1394/eth1394.c | 16 - + drivers/isdn/hisax/hfc_sx.c | 13 +- + drivers/isdn/mISDN/dsp_cmx.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 2 +- + drivers/net/Kconfig | 11 + + drivers/net/Makefile | 1 + + drivers/net/amd8111e.c | 18 +- + drivers/net/amd8111e.h | 1 - + drivers/net/arm/am79c961a.c | 35 +- + drivers/net/arm/am79c961a.h | 1 - + drivers/net/arm/ep93xx_eth.c | 39 +- + drivers/net/arm/ether1.c | 34 +- + drivers/net/arm/ether1.h | 1 - + drivers/net/arm/ether3.c | 33 +- + drivers/net/arm/ether3.h | 1 - + drivers/net/atl1c/atl1c.h | 1 - + drivers/net/atl1c/atl1c_main.c | 6 +- + drivers/net/bfin_mac.c | 10 +- + drivers/net/bmac.c | 7 - + drivers/net/bnx2.c | 44 ++- + drivers/net/bnx2x/bnx2x_cmn.c | 20 + + drivers/net/bnx2x/bnx2x_cmn.h | 9 + + drivers/net/bnx2x/bnx2x_link.c | 10 +- + drivers/net/bnx2x/bnx2x_main.c | 26 +- + drivers/net/cnic.c | 2 +- + drivers/net/cpmac.c | 35 +- + drivers/net/eepro.c | 8 +- + drivers/net/ehea/ehea_main.c | 4 +- + drivers/net/enic/enic.h | 2 +- + drivers/net/enic/enic_main.c | 19 +- + drivers/net/enic/vnic_dev.c | 25 +- + drivers/net/enic/vnic_devcmd.h | 12 + + drivers/net/enic/vnic_enet.h | 2 +- + drivers/net/enic/vnic_resource.h | 13 + + drivers/net/enic/vnic_rq.c | 6 +- + drivers/net/enic/vnic_vic.c | 7 +- + drivers/net/enic/vnic_wq.c | 6 +- + drivers/net/fec_mpc52xx.c | 6 - + drivers/net/gianfar.c | 17 +- + drivers/net/greth.c | 4 +- + drivers/net/hamradio/scc.c | 3 +- + drivers/net/igb/igb.h | 2 +- + drivers/net/igb/igb_main.c | 11 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/ixgbe/ixgbe.h | 30 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 385 +++++-------- + drivers/net/ixgbe/ixgbe_fcoe.c | 2 +- + drivers/net/ixgbe/ixgbe_main.c | 925 ++++++++++++++++------------- + drivers/net/ixgbe/ixgbe_type.h | 2 + + drivers/net/macvtap.c | 99 +++- + drivers/net/mlx4/alloc.c | 2 +- + drivers/net/mlx4/en_ethtool.c | 2 - + drivers/net/mlx4/en_main.c | 5 - + drivers/net/mlx4/en_netdev.c | 3 +- + drivers/net/mlx4/en_rx.c | 4 +- + drivers/net/mlx4/mlx4_en.h | 1 - + drivers/net/mlx4/profile.c | 2 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/niu.c | 4 +- + drivers/net/pasemi_mac_ethtool.c | 16 - + drivers/net/pcmcia/3c574_cs.c | 86 ++-- + drivers/net/pcmcia/3c589_cs.c | 13 +- + drivers/net/pcmcia/axnet_cs.c | 177 +++--- + drivers/net/pcmcia/com20020_cs.c | 32 +- + drivers/net/pcmcia/fmvj18x_cs.c | 60 +- + drivers/net/pcmcia/ibmtr_cs.c | 26 +- + drivers/net/pcmcia/nmclan_cs.c | 54 +- + drivers/net/pcmcia/pcnet_cs.c | 100 ++-- + drivers/net/pcmcia/smc91c92_cs.c | 99 ++-- + drivers/net/pcmcia/xirc2ps_cs.c | 104 ++-- + drivers/net/pptp.c | 726 ++++++++++++++++++++++ + drivers/net/qlcnic/qlcnic.h | 65 ++- + drivers/net/qlcnic/qlcnic_ctx.c | 265 ++++++++- + drivers/net/qlcnic/qlcnic_ethtool.c | 58 ++- + drivers/net/qlcnic/qlcnic_hdr.h | 17 +- + drivers/net/qlcnic/qlcnic_hw.c | 5 +- + drivers/net/qlcnic/qlcnic_init.c | 154 ++---- + drivers/net/qlcnic/qlcnic_main.c | 635 ++++++++++++++------ + drivers/net/qlge/qlge_main.c | 5 +- + drivers/net/r6040.c | 34 +- + drivers/net/s2io.c | 4 +- + drivers/net/s2io.h | 8 - + drivers/net/sc92031.c | 11 - + drivers/net/slip.c | 50 +- + drivers/net/sungem.c | 211 +++---- + drivers/net/sungem_phy.c | 3 +- + drivers/net/sunhme.c | 6 +- + drivers/net/sunvnet.c | 50 +- + drivers/net/tehuti.c | 21 +- + drivers/net/tehuti.h | 1 - + drivers/net/tokenring/tms380tr.c | 6 +- + drivers/net/tulip/xircom_cb.c | 15 - + drivers/net/usb/hso.c | 9 - + drivers/net/usb/kaweth.c | 9 - + drivers/net/virtio_net.c | 14 - + drivers/net/vxge/vxge-main.c | 32 +- + drivers/net/vxge/vxge-main.h | 1 - + drivers/net/wan/c101.c | 2 +- + drivers/net/wan/n2.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wireless/airo.c | 5 +- + drivers/net/wireless/b43/phy_n.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 6 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 12 +- + drivers/net/wireless/ray_cs.c | 16 - + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 4 +- + drivers/net/wireless/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_scan.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 11 - + drivers/net/xen-netfront.c | 8 +- + drivers/net/xilinx_emaclite.c | 13 + + include/linux/if_macvlan.h | 9 +- + include/linux/if_pppox.h | 50 ++- + include/linux/if_vlan.h | 5 +- + include/linux/in.h | 19 + + include/linux/netdevice.h | 2 +- + include/linux/pkt_cls.h | 1 + + include/linux/rds.h | 9 - + include/linux/skbuff.h | 57 +- + include/linux/tc_act/Kbuild | 1 + + include/linux/tc_act/tc_csum.h | 32 + + include/net/gre.h | 18 + + include/net/ip.h | 2 +- + include/net/irda/irlan_common.h | 1 - + include/net/sock.h | 8 +- + include/net/tc_act/tc_csum.h | 15 + + net/8021q/vlan_core.c | 3 +- + net/atm/common.c | 2 +- + net/atm/lec.c | 1 - + net/ax25/af_ax25.c | 2 +- + net/ax25/ax25_route.c | 4 +- + net/bridge/br_input.c | 2 +- + net/can/raw.c | 4 +- + net/core/dev.c | 141 +++-- + net/core/ethtool.c | 33 +- + net/core/skbuff.c | 20 +- + net/decnet/dn_nsp_out.c | 8 +- + net/ipv4/Kconfig | 7 + + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 8 +- + net/ipv4/gre.c | 151 +++++ + net/ipv4/icmp.c | 4 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_gre.c | 14 +- + net/ipv4/ip_output.c | 8 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 31 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 9 +- + net/ipv4/tcp_output.c | 11 + + net/ipv4/udp.c | 4 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/reassembly.c | 2 +- + net/irda/irlan/irlan_eth.c | 32 +- + net/netfilter/xt_hashlimit.c | 15 +- + net/packet/af_packet.c | 4 +- + net/sched/Kconfig | 10 + + net/sched/Makefile | 1 + + net/sched/act_csum.c | 596 +++++++++++++++++++ + net/sched/cls_flow.c | 74 ++- + net/sched/sch_api.c | 2 +- + net/sched/sch_sfq.c | 33 +- + net/socket.c | 9 +- + net/tipc/bcast.c | 39 +- + net/tipc/core.c | 6 +- + net/tipc/discover.c | 8 + + net/tipc/link.c | 25 +- + net/tipc/name_table.c | 44 +- + net/tipc/node.c | 22 +- + net/tipc/node.h | 2 + + net/tipc/port.c | 15 +- + net/tipc/socket.c | 81 ++- + 182 files changed, 4532 insertions(+), 2521 deletions(-) + create mode 100644 drivers/net/pptp.c + create mode 100644 include/linux/tc_act/tc_csum.h + create mode 100644 include/net/gre.h + create mode 100644 include/net/tc_act/tc_csum.h + create mode 100644 net/ipv4/gre.c + create mode 100644 net/sched/act_csum.c +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'drivers/net/mlx4/en_rx.c' +Resolved 'drivers/net/wireless/libertas/if_sdio.c' using previous resolution. +Auto-merging Documentation/DocBook/Makefile +Removing Documentation/DocBook/mac80211.tmpl +Auto-merging drivers/net/ehea/ehea_main.c +Auto-merging drivers/net/mlx4/en_rx.c +CONFLICT (content): Merge conflict in drivers/net/mlx4/en_rx.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/niu.c +Auto-merging drivers/net/vxge/vxge-main.c +Auto-merging drivers/net/wireless/at76c50x-usb.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Auto-merging drivers/net/wireless/b43/phy_n.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2100.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/libertas/cfg.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/net/wireless/libertas_tf/if_usb.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/net/wireless/p54/eeprom.c +Auto-merging drivers/net/wireless/p54/fwio.c +Auto-merging drivers/net/wireless/p54/txrx.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/rtl818x/rtl8180_dev.c +Auto-merging drivers/net/wireless/rtl818x/rtl8187_dev.c +Auto-merging include/linux/netdevice.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/mlx4/en_rx.c'. +[master 6bb8874] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 496 ++++++++++++++++++ + Documentation/DocBook/Makefile | 2 +- + Documentation/DocBook/mac80211.tmpl | 337 ------------ + drivers/net/wireless/at76c50x-usb.c | 7 +- + drivers/net/wireless/ath/ar9170/main.c | 31 +- + drivers/net/wireless/ath/ath5k/ani.c | 6 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 7 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 90 ++-- + drivers/net/wireless/ath/ath5k/dma.c | 4 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pcu.c | 32 +- + drivers/net/wireless/ath/ath5k/phy.c | 15 +- + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath5k/reset.c | 24 +- + drivers/net/wireless/ath/ath5k/rfbuffer.h | 4 +- + drivers/net/wireless/ath/ath9k/Makefile | 3 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 2 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 9 +- + drivers/net/wireless/ath/ath9k/beacon.c | 7 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 7 + + drivers/net/wireless/ath/ath9k/calib.c | 109 ++++- + drivers/net/wireless/ath/ath9k/calib.h | 1 + + drivers/net/wireless/ath/ath9k/common.c | 67 ++- + drivers/net/wireless/ath/ath9k/common.h | 10 + + drivers/net/wireless/ath/ath9k/gpio.c | 40 +-- + drivers/net/wireless/ath/ath9k/hif_usb.c | 3 +- + drivers/net/wireless/ath/ath9k/htc.h | 42 ++- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 134 +++++ + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 42 ++- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 17 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 4 +- + drivers/net/wireless/ath/ath9k/htc_hst.h | 2 +- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 19 +- + drivers/net/wireless/ath/ath9k/wmi.c | 2 + + drivers/net/wireless/ath/ath9k/wmi.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/ath/debug.h | 2 + + drivers/net/wireless/b43/main.c | 30 +- + drivers/net/wireless/b43/phy_n.c | 60 ++- + drivers/net/wireless/b43legacy/main.c | 5 + + drivers/net/wireless/hostap/hostap_ioctl.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/iwlwifi/Kconfig | 10 + + drivers/net/wireless/iwlwifi/Makefile | 1 + + drivers/net/wireless/iwlwifi/iwl-1000.c | 5 + + drivers/net/wireless/iwlwifi/iwl-4965.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 12 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 21 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 42 ++- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 696 +++++++++++++++++++++++++ + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 129 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 141 ++++- + drivers/net/wireless/iwlwifi/iwl-commands.h | 50 ++- + drivers/net/wireless/iwlwifi/iwl-core.c | 154 ++----- + drivers/net/wireless/iwlwifi/iwl-core.h | 29 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 638 +---------------------- + drivers/net/wireless/iwlwifi/iwl-power.h | 93 ---- + drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 24 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 9 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 69 ++-- + drivers/net/wireless/iwmc3200wifi/rx.c | 7 +- + drivers/net/wireless/libertas/cfg.c | 62 ++- + drivers/net/wireless/libertas/decl.h | 13 + + drivers/net/wireless/libertas/if_cs.c | 130 +++-- + drivers/net/wireless/libertas/if_sdio.c | 171 +++---- + drivers/net/wireless/libertas/if_sdio.h | 4 - + drivers/net/wireless/libertas/if_spi.c | 150 +++--- + drivers/net/wireless/libertas/if_spi.h | 5 - + drivers/net/wireless/libertas/if_usb.c | 60 ++- + drivers/net/wireless/libertas/if_usb.h | 1 + + drivers/net/wireless/libertas/main.c | 105 ++++ + drivers/net/wireless/libertas_tf/if_usb.c | 57 ++- + drivers/net/wireless/mac80211_hwsim.c | 7 +- + drivers/net/wireless/p54/Kconfig | 1 + + drivers/net/wireless/p54/eeprom.c | 21 +- + drivers/net/wireless/p54/fwio.c | 6 +- + drivers/net/wireless/p54/main.c | 9 +- + drivers/net/wireless/p54/p54spi_eeprom.h | 2 +- + drivers/net/wireless/p54/txrx.c | 17 +- + drivers/net/wireless/prism54/isl_ioctl.c | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2800.h | 27 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 130 +++++- + drivers/net/wireless/rt2x00/rt2800lib.h | 15 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 119 +---- + drivers/net/wireless/rt2x00/rt2800usb.c | 54 ++- + drivers/net/wireless/rt2x00/rt2x00.h | 16 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 12 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 17 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 63 ++-- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 + + drivers/net/wireless/rt2x00/rt2x00ht.c | 10 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 135 ++++-- + drivers/net/wireless/rt2x00/rt61pci.c | 10 +- + drivers/net/wireless/rt2x00/rt73usb.c | 4 +- + drivers/net/wireless/rtl818x/rtl8180_dev.c | 143 +++--- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_acx.h | 8 +- + drivers/net/wireless/wl12xx/wl1251_boot.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_cmd.h | 6 +- + drivers/net/wireless/wl12xx/wl1251_event.c | 29 + + drivers/net/wireless/wl12xx/wl1251_event.h | 1 + + drivers/net/wireless/wl12xx/wl1251_main.c | 37 +- + drivers/net/wireless/wl12xx/wl1251_tx.c | 4 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 2 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 13 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 5 + + include/linux/netdevice.h | 2 + + include/linux/nl80211.h | 150 +++++-- + include/linux/ssb/ssb_regs.h | 1 + + include/net/cfg80211.h | 179 ++++++- + include/net/mac80211.h | 60 ++- + net/core/net-sysfs.c | 3 +- + net/mac80211/aes_ccm.c | 6 +- + net/mac80211/aes_cmac.c | 6 +- + net/mac80211/agg-rx.c | 22 + + net/mac80211/cfg.c | 62 +-- + net/mac80211/debugfs_key.c | 55 +-- + net/mac80211/driver-trace.h | 4 +- + net/mac80211/ht.c | 28 + + net/mac80211/ibss.c | 8 +- + net/mac80211/ieee80211_i.h | 20 +- + net/mac80211/iface.c | 63 ++- + net/mac80211/key.c | 59 +-- + net/mac80211/key.h | 4 +- + net/mac80211/main.c | 81 +++- + net/mac80211/mlme.c | 28 +- + net/mac80211/rc80211_pid_debugfs.c | 2 +- + net/mac80211/rx.c | 503 ++++++++++++------ + net/mac80211/scan.c | 32 +- + net/mac80211/sta_info.h | 16 +- + net/mac80211/status.c | 2 +- + net/mac80211/tx.c | 22 +- + net/mac80211/util.c | 6 +- + net/mac80211/wep.c | 2 +- + net/mac80211/work.c | 39 +- + net/mac80211/wpa.c | 32 +- + net/wireless/core.c | 15 +- + net/wireless/core.h | 21 +- + net/wireless/mlme.c | 149 ++++-- + net/wireless/nl80211.c | 123 ++++- + net/wireless/nl80211.h | 14 +- + net/wireless/reg.c | 16 +- + net/wireless/sysfs.c | 9 + + net/wireless/util.c | 4 +- + 158 files changed, 4631 insertions(+), 2854 deletions(-) + create mode 100644 Documentation/DocBook/80211.tmpl + delete mode 100644 Documentation/DocBook/mac80211.tmpl + create mode 100644 drivers/net/wireless/ath/ath9k/htc_drv_gpio.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-tt.h +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 16 ++++++++++++++++ + 1 files changed, 16 insertions(+), 0 deletions(-) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Resolved 'arch/arm/mach-s3c64xx/mach-smdk6410.c' using previous resolution. +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Auto-merging arch/arm/mach-s3c64xx/mach-smdk6410.c +CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c +Removing include/sound/soc-of-simple.h +Removing sound/soc/blackfin/bf5xx-i2s.h +Removing sound/soc/codecs/ac97.h +Removing sound/soc/codecs/ak4104.h +Removing sound/soc/codecs/ak4642.h +Removing sound/soc/codecs/cq93vc.h +Removing sound/soc/codecs/cs4270.h +Removing sound/soc/codecs/da7210.h +Removing sound/soc/codecs/jz4740.h +Removing sound/soc/codecs/spdif_transciever.h +Removing sound/soc/codecs/twl4030.h +Removing sound/soc/codecs/wm8727.h +Removing sound/soc/davinci/davinci-vcif.h +Removing sound/soc/ep93xx/ep93xx-i2s.h +Removing sound/soc/fsl/soc-of-simple.c +Removing sound/soc/kirkwood/kirkwood-dma.h +Removing sound/soc/kirkwood/kirkwood-i2s.h +Removing sound/soc/omap/omap-mcpdm.h +Removing sound/soc/pxa/pxa2xx-pcm.h +Auto-merging sound/soc/sh/siu_pcm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a098648] Merge remote branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-davinci/devices.c | 13 + + arch/arm/mach-ep93xx/core.c | 6 + + arch/arm/mach-kirkwood/common.c | 6 + + arch/arm/mach-mx3/clock-imx31.c | 4 +- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/devices.c | 4 +- + arch/arm/mach-omap1/devices.c | 26 + + arch/arm/mach-omap2/board-rx51-peripherals.c | 13 +- + arch/arm/mach-omap2/board-zoom2.c | 28 +- + arch/arm/mach-omap2/devices.c | 39 + + arch/arm/mach-omap2/include/mach/board-zoom.h | 2 + + arch/arm/mach-pxa/devices.c | 25 + + arch/arm/mach-pxa/devices.h | 6 + + arch/arm/mach-pxa/pxa27x.c | 4 + + arch/arm/mach-pxa/pxa3xx.c | 5 + + arch/arm/mach-pxa/zylonite.c | 11 + + arch/arm/mach-s3c64xx/dev-audio.c | 13 + + arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 + + arch/arm/plat-mxc/audmux-v2.c | 4 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 7 + + arch/arm/plat-s3c24xx/devs.c | 30 +- + arch/arm/plat-samsung/include/plat/devs.h | 2 + + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 1 + + .../include/asm/{immap_86xx.h => fsl_guts.h} | 111 +- + drivers/input/misc/twl4030-vibra.c | 4 +- + drivers/mfd/twl-core.c | 6 +- + drivers/mfd/twl4030-codec.c | 8 +- + include/linux/i2c/twl.h | 6 +- + include/sound/sh_fsi.h | 4 +- + include/sound/soc-dai.h | 98 +- + include/sound/soc-dapm.h | 8 +- + include/sound/soc-of-simple.h | 25 - + include/sound/soc.h | 236 +- + include/sound/tlv320aic3x.h | 43 +- + include/sound/wm8962.h | 23 + + sound/soc/atmel/atmel-pcm.c | 59 +- + sound/soc/atmel/atmel-pcm.h | 3 - + sound/soc/atmel/atmel_ssc_dai.c | 148 +- + sound/soc/atmel/atmel_ssc_dai.h | 3 +- + sound/soc/atmel/playpaq_wm8510.c | 65 +- + sound/soc/atmel/sam9g20_wm8731.c | 59 +- + sound/soc/atmel/snd-soc-afeb9260.c | 35 +- + sound/soc/au1x/db1200.c | 37 +- + sound/soc/au1x/dbdma2.c | 19 +- + sound/soc/au1x/psc-ac97.c | 20 +- + sound/soc/au1x/psc-i2s.c | 21 +- + sound/soc/au1x/psc.h | 3 - + sound/soc/blackfin/bf5xx-ac97-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-ac97-pcm.h | 3 - + sound/soc/blackfin/bf5xx-ac97.c | 41 +- + sound/soc/blackfin/bf5xx-ac97.h | 2 - + sound/soc/blackfin/bf5xx-ad1836.c | 23 +- + sound/soc/blackfin/bf5xx-ad193x.c | 23 +- + sound/soc/blackfin/bf5xx-ad1980.c | 19 +- + sound/soc/blackfin/bf5xx-ad73311.c | 22 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 44 +- + sound/soc/blackfin/bf5xx-i2s-pcm.h | 3 - + sound/soc/blackfin/bf5xx-i2s.c | 45 +- + sound/soc/blackfin/bf5xx-i2s.h | 14 - + sound/soc/blackfin/bf5xx-ssm2602.c | 38 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 43 +- + sound/soc/blackfin/bf5xx-tdm-pcm.h | 3 - + sound/soc/blackfin/bf5xx-tdm.c | 15 +- + sound/soc/blackfin/bf5xx-tdm.h | 2 - + sound/soc/codecs/88pm860x-codec.c | 1486 + + sound/soc/codecs/88pm860x-codec.h | 97 + + sound/soc/codecs/Kconfig | 12 + + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/ac97.c | 124 +- + sound/soc/codecs/ac97.h | 19 - + sound/soc/codecs/ad1836.c | 191 +- + sound/soc/codecs/ad1836.h | 2 - + sound/soc/codecs/ad193x.c | 217 +- + sound/soc/codecs/ad193x.h | 3 - + sound/soc/codecs/ad1980.c | 107 +- + sound/soc/codecs/ad1980.h | 3 - + sound/soc/codecs/ad73311.c | 66 +- + sound/soc/codecs/ad73311.h | 2 - + sound/soc/codecs/ads117x.c | 72 +- + sound/soc/codecs/ads117x.h | 4 +- + sound/soc/codecs/ak4104.c | 149 +- + sound/soc/codecs/ak4104.h | 7 - + sound/soc/codecs/ak4535.c | 236 +- + sound/soc/codecs/ak4535.h | 8 - + sound/soc/codecs/ak4642.c | 175 +- + sound/soc/codecs/ak4642.h | 20 - + sound/soc/codecs/ak4671.c | 141 +- + sound/soc/codecs/ak4671.h | 3 - + sound/soc/codecs/cq93vc.c | 132 +- + sound/soc/codecs/cq93vc.h | 29 - + sound/soc/codecs/cs4270.c | 393 +- + sound/soc/codecs/cs4270.h | 28 - + sound/soc/codecs/cs42l51.c | 293 +- + sound/soc/codecs/cs42l51.h | 2 - + sound/soc/codecs/cx20442.c | 173 +- + sound/soc/codecs/cx20442.h | 2 - + sound/soc/codecs/da7210.c | 157 +- + sound/soc/codecs/da7210.h | 24 - + sound/soc/codecs/jz4740.c | 116 +- + sound/soc/codecs/jz4740.h | 20 - + sound/soc/codecs/pcm3008.c | 92 +- + sound/soc/codecs/pcm3008.h | 3 - + sound/soc/codecs/spdif_transciever.c | 102 +- + sound/soc/codecs/spdif_transciever.h | 18 - + sound/soc/codecs/ssm2602.c | 219 +- + sound/soc/codecs/ssm2602.h | 3 - + sound/soc/codecs/stac9766.c | 118 +- + sound/soc/codecs/stac9766.h | 4 - + sound/soc/codecs/tlv320aic23.c | 182 +- + sound/soc/codecs/tlv320aic23.h | 3 - + sound/soc/codecs/tlv320aic26.c | 180 +- + sound/soc/codecs/tlv320aic26.h | 3 - + sound/soc/codecs/tlv320aic3x.c | 303 +- + sound/soc/codecs/tlv320aic3x.h | 45 +- + sound/soc/codecs/tlv320dac33.c | 249 +- + sound/soc/codecs/tlv320dac33.h | 3 - + sound/soc/codecs/twl4030.c | 229 +- + sound/soc/codecs/twl4030.h | 55 - + sound/soc/codecs/twl6040.c | 170 +- + sound/soc/codecs/twl6040.h | 3 - + sound/soc/codecs/uda134x.c | 154 +- + sound/soc/codecs/uda134x.h | 3 - + sound/soc/codecs/uda1380.c | 211 +- + sound/soc/codecs/uda1380.h | 3 - + sound/soc/codecs/wl1273.c | 525 + + sound/soc/codecs/wl1273.h | 101 + + sound/soc/codecs/wm2000.h | 3 - + sound/soc/codecs/wm8350.c | 231 +- + sound/soc/codecs/wm8350.h | 3 - + sound/soc/codecs/wm8400.c | 181 +- + sound/soc/codecs/wm8400.h | 3 - + sound/soc/codecs/wm8510.c | 288 +- + sound/soc/codecs/wm8510.h | 3 - + sound/soc/codecs/wm8523.c | 177 +- + sound/soc/codecs/wm8523.h | 3 - + sound/soc/codecs/wm8580.c | 325 +- + sound/soc/codecs/wm8580.h | 17 +- + sound/soc/codecs/wm8711.c | 202 +- + sound/soc/codecs/wm8711.h | 3 - + sound/soc/codecs/wm8727.c | 106 +- + sound/soc/codecs/wm8727.h | 21 - + sound/soc/codecs/wm8728.c | 290 +- + sound/soc/codecs/wm8728.h | 9 - + sound/soc/codecs/wm8731.c | 244 +- + sound/soc/codecs/wm8731.h | 7 +- + sound/soc/codecs/wm8741.c | 203 +- + sound/soc/codecs/wm8741.h | 3 - + sound/soc/codecs/wm8750.c | 265 +- + sound/soc/codecs/wm8750.h | 9 - + sound/soc/codecs/wm8753.c | 403 +- + sound/soc/codecs/wm8753.h | 3 - + sound/soc/codecs/wm8776.c | 247 +- + sound/soc/codecs/wm8776.h | 3 - + sound/soc/codecs/wm8900.c | 247 +- + sound/soc/codecs/wm8900.h | 3 - + sound/soc/codecs/wm8903.c | 265 +- + sound/soc/codecs/wm8903.h | 3 - + sound/soc/codecs/wm8904.c | 208 +- + sound/soc/codecs/wm8904.h | 3 - + sound/soc/codecs/wm8940.c | 199 +- + sound/soc/codecs/wm8940.h | 2 - + sound/soc/codecs/wm8955.c | 181 +- + sound/soc/codecs/wm8955.h | 3 - + sound/soc/codecs/wm8960.c | 209 +- + sound/soc/codecs/wm8960.h | 3 - + sound/soc/codecs/wm8961.c | 237 +- + sound/soc/codecs/wm8961.h | 3 - + sound/soc/codecs/wm8962-tables.c |42299 ++++++++++++++++++++ + sound/soc/codecs/wm8962.c | 1859 + + sound/soc/codecs/wm8962.h | 3787 ++ + sound/soc/codecs/wm8971.c | 247 +- + sound/soc/codecs/wm8971.h | 8 - + sound/soc/codecs/wm8974.c | 167 +- + sound/soc/codecs/wm8974.h | 3 - + sound/soc/codecs/wm8978.c | 190 +- + sound/soc/codecs/wm8978.h | 3 - + sound/soc/codecs/wm8988.c | 262 +- + sound/soc/codecs/wm8988.h | 3 - + sound/soc/codecs/wm8990.c | 222 +- + sound/soc/codecs/wm8990.h | 8 - + sound/soc/codecs/wm8993.c | 304 +- + sound/soc/codecs/wm8993.h | 3 - + sound/soc/codecs/wm8994.c | 241 +- + sound/soc/codecs/wm8994.h | 3 - + sound/soc/codecs/wm9081.c | 208 +- + sound/soc/codecs/wm9081.h | 3 - + sound/soc/codecs/wm9090.c | 183 +- + sound/soc/codecs/wm9090.h | 2 - + sound/soc/codecs/wm9705.c | 116 +- + sound/soc/codecs/wm9705.h | 3 - + sound/soc/codecs/wm9712.c | 124 +- + sound/soc/codecs/wm9712.h | 3 - + sound/soc/codecs/wm9713.c | 131 +- + sound/soc/codecs/wm9713.h | 3 - + sound/soc/davinci/davinci-evm.c | 109 +- + sound/soc/davinci/davinci-i2s.c | 44 +- + sound/soc/davinci/davinci-i2s.h | 2 - + sound/soc/davinci/davinci-mcasp.c | 32 +- + sound/soc/davinci/davinci-mcasp.h | 2 - + sound/soc/davinci/davinci-pcm.c | 45 +- + sound/soc/davinci/davinci-pcm.h | 3 - + sound/soc/davinci/davinci-sffsdr.c | 27 +- + sound/soc/davinci/davinci-vcif.c | 25 +- + sound/soc/davinci/davinci-vcif.h | 28 - + sound/soc/ep93xx/ep93xx-i2s.c | 34 +- + sound/soc/ep93xx/ep93xx-i2s.h | 18 - + sound/soc/ep93xx/ep93xx-pcm.c | 37 +- + sound/soc/ep93xx/ep93xx-pcm.h | 2 - + sound/soc/ep93xx/snappercl15.c | 24 +- + sound/soc/fsl/Kconfig | 27 +- + sound/soc/fsl/Makefile | 11 +- + sound/soc/fsl/efika-audio-fabric.c | 20 +- + sound/soc/fsl/fsl_dma.c | 458 +- + sound/soc/fsl/fsl_dma.h | 20 - + sound/soc/fsl/fsl_ssi.c | 298 +- + sound/soc/fsl/fsl_ssi.h | 26 - + sound/soc/fsl/mpc5200_dma.c | 66 +- + sound/soc/fsl/mpc5200_dma.h | 5 - + sound/soc/fsl/mpc5200_psc_ac97.c | 34 +- + sound/soc/fsl/mpc5200_psc_ac97.h | 2 - + sound/soc/fsl/mpc5200_psc_i2s.c | 19 +- + sound/soc/fsl/mpc8610_hpcd.c | 660 +- + sound/soc/fsl/p1022_ds.c | 590 + + sound/soc/fsl/pcm030-audio-fabric.c | 21 +- + sound/soc/fsl/soc-of-simple.c | 172 - + sound/soc/imx/Kconfig | 16 + + sound/soc/imx/Makefile | 10 +- + sound/soc/imx/eukrea-tlv320.c | 16 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 43 +- + sound/soc/imx/imx-pcm-fiq.c | 68 +- + sound/soc/imx/imx-ssi.c | 148 +- + sound/soc/imx/imx-ssi.h | 7 +- + sound/soc/imx/phycore-ac97.c | 19 +- + sound/soc/imx/wm1133-ev1.c | 27 +- + sound/soc/jz4740/jz4740-i2s.c | 104 +- + sound/soc/jz4740/jz4740-i2s.h | 2 - + sound/soc/jz4740/jz4740-pcm.c | 18 +- + sound/soc/jz4740/jz4740-pcm.h | 2 - + sound/soc/jz4740/qi_lb60.c | 25 +- + sound/soc/kirkwood/kirkwood-dma.c | 64 +- + sound/soc/kirkwood/kirkwood-dma.h | 17 - + sound/soc/kirkwood/kirkwood-i2s.c | 52 +- + sound/soc/kirkwood/kirkwood-i2s.h | 17 - + sound/soc/kirkwood/kirkwood-openrd.c | 21 +- + sound/soc/nuc900/nuc900-ac97.c | 12 +- + sound/soc/nuc900/nuc900-audio.c | 16 +- + sound/soc/nuc900/nuc900-audio.h | 4 - + sound/soc/nuc900/nuc900-pcm.c | 38 +- + sound/soc/omap/am3517evm.c | 25 +- + sound/soc/omap/ams-delta.c | 98 +- + sound/soc/omap/igep0020.c | 22 +- + sound/soc/omap/mcpdm.c | 19 +- + sound/soc/omap/mcpdm.h | 2 + + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap-mcbsp.c | 123 +- + sound/soc/omap/omap-mcbsp.h | 2 - + sound/soc/omap/omap-mcpdm.c | 71 +- + sound/soc/omap/omap-mcpdm.h | 29 - + sound/soc/omap/omap-pcm.c | 47 +- + sound/soc/omap/omap-pcm.h | 2 - + sound/soc/omap/omap2evm.c | 25 +- + sound/soc/omap/omap3beagle.c | 23 +- + sound/soc/omap/omap3evm.c | 30 +- + sound/soc/omap/omap3pandora.c | 36 +- + sound/soc/omap/osk5912.c | 24 +- + sound/soc/omap/overo.c | 22 +- + sound/soc/omap/rx51.c | 37 +- + sound/soc/omap/sdp3430.c | 56 +- + sound/soc/omap/sdp4430.c | 23 +- + sound/soc/omap/zoom2.c | 64 +- + sound/soc/pxa/Kconfig | 18 + + sound/soc/pxa/Makefile | 4 + + sound/soc/pxa/corgi.c | 28 +- + sound/soc/pxa/e740_wm9705.c | 29 +- + sound/soc/pxa/e750_wm9705.c | 26 +- + sound/soc/pxa/e800_wm9712.c | 26 +- + sound/soc/pxa/em-x270.c | 22 +- + sound/soc/pxa/imote2.c | 20 +- + sound/soc/pxa/magician.c | 35 +- + sound/soc/pxa/mioa701_wm9713.c | 33 +- + sound/soc/pxa/palm27x.c | 27 +- + sound/soc/pxa/poodle.c | 29 +- + sound/soc/pxa/pxa-ssp.c | 173 +- + sound/soc/pxa/pxa-ssp.h | 2 - + sound/soc/pxa/pxa2xx-ac97.c | 46 +- + sound/soc/pxa/pxa2xx-ac97.h | 2 - + sound/soc/pxa/pxa2xx-i2s.c | 91 +- + sound/soc/pxa/pxa2xx-i2s.h | 2 - + sound/soc/pxa/pxa2xx-pcm.c | 46 +- + sound/soc/pxa/pxa2xx-pcm.h | 19 - + sound/soc/pxa/raumfeld.c | 114 +- + sound/soc/pxa/saarb.c | 200 + + sound/soc/pxa/spitz.c | 26 +- + sound/soc/pxa/tavorevb3.c | 200 + + sound/soc/pxa/tosa.c | 27 +- + sound/soc/pxa/z2.c | 26 +- + sound/soc/pxa/zylonite.c | 40 +- + sound/soc/s3c24xx/Kconfig | 18 + + sound/soc/s3c24xx/Makefile | 4 + + sound/soc/s3c24xx/aquila_wm8994.c | 295 + + sound/soc/s3c24xx/goni_wm8994.c | 298 + + sound/soc/s3c24xx/jive_wm8750.c | 23 +- + sound/soc/s3c24xx/ln2440sbc_alc650.c | 17 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 58 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 37 +- + sound/soc/s3c24xx/s3c-ac97.c | 22 +- + sound/soc/s3c24xx/s3c-ac97.h | 2 - + sound/soc/s3c24xx/s3c-dma.c | 46 +- + sound/soc/s3c24xx/s3c-dma.h | 1 - + sound/soc/s3c24xx/s3c-i2s-v2.c | 50 +- + sound/soc/s3c24xx/s3c-i2s-v2.h | 13 +- + sound/soc/s3c24xx/s3c-pcm.c | 42 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 54 +- + sound/soc/s3c24xx/s3c2412-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 40 +- + sound/soc/s3c24xx/s3c24xx-i2s.h | 2 - + sound/soc/s3c24xx/s3c24xx_simtec.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec.h | 4 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 25 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 21 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 21 +- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 135 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 206 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 2 - + sound/soc/s3c24xx/smartq_wm8987.c | 15 +- + sound/soc/s3c24xx/smdk2443_wm9710.c | 17 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 66 +- + sound/soc/s3c24xx/smdk_wm9713.c | 38 +- + sound/soc/s6000/s6000-i2s.c | 56 +- + sound/soc/s6000/s6000-i2s.h | 2 - + sound/soc/s6000/s6000-pcm.c | 100 +- + sound/soc/s6000/s6000-pcm.h | 2 - + sound/soc/s6000/s6105-ipcam.c | 31 +- + sound/soc/sh/dma-sh7760.c | 53 +- + sound/soc/sh/fsi-ak4642.c | 24 +- + sound/soc/sh/fsi-da7210.c | 22 +- + sound/soc/sh/fsi.c | 47 +- + sound/soc/sh/hac.c | 46 +- + sound/soc/sh/migor.c | 29 +- + sound/soc/sh/sh7760-ac97.c | 25 +- + sound/soc/sh/siu.h | 5 +- + sound/soc/sh/siu_dai.c | 66 +- + sound/soc/sh/siu_pcm.c | 32 +- + sound/soc/sh/ssi.c | 55 +- + sound/soc/soc-cache.c | 42 +- + sound/soc/soc-core.c | 1680 +- + sound/soc/soc-dapm.c | 88 +- + sound/soc/soc-jack.c | 10 +- + sound/soc/txx9/txx9aclc-ac97.c | 55 +- + sound/soc/txx9/txx9aclc-generic.c | 24 +- + sound/soc/txx9/txx9aclc.c | 141 +- + sound/soc/txx9/txx9aclc.h | 13 +- + 352 files changed, 60876 insertions(+), 13485 deletions(-) + rename arch/powerpc/include/asm/{immap_86xx.h => fsl_guts.h} (66%) + delete mode 100644 include/sound/soc-of-simple.h + create mode 100644 include/sound/wm8962.h + delete mode 100644 sound/soc/blackfin/bf5xx-i2s.h + create mode 100644 sound/soc/codecs/88pm860x-codec.c + create mode 100644 sound/soc/codecs/88pm860x-codec.h + delete mode 100644 sound/soc/codecs/ac97.h + delete mode 100644 sound/soc/codecs/ak4104.h + delete mode 100644 sound/soc/codecs/ak4642.h + delete mode 100644 sound/soc/codecs/cq93vc.h + delete mode 100644 sound/soc/codecs/cs4270.h + delete mode 100644 sound/soc/codecs/da7210.h + delete mode 100644 sound/soc/codecs/jz4740.h + delete mode 100644 sound/soc/codecs/spdif_transciever.h + delete mode 100644 sound/soc/codecs/twl4030.h + create mode 100644 sound/soc/codecs/wl1273.c + create mode 100644 sound/soc/codecs/wl1273.h + delete mode 100644 sound/soc/codecs/wm8727.h + create mode 100644 sound/soc/codecs/wm8962-tables.c + create mode 100644 sound/soc/codecs/wm8962.c + create mode 100644 sound/soc/codecs/wm8962.h + delete mode 100644 sound/soc/davinci/davinci-vcif.h + delete mode 100644 sound/soc/ep93xx/ep93xx-i2s.h + create mode 100644 sound/soc/fsl/p1022_ds.c + delete mode 100644 sound/soc/fsl/soc-of-simple.c + delete mode 100644 sound/soc/kirkwood/kirkwood-dma.h + delete mode 100644 sound/soc/kirkwood/kirkwood-i2s.h + delete mode 100644 sound/soc/omap/omap-mcpdm.h + delete mode 100644 sound/soc/pxa/pxa2xx-pcm.h + create mode 100644 sound/soc/pxa/saarb.c + create mode 100644 sound/soc/pxa/tavorevb3.c + create mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + create mode 100644 sound/soc/s3c24xx/goni_wm8994.c +Merging sound/for-next +$ git merge sound/for-next +Removing sound/isa/sgalaxy.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 82 ++- + include/sound/pcm.h | 1 + + sound/core/pcm_lib.c | 14 +- + sound/core/pcm_native.c | 2 + + sound/drivers/Kconfig | 19 + + sound/drivers/Makefile | 2 + + sound/drivers/aloop.c | 1055 +++++++++++++++++++++++ + sound/isa/Kconfig | 36 +- + sound/isa/Makefile | 4 +- + sound/isa/galaxy/Makefile | 10 + + sound/isa/galaxy/azt1605.c | 91 ++ + sound/isa/galaxy/azt2316.c | 111 +++ + sound/isa/galaxy/galaxy.c | 652 ++++++++++++++ + sound/isa/sgalaxy.c | 369 -------- + sound/pci/ice1712/delta.c | 10 + + sound/pci/ice1712/delta.h | 4 +- + sound/usb/card.c | 31 +- + sound/usb/helper.c | 17 +- + sound/usb/midi.c | 9 +- + sound/usb/pcm.c | 4 +- + sound/usb/proc.c | 2 +- + sound/usb/urb.c | 2 +- + 22 files changed, 2106 insertions(+), 421 deletions(-) + create mode 100644 sound/drivers/aloop.c + create mode 100644 sound/isa/galaxy/Makefile + create mode 100644 sound/isa/galaxy/azt1605.c + create mode 100644 sound/isa/galaxy/azt2316.c + create mode 100644 sound/isa/galaxy/galaxy.c + delete mode 100644 sound/isa/sgalaxy.c +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Already up-to-date. +Merging input/next +$ git merge input/next +Auto-merging arch/sparc/kernel/process_64.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/generic.c +Auto-merging drivers/usb/serial/pl2303.c +Auto-merging drivers/usb/serial/ssu100.c +Merge made by recursive. + arch/arm/kernel/etm.c | 2 +- + arch/ia64/hp/sim/simserial.c | 2 +- + arch/powerpc/xmon/xmon.c | 5 +-- + arch/sparc/kernel/process_64.c | 2 +- + arch/um/drivers/mconsole_kern.c | 2 +- + drivers/char/hangcheck-timer.c | 2 +- + drivers/char/hvc_console.c | 2 +- + drivers/char/hvsi.c | 2 +- + drivers/char/sysrq.c | 53 ++++++++++++++++++------------------- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/input/keyboard/hil_kbd.c | 12 ++++---- + drivers/input/misc/uinput.c | 2 + + drivers/net/ibm_newemac/debug.c | 2 +- + drivers/s390/char/ctrlchar.c | 4 +-- + drivers/s390/char/keyboard.c | 2 +- + drivers/serial/sn_console.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/generic.c | 10 +++---- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/ssu100.c | 2 +- + drivers/xen/manage.c | 2 +- + include/linux/miscdevice.h | 1 + + include/linux/serial_core.h | 2 +- + include/linux/sysrq.h | 16 ++++++----- + include/linux/uinput.h | 1 - + include/linux/usb/serial.h | 3 +- + kernel/debug/debug_core.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/power/poweroff.c | 2 +- + 29 files changed, 71 insertions(+), 74 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Recorded preimage for 'drivers/s390/char/tape_block.c' +Auto-merging drivers/s390/char/tape_block.c +CONFLICT (content): Merge conflict in drivers/s390/char/tape_block.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/s390/char/tape_block.c'. +[master 2aa1120] Merge remote branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/cfq-iosched.txt | 45 ++++++++++++ + Documentation/cgroups/blkio-controller.txt | 28 ++++++++ + block/blk-cgroup.c | 2 +- + block/blk-core.c | 6 +- + block/blk-sysfs.c | 1 + + block/cfq-iosched.c | 103 ++++++++++++++++++++++++---- + block/elevator.c | 44 ++++++++---- + drivers/block/cciss.c | 9 +++ + drivers/block/loop.c | 2 +- + drivers/block/mg_disk.c | 3 +- + drivers/s390/char/tape_block.c | 4 +- + fs/bio-integrity.c | 4 +- + include/linux/elevator.h | 1 + + 13 files changed, 212 insertions(+), 40 deletions(-) + create mode 100644 Documentation/block/cfq-iosched.txt +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merging drivers/net/pcmcia/xirc2ps_cs.c +Merge made by recursive. +Merging battery/master +$ git merge battery/master +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 5 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/isp1704_charger.c | 369 ++++++++++++++++++++++++++ + 4 files changed, 382 insertions(+), 0 deletions(-) + create mode 100644 drivers/power/isp1704_charger.c +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 kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by recursive. + drivers/char/keyboard.c | 37 ++++++++ + drivers/gpu/drm/drm_fb_helper.c | 5 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 ++ + drivers/gpu/drm/nouveau/nv04_crtc.c | 46 +++++++++-- + drivers/gpu/drm/nouveau/nv50_crtc.c | 49 ++++++++--- + drivers/gpu/drm/radeon/atombios_crtc.c | 119 +++++++++++++++++++-------- + drivers/gpu/drm/radeon/radeon_display.c | 32 +++++++ + drivers/gpu/drm/radeon/radeon_fb.c | 2 + + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 50 +++++++++--- + drivers/gpu/drm/radeon/radeon_mode.h | 13 +++- + drivers/serial/kgdboc.c | 13 +++ + include/drm/drm_crtc_helper.h | 3 +- + include/linux/kbd_kern.h | 1 + + 14 files changed, 306 insertions(+), 72 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + include/linux/slub_def.h | 7 +- + mm/slub.c | 380 +++++++++++++++++++++++++--------------------- + 2 files changed, 208 insertions(+), 179 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 1a597ab Merge remote branch 'kgdb/kgdb-next' +Merging refs/next/20100823/slab +$ git merge refs/next/20100823/slab +Already up-to-date. +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 +Merge made by recursive. + drivers/gpio/stmpe-gpio.c | 5 ++ + drivers/gpio/wm8994-gpio.c | 1 + + drivers/mfd/Kconfig | 1 + + drivers/mfd/ab3100-core.c | 143 +++++++++++++++++++----------------- + drivers/mfd/pcf50633-core.c | 7 -- + drivers/mfd/wm831x-irq.c | 9 ++- + include/linux/mfd/pcf50633/core.h | 7 ++ + include/linux/mfd/stmpe.h | 6 ++ + 8 files changed, 102 insertions(+), 77 deletions(-) +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Removing drivers/video/via/lcdtbl.h +Merge made by recursive. + drivers/video/via/dvi.c | 172 +++++++++---- + drivers/video/via/dvi.h | 4 +- + drivers/video/via/hw.c | 456 ++++++++++++-------------------- + drivers/video/via/hw.h | 16 +- + drivers/video/via/ioctl.c | 2 + + drivers/video/via/lcd.c | 49 +++- + drivers/video/via/lcd.h | 6 +- + drivers/video/via/lcdtbl.h | 591 ------------------------------------------ + drivers/video/via/viafbdev.c | 8 +- + drivers/video/via/viafbdev.h | 3 + + 10 files changed, 360 insertions(+), 947 deletions(-) + delete mode 100644 drivers/video/via/lcdtbl.h +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 1 + + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 7 +- + drivers/regulator/max1586.c | 12 +- + drivers/regulator/max8952.c | 360 ++++++++++++++++++++++++++++++++ + drivers/regulator/max8998.c | 6 +- + drivers/regulator/tps6507x-regulator.c | 6 - + include/linux/regulator/max8952.h | 135 ++++++++++++ + 9 files changed, 517 insertions(+), 23 deletions(-) + create mode 100644 drivers/regulator/max8952.c + create mode 100644 include/linux/regulator/max8952.h +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + security/selinux/ss/policydb.c | 4 ++-- + security/tomoyo/common.c | 6 ++++-- + 2 files changed, 6 insertions(+), 4 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 uwb/for-upstream +$ git merge uwb/for-upstream +Auto-merging include/linux/wlp.h +Merge made by recursive. + drivers/uwb/i1480/i1480u-wlp/lc.c | 16 ++++++------ + drivers/uwb/wlp/messages.c | 40 ++++++++++++++++---------------- + drivers/uwb/wlp/sysfs.c | 46 ++++++++++++++++++------------------ + drivers/uwb/wlp/wlp-lc.c | 12 +++++----- + include/linux/wlp.h | 2 +- + 5 files changed, 58 insertions(+), 58 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Already up-to-date. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/blackfin/mach-bf537/boards/stamp.c +Auto-merging block/blk-core.c +Auto-merging drivers/gpu/drm/radeon/radeon_cs.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/rtc/rtc-nuc900.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/io_ti.c +Auto-merging fs/exofs/inode.c +Auto-merging fs/exofs/ios.c +Auto-merging init/Kconfig +Auto-merging mm/vmscan.c +Merge made by recursive. + Documentation/arm/SA1100/FreeBird | 4 ++-- + Documentation/kernel-parameters.txt | 2 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/xtensa/include/asm/uaccess.h | 2 +- + block/blk-core.c | 2 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/base/core.c | 2 +- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/ide/ide-disk.c | 3 +-- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/net/depca.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 ++-- + drivers/net/skfp/hwt.c | 2 +- + drivers/net/skfp/skfddi.c | 2 +- + drivers/net/tulip/pnic2.c | 2 +- + drivers/rtc/rtc-nuc900.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/char/tape_3590.c | 6 +++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/f_audio.c | 2 -- + drivers/usb/gadget/f_hid.c | 4 ---- + drivers/usb/gadget/fsl_udc_core.c | 6 ------ + drivers/usb/gadget/langwell_udc.c | 3 --- + drivers/usb/gadget/pxa27x_udc.c | 2 -- + drivers/usb/gadget/rndis.c | 2 -- + drivers/usb/host/ehci-hcd.c | 1 - + drivers/usb/host/imx21-hcd.c | 4 ++-- + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 9 --------- + drivers/usb/host/pci-quirks.c | 2 -- + drivers/usb/host/u132-hcd.c | 8 ++------ + drivers/usb/image/microtek.c | 9 --------- + drivers/usb/misc/ftdi-elan.c | 2 -- + drivers/usb/mon/mon_main.c | 2 -- + drivers/usb/musb/musb_gadget.c | 1 - + drivers/usb/serial/cypress_m8.c | 2 -- + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/io_edgeport.c | 11 ----------- + drivers/usb/serial/io_ti.c | 4 ---- + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan_pda.c | 1 - + drivers/usb/serial/mos7720.c | 6 ------ + drivers/usb/serial/mos7840.c | 7 ------- + drivers/usb/serial/omninet.c | 2 -- + drivers/usb/serial/sierra.c | 2 -- + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/usb_wwan.c | 1 - + drivers/usb/serial/whiteheat.c | 6 ------ + drivers/video/bf54x-lq043fb.c | 6 +++--- + drivers/video/bfin-t350mcqb-fb.c | 2 +- + drivers/video/vesafb.c | 2 +- + fs/exofs/inode.c | 14 +++++++------- + fs/exofs/ios.c | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + include/linux/jhash.h | 2 +- + include/video/vga.h | 2 +- + init/Kconfig | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + mm/percpu.c | 2 +- + mm/vmscan.c | 4 ++-- + net/mac80211/mesh.h | 2 +- + net/wanrouter/wanmain.c | 4 ++-- + usr/Kconfig | 2 +- + 68 files changed, 60 insertions(+), 158 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 6 ++++ + fs/notify/fanotify/fanotify.c | 3 -- + fs/notify/fanotify/fanotify_user.c | 29 +++++++++++++++++++++ + fs/notify/fsnotify.c | 48 +++++++++++++++++++++--------------- + include/linux/fanotify.h | 27 ++++++++++++++------ + include/linux/fsnotify_backend.h | 1 + + 6 files changed, 83 insertions(+), 31 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 187f1ea] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++++ + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/cacheflush.h | 9 +- + arch/arm/include/asm/domain.h | 31 ++++- + arch/arm/include/asm/futex.h | 9 +- + arch/arm/include/asm/pgtable.h | 29 ++++- + arch/arm/include/asm/smp_plat.h | 4 + + arch/arm/include/asm/tlbflush.h | 12 ++- + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 260 +++++++++++++++++++++++++++++++++++++ + 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/mm/Kconfig | 45 ++++++- + arch/arm/mm/cache-l2x0.c | 15 ++- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v6.c | 2 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 6 + + arch/arm/mm/fault-armv.c | 8 +- + arch/arm/mm/flush.c | 46 +++++-- + arch/arm/mm/mmu.c | 20 +++- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + 30 files changed, 601 insertions(+), 124 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + create mode 100644 arch/arm/kernel/swp_emulate.c +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 eab387e] 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 +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/edac/i7core_edac.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master df4ef42] Merge remote branch 'i7core_edac/linux_next' +$ git diff -M --stat --summary HEAD^.. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Merge made by recursive. + drivers/spi/amba-pl022.c | 3 ++- + drivers/spi/omap2_mcspi.c | 36 +++++++++--------------------------- + drivers/spi/orion_spi.c | 4 ++-- + 3 files changed, 13 insertions(+), 30 deletions(-) +Merging limits/writable_limits +$ git merge limits/writable_limits +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/kernel/i387.c +Merge made by recursive. + Documentation/x86/x86_64/kernel-stacks | 6 +- + arch/arm/kernel/perf_event.c | 62 +------ + arch/powerpc/kernel/perf_callchain.c | 86 +++------- + arch/sh/kernel/perf_callchain.c | 50 +----- + arch/sparc/kernel/perf_event.c | 69 +++----- + arch/x86/Kconfig.debug | 10 - + arch/x86/include/asm/apb_timer.h | 1 - + arch/x86/include/asm/cpu.h | 1 - + arch/x86/include/asm/irq.h | 12 +- + arch/x86/include/asm/module.h | 7 +- + arch/x86/include/asm/page_32_types.h | 4 - + arch/x86/include/asm/tsc.h | 2 + + arch/x86/kernel/apb_timer.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 12 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/intel.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 9 +- + arch/x86/kernel/cpu/perf_event.c | 82 ++------- + arch/x86/kernel/i387.c | 6 + + arch/x86/kernel/irq_32.c | 8 +- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 1 - + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/tsc.c | 38 ++++ + arch/x86/mm/k8topology_64.c | 6 +- + arch/x86/power/cpu.c | 2 + + include/linux/debug_locks.h | 5 - + include/linux/ftrace_event.h | 4 +- + include/linux/irq.h | 2 +- + include/linux/perf_event.h | 30 +++- + include/trace/events/timer.h | 8 +- + kernel/hung_task.c | 4 +- + kernel/lockdep.c | 8 +- + kernel/perf_event.c | 259 ++++++++++++++++++++++++---- + kernel/sched.c | 10 +- + kernel/sched_fair.c | 2 + + kernel/trace/trace_event_perf.c | 21 ++- + kernel/trace/trace_events.c | 55 ++---- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/watchdog.c | 5 +- + tools/perf/Documentation/perf-annotate.txt | 11 +- + tools/perf/Documentation/perf-report.txt | 7 + + tools/perf/Makefile | 9 + + tools/perf/builtin-annotate.c | 26 ++- + tools/perf/builtin-report.c | 14 ++- + tools/perf/feature-tests.mak | 11 ++ + tools/perf/util/cache.h | 2 + + tools/perf/util/callchain.c | 98 +++++++++-- + tools/perf/util/callchain.h | 25 ++- + tools/perf/util/hist.c | 4 +- + tools/perf/util/path.c | 3 +- + tools/perf/util/sort.h | 2 +- + tools/perf/util/ui/browser.c | 93 ++++++----- + tools/perf/util/ui/browser.h | 9 +- + tools/perf/util/ui/browsers/annotate.c | 38 ++--- + tools/perf/util/ui/browsers/hists.c | 157 +++++++---------- + tools/perf/util/ui/browsers/map.c | 23 +-- + tools/perf/util/ui/util.c | 4 +- + tools/perf/util/util.h | 13 -- + 61 files changed, 782 insertions(+), 669 deletions(-) +Merging lost-spurious-irq/lost-spurious-irq +$ git merge lost-spurious-irq/lost-spurious-irq +Resolved 'drivers/ata/libata-core.c' using previous resolution. +Resolved 'include/linux/libata.h' using previous resolution. +Auto-merging arch/arm/mach-bcmring/core.c +Auto-merging arch/arm/mach-ep93xx/core.c +Auto-merging arch/arm/mach-integrator/integrator_ap.c +Auto-merging arch/arm/mach-mmp/time.c +Auto-merging arch/arm/mach-u300/timer.c +Auto-merging arch/arm/plat-iop/time.c +Auto-merging arch/ia64/kernel/time.c +Auto-merging drivers/ata/libata-core.c +CONFLICT (content): Merge conflict in drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-eh.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/sata_fsl.c +Auto-merging drivers/clocksource/sh_cmt.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/irq.h +Auto-merging include/linux/libata.h +CONFLICT (content): Merge conflict in include/linux/libata.h +Auto-merging kernel/irq/manage.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d221614] Merge remote branch 'lost-spurious-irq/lost-spurious-irq' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-aaec2000/core.c | 2 +- + arch/arm/mach-at91/at91rm9200_time.c | 2 +- + arch/arm/mach-at91/at91sam926x_time.c | 2 +- + arch/arm/mach-bcmring/core.c | 2 +- + arch/arm/mach-clps711x/time.c | 2 +- + arch/arm/mach-cns3xxx/core.c | 2 +- + arch/arm/mach-ebsa110/core.c | 2 +- + arch/arm/mach-ep93xx/core.c | 2 +- + arch/arm/mach-footbridge/dc21285-timer.c | 2 +- + arch/arm/mach-footbridge/isa-timer.c | 2 +- + arch/arm/mach-h720x/cpu-h7201.c | 2 +- + arch/arm/mach-h720x/cpu-h7202.c | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 2 +- + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-ixp23xx/core.c | 2 +- + arch/arm/mach-ixp4xx/common.c | 2 +- + arch/arm/mach-lh7a40x/time.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-netx/time.c | 2 +- + arch/arm/mach-ns9xxx/irq.c | 3 - + arch/arm/mach-ns9xxx/time-ns9360.c | 2 +- + arch/arm/mach-nuc93x/time.c | 2 +- + arch/arm/mach-omap1/time.c | 2 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-pnx4008/time.c | 2 +- + arch/arm/mach-pxa/time.c | 2 +- + arch/arm/mach-sa1100/time.c | 2 +- + arch/arm/mach-shark/core.c | 2 +- + arch/arm/mach-u300/timer.c | 2 +- + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/plat-iop/time.c | 2 +- + arch/arm/plat-mxc/time.c | 2 +- + arch/arm/plat-samsung/time.c | 2 +- + arch/arm/plat-versatile/timer-sp.c | 2 +- + arch/blackfin/kernel/time-ts.c | 6 +- + arch/ia64/kernel/time.c | 2 +- + arch/parisc/kernel/irq.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 5 +- + arch/x86/kernel/time.c | 2 +- + drivers/ata/libata-core.c | 55 ++- + drivers/ata/libata-eh.c | 4 +- + drivers/ata/libata-sff.c | 37 +- + drivers/clocksource/sh_cmt.c | 3 +- + drivers/clocksource/sh_mtu2.c | 3 +- + drivers/clocksource/sh_tmu.c | 3 +- + drivers/usb/core/hcd.c | 1 + + include/linux/interrupt.h | 43 +- + include/linux/irq.h | 40 +- + include/linux/libata.h | 2 + + kernel/irq/chip.c | 20 +- + kernel/irq/handle.c | 7 +- + kernel/irq/internals.h | 10 +- + kernel/irq/manage.c | 18 +- + kernel/irq/proc.c | 5 +- + kernel/irq/spurious.c | 978 +++++++++++++++++++++++++----- + 56 files changed, 1031 insertions(+), 286 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Merge made by recursive. + drivers/platform/x86/Kconfig | 6 +- + drivers/platform/x86/dell-wmi.c | 256 ++++++++++++------------------- + drivers/platform/x86/hp-wmi.c | 172 ++++++--------------- + drivers/platform/x86/panasonic-laptop.c | 172 ++++++++------------- + drivers/platform/x86/topstar-laptop.c | 161 +++++++------------- + drivers/platform/x86/toshiba_acpi.c | 191 ++++++++--------------- + 6 files changed, 331 insertions(+), 627 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging bkl-core/bkl/core +$ git merge bkl-core/bkl/core +Already up-to-date. +Merging bkl-procfs/bkl/procfs +$ git merge bkl-procfs/bkl/procfs +Already up-to-date. +Merging bkl-ioctl/bkl/ioctl +$ git merge bkl-ioctl/bkl/ioctl +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging staging-next/staging-next +$ git merge staging-next/staging-next +Already up-to-date. +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -r ../rebase-tmp diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..2cca68330e1c --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,134 @@ +Importing driver-core.current based on 2.6.36-rc2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 76be97c1fc945db08aae1f1b746012662d643e97 +HEAD is now at 76be97c Linux 2.6.36-rc2 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core.current +kobject-break-the-kobject-namespace-defs-into-their-own-header.patch +firmware_class-fix-typo-in-error-path.patch +kobject_uevent-fix-typo-in-comments.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core.current +From ../quilt-tmp + + d124a57...58f999e master -> quilt/driver-core.current (forced update) +Importing tty.current based on quilt/driver-core.current +$ cd ../quilt-tmp +$ git reset --hard 58f999eeb3b67bced2308b39334e050d16403e46 +HEAD is now at 58f999e kobject_uevent: fix typo in comments +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty.current +serial-print-early-console-device-address-in-hex.patch +ip2-remove-unneeded-null-check.patch +ip2-return-efault-on-copy_to_user-errors.patch +rocket-add-a-mutex_unlock.patch +synclink-add-mutex_unlock-on-error-path.patch +68328serial-check-return-value-of-copy_-_user-instead-of-access_ok.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty.current +From ../quilt-tmp + + 44f9522...278d10f master -> quilt/tty.current (forced update) +Importing usb.current based on quilt/tty.current +$ cd ../quilt-tmp +$ git reset --hard 278d10f1e74d21d3ee6cb7287938ab1af4a3d425 +HEAD is now at 278d10f 68328serial: check return value of copy_*_user() instead of access_ok() +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-uvc_v4l2-cleanup-test-for-end-of-loop.patch +usb-option-add-celot-ct-650.patch +usb-isp1760-use-a-write-barrier-to-ensure-proper-ndelay-timing.patch +usb-add-device-ids-for-igotu-to-navman.patch +usb-serial-fix-leak-of-usb-serial-module-refrence-count.patch +usb-pl2303-new-vendor-and-product-id.patch +usb-cp210x-fix-break-on-off.patch +usb-ftdi_sio-fix-endianess-of-max-packet-size.patch +usb-io_ti-check-firmware-version-before-updating.patch +usb-r8a66597-udc-return-enomem-if-kzalloc-fails.patch +usb-ssu100-add-locking-for-port-private-data-in-ssu100.patch +usb-ssu100-refine-process_packet-in-ssu100.patch +usb-ssu100-remove-duplicate-defines-in-ssu100.patch +usb-ssu100-add-register-parameter-to-ssu100_setregister.patch +usb-ssu100-rework-logic-for-tiocmiwait.patch +usb-serial-export-symbol-usb_serial_generic_disconnect.patch +usb-ssu100-add-disconnect-function-for-ssu100.patch +usb-ssu100-set-tty_flags-in-ssu100_process_packet.patch +usb-gadget-fix-composite-kernel-doc-warnings.patch +usb-gadget-return-enomem-on-memory-allocation.patch +usb-otg-twl4030-fix-wrong-assumption-of-starting-state.patch +usb-serial-io_ti.c-don-t-return-0-if-writing-the-download-record-failed.patch +usb-ftdi_sio-add-id-for-ionics-plugcomputer.patch +usb-xhci-remove-buggy-assignment-in-next_trb.patch +usb-xhci-update-ring-dequeue-pointer-when-process-missed-tds.patch +usb-iowarrior-fix-misuse-of-return-value-of-copy_to_user.patch +usb-adutux-fix-misuse-of-return-value-of-copy_to_user.patch +usb-ftdi_sio-add-product-id-for-lenz-li-usb.patch +arm-imx-fix-build-failure-concerning-otg-ulpi.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + 1db1870...fa48a9c master -> quilt/usb.current (forced update) +Importing staging.current based on quilt/usb.current +$ cd ../quilt-tmp +$ git reset --hard fa48a9c4e7a3cc5cb14db5a1e56895a4d3679e22 +HEAD is now at fa48a9c ARM: imx: fix build failure concerning otg/ulpi +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging.current +staging-spectra-removes-q-prepare_flush_fn-fix-build-breakage.patch +staging-use-new-req_flush-flag-fix-build-breakage.patch +staging-spectra-don-t-use-locked_ioctl-fix-build.patch +staging-spectra-remove-duplicate-glob_version-definition.patch +staging-spectra-removes-unused-variable.patch +staging-spectra-initializa-lblk-variable.patch +staging-spectra-removes-unused-functions.patch +staging-batman-adv-fix-merge-of-linus-tree.patch +staging-batman-adv-unify-orig_hash_lock-spinlock-handling-to-avoid-deadlocks.patch +staging-batman-adv-fix-batman-icmp-originating-from-secondary-interface.patch +staging-batman-adv-always-reply-batman-icmp-packets-with-primary-mac.patch +staging-batman-adv-fix-own-mac-address-detection.patch +staging-batman-adv-create-batman_if-only-on-register-event.patch +staging-batman-adv-don-t-use-net_dev-after-dev_put.patch +staging-batman-adv-don-t-write-in-not-allocated-packet_buff.patch +staging-sep-remove-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging.current +From ../quilt-tmp + + 1b1a0c4...34d31af master -> quilt/staging.current (forced update) +Importing i2c based on 2.6.36-rc2 +$ cd ../quilt-tmp +$ git reset --hard 76be97c1fc945db08aae1f1b746012662d643e97 +HEAD is now at 76be97c Linux 2.6.36-rc2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-simplify-i2c_parent_is_i2c_adapter.patch +i2c-i2c_parent_is_i2c_adapter-returns-parent.patch +i2c-remove-obsolete-cleanup-for-clientdata.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + e36c886..a140a3d master -> quilt/i2c +Importing jdelvare-hwmon based on 2.6.36-rc2 +$ cd ../quilt-tmp +$ git reset --hard 76be97c1fc945db08aae1f1b746012662d643e97 +HEAD is now at 76be97c Linux 2.6.36-rc2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-coretemp-fix-warning.patch +hwmon-ads7871-fix-ads7871_probe-error-paths.patch +hwmon-k8temp-01-differentiate-between-am2-and-asb1.patch +maintainers-hwmon-coretemp-change-maintainers.patch +hwmon-k8temp-02-remove-superfluous-cpu-family-check.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 4767b33...01a6f2b master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.35 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.35-7786-gad41a1e +Unchanged quilt series rr +Importing device-mapper based on v2.6.36-rc1 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +Importing tty based on quilt/driver-core + quilt series is empty +$ git update-ref refs/heads/quilt/tty 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 +Importing usb based on quilt/tty + quilt series is empty +$ git update-ref refs/heads/quilt/usb 34d31af4c9a8558ace4dddfe4d6181f7a67fde85 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..5de2172d1bc0 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100824 |