diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-09 15:03:24 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-11-09 15:03:24 +1100 |
| commit | 9729d94163968f7610a54bb9ad259b4471d311a7 (patch) | |
| tree | b430238f1474bb53c0b789555189692ebd8fbad5 | |
| parent | 5f4d9e80354b1f38c5cb1a7515765fe4861f1651 (diff) | |
Add linux-next specific files for 20101109next-20101109
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 178 | ||||
| -rw-r--r-- | Next/Trees | 180 | ||||
| -rw-r--r-- | Next/merge.log | 3087 | ||||
| -rw-r--r-- | Next/quilt-import.log | 66 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 3512 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ee50d85b2d7d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,178 @@ +Name SHA1 +---- ---- +origin a7bcf21e60c73cb7f7c13fad928967d7e47c3cac +fixes 2bfc96a127bc1cc94d26bfaa40159966064f9c8c +arm-current 85d988fcff5a7e35df0d0fb0c581470f4b72a3de +m68k-current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +powerpc-merge 93f68f1ef787d97ab688f78a01f446e85bb9a496 +sparc-current e69f58c037ab5b166b3858fa7b5d7fa470613e8f +scsi-rc-fixes 151f52f09c5728ecfdd0c289da1a4b30bb416f2c +net-current aa58163a76a3aef33c7220931543d45d0fe43753 +sound-current 69dbdd819599e2f3b77c172e83af512845bca5ad +pci-current 985a1a8601954170f4163a1a1bea6e5951ec6e49 +wireless-current 48a7c3df14d0cda850337a9b3f9e667a0b12a996 +kbuild-current e9203c988234aa512bd45ca32b52e21c7bbfc414 +driver-core.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +tty.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +usb.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +staging.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +cpufreq-current 320b2b8de12698082609ebbc1a17165727f4c893 +input-current d745b5326dd1960bf1d9ce2cb8408561a81a7271 +md-current f3ac8bf7ce1c5abd763ea762e95d1cdcf7799372 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current c054a076a1bd4731820a9c4d638b13d5c9bf5935 +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +gcl-current 2b07be2493681220cac4d185494a4edb0b8efd1e +arm 09e46f045e0763af7ad10d9e948d83bdeec83fc5 +davinci 489e176c71f36654dcb8835926f7e5717b8b4c19 +i.MX e9328b02609f82669ec2726bd855d169b9992905 +msm 178578fefe43e746c5d85174f562c25bf7f62dc0 +omap 46c5e79cf689531ff3845da328d16556e261322a +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung d70c5240ae4e10d57a5cbd1c0b08b77c0465024d +s5p c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +tegra f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 3d0ae3e55d62ee94d5d10b62a5b5e5fa5972f1b7 +cris 395bc5121828e570bd4bb6455c82b80e2f2b05b4 +ia64 d4429f608abde89e8bc1e24b43cd503feb95c496 +m68k c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +m68knommu 74eb81ba3ffc9ebdec0c77cf58b6ce54b882ec28 +microblaze ff8b16d7e15a8ba2a6086645614a483e048e3fbf +mips 8fd01d6cfbf75465d84a4e533ed70c5f57b3ff51 +parisc 6a915c2bf073743dd31229f1ec2eaa7a2b13c1c3 +powerpc 6a1c9dfe4186f18fed38421b35b40fb9260cbfe1 +4xx 2989b722c9c4694cf6c5aa378f9c8a14e106d320 +52xx-and-virtex e39d5ef678045d61812c1401f04fe8edb14d6359 +galak e0dc09ff9a28f37441c5e92a14de6abda8db49d6 +s390 a2c201346a4ebf97c5137f51d110a62ba2f28578 +sh e5969c4d809240ccad0fb7b71d6d14f76378e673 +genesis 5c4e0f198d670338daf296e95b7536fdb3489590 +sparc 2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3 +tile d02db4f8d79c5841ba32b326edb75ea6acd081ca +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph efa4c1206eaff047c474af2136748a58eb8cc33b +cifs 618763958b2291a09057dbfa553da6ded93dcfad +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 11356a37c211ea6e9f5712f5fcd6cb6b7a4cc553 +ext3 4408ea41c0ab4b711d4da44dd954fb06dce6c3f8 +ext4 7ff9c073dd4d7200399076554f7ab9b876f196f6 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 0157443c56bcc50be4933ebdff3ece723dfd535c +gfs2 153de6f50947e52fc7441f33744f9c09cefd46c2 +hfsplus 6f80dfe55fcbde1e588bc2cfa1273403b710872d +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 166560177c18265f8b52b676bcef818789673e7e +nfsd 42d7ba3d6d56a6cbc773284896108b1e2ebcee81 +nilfs2 c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +ocfs2 2decd65a2630633cee04d0b83fdcee46ad2989a1 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 5f3b321da1aa5936c85ed6dec67358239a9d3cfd +udf 581b7e9fc00789782cb3bdca58db49f6f0f66608 +v9fs ff8b16d7e15a8ba2a6086645614a483e048e3fbf +ubifs 18cb657ca1bafe635f368346a1676fb04c512edf +xfs 39dc948c6921169e13224a97fa53188922acfde8 +vfs 99b7db7b8ffd6bb755eb0a175596421a0b581cb2 +pci 1af3c2e45e7a641e774bbb84fa428f2f0bf2d9c9 +hid 153dec3499d1389acde4fc92787670a50f02d350 +i2c 67398cff7e175bcf252bb809caf87acc8462ddef +bjdooks-i2c 9cc11dee3ddf140e39b0088688bfe5ee45d63b41 +jdelvare-hwmon c1426f30221afb23e5a39f595ee6de98e7ca756d +hwmon-staging b18cae4224bde7e5a332c19bc99247b2098ea232 +kernel-doc 229aebb873e29726b91e076161649cf45154b0bf +v4l-dvb 52fae5eead706cb8d604ee634162f6694d75ccad +kbuild 62a2836d2e0efa64d55654adb2862a4350785b78 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 89692c03226a066a017048cf7fbacbaa645f0e79 +infiniband c48c43e422c1404fd72c57d1d21a6f6d01e18900 +acpi 7e31842441776b4d6ec7fd916c91663ad05b7814 +idle-test c25d29952b2a8c9aaf00e081c9162a0e383030cd +ieee1394 7242604b89a42b030b48cc203837b3ea5f890191 +ubi 18cb657ca1bafe635f368346a1676fb04c512edf +kvm df8940eadf011db2d4bedecf6eb659d44494edb3 +dlm 269cddd44e3588d1c50a7ec055b78de4d6c72cb6 +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 151f52f09c5728ecfdd0c289da1a4b30bb416f2c +async_tx 964dc256bb91e990277010a3f6dc66daa130be8b +net 973a34aa8593dbfe84386343c694f5beecb51d8a +wireless 229aebb873e29726b91e076161649cf45154b0bf +bluetooth 380f981b60424344d089c8afa1d67469c6bc2023 +mtd 79346507ad48895f41b438fa562b1965721f36b9 +crypto 6d388b43d2c4ef6f0806c9bb9a5edebf00a23c6a +sound 210635c0308a9110b0eaac14c7bddcce7c2bedcc +sound-asoc 8bced693459cec5c3737f2492a2a8f1233b6614f +cpufreq a69a0612c4cb7b08570d1b25b542cef478a2d79a +rr 18d5fef89d84e11336111770d2b682c36cc69e8c +input 8c5188b6d350d033275eaf85faa12f284e2909e4 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block db6af4e85c46e61252033d5ac2a40783eb9008c8 +device-mapper db6af4e85c46e61252033d5ac2a40783eb9008c8 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 2f7ab176b76da7645a52a50375a04b8f2528b37b +battery 23886839a752401aba66517bff8a8b91549279ce +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc cdd30c136078e541b7f79fb9f85ec532ccb7703c +kgdb e99d11d19977c74b18411cdb59cdebb788237a6e +slab 98072e4d977aabe6a39abb95951cd8bf2c2202d5 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f3ac8bf7ce1c5abd763ea762e95d1cdcf7799372 +mfd 0f48285755991b73c14b6eeeee464590f490ac25 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 7e94250312d8b32a18e7e96cee19f2795d224e8c +viafb 51f4332bb5fef869e8a89895a7bac6b4c03b4946 +voltage 803ba375da7158d6aee6274a17bc48780daa0f38 +security-testing 3985c7ce85039adacdf882904ca096f091d39346 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 8f21dd55b61da1e23ae4be6a3d152b0c89076c34 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu eecfd57f6429d9d8e10be186566ef99fced55163 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd fe2fd9ed5bf184f797412be8b86f4589d1b77bb8 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 9db3b9bcc7f53487da8766b32e2d790ad03c53b9 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 78ca7c37efaa541006269aa3d3e560ea7926e245 +fsnotify 02478ec882e057e33fbdd8f1ba245fdfa5a355fb +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin 293801e7048415b93b2497eb6f9faf0099913983 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 76a7bd81130646459dfded1845e0d511488a6afa +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree 97ff46cb69da22037346670ae515217c658ace02 +spi 65289d6345d93abd860e43fd2119ac176d6cc697 +omap_dss2 5e4106bd304ee787c418a56b8c4ba85c22529d7a +tip fdc9fcf6e955512751c7c8eae757aa3bc2c0373c +rcu a45f258fe84bfe30c42393b0756c429582789ba8 +oprofile c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +xen 5b6dd91e461dbb17b2bb43d15a638ea3b777e0db +swiotlb-xen 2a63dd7275b2278bd7e9203f74b9aa4f07e82a7a +xen-pvhvm e0b58be59e4e278480b120ba827b8cfee7c7ddbd +edac-amd 3f0ee6e63d40c976f14eaa3391155ed0dc1d47ec +percpu 71c0993943c5663f67a908dfd21a571674a71793 +workqueues 229aebb873e29726b91e076161649cf45154b0bf +sfi 82acf2a8fe4764e21a7ad406590453b004751e58 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 7f80d734b3b5d23b9851cc03cc20733bca2c724e +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +tty c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +usb c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +staging-next c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-trivial 2a48fc0ab24241755dc93bfd4f01d68efab47f5a +bkl-llseek 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f +bkl-vfs 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 +bkl-config 6de5bd128d381ad88ac6d419a5e597048eb468cf +irqflags df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge 2bfc96a127bc1cc94d26bfaa40159966064f9c8c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..42d377873048 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,180 @@ +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 +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +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 +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 +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#master +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core 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 +bkl-trivial git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#trivial +bkl-llseek git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#llseek +bkl-vfs git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#vfs +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +irqflags git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags.git#master +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..16ca375c62bb --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3087 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 2301b65 Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 +Merging origin/master +$ git merge origin/master +Updating 2301b65..a7bcf21 +Fast-forward + Documentation/DocBook/kgdb.tmpl | 13 +- + Documentation/filesystems/Locking | 2 - + Documentation/i2c/busses/i2c-i801 | 6 +- + Documentation/scsi/ChangeLog.megaraid_sas | 47 + + MAINTAINERS | 21 +- + Makefile | 7 +- + arch/Kconfig | 14 + + arch/arm/Kconfig | 12 + + arch/arm/configs/mx51_defconfig | 1 + + arch/arm/include/asm/hardware/cache-l2x0.h | 13 +- + arch/arm/include/asm/kgdb.h | 5 +- + arch/arm/include/asm/memblock.h | 7 - + arch/arm/include/asm/outercache.h | 24 + + arch/arm/kernel/kgdb.c | 2 +- + arch/arm/kernel/machine_kexec.c | 3 + + arch/arm/kernel/vmlinux.lds.S | 1 + + arch/arm/mach-imx/mach-mx27_3ds.c | 38 + + arch/arm/mach-ixp2000/core.c | 2 +- + arch/arm/mach-msm/Kconfig | 9 +- + arch/arm/mach-msm/board-halibut.c | 1 - + arch/arm/mach-msm/include/mach/debug-macro.S | 15 +- + arch/arm/mach-msm/iommu_dev.c | 22 +- + arch/arm/mach-msm/timer.c | 2 +- + arch/arm/mach-mx25/Kconfig | 1 + + arch/arm/mach-mx25/mach-mx25_3ds.c | 10 + + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/devices.c | 16 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 38 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 16 + + arch/arm/mach-mx5/Kconfig | 2 + + arch/arm/mach-mx5/Makefile | 1 + + arch/arm/mach-mx5/board-mx51_babbage.c | 49 +- + arch/arm/mach-mx5/clock-mx51.c | 22 +- + arch/arm/mach-mx5/cpu_op-mx51.c | 29 + + arch/arm/mach-mx5/cpu_op-mx51.h | 14 + + arch/arm/mach-mx5/devices-imx51.h | 2 + + arch/arm/mach-omap2/omap4-common.c | 13 + + arch/arm/mach-s3c2410/h1940-bluetooth.c | 13 +- + arch/arm/mach-s3c2410/include/mach/gpio.h | 10 +- + arch/arm/mach-s3c2410/include/mach/h1940-latch.h | 57 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 2 + + arch/arm/mach-s3c2410/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 169 +- + arch/arm/mach-s3c2412/s3c2412.c | 3 +- + arch/arm/mach-s3c2416/Kconfig | 6 + + arch/arm/mach-s3c2416/Makefile | 2 +- + arch/arm/mach-s3c2416/irq.c | 2 + + arch/arm/mach-s3c2416/pm.c | 84 + + arch/arm/mach-s3c2416/s3c2416.c | 3 +- + arch/arm/mach-s3c2440/Kconfig | 7 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 218 ++- + arch/arm/mach-s3c2440/s3c244x.c | 3 +- + arch/arm/mach-s3c2443/s3c2443.c | 3 +- + arch/arm/mach-s3c24a0/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s3c64xx/Kconfig | 21 + + arch/arm/mach-s3c64xx/Makefile | 1 + + arch/arm/mach-s3c64xx/dev-audio.c | 63 +- + arch/arm/mach-s3c64xx/gpiolib.c | 8 +- + arch/arm/mach-s3c64xx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 357 ++ + arch/arm/mach-s3c64xx/mach-real6410.c | 198 +- + arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 13 +- + arch/arm/mach-s3c64xx/setup-ide.c | 11 +- + arch/arm/mach-s3c64xx/setup-keypad.c | 16 +- + arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 41 +- + arch/arm/mach-s5p6442/Kconfig | 1 - + arch/arm/mach-s5p6442/clock.c | 28 + + arch/arm/mach-s5p6442/dev-audio.c | 30 +- + arch/arm/mach-s5p6442/dev-spi.c | 6 +- + arch/arm/mach-s5p6442/dma.c | 2 +- + arch/arm/mach-s5p6442/include/mach/regs-clock.h | 1 + + arch/arm/mach-s5p6442/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s5p64x0/Kconfig | 2 - + arch/arm/mach-s5p64x0/clock-s5p6440.c | 19 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 19 +- + arch/arm/mach-s5p64x0/clock.c | 18 - + arch/arm/mach-s5p64x0/dev-audio.c | 26 +- + arch/arm/mach-s5p64x0/dev-spi.c | 38 +- + arch/arm/mach-s5p64x0/dma.c | 2 +- + arch/arm/mach-s5p64x0/include/mach/regs-clock.h | 2 + + arch/arm/mach-s5p64x0/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s5p64x0/setup-i2c0.c | 12 +- + arch/arm/mach-s5p64x0/setup-i2c1.c | 12 +- + arch/arm/mach-s5pc100/Kconfig | 1 - + arch/arm/mach-s5pc100/Makefile | 2 +- + arch/arm/mach-s5pc100/clock.c | 174 +- + arch/arm/mach-s5pc100/dev-audio.c | 86 +- + arch/arm/mach-s5pc100/dev-spi.c | 22 +- + arch/arm/mach-s5pc100/dma.c | 4 +- + arch/arm/mach-s5pc100/gpiolib.c | 216 +- + arch/arm/mach-s5pc100/include/mach/gpio.h | 7 - + arch/arm/mach-s5pc100/include/mach/irqs.h | 13 +- + arch/arm/mach-s5pc100/include/mach/map.h | 2 + + arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 49 +- + arch/arm/mach-s5pc100/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s5pc100/irq-gpio.c | 266 -- + arch/arm/mach-s5pc100/mach-smdkc100.c | 4 + + arch/arm/mach-s5pc100/setup-fb-24bpp.c | 30 +- + arch/arm/mach-s5pc100/setup-i2c0.c | 6 +- + arch/arm/mach-s5pc100/setup-i2c1.c | 6 +- + arch/arm/mach-s5pc100/setup-ide.c | 41 +- + arch/arm/mach-s5pc100/setup-keypad.c | 15 +- + arch/arm/mach-s5pc100/setup-sdhci-gpio.c | 35 +- + arch/arm/mach-s5pv210/Kconfig | 37 +- + arch/arm/mach-s5pv210/Makefile | 3 + + arch/arm/mach-s5pv210/clock.c | 207 +- + arch/arm/mach-s5pv210/cpu.c | 15 + + arch/arm/mach-s5pv210/cpufreq.c | 484 +++ + arch/arm/mach-s5pv210/dev-audio.c | 86 +- + arch/arm/mach-s5pv210/dev-spi.c | 19 +- + arch/arm/mach-s5pv210/dma.c | 4 +- + arch/arm/mach-s5pv210/gpiolib.c | 14 +- + arch/arm/mach-s5pv210/include/mach/irqs.h | 12 +- + arch/arm/mach-s5pv210/include/mach/map.h | 12 + + arch/arm/mach-s5pv210/include/mach/pm-core.h | 43 + + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 39 +- + arch/arm/mach-s5pv210/include/mach/regs-gpio.h | 7 - + arch/arm/mach-s5pv210/include/mach/regs-sys.h | 19 + + arch/arm/mach-s5pv210/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s5pv210/mach-aquila.c | 169 + + arch/arm/mach-s5pv210/mach-goni.c | 381 ++- + arch/arm/mach-s5pv210/mach-smdkc110.c | 4 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 4 + + arch/arm/mach-s5pv210/mach-torbreck.c | 131 + + arch/arm/mach-s5pv210/pm.c | 166 + + arch/arm/mach-s5pv210/setup-fb-24bpp.c | 34 +- + arch/arm/mach-s5pv210/setup-i2c0.c | 6 +- + arch/arm/mach-s5pv210/setup-i2c1.c | 6 +- + arch/arm/mach-s5pv210/setup-i2c2.c | 6 +- + arch/arm/mach-s5pv210/setup-ide.c | 49 +- + arch/arm/mach-s5pv210/setup-keypad.c | 14 +- + arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 57 +- + arch/arm/mach-s5pv210/sleep.S | 170 + + arch/arm/mach-s5pv310/Kconfig | 95 +- + arch/arm/mach-s5pv310/Makefile | 10 +- + arch/arm/mach-s5pv310/clock.c | 635 +++- + arch/arm/mach-s5pv310/cpu.c | 47 +- + arch/arm/mach-s5pv310/gpiolib.c | 304 ++ + arch/arm/mach-s5pv310/hotplug.c | 144 + + arch/arm/mach-s5pv310/include/mach/irqs.h | 44 +- + arch/arm/mach-s5pv310/include/mach/map.h | 19 +- + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 32 +- + arch/arm/mach-s5pv310/include/mach/regs-gpio.h | 42 + + arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 + + arch/arm/mach-s5pv310/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s5pv310/irq-combiner.c | 6 +- + arch/arm/mach-s5pv310/irq-eint.c | 228 ++ + arch/arm/mach-s5pv310/mach-smdkc210.c | 202 + + arch/arm/mach-s5pv310/mach-smdkv310.c | 121 +- + arch/arm/mach-s5pv310/mach-universal_c210.c | 81 +- + arch/arm/mach-s5pv310/setup-i2c0.c | 6 +- + arch/arm/mach-s5pv310/setup-i2c1.c | 6 +- + arch/arm/mach-s5pv310/setup-i2c2.c | 6 +- + arch/arm/mach-s5pv310/setup-i2c3.c | 23 + + arch/arm/mach-s5pv310/setup-i2c4.c | 23 + + arch/arm/mach-s5pv310/setup-i2c5.c | 23 + + arch/arm/mach-s5pv310/setup-i2c6.c | 23 + + arch/arm/mach-s5pv310/setup-i2c7.c | 23 + + arch/arm/mach-s5pv310/setup-sdhci-gpio.c | 152 + + arch/arm/mach-s5pv310/setup-sdhci.c | 69 + + arch/arm/mach-sa1100/cpu-sa1100.c | 5 +- + arch/arm/mach-shmobile/Kconfig | 2 + + arch/arm/mach-shmobile/board-ap4evb.c | 362 ++- + arch/arm/mach-shmobile/clock-sh7367.c | 2 +- + arch/arm/mach-shmobile/clock-sh7372.c | 180 +- + arch/arm/mach-shmobile/clock-sh7377.c | 2 +- + arch/arm/mach-shmobile/include/mach/gpio.h | 4 +- + arch/arm/mach-shmobile/include/mach/sh7372.h | 12 +- + arch/arm/mach-shmobile/intc-sh7372.c | 28 + + arch/arm/mach-shmobile/pfc-sh7372.c | 8 +- + arch/arm/mach-shmobile/setup-sh7367.c | 1 - + arch/arm/mach-shmobile/setup-sh7372.c | 94 +- + arch/arm/mach-shmobile/setup-sh7377.c | 1 - + arch/arm/mach-u300/clock.c | 6 +- + arch/arm/mach-u300/core.c | 47 +- + arch/arm/mach-u300/include/mach/u300-regs.h | 2 - + arch/arm/mach-u300/spi.c | 2 +- + arch/arm/mach-ux500/cpu.c | 45 + + arch/arm/mm/Kconfig | 8 + + arch/arm/mm/cache-fa.S | 12 + + arch/arm/mm/cache-l2x0.c | 78 +- + arch/arm/mm/cache-v3.S | 10 + + arch/arm/mm/cache-v4.S | 10 + + arch/arm/mm/cache-v4wb.S | 12 + + arch/arm/mm/cache-v4wt.S | 12 + + arch/arm/mm/fault-armv.c | 28 +- + arch/arm/mm/init.c | 155 +- + arch/arm/mm/mmu.c | 73 +- + arch/arm/mm/proc-arm1020.S | 15 + + arch/arm/mm/proc-arm1020e.S | 15 + + arch/arm/mm/proc-arm1022.S | 15 + + arch/arm/mm/proc-arm1026.S | 15 + + arch/arm/mm/proc-arm920.S | 12 + + arch/arm/mm/proc-arm922.S | 12 + + arch/arm/mm/proc-arm925.S | 12 + + arch/arm/mm/proc-arm926.S | 12 + + arch/arm/mm/proc-arm940.S | 12 + + arch/arm/mm/proc-arm946.S | 12 + + arch/arm/mm/proc-feroceon.S | 13 + + arch/arm/mm/proc-xsc3.S | 12 + + arch/arm/mm/proc-xscale.S | 12 + + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/cpufreq.c | 206 + + arch/arm/plat-mxc/devices/Kconfig | 6 +- + arch/arm/plat-mxc/devices/Makefile | 1 + + arch/arm/plat-mxc/devices/platform-gpio_keys.c | 27 + + arch/arm/plat-mxc/gpio.c | 32 + + arch/arm/plat-mxc/include/mach/devices-common.h | 4 + + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 2 + + arch/arm/plat-mxc/include/mach/mx31.h | 1 - + arch/arm/plat-mxc/include/mach/mx35.h | 2 - + arch/arm/plat-mxc/include/mach/mxc.h | 13 +- + arch/arm/plat-pxa/include/plat/pxa3xx_nand.h | 18 +- + arch/arm/plat-s3c24xx/Kconfig | 1 + + arch/arm/plat-s3c24xx/common-smdk.c | 2 +- + arch/arm/plat-s3c24xx/gpiolib.c | 10 +- + arch/arm/plat-s5p/Kconfig | 5 + + arch/arm/plat-s5p/Makefile | 3 + + arch/arm/plat-s5p/clock.c | 29 +- + arch/arm/plat-s5p/include/plat/irqs.h | 18 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 40 +- + arch/arm/plat-s5p/include/plat/s5p-clock.h | 4 + + arch/arm/plat-s5p/irq-eint.c | 10 +- + arch/arm/plat-s5p/irq-gpioint.c | 237 ++ + arch/arm/plat-s5p/irq-pm.c | 93 + + arch/arm/plat-s5p/pm.c | 52 + + arch/arm/plat-samsung/Kconfig | 25 + + arch/arm/plat-samsung/Makefile | 5 + + arch/arm/plat-samsung/dev-hsmmc.c | 8 +- + arch/arm/plat-samsung/dev-hsmmc1.c | 8 +- + arch/arm/plat-samsung/dev-hsmmc2.c | 8 +- + arch/arm/plat-samsung/dev-hsmmc3.c | 12 +- + arch/arm/plat-samsung/dev-i2c2.c | 4 +- + arch/arm/plat-samsung/dev-i2c3.c | 68 + + arch/arm/plat-samsung/dev-i2c4.c | 68 + + arch/arm/plat-samsung/dev-i2c5.c | 68 + + arch/arm/plat-samsung/dev-i2c6.c | 68 + + arch/arm/plat-samsung/dev-i2c7.c | 68 + + arch/arm/plat-samsung/gpio-config.c | 50 + + arch/arm/plat-samsung/gpio.c | 8 + + arch/arm/plat-samsung/include/plat/audio.h | 9 + + arch/arm/plat-samsung/include/plat/devs.h | 7 + + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 6 + + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 56 + + arch/arm/plat-samsung/include/plat/gpio-core.h | 15 + + arch/arm/plat-samsung/include/plat/iic.h | 10 + + arch/arm/plat-samsung/include/plat/map-base.h | 4 +- + arch/arm/plat-samsung/include/plat/nand-core.h | 28 + + arch/arm/plat-samsung/include/plat/sdhci.h | 64 + + arch/arm/plat-samsung/pm-gpio.c | 4 +- + arch/arm/plat-samsung/s3c-pl330.c | 34 +- + arch/blackfin/kernel/kgdb.c | 3 +- + arch/ia64/kernel/perfmon.c | 9 +- + arch/m68k/include/asm/irqflags.h | 2 + + arch/m68k/include/asm/machdep.h | 1 + + arch/mips/Kconfig | 79 + + arch/mips/Kconfig.debug | 9 + + arch/mips/Makefile | 4 +- + arch/mips/ar7/gpio.c | 243 ++- + arch/mips/ar7/platform.c | 56 + + arch/mips/ar7/prom.c | 2 + + arch/mips/ar7/setup.c | 14 + + arch/mips/bcm63xx/cpu.c | 30 +- + arch/mips/cavium-octeon/Kconfig | 23 + + arch/mips/cavium-octeon/csrc-octeon.c | 34 +- + arch/mips/cavium-octeon/dma-octeon.c | 581 ++-- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 810 +++-- + arch/mips/cavium-octeon/octeon-platform.c | 112 +- + arch/mips/cavium-octeon/serial.c | 2 +- + arch/mips/cavium-octeon/setup.c | 120 +- + arch/mips/include/asm/atomic.h | 208 +- + arch/mips/include/asm/bitops.h | 270 +- + arch/mips/include/asm/bootinfo.h | 12 + + arch/mips/include/asm/cmpxchg.h | 7 +- + arch/mips/include/asm/cpu.h | 26 +- + arch/mips/include/asm/device.h | 15 +- + arch/mips/include/asm/dma-mapping.h | 96 +- + arch/mips/include/asm/dma.h | 3 + + arch/mips/include/asm/local.h | 2 +- + arch/mips/include/asm/mach-ar7/ar7.h | 47 +- + arch/mips/include/asm/mach-ar7/gpio.h | 3 +- + arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h | 97 + + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 8 +- + .../include/asm/mach-cavium-octeon/dma-coherence.h | 24 +- + arch/mips/include/asm/mach-ip27/dma-coherence.h | 5 +- + arch/mips/include/asm/mach-ip32/dma-coherence.h | 5 +- + arch/mips/include/asm/mach-jazz/dma-coherence.h | 9 +- + arch/mips/include/asm/mipsregs.h | 51 + + arch/mips/include/asm/octeon/cvmx-agl-defs.h | 616 +++- + arch/mips/include/asm/octeon/cvmx-asm.h | 11 + + arch/mips/include/asm/octeon/cvmx-ciu-defs.h | 857 ++++- + arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 74 +- + arch/mips/include/asm/octeon/cvmx-iob-defs.h | 242 +- + arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 314 +- + arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 738 ++++- + arch/mips/include/asm/octeon/cvmx-l2c.h | 225 +- + arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 38 +- + arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 5 +- + arch/mips/include/asm/octeon/cvmx-led-defs.h | 41 +- + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 807 +++-- + arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 200 +- + arch/mips/include/asm/octeon/cvmx-npei-defs.h | 681 ++-- + arch/mips/include/asm/octeon/cvmx-npi-defs.h | 362 +-- + arch/mips/include/asm/octeon/cvmx-pci-defs.h | 265 +- + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 435 ++- + arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 50 +- + arch/mips/include/asm/octeon/cvmx-pexp-defs.h | 378 +- + arch/mips/include/asm/octeon/cvmx-pow-defs.h | 157 +- + arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 67 +- + arch/mips/include/asm/octeon/cvmx-smix-defs.h | 46 +- + arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 261 ++ + arch/mips/include/asm/octeon/octeon-model.h | 36 +- + arch/mips/include/asm/octeon/octeon.h | 1 + + arch/mips/include/asm/octeon/pci-octeon.h | 10 + + arch/mips/include/asm/perf_event.h | 25 + + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/include/asm/processor.h | 40 +- + arch/mips/include/asm/system.h | 52 +- + arch/mips/include/asm/thread_info.h | 2 + + arch/mips/include/asm/uaccess.h | 4 +- + arch/mips/kernel/Makefile | 2 + + arch/mips/kernel/cpu-probe.c | 82 +- + arch/mips/kernel/irq.c | 24 + + arch/mips/kernel/perf_event.c | 601 +++ + arch/mips/kernel/perf_event_mipsxx.c | 1052 +++++ + arch/mips/kernel/setup.c | 1 + + arch/mips/kernel/traps.c | 31 +- + arch/mips/kernel/unaligned.c | 7 + + arch/mips/loongson/Kconfig | 2 - + arch/mips/math-emu/cp1emu.c | 3 + + arch/mips/mm/c-octeon.c | 16 +- + arch/mips/mm/c-r4k.c | 21 +- + arch/mips/mm/dma-default.c | 165 +- + arch/mips/mm/fault.c | 11 +- + arch/mips/mm/sc-mips.c | 34 +- + arch/mips/mm/tlbex.c | 11 +- + arch/mips/mm/uasm.c | 20 +- + arch/mips/pci/pci-octeon.c | 60 +- + arch/mips/pci/pcie-octeon.c | 5 + + arch/powerpc/Kconfig | 7 +- + arch/powerpc/include/asm/fsl_lbc.h | 34 +- + arch/powerpc/include/asm/kgdb.h | 1 + + arch/powerpc/kernel/kgdb.c | 188 +- + arch/powerpc/kernel/kvm.c | 2 +- + arch/powerpc/kvm/booke_interrupts.S | 2 +- + arch/powerpc/kvm/e500.c | 2 +- + arch/powerpc/kvm/powerpc.c | 1 + + arch/powerpc/kvm/timing.c | 2 - + arch/powerpc/platforms/cell/spufs/inode.c | 10 +- + arch/powerpc/sysdev/fsl_lbc.c | 244 +- + arch/s390/Kconfig | 61 +- + arch/s390/hypfs/hypfs_diag.c | 19 +- + arch/s390/hypfs/inode.c | 8 +- + arch/s390/include/asm/dasd.h | 40 +- + arch/s390/kernel/asm-offsets.c | 6 +- + arch/s390/kernel/early.c | 2 - + arch/s390/kernel/entry.S | 1 + + arch/s390/kernel/entry64.S | 1 + + arch/s390/kernel/kprobes.c | 9 +- + arch/s390/kernel/setup.c | 3 + + arch/s390/kernel/sysinfo.c | 2 + + arch/s390/kernel/topology.c | 6 +- + arch/s390/kernel/vdso32/clock_getres.S | 6 +- + arch/s390/kernel/vdso32/clock_gettime.S | 4 +- + arch/s390/kernel/vdso64/clock_getres.S | 6 +- + arch/s390/kernel/vdso64/clock_gettime.S | 4 +- + arch/sh/Kconfig | 1 + + arch/sh/Makefile | 3 - + arch/sh/boards/Kconfig | 7 - + arch/sh/boards/Makefile | 2 + + arch/sh/boards/board-edosk7705.c | 78 + + .../setup.c => board-secureedge5410.c} | 38 +- + arch/sh/boards/mach-ap325rxa/setup.c | 29 +- + arch/sh/boards/mach-ecovec24/setup.c | 60 +- + arch/sh/boards/mach-edosk7705/Makefile | 5 - + arch/sh/boards/mach-edosk7705/io.c | 71 - + arch/sh/boards/mach-edosk7705/setup.c | 36 - + arch/sh/boards/mach-kfr2r09/setup.c | 29 +- + arch/sh/boards/mach-microdev/io.c | 246 +-- + arch/sh/boards/mach-microdev/setup.c | 23 +- + arch/sh/boards/mach-migor/setup.c | 58 +- + arch/sh/boards/mach-se/7206/Makefile | 2 +- + arch/sh/boards/mach-se/7206/io.c | 104 - + arch/sh/boards/mach-se/7206/irq.c | 4 +- + arch/sh/boards/mach-se/7206/setup.c | 15 - + arch/sh/boards/mach-se/770x/Makefile | 2 +- + arch/sh/boards/mach-se/770x/io.c | 156 - + arch/sh/boards/mach-se/770x/setup.c | 22 - + arch/sh/boards/mach-se/7724/setup.c | 54 +- + arch/sh/boards/mach-se/7751/Makefile | 2 +- + arch/sh/boards/mach-se/7751/io.c | 119 - + arch/sh/boards/mach-se/7751/setup.c | 18 - + arch/sh/boards/mach-snapgear/Makefile | 5 - + arch/sh/boards/mach-snapgear/io.c | 121 - + arch/sh/boards/mach-systemh/Makefile | 13 - + arch/sh/boards/mach-systemh/io.c | 158 - + arch/sh/boards/mach-systemh/irq.c | 61 - + arch/sh/boards/mach-systemh/setup.c | 57 - + ...snapgear_defconfig => secureedge5410_defconfig} | 0 + arch/sh/configs/systemh_defconfig | 28 - + arch/sh/include/asm/addrspace.h | 8 +- + arch/sh/include/asm/pgtable.h | 12 - + arch/sh/include/asm/system.h | 4 +- + arch/sh/include/asm/system_32.h | 36 - + arch/sh/include/asm/system_64.h | 3 - + arch/sh/include/asm/uncached.h | 40 + + arch/sh/include/mach-common/mach/edosk7705.h | 7 - + arch/sh/include/mach-common/mach/microdev.h | 9 - + .../mach/{snapgear.h => secureedge5410.h} | 22 - + arch/sh/include/mach-common/mach/systemh7751.h | 71 - + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 6 +- + arch/sh/mm/Kconfig | 2 +- + arch/sh/mm/consistent.c | 15 +- + arch/sh/mm/uncached.c | 2 +- + arch/sh/tools/mach-types | 1 - + arch/sparc/Kconfig | 3 - + arch/sparc/include/asm/jump_label.h | 2 +- + arch/sparc/kernel/irq_32.c | 4 +- + arch/sparc/kernel/leon_smp.c | 4 +- + arch/sparc/kernel/rtrap_32.S | 6 +- + arch/sparc/kernel/rtrap_64.S | 36 +- + arch/sparc/mm/fault_32.c | 12 + + arch/tile/include/asm/highmem.h | 1 - + arch/tile/include/asm/kmap_types.h | 34 +- + arch/tile/include/asm/pgtable.h | 6 +- + arch/tile/include/asm/stat.h | 3 + + arch/tile/include/asm/unistd.h | 1 + + arch/tile/kernel/compat.c | 10 +- + arch/tile/kernel/early_printk.c | 2 +- + arch/tile/kernel/hardwall.c | 6 +- + arch/tile/kernel/irq.c | 4 +- + arch/tile/kernel/machine_kexec.c | 6 +- + arch/tile/kernel/messaging.c | 2 +- + arch/tile/kernel/ptrace.c | 39 +- + arch/tile/kernel/reboot.c | 6 +- + arch/tile/kernel/setup.c | 8 +- + arch/tile/kernel/signal.c | 9 +- + arch/tile/kernel/smp.c | 2 +- + arch/tile/kernel/time.c | 8 +- + arch/tile/lib/memcpy_tile64.c | 11 +- + arch/tile/mm/highmem.c | 2 +- + arch/tile/mm/init.c | 8 +- + arch/tile/mm/pgtable.c | 4 +- + arch/x86/Kconfig | 5 + + arch/x86/Makefile_32.cpu | 13 +- + arch/x86/include/asm/acpi.h | 3 + + arch/x86/include/asm/io.h | 13 + + arch/x86/include/asm/io_apic.h | 1 + + arch/x86/include/asm/pci.h | 33 +- + arch/x86/include/asm/pci_x86.h | 1 + + arch/x86/include/asm/uv/uv_hub.h | 21 +- + arch/x86/include/asm/x86_init.h | 9 + + arch/x86/include/asm/xen/pci.h | 65 + + arch/x86/kernel/acpi/boot.c | 60 +- + arch/x86/kernel/alternative.c | 71 +- + arch/x86/kernel/apic/io_apic.c | 11 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 24 +- + arch/x86/kernel/irq_32.c | 9 +- + arch/x86/kernel/kgdb.c | 3 +- + arch/x86/kernel/x86_init.c | 7 + + arch/x86/kvm/mmu.c | 9 +- + arch/x86/kvm/x86.c | 16 +- + arch/x86/mm/numa_64.c | 7 +- + arch/x86/pci/Makefile | 1 + + arch/x86/pci/common.c | 17 +- + arch/x86/pci/i386.c | 2 + + arch/x86/pci/xen.c | 414 ++ + arch/x86/xen/Kconfig | 10 + + arch/x86/xen/enlighten.c | 5 + + arch/x86/xen/mmu.c | 47 +- + arch/x86/xen/pci-swiotlb-xen.c | 4 + + arch/x86/xen/setup.c | 5 +- + arch/x86/xen/smp.c | 26 + + drivers/Makefile | 1 + + drivers/ata/pata_octeon_cf.c | 2 +- + drivers/base/devtmpfs.c | 18 +- + drivers/base/power/runtime.c | 2 +- + drivers/block/floppy.c | 4 +- + drivers/block/xen-blkfront.c | 2 + + drivers/char/Makefile | 44 +- + drivers/char/agp/parisc-agp.c | 1 + + drivers/char/hvc_xen.c | 98 +- + drivers/clocksource/sh_cmt.c | 10 +- + drivers/clocksource/sh_mtu2.c | 10 +- + drivers/clocksource/sh_tmu.c | 10 +- + drivers/dma/Kconfig | 4 +- + drivers/firewire/ohci.c | 92 +- + drivers/hwmon/ltc4261.c | 5 +- + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-i801.c | 333 +- + drivers/i2c/busses/i2c-intel-mid.c | 1135 ++++++ + drivers/i2c/busses/i2c-nomadik.c | 36 +- + drivers/i2c/busses/i2c-s3c2410.c | 10 +- + drivers/ide/hpt366.c | 14 +- + drivers/ide/ide-dma.c | 11 +- + drivers/infiniband/hw/ipath/ipath_fs.c | 14 +- + drivers/infiniband/hw/qib/qib_fs.c | 14 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/touchscreen/ad7879.c | 32 +- + drivers/input/touchscreen/bu21013_ts.c | 2 +- + drivers/input/xen-kbdfront.c | 2 + + drivers/isdn/capi/capifs.c | 8 +- + drivers/isdn/hisax/isar.c | 4 +- + drivers/isdn/mISDN/socket.c | 2 + + drivers/leds/leds-net5501.c | 2 + + drivers/md/bitmap.c | 30 +- + drivers/md/bitmap.h | 4 +- + drivers/md/faulty.c | 2 +- + drivers/md/md.c | 162 +- + drivers/md/md.h | 8 +- + drivers/md/raid1.c | 224 +- + drivers/md/raid1.h | 2 - + drivers/md/raid10.c | 42 +- + drivers/md/raid5.c | 6 +- + drivers/media/IR/ir-keytable.c | 8 +- + drivers/misc/ibmasm/ibmasmfs.c | 9 +- + drivers/misc/kgdbts.c | 16 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 4 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 83 +- + drivers/mtd/chips/cfi_probe.c | 2 + + drivers/mtd/chips/cfi_util.c | 7 + + drivers/mtd/devices/block2mtd.c | 1 - + drivers/mtd/devices/m25p80.c | 6 +- + drivers/mtd/devices/phram.c | 2 +- + drivers/mtd/maps/Kconfig | 9 + + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/bcm963xx-flash.c | 271 ++ + drivers/mtd/maps/gpio-addr-flash.c | 10 +- + drivers/mtd/maps/pcmciamtd.c | 4 - + drivers/mtd/maps/physmap_of.c | 20 +- + drivers/mtd/mtd_blkdevs.c | 68 +- + drivers/mtd/mtdchar.c | 119 +- + drivers/mtd/mtdpart.c | 154 +- + drivers/mtd/mtdsuper.c | 54 +- + drivers/mtd/nand/Kconfig | 15 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/bf5xx_nand.c | 14 +- + drivers/mtd/nand/davinci_nand.c | 11 +- + drivers/mtd/nand/denali.c | 1 + + drivers/mtd/nand/fsl_elbc_nand.c | 484 +-- + drivers/mtd/nand/fsl_upm.c | 10 +- + drivers/mtd/nand/fsmc_nand.c | 866 +++++ + drivers/mtd/nand/mpc5121_nfc.c | 11 +- + drivers/mtd/nand/nand_base.c | 338 ++- + drivers/mtd/nand/nand_bbt.c | 250 ++- + drivers/mtd/nand/nand_ids.c | 31 + + drivers/mtd/nand/nandsim.c | 19 +- + drivers/mtd/nand/ndfc.c | 8 +- + drivers/mtd/nand/omap2.c | 4 +- + drivers/mtd/nand/pxa3xx_nand.c | 348 +-- + drivers/mtd/nand/r852.c | 30 +- + drivers/mtd/nand/r852.h | 2 - + drivers/mtd/ofpart.c | 2 +- + drivers/mtd/onenand/Kconfig | 7 +- + drivers/mtd/onenand/onenand_base.c | 7 +- + drivers/mtd/onenand/samsung.c | 133 +- + drivers/mtd/sm_ftl.h | 8 +- + drivers/net/Kconfig | 1 + + drivers/net/atarilance.c | 2 +- + drivers/net/atlx/atl1.c | 1 - + drivers/net/bnx2x/bnx2x.h | 4 +- + drivers/net/bnx2x/bnx2x_hsi.h | 9 +- + drivers/net/bnx2x/bnx2x_link.c | 57 +- + drivers/net/caif/caif_spi.c | 57 +- + drivers/net/caif/caif_spi_slave.c | 13 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/pch_can.c | 10 +- + drivers/net/cxgb3/cxgb3_main.c | 1 - + drivers/net/cxgb3/sge.c | 4 +- + drivers/net/cxgb4/cxgb4_main.c | 1 - + drivers/net/cxgb4vf/cxgb4vf_main.c | 1 - + drivers/net/e1000e/82571.c | 38 + + drivers/net/e1000e/e1000.h | 3 + + drivers/net/e1000e/netdev.c | 29 +- + drivers/net/ibm_newemac/core.c | 1 - + drivers/net/igb/igb_main.c | 1 - + drivers/net/igbvf/netdev.c | 8 +- + drivers/net/ixgb/ixgb_main.c | 1 + + drivers/net/ixgbe/ixgbe_dcb.c | 39 +- + drivers/net/ixgbe/ixgbe_dcb.h | 5 +- + drivers/net/ixgbe/ixgbe_dcb_82599.c | 5 + + drivers/net/ixgbe/ixgbe_dcb_82599.h | 3 + + drivers/net/ixgbe/ixgbe_main.c | 12 +- + drivers/net/jme.c | 4 - + drivers/net/lib8390.c | 1 - + drivers/net/netxen/netxen_nic_ctx.c | 15 - + drivers/net/netxen/netxen_nic_main.c | 11 +- + drivers/net/pcmcia/pcnet_cs.c | 1 + + drivers/net/phy/marvell.c | 18 +- + drivers/net/qlcnic/qlcnic_main.c | 1 - + drivers/net/smsc911x.h | 2 +- + drivers/net/stmmac/stmmac_main.c | 40 +- + drivers/net/tulip/de2104x.c | 1 - + drivers/net/usb/usbnet.c | 11 + + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/vmxnet3/vmxnet3_int.h | 8 +- + drivers/net/wireless/ath/ath5k/attach.c | 17 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 10 +- + drivers/net/wireless/ath/ath9k/main.c | 31 +- + drivers/net/wireless/ath/ath9k/rc.c | 2 +- + drivers/net/wireless/ath/ath9k/recv.c | 15 +- + drivers/net/wireless/ath/ath9k/xmit.c | 18 +- + drivers/net/wireless/b43/sdio.c | 2 + + drivers/net/wireless/ipw2x00/libipw_module.c | 9 +- + drivers/net/wireless/libertas/if_sdio.c | 32 +- + drivers/net/xen-netfront.c | 2 + + drivers/oprofile/buffer_sync.c | 2 +- + drivers/oprofile/cpu_buffer.c | 10 +- + drivers/oprofile/cpu_buffer.h | 1 + + drivers/oprofile/oprofilefs.c | 8 +- + drivers/oprofile/timer_int.c | 13 + + drivers/pci/Kconfig | 21 + + drivers/pci/Makefile | 2 + + drivers/pci/bus.c | 1 + + drivers/pci/msi.c | 14 +- + drivers/pci/xen-pcifront.c | 1148 ++++++ + drivers/rtc/rtc-ds1302.c | 2 +- + drivers/s390/block/dasd_eckd.c | 69 + + drivers/s390/block/dasd_eckd.h | 1 + + drivers/s390/char/tape_core.c | 9 +- + drivers/s390/char/tape_std.c | 4 +- + drivers/s390/scsi/zfcp_fc.h | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 3 - + drivers/s390/scsi/zfcp_unit.c | 4 +- + drivers/scsi/bfa/bfa.h | 48 +- + drivers/scsi/bfa/bfa_cb_ioim.h | 22 +- + drivers/scsi/bfa/bfa_core.c | 178 +- + drivers/scsi/bfa/bfa_cs.h | 24 +- + drivers/scsi/bfa/bfa_defs.h | 54 +- + drivers/scsi/bfa/bfa_defs_fcs.h | 48 +- + drivers/scsi/bfa/bfa_defs_svc.h | 82 +- + drivers/scsi/bfa/bfa_drv.c | 6 +- + drivers/scsi/bfa/bfa_fc.h | 30 +- + drivers/scsi/bfa/bfa_fcbuild.c | 196 +- + drivers/scsi/bfa/bfa_fcpim.c | 351 +- + drivers/scsi/bfa/bfa_fcpim.h | 18 +- + drivers/scsi/bfa/bfa_fcs.c | 335 +-- + drivers/scsi/bfa/bfa_fcs.h | 43 +- + drivers/scsi/bfa/bfa_fcs_fcpim.c | 34 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 468 +-- + drivers/scsi/bfa/bfa_fcs_rport.c | 198 +- + drivers/scsi/bfa/bfa_hw_cb.c | 16 +- + drivers/scsi/bfa/bfa_hw_ct.c | 22 +- + drivers/scsi/bfa/bfa_ioc.c | 397 +- + drivers/scsi/bfa/bfa_ioc.h | 108 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 90 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 167 +- + drivers/scsi/bfa/bfa_modules.h | 6 +- + drivers/scsi/bfa/bfa_os_inc.h | 82 +- + drivers/scsi/bfa/bfa_port.c | 40 +- + drivers/scsi/bfa/bfa_svc.c | 504 ++-- + drivers/scsi/bfa/bfa_svc.h | 41 +- + drivers/scsi/bfa/bfad.c | 73 +- + drivers/scsi/bfa/bfad_attr.c | 38 +- + drivers/scsi/bfa/bfad_debugfs.c | 4 +- + drivers/scsi/bfa/bfad_drv.h | 5 +- + drivers/scsi/bfa/bfad_im.c | 71 +- + drivers/scsi/bfa/bfi.h | 58 +- + drivers/scsi/bfa/bfi_ms.h | 50 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 3 + + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 + + drivers/scsi/fcoe/fcoe.c | 18 +- + drivers/scsi/fcoe/libfcoe.c | 2 +- + drivers/scsi/gdth.c | 8 + + drivers/scsi/ipr.c | 2 + + drivers/scsi/ipr.h | 1 + + drivers/scsi/libfc/fc_disc.c | 5 +- + drivers/scsi/libfc/fc_fcp.c | 24 +- + drivers/scsi/libfc/fc_lport.c | 12 +- + drivers/scsi/libfc/fc_rport.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 12 +- + drivers/scsi/lpfc/lpfc_attr.c | 7 +- + drivers/scsi/lpfc/lpfc_bsg.c | 4 +- + drivers/scsi/lpfc/lpfc_crtn.h | 4 + + drivers/scsi/lpfc/lpfc_els.c | 439 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 437 ++- + drivers/scsi/lpfc/lpfc_hw.h | 41 + + drivers/scsi/lpfc/lpfc_hw4.h | 167 +- + drivers/scsi/lpfc/lpfc_init.c | 102 +- + drivers/scsi/lpfc/lpfc_mbox.c | 28 + + drivers/scsi/lpfc/lpfc_scsi.c | 9 +- + drivers/scsi/lpfc/lpfc_sli.c | 458 ++- + drivers/scsi/lpfc/lpfc_sli4.h | 9 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid/megaraid_sas.c | 126 +- + drivers/scsi/megaraid/megaraid_sas.h | 7 +- + drivers/scsi/osd/osd_initiator.c | 244 ++- + drivers/scsi/pmcraid.c | 129 +- + drivers/scsi/pmcraid.h | 23 +- + drivers/scsi/qla2xxx/qla_attr.c | 4 + + drivers/scsi/qla2xxx/qla_bsg.c | 125 + + drivers/scsi/qla2xxx/qla_bsg.h | 2 + + drivers/scsi/qla2xxx/qla_def.h | 2 - + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_init.c | 28 +- + drivers/scsi/qla2xxx/qla_iocb.c | 4 +- + drivers/scsi/qla2xxx/qla_isr.c | 21 +- + drivers/scsi/qla2xxx/qla_os.c | 207 +- + drivers/scsi/qla4xxx/ql4_dbg.c | 101 + + drivers/scsi/qla4xxx/ql4_def.h | 20 +- + drivers/scsi/qla4xxx/ql4_fw.h | 3 + + drivers/scsi/qla4xxx/ql4_glbl.h | 1 + + drivers/scsi/qla4xxx/ql4_init.c | 10 +- + drivers/scsi/qla4xxx/ql4_iocb.c | 10 +- + drivers/scsi/qla4xxx/ql4_isr.c | 16 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 11 +- + drivers/scsi/qla4xxx/ql4_nx.c | 89 +- + drivers/scsi/qla4xxx/ql4_nx.h | 5 +- + drivers/scsi/qla4xxx/ql4_os.c | 109 +- + drivers/scsi/qla4xxx/ql4_version.h | 2 +- + drivers/scsi/scsi_lib.c | 3 +- + drivers/scsi/scsi_sysfs.c | 3 +- + drivers/scsi/sd.c | 23 + + drivers/scsi/sr_ioctl.c | 9 + + drivers/serial/crisv10.c | 23 +- + drivers/sh/clk/core.c | 96 +- + drivers/sh/intc/core.c | 2 +- + drivers/sh/intc/dynamic.c | 2 +- + drivers/spi/spi.c | 98 +- + drivers/spi/spi_bfin5xx.c | 22 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 4 +- + drivers/staging/ath6kl/os/linux/ar6000_raw_if.c | 4 +- + drivers/staging/autofs/init.c | 8 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 4 +- + drivers/staging/brcm80211/sys/wl_mac80211.c | 2 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/comedi/drivers/usbduxfast.c | 4 +- + drivers/staging/dream/Kconfig | 13 - + drivers/staging/dream/Makefile | 5 - + drivers/staging/dream/TODO | 13 - + drivers/staging/dream/camera/Kconfig | 46 - + drivers/staging/dream/camera/Makefile | 8 - + drivers/staging/dream/camera/msm_camera.c | 2181 ----------- + drivers/staging/dream/camera/msm_io7x.c | 291 -- + drivers/staging/dream/camera/msm_io8x.c | 320 -- + drivers/staging/dream/camera/msm_v4l2.c | 798 ---- + drivers/staging/dream/camera/msm_vfe7x.c | 702 ---- + drivers/staging/dream/camera/msm_vfe7x.h | 255 -- + drivers/staging/dream/camera/msm_vfe8x.c | 736 ---- + drivers/staging/dream/camera/msm_vfe8x.h | 895 ----- + drivers/staging/dream/camera/msm_vfe8x_proc.c | 4003 -------------------- + drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 -------- + drivers/staging/dream/camera/mt9d112.c | 762 ---- + drivers/staging/dream/camera/mt9d112.h | 36 - + drivers/staging/dream/camera/mt9d112_reg.c | 307 -- + drivers/staging/dream/camera/mt9p012.h | 51 - + drivers/staging/dream/camera/mt9p012_fox.c | 1306 ------- + drivers/staging/dream/camera/mt9p012_reg.c | 573 --- + drivers/staging/dream/camera/mt9t013.c | 1497 -------- + drivers/staging/dream/camera/mt9t013.h | 48 - + drivers/staging/dream/camera/mt9t013_reg.c | 266 -- + drivers/staging/dream/camera/s5k3e2fx.c | 1307 ------- + drivers/staging/dream/camera/s5k3e2fx.h | 9 - + drivers/staging/dream/generic_gpio.c | 274 -- + drivers/staging/dream/gpio_axis.c | 181 - + drivers/staging/dream/gpio_event.c | 224 -- + drivers/staging/dream/gpio_input.c | 337 -- + drivers/staging/dream/gpio_matrix.c | 399 -- + drivers/staging/dream/gpio_output.c | 84 - + drivers/staging/dream/include/linux/android_pmem.h | 80 - + drivers/staging/dream/include/linux/gpio_event.h | 154 - + drivers/staging/dream/include/linux/msm_adsp.h | 84 - + drivers/staging/dream/include/linux/msm_audio.h | 115 - + .../staging/dream/include/linux/msm_rpcrouter.h | 47 - + drivers/staging/dream/include/linux/wakelock.h | 91 - + drivers/staging/dream/include/mach/camera.h | 279 -- + drivers/staging/dream/include/mach/msm_adsp.h | 112 - + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 - + drivers/staging/dream/include/mach/msm_smd.h | 107 - + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 - + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 - + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 ----- + .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 -- + .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 -- + .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 - + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 - + .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 - + .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 -- + .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 - + .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 - + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 - + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 -- + .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 - + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 -- + .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 ----- + .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 -- + drivers/staging/dream/include/media/msm_camera.h | 388 -- + drivers/staging/dream/pmem.c | 1333 ------- + drivers/staging/dream/qdsp5/Makefile | 18 - + drivers/staging/dream/qdsp5/adsp.c | 1159 ------ + drivers/staging/dream/qdsp5/adsp.h | 369 -- + drivers/staging/dream/qdsp5/adsp_6210.c | 283 -- + drivers/staging/dream/qdsp5/adsp_6220.c | 284 -- + drivers/staging/dream/qdsp5/adsp_6225.c | 328 -- + drivers/staging/dream/qdsp5/adsp_driver.c | 643 ---- + drivers/staging/dream/qdsp5/adsp_info.c | 121 - + .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 - + drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 - + drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 - + drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 - + drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 -- + .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 - + .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 -- + drivers/staging/dream/qdsp5/audio_aac.c | 1054 ----- + drivers/staging/dream/qdsp5/audio_amrnb.c | 875 ----- + drivers/staging/dream/qdsp5/audio_evrc.c | 847 ----- + drivers/staging/dream/qdsp5/audio_in.c | 970 ----- + drivers/staging/dream/qdsp5/audio_mp3.c | 972 ----- + drivers/staging/dream/qdsp5/audio_out.c | 841 ---- + drivers/staging/dream/qdsp5/audio_qcelp.c | 858 ----- + drivers/staging/dream/qdsp5/audmgr.c | 314 -- + drivers/staging/dream/qdsp5/audmgr.h | 215 -- + drivers/staging/dream/qdsp5/audmgr_new.h | 213 -- + drivers/staging/dream/qdsp5/audpp.c | 429 --- + drivers/staging/dream/qdsp5/evlog.h | 134 - + drivers/staging/dream/qdsp5/snd.c | 280 -- + drivers/staging/dream/synaptics_i2c_rmi.c | 649 ---- + drivers/staging/dream/synaptics_i2c_rmi.h | 53 - + drivers/staging/msm/msm_fb.c | 4 +- + drivers/staging/pohmelfs/inode.c | 9 +- + drivers/staging/rtl8712/osdep_service.h | 2 +- + drivers/staging/smbfs/inode.c | 10 +- + drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- + drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- + drivers/staging/tm6000/tm6000-i2c.c | 1 - + .../westbridge/astoria/block/cyasblkdev_block.c | 2 +- + .../westbridge/astoria/block/cyasblkdev_queue.c | 2 +- + drivers/tty/Makefile | 11 + + drivers/{char => tty}/n_gsm.c | 0 + drivers/{char => tty}/n_hdlc.c | 0 + drivers/{char => tty}/n_r3964.c | 0 + drivers/{char => tty}/n_tty.c | 0 + drivers/{char => tty}/pty.c | 0 + drivers/{char => tty}/sysrq.c | 0 + drivers/{char => tty}/tty_audit.c | 38 +- + drivers/{char => tty}/tty_buffer.c | 0 + drivers/{char => tty}/tty_io.c | 0 + drivers/{char => tty}/tty_ioctl.c | 0 + drivers/{char => tty}/tty_ldisc.c | 0 + drivers/{char => tty}/tty_mutex.c | 0 + drivers/{char => tty}/tty_port.c | 0 + drivers/{char => tty/vt}/.gitignore | 0 + drivers/tty/vt/Makefile | 34 + + drivers/{char => tty/vt}/consolemap.c | 0 + drivers/{char => tty/vt}/cp437.uni | 0 + drivers/{char => tty/vt}/defkeymap.c_shipped | 0 + drivers/{char => tty/vt}/defkeymap.map | 0 + drivers/{char => tty/vt}/keyboard.c | 0 + drivers/{char => tty/vt}/selection.c | 0 + drivers/{char => tty/vt}/vc_screen.c | 0 + drivers/{char => tty/vt}/vt.c | 0 + drivers/{char => tty/vt}/vt_ioctl.c | 0 + drivers/usb/core/inode.c | 8 +- + drivers/usb/gadget/f_fs.c | 14 +- + drivers/usb/gadget/inode.c | 10 +- + drivers/usb/gadget/u_ether.c | 1 - + drivers/usb/host/Kconfig | 30 +- + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-hcd.c | 5 + + drivers/usb/host/ehci-octeon.c | 207 + + drivers/usb/host/octeon2-common.c | 185 + + drivers/usb/host/ohci-hcd.c | 5 + + drivers/usb/host/ohci-octeon.c | 214 ++ + drivers/video/msm/mddi.c | 5 +- + drivers/video/msm/mdp.c | 3 +- + drivers/video/sh_mipi_dsi.c | 32 +- + drivers/video/sh_mobile_hdmi.c | 629 ++-- + drivers/video/sh_mobile_lcdcfb.c | 348 ++- + drivers/video/sh_mobile_lcdcfb.h | 41 + + drivers/video/xen-fbfront.c | 2 + + drivers/watchdog/octeon-wdt-main.c | 4 +- + drivers/xen/Kconfig | 3 +- + drivers/xen/Makefile | 2 + + drivers/xen/biomerge.c | 13 + + drivers/xen/events.c | 509 +++- + drivers/xen/pci.c | 117 + + drivers/xen/xenbus/xenbus_client.c | 2 + + drivers/xen/xenbus/xenbus_probe.c | 29 +- + drivers/xen/xenfs/super.c | 8 +- + fs/9p/vfs_super.c | 22 +- + fs/adfs/super.c | 9 +- + fs/affs/super.c | 9 +- + fs/afs/super.c | 19 +- + fs/anon_inodes.c | 10 +- + fs/autofs4/init.c | 8 +- + fs/befs/linuxvfs.c | 11 +- + fs/bfs/inode.c | 8 +- + fs/binfmt_misc.c | 8 +- + fs/block_dev.c | 8 +- + fs/btrfs/compression.c | 2 - + fs/btrfs/ctree.c | 57 +- + fs/btrfs/ctree.h | 100 +- + fs/btrfs/dir-item.c | 2 +- + fs/btrfs/disk-io.c | 32 +- + fs/btrfs/extent-tree.c | 694 +++- + fs/btrfs/extent_io.c | 168 +- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/extent_map.c | 4 +- + fs/btrfs/free-space-cache.c | 751 ++++ + fs/btrfs/free-space-cache.h | 18 + + fs/btrfs/inode.c | 202 +- + fs/btrfs/ioctl.c | 398 ++- + fs/btrfs/ioctl.h | 13 +- + fs/btrfs/ordered-data.c | 2 - + fs/btrfs/relocation.c | 109 +- + fs/btrfs/root-tree.c | 2 - + fs/btrfs/super.c | 57 +- + fs/btrfs/transaction.c | 234 +- + fs/btrfs/transaction.h | 8 + + fs/btrfs/tree-defrag.c | 2 - + fs/btrfs/tree-log.c | 17 +- + fs/btrfs/volumes.c | 7 +- + fs/btrfs/xattr.c | 2 - + fs/btrfs/zlib.c | 5 - + fs/ceph/super.c | 50 +- + fs/cifs/Kconfig | 3 + + fs/cifs/TODO | 2 +- + fs/cifs/cifs_fs_sb.h | 6 +- + fs/cifs/cifsencrypt.c | 427 ++- + fs/cifs/cifsfs.c | 21 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 58 +- + fs/cifs/cifspdu.h | 13 +- + fs/cifs/cifsproto.h | 15 +- + fs/cifs/cifssmb.c | 4 +- + fs/cifs/connect.c | 246 +- + fs/cifs/file.c | 129 +- + fs/cifs/inode.c | 15 +- + fs/cifs/ioctl.c | 4 - + fs/cifs/misc.c | 27 +- + fs/cifs/sess.c | 166 +- + fs/cifs/transport.c | 6 +- + fs/coda/inode.c | 8 +- + fs/compat.c | 13 +- + fs/configfs/mount.c | 8 +- + fs/cramfs/inode.c | 9 +- + fs/debugfs/inode.c | 8 +- + fs/devpts/inode.c | 32 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 + + fs/ecryptfs/inode.c | 11 +- + fs/ecryptfs/keystore.c | 45 +- + fs/ecryptfs/main.c | 20 +- + fs/ecryptfs/super.c | 2 + + fs/efs/super.c | 8 +- + fs/exofs/super.c | 10 +- + fs/ext2/super.c | 8 +- + fs/ext3/super.c | 8 +- + fs/ext4/ext4.h | 4 +- + fs/ext4/inode.c | 5 +- + fs/ext4/mballoc.c | 2 - + fs/ext4/page-io.c | 97 +- + fs/ext4/super.c | 118 +- + fs/fat/namei_msdos.c | 9 +- + fs/fat/namei_vfat.c | 9 +- + fs/freevxfs/vxfs_super.c | 9 +- + fs/fs-writeback.c | 68 +- + fs/fuse/control.c | 10 +- + fs/fuse/inode.c | 17 +- + fs/gfs2/ops_fstype.c | 51 +- + fs/hfs/super.c | 9 +- + fs/hfsplus/super.c | 10 +- + fs/hostfs/hostfs_kern.c | 8 +- + fs/hpfs/buffer.c | 4 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/super.c | 11 +- + fs/hppfs/hppfs.c | 8 +- + fs/hugetlbfs/inode.c | 8 +- + fs/internal.h | 2 +- + fs/isofs/inode.c | 9 +- + fs/jbd2/journal.c | 8 +- + fs/jffs2/build.c | 2 +- + fs/jffs2/compr.c | 6 +- + fs/jffs2/compr.h | 4 +- + fs/jffs2/compr_lzo.c | 4 +- + fs/jffs2/compr_rtime.c | 6 +- + fs/jffs2/compr_rubin.c | 11 +- + fs/jffs2/compr_zlib.c | 6 +- + fs/jffs2/dir.c | 3 +- + fs/jffs2/erase.c | 2 +- + fs/jffs2/fs.c | 22 +- + fs/jffs2/gc.c | 7 +- + fs/jffs2/jffs2_fs_sb.h | 1 + + fs/jffs2/nodelist.c | 8 +- + fs/jffs2/nodelist.h | 3 +- + fs/jffs2/scan.c | 12 +- + fs/jffs2/super.c | 9 +- + fs/jfs/super.c | 9 +- + fs/libfs.c | 14 +- + fs/locks.c | 77 +- + fs/logfs/dev_bdev.c | 15 +- + fs/logfs/dev_mtd.c | 18 +- + fs/logfs/logfs.h | 22 +- + fs/logfs/super.c | 77 +- + fs/minix/inode.c | 9 +- + fs/namei.c | 2 + + fs/ncpfs/inode.c | 8 +- + fs/nfs/file.c | 1 - + fs/nfs/super.c | 96 +- + fs/nfs/unlink.c | 4 +- + fs/nfsd/nfs4state.c | 20 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nilfs2/super.c | 16 +- + fs/notify/Kconfig | 2 +- + fs/notify/fanotify/fanotify.c | 27 +- + fs/notify/fanotify/fanotify_user.c | 98 +- + fs/notify/fsnotify.c | 35 +- + fs/notify/inode_mark.c | 9 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/notify/vfsmount_mark.c | 6 +- + fs/ntfs/super.c | 9 +- + fs/ocfs2/dlmfs/dlmfs.c | 8 +- + fs/ocfs2/super.c | 11 +- + fs/omfs/inode.c | 9 +- + fs/open.c | 6 +- + fs/openpromfs/inode.c | 8 +- + fs/pipe.c | 9 +- + fs/proc/root.c | 16 +- + fs/qnx4/inode.c | 9 +- + fs/ramfs/inode.c | 17 +- + fs/read_write.c | 62 +- + fs/reiserfs/super.c | 9 +- + fs/romfs/super.c | 17 +- + fs/squashfs/super.c | 10 +- + fs/squashfs/xattr.c | 9 +- + fs/squashfs/xattr.h | 4 +- + fs/squashfs/xattr_id.c | 1 + + fs/super.c | 111 +- + fs/sysfs/mount.c | 32 +- + fs/sysv/super.c | 17 +- + fs/ubifs/super.c | 13 +- + fs/udf/super.c | 9 +- + fs/ufs/super.c | 8 +- + fs/xfs/linux-2.6/xfs_super.c | 12 +- + include/asm-generic/audit_change_attr.h | 4 + + include/asm-generic/stat.h | 14 +- + include/linux/Kbuild | 1 + + include/linux/audit.h | 9 + + include/linux/dccp.h | 4 +- + include/linux/fanotify.h | 36 +- + include/linux/fs.h | 24 +- + include/linux/fsnotify.h | 38 +- + include/linux/fsnotify_backend.h | 26 +- + include/linux/hardirq.h | 8 +- + include/linux/i2c.h | 2 - + include/linux/irq.h | 5 + + include/linux/irqnr.h | 2 +- + include/linux/jump_label.h | 7 +- + include/linux/kgdb.h | 13 +- + include/linux/marvell_phy.h | 2 +- + include/linux/mmc/sh_mmcif.h | 18 +- + include/linux/mtd/bbm.h | 4 +- + include/linux/mtd/cfi.h | 1 + + include/linux/mtd/fsmc.h | 181 + + include/linux/mtd/inftl.h | 14 +- + include/linux/mtd/mtd.h | 15 + + include/linux/mtd/nand.h | 426 ++- + include/linux/mtd/partitions.h | 7 +- + include/linux/mtd/super.h | 5 +- + include/linux/pci_ids.h | 1 + + include/linux/ramfs.h | 4 +- + include/linux/sched.h | 5 +- + include/linux/semaphore.h | 6 - + include/linux/sh_clk.h | 4 + + include/linux/sh_timer.h | 1 - + include/linux/socket.h | 2 +- + include/linux/spi/spi.h | 3 + + include/linux/tty.h | 9 +- + include/linux/writeback.h | 2 + + include/mtd/mtd-abi.h | 16 +- + include/mtd/mtd-user.h | 2 +- + include/net/caif/caif_dev.h | 4 +- + include/net/caif/caif_spi.h | 2 + + include/net/caif/cfcnfg.h | 8 +- + include/net/ip_fib.h | 2 + + include/net/netlink.h | 2 +- + include/scsi/libfc.h | 2 +- + include/scsi/osd_initiator.h | 16 +- + include/scsi/osd_protocol.h | 42 + + include/scsi/osd_types.h | 5 + + include/trace/events/ext4.h | 97 + + include/video/sh_mobile_lcdc.h | 5 +- + include/xen/events.h | 26 + + include/xen/interface/features.h | 3 + + include/xen/interface/io/pciif.h | 112 + + include/xen/interface/io/xenbus.h | 8 +- + include/xen/interface/physdev.h | 67 + + ipc/mqueue.c | 8 +- + ipc/shm.c | 1 + + kernel/audit.c | 67 +- + kernel/audit.h | 5 +- + kernel/audit_tree.c | 9 +- + kernel/audit_watch.c | 4 +- + kernel/auditfilter.c | 12 + + kernel/auditsc.c | 16 + + kernel/cgroup.c | 11 +- + kernel/cpuset.c | 13 +- + kernel/debug/debug_core.c | 16 +- + kernel/debug/kdb/kdb_main.c | 48 +- + kernel/exit.c | 8 + + kernel/irq/manage.c | 4 + + kernel/jump_label.c | 77 +- + kernel/kprobes.c | 26 +- + kernel/relay.c | 15 +- + kernel/sched.c | 8 +- + kernel/sched_fair.c | 25 +- + kernel/sched_stats.h | 20 +- + kernel/watchdog.c | 2 +- + mm/filemap.c | 4 +- + mm/mmap.c | 2 + + mm/nommu.c | 2 + + mm/shmem.c | 10 +- + mm/vmstat.c | 2 +- + net/caif/caif_config_util.c | 13 +- + net/caif/caif_dev.c | 2 + + net/caif/caif_socket.c | 45 +- + net/caif/cfcnfg.c | 17 +- + net/caif/cfctrl.c | 3 +- + net/caif/cfdbgl.c | 14 + + net/caif/cfrfml.c | 2 +- + net/compat.c | 10 +- + net/core/dev.c | 2 +- + net/core/iovec.c | 20 +- + net/core/pktgen.c | 7 +- + net/dccp/ccid.h | 34 +- + net/dccp/ccids/ccid2.c | 23 +- + net/dccp/ccids/ccid2.h | 5 + + net/dccp/ccids/ccid3.c | 12 +- + net/dccp/dccp.h | 5 +- + net/dccp/output.c | 209 +- + net/dccp/proto.c | 21 +- + net/dccp/timer.c | 27 +- + net/ipv4/fib_frontend.c | 2 +- + net/ipv4/fib_hash.c | 18 + + net/ipv4/fib_lookup.h | 5 +- + net/ipv4/fib_trie.c | 5 + + net/ipv4/inet_diag.c | 27 +- + net/ipv4/ip_gre.c | 6 +- + net/ipv4/netfilter/arp_tables.c | 1 + + net/ipv4/netfilter/ip_tables.c | 1 + + net/ipv4/netfilter/nf_nat_core.c | 40 +- + net/ipv6/netfilter/ip6_tables.c | 1 + + net/ipv6/proc.c | 4 + + net/ipv6/route.c | 2 + + net/l2tp/l2tp_debugfs.c | 2 +- + net/mac80211/debugfs_key.c | 6 +- + net/mac80211/main.c | 5 +- + net/netfilter/nf_conntrack_core.c | 3 +- + net/netfilter/nf_conntrack_proto.c | 6 + + net/netfilter/xt_socket.c | 7 +- + net/rds/loop.c | 4 + + net/rds/message.c | 5 + + net/rds/rdma.c | 126 +- + net/rds/send.c | 4 + + net/rds/tcp.c | 6 + + net/sched/cls_cgroup.c | 2 - + net/sched/em_text.c | 3 +- + net/socket.c | 14 +- + net/sunrpc/rpc_pipe.c | 18 +- + net/x25/x25_facilities.c | 8 +- + net/x25/x25_in.c | 2 + + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/kdb/Makefile | 1 + + samples/kdb/kdb_hello.c | 60 + + scripts/checkpatch.pl | 8 +- + scripts/kconfig/streamline_config.pl | 43 +- + scripts/kconfig/symbol.c | 2 +- + scripts/recordmcount.c | 44 + + scripts/recordmcount.h | 86 +- + security/inode.c | 8 +- + security/selinux/selinuxfs.c | 9 +- + security/smack/smackfs.c | 12 +- + sound/pci/asihpi/hpi6000.c | 2 + + sound/pci/asihpi/hpi6205.c | 2 + + sound/pci/asihpi/hpicmn.c | 12 +- + sound/pci/cs46xx/dsp_spos.c | 33 +- + sound/pci/hda/patch_cirrus.c | 1 + + sound/pci/lx6464es/lx6464es.c | 4 +- + sound/pci/lx6464es/lx6464es.h | 2 +- + sound/pci/lx6464es/lx_core.c | 2 +- + sound/soc/codecs/Kconfig | 3 +- + sound/soc/codecs/tlv320dac33.c | 36 +- + sound/soc/codecs/tpa6130a2.c | 6 +- + sound/soc/codecs/wm8900.c | 6 - + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/pxa/tosa.c | 2 +- + sound/soc/soc-core.c | 5 +- + sound/usb/mixer_quirks.c | 15 +- + sound/usb/pcm.c | 4 +- + usr/initramfs_data.S | 6 +- + 1195 files changed, 37822 insertions(+), 54957 deletions(-) + create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.c + create mode 100644 arch/arm/mach-mx5/cpu_op-mx51.h + create mode 100644 arch/arm/mach-s3c2416/pm.c + create mode 100644 arch/arm/mach-s3c64xx/mach-mini6410.c + delete mode 100644 arch/arm/mach-s5pc100/irq-gpio.c + create mode 100644 arch/arm/mach-s5pv210/cpufreq.c + create mode 100644 arch/arm/mach-s5pv210/include/mach/pm-core.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-sys.h + create mode 100644 arch/arm/mach-s5pv210/mach-torbreck.c + create mode 100644 arch/arm/mach-s5pv210/pm.c + create mode 100644 arch/arm/mach-s5pv210/sleep.S + create mode 100644 arch/arm/mach-s5pv310/gpiolib.c + create mode 100644 arch/arm/mach-s5pv310/hotplug.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-gpio.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h + create mode 100644 arch/arm/mach-s5pv310/irq-eint.c + create mode 100644 arch/arm/mach-s5pv310/mach-smdkc210.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c3.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c4.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c5.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c6.c + create mode 100644 arch/arm/mach-s5pv310/setup-i2c7.c + create mode 100644 arch/arm/mach-s5pv310/setup-sdhci-gpio.c + create mode 100644 arch/arm/mach-s5pv310/setup-sdhci.c + create mode 100644 arch/arm/plat-mxc/cpufreq.c + create mode 100644 arch/arm/plat-mxc/devices/platform-gpio_keys.c + create mode 100644 arch/arm/plat-s5p/irq-gpioint.c + create mode 100644 arch/arm/plat-s5p/irq-pm.c + create mode 100644 arch/arm/plat-s5p/pm.c + create mode 100644 arch/arm/plat-samsung/dev-i2c3.c + create mode 100644 arch/arm/plat-samsung/dev-i2c4.c + create mode 100644 arch/arm/plat-samsung/dev-i2c5.c + create mode 100644 arch/arm/plat-samsung/dev-i2c6.c + create mode 100644 arch/arm/plat-samsung/dev-i2c7.c + create mode 100644 arch/arm/plat-samsung/include/plat/nand-core.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-uctlx-defs.h + create mode 100644 arch/mips/include/asm/perf_event.h + create mode 100644 arch/mips/kernel/perf_event.c + create mode 100644 arch/mips/kernel/perf_event_mipsxx.c + create mode 100644 arch/sh/boards/board-edosk7705.c + rename arch/sh/boards/{mach-snapgear/setup.c => board-secureedge5410.c} (70%) + delete mode 100644 arch/sh/boards/mach-edosk7705/Makefile + delete mode 100644 arch/sh/boards/mach-edosk7705/io.c + delete mode 100644 arch/sh/boards/mach-edosk7705/setup.c + delete mode 100644 arch/sh/boards/mach-se/7206/io.c + delete mode 100644 arch/sh/boards/mach-se/770x/io.c + delete mode 100644 arch/sh/boards/mach-se/7751/io.c + delete mode 100644 arch/sh/boards/mach-snapgear/Makefile + delete mode 100644 arch/sh/boards/mach-snapgear/io.c + delete mode 100644 arch/sh/boards/mach-systemh/Makefile + delete mode 100644 arch/sh/boards/mach-systemh/io.c + delete mode 100644 arch/sh/boards/mach-systemh/irq.c + delete mode 100644 arch/sh/boards/mach-systemh/setup.c + rename arch/sh/configs/{snapgear_defconfig => secureedge5410_defconfig} (100%) + delete mode 100644 arch/sh/configs/systemh_defconfig + delete mode 100644 arch/sh/include/mach-common/mach/edosk7705.h + rename arch/sh/include/mach-common/mach/{snapgear.h => secureedge5410.h} (79%) + delete mode 100644 arch/sh/include/mach-common/mach/systemh7751.h + create mode 100644 arch/x86/include/asm/xen/pci.h + create mode 100644 arch/x86/pci/xen.c + create mode 100644 drivers/i2c/busses/i2c-intel-mid.c + create mode 100644 drivers/mtd/maps/bcm963xx-flash.c + create mode 100644 drivers/mtd/nand/fsmc_nand.c + create mode 100644 drivers/pci/xen-pcifront.c + delete mode 100644 drivers/staging/ath6kl/os/linux/include/athendpack_linux.h + delete mode 100644 drivers/staging/ath6kl/os/linux/include/athstartpack_linux.h + delete mode 100644 drivers/staging/dream/Kconfig + delete mode 100644 drivers/staging/dream/Makefile + delete mode 100644 drivers/staging/dream/TODO + delete mode 100644 drivers/staging/dream/camera/Kconfig + delete mode 100644 drivers/staging/dream/camera/Makefile + delete mode 100644 drivers/staging/dream/camera/msm_camera.c + delete mode 100644 drivers/staging/dream/camera/msm_io7x.c + delete mode 100644 drivers/staging/dream/camera/msm_io8x.c + delete mode 100644 drivers/staging/dream/camera/msm_v4l2.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.h + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.h + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h + delete mode 100644 drivers/staging/dream/camera/mt9d112.c + delete mode 100644 drivers/staging/dream/camera/mt9d112.h + delete mode 100644 drivers/staging/dream/camera/mt9d112_reg.c + delete mode 100644 drivers/staging/dream/camera/mt9p012.h + delete mode 100644 drivers/staging/dream/camera/mt9p012_fox.c + delete mode 100644 drivers/staging/dream/camera/mt9p012_reg.c + delete mode 100644 drivers/staging/dream/camera/mt9t013.c + delete mode 100644 drivers/staging/dream/camera/mt9t013.h + delete mode 100644 drivers/staging/dream/camera/mt9t013_reg.c + delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.c + delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.h + delete mode 100644 drivers/staging/dream/generic_gpio.c + delete mode 100644 drivers/staging/dream/gpio_axis.c + delete mode 100644 drivers/staging/dream/gpio_event.c + delete mode 100644 drivers/staging/dream/gpio_input.c + delete mode 100644 drivers/staging/dream/gpio_matrix.c + delete mode 100644 drivers/staging/dream/gpio_output.c + delete mode 100644 drivers/staging/dream/include/linux/android_pmem.h + delete mode 100644 drivers/staging/dream/include/linux/gpio_event.h + delete mode 100644 drivers/staging/dream/include/linux/msm_adsp.h + delete mode 100644 drivers/staging/dream/include/linux/msm_audio.h + delete mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h + delete mode 100644 drivers/staging/dream/include/linux/wakelock.h + delete mode 100644 drivers/staging/dream/include/mach/camera.h + delete mode 100644 drivers/staging/dream/include/mach/msm_adsp.h + delete mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h + delete mode 100644 drivers/staging/dream/include/mach/msm_smd.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h + delete mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h + delete mode 100644 drivers/staging/dream/include/media/msm_camera.h + delete mode 100644 drivers/staging/dream/pmem.c + delete mode 100644 drivers/staging/dream/qdsp5/Makefile + delete mode 100644 drivers/staging/dream/qdsp5/adsp.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp.h + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_info.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_aac.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_in.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_out.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c + delete mode 100644 drivers/staging/dream/qdsp5/audmgr.c + delete mode 100644 drivers/staging/dream/qdsp5/audmgr.h + delete mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h + delete mode 100644 drivers/staging/dream/qdsp5/audpp.c + delete mode 100644 drivers/staging/dream/qdsp5/evlog.h + delete mode 100644 drivers/staging/dream/qdsp5/snd.c + delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c + delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h + create mode 100644 drivers/tty/Makefile + rename drivers/{char => tty}/n_gsm.c (100%) + rename drivers/{char => tty}/n_hdlc.c (100%) + rename drivers/{char => tty}/n_r3964.c (100%) + rename drivers/{char => tty}/n_tty.c (100%) + rename drivers/{char => tty}/pty.c (100%) + rename drivers/{char => tty}/sysrq.c (100%) + rename drivers/{char => tty}/tty_audit.c (90%) + rename drivers/{char => tty}/tty_buffer.c (100%) + rename drivers/{char => tty}/tty_io.c (100%) + rename drivers/{char => tty}/tty_ioctl.c (100%) + rename drivers/{char => tty}/tty_ldisc.c (100%) + rename drivers/{char => tty}/tty_mutex.c (100%) + rename drivers/{char => tty}/tty_port.c (100%) + rename drivers/{char => tty/vt}/.gitignore (100%) + create mode 100644 drivers/tty/vt/Makefile + rename drivers/{char => tty/vt}/consolemap.c (100%) + rename drivers/{char => tty/vt}/cp437.uni (100%) + rename drivers/{char => tty/vt}/defkeymap.c_shipped (100%) + rename drivers/{char => tty/vt}/defkeymap.map (100%) + rename drivers/{char => tty/vt}/keyboard.c (100%) + rename drivers/{char => tty/vt}/selection.c (100%) + rename drivers/{char => tty/vt}/vc_screen.c (100%) + rename drivers/{char => tty/vt}/vt.c (100%) + rename drivers/{char => tty/vt}/vt_ioctl.c (100%) + create mode 100644 drivers/usb/host/ehci-octeon.c + create mode 100644 drivers/usb/host/octeon2-common.c + create mode 100644 drivers/usb/host/ohci-octeon.c + create mode 100644 drivers/video/sh_mobile_lcdcfb.h + create mode 100644 drivers/xen/biomerge.c + create mode 100644 drivers/xen/pci.c + create mode 100644 include/linux/mtd/fsmc.h + create mode 100644 include/xen/interface/io/pciif.h + create mode 100644 samples/kdb/Makefile + create mode 100644 samples/kdb/kdb_hello.c +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Merge made by recursive. + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/hardware/it8152.h | 2 +- + arch/arm/kernel/perf_event.c | 2 +- + arch/arm/kernel/stacktrace.c | 2 +- + arch/arm/kernel/unwind.c | 2 +- + arch/arm/mach-ep93xx/include/mach/dma.h | 111 +++++++++++++++++++++++++-- + arch/arm/mach-kirkwood/common.c | 7 +- + arch/arm/mach-kirkwood/d2net_v2-setup.c | 2 +- + arch/arm/mach-kirkwood/lacie_v2-common.c | 14 ---- + arch/arm/mach-kirkwood/lacie_v2-common.h | 2 - + arch/arm/mach-kirkwood/mpp.c | 4 +- + arch/arm/mach-kirkwood/netspace_v2-setup.c | 6 +- + arch/arm/mach-kirkwood/netxbig_v2-setup.c | 4 +- + arch/arm/mach-kirkwood/ts41x-setup.c | 14 +++- + arch/arm/mach-mmp/include/mach/cputype.h | 3 +- + arch/arm/mach-mv78xx0/mpp.c | 4 +- + arch/arm/mach-orion5x/mpp.c | 4 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/cm-x2xx.c | 2 - + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/plat-orion/include/plat/pcie.h | 3 + + arch/arm/plat-orion/pcie.c | 5 - + 23 files changed, 140 insertions(+), 61 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Merge made by recursive. + drivers/atm/solos-attrlist.c | 1 + + drivers/atm/solos-pci.c | 8 +++++ + drivers/net/skge.c | 1 - + drivers/s390/net/qeth_core.h | 9 ------ + drivers/s390/net/qeth_core_main.c | 55 ++++++------------------------------- + include/linux/netdevice.h | 5 +++ + include/net/dst_ops.h | 1 + + net/core/pktgen.c | 6 ++-- + net/ipv6/reassembly.c | 2 +- + net/rds/message.c | 4 ++- + net/sched/cls_basic.c | 4 +++ + 11 files changed, 35 insertions(+), 61 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Merge made by recursive. + drivers/pci/pci.c | 12 ++++++++++++ + 1 files changed, 12 insertions(+), 0 deletions(-) +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/ath9k/ar9002_hw.c | 3 ++ + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/hif_usb.c | 31 +++++++++++++-------------- + drivers/net/wireless/ath/ath9k/hw.c | 15 +++++++++++- + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/init.c | 8 +++++++ + drivers/net/wireless/ath/ath9k/main.c | 29 +++++++++++++++++++------- + drivers/net/wireless/ath/ath9k/recv.c | 4 +- + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ath/carl9170/usb.c | 4 ++- + drivers/net/wireless/libertas/cfg.c | 5 ++- + drivers/net/wireless/libertas/dev.h | 1 + + drivers/net/wireless/libertas/main.c | 7 ++++++ + net/mac80211/iface.c | 6 ++-- + net/wireless/nl80211.c | 4 +- + 15 files changed, 84 insertions(+), 36 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +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 +Merge made by recursive. + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/padlock-aes.c | 2 +- + 2 files changed, 2 insertions(+), 2 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 +Merge made by recursive. + Documentation/arm/00-INDEX | 2 + + Documentation/arm/swp_emulation | 27 ++ + arch/arm/common/Makefile | 1 + + arch/arm/{plat-versatile => common}/timer-sp.c | 4 +- + arch/arm/include/asm/assembler.h | 13 +- + arch/arm/include/asm/domain.h | 31 +++- + arch/arm/include/asm/futex.h | 9 +- + .../plat => include/asm/hardware}/timer-sp.h | 0 + arch/arm/include/asm/traps.h | 2 + + arch/arm/include/asm/uaccess.h | 16 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/entry-armv.S | 4 +- + arch/arm/kernel/fiq.c | 5 + + arch/arm/kernel/swp_emulate.c | 267 ++++++++++++++++++++ + arch/arm/kernel/traps.c | 14 +- + arch/arm/lib/getuser.S | 13 +- + arch/arm/lib/putuser.S | 29 ++- + arch/arm/lib/uaccess.S | 83 +++--- + arch/arm/mach-integrator/integrator_cp.c | 2 +- + arch/arm/mach-realview/core.c | 2 +- + arch/arm/mach-versatile/core.c | 2 +- + arch/arm/mach-vexpress/ct-ca9x4.c | 2 +- + arch/arm/mach-vexpress/v2m.c | 2 +- + arch/arm/mm/Kconfig | 35 +++ + arch/arm/mm/mmu.c | 6 +- + arch/arm/mm/proc-macros.S | 7 + + arch/arm/mm/proc-v7.S | 9 +- + arch/arm/plat-versatile/Makefile | 1 - + 28 files changed, 488 insertions(+), 101 deletions(-) + create mode 100644 Documentation/arm/swp_emulation + rename arch/arm/{plat-versatile => common}/timer-sp.c (98%) + rename arch/arm/{plat-versatile/include/plat => include/asm/hardware}/timer-sp.h (100%) + create mode 100644 arch/arm/kernel/swp_emulate.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Merge made by recursive. + arch/arm/mach-imx/devices.c | 8 +- + arch/arm/mach-imx/mm-imx1.c | 7 +- + arch/arm/mach-imx/mm-imx21.c | 21 +-- + arch/arm/mach-imx/mm-imx27.c | 21 +-- + arch/arm/mach-mx25/devices.c | 8 +- + arch/arm/mach-mx25/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx25/mach-cpuimx25.c | 2 +- + arch/arm/mach-mx25/mach-mx25_3ds.c | 2 +- + arch/arm/mach-mx25/mm.c | 27 +-- + arch/arm/mach-mx3/Makefile | 3 - + arch/arm/mach-mx3/devices.c | 72 ++++---- + arch/arm/mach-mx3/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx3/mach-cpuimx35.c | 2 +- + arch/arm/mach-mx3/mach-kzm_arm11_01.c | 6 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 2 +- + arch/arm/mach-mx3/mach-mx35_3ds.c | 2 +- + arch/arm/mach-mx3/mach-pcm037_eet.c | 5 +- + arch/arm/mach-mx3/mach-pcm043.c | 16 +- + arch/arm/mach-mx3/mm.c | 63 +++---- + arch/arm/mach-mx5/Kconfig | 3 + + arch/arm/mach-mx5/board-cpuimx51.c | 2 +- + arch/arm/mach-mx5/board-cpuimx51sd.c | 2 +- + arch/arm/mach-mx5/board-mx51_3ds.c | 3 +- + arch/arm/mach-mx5/board-mx51_babbage.c | 10 +- + arch/arm/mach-mx5/board-mx51_efikamx.c | 245 ++++++++++++++++++++++++- + arch/arm/mach-mx5/eukrea_mbimx51-baseboard.c | 2 +- + arch/arm/mach-mx5/eukrea_mbimxsd-baseboard.c | 2 +- + arch/arm/mach-mx5/mm.c | 35 +--- + arch/arm/mach-mxc91231/mm.c | 53 +----- + arch/arm/plat-mxc/devices/platform-imx-dma.c | 8 - + arch/arm/plat-mxc/include/mach/common.h | 2 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 24 +-- + arch/arm/plat-mxc/include/mach/hardware.h | 87 +++++++++- + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 28 ++- + arch/arm/plat-mxc/include/mach/iomux-v3.h | 38 ++++- + arch/arm/plat-mxc/include/mach/mx1.h | 133 +------------- + arch/arm/plat-mxc/include/mach/mx21.h | 44 +----- + arch/arm/plat-mxc/include/mach/mx25.h | 23 +-- + arch/arm/plat-mxc/include/mach/mx27.h | 79 +-------- + arch/arm/plat-mxc/include/mach/mx2x.h | 149 --------------- + arch/arm/plat-mxc/include/mach/mx31.h | 49 +----- + arch/arm/plat-mxc/include/mach/mx35.h | 34 +--- + arch/arm/plat-mxc/include/mach/mx3x.h | 182 +------------------ + arch/arm/plat-mxc/include/mach/mx51.h | 42 +---- + arch/arm/plat-mxc/include/mach/mxc91231.h | 23 +-- + arch/arm/plat-mxc/iomux-v3.c | 22 +- + arch/arm/plat-mxc/system.c | 8 + + drivers/usb/host/ehci-mxc.c | 14 +- + drivers/video/mx3fb.c | 4 + + 49 files changed, 584 insertions(+), 1037 deletions(-) +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date! +Merge made by recursive. +Merging omap/for-next +$ git merge omap/for-next +Merge made by recursive. + arch/arm/mach-omap1/include/mach/camera.h | 2 + + arch/arm/mach-omap2/board-devkit8000.c | 3 -- + arch/arm/mach-omap2/board-igep0020.c | 35 +++++++++------------------- + arch/arm/plat-omap/dma.c | 2 + + 4 files changed, 15 insertions(+), 27 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Merge made by recursive. +Merging s5p/for-next +$ git merge s5p/for-next +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 +Removing arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h +Removing arch/blackfin/mach-bf518/include/mach/defBF51x_base.h +Removing arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h +Removing arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +Removing arch/blackfin/mach-bf533/include/mach/fio_flag.h +Merge made by recursive. + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ + arch/blackfin/include/asm/bfin_dma.h | 91 + + arch/blackfin/include/asm/bfin_serial.h | 263 +++ + arch/blackfin/include/asm/dma.h | 37 +- + arch/blackfin/include/asm/io.h | 268 +--- + arch/blackfin/include/mach-common/ports-a.h | 25 + + arch/blackfin/include/mach-common/ports-b.h | 25 + + arch/blackfin/include/mach-common/ports-c.h | 25 + + arch/blackfin/include/mach-common/ports-d.h | 25 + + arch/blackfin/include/mach-common/ports-e.h | 25 + + arch/blackfin/include/mach-common/ports-f.h | 25 + + arch/blackfin/include/mach-common/ports-g.h | 25 + + arch/blackfin/include/mach-common/ports-h.h | 25 + + arch/blackfin/include/mach-common/ports-i.h | 25 + + arch/blackfin/include/mach-common/ports-j.h | 25 + + arch/blackfin/mach-bf518/dma.c | 2 +- + .../blackfin/mach-bf518/include/mach/bfin_serial.h | 14 + + .../mach-bf518/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf518/include/mach/blackfin.h | 68 +- + arch/blackfin/mach-bf518/include/mach/cdefBF512.h | 1038 ++++++++++- + arch/blackfin/mach-bf518/include/mach/cdefBF514.h | 5 +- + arch/blackfin/mach-bf518/include/mach/cdefBF516.h | 5 +- + arch/blackfin/mach-bf518/include/mach/cdefBF518.h | 5 +- + .../mach-bf518/include/mach/cdefBF51x_base.h | 1061 ---------- + arch/blackfin/mach-bf518/include/mach/defBF512.h | 1388 +++++++++++++- + .../mach-bf518/include/mach/defBF51x_base.h | 1495 -------------- + arch/blackfin/mach-bf518/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf527/dma.c | 2 +- + .../blackfin/mach-bf527/include/mach/bfin_serial.h | 14 + + .../mach-bf527/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf527/include/mach/blackfin.h | 48 +- + arch/blackfin/mach-bf527/include/mach/cdefBF522.h | 1092 ++++++++++- + arch/blackfin/mach-bf527/include/mach/cdefBF525.h | 7 +- + arch/blackfin/mach-bf527/include/mach/cdefBF527.h | 7 +- + .../mach-bf527/include/mach/cdefBF52x_base.h | 1113 ----------- + arch/blackfin/mach-bf527/include/mach/defBF522.h | 1393 +++++++++++++- + arch/blackfin/mach-bf527/include/mach/defBF525.h | 2 +- + arch/blackfin/mach-bf527/include/mach/defBF527.h | 2 +- + .../mach-bf527/include/mach/defBF52x_base.h | 1506 -------------- + arch/blackfin/mach-bf527/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf533/boards/blackstamp.c | 15 +- + arch/blackfin/mach-bf533/boards/ip0x.c | 9 - + arch/blackfin/mach-bf533/boards/stamp.c | 20 +- + arch/blackfin/mach-bf533/dma.c | 2 +- + .../blackfin/mach-bf533/include/mach/bfin_serial.h | 14 + + .../mach-bf533/include/mach/bfin_serial_5xx.h | 74 +- + arch/blackfin/mach-bf533/include/mach/blackfin.h | 30 +- + arch/blackfin/mach-bf533/include/mach/cdefBF532.h | 63 +- + arch/blackfin/mach-bf533/include/mach/defBF532.h | 128 +-- + arch/blackfin/mach-bf533/include/mach/fio_flag.h | 55 - + arch/blackfin/mach-bf533/include/mach/gpio.h | 2 + + arch/blackfin/mach-bf537/dma.c | 2 +- + .../blackfin/mach-bf537/include/mach/bfin_serial.h | 14 + + .../mach-bf537/include/mach/bfin_serial_5xx.h | 72 +- + arch/blackfin/mach-bf537/include/mach/blackfin.h | 38 +- + arch/blackfin/mach-bf537/include/mach/cdefBF534.h | 27 +- + arch/blackfin/mach-bf537/include/mach/cdefBF537.h | 5 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 111 +- + arch/blackfin/mach-bf537/include/mach/defBF537.h | 5 +- + arch/blackfin/mach-bf537/include/mach/gpio.h | 4 + + arch/blackfin/mach-bf538/dma.c | 18 +- + .../blackfin/mach-bf538/include/mach/bfin_serial.h | 14 + + .../mach-bf538/include/mach/bfin_serial_5xx.h | 73 +- + arch/blackfin/mach-bf538/include/mach/blackfin.h | 37 +- + arch/blackfin/mach-bf538/include/mach/cdefBF538.h | 504 ++--- + arch/blackfin/mach-bf538/include/mach/cdefBF539.h | 8 +- + arch/blackfin/mach-bf538/include/mach/defBF538.h | 1825 +++++++++++++++++ + arch/blackfin/mach-bf538/include/mach/defBF539.h | 2095 +------------------- + arch/blackfin/mach-bf538/include/mach/gpio.h | 5 + + arch/blackfin/mach-bf548/dma.c | 2 +- + .../blackfin/mach-bf548/include/mach/bfin_serial.h | 16 + + .../mach-bf548/include/mach/bfin_serial_5xx.h | 60 +- + arch/blackfin/mach-bf548/include/mach/blackfin.h | 70 +- + arch/blackfin/mach-bf548/include/mach/cdefBF542.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF544.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF547.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF548.h | 10 +- + arch/blackfin/mach-bf548/include/mach/cdefBF549.h | 10 +- + .../mach-bf548/include/mach/cdefBF54x_base.h | 23 +- + arch/blackfin/mach-bf548/include/mach/defBF542.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF544.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF547.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF548.h | 7 +- + arch/blackfin/mach-bf548/include/mach/defBF549.h | 7 +- + .../mach-bf548/include/mach/defBF54x_base.h | 321 +--- + arch/blackfin/mach-bf548/include/mach/gpio.h | 11 + + arch/blackfin/mach-bf561/dma.c | 18 +- + .../blackfin/mach-bf561/include/mach/bfin_serial.h | 14 + + .../mach-bf561/include/mach/bfin_serial_5xx.h | 74 +- + arch/blackfin/mach-bf561/include/mach/blackfin.h | 26 +- + arch/blackfin/mach-bf561/include/mach/cdefBF561.h | 503 ++--- + arch/blackfin/mach-bf561/include/mach/defBF561.h | 408 ++--- + arch/blackfin/mach-bf561/include/mach/gpio.h | 2 + + arch/blackfin/mach-bf561/smp.c | 4 +- + drivers/net/irda/bfin_sir.h | 2 + + include/asm-generic/io.h | 30 + + 96 files changed, 8439 insertions(+), 9942 deletions(-) + create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig + create mode 100644 arch/blackfin/include/asm/bfin_dma.h + create mode 100644 arch/blackfin/include/asm/bfin_serial.h + create mode 100644 arch/blackfin/include/mach-common/ports-a.h + create mode 100644 arch/blackfin/include/mach-common/ports-b.h + create mode 100644 arch/blackfin/include/mach-common/ports-c.h + create mode 100644 arch/blackfin/include/mach-common/ports-d.h + create mode 100644 arch/blackfin/include/mach-common/ports-e.h + create mode 100644 arch/blackfin/include/mach-common/ports-f.h + create mode 100644 arch/blackfin/include/mach-common/ports-g.h + create mode 100644 arch/blackfin/include/mach-common/ports-h.h + create mode 100644 arch/blackfin/include/mach-common/ports-i.h + create mode 100644 arch/blackfin/include/mach-common/ports-j.h + create mode 100644 arch/blackfin/mach-bf518/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/cdefBF51x_base.h + delete mode 100644 arch/blackfin/mach-bf518/include/mach/defBF51x_base.h + create mode 100644 arch/blackfin/mach-bf527/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/cdefBF52x_base.h + delete mode 100644 arch/blackfin/mach-bf527/include/mach/defBF52x_base.h + create mode 100644 arch/blackfin/mach-bf533/include/mach/bfin_serial.h + delete mode 100644 arch/blackfin/mach-bf533/include/mach/fio_flag.h + create mode 100644 arch/blackfin/mach-bf537/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf538/include/mach/defBF538.h + create mode 100644 arch/blackfin/mach-bf548/include/mach/bfin_serial.h + create mode 100644 arch/blackfin/mach-bf561/include/mach/bfin_serial.h +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68knommu/mm/fault.c +Removing arch/m68knommu/mm/memory.c +Merge made by recursive. + arch/m68k/include/asm/cacheflush_no.h | 34 ++----- + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/entry_no.h | 59 ++++++----- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/io_no.h | 1 - + arch/m68k/include/asm/m5206sim.h | 12 ++- + arch/m68k/include/asm/m520xsim.h | 12 ++- + arch/m68k/include/asm/m523xsim.h | 9 ++ + arch/m68k/include/asm/m5249sim.h | 8 ++ + arch/m68k/include/asm/m5272sim.h | 6 + + arch/m68k/include/asm/m527xsim.h | 9 ++ + arch/m68k/include/asm/m528xsim.h | 9 ++ + arch/m68k/include/asm/m5307sim.h | 14 +++ + arch/m68k/include/asm/m532xsim.h | 10 ++ + arch/m68k/include/asm/m5407sim.h | 40 +------ + arch/m68k/include/asm/m54xxacr.h | 123 ++++++++++++++++++++++ + arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- + arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 21 +++- + arch/m68k/include/asm/mcfcache.h | 30 +++--- + arch/m68k/include/asm/mcfsim.h | 4 +- + arch/m68k/include/asm/mcfuart.h | 45 +-------- + arch/m68k/include/asm/processor.h | 13 ++- + arch/m68knommu/Kconfig | 23 ++++- + arch/m68knommu/Makefile | 6 +- + arch/m68knommu/kernel/setup.c | 72 +++---------- + arch/m68knommu/mm/Makefile | 2 +- + arch/m68knommu/mm/fault.c | 57 ---------- + arch/m68knommu/mm/kmap.c | 9 -- + arch/m68knommu/mm/memory.c | 33 ------ + arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 + arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- + arch/m68knommu/platform/coldfire/Makefile | 2 +- + arch/m68knommu/platform/coldfire/entry.S | 56 ++-------- + 33 files changed, 380 insertions(+), 385 deletions(-) + create mode 100644 arch/m68k/include/asm/m54xxacr.h + rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) + rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (74%) + delete mode 100644 arch/m68knommu/mm/fault.c + delete mode 100644 arch/m68knommu/mm/memory.c + rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) + rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Auto-merging arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/sysdev/mpc8xxx_gpio.c +Merge made by recursive. + arch/powerpc/platforms/Kconfig | 7 ++- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++++++++++++++++++++++---- + 2 files changed, 71 insertions(+), 11 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/mm/gup.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merging arch/sh/Kconfig +Removing arch/sh/kernel/io_generic.c +Merge made by recursive. + arch/sh/Kconfig | 20 +- + arch/sh/boards/board-secureedge5410.c | 2 - + arch/sh/boards/mach-se/7206/setup.c | 6 + + arch/sh/boards/mach-se/board-se7619.c | 6 + + arch/sh/drivers/pci/pci.c | 3 +- + arch/sh/include/asm/io.h | 345 +++++++++++++++++--------------- + arch/sh/include/asm/io_generic.h | 25 --- + arch/sh/include/asm/machvec.h | 21 -- + arch/sh/kernel/Makefile | 6 +- + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/proc.c | 148 ++++++++++++++ + arch/sh/kernel/cpu/sh2/clock-sh7619.c | 22 +- + arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 20 +- + arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 21 +- + arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 20 +- + arch/sh/kernel/io_generic.c | 180 ----------------- + arch/sh/kernel/iomap.c | 165 +++++++++++++++ + arch/sh/kernel/ioport.c | 43 ++++ + arch/sh/kernel/machvec.c | 22 -- + arch/sh/kernel/setup.c | 144 ------------- + 20 files changed, 605 insertions(+), 616 deletions(-) + create mode 100644 arch/sh/kernel/cpu/proc.c + delete mode 100644 arch/sh/kernel/io_generic.c + create mode 100644 arch/sh/kernel/iomap.c + create mode 100644 arch/sh/kernel/ioport.c +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +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 70249f6] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/ioctl.c | 12 ++++++++++-- + 1 files changed, 10 insertions(+), 2 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/main.c +Merge made by recursive. +Merging ext3/for_next +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/export.c | 46 ++--------------- + fs/gfs2/glock.c | 28 +++++----- + fs/gfs2/inode.c | 152 ++++++++++++----------------------------------------- + fs/gfs2/inode.h | 4 +- + fs/gfs2/rgrp.c | 91 ++++++++++++++++---------------- + 5 files changed, 102 insertions(+), 219 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/options.c | 26 ++++++++++++++++++++++++++ + fs/hfsplus/super.c | 8 +++----- + 3 files changed, 30 insertions(+), 5 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/dir.c +Auto-merging fs/logfs/file.c +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7adacaf] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/lockd/host.c | 11 ++++------- + fs/nfs/super.c | 8 +++++++- + include/linux/lockd/lockd.h | 1 + + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Recorded preimage for 'drivers/hid/hid-input.c' +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-input.c +CONFLICT (content): Merge conflict in drivers/hid/hid-input.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/hid/hid-input.c'. +[master 2115282] Merge remote branch 'hid/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/hid/Kconfig | 10 +++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-apple.c | 49 +++++++++++++-- + drivers/hid/hid-core.c | 13 ++++ + drivers/hid/hid-egalax.c | 2 +- + drivers/hid/hid-emsff.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-ids.h | 9 +++ + drivers/hid/hid-input.c | 2 +- + 8 files changed, 241 insertions(+), 7 deletions(-) + create mode 100644 drivers/hid/hid-emsff.c +Merging quilt/i2c +$ git merge quilt/i2c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 10 ++++++++++ + drivers/i2c/i2c-mux.c | 1 - + drivers/media/common/saa7146_i2c.c | 1 - + drivers/media/video/ir-kbd-i2c.c | 1 - + drivers/staging/olpc_dcon/olpc_dcon.c | 1 - + drivers/video/riva/rivafb-i2c.c | 1 - + include/linux/i2c-id.h | 22 ---------------------- + include/linux/i2c.h | 2 +- + 8 files changed, 11 insertions(+), 28 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 +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master e7fa134] Merge branch 'quilt/jdelvare-hwmon' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 10 ++ + Documentation/hwmon/adm9240 | 2 +- + Documentation/hwmon/w83793 | 2 +- + drivers/hwmon/adm9240.c | 32 ++++- + drivers/hwmon/amc6821.c | 2 +- + drivers/hwmon/lm93.c | 4 +- + drivers/hwmon/lm95241.c | 19 ++- + drivers/hwmon/max6650.c | 2 +- + drivers/hwmon/w83792d.c | 44 ++++++- + drivers/hwmon/w83793.c | 33 ++++- + drivers/hwmon/w83795.c | 207 +++++++++++++++++++++++----- + 11 files changed, 304 insertions(+), 53 deletions(-) +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Already up-to-date. +Merging kbuild/for-next +$ git merge kbuild/for-next +Already up-to-date! +Merge made by recursive. +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +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-card.c | 6 +++--- + drivers/firewire/core-cdev.c | 2 +- + drivers/firewire/core-device.c | 30 +++++++++++++++++++----------- + drivers/firewire/core-transaction.c | 18 ++++++++++++++---- + drivers/firewire/core.h | 2 ++ + drivers/firewire/nosy.c | 3 +-- + 6 files changed, 40 insertions(+), 21 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 6 +- + drivers/net/bonding/bond_main.c | 8 ++-- + drivers/net/ks8851.c | 33 +++++++++++++ + include/linux/netdevice.h | 2 +- + include/net/dn_dev.h | 27 +++++++---- + include/net/dst.h | 8 ++-- + net/decnet/af_decnet.c | 2 +- + net/decnet/dn_dev.c | 100 +++++++++++++++++++++++---------------- + net/decnet/dn_fib.c | 6 ++- + net/decnet/dn_neigh.c | 2 +- + net/decnet/dn_route.c | 68 +++++++++++++++----------- + net/unix/af_unix.c | 34 +++++++------- + 12 files changed, 184 insertions(+), 112 deletions(-) +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Merge made by recursive. + drivers/bluetooth/btusb.c | 2 ++ + net/bluetooth/bnep/core.c | 1 + + net/bluetooth/cmtp/core.c | 1 + + net/bluetooth/hci_event.c | 6 ++++++ + net/bluetooth/hidp/Kconfig | 2 +- + net/bluetooth/hidp/core.c | 2 +- + net/bluetooth/l2cap.c | 8 ++++---- + net/bluetooth/rfcomm/core.c | 13 ++++++++++--- + 8 files changed, 26 insertions(+), 9 deletions(-) +Merging mtd/master +$ git merge mtd/master +Already up-to-date. +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Removing sound/pci/oxygen/hifier.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 12 +- + include/sound/alc5623.h | 15 + + sound/pci/Kconfig | 17 +- + sound/pci/oxygen/Makefile | 2 - + sound/pci/oxygen/hifier.c | 239 ----- + sound/pci/oxygen/oxygen.c | 71 ++- + sound/pci/oxygen/oxygen_lib.c | 2 +- + sound/soc/codecs/Kconfig | 5 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/alc5623.c | 1118 +++++++++++++++++++++++ + sound/soc/codecs/alc5623.h | 161 ++++ + sound/soc/codecs/wm8993.c | 2 + + sound/soc/codecs/wm8994.c | 3 + + sound/soc/codecs/wm_hubs.c | 69 +- + sound/soc/codecs/wm_hubs.h | 3 + + sound/soc/kirkwood/Kconfig | 9 + + sound/soc/kirkwood/Makefile | 2 + + sound/soc/kirkwood/kirkwood-t5325.c | 141 +++ + 18 files changed, 1577 insertions(+), 296 deletions(-) + create mode 100644 include/sound/alc5623.h + delete mode 100644 sound/pci/oxygen/hifier.c + create mode 100644 sound/soc/codecs/alc5623.c + create mode 100644 sound/soc/codecs/alc5623.h + create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Merge made by recursive. + include/sound/soc-dapm.h | 49 ++- + include/sound/soc.h | 30 +- + sound/soc/atmel/playpaq_wm8510.c | 11 +- + sound/soc/atmel/sam9g20_wm8731.c | 17 +- + sound/soc/atmel/snd-soc-afeb9260.c | 13 +- + sound/soc/codecs/88pm860x-codec.c | 9 +- + sound/soc/codecs/Kconfig | 4 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ad1836.c | 5 +- + sound/soc/codecs/ad193x.c | 5 +- + sound/soc/codecs/ak4535.c | 9 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 9 +- + sound/soc/codecs/alc5623.c | 23 +- + sound/soc/codecs/cq93vc.c | 2 +- + sound/soc/codecs/cs42l51.c | 5 +- + sound/soc/codecs/cx20442.c | 15 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/jz4740.c | 10 +- + sound/soc/codecs/max98088.c | 12 +- + sound/soc/codecs/ssm2602.c | 9 +- + sound/soc/codecs/stac9766.c | 3 +- + sound/soc/codecs/tlv320aic23.c | 9 +- + sound/soc/codecs/tlv320aic3x.c | 22 +- + sound/soc/codecs/tlv320dac33.c | 15 +- + sound/soc/codecs/tpa6130a2.c | 5 +- + sound/soc/codecs/twl4030.c | 13 +- + sound/soc/codecs/twl6040.c | 12 +- + sound/soc/codecs/uda134x.c | 2 +- + sound/soc/codecs/uda1380.c | 13 +- + sound/soc/codecs/wm2000.c | 5 +- + sound/soc/codecs/wm8350.c | 28 +- + sound/soc/codecs/wm8400.c | 11 +- + sound/soc/codecs/wm8510.c | 11 +- + sound/soc/codecs/wm8523.c | 11 +- + sound/soc/codecs/wm8580.c | 13 +- + sound/soc/codecs/wm8711.c | 9 +- + sound/soc/codecs/wm8728.c | 11 +- + sound/soc/codecs/wm8731.c | 13 +- + sound/soc/codecs/wm8741.c | 9 +- + sound/soc/codecs/wm8750.c | 11 +- + sound/soc/codecs/wm8753.c | 29 +- + sound/soc/codecs/wm8770.c | 750 ++++++++++++++++++++++++ + sound/soc/codecs/wm8770.h | 51 ++ + sound/soc/codecs/wm8776.c | 10 +- + sound/soc/codecs/wm8804.c | 6 +- + sound/soc/codecs/wm8900.c | 11 +- + sound/soc/codecs/wm8903.c | 11 +- + sound/soc/codecs/wm8904.c | 33 +- + sound/soc/codecs/wm8940.c | 5 +- + sound/soc/codecs/wm8955.c | 11 +- + sound/soc/codecs/wm8960.c | 25 +- + sound/soc/codecs/wm8961.c | 11 +- + sound/soc/codecs/wm8962.c | 37 +- + sound/soc/codecs/wm8971.c | 29 +- + sound/soc/codecs/wm8974.c | 11 +- + sound/soc/codecs/wm8978.c | 11 +- + sound/soc/codecs/wm8985.c | 11 +- + sound/soc/codecs/wm8988.c | 9 +- + sound/soc/codecs/wm8990.c | 11 +- + sound/soc/codecs/wm8993.c | 9 +- + sound/soc/codecs/wm8994.c | 15 +- + sound/soc/codecs/wm9081.c | 9 +- + sound/soc/codecs/wm9090.c | 17 +- + sound/soc/codecs/wm9705.c | 6 +- + sound/soc/codecs/wm9712.c | 9 +- + sound/soc/codecs/wm9713.c | 8 +- + sound/soc/codecs/wm_hubs.c | 18 +- + sound/soc/davinci/davinci-evm.c | 21 +- + sound/soc/ep93xx/snappercl15.c | 5 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 2 +- + sound/soc/imx/eukrea-tlv320.c | 8 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 221 +++---- + sound/soc/imx/imx-ssi.c | 48 +- + sound/soc/imx/imx-ssi.h | 4 + + sound/soc/imx/phycore-ac97.c | 5 +- + sound/soc/imx/wm1133-ev1.c | 7 +- + sound/soc/jz4740/qi_lb60.c | 13 +- + sound/soc/kirkwood/kirkwood-t5325.c | 13 +- + sound/soc/omap/am3517evm.c | 13 +- + sound/soc/omap/ams-delta.c | 82 ++-- + sound/soc/omap/n810.c | 42 +- + sound/soc/omap/omap3pandora.c | 44 +- + sound/soc/omap/osk5912.c | 13 +- + sound/soc/omap/rx51.c | 25 +- + sound/soc/omap/sdp3430.c | 43 +- + sound/soc/omap/sdp4430.c | 19 +- + sound/soc/omap/zoom2.c | 35 +- + sound/soc/pxa/corgi.c | 56 +- + sound/soc/pxa/e740_wm9705.c | 29 +- + sound/soc/pxa/e750_wm9705.c | 29 +- + sound/soc/pxa/e800_wm9712.c | 7 +- + sound/soc/pxa/magician.c | 39 +- + sound/soc/pxa/mioa701_wm9713.c | 17 +- + sound/soc/pxa/palm27x.c | 33 +- + sound/soc/pxa/poodle.c | 30 +- + sound/soc/pxa/saarb.c | 17 +- + sound/soc/pxa/spitz.c | 74 ++- + sound/soc/pxa/tavorevb3.c | 17 +- + sound/soc/pxa/tosa.c | 42 +- + sound/soc/pxa/z2.c | 15 +- + sound/soc/pxa/zylonite.c | 11 +- + sound/soc/s3c24xx/Kconfig | 1 + + sound/soc/s3c24xx/aquila_wm8994.c | 25 +- + sound/soc/s3c24xx/goni_wm8994.c | 21 +- + sound/soc/s3c24xx/jive_wm8750.c | 19 +- + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 41 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 123 ++-- + sound/soc/s3c24xx/rx1950_uda1380.c | 11 +- + sound/soc/s3c24xx/s3c24xx_simtec_hermes.c | 15 +- + sound/soc/s3c24xx/s3c24xx_simtec_tlv320aic23.c | 15 +- + sound/soc/s3c24xx/smartq_wm8987.c | 21 +- + sound/soc/s3c24xx/smdk64xx_wm8580.c | 16 +- + sound/soc/s6000/s6105-ipcam.c | 40 +- + sound/soc/sh/migor.c | 5 +- + sound/soc/sh/sh7760-ac97.c | 2 +- + sound/soc/soc-cache.c | 18 +- + sound/soc/soc-core.c | 96 +++- + sound/soc/soc-dapm.c | 357 ++++++------ + sound/soc/soc-jack.c | 19 +- + 120 files changed, 2295 insertions(+), 1261 deletions(-) + create mode 100644 sound/soc/codecs/wm8770.c + create mode 100644 sound/soc/codecs/wm8770.h +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/char/virtio_console.c +Auto-merging kernel/module.c +Merge made by recursive. +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/input.c | 50 +++++++++++++++------- + drivers/input/keyboard/adp5588-keys.c | 74 +++++++++++---------------------- + drivers/input/keyboard/atkbd.c | 12 +++++- + drivers/input/serio/i8042-x86ia64io.h | 11 +++++ + drivers/serial/kgdboc.c | 59 ++++++++++++++++++++++++++ + include/linux/i2c/adp5588.h | 15 ++++++- + include/linux/input.h | 4 +- + 7 files changed, 158 insertions(+), 67 deletions(-) +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Resolved 'fs/ocfs2/file.c' using previous resolution. +Auto-merging fs/ocfs2/file.c +CONFLICT (content): Merge conflict in fs/ocfs2/file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9373de5] Merge remote branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. +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/char/pcmcia/cm4000_cs.c +Merge made by recursive. + drivers/char/pcmcia/cm4000_cs.c | 3 ++- + drivers/pcmcia/pd6729.c | 8 ++++---- + drivers/pcmcia/pd6729.h | 2 +- + 3 files changed, 7 insertions(+), 6 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Merge made by recursive. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Merge made by recursive. + arch/arm/mach-dove/common.c | 4 +- + drivers/mmc/core/mmc.c | 8 +++- + drivers/mmc/host/Kconfig | 11 ++++++ + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/mxcmmc.c | 48 +++++++++++++++++++++--- + drivers/mmc/host/sdhci-dove.c | 70 ++++++++++++++++++++++++++++++++++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 12 +++++-- + drivers/mmc/host/sdhci-pci.c | 11 +++++- + drivers/mmc/host/sdhci-pltfm.c | 3 ++ + drivers/mmc/host/sdhci-pltfm.h | 1 + + drivers/mmc/host/sdhci.c | 10 +++++ + drivers/mmc/host/sdhci.h | 4 ++ + drivers/mmc/host/ushc.c | 30 +++++++++++---- + 13 files changed, 190 insertions(+), 23 deletions(-) + create mode 100644 drivers/mmc/host/sdhci-dove.c +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + Documentation/vm/Makefile | 2 +- + include/linux/slub_def.h | 55 +++++++++++++-------------- + mm/slub.c | 33 ++++++++++++---- + {Documentation/vm => tools/slub}/slabinfo.c | 6 +- + 4 files changed, 55 insertions(+), 41 deletions(-) + rename {Documentation/vm => tools/slub}/slabinfo.c (99%) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + drivers/regulator/core.c | 12 +++++++++--- + drivers/regulator/mc13783-regulator.c | 4 ++-- + drivers/regulator/twl-regulator.c | 6 +++--- + 3 files changed, 14 insertions(+), 8 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Auto-merging drivers/char/agp/backend.c +Auto-merging drivers/char/agp/hp-agp.c +Merge made by recursive. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/bcm63xx_wdt.c | 42 +++++++++++---------------------------- + 1 files changed, 12 insertions(+), 30 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Recorded preimage for 'arch/blackfin/mach-bf538/include/mach/defBF539.h' +Recorded preimage for 'drivers/scsi/bfa/bfa_fcpim.c' +CONFLICT (delete/modify): arch/blackfin/mach-bf518/include/mach/defBF51x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf518/include/mach/defBF51x_base.h left in tree. +CONFLICT (delete/modify): arch/blackfin/mach-bf527/include/mach/defBF52x_base.h deleted in HEAD and modified in trivial/for-next. Version trivial/for-next of arch/blackfin/mach-bf527/include/mach/defBF52x_base.h left in tree. +Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h +Auto-merging arch/blackfin/mach-bf538/include/mach/defBF539.h +CONFLICT (content): Merge conflict in arch/blackfin/mach-bf538/include/mach/defBF539.h +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/scsi/bfa/bfa_fcpim.c +CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c +Auto-merging drivers/scsi/bfa/bfa_fcs_lport.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging net/core/dev.c +Auto-merging net/decnet/dn_dev.c +Auto-merging sound/soc/codecs/max98088.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/blackfin/mach-bf518/include/mach/defBF51x_base.h arch/blackfin/mach-bf527/include/mach/defBF52x_base.h +arch/blackfin/mach-bf518/include/mach/defBF51x_base.h: needs merge +arch/blackfin/mach-bf527/include/mach/defBF52x_base.h: needs merge +arch/blackfin/mach-bf538/include/mach/defBF539.h: needs merge +drivers/scsi/bfa/bfa_fcpim.c: needs merge +rm 'arch/blackfin/mach-bf518/include/mach/defBF51x_base.h' +rm 'arch/blackfin/mach-bf527/include/mach/defBF52x_base.h' +$ git commit -v -a +Recorded resolution for 'arch/blackfin/mach-bf538/include/mach/defBF539.h'. +Recorded resolution for 'drivers/scsi/bfa/bfa_fcpim.c'. +[master 943c279] Merge remote branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/cgroups/cgroup_event_listener.c | 2 +- + Documentation/cgroups/memcg_test.txt | 2 +- + Documentation/kprobes.txt | 2 +- + Documentation/kvm/api.txt | 2 +- + Documentation/networking/caif/spi_porting.txt | 2 +- + Documentation/powerpc/booting-without-of.txt | 2 +- + Documentation/scheduler/00-INDEX | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/timers/timer_stats.txt | 2 +- + arch/arm/common/it8152.c | 2 +- + arch/arm/common/vic.c | 2 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +++--- + arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- + arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- + .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- + .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- + arch/arm/mach-gemini/include/mach/hardware.h | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-omap2/cpuidle34xx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-spear3xx/spear300.c | 4 ++-- + arch/arm/mach-spear3xx/spear310.c | 2 +- + arch/arm/mach-spear3xx/spear320.c | 2 +- + arch/arm/mach-spear3xx/spear3xx.c | 6 +++--- + arch/arm/mach-spear6xx/spear6xx.c | 4 ++-- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-u300/include/mach/coh901318.h | 4 ++-- + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- + arch/cris/arch-v32/lib/nand_init.S | 2 +- + arch/cris/include/asm/etraxgpio.h | 2 +- + arch/h8300/Kconfig.debug | 2 +- + arch/ia64/kvm/mmio.c | 2 +- + arch/mips/alchemy/common/power.c | 2 +- + arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 4 ++-- + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/powertv/memory.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/powerpc/include/asm/8xx_immap.h | 4 ++-- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- + arch/powerpc/platforms/ps3/device-init.c | 4 ++-- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/sh/mm/cache-sh5.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/kernel/amd_iommu.c | 4 ++-- + arch/x86/kernel/early_printk_mrst.c | 2 +- + arch/x86/kernel/head_32.S | 2 +- + block/cfq-iosched.c | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/ata/libata-core.c | 4 ++-- + drivers/ata/sata_vsc.c | 2 +- + drivers/atm/idt77252.h | 2 +- + drivers/atm/iphase.c | 4 ++-- + drivers/base/power/main.c | 2 +- + drivers/dma/intel_mid_dma.c | 6 +++--- + drivers/edac/amd8131_edac.h | 2 +- + drivers/edac/cell_edac.c | 4 ++-- + drivers/edac/edac_core.h | 2 +- + drivers/edac/ppc4xx_edac.c | 6 +++--- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 4 ++-- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/isdn/gigaset/bas-gigaset.c | 4 ++-- + drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- + drivers/isdn/gigaset/usb-gigaset.c | 4 ++-- + drivers/isdn/hardware/mISDN/ipac.h | 4 ++-- + drivers/isdn/hardware/mISDN/isar.h | 2 +- + drivers/media/video/cx25840/cx25840-ir.c | 2 +- + drivers/media/video/davinci/vpif.h | 2 +- + drivers/media/video/davinci/vpss.c | 2 +- + drivers/media/video/omap/omap_vout.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 4 ++-- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/via-camera.c | 2 -- + drivers/media/video/zoran/zoran.h | 2 +- + drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/arm-charlcd.c | 2 +- + drivers/mmc/card/block.c | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/au1xmmc.c | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 ++-- + drivers/mtd/nand/nand_base.c | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 6 +++--- + drivers/net/chelsio/subr.c | 2 +- + drivers/net/cxgb3/mc5.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 2 +- + drivers/net/e1000/e1000_main.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/ich8lan.c | 2 +- + drivers/net/e1000e/phy.c | 2 +- + drivers/net/eepro.c | 2 +- + drivers/net/irda/donauboe.h | 2 +- + drivers/net/ixgbe/ixgbe_82599.c | 4 ++-- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/tehuti.c | 6 +++--- + drivers/net/tun.c | 2 +- + drivers/net/vxge/vxge-traffic.h | 2 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wimax/i2400m/driver.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wireless/ath/ath5k/reg.h | 6 +++--- + drivers/net/wireless/b43/phy_g.c | 2 +- + drivers/net/wireless/b43legacy/phy.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 2 +- + drivers/net/wireless/prism54/islpci_dev.c | 6 +++--- + drivers/net/wireless/prism54/islpci_eth.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/pcmcia/m32r_cfc.h | 2 +- + drivers/pcmcia/m32r_pcc.h | 2 +- + drivers/pcmcia/m8xx_pcmcia.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/power/s3c_adc_battery.c | 4 ++-- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/scsi/zfcp_cfdc.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++-- + drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++--- + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/dc395x.c | 8 ++++---- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/spi/atmel_spi.c | 4 ++-- + drivers/spi/spidev.c | 2 +- + drivers/staging/stradis/stradis.c | 2 +- + drivers/telephony/ixj.c | 3 ++- + drivers/usb/gadget/imx_udc.c | 2 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/ldusb.c | 2 +- + drivers/usb/musb/musb_gadget.c | 4 ++-- + drivers/usb/wusbcore/wa-rpipe.c | 2 +- + drivers/video/sstfb.c | 2 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 4 ++-- + fs/ext4/inode.c | 4 ++-- + fs/notify/fanotify/Kconfig | 2 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/suballoc.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/actbl1.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/firewire-cdev.h | 2 +- + include/linux/mfd/core.h | 2 +- + include/net/sctp/user.h | 4 ++-- + include/scsi/fc/fc_fcp.h | 4 ++-- + kernel/audit.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/kexec.c | 2 +- + kernel/power/swap.c | 2 +- + kernel/sched.c | 2 +- + kernel/sysctl_binary.c | 2 +- + kernel/time/clocksource.c | 2 +- + kernel/trace/trace_entries.h | 2 +- + lib/nlattr.c | 2 +- + lib/swiotlb.c | 2 +- + mm/percpu.c | 2 +- + mm/sparse-vmemmap.c | 2 +- + net/core/dev.c | 2 +- + net/decnet/dn_dev.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + scripts/kconfig/confdata.c | 2 +- + scripts/mod/modpost.c | 2 +- + security/apparmor/include/match.h | 2 +- + sound/core/init.c | 2 +- + sound/core/pcm_native.c | 2 +- + sound/isa/opl3sa2.c | 2 +- + sound/pci/ca0106/ca0106.h | 2 +- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/emu10k1/p16v.h | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/rme9652/hdspm.c | 6 +++--- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/s3c24xx/smdk_spdif.c | 6 +++--- + 211 files changed, 264 insertions(+), 265 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 fsnotify/for-next +$ git merge fsnotify/for-next +Merge made by recursive. + fs/namei.c | 3 ++ + fs/notify/fanotify/fanotify_user.c | 47 ++++++++++++++++++++++++++++------- + fs/notify/mark.c | 11 -------- + include/linux/fanotify.h | 7 ++++- + include/linux/fsnotify.h | 3 -- + include/linux/fsnotify_backend.h | 13 ++++++++- + 6 files changed, 56 insertions(+), 28 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Recorded preimage for 'arch/arm/kernel/Makefile' +Recorded preimage for 'arch/arm/kernel/swp_emulate.c' +Resolved 'arch/arm/mach-vexpress/ct-ca9x4.c' using previous resolution. +Resolved 'arch/arm/mm/flush.c' using previous resolution. +Resolved 'arch/arm/mm/mmu.c' using previous resolution. +Auto-merging Documentation/arm/00-INDEX +Auto-merging arch/arm/include/asm/assembler.h +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/arm/include/asm/pgtable.h +Auto-merging arch/arm/include/asm/smp_plat.h +Auto-merging arch/arm/include/asm/tlbflush.h +Auto-merging arch/arm/kernel/Makefile +CONFLICT (content): Merge conflict in arch/arm/kernel/Makefile +Auto-merging arch/arm/kernel/entry-armv.S +Auto-merging arch/arm/kernel/swp_emulate.c +CONFLICT (add/add): Merge conflict in arch/arm/kernel/swp_emulate.c +Auto-merging arch/arm/mach-vexpress/ct-ca9x4.c +CONFLICT (content): Merge conflict in arch/arm/mach-vexpress/ct-ca9x4.c +Auto-merging arch/arm/mm/cache-l2x0.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/fault-armv.c +Auto-merging arch/arm/mm/flush.c +CONFLICT (content): Merge conflict in arch/arm/mm/flush.c +Auto-merging arch/arm/mm/mmu.c +CONFLICT (content): Merge conflict in arch/arm/mm/mmu.c +Auto-merging arch/arm/mm/proc-v7.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/kernel/Makefile'. +Recorded resolution for 'arch/arm/kernel/swp_emulate.c'. +[master 85d2b42] Merge remote branch 'catalin/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mm/mmu.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) +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 07416df] 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 +Already up-to-date. +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Auto-merging arch/arm/plat-omap/fb.c +Auto-merging drivers/video/omap2/omapfb/omapfb-main.c +Auto-merging drivers/video/omap2/vram.c +Merge made by recursive. + arch/arm/plat-omap/include/plat/vram.h | 1 + + drivers/video/omap2/omapfb/omapfb-main.c | 2 +- + drivers/video/omap2/vram.c | 10 ++++++++++ + 3 files changed, 12 insertions(+), 1 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging kernel/sched.c +Merge made by recursive. + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/i387.h | 24 ++++++ + arch/x86/include/asm/io_apic.h | 7 +- + arch/x86/kernel/apic/apic.c | 102 ++++++++++++++++---------- + arch/x86/kernel/apic/io_apic.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 135 +++++++++++++++++++--------------- + arch/x86/kernel/process.c | 1 - + arch/x86/kernel/setup.c | 5 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/oprofile/op_model_amd.c | 1 + + include/linux/rcupdate.h | 2 +- + include/linux/sched.h | 5 +- + include/linux/timer.h | 32 +++++++- + include/linux/workqueue.h | 8 ++ + kernel/irq/manage.c | 4 +- + kernel/kthread.c | 2 +- + kernel/posix-timers.c | 10 ++- + kernel/profile.c | 6 +- + kernel/sched.c | 6 +- + kernel/softirq.c | 4 +- + kernel/time/timecompare.c | 5 +- + kernel/time/timekeeping.c | 9 ++- + kernel/timer.c | 46 +++--------- + kernel/trace/trace_selftest.c | 2 +- + kernel/watchdog.c | 2 +- + 25 files changed, 258 insertions(+), 169 deletions(-) +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging include/linux/init_task.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/sched.c +Merge made by recursive. + Documentation/RCU/trace.txt | 144 +++++++++++++-- + include/linux/init_task.h | 9 +- + include/linux/rcupdate.h | 2 - + include/linux/rcutiny.h | 13 +- + include/linux/rcutree.h | 2 + + include/linux/sched.h | 11 +- + init/Kconfig | 40 ++++- + kernel/rcutiny.c | 105 +++++++---- + kernel/rcutiny_plugin.h | 423 +++++++++++++++++++++++++++++++++++++++++-- + kernel/rcutorture.c | 270 ++++++++++++++++++++++++++- + kernel/rcutree.c | 85 +++------ + kernel/rcutree.h | 16 +-- + kernel/rcutree_plugin.h | 93 +++++++++- + kernel/rcutree_trace.c | 12 +- + kernel/sched.c | 69 ------- + kernel/srcu.c | 8 +- + 16 files changed, 1061 insertions(+), 241 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Resolved 'arch/x86/xen/mmu.c' using previous resolution. +Resolved 'arch/x86/xen/setup.c' using previous resolution. +Auto-merging arch/x86/xen/mmu.c +CONFLICT (content): Merge conflict in arch/x86/xen/mmu.c +Auto-merging arch/x86/xen/setup.c +CONFLICT (content): Merge conflict in arch/x86/xen/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 26dda0f] Merge remote branch 'xen/upstream/xen' +$ git diff -M --stat --summary HEAD^.. + arch/x86/xen/setup.c | 32 +++++++++++++++++++++++++------- + 1 files changed, 25 insertions(+), 7 deletions(-) +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 2 +- + arch/x86/pci/xen.c | 8 +++++--- + drivers/pci/xen-pcifront.c | 6 +++--- + 3 files changed, 9 insertions(+), 7 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Merge made by recursive. + arch/x86/include/asm/xen/interface.h | 6 +++--- + arch/x86/include/asm/xen/interface_32.h | 5 +++++ + arch/x86/include/asm/xen/interface_64.h | 13 +------------ + arch/x86/include/asm/xen/page.h | 7 ++++--- + arch/x86/xen/enlighten.c | 7 +++++++ + arch/x86/xen/mmu.c | 14 ++++++++++++++ + include/xen/interface/memory.h | 13 +++++++++++++ + 7 files changed, 47 insertions(+), 18 deletions(-) +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Renaming drivers/edac/edac_mce_amd.h->drivers/edac/mce_amd.h +Auto-merging drivers/edac/mce_amd.h +Auto-merging drivers/edac/Kconfig +Auto-merging drivers/edac/Makefile +Auto-merging drivers/edac/amd64_edac.c +Auto-merging drivers/edac/edac_device_sysfs.c +Auto-merging drivers/edac/edac_mc_sysfs.c +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging mm/percpu.c +Merge made by recursive. + mm/percpu.c | 8 ++------ + 1 files changed, 2 insertions(+), 6 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging 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 bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 972ea64] Merge remote branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git am -3 ../patches/0001-openpromfs-fix-for-bad-get_sb_single-conversion.patch +Applying: openpromfs: fix for bad get_sb_single() conversion diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..c0e116807147 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,66 @@ +Importing driver-core.current based on 2.6.37-rc1 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing tty.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/tty.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing usb.current based on quilt/tty.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing staging.current based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/staging.current c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing i2c based on 2.6.37-rc1-git5 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 151f52f09c5728ecfdd0c289da1a4b30bb416f2c +HEAD is now at 151f52f ipw2x00: remove the right /proc/net entry +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-id-01-delete-unused-adapter-ids.patch +i2c-id-02-drivers-dont-include-i2c-id-h.patch +i2c-id-03-deprecate-adapter-id-field.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + 8128057..67398cf master -> quilt/i2c +Importing jdelvare-hwmon based on 2.6.37-rc1-git5 +$ cd ../quilt-tmp +$ git reset --hard 151f52f09c5728ecfdd0c289da1a4b30bb416f2c +HEAD is now at 151f52f ipw2x00: remove the right /proc/net entry +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-change-mail-address-of-hans-j-koch.patch +hwmon-lm95241-check-validity-of-input-values.patch +hwmon-w83795-01-fix-pwm_enable.patch +hwmon-w83795-02-add-pwm_mode.patch +hwmon-w83795-03-list-all-usable-temp-sources.patch +hwmon-w83795-04-sources-show-actual-temp-channels.patch +hwmon-w83795-05-fix-intrusion-alarm-behavior.patch +hwmon-w83795-06-clear-intrusion-immediately.patch +hwmon-w83795-07-check-if-beeping-is-enabled.patch +hwmon-adm9240-implement-standard-intrusion-detection-interface.patch +hwmon-w83792d-implement-standard-intrusion-detection-interface.patch +hwmon-w83793-implement-standard-intrusion-detection-interface.patch +hwmon-schedule-removal-old-intrusion-detection-interface.patch +Context reduced to (2/0) to apply fragment at 555 +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + dd466ca...c1426f3 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.36-git6 + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 229aebb873e29726b91e076161649cf45154b0bf +Importing rr based on v2.6.36-rc7-185-g53eeb64 +Unchanged quilt series rr +Importing device-mapper based on block/for-next +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 c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing tty based on quilt/driver-core + quilt series is empty +$ git update-ref refs/heads/quilt/tty c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +Importing usb based on quilt/tty + quilt series is empty +$ git update-ref refs/heads/quilt/usb c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..b42f49d54441 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20101109 |