diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-11 13:20:39 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-01-11 13:20:39 +1100 |
| commit | 2cc48ac8c0ac493591f9d21b57766b95d44c2b47 (patch) | |
| tree | 58f59543d7673fc6f8d2188e69e08f2ac7801df1 | |
| parent | e70f43d2a4324bee7fae31482ec08a2ae19dd028 (diff) | |
Add linux-next specific files for 20110111next-20110111
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 186 | ||||
| -rw-r--r-- | Next/Trees | 188 | ||||
| -rw-r--r-- | Next/merge.log | 5185 | ||||
| -rw-r--r-- | Next/quilt-import.log | 10 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 5570 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e6a367f6e2f1 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,186 @@ +Name SHA1 +---- ---- +origin e0e736fc0d33861335e2a132e4f688f7fd380c61 +fixes c12ae95ccc2dc80b4bd57363240cdb6eab2adcbc +arm-current 0c21e3aaf6ae85bee804a325aa29c325209180fd +m68k-current 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 +powerpc-merge f2e785ed5fb8e5fe5063ee2ba1c8f150396c53c6 +sparc-current 5edddaab1d5d6143c23fef119a24ea768915681a +scsi-rc-fixes 29687512c0b084957112cc2c0743ce34cd0d5055 +net-current b11a25aaeccc29d5090d1ce9776af20e3ee99ab9 +sound-current ea78484bd508d582f543ff727c9a53a381c15895 +pci-current 994e0b2c3646ce0ca0e4546e6b10c5cf66b976bf +wireless-current 4e5518ca53be29c1ec3c00089c97bef36bfed515 +kbuild-current 7ad1227818f09242cfe9bf1845fd24211f5f99bd +driver-core.current cf7d7e5a1980d1116ee152d25dac382b112b9c17 +tty.current 3c0eee3fe6a3a1c745379547c7e7c904aa64f6d5 +usb.current 3e5b08cbbf78bedd316904ab0cf3b27119433ee5 +staging.current 61b6b23b79181e28b206cdad8b02aafce4497a86 +cpufreq-current 948e1f8f08692e35255aea6e417dc62e347a63c7 +input-current 554738da71004d96e06fb75f4772dfc3b0f47810 +md-current 589a594be1fb8815b3f18e517be696c48664f728 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current c73b7d02da9bfb4fadafc118a24ee868708839b6 +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 30f2ba38011247ad95bffbf0743a0dc0656a5eb7 +rmobile-current 1cf215a5b43950d1a304373037828158057ff9fc +fbdev-current cb59bfc59024115279de0d7612558caa72ec95f1 +gcl-current 4bdac7da5237170b1392f39ebee99d235043fad8 +arm a866100b671948f80bb4cd8e64d64b0e24d11ce3 +davinci 28bd2c341120db346f30b3ba11b4eac06b2cc981 +i.MX b93ae3ddc5b707f73b68a653c3dd26227b20d50c +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm c6d92e9b84da2002ee7a75b784834970ddfd3bfd +omap 18cbc7d94c1248fdc850ef6bac1cd8e22ef0738f +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 6965f4727f4e62ec3a866d46268cf23333127590 +s5p 854bf596b3be4f4b41c5b3bd8039e4828ec1ace6 +tegra 145d43d75daa1a5bc7ce4992c6f36128e44cac56 +ux500-core afbc74cac167dcfbb12ed87e8ccce80cf59d92f2 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin a780c6e86851c6479851186c5d5b9fb2b201bec7 +cris 395bc5121828e570bd4bb6455c82b80e2f2b05b4 +ia64 af8e4546d6f69c3aaf3d40a984c1b00588a3f75c +m68k 751c88a2c362a4a8985f9a2cb5daf7cd9ce1c4d0 +m68knommu a1b2c6b46841800cf71f383b442285eeb051694c +microblaze d15be32c30e6108cdab76ca895a19b5f8b88b5ca +mips 60572c90e7db3c8dd033b64263f085676d067a68 +parisc 7bfbeae9c78fb9404ccbd62a25c82f5860432ac9 +powerpc 98b14d6b290d96b24ae993ceaccc59b2aa4b130c +4xx ee2ffd8bbb2170f9b52fc8ff4aebe9702e0de651 +52xx-and-virtex c9de9333f5a860cab82052bce6ac28bcac9b2c26 +galak e0dc09ff9a28f37441c5e92a14de6abda8db49d6 +s390 8e1023016cf17152972b98bce6c144834a4916d5 +sh 3bd75e5e0c5b58636aeadd34890114bcb988777e +rmobile c413521eb4e2d7ffd5ce432a144708d479054bd3 +sparc 0c21e3aaf6ae85bee804a325aa29c325209180fd +tile 81711cee933599fa114abb0d258d8bbabef8adfb +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph aa7edae5f9eabc09d82ceab85ec6eb95fc969b6a +cifs a08948812b30653eb2c536ae613b635a989feb6f +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 66a595a5c4a0f7a4ea78fbeddfe4002c036b96f1 +ext3 d96336b05d718b03ff03c94c0dc0cc283a29d534 +ext4 d002ebf1d8daa5a317645b1c4a3a0b7ea2abc9ac +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse 1baa26b2be92fe9917e2f7ef46d423b5dfa4da71 +gfs2 01539ba2a706ab7d35fc0667dff919ade7f87d63 +hfsplus b2837fcf4994e699a4def002e26f274d95b387c1 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 68c404b18f6fba404b2753622d0459c68ee128ae +nfsd 3c726023402a2f3b28f49b9d90ebf9e71151157d +nilfs2 365e215ce1f154e288ff0f7c9acbdf5421f57949 +ocfs2 d6351db2073315ddebac72cc1935e912f60f86e0 +omfs ffc18879903e55487bc5ac3c774b99a07de06029 +squashfs 2e5f5917f8fa2a227cf416e1617f8e532ae15f5f +udf a4264b3f4049ae7aeeb0017f8158119e22fa354f +v9fs 231e70c6d697bad88d5122a31d5ed4eb643e8864 +ubifs e53beacd23d9cb47590da6a7a7f6d417b941a994 +xfs d0eb2f38b250b7d6c993adf81b0e4ded0565497e +vfs 99b7db7b8ffd6bb755eb0a175596421a0b581cb2 +vfs-scale b3e19d924b6eaf2ca7d22cba99a517c5171007b6 +pci fe31e69740eddc7316071ed5165fed6703c8cd12 +hid a08948812b30653eb2c536ae613b635a989feb6f +i2c 764443a4f608231ef98235a8d562920a9ed3ac34 +bjdooks-i2c 28d3ccefad07982cd1289dc16fe040f020f1f491 +jdelvare-hwmon b7f2a5c8c9190fcf0126d43972a8ad37eb98f5d0 +hwmon-staging 6099469805c24af14250e182bb9ca082b8a6b716 +kernel-doc 485222f9780e4f1d7141f879def669767501fc03 +v4l-dvb d1aa213b138dfd05121701df989909617420c84e +kbuild bef6a5a83edaa8feca5c20e23bd390c34f1e54ee +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 2ad2c320a107aceeba984f97ab2a60064101f5d5 +infiniband c620cd29efe1a58e680ac6f7d8b6dfb960a7ac6d +acpi 7673fa8423d100baaf577fdc211c9b8be454dc15 +idle-test 7abfcccd05afafef744b4276ce34ea7ee22f0403 +ieee1394 410cf2bd3dc6ec1ed9e1b36b25b9d7aa927ed14e +ubi cf7d7e5a1980d1116ee152d25dac382b112b9c17 +kvm 300edb8d906c08c46153cb57a959369745be7e3e +dlm b9d41052794385f9d47ebb7acf4a772f3ad02398 +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi c32e061fa19893ce4acf95d97d5613a161f0f1b7 +async_tx bc0fa81473c077bf4403e3b7b3397326204b65cd +net 0c21e3aaf6ae85bee804a325aa29c325209180fd +wireless 33af88138b859f515b365a074e0a014d7cdbf846 +bluetooth 33af88138b859f515b365a074e0a014d7cdbf846 +mtd 52d039fdaa78c5a9f9bc2940ad58d7ed76b8336d +crypto 55db8387a5e8d07407f0b7c6b2526417a2bc6243 +sound-asoc 11b8fca53a84992c74f05a091102c32eb40f1a08 +sound bb3eb906d54b8289744ce21b40d0591f6cd645b0 +cpufreq 62bfdfa1de1361b2fb8201c72def1bbca5e7a395 +rr 80b4875e3f55c49a0fd8164623ed1745b16a8b31 +input 93f38e914183c9b7af248fab793153772996987c +input-mt 4f56ce929cab45a3a6e1a81700da52bb9bdbfc0f +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 5fce009772d72cbf425e4894c2def78f06a2ec91 +device-mapper 86c7fd3038170f8154c014c3ce04d7e5051dfdfc +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 106665d937df6eff33c71997a52f7bc3aefa6c12 +battery f3dcab70e192b0489ac05cc554e0b1cedae46d1a +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 188a1ef6f258cd9e568cbf1631b346d475cac1d7 +kgdb 62f6d9b5d890c6dacf17e629d91085937990ccc0 +slab 8165984acf825917437debae519209073c32a5a7 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 589a594be1fb8815b3f18e517be696c48664f728 +mfd e7cffa7db890ca970b87172c596ee590f8936ff5 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 56bec7c009872ef33fe452ea75fecba481351b44 +fbdev 1928e87bcf185f56008d0746f887b691c1cb8c4a +viafb b884a94ed16d1a633e76f80fb1bd75d0e7373ce3 +omap_dss2 18016e35d448d35739f8640b51476709c07e95db +voltage 30f60db382e52f28ffce27deb7642973360e8f5d +security-testing aeda4ac3efc29e4d55989abd0a73530453aa69ba +selinux 350e4f31e0eaf56dfc3b328d24a11bdf42a41fb8 +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 87dbd920e1063979ea5b15d34f0d787ba51c7a7c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu eecfd57f6429d9d8e10be186566ef99fced55163 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd fe2fd9ed5bf184f797412be8b86f4589d1b77bb8 +jc_docs 4047f8b1f9f4b4ecc4863f5f10cd9ba388b32a94 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial bfc672dcf323877228682aff79dff8ecd9f30ff8 +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend a08948812b30653eb2c536ae613b635a989feb6f +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +catalin c8ddb2713c624f432fa5fe3c7ecffcdda46ea0d4 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree a081748735c5feb96b1365e78a5ff0fb6ca7e3a4 +spi 07fe0351702b6f0c9749e80cdbcb758686b0fe9b +tip dca876080fb9b1553b65a91eaf74e1d821497b8e +rcu 3c2dcf2aed5ea22ecf65a9a871c4963faec421b3 +oprofile 5ee0fcc34833c7e6acfd8692af33a78ae529d9c5 +xen d43b1135a6f695417d8f1424ac71985f263c30cc +swiotlb-xen 9ad72acf1ab93aca062c269fab59eefd9eb1ee1c +xen-pvhvm e0b58be59e4e278480b120ba827b8cfee7c7ddbd +edac-amd 295839e770f95a272d25dc707183cb5f9ba14c1c +percpu 0c21e3aaf6ae85bee804a325aa29c325209180fd +workqueues 7ef85c4c88673f91799b1aeca2586ccc2538848b +sfi 82acf2a8fe4764e21a7ad406590453b004751e58 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 1a7d946993aaf2a79e9c65abbe169a108e351bcb +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core c6c0ac664c86ff6408fadbed4913938c8a732e26 +tty e0e736fc0d33861335e2a132e4f688f7fd380c61 +usb e0e736fc0d33861335e2a132e4f688f7fd380c61 +staging 7959d55679e4360205c9ebc89d40a5503c53bae2 +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-trivial 2a48fc0ab24241755dc93bfd4f01d68efab47f5a +bkl-llseek 776c163b1b93c8dfa5edba885bc2bfbc2d228a5f +bkl-vfs 6d7bccc2215c37205ede6c9cf84db64e7c4f9443 +bkl-config a3ba01b63468c925518da2da0ac3be11358f60cb +irqflags df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101 +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge 834349b74d38ee6330e766715b189790ab6897ae diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..0627fa15e32b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,188 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git#master +fixes git -#fixes +arm-current git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#master +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-merge git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#merge +sparc-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git#master +scsi-rc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git#master +net-current git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#for-linus +wireless-current git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-fixes +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +gcl-current git git://git.secretlab.ca/git/linux-2.6#merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +msm git git://codeaurora.org/quic/kernel/davidb/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +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-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +selinux git git://git.infradead.org/users/eparis/selinux.git#master +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +xen git git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen.git#upstream/xen +swiotlb-xen git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#master +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-trivial git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#trivial +bkl-llseek git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#llseek +bkl-vfs git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#vfs +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +irqflags git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags.git#master +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..b3a9c2d32cb2 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5185 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 0c21e3a Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus +Merging origin/master +$ git merge origin/master +Updating 0c21e3a..e0e736f +Fast-forward + .../ABI/testing/sysfs-driver-hid-roccat-kone | 16 +- + .../ABI/testing/sysfs-driver-hid-roccat-koneplus | 108 ++ + .../ABI/testing/sysfs-driver-hid-roccat-pyra | 18 +- + Documentation/coccinelle.txt | 4 + + Documentation/hwmon/ds620 | 34 + + Documentation/hwmon/sht21 | 49 + + Documentation/hwmon/sysfs-interface | 49 +- + Documentation/kbuild/kbuild.txt | 8 + + Documentation/kbuild/kconfig-language.txt | 7 +- + Documentation/kbuild/makefiles.txt | 15 + + Documentation/keys-trusted-encrypted.txt | 145 ++ + Documentation/make/headers_install.txt | 5 +- + Documentation/power/drivers-testing.txt | 8 +- + Documentation/power/runtime_pm.txt | 31 + + Documentation/powerpc/dts-bindings/eeprom.txt | 28 + + Documentation/sysctl/kernel.txt | 2 +- + Documentation/vm/Makefile | 2 +- + MAINTAINERS | 4 +- + Makefile | 1 + + arch/arm/plat-s3c24xx/cpu-freq.c | 1 - + arch/microblaze/Kconfig | 2 +- + arch/microblaze/boot/Makefile | 12 +- + arch/microblaze/include/asm/prom.h | 3 - + arch/microblaze/kernel/prom_parse.c | 38 - + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/boot/Makefile | 8 +- + arch/powerpc/boot/dts/bluestone.dts | 8 +- + arch/powerpc/boot/dts/cm5200.dts | 194 +-- + arch/powerpc/boot/dts/digsy_mtc.dts | 177 +-- + arch/powerpc/boot/dts/hotfoot.dts | 2 + + arch/powerpc/boot/dts/lite5200b.dts | 220 +--- + arch/powerpc/boot/dts/media5200.dts | 214 +--- + arch/powerpc/boot/dts/motionpro.dts | 194 +-- + arch/powerpc/boot/dts/mpc5200b.dtsi | 275 ++++ + arch/powerpc/boot/dts/mucmc52.dts | 174 +-- + arch/powerpc/boot/dts/pcm030.dts | 196 +--- + arch/powerpc/boot/dts/pcm032.dts | 242 +--- + arch/powerpc/boot/dts/uc101.dts | 160 +-- + arch/powerpc/include/asm/prom.h | 5 +- + arch/powerpc/kernel/prom_parse.c | 38 - + arch/powerpc/platforms/40x/ppc40x_simple.c | 13 +- + arch/powerpc/platforms/512x/mpc5121_generic.c | 13 +- + arch/powerpc/platforms/52xx/lite5200.c | 16 +- + arch/powerpc/platforms/52xx/media5200.c | 13 +- + arch/powerpc/platforms/52xx/mpc5200_simple.c | 13 +- + arch/powerpc/platforms/83xx/mpc830x_rdb.c | 13 +- + arch/powerpc/platforms/83xx/mpc831x_rdb.c | 11 +- + arch/powerpc/platforms/83xx/mpc837x_rdb.c | 15 +- + arch/powerpc/platforms/85xx/tqm85xx.c | 20 +- + arch/powerpc/platforms/pseries/eeh_sysfs.c | 1 - + arch/powerpc/sysdev/mv64x60_dev.c | 1 + + arch/powerpc/sysdev/tsi108_dev.c | 1 + + arch/sparc/kernel/auxio_32.c | 2 +- + arch/sparc/kernel/starfire.c | 2 +- + arch/sparc/prom/init_32.c | 2 +- + arch/sparc/prom/init_64.c | 4 +- + arch/sparc/prom/tree_32.c | 17 +- + arch/sparc/prom/tree_64.c | 18 +- + arch/x86/include/asm/hypervisor.h | 12 + + arch/x86/include/asm/xen/hypervisor.h | 35 + + arch/x86/kernel/apic/apic.c | 5 +- + arch/x86/xen/enlighten.c | 40 +- + drivers/ata/Kconfig | 28 +- + drivers/ata/Makefile | 1 + + drivers/ata/acard-ahci.c | 528 +++++++ + drivers/ata/ahci.h | 3 + + drivers/ata/libahci.c | 11 +- + drivers/ata/libata-scsi.c | 60 +- + drivers/ata/pata_hpt366.c | 51 +- + drivers/ata/pata_hpt37x.c | 236 ++-- + drivers/ata/pata_hpt3x2n.c | 150 ++- + drivers/base/core.c | 41 +- + drivers/base/power/generic_ops.c | 6 +- + drivers/base/power/main.c | 174 +-- + drivers/base/power/runtime.c | 47 +- + drivers/base/power/wakeup.c | 20 +- + drivers/char/ipmi/ipmi_si_intf.c | 10 +- + drivers/char/snsc.h | 1 - + drivers/char/tpm/tpm.c | 20 +- + drivers/char/tpm/tpm.h | 5 + + drivers/firewire/Kconfig | 2 +- + drivers/firewire/core-cdev.c | 7 +- + drivers/firewire/core-transaction.c | 58 +- + drivers/firewire/core.h | 4 +- + drivers/firewire/net.c | 47 +- + drivers/firewire/nosy.c | 3 +- + drivers/firewire/ohci.c | 672 ++++++--- + drivers/hid/Kconfig | 17 + + drivers/hid/Makefile | 14 +- + drivers/hid/hid-3m-pct.c | 2 +- + drivers/hid/hid-a4tech.c | 6 +- + drivers/hid/hid-apple.c | 63 +- + drivers/hid/hid-axff.c | 14 +- + drivers/hid/hid-belkin.c | 4 +- + drivers/hid/hid-cando.c | 2 +- + drivers/hid/hid-cherry.c | 3 +- + drivers/hid/hid-core.c | 119 +- + drivers/hid/hid-cypress.c | 4 +- + drivers/hid/hid-debug.c | 4 +- + drivers/hid/hid-drff.c | 14 +- + drivers/hid/hid-egalax.c | 2 +- + drivers/hid/hid-elecom.c | 3 +- + drivers/hid/hid-emsff.c | 161 ++ + drivers/hid/hid-gaff.c | 13 +- + drivers/hid/hid-ids.h | 11 + + drivers/hid/hid-input.c | 18 +- + drivers/hid/hid-kye.c | 4 +- + drivers/hid/hid-lg.c | 15 +- + drivers/hid/hid-lg2ff.c | 9 +- + drivers/hid/hid-lg3ff.c | 9 +- + drivers/hid/hid-lg4ff.c | 9 +- + drivers/hid/hid-lgff.c | 8 +- + drivers/hid/hid-magicmouse.c | 20 +- + drivers/hid/hid-microsoft.c | 7 +- + drivers/hid/hid-monterey.c | 3 +- + drivers/hid/hid-mosart.c | 22 +- + drivers/hid/hid-ntrig.c | 9 +- + drivers/hid/hid-ortek.c | 3 +- + drivers/hid/hid-petalynx.c | 7 +- + drivers/hid/hid-picolcd.c | 58 +- + drivers/hid/hid-pl.c | 16 +- + drivers/hid/hid-prodikeys.c | 27 +- + drivers/hid/hid-quanta.c | 2 +- + drivers/hid/hid-roccat-kone.c | 404 ++--- + drivers/hid/hid-roccat-kone.h | 19 +- + drivers/hid/hid-roccat-koneplus.c | 837 ++++++++++ + drivers/hid/hid-roccat-koneplus.h | 224 +++ + drivers/hid/hid-roccat-pyra.c | 411 ++---- + drivers/hid/hid-roccat-pyra.h | 23 +- + drivers/hid/hid-roccat.c | 53 +- + drivers/hid/hid-roccat.h | 5 +- + drivers/hid/hid-samsung.c | 8 +- + drivers/hid/hid-sjoy.c | 16 +- + drivers/hid/hid-sony.c | 11 +- + drivers/hid/hid-stantum.c | 2 +- + drivers/hid/hid-sunplus.c | 3 +- + drivers/hid/hid-tmff.c | 27 +- + drivers/hid/hid-topseed.c | 1 + + drivers/hid/hid-wacom.c | 28 +- + drivers/hid/hid-zpff.c | 11 +- + drivers/hid/hid-zydacron.c | 11 +- + drivers/hid/hidraw.c | 36 +- + drivers/hid/usbhid/Makefile | 6 +- + drivers/hid/usbhid/hid-core.c | 105 +- + drivers/hid/usbhid/hid-pidff.c | 164 +-- + drivers/hid/usbhid/hid-quirks.c | 2 +- + drivers/hid/usbhid/hiddev.c | 241 ++-- + drivers/hid/usbhid/usbhid.h | 1 - + drivers/hid/usbhid/usbkbd.c | 24 +- + drivers/hwmon/Kconfig | 20 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/abituguru.c | 36 +- + drivers/hwmon/abituguru3.c | 45 +- + drivers/hwmon/adt7470.c | 4 +- + drivers/hwmon/applesmc.c | 1632 +++++++------------- + drivers/hwmon/asb100.c | 9 +- + drivers/hwmon/asus_atk0110.c | 7 +- + drivers/hwmon/coretemp.c | 11 +- + drivers/hwmon/dme1737.c | 12 +- + drivers/hwmon/ds620.c | 337 ++++ + drivers/hwmon/f71805f.c | 29 +- + drivers/hwmon/f71882fg.c | 23 +- + drivers/hwmon/hp_accel.c | 13 +- + drivers/hwmon/hwmon-vid.c | 11 +- + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/ibmaem.c | 4 +- + drivers/hwmon/lis3lv02d.c | 23 +- + drivers/hwmon/lm70.c | 5 +- + drivers/hwmon/lm95241.c | 495 +++---- + drivers/hwmon/pcf8591.c | 5 +- + drivers/hwmon/pkgtemp.c | 7 +- + drivers/hwmon/sht21.c | 307 ++++ + drivers/hwmon/sis5595.c | 10 +- + drivers/hwmon/smsc47b397.c | 13 +- + drivers/hwmon/smsc47m1.c | 31 +- + drivers/hwmon/via-cputemp.c | 35 +- + drivers/hwmon/via686a.c | 10 +- + drivers/hwmon/vt1211.c | 30 +- + drivers/hwmon/vt8231.c | 10 +- + drivers/hwmon/w83627ehf.c | 23 +- + drivers/hwmon/w83627hf.c | 17 +- + drivers/input/mouse/bcm5974.c | 40 + + drivers/misc/eeprom/at24.c | 43 +- + drivers/mmc/host/Kconfig | 4 +- + drivers/mmc/host/sdhci-of-core.c | 4 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/net/bonding/bonding.h | 1 - + drivers/net/fs_enet/fs_enet-main.c | 1 + + drivers/net/gianfar.c | 1 + + drivers/net/ucc_geth.c | 1 + + drivers/net/xilinx_emaclite.c | 1 + + drivers/of/Kconfig | 8 + + drivers/of/Makefile | 1 + + drivers/of/address.c | 54 +- + drivers/of/fdt.c | 430 ++++-- + drivers/of/of_mdio.c | 26 +- + drivers/of/of_net.c | 48 + + drivers/of/platform.c | 22 +- + drivers/pci/hotplug/acpiphp.h | 1 - + drivers/pci/hotplug/rpaphp_slot.c | 1 - + drivers/s390/char/tape_class.h | 1 - + drivers/sbus/char/jsflash.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/libsas/sas_scsi_host.c | 3 +- + drivers/serial/Kconfig | 2 +- + drivers/serial/of_serial.c | 1 + + drivers/sh/clk/core.c | 1 - + drivers/spi/spi.c | 92 +- + drivers/usb/core/driver.c | 7 +- + drivers/usb/musb/musb_debugfs.c | 1 - + drivers/video/xen-fbfront.c | 19 +- + drivers/xen/events.c | 21 +- + fs/cifs/cache.c | 16 +- + fs/cifs/cifs_debug.c | 22 +- + fs/cifs/cifs_spnego.c | 10 +- + fs/cifs/cifsencrypt.c | 6 +- + fs/cifs/cifsfs.c | 17 +- + fs/cifs/cifsglob.h | 9 +- + fs/cifs/cifssmb.c | 5 +- + fs/cifs/connect.c | 462 +++--- + fs/cifs/dir.c | 6 +- + fs/cifs/file.c | 233 ++-- + fs/cifs/inode.c | 6 + + fs/cifs/readdir.c | 1 + + fs/cifs/sess.c | 135 +- + fs/cifs/transport.c | 2 +- + fs/dlm/lowcomms.c | 63 +- + fs/fuse/dev.c | 156 ++- + fs/fuse/dir.c | 53 +- + fs/fuse/file.c | 66 +- + fs/fuse/fuse_i.h | 27 +- + fs/fuse/inode.c | 30 +- + fs/gfs2/incore.h | 1 + + fs/namei.c | 8 +- + fs/nilfs2/bmap.c | 47 +- + fs/nilfs2/btnode.c | 3 +- + fs/nilfs2/dir.c | 3 +- + fs/nilfs2/file.c | 1 + + fs/nilfs2/ifile.c | 11 +- + fs/nilfs2/inode.c | 180 ++- + fs/nilfs2/ioctl.c | 12 +- + fs/nilfs2/mdt.c | 32 +- + fs/nilfs2/namei.c | 1 + + fs/nilfs2/nilfs.h | 13 +- + fs/nilfs2/page.c | 86 +- + fs/nilfs2/page.h | 3 + + fs/nilfs2/recovery.c | 2 +- + fs/nilfs2/sb.h | 8 - + fs/nilfs2/segment.c | 43 +- + fs/nilfs2/super.c | 30 +- + fs/nilfs2/the_nilfs.c | 6 +- + fs/nilfs2/the_nilfs.h | 3 - + fs/sysfs/inode.c | 1 + + fs/sysfs/sysfs.h | 1 + + include/asm-generic/vmlinux.lds.h | 13 +- + include/keys/encrypted-type.h | 29 + + include/keys/trusted-type.h | 31 + + include/linux/Kbuild | 9 +- + include/linux/audit.h | 1 + + include/linux/capability.h | 7 +- + include/linux/dcache.h | 2 +- + include/linux/dcookies.h | 2 +- + include/linux/device.h | 5 +- + include/linux/firewire.h | 2 +- + include/linux/firmware-map.h | 1 - + include/linux/flex_array.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/fuse.h | 26 +- + include/linux/hid.h | 75 +- + include/linux/hrtimer.h | 1 - + include/linux/i2c/ds620.h | 21 + + include/linux/kernel.h | 3 + + include/linux/libata.h | 6 +- + include/linux/of_address.h | 6 +- + include/linux/of_fdt.h | 18 + + include/linux/of_net.h | 15 + + include/linux/pipe_fs_i.h | 1 + + include/linux/pm.h | 51 +- + include/linux/pm_runtime.h | 13 + + include/linux/sched.h | 2 - + include/linux/security.h | 3 +- + include/linux/slab_def.h | 33 +- + include/linux/slub_def.h | 55 +- + include/linux/sunrpc/cache.h | 1 + + include/linux/suspend.h | 4 +- + include/linux/tpm.h | 4 + + include/linux/tpm_command.h | 28 + + include/linux/xattr.h | 4 + + kernel/Makefile | 2 +- + kernel/freezer.c | 9 +- + kernel/power/Makefile | 5 +- + kernel/power/hibernate.c | 7 +- + kernel/power/process.c | 8 +- + kernel/power/suspend.c | 2 +- + kernel/printk.c | 14 +- + lib/hexdump.c | 16 + + mm/slab.c | 38 +- + mm/slub.c | 30 +- + scripts/.gitignore | 1 + + scripts/Makefile.lib | 23 + + scripts/basic/fixdep.c | 119 +- + scripts/checksyscalls.sh | 4 +- + scripts/coccinelle/misc/doubleinit.cocci | 6 +- + scripts/coccinelle/null/deref_null.cocci | 39 +- + scripts/config | 13 +- + scripts/dtc/Makefile | 3 +- + scripts/dtc/checks.c | 105 ++- + scripts/dtc/dtc-lexer.l | 175 +-- + scripts/dtc/dtc-lexer.lex.c_shipped | 551 +++----- + scripts/dtc/dtc-parser.tab.c_shipped | 892 ++++++------ + scripts/dtc/dtc-parser.tab.h_shipped | 82 +- + scripts/dtc/dtc-parser.y | 160 +-- + scripts/dtc/dtc.c | 57 +- + scripts/dtc/dtc.h | 77 +- + scripts/dtc/flattree.c | 192 ++- + scripts/dtc/fstree.c | 12 +- + scripts/dtc/livetree.c | 345 ++++- + scripts/dtc/srcpos.c | 258 +++- + scripts/dtc/srcpos.h | 99 +- + scripts/dtc/treesource.c | 48 +- + scripts/dtc/util.c | 59 + + scripts/dtc/util.h | 56 + + scripts/dtc/version_gen.h | 2 +- + scripts/genksyms/parse.c_shipped | 2 +- + scripts/genksyms/parse.y | 2 +- + scripts/headers.sh | 2 +- + scripts/headers_check.pl | 6 +- + scripts/headers_install.pl | 7 + + scripts/kconfig/conf.c | 2 - + scripts/kconfig/confdata.c | 27 +- + scripts/kconfig/expr.c | 44 +- + scripts/kconfig/expr.h | 3 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/menu.c | 15 +- + scripts/kconfig/nconf.c | 10 +- + scripts/kconfig/symbol.c | 8 +- + scripts/mkuboot.sh | 2 +- + scripts/mod/modpost.c | 3 +- + scripts/package/builddeb | 93 ++- + scripts/tags.sh | 2 +- + security/Kconfig | 31 + + security/apparmor/include/file.h | 3 +- + security/apparmor/include/match.h | 1 + + security/keys/Makefile | 2 + + security/keys/encrypted_defined.c | 903 +++++++++++ + security/keys/encrypted_defined.h | 54 + + security/keys/trusted_defined.c | 1175 ++++++++++++++ + security/keys/trusted_defined.h | 134 ++ + security/selinux/hooks.c | 5 +- + security/selinux/include/avc.h | 1 - + security/selinux/include/classmap.h | 2 +- + security/selinux/nlmsgtab.c | 2 + + security/selinux/selinuxfs.c | 649 ++++---- + security/selinux/ss/conditional.c | 6 +- + security/selinux/ss/mls.c | 25 +- + security/selinux/ss/policydb.c | 701 +++++----- + security/selinux/ss/policydb.h | 19 +- + security/selinux/ss/services.c | 425 +++--- + security/selinux/ss/sidtab.c | 39 +- + security/selinux/ss/sidtab.h | 2 + + security/smack/smack.h | 45 + + security/smack/smack_access.c | 58 +- + security/smack/smack_lsm.c | 354 +++-- + security/smack/smackfs.c | 41 +- + {Documentation/vm => tools/slub}/slabinfo.c | 6 +- + usr/gen_init_cpio.c | 20 +- + 368 files changed, 14401 insertions(+), 8933 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus + create mode 100644 Documentation/hwmon/ds620 + create mode 100644 Documentation/hwmon/sht21 + create mode 100644 Documentation/keys-trusted-encrypted.txt + create mode 100644 Documentation/powerpc/dts-bindings/eeprom.txt + create mode 100644 arch/powerpc/boot/dts/mpc5200b.dtsi + create mode 100644 drivers/ata/acard-ahci.c + create mode 100644 drivers/hid/hid-emsff.c + create mode 100644 drivers/hid/hid-roccat-koneplus.c + create mode 100644 drivers/hid/hid-roccat-koneplus.h + create mode 100644 drivers/hwmon/ds620.c + create mode 100644 drivers/hwmon/sht21.c + create mode 100644 drivers/of/of_net.c + create mode 100644 include/keys/encrypted-type.h + create mode 100644 include/keys/trusted-type.h + create mode 100644 include/linux/i2c/ds620.h + create mode 100644 include/linux/of_net.h + create mode 100644 include/linux/tpm_command.h + create mode 100644 scripts/dtc/util.c + create mode 100644 scripts/dtc/util.h + create mode 100644 security/keys/encrypted_defined.c + create mode 100644 security/keys/encrypted_defined.h + create mode 100644 security/keys/trusted_defined.c + create mode 100644 security/keys/trusted_defined.h + rename {Documentation/vm => tools/slub}/slabinfo.c (99%) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/sun3_pgtable.h | 5 +- + arch/m68k/include/asm/thread_info.h | 1 + + arch/m68k/include/asm/unistd.h | 1 + + arch/m68k/kernel/entry.S | 30 +--- + arch/m68k/kernel/signal.c | 314 +++++++++++++----------------- + arch/m68knommu/kernel/entry.S | 16 -- + arch/m68knommu/kernel/signal.c | 188 ++++++++---------- + arch/m68knommu/platform/68328/entry.S | 7 +- + arch/m68knommu/platform/68360/entry.S | 7 +- + arch/m68knommu/platform/coldfire/entry.S | 5 +- + 10 files changed, 231 insertions(+), 343 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Merge made by recursive. + arch/sparc/kernel/cpu.c | 2 +- + arch/sparc/kernel/pcr.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +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. + Documentation/networking/dccp.txt | 1 + + drivers/atm/ambassador.c | 19 +- + drivers/net/Kconfig | 7 +- + drivers/net/bfin_mac.c | 74 ++-- + drivers/net/bfin_mac.h | 11 +- + drivers/net/bnx2x/bnx2x.h | 1 + + drivers/net/bnx2x/bnx2x_dump.h | 988 +++++++++++++++++++-------------- + drivers/net/bnx2x/bnx2x_ethtool.c | 22 +- + drivers/net/bnx2x/bnx2x_init.h | 220 ++++++++ + drivers/net/bnx2x/bnx2x_main.c | 70 +-- + drivers/net/bnx2x/bnx2x_reg.h | 74 +++ + drivers/net/bnx2x/bnx2x_stats.c | 5 + + drivers/net/e1000/e1000_hw.c | 328 +++++++++--- + drivers/net/e1000/e1000_hw.h | 59 ++- + drivers/net/e1000/e1000_main.c | 35 ++ + drivers/net/e1000/e1000_osdep.h | 19 +- + drivers/net/e1000e/82571.c | 77 +++- + drivers/net/e1000e/e1000.h | 3 + + drivers/net/e1000e/es2lan.c | 4 +- + drivers/net/e1000e/ethtool.c | 54 ++- + drivers/net/e1000e/hw.h | 1 + + drivers/net/e1000e/ich8lan.c | 77 +-- + drivers/net/e1000e/lib.c | 3 +- + drivers/net/e1000e/netdev.c | 53 ++- + drivers/net/e1000e/phy.c | 40 +- + drivers/net/fec.c | 248 ++++++--- + drivers/net/fec.h | 5 +- + drivers/net/forcedeth.c | 34 +- + drivers/net/hamradio/yam.c | 4 +- + drivers/net/ixgbe/ixgbe.h | 21 +- + drivers/net/ixgbe/ixgbe_82599.c | 749 ++++++++++---------------- + drivers/net/ixgbe/ixgbe_ethtool.c | 142 ++++-- + drivers/net/ixgbe/ixgbe_main.c | 169 +++++-- + drivers/net/ixgbe/ixgbe_type.h | 91 ++-- + drivers/net/qlcnic/qlcnic.h | 24 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 2 +- + drivers/net/qlcnic/qlcnic_init.c | 63 +++- + drivers/net/qlcnic/qlcnic_main.c | 10 +- + drivers/net/r8169.c | 21 +- + drivers/net/sky2.c | 143 +++--- + drivers/net/sky2.h | 6 +- + drivers/net/xen-netfront.c | 2 +- + include/linux/bfin_mac.h | 1 + + include/linux/fec.h | 3 + + include/linux/netdevice.h | 14 +- + include/net/phonet/phonet.h | 4 +- + include/net/sock.h | 4 + + net/core/dev.c | 112 ++-- + net/core/filter.c | 2 +- + net/core/rtnetlink.c | 2 +- + net/dccp/dccp.h | 3 +- + net/dccp/input.c | 2 +- + net/dccp/sysctl.c | 4 +- + net/ipv4/inet_diag.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 4 +- + net/netlink/genetlink.c | 2 +- + net/phonet/af_phonet.c | 6 +- + net/xfrm/xfrm_user.c | 2 +- + 58 files changed, 2552 insertions(+), 1594 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + Documentation/DocBook/80211.tmpl | 21 +++++++++++--- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 3 ++ + drivers/net/wireless/ath/ath9k/eeprom_def.c | 4 +++ + drivers/net/wireless/ath/ath9k/htc.h | 1 + + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 37 +++++++++++++++++------- + drivers/net/wireless/ath/ath9k/hw.c | 5 ++- + drivers/net/wireless/hostap/hostap_cs.c | 15 ++++------ + drivers/net/wireless/ipw2x00/ipw2200.c | 7 +++++ + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/ssb/scan.c | 10 +++++++ + include/linux/nl80211.h | 20 ++++++++++--- + include/net/cfg80211.h | 2 + + include/net/mac80211.h | 14 +++++++++ + 13 files changed, 109 insertions(+), 32 deletions(-) +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +Merge made by recursive. + drivers/staging/speakup/kobjects.c | 9 ++++++--- + drivers/staging/speakup/main.c | 33 +++++++++++++++++++++------------ + drivers/staging/usbip/vhci_hcd.c | 14 -------------- + 3 files changed, 27 insertions(+), 29 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Auto-merging arch/x86/kernel/cpu/cpufreq/powernow-k8.c +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Already up-to-date. +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Auto-merging crypto/pcrypt.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/socket.h +Auto-merging net/core/sock.c +Merge made by recursive. + arch/x86/crypto/aesni-intel_asm.S | 1832 +++++++++++++++++++++++++++++++++++- + arch/x86/crypto/aesni-intel_glue.c | 540 +++++++++++- + crypto/Kconfig | 34 +- + crypto/Makefile | 17 +- + crypto/af_alg.c | 483 ++++++++++ + crypto/algif_hash.c | 319 +++++++ + crypto/algif_skcipher.c | 632 +++++++++++++ + crypto/authenc.c | 22 +- + crypto/cast5.c | 74 +- + crypto/crypto_wq.c | 3 +- + crypto/deflate.c | 3 +- + crypto/eseqiv.c | 18 +- + crypto/gcm.c | 19 +- + crypto/pcrypt.c | 3 +- + crypto/rmd128.c | 3 +- + crypto/rmd160.c | 3 +- + crypto/rmd256.c | 3 +- + crypto/rmd320.c | 3 +- + crypto/shash.c | 8 +- + crypto/tcrypt.c | 11 + + crypto/testmgr.c | 24 + + crypto/testmgr.h | 361 +++++++ + crypto/zlib.c | 3 +- + drivers/crypto/mv_cesa.c | 2 +- + drivers/crypto/omap-aes.c | 260 +++--- + drivers/crypto/omap-sham.c | 374 +++++---- + include/crypto/if_alg.h | 92 ++ + include/crypto/scatterwalk.h | 15 + + include/linux/Kbuild | 1 + + include/linux/if_alg.h | 40 + + include/linux/socket.h | 5 +- + net/core/sock.c | 6 +- + 32 files changed, 4763 insertions(+), 450 deletions(-) + create mode 100644 crypto/af_alg.c + create mode 100644 crypto/algif_hash.c + create mode 100644 crypto/algif_skcipher.c + create mode 100644 include/crypto/if_alg.h + create mode 100644 include/linux/if_alg.h +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging gcl-current/merge +$ git merge gcl-current/merge +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Merge made by recursive. + arch/arm/include/asm/pgalloc.h | 2 +- + arch/arm/include/asm/pgtable.h | 24 ++++++++++++++---------- + arch/arm/include/asm/tlb.h | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 7 ++++++- + arch/arm/mm/dma-mapping.c | 11 ++++++++++- + arch/arm/mm/fault-armv.c | 7 ++++++- + arch/arm/mm/fault.c | 29 +++++++++++++++++++++++++---- + arch/arm/mm/idmap.c | 35 +++++++++++++++++++++++++++++------ + arch/arm/mm/mm.h | 2 +- + arch/arm/mm/mmu.c | 22 ++++++++++++++++++---- + arch/arm/mm/pgd.c | 24 ++++++++++++++++++++---- + 11 files changed, 131 insertions(+), 33 deletions(-) +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/mach-mx27_3ds.c | 4 +- + arch/arm/mach-mx5/Kconfig | 2 + + arch/arm/mach-mx5/board-mx53_evk.c | 37 ++++++++++++++++++++ + arch/arm/mach-mx5/clock-mx51-mx53.c | 4 ++ + arch/arm/mach-mx5/devices-imx53.h | 14 +++++++ + arch/arm/plat-mxc/devices/Kconfig | 2 +- + arch/arm/plat-mxc/devices/platform-fec.c | 5 +++ + arch/arm/plat-mxc/devices/platform-imx-i2c.c | 9 +++++ + .../plat-mxc/devices/platform-sdhci-esdhc-imx.c | 12 ++++++ + arch/arm/plat-mxc/include/mach/iomux-mx53.h | 1 - + arch/arm/plat-mxc/include/mach/iomux-v3.h | 1 + + arch/arm/plat-mxc/include/mach/mx53.h | 18 +++++----- + arch/arm/plat-mxc/ssi-fiq.S | 2 + + 13 files changed, 98 insertions(+), 13 deletions(-) +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + arch/arm/mach-omap2/board-igep0020.c | 33 ++++++++++ + arch/arm/mach-omap2/board-igep0030.c | 84 ++++++++++++++++++++++---- + arch/arm/mach-omap2/board-omap4panda.c | 10 +++ + arch/arm/mach-omap2/board-zoom-peripherals.c | 4 +- + arch/arm/mach-omap2/clock3xxx_data.c | 2 +- + arch/arm/mach-omap2/clockdomain.h | 2 - + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/mux34xx.c | 4 +- + arch/arm/mach-omap2/mux44xx.c | 6 +- + arch/arm/mach-omap2/omap_twl.c | 10 ++- + arch/arm/mach-omap2/pm_bus.c | 4 +- + arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++- + arch/arm/mach-omap2/sr_device.c | 1 + + arch/arm/mach-omap2/wd_timer.c | 2 + + arch/arm/mm/Kconfig | 2 +- + arch/arm/plat-omap/gpio.c | 12 +++- + arch/arm/plat-omap/include/plat/voltage.h | 17 ++++- + 18 files changed, 219 insertions(+), 41 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Merge made by recursive. + arch/arm/mach-s3c2410/h1940-bluetooth.c | 11 +- + arch/arm/mach-s3c2410/include/mach/h1940.h | 3 + + arch/arm/mach-s3c2410/mach-h1940.c | 302 ++++++++++++++++++++++++++-- + arch/arm/mach-s3c2440/mach-rx1950.c | 57 ++++++ + 4 files changed, 356 insertions(+), 17 deletions(-) +Merging s5p/for-next +$ git merge s5p/for-next +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/mach-s5pv310/cpu.c +Removing arch/arm/mach-s5pv310/include/mach/regs-srom.h +Merge made by recursive. + arch/arm/Kconfig | 1 + + arch/arm/mach-s3c2410/bast-irq.c | 22 +- + arch/arm/mach-s3c2410/include/mach/irqs.h | 4 +- + arch/arm/mach-s3c2410/include/mach/map.h | 4 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 1 + + arch/arm/mach-s3c2412/irq.c | 50 +- + arch/arm/mach-s3c2416/Kconfig | 12 + + arch/arm/mach-s3c2416/Makefile | 4 + + arch/arm/mach-s3c2416/clock.c | 18 +- + arch/arm/mach-s3c2416/irq.c | 76 ++-- + arch/arm/mach-s3c2416/mach-smdk2416.c | 23 + + arch/arm/mach-s3c2416/s3c2416.c | 5 + + arch/arm/mach-s3c2416/setup-sdhci-gpio.c | 34 ++ + arch/arm/mach-s3c2416/setup-sdhci.c | 61 ++ + arch/arm/mach-s3c2440/irq.c | 18 +- + arch/arm/mach-s3c2440/s3c244x-irq.c | 18 +- + arch/arm/mach-s3c2443/Kconfig | 3 +- + arch/arm/mach-s3c2443/clock.c | 4 +- + arch/arm/mach-s3c2443/irq.c | 95 ++-- + arch/arm/mach-s3c2443/mach-smdk2443.c | 9 +- + arch/arm/mach-s3c2443/s3c2443.c | 7 + + arch/arm/mach-s3c64xx/clock.c | 21 +- + arch/arm/mach-s3c64xx/dev-audio.c | 60 ++- + arch/arm/mach-s3c64xx/dma.c | 1 + + arch/arm/mach-s3c64xx/irq-eint.c | 37 +- + arch/arm/mach-s5p6442/clock.c | 16 +- + arch/arm/mach-s5p6442/dev-audio.c | 44 ++- + arch/arm/mach-s5p6442/include/mach/map.h | 3 + + arch/arm/mach-s5p6442/mach-smdk6442.c | 10 + + arch/arm/mach-s5p6442/setup-i2c0.c | 5 +- + arch/arm/mach-s5p64x0/Makefile | 4 +- + arch/arm/mach-s5p64x0/clock-s5p6440.c | 24 +- + arch/arm/mach-s5p64x0/clock-s5p6450.c | 36 +- + arch/arm/mach-s5p64x0/dev-audio.c | 144 ++++- + arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} | 221 +++++++- + arch/arm/mach-s5p64x0/include/mach/map.h | 5 + + arch/arm/mach-s5p64x0/include/mach/regs-gpio.h | 57 +-- + arch/arm/mach-s5p64x0/mach-smdk6440.c | 1 + + arch/arm/mach-s5p64x0/mach-smdk6450.c | 1 + + arch/arm/mach-s5pc100/clock.c | 16 +- + arch/arm/mach-s5pc100/dev-audio.c | 54 ++- + arch/arm/mach-s5pc100/include/mach/map.h | 2 + + arch/arm/mach-s5pv210/Kconfig | 2 + + arch/arm/mach-s5pv210/clock.c | 35 +- + arch/arm/mach-s5pv210/cpu.c | 5 - + arch/arm/mach-s5pv210/dev-audio.c | 56 ++- + arch/arm/mach-s5pv210/include/mach/irqs.h | 3 +- + arch/arm/mach-s5pv210/include/mach/map.h | 6 + + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 5 +- + arch/arm/mach-s5pv210/mach-smdkc110.c | 1 + + arch/arm/mach-s5pv210/mach-smdkv210.c | 139 +++++- + arch/arm/mach-s5pv310/Kconfig | 16 + + arch/arm/mach-s5pv310/Makefile | 6 +- + arch/arm/mach-s5pv310/clock.c | 77 ++- + arch/arm/mach-s5pv310/cpu.c | 21 +- + arch/arm/mach-s5pv310/cpufreq.c | 580 ++++++++++++++++++++ + arch/arm/mach-s5pv310/dev-audio.c | 364 ++++++++++++ + arch/arm/mach-s5pv310/dev-pd.c | 139 +++++ + arch/arm/mach-s5pv310/dma.c | 168 ++++++ + arch/arm/mach-s5pv310/include/mach/dma.h | 26 + + arch/arm/mach-s5pv310/include/mach/irqs.h | 19 +- + arch/arm/mach-s5pv310/include/mach/map.h | 31 + + arch/arm/mach-s5pv310/include/mach/regs-clock.h | 80 +++- + arch/arm/mach-s5pv310/include/mach/regs-mem.h | 23 + + arch/arm/mach-s5pv310/include/mach/regs-pmu.h | 30 + + arch/arm/mach-s5pv310/include/mach/regs-srom.h | 50 -- + arch/arm/mach-s5pv310/irq-combiner.c | 32 +- + arch/arm/mach-s5pv310/irq-eint.c | 55 +- + arch/arm/mach-s5pv310/mach-smdkc210.c | 51 ++- + arch/arm/mach-s5pv310/mach-smdkv310.c | 51 ++- + arch/arm/mach-s5pv310/mach-universal_c210.c | 80 +++ + arch/arm/plat-s3c24xx/devs.c | 1 - + arch/arm/plat-s3c24xx/include/plat/irq.h | 4 +- + arch/arm/plat-s3c24xx/irq-pm.c | 9 +- + arch/arm/plat-s3c24xx/irq.c | 182 +++---- + arch/arm/plat-s3c24xx/s3c2443-clock.c | 2 +- + arch/arm/plat-s5p/Kconfig | 10 + + arch/arm/plat-s5p/Makefile | 2 + + arch/arm/plat-s5p/cpu.c | 5 + + arch/arm/plat-s5p/dev-csis0.c | 34 ++ + arch/arm/plat-s5p/dev-csis1.c | 34 ++ + arch/arm/plat-s5p/include/plat/csis.h | 28 + + arch/arm/plat-s5p/include/plat/map-s5p.h | 1 + + arch/arm/plat-s5p/include/plat/regs-srom.h | 54 ++ + arch/arm/plat-s5p/irq-eint.c | 86 ++-- + arch/arm/plat-s5p/irq-gpioint.c | 50 +- + arch/arm/plat-s5p/irq-pm.c | 6 +- + arch/arm/plat-samsung/Kconfig | 14 + + arch/arm/plat-samsung/Makefile | 4 + + arch/arm/plat-samsung/dev-nand.c | 2 - + arch/arm/plat-samsung/gpio-config.c | 42 ++ + arch/arm/plat-samsung/gpiolib.c | 7 + + arch/arm/plat-samsung/include/plat/audio.h | 24 + + arch/arm/plat-samsung/include/plat/devs.h | 15 + + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 + + arch/arm/plat-samsung/include/plat/pd.h | 30 + + arch/arm/plat-samsung/include/plat/pm.h | 4 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 35 ++ + arch/arm/plat-samsung/irq-uart.c | 40 +- + arch/arm/plat-samsung/irq-vic-timer.c | 26 +- + arch/arm/plat-samsung/pd.c | 95 ++++ + arch/arm/plat-samsung/pm.c | 6 +- + 103 files changed, 3434 insertions(+), 804 deletions(-) + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci-gpio.c + create mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c + rename arch/arm/mach-s5p64x0/{gpio.c => gpiolib.c} (58%) + create mode 100644 arch/arm/mach-s5pv310/cpufreq.c + create mode 100644 arch/arm/mach-s5pv310/dev-audio.c + create mode 100644 arch/arm/mach-s5pv310/dev-pd.c + create mode 100644 arch/arm/mach-s5pv310/dma.c + create mode 100644 arch/arm/mach-s5pv310/include/mach/dma.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-mem.h + create mode 100644 arch/arm/mach-s5pv310/include/mach/regs-pmu.h + delete mode 100644 arch/arm/mach-s5pv310/include/mach/regs-srom.h + create mode 100644 arch/arm/plat-s5p/dev-csis0.c + create mode 100644 arch/arm/plat-s5p/dev-csis1.c + create mode 100644 arch/arm/plat-s5p/include/plat/csis.h + create mode 100644 arch/arm/plat-s5p/include/plat/regs-srom.h + create mode 100644 arch/arm/plat-samsung/include/plat/pd.h + create mode 100644 arch/arm/plat-samsung/pd.c +Merging tegra/for-next +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/timer.c' using previous resolution. +Auto-merging arch/arm/mach-tegra/timer.c +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 218efee] Merge remote branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Auto-merging MAINTAINERS +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 +Auto-merging drivers/serial/Kconfig +Merge made by recursive. + MAINTAINERS | 82 +- + arch/blackfin/Makefile | 9 +- + arch/blackfin/boot/Makefile | 2 +- + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 113 ++ + arch/blackfin/configs/DNP5370_defconfig | 121 ++ + arch/blackfin/include/asm/bfin_dma.h | 91 + + arch/blackfin/include/asm/bfin_serial.h | 275 +++ + arch/blackfin/include/asm/bitops.h | 2 + + arch/blackfin/include/asm/cache.h | 2 + + arch/blackfin/include/asm/cacheflush.h | 3 + + arch/blackfin/include/asm/dma.h | 37 +- + arch/blackfin/include/asm/dpmc.h | 2 + + arch/blackfin/include/asm/io.h | 268 +--- + arch/blackfin/include/asm/irqflags.h | 3 - + arch/blackfin/include/asm/processor.h | 4 +- + arch/blackfin/include/asm/spinlock.h | 28 +- + arch/blackfin/include/mach-common/pll.h | 86 + + 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/kernel/cplb-nompu/cplbinit.c | 2 +- + arch/blackfin/kernel/kgdb.c | 26 + + arch/blackfin/kernel/kgdb_test.c | 4 + + arch/blackfin/mach-bf518/boards/ezbrd.c | 29 +- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 12 +- + 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-bf518/include/mach/pll.h | 64 +- + arch/blackfin/mach-bf527/boards/ad7160eval.c | 13 +- + arch/blackfin/mach-bf527/boards/cm_bf527.c | 13 +- + arch/blackfin/mach-bf527/boards/ezbrd.c | 13 +- + arch/blackfin/mach-bf527/boards/ezkit.c | 18 +- + arch/blackfin/mach-bf527/boards/tll6527m.c | 14 +- + 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-bf527/include/mach/pll.h | 64 +- + arch/blackfin/mach-bf533/boards/H8606.c | 2 +- + arch/blackfin/mach-bf533/boards/blackstamp.c | 25 +- + arch/blackfin/mach-bf533/boards/cm_bf533.c | 10 +- + arch/blackfin/mach-bf533/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf533/boards/ip0x.c | 11 +- + arch/blackfin/mach-bf533/boards/stamp.c | 30 +- + 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-bf533/include/mach/pll.h | 58 +- + arch/blackfin/mach-bf537/boards/Kconfig | 6 + + arch/blackfin/mach-bf537/boards/Makefile | 1 + + arch/blackfin/mach-bf537/boards/cm_bf537e.c | 12 +- + arch/blackfin/mach-bf537/boards/cm_bf537u.c | 12 +- + arch/blackfin/mach-bf537/boards/dnp5370.c | 418 ++++ + arch/blackfin/mach-bf537/boards/minotaur.c | 12 +- + arch/blackfin/mach-bf537/boards/pnav10.c | 4 +- + arch/blackfin/mach-bf537/boards/stamp.c | 18 +- + arch/blackfin/mach-bf537/boards/tcm_bf537.c | 12 +- + 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-bf537/include/mach/pll.h | 58 +- + arch/blackfin/mach-bf538/boards/ezkit.c | 20 +- + 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-bf538/include/mach/pll.h | 64 +- + arch/blackfin/mach-bf548/boards/cm_bf548.c | 23 +- + arch/blackfin/mach-bf548/boards/ezkit.c | 23 +- + 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-bf548/include/mach/irq.h | 22 + + arch/blackfin/mach-bf548/include/mach/pll.h | 70 +- + arch/blackfin/mach-bf561/atomic.S | 5 + + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- + arch/blackfin/mach-bf561/boards/cm_bf561.c | 2 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf561/boards/tepla.c | 2 +- + arch/blackfin/mach-bf561/dma.c | 18 +- + arch/blackfin/mach-bf561/hotplug.c | 2 + + arch/blackfin/mach-bf561/include/mach/anomaly.h | 6 +- + .../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/include/mach/mem_map.h | 16 +- + arch/blackfin/mach-bf561/include/mach/pll.h | 83 +- + arch/blackfin/mach-bf561/include/mach/smp.h | 10 +- + arch/blackfin/mach-bf561/smp.c | 29 +- + arch/blackfin/mach-common/entry.S | 4 +- + arch/blackfin/mach-common/ints-priority.c | 1 - + arch/blackfin/mach-common/pm.c | 10 - + arch/blackfin/mach-common/smp.c | 204 +-- + arch/blackfin/mm/sram-alloc.c | 18 +- + drivers/net/irda/bfin_sir.h | 2 + + drivers/serial/Kconfig | 70 +- + drivers/serial/bfin_5xx.c | 638 ++++--- + include/asm-generic/io.h | 30 + + 157 files changed, 9963 insertions(+), 11015 deletions(-) + create mode 100644 arch/blackfin/configs/BF561-EZKIT-SMP_defconfig + create mode 100644 arch/blackfin/configs/DNP5370_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/pll.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/boards/dnp5370.c + 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 +Auto-merging arch/ia64/kernel/perfmon.c +Merge made by recursive. + Documentation/ABI/testing/pstore | 35 ++++ + Documentation/ABI/testing/sysfs-fs-pstore | 7 + + arch/ia64/kernel/irq_ia64.c | 2 +- + arch/ia64/kernel/perfmon.c | 3 +- + arch/ia64/kernel/smp.c | 13 +- + arch/ia64/kernel/time.c | 2 +- + drivers/acpi/apei/Kconfig | 1 + + drivers/acpi/apei/erst.c | 136 ++++++++++++++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/pstore/Kconfig | 13 ++ + fs/pstore/Makefile | 7 + + fs/pstore/inode.c | 285 +++++++++++++++++++++++++++++ + fs/pstore/internal.h | 7 + + fs/pstore/platform.c | 202 ++++++++++++++++++++ + include/linux/magic.h | 1 + + include/linux/pstore.h | 60 ++++++ + 17 files changed, 769 insertions(+), 7 deletions(-) + create mode 100644 Documentation/ABI/testing/pstore + create mode 100644 Documentation/ABI/testing/sysfs-fs-pstore + create mode 100644 fs/pstore/Kconfig + create mode 100644 fs/pstore/Makefile + create mode 100644 fs/pstore/inode.c + create mode 100644 fs/pstore/internal.h + create mode 100644 fs/pstore/platform.c + create mode 100644 include/linux/pstore.h +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/include/asm/mcfcache.h +Removing arch/m68knommu/mm/fault.c +Removing arch/m68knommu/mm/memory.c +Auto-merging arch/m68knommu/platform/coldfire/entry.S +Merge made by recursive. + arch/m68k/include/asm/cacheflush_no.h | 95 ++++++-------- + arch/m68k/include/asm/coldfire.h | 2 +- + arch/m68k/include/asm/entry_no.h | 59 +++++---- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/io_no.h | 1 - + arch/m68k/include/asm/m5206sim.h | 14 ++- + arch/m68k/include/asm/m520xsim.h | 17 +++- + arch/m68k/include/asm/m523xsim.h | 11 ++ + arch/m68k/include/asm/m5249sim.h | 10 ++ + arch/m68k/include/asm/m5272sim.h | 8 + + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 11 ++ + arch/m68k/include/asm/m52xxacr.h | 94 ++++++++++++++ + arch/m68k/include/asm/m5307sim.h | 43 +++---- + arch/m68k/include/asm/m532xsim.h | 33 ++---- + arch/m68k/include/asm/m53xxacr.h | 101 +++++++++++++++ + arch/m68k/include/asm/m5407sim.h | 42 +----- + arch/m68k/include/asm/m54xxacr.h | 97 ++++++++++++++ + arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} | 10 +- + arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} | 23 +++- + arch/m68k/include/asm/mcfcache.h | 150 ---------------------- + arch/m68k/include/asm/mcfsim.h | 4 +- + arch/m68k/include/asm/mcfuart.h | 45 +------- + arch/m68k/include/asm/processor.h | 13 +- + arch/m68knommu/Kconfig | 99 +++++++++++++-- + arch/m68knommu/Makefile | 14 +- + arch/m68knommu/kernel/setup.c | 72 +++-------- + arch/m68knommu/mm/Makefile | 2 +- + arch/m68knommu/mm/fault.c | 57 -------- + arch/m68knommu/mm/kmap.c | 9 -- + arch/m68knommu/mm/memory.c | 33 ----- + arch/m68knommu/platform/{548x => 54xx}/Makefile | 0 + arch/m68knommu/platform/{548x => 54xx}/config.c | 32 +++--- + arch/m68knommu/platform/coldfire/Makefile | 4 +- + arch/m68knommu/platform/coldfire/cache.c | 48 +++++++ + arch/m68knommu/platform/coldfire/entry.S | 56 ++------- + arch/m68knommu/platform/coldfire/head.S | 26 +++- + 37 files changed, 726 insertions(+), 621 deletions(-) + create mode 100644 arch/m68k/include/asm/m52xxacr.h + create mode 100644 arch/m68k/include/asm/m53xxacr.h + create mode 100644 arch/m68k/include/asm/m54xxacr.h + rename arch/m68k/include/asm/{m548xgpt.h => m54xxgpt.h} (95%) + rename arch/m68k/include/asm/{m548xsim.h => m54xxsim.h} (73%) + delete mode 100644 arch/m68k/include/asm/mcfcache.h + delete mode 100644 arch/m68knommu/mm/fault.c + delete mode 100644 arch/m68knommu/mm/memory.c + rename arch/m68knommu/platform/{548x => 54xx}/Makefile (100%) + rename arch/m68knommu/platform/{548x => 54xx}/config.c (74%) + create mode 100644 arch/m68knommu/platform/coldfire/cache.c +Merging microblaze/next +$ git merge microblaze/next +Removing arch/microblaze/lib/muldi3.S +Merge made by recursive. + arch/microblaze/Kconfig.debug | 4 - + arch/microblaze/Makefile | 2 +- + arch/microblaze/configs/mmu_defconfig | 1 - + arch/microblaze/include/asm/pvr.h | 185 +++++++++++++------------ + arch/microblaze/kernel/cpu/cpuinfo.c | 1 + + arch/microblaze/kernel/entry.S | 46 +++++- + arch/microblaze/kernel/exceptions.c | 3 + + arch/microblaze/kernel/hw_exception_handler.S | 9 ++ + arch/microblaze/kernel/prom.c | 4 +- + arch/microblaze/kernel/vmlinux.lds.S | 16 +-- + arch/microblaze/lib/memmove.c | 2 +- + arch/microblaze/lib/muldi3.S | 121 ---------------- + arch/microblaze/lib/muldi3.c | 60 ++++++++ + 13 files changed, 214 insertions(+), 240 deletions(-) + delete mode 100644 arch/microblaze/lib/muldi3.S + create mode 100644 arch/microblaze/lib/muldi3.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Merge made by recursive. + arch/mips/Kconfig | 4 + + arch/mips/include/asm/cpu-info.h | 1 + + arch/mips/include/asm/inst.h | 14 + + arch/mips/include/asm/jump_label.h | 48 +++ + arch/mips/include/asm/mips_machine.h | 54 +++ + arch/mips/include/asm/mmu_context.h | 8 +- + arch/mips/include/asm/uasm.h | 7 + + arch/mips/kernel/Makefile | 3 + + arch/mips/kernel/cpu-probe.c | 2 + + arch/mips/kernel/jump_label.c | 54 +++ + arch/mips/kernel/mips_machine.c | 86 +++++ + arch/mips/kernel/module.c | 5 + + arch/mips/kernel/proc.c | 9 +- + arch/mips/kernel/traps.c | 2 +- + arch/mips/kernel/vmlinux.lds.S | 7 + + arch/mips/mm/tlbex.c | 590 +++++++++++++++++++++++++++++----- + arch/mips/mm/uasm.c | 56 ++-- + arch/mips/sibyte/common/sb_tbprof.c | 3 +- + arch/mips/txx9/generic/pci.c | 7 +- + 19 files changed, 832 insertions(+), 128 deletions(-) + create mode 100644 arch/mips/include/asm/jump_label.h + create mode 100644 arch/mips/include/asm/mips_machine.h + create mode 100644 arch/mips/kernel/jump_label.c + create mode 100644 arch/mips/kernel/mips_machine.c +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +Merging powerpc/next +$ git merge powerpc/next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/include/asm/prom.h +Auto-merging arch/powerpc/sysdev/tsi108_dev.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 8 + + Documentation/powerpc/booting-without-of.txt | 4 +- + Documentation/powerpc/dts-bindings/4xx/cpm.txt | 52 +++ + arch/powerpc/Kconfig | 16 +- + arch/powerpc/boot/dts/canyonlands.dts | 31 +- + arch/powerpc/boot/dts/kilauea.dts | 9 + + arch/powerpc/configs/40x/kilauea_defconfig | 5 + + arch/powerpc/configs/44x/canyonlands_defconfig | 3 + + arch/powerpc/include/asm/bitops.h | 9 + + arch/powerpc/include/asm/cputable.h | 9 +- + arch/powerpc/include/asm/cputhreads.h | 15 +- + arch/powerpc/include/asm/device.h | 6 + + arch/powerpc/include/asm/firmware.h | 3 +- + arch/powerpc/include/asm/hvcall.h | 4 +- + arch/powerpc/include/asm/lppaca.h | 5 +- + arch/powerpc/include/asm/machdep.h | 6 +- + arch/powerpc/include/asm/mmzone.h | 5 + + arch/powerpc/include/asm/nvram.h | 52 +-- + arch/powerpc/include/asm/ppc-opcode.h | 8 + + arch/powerpc/include/asm/processor.h | 2 - + arch/powerpc/include/asm/topology.h | 10 + + arch/powerpc/include/asm/vdso_datapage.h | 2 - + arch/powerpc/kernel/Makefile | 9 +- + arch/powerpc/kernel/asm-offsets.c | 1 - + arch/powerpc/kernel/cputable.c | 22 +- + arch/powerpc/kernel/crash_dump.c | 33 ++ + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/entry_32.S | 1 + + arch/powerpc/kernel/exceptions-64s.S | 1 + + arch/powerpc/kernel/fpu.S | 1 + + arch/powerpc/kernel/head_40x.S | 1 + + arch/powerpc/kernel/head_44x.S | 1 + + arch/powerpc/kernel/head_64.S | 7 +- + arch/powerpc/kernel/head_8xx.S | 1 + + arch/powerpc/kernel/head_fsl_booke.S | 1 + + arch/powerpc/kernel/iommu.c | 14 +- + arch/powerpc/kernel/misc.S | 5 - + arch/powerpc/kernel/misc_32.S | 1 + + arch/powerpc/kernel/misc_64.S | 1 + + arch/powerpc/kernel/nvram_64.c | 481 ++++++++--------------- + arch/powerpc/kernel/pci_64.c | 3 +- + arch/powerpc/kernel/ppc_ksyms.c | 7 + + arch/powerpc/kernel/ppc_save_regs.S | 1 + + arch/powerpc/kernel/ptrace.c | 22 +- + arch/powerpc/kernel/ptrace32.c | 7 + + arch/powerpc/kernel/rtas.c | 3 + + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/smp.c | 19 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kernel/vector.S | 1 + + arch/powerpc/kernel/vio.c | 15 +- + arch/powerpc/lib/Makefile | 2 +- + arch/powerpc/lib/hweight_64.S | 110 +++++ + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/mmu_context_nohash.c | 12 +- + arch/powerpc/mm/numa.c | 303 ++++++++++++++- + arch/powerpc/mm/pgtable_32.c | 3 +- + arch/powerpc/mm/pgtable_64.c | 2 + + arch/powerpc/platforms/44x/Makefile | 5 +- + arch/powerpc/platforms/cell/beat_iommu.c | 3 +- + arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 3 +- + arch/powerpc/platforms/chrp/time.c | 4 + + arch/powerpc/platforms/iseries/mf.c | 62 --- + arch/powerpc/platforms/pasemi/iommu.c | 19 +- + arch/powerpc/platforms/powermac/setup.c | 9 + + arch/powerpc/platforms/pseries/Kconfig | 10 + + arch/powerpc/platforms/pseries/Makefile | 1 + + arch/powerpc/platforms/pseries/firmware.c | 1 + + arch/powerpc/platforms/pseries/hvCall.S | 1 + + arch/powerpc/platforms/pseries/iommu.c | 49 +-- + arch/powerpc/platforms/pseries/lpar.c | 12 + + arch/powerpc/platforms/pseries/nvram.c | 205 ++++++++++ + arch/powerpc/platforms/pseries/pseries_energy.c | 326 +++++++++++++++ + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/dart_iommu.c | 9 +- + arch/powerpc/sysdev/ppc4xx_cpm.c | 346 ++++++++++++++++ + arch/powerpc/sysdev/tsi108_dev.c | 8 +- + drivers/char/hvc_vio.c | 2 +- + drivers/macintosh/macio_asic.c | 7 +- + drivers/macintosh/therm_pm72.c | 30 +-- + drivers/ps3/Makefile | 2 +- + drivers/rtc/rtc-cmos.c | 3 +- + 82 files changed, 1852 insertions(+), 631 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/4xx/cpm.txt + create mode 100644 arch/powerpc/lib/hweight_64.S + create mode 100644 arch/powerpc/platforms/pseries/pseries_energy.c + create mode 100644 arch/powerpc/sysdev/ppc4xx_cpm.c +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Merge made by recursive. + arch/powerpc/boot/dts/mpc8308_p1m.dts | 8 ++ + arch/powerpc/boot/dts/mpc8308rdb.dts | 8 ++ + arch/powerpc/platforms/Kconfig | 7 +- + arch/powerpc/sysdev/mpc8xxx_gpio.c | 75 ++++++++++++-- + drivers/dma/Kconfig | 2 +- + drivers/dma/mpc512x_dma.c | 187 +++++++++++++++++++++------------ + 6 files changed, 210 insertions(+), 77 deletions(-) +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/sh-latest +$ git merge sh/sh-latest +Merge made by recursive. + arch/sh/boards/mach-sdk7786/setup.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +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 647692e] Merge remote branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging fs/ceph/dir.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/super.h +Merge made by recursive. + fs/ceph/Makefile | 23 +--------------- + fs/ceph/debugfs.c | 9 ++++-- + fs/ceph/dir.c | 20 ++++++++++++++ + fs/ceph/export.c | 2 +- + fs/ceph/inode.c | 4 +++ + fs/ceph/mds_client.c | 56 +++++++++++++++++++++++++-------------- + fs/ceph/mds_client.h | 2 +- + fs/ceph/super.c | 13 ++++++--- + fs/ceph/super.h | 2 + + include/linux/ceph/ceph_fs.h | 16 +++++++++-- + include/linux/ceph/messenger.h | 5 --- + net/ceph/ceph_hash.c | 3 ++ + net/ceph/messenger.c | 46 +------------------------------- + net/ceph/osdmap.c | 4 ++- + 14 files changed, 101 insertions(+), 104 deletions(-) +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/ecryptfs/main.c +Auto-merging include/linux/magic.h +Merge made by recursive. + fs/ecryptfs/crypto.c | 30 ++++++++++++++---------------- + fs/ecryptfs/ecryptfs_kernel.h | 5 ++--- + fs/ecryptfs/file.c | 28 +++++++++++++--------------- + fs/ecryptfs/inode.c | 32 ++++++++++++++------------------ + fs/ecryptfs/keystore.c | 26 +++++++++++++------------- + fs/ecryptfs/kthread.c | 19 +++++++++++++++---- + fs/ecryptfs/main.c | 12 +++++++----- + fs/ecryptfs/mmap.c | 35 +++++++++++++++++++++-------------- + include/linux/magic.h | 1 + + 9 files changed, 100 insertions(+), 88 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext2/super.c +Auto-merging fs/ext3/super.c +Merge made by recursive. + fs/ext2/dir.c | 19 +++- + fs/ext2/namei.c | 2 +- + fs/ext2/super.c | 25 +++-- + fs/ext3/balloc.c | 266 ++++++++++++++++++++++++++++++++++++++++++++++ + fs/ext3/dir.c | 15 ++-- + fs/ext3/inode.c | 6 +- + fs/ext3/ioctl.c | 22 ++++ + fs/ext3/namei.c | 138 ++++++++++++++---------- + fs/ext3/resize.c | 65 +++++++++--- + fs/ext3/super.c | 64 +++++++---- + fs/mbcache.c | 12 -- + fs/quota/dquot.c | 18 ++-- + fs/quota/quota_tree.c | 9 +- + include/linux/ext3_fs.h | 10 ++ + include/linux/mbcache.h | 11 ++ + include/linux/quotaops.h | 5 +- + 16 files changed, 545 insertions(+), 142 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/resize.c +Auto-merging fs/ext4/super.c +Merge made by recursive. + fs/ext2/xattr.c | 10 +-- + fs/ext3/xattr.c | 2 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/dir.c | 58 ++++++---- + fs/ext4/ext4.h | 93 ++++++++++------ + fs/ext4/ext4_extents.h | 8 +- + fs/ext4/ext4_jbd2.h | 2 +- + fs/ext4/extents.c | 88 +++++++++------ + fs/ext4/file.c | 22 ++++ + fs/ext4/fsync.c | 4 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 74 +++++++++---- + fs/ext4/mballoc.c | 55 ++++----- + fs/ext4/migrate.c | 2 +- + fs/ext4/namei.c | 69 ++++++++---- + fs/ext4/page-io.c | 7 +- + fs/ext4/resize.c | 64 ++++++++--- + fs/ext4/super.c | 288 ++++++++++++++++++++++++++---------------------- + fs/ext4/xattr.c | 28 +++--- + fs/jbd2/journal.c | 34 +++--- + fs/jbd2/recovery.c | 2 +- + fs/jbd2/transaction.c | 6 +- + include/linux/jbd2.h | 20 +++- + 23 files changed, 562 insertions(+), 379 deletions(-) +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 +Already up-to-date. +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Already up-to-date. +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 ee45dc6] Merge remote branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/unlink.c +Auto-merging net/sunrpc/rpc_pipe.c +Merge made by recursive. + fs/lockd/Makefile | 6 +- + fs/lockd/clnt4xdr.c | 605 ++++++++ + fs/lockd/clntlock.c | 4 +- + fs/lockd/clntproc.c | 18 +- + fs/lockd/clntxdr.c | 627 +++++++++ + fs/lockd/host.c | 409 ++++--- + fs/lockd/mon.c | 110 +- + fs/lockd/svc4proc.c | 20 +- + fs/lockd/svclock.c | 34 +- + fs/lockd/svcproc.c | 28 +- + fs/lockd/xdr.c | 287 ---- + fs/lockd/xdr4.c | 255 ---- + fs/nfs/callback.c | 83 +- + fs/nfs/callback.h | 59 +- + fs/nfs/callback_proc.c | 326 +++-- + fs/nfs/callback_xdr.c | 143 ++- + fs/nfs/client.c | 302 +++-- + fs/nfs/delegation.c | 362 ++++-- + fs/nfs/delegation.h | 1 + + fs/nfs/dir.c | 72 +- + fs/nfs/idmap.c | 2 +- + fs/nfs/inode.c | 3 +- + fs/nfs/internal.h | 19 +- + fs/nfs/mount_clnt.c | 83 +- + fs/nfs/nfs2xdr.c | 1294 ++++++++++++------ + fs/nfs/nfs3xdr.c | 2889 ++++++++++++++++++++++++++++----------- + fs/nfs/nfs4_fs.h | 13 +- + fs/nfs/nfs4filelayout.c | 6 +- + fs/nfs/nfs4proc.c | 163 ++- + fs/nfs/nfs4renewd.c | 11 +- + fs/nfs/nfs4state.c | 293 +++-- + fs/nfs/nfs4xdr.c | 1426 +++++++++---------- + fs/nfs/pagelist.c | 7 +- + fs/nfs/pnfs.c | 524 +++++--- + fs/nfs/pnfs.h | 76 +- + fs/nfs/proc.c | 5 +- + fs/nfs/super.c | 18 +- + fs/nfs/unlink.c | 2 +- + fs/nfsd/nfs4callback.c | 686 ++++++---- + include/linux/lockd/debug.h | 10 - + include/linux/lockd/lockd.h | 6 +- + include/linux/nfs3.h | 3 + + include/linux/nfs_fs_sb.h | 15 +- + include/linux/nfs_xdr.h | 6 +- + include/linux/sunrpc/auth.h | 8 +- + include/linux/sunrpc/bc_xprt.h | 15 +- + include/linux/sunrpc/clnt.h | 4 +- + include/linux/sunrpc/svc.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/xdr.h | 14 +- + net/sunrpc/auth.c | 28 +- + net/sunrpc/auth_gss/auth_gss.c | 44 +- + net/sunrpc/bc_svc.c | 2 +- + net/sunrpc/clnt.c | 21 +- + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/rpcb_clnt.c | 147 +-- + net/sunrpc/svc.c | 36 +- + net/sunrpc/svcsock.c | 106 ++- + net/sunrpc/xdr.c | 155 ++- + 59 files changed, 7825 insertions(+), 4071 deletions(-) + create mode 100644 fs/lockd/clnt4xdr.c + create mode 100644 fs/lockd/clntxdr.c +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Resolved 'Documentation/filesystems/Locking' using previous resolution. +Auto-merging Documentation/filesystems/Locking +CONFLICT (content): Merge conflict in Documentation/filesystems/Locking +Auto-merging fs/locks.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/sunrpc/cache.h +Auto-merging include/linux/sunrpc/svc.h +Auto-merging include/linux/sunrpc/svc_xprt.h +Auto-merging net/sunrpc/svc.c +Auto-merging net/sunrpc/svcsock.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6b869ac] Merge remote branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 - + fs/locks.c | 8 +-- + include/linux/nfs4_acl.h => fs/nfsd/acl.h | 2 - + include/linux/nfsd_idmap.h => fs/nfsd/idmap.h | 6 +- + fs/nfsd/nfs3proc.c | 8 +- + fs/nfsd/nfs4acl.c | 2 +- + fs/nfsd/nfs4callback.c | 7 +- + fs/nfsd/nfs4idmap.c | 15 ++-- + fs/nfsd/nfs4proc.c | 50 +++++++++--- + fs/nfsd/nfs4recover.c | 1 - + fs/nfsd/nfs4state.c | 109 ++++++++----------------- + fs/nfsd/nfs4xdr.c | 73 ++++++++++++----- + fs/nfsd/nfsctl.c | 4 +- + fs/nfsd/nfsd.h | 1 + + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/state.h | 1 + + fs/nfsd/vfs.c | 8 +-- + fs/nfsd/xdr4.h | 5 + + include/linux/fs.h | 1 - + include/linux/nfs4.h | 3 + + include/linux/sunrpc/cache.h | 3 + + include/linux/sunrpc/svc.h | 1 + + include/linux/sunrpc/svc_xprt.h | 1 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 - + net/sunrpc/cache.c | 54 +++++++++---- + net/sunrpc/svc.c | 3 +- + net/sunrpc/svc_xprt.c | 93 ++++++++++------------ + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcauth_unix.c | 17 +++- + net/sunrpc/svcsock.c | 10 ++- + 32 files changed, 271 insertions(+), 230 deletions(-) + rename include/linux/nfs4_acl.h => fs/nfsd/acl.h (98%) + rename include/linux/nfsd_idmap.h => fs/nfsd/idmap.h (92%) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging MAINTAINERS +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/ocfs2/namei.c +Merge made by recursive. + MAINTAINERS | 5 +- + fs/ocfs2/Kconfig | 2 +- + fs/ocfs2/alloc.c | 77 +---------- + fs/ocfs2/alloc.h | 4 - + fs/ocfs2/aops.c | 59 ++++++++- + fs/ocfs2/cluster/heartbeat.c | 246 ++++++++++++++++++++++++++++----- + fs/ocfs2/cluster/netdebug.c | 286 ++++++++++++++++++++++++++------------- + fs/ocfs2/cluster/tcp.c | 145 ++++++++++++++------ + fs/ocfs2/cluster/tcp_internal.h | 33 +++-- + fs/ocfs2/dlm/dlmast.c | 76 +++++++---- + fs/ocfs2/dlm/dlmcommon.h | 86 ++++++------ + fs/ocfs2/dlm/dlmdebug.c | 200 ++++++++++----------------- + fs/ocfs2/dlm/dlmdebug.h | 5 - + fs/ocfs2/dlm/dlmdomain.c | 10 +- + fs/ocfs2/dlm/dlmlock.c | 3 + + fs/ocfs2/dlm/dlmthread.c | 132 +++++++++--------- + fs/ocfs2/namei.c | 5 +- + fs/ocfs2/ocfs2.h | 5 + + 18 files changed, 845 insertions(+), 534 deletions(-) +Merging omfs/for-next +$ git merge omfs/for-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Merge made by recursive. + fs/squashfs/Kconfig | 3 --- + fs/squashfs/block.c | 1 - + fs/squashfs/cache.c | 1 - + fs/squashfs/decompressor.c | 9 ++------- + fs/squashfs/decompressor.h | 5 +++++ + fs/squashfs/fragment.c | 1 - + fs/squashfs/id.c | 1 - + fs/squashfs/lzo_wrapper.c | 1 - + fs/squashfs/squashfs.h | 8 -------- + fs/squashfs/squashfs_fs_i.h | 6 ++++++ + fs/squashfs/xattr_id.c | 1 - + fs/squashfs/zlib_wrapper.c | 15 +++++++++------ + 12 files changed, 22 insertions(+), 30 deletions(-) +Merging udf/for_next +$ git merge udf/for_next +Auto-merging fs/udf/super.c +Merge made by recursive. + fs/udf/balloc.c | 3 +- + fs/udf/dir.c | 5 -- + fs/udf/file.c | 11 ++--- + fs/udf/ialloc.c | 21 +++------- + fs/udf/inode.c | 51 +++++++++++-------------- + fs/udf/namei.c | 107 ++++++++++++++-------------------------------------- + fs/udf/partition.c | 27 +++++++++---- + fs/udf/super.c | 67 ++++++++++++++++++++------------- + fs/udf/symlink.c | 12 +++-- + fs/udf/udf_i.h | 13 ++++++ + fs/udf/udf_sb.h | 22 +++++++++-- + fs/udf/udfdecl.h | 4 +- + 12 files changed, 164 insertions(+), 179 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + fs/9p/Kconfig | 5 +- + fs/9p/Makefile | 1 + + fs/9p/acl.c | 4 +- + fs/9p/v9fs.h | 42 +++- + fs/9p/vfs_inode.c | 865 +----------------------------------------------- + fs/9p/vfs_inode_dotl.c | 837 ++++++++++++++++++++++++++++++++++++++++++++++ + fs/9p/xattr.c | 2 +- + net/9p/protocol.c | 22 +- + 8 files changed, 900 insertions(+), 878 deletions(-) + create mode 100644 fs/9p/vfs_inode_dotl.c +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Resolved 'fs/xfs/xfs_iget.c' using previous resolution. +Removing fs/xfs/linux-2.6/sv.h +Auto-merging fs/xfs/xfs_iget.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_iget.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 82bf889] Merge remote branch 'xfs/master' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/linux-2.6/sv.h | 59 ---- + fs/xfs/linux-2.6/xfs_aops.c | 425 ++++++++++-------------- + fs/xfs/linux-2.6/xfs_aops.h | 16 + + fs/xfs/linux-2.6/xfs_buf.c | 235 +++++++++----- + fs/xfs/linux-2.6/xfs_buf.h | 22 +- + fs/xfs/linux-2.6/xfs_export.c | 12 +- + fs/xfs/linux-2.6/xfs_linux.h | 1 - + fs/xfs/linux-2.6/xfs_super.c | 22 +- + fs/xfs/linux-2.6/xfs_sync.c | 92 ++++-- + fs/xfs/linux-2.6/xfs_trace.h | 59 ++-- + fs/xfs/quota/xfs_dquot.c | 1 - + fs/xfs/xfs_ag.h | 2 +- + fs/xfs/xfs_alloc.c | 351 ++++++++------------ + fs/xfs/xfs_attr_leaf.c | 4 +- + fs/xfs/xfs_btree.c | 9 +- + fs/xfs/xfs_buf_item.c | 32 ++- + fs/xfs/xfs_buf_item.h | 11 - + fs/xfs/xfs_extfree_item.c | 97 +++--- + fs/xfs/xfs_extfree_item.h | 11 +- + fs/xfs/xfs_fsops.c | 1 + + fs/xfs/xfs_iget.c | 76 ++++- + fs/xfs/xfs_inode.c | 54 +++- + fs/xfs/xfs_inode.h | 15 +- + fs/xfs/xfs_inode_item.c | 92 +++++- + fs/xfs/xfs_iomap.c | 233 +++++--------- + fs/xfs/xfs_iomap.h | 27 +-- + fs/xfs/xfs_log.c | 739 +++++++++++++++++++---------------------- + fs/xfs/xfs_log_cil.c | 17 +- + fs/xfs/xfs_log_priv.h | 127 ++++++-- + fs/xfs/xfs_log_recover.c | 620 ++++++++++++++--------------------- + fs/xfs/xfs_mount.c | 23 ++- + fs/xfs/xfs_mount.h | 14 + + fs/xfs/xfs_trans.c | 79 +++++- + fs/xfs/xfs_trans.h | 2 +- + fs/xfs/xfs_trans_ail.c | 232 +++++++------ + fs/xfs/xfs_trans_extfree.c | 8 +- + fs/xfs/xfs_trans_priv.h | 35 ++- + fs/xfs/xfs_vnodeops.c | 61 +++-- + 38 files changed, 1996 insertions(+), 1920 deletions(-) + delete mode 100644 fs/xfs/linux-2.6/sv.h +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Resolved 'drivers/net/skge.c' using previous resolution. +Resolved 'drivers/net/sky2.c' using previous resolution. +Auto-merging arch/x86/Kconfig +Auto-merging drivers/media/video/cafe_ccic.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/sfc/falcon.c +Auto-merging drivers/net/skge.c +CONFLICT (content): Merge conflict in drivers/net/skge.c +Auto-merging drivers/net/sky2.c +CONFLICT (content): Merge conflict in drivers/net/sky2.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merging drivers/scsi/ipr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bd0376f] Merge remote branch 'pci/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 31 +++- + arch/x86/Kconfig | 10 +- + arch/x86/pci/broadcom_bus.c | 11 +- + arch/x86/pci/common.c | 41 ++++++ + arch/x86/pci/irq.c | 3 +- + drivers/acpi/apei/hest.c | 22 ++-- + drivers/acpi/pci_root.c | 35 +++++ + drivers/media/video/cafe_ccic.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 4 +- + drivers/net/sfc/falcon.c | 25 +--- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/pci/Makefile | 3 +- + drivers/pci/msi.c | 5 +- + drivers/pci/msi.h | 6 - + drivers/pci/pci-acpi.c | 3 +- + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci-label.c | 236 ++++++++++++++++++++++++++++++- + drivers/pci/pci-stub.c | 7 + + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/pci.c | 25 +--- + drivers/pci/pci.h | 16 +-- + drivers/pci/pcie/aer/aerdrv.c | 1 + + drivers/pci/pcie/aer/aerdrv.h | 3 - + drivers/pci/pcie/aspm.c | 21 +++- + drivers/pci/pcie/pme.c | 31 +---- + drivers/pci/pcie/portdrv.h | 5 +- + drivers/pci/pcie/portdrv_acpi.c | 23 +--- + drivers/pci/pcie/portdrv_core.c | 25 ++-- + drivers/pci/pcie/portdrv_pci.c | 37 +++++- + drivers/scsi/ipr.c | 8 +- + drivers/scsi/pmcraid.c | 7 +- + drivers/staging/sm7xx/smtcfb.c | 2 +- + include/acpi/apei.h | 6 + + include/linux/pci-acpi.h | 6 + + include/linux/pci-aspm.h | 5 +- + include/linux/pci.h | 20 ++- + include/linux/pci_ids.h | 3 +- + include/linux/pci_regs.h | 10 ++ + sound/pci/cs5535audio/cs5535audio_pm.c | 7 +- + 39 files changed, 519 insertions(+), 199 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 82bf889 Merge remote branch 'xfs/master' +Merging refs/next/20110107/pci +$ git merge refs/next/20110107/pci +Resolved 'drivers/net/skge.c' using previous resolution. +Resolved 'drivers/net/sky2.c' using previous resolution. +Auto-merging drivers/media/video/cafe_ccic.c +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/sfc/falcon.c +Auto-merging drivers/net/skge.c +CONFLICT (content): Merge conflict in drivers/net/skge.c +Auto-merging drivers/net/sky2.c +CONFLICT (content): Merge conflict in drivers/net/sky2.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00pci.c +Auto-merging drivers/scsi/ipr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c3f692] Merge commit 'refs/next/20110107/pci' +$ git diff -M --stat --summary HEAD^.. + arch/x86/pci/irq.c | 3 +- + drivers/media/video/cafe_ccic.c | 4 +-- + drivers/net/myri10ge/myri10ge.c | 4 +-- + drivers/net/sfc/falcon.c | 25 ++++---------------- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/pci/msi.c | 5 ++- + drivers/pci/msi.h | 6 ----- + drivers/pci/pci-acpi.c | 1 + + drivers/pci/pci-driver.c | 5 ++- + drivers/pci/pci-stub.c | 7 ++++++ + drivers/pci/pci.c | 7 +---- + drivers/pci/pcie/aspm.c | 21 ++++++++++++++--- + drivers/pci/pcie/pme.c | 27 +++------------------- + drivers/pci/pcie/portdrv.h | 2 + + drivers/pci/pcie/portdrv_core.c | 25 +++++++++++--------- + drivers/pci/pcie/portdrv_pci.c | 37 +++++++++++++++++++++++++++--- + drivers/scsi/ipr.c | 8 +------ + drivers/scsi/pmcraid.c | 7 +----- + drivers/staging/sm7xx/smtcfb.c | 2 +- + include/linux/pci-aspm.h | 5 +++- + include/linux/pci.h | 8 ++---- + include/linux/pci_ids.h | 3 +- + include/linux/pci_regs.h | 10 ++++++++ + sound/pci/cs5535audio/cs5535audio_pm.c | 7 +----- + 24 files changed, 120 insertions(+), 113 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/i2c/muxes/gpio-i2cmux | 65 ++++++++++++ + MAINTAINERS | 8 ++ + drivers/i2c/algos/i2c-algo-bit.c | 31 +++--- + drivers/i2c/busses/i2c-i801.c | 1 + + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/i2c-core.c | 29 +++--- + drivers/i2c/muxes/Kconfig | 12 +++ + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/gpio-i2cmux.c | 184 +++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-ds1307.c | 12 +- + include/linux/gpio-i2cmux.h | 38 +++++++ + include/linux/i2c.h | 27 +++--- + 12 files changed, 362 insertions(+), 48 deletions(-) + create mode 100644 Documentation/i2c/muxes/gpio-i2cmux + create mode 100644 drivers/i2c/muxes/gpio-i2cmux.c + create mode 100644 include/linux/gpio-i2cmux.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'arch/arm/mach-pxa/devices.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/poodle.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/pxa27x.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/pxa3xx.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/z2.c' using previous resolution. +CONFLICT (rename/rename): Rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"arch/arm/mach-s5pv310/include/mach/dma.h" in branch "HEAD" rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"include/linux/spi/pxa2xx_spi.h" in "bjdooks-i2c/next-i2c" +Renaming arch/arm/plat-pxa/include/plat/ssp.h->include/linux/pxa2xx_ssp.h +Auto-merging include/linux/pxa2xx_ssp.h +Auto-merging arch/arm/mach-mmp/include/mach/mmp2.h +Auto-merging arch/arm/mach-pxa/balloon3.c +Auto-merging arch/arm/mach-pxa/cm-x300.c +Auto-merging arch/arm/mach-pxa/colibri-pxa270-income.c +Auto-merging arch/arm/mach-pxa/corgi.c +Auto-merging arch/arm/mach-pxa/csb726.c +Auto-merging arch/arm/mach-pxa/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/hx4700.c +Auto-merging arch/arm/mach-pxa/icontrol.c +Auto-merging arch/arm/mach-pxa/littleton.c +Auto-merging arch/arm/mach-pxa/lubbock.c +Auto-merging arch/arm/mach-pxa/magician.c +Auto-merging arch/arm/mach-pxa/mainstone.c +Auto-merging arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/pcm027.c +Auto-merging arch/arm/mach-pxa/poodle.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c +Auto-merging arch/arm/mach-pxa/pxa27x.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c +Auto-merging arch/arm/mach-pxa/pxa3xx.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa3xx.c +Auto-merging arch/arm/mach-pxa/raumfeld.c +Auto-merging arch/arm/mach-pxa/saar.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mach-pxa/stargate2.c +Auto-merging arch/arm/mach-pxa/tavorevb3.c +Auto-merging arch/arm/mach-pxa/tosa.c +Auto-merging arch/arm/mach-pxa/trizeps4.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/trizeps4.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/vpac270.c +Auto-merging arch/arm/mach-pxa/xcep.c +Auto-merging arch/arm/mach-pxa/z2.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/z2.c +Auto-merging arch/arm/mach-pxa/zeus.c +Auto-merging drivers/i2c/busses/i2c-omap.c +Auto-merging drivers/spi/pxa2xx_spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-pxa/include/mach/pxa2xx_spi.h +arch/arm/mach-pxa/devices.c: needs merge +arch/arm/mach-pxa/include/mach/pxa2xx_spi.h: needs merge +arch/arm/mach-pxa/poodle.c: needs merge +arch/arm/mach-pxa/pxa27x.c: needs merge +arch/arm/mach-pxa/pxa3xx.c: needs merge +arch/arm/mach-pxa/trizeps4.c: needs merge +arch/arm/mach-pxa/z2.c: needs merge +include/linux/spi/pxa2xx_spi.h: needs merge +rm 'arch/arm/mach-pxa/include/mach/pxa2xx_spi.h' +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-pxa/trizeps4.c'. +[master 54d7258] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-mmp/include/mach/mmp2.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa910.h | 2 +- + arch/arm/mach-pxa/balloon3.c | 3 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 3 +- + arch/arm/mach-pxa/corgi.c | 2 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 2 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 3 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 2 +- + arch/arm/mach-pxa/pxa27x.c | 3 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 3 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tavorevb3.c | 3 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 3 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 3 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 2 +- + drivers/i2c/busses/Kconfig | 15 +- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-eg20t.c | 900 ++++++++++++++++++++ + drivers/i2c/busses/i2c-iop3xx.c | 6 +- + drivers/i2c/busses/i2c-iop3xx.h | 2 +- + drivers/i2c/busses/i2c-mv64xxx.c | 45 +- + drivers/i2c/busses/i2c-nomadik.c | 6 +- + drivers/i2c/busses/i2c-ocores.c | 145 +++- + drivers/i2c/busses/i2c-omap.c | 10 +- + drivers/i2c/busses/i2c-pxa-pci.c | 173 ++++ + drivers/i2c/busses/i2c-pxa.c | 116 ++- + .../plat/i2c.h => include/linux/i2c/pxa-i2c.h | 0 + 47 files changed, 1367 insertions(+), 133 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-eg20t.c + create mode 100644 drivers/i2c/busses/i2c-pxa-pci.c + rename arch/arm/plat-pxa/include/plat/i2c.h => include/linux/i2c/pxa-i2c.h (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Resolved 'drivers/hwmon/dme1737.c' using previous resolution. +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/dme1737.c +CONFLICT (content): Merge conflict in drivers/hwmon/dme1737.c +Auto-merging drivers/hwmon/via686a.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3ab7302] Merge branch 'quilt/jdelvare-hwmon' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 10 ++ + Documentation/hwmon/adm9240 | 2 +- + Documentation/hwmon/ads7828 | 2 +- + Documentation/hwmon/dme1737 | 12 +- + Documentation/hwmon/w83627hf | 22 ++++ + Documentation/hwmon/w83793 | 2 +- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/adm9240.c | 32 +++++- + drivers/hwmon/ads7828.c | 4 +- + drivers/hwmon/dme1737.c | 189 ++++++++++++++++++--------- + drivers/hwmon/emc1403.c | 16 ++- + drivers/hwmon/fschmd.c | 5 +- + drivers/hwmon/it87.c | 30 ++--- + drivers/hwmon/lm78.c | 14 +- + drivers/hwmon/pc87360.c | 53 ++++----- + drivers/hwmon/pc87427.c | 26 ++-- + drivers/hwmon/via686a.c | 14 ++- + drivers/hwmon/w83781d.c | 29 ++--- + drivers/hwmon/w83792d.c | 44 ++++++- + drivers/hwmon/w83793.c | 38 +++++- + drivers/hwmon/w83795.c | 4 +- + 21 files changed, 370 insertions(+), 182 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 +Merge made by recursive. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by recursive. +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 +Merge made by recursive. + drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 + + drivers/infiniband/hw/cxgb3/iwch_provider.h | 2 - + drivers/infiniband/hw/cxgb3/iwch_qp.c | 56 ---- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/cxgb4/qp.c | 32 --- + drivers/infiniband/hw/ipath/ipath_driver.c | 5 +- + drivers/infiniband/hw/mlx4/cq.c | 9 +- + drivers/infiniband/hw/mlx4/mad.c | 2 + + drivers/infiniband/hw/mthca/mthca_mad.c | 2 + + drivers/infiniband/hw/nes/nes_nic.c | 4 +- + drivers/infiniband/hw/qib/qib.h | 2 +- + drivers/infiniband/hw/qib/qib_cq.c | 3 +- + drivers/infiniband/hw/qib/qib_driver.c | 155 ++++++++++- + drivers/infiniband/hw/qib/qib_file_ops.c | 10 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 373 +++++++++++++++++++++++--- + drivers/infiniband/hw/qib/qib_init.c | 6 +- + drivers/infiniband/hw/qib/qib_intr.c | 3 +- + drivers/infiniband/hw/qib/qib_keys.c | 80 ++++-- + drivers/infiniband/hw/qib/qib_mad.c | 45 ++-- + drivers/infiniband/hw/qib/qib_mr.c | 8 +- + drivers/infiniband/hw/qib/qib_qp.c | 32 +-- + drivers/infiniband/hw/qib/qib_rc.c | 24 ++ + drivers/infiniband/hw/qib/qib_ud.c | 57 ++--- + drivers/infiniband/hw/qib/qib_user_sdma.c | 1 + + drivers/infiniband/hw/qib/qib_verbs.h | 11 +- + drivers/infiniband/ulp/ipoib/Kconfig | 1 - + drivers/infiniband/ulp/ipoib/ipoib.h | 12 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 1 + + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 51 ---- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 62 +----- + drivers/net/mlx4/alloc.c | 3 +- + drivers/net/mlx4/fw.c | 4 +- + 35 files changed, 683 insertions(+), 390 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Auto-merging include/linux/suspend.h +Auto-merging kernel/power/Makefile +Merge made by recursive. + Documentation/ABI/stable/thermal-notification | 4 + + Documentation/IPMI.txt | 27 + + Documentation/acpi/apei/output_format.txt | 122 +++++ + Documentation/thermal/sysfs-api.txt | 12 + + arch/ia64/include/asm/io.h | 5 + + arch/x86/kernel/e820.c | 1 + + drivers/acpi/Kconfig | 11 + + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_ipmi.c | 525 +++++++++++++++++++ + drivers/acpi/acpica/Makefile | 2 +- + drivers/acpi/acpica/acevents.h | 21 +- + drivers/acpi/acpica/acglobal.h | 7 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/aclocal.h | 13 +- + drivers/acpi/acpica/evevent.c | 12 +- + drivers/acpi/acpica/evgpe.c | 265 +++++++---- + drivers/acpi/acpica/evgpeblk.c | 33 +- + drivers/acpi/acpica/evgpeinit.c | 25 +- + drivers/acpi/acpica/evgpeutil.c | 39 ++ + drivers/acpi/acpica/evxface.c | 77 +++- + drivers/acpi/acpica/evxfevnt.c | 600 ---------------------- + drivers/acpi/acpica/evxfgpe.c | 669 +++++++++++++++++++++++++ + drivers/acpi/acpica/hwgpe.c | 32 +- + drivers/acpi/acpica/utglobal.c | 3 +- + drivers/acpi/apei/apei-internal.h | 2 + + drivers/acpi/apei/cper.c | 311 ++++++++++++ + drivers/acpi/apei/ghes.c | 25 +- + drivers/acpi/bus.c | 153 +++--- + drivers/acpi/dock.c | 2 +- + drivers/acpi/ec.c | 3 +- + drivers/acpi/fan.c | 27 +- + drivers/acpi/internal.h | 13 +- + {kernel/power => drivers/acpi}/nvs.c | 20 +- + drivers/acpi/osl.c | 6 +- + drivers/acpi/power.c | 90 ++-- + drivers/acpi/scan.c | 33 +- + drivers/acpi/sleep.c | 5 +- + drivers/acpi/sysfs.c | 19 +- + drivers/acpi/thermal.c | 5 +- + drivers/acpi/wakeup.c | 4 +- + drivers/char/ipmi/ipmi_msghandler.c | 27 + + drivers/char/ipmi/ipmi_si_intf.c | 23 +- + drivers/platform/x86/fujitsu-laptop.c | 4 +- + drivers/pnp/Makefile | 6 +- + drivers/pnp/core.c | 7 +- + drivers/pnp/isapnp/Makefile | 6 +- + drivers/pnp/pnpacpi/Makefile | 3 +- + drivers/pnp/pnpbios/Makefile | 5 +- + drivers/thermal/thermal_sys.c | 120 ++++- + include/acpi/acpi_bus.h | 5 +- + include/acpi/acpixf.h | 20 +- + include/acpi/actypes.h | 54 ++- + include/linux/acpi.h | 9 + + include/linux/cper.h | 86 +++- + include/linux/ipmi.h | 38 ++ + include/linux/ipmi_smi.h | 8 + + include/linux/suspend.h | 17 - + include/linux/thermal.h | 47 ++- + kernel/power/Kconfig | 5 - + kernel/power/Makefile | 1 - + 60 files changed, 2695 insertions(+), 1024 deletions(-) + create mode 100644 Documentation/ABI/stable/thermal-notification + create mode 100644 Documentation/acpi/apei/output_format.txt + create mode 100644 drivers/acpi/acpi_ipmi.c + create mode 100644 drivers/acpi/acpica/evxfgpe.c + rename {kernel/power => drivers/acpi}/nvs.c (86%) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging drivers/cpuidle/cpuidle.c +Auto-merging drivers/idle/intel_idle.c +Merge made by recursive. + drivers/cpuidle/cpuidle.c | 82 ++++++++++++++++++++++---------------------- + drivers/idle/intel_idle.c | 8 ++-- + 2 files changed, 45 insertions(+), 45 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/kvm/x86.c +Auto-merging mm/filemap.c +Auto-merging mm/shmem.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 3 + + Documentation/kvm/api.txt | 178 +++++++ + Documentation/kvm/cpuid.txt | 3 + + Documentation/kvm/msr.txt | 36 ++- + arch/ia64/include/asm/kvm_host.h | 4 + + arch/ia64/kvm/kvm-ia64.c | 30 +- + arch/powerpc/kvm/book3s.c | 4 +- + arch/powerpc/kvm/powerpc.c | 20 +- + arch/s390/kvm/kvm-s390.c | 23 +- + arch/x86/include/asm/kvm_emulate.h | 35 +- + arch/x86/include/asm/kvm_host.h | 99 +++-- + arch/x86/include/asm/kvm_para.h | 24 + + arch/x86/include/asm/svm.h | 57 ++- + arch/x86/include/asm/traps.h | 1 + + arch/x86/include/asm/vmx.h | 15 + + arch/x86/kernel/entry_32.S | 10 + + arch/x86/kernel/entry_64.S | 3 + + arch/x86/kernel/kvm.c | 317 +++++++++++++ + arch/x86/kernel/kvmclock.c | 13 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 367 +++++++--------- + arch/x86/kvm/kvm_cache_regs.h | 22 + + arch/x86/kvm/lapic.c | 3 +- + arch/x86/kvm/mmu.c | 251 +++++++---- + arch/x86/kvm/mmu_audit.c | 39 +- + arch/x86/kvm/paging_tmpl.h | 147 ++++--- + arch/x86/kvm/svm.c | 865 ++++++++++++++++++++++------------- + arch/x86/kvm/trace.h | 17 +- + arch/x86/kvm/vmx.c | 156 +++++-- + arch/x86/kvm/x86.c | 471 ++++++++++++++----- + fs/ncpfs/mmap.c | 2 + + include/linux/kvm.h | 1 + + include/linux/kvm_host.h | 101 ++++- + include/linux/kvm_types.h | 7 + + include/linux/mm.h | 5 + + include/trace/events/kvm.h | 121 +++++ + mm/filemap.c | 3 + + mm/memory.c | 31 ++- + mm/shmem.c | 8 +- + virt/kvm/Kconfig | 3 + + virt/kvm/assigned-dev.c | 125 ++---- + virt/kvm/async_pf.c | 216 +++++++++ + virt/kvm/async_pf.h | 36 ++ + virt/kvm/eventfd.c | 91 ++++- + virt/kvm/irq_comm.c | 7 +- + virt/kvm/kvm_main.c | 342 ++++++++++---- + 47 files changed, 3127 insertions(+), 1189 deletions(-) + create mode 100644 virt/kvm/async_pf.c + create mode 100644 virt/kvm/async_pf.h +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 +Auto-merging drivers/dma/fsldma.c +Merge made by recursive. + arch/arm/plat-nomadik/include/plat/ste_dma40.h | 8 + + drivers/dma/amba-pl08x.c | 1040 +++++++++++------------- + drivers/dma/fsldma.c | 4 +- + drivers/dma/intel_mid_dma.c | 33 +- + drivers/dma/ste_dma40.c | 191 ++++- + drivers/dma/ste_dma40_ll.c | 246 ++++-- + drivers/dma/ste_dma40_ll.h | 36 +- + include/linux/amba/pl08x.h | 56 +- + 8 files changed, 898 insertions(+), 716 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/Kconfig' using previous resolution. +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging drivers/mtd/Kconfig +CONFLICT (content): Merge conflict in drivers/mtd/Kconfig +Auto-merging drivers/mtd/mtdchar.c +Auto-merging drivers/mtd/onenand/omap2.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1ea0924] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/board-ams-delta.c | 17 ++++ + arch/arm/plat-omap/include/plat/onenand.h | 1 + + drivers/mtd/Kconfig | 19 +++-- + drivers/mtd/Makefile | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 55 +++++++------- + drivers/mtd/chips/cfi_cmdset_0002.c | 116 ++++++++++++++++------------ + drivers/mtd/chips/cfi_cmdset_0020.c | 1 + + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/fwh_lock.h | 2 +- + drivers/mtd/devices/m25p80.c | 39 +++++++++- + drivers/mtd/devices/sst25l.c | 4 +- + drivers/mtd/maps/amd76xrom.c | 7 +- + drivers/mtd/maps/bcm963xx-flash.c | 5 + + drivers/mtd/maps/ck804xrom.c | 7 +- + drivers/mtd/maps/esb2rom.c | 9 +-- + drivers/mtd/maps/ichxrom.c | 9 +-- + drivers/mtd/maps/physmap_of.c | 4 +- + drivers/mtd/maps/scx200_docflash.c | 5 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/mtdchar.c | 10 +- + drivers/mtd/mtdconcat.c | 1 + + drivers/mtd/mtdoops.c | 3 +- + drivers/mtd/mtdpart.c | 11 ++- + drivers/mtd/nand/Kconfig | 1 + + drivers/mtd/nand/ams-delta.c | 80 +++++++++++++++++--- + drivers/mtd/nand/fsl_elbc_nand.c | 2 + + drivers/mtd/nand/fsmc_nand.c | 89 +++++++++++++++++----- + drivers/mtd/nand/jz4740_nand.c | 57 +-------------- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/mtd/nand/nand_base.c | 25 ++++--- + drivers/mtd/nand/nand_bbt.c | 3 +- + drivers/mtd/nand/nandsim.c | 39 +++++----- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/txx9ndfmc.c | 5 +- + drivers/mtd/onenand/omap2.c | 80 +++++++++++++++----- + drivers/mtd/onenand/onenand_base.c | 81 +++++++++++++------- + drivers/mtd/onenand/onenand_bbt.c | 10 ++- + drivers/mtd/onenand/samsung.c | 7 +- + drivers/mtd/ubi/build.c | 28 +++++++- + drivers/mtd/ubi/vtbl.c | 6 +- + fs/jffs2/build.c | 5 +- + fs/jffs2/jffs2_fs_sb.h | 2 +- + fs/jffs2/xattr.c | 12 ++-- + include/linux/mtd/cfi.h | 3 +- + include/linux/mtd/fsmc.h | 26 +------ + include/linux/mtd/mtd.h | 11 +++ + include/linux/mtd/nand.h | 2 + + include/linux/mtd/onenand.h | 14 ++++ + include/linux/mtd/partitions.h | 2 +- + 50 files changed, 577 insertions(+), 350 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging drivers/crypto/n2_core.c +Auto-merging drivers/crypto/padlock-aes.c +Merge made by recursive. + drivers/char/hw_random/via-rng.c | 10 ++++++---- + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/padlock-aes.c | 2 +- + drivers/crypto/padlock-sha.c | 8 +------- + {drivers => include}/crypto/padlock.h | 8 +++++++- + 5 files changed, 16 insertions(+), 14 deletions(-) + rename {drivers => include}/crypto/padlock.h (82%) +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-s3c2410/mach-h1940.c +Auto-merging arch/arm/mach-s3c2440/mach-rx1950.c +Auto-merging arch/arm/mach-shmobile/board-ap4evb.c +Auto-merging arch/arm/plat-s3c24xx/devs.c +Auto-merging arch/arm/plat-samsung/Makefile +Auto-merging arch/arm/plat-samsung/include/plat/devs.h +Auto-merging drivers/video/sh_mobile_hdmi.c +Removing sound/soc/s3c24xx/Kconfig +Removing sound/soc/s3c24xx/Makefile +Removing sound/soc/s3c24xx/aquila_wm8994.c +Removing sound/soc/s3c24xx/s3c64xx-i2s-v4.c +Removing sound/soc/s3c24xx/s3c64xx-i2s.c +Removing sound/soc/s3c24xx/s3c64xx-i2s.h +Merge made by recursive. + MAINTAINERS | 2 +- + arch/arm/mach-kirkwood/openrd-setup.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 2 +- + arch/arm/mach-s3c2440/mach-rx1950.c | 2 +- + arch/arm/mach-s3c64xx/dev-audio.c | 15 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- + arch/arm/mach-s5pc100/dev-audio.c | 2 +- + arch/arm/mach-s5pc100/mach-smdkc100.c | 2 + + arch/arm/mach-s5pv210/dev-audio.c | 2 +- + arch/arm/mach-shmobile/board-ap4evb.c | 5 + + arch/arm/plat-s3c24xx/devs.c | 19 +- + arch/arm/plat-samsung/Makefile | 1 + + arch/arm/plat-samsung/dev-asocdma.c | 25 + + arch/arm/plat-samsung/include/plat/devs.h | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 5 + + drivers/gpio/wm8994-gpio.c | 24 + + drivers/mfd/wm8994-core.c | 93 +- + drivers/regulator/wm8994-regulator.c | 23 +- + drivers/video/sh_mobile_hdmi.c | 1 + + include/linux/mfd/wm8994/core.h | 8 + + include/linux/mfd/wm8994/pdata.h | 17 + + include/linux/mfd/wm8994/registers.h | 302 ++ + include/sound/alc5623.h | 15 + + include/sound/soc-dai.h | 4 +- + include/sound/soc-dapm.h | 99 +- + include/sound/soc.h | 116 +- + include/trace/events/asoc.h | 235 ++ + sound/aoa/core/gpio-feature.c | 7 +- + sound/aoa/core/gpio-pmf.c | 7 +- + sound/i2c/other/ak4113.c | 5 +- + sound/i2c/other/ak4114.c | 5 +- + sound/pci/ac97/ac97_codec.c | 6 +- + sound/pci/hda/patch_via.c | 3 +- + sound/pci/oxygen/oxygen_lib.c | 6 +- + sound/soc/Kconfig | 17 +- + sound/soc/Makefile | 2 +- + sound/soc/atmel/playpaq_wm8510.c | 12 +- + sound/soc/atmel/sam9g20_wm8731.c | 18 +- + sound/soc/atmel/snd-soc-afeb9260.c | 14 +- + sound/soc/au1x/db1200.c | 1 - + sound/soc/blackfin/bf5xx-ad1836.c | 1 - + sound/soc/blackfin/bf5xx-ad193x.c | 1 - + sound/soc/blackfin/bf5xx-ad73311.c | 1 - + sound/soc/blackfin/bf5xx-ssm2602.c | 1 - + sound/soc/codecs/88pm860x-codec.c | 30 +- + sound/soc/codecs/Kconfig | 17 + + sound/soc/codecs/Makefile | 10 +- + sound/soc/codecs/ad1836.c | 7 +- + sound/soc/codecs/ad193x.c | 8 +- + sound/soc/codecs/ad1980.c | 1 - + sound/soc/codecs/ak4535.c | 20 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 11 +- + sound/soc/codecs/alc5623.c | 1117 +++++ + sound/soc/codecs/alc5623.h | 161 + + sound/soc/codecs/cq93vc.c | 4 +- + sound/soc/codecs/cs4270.c | 162 +- + sound/soc/codecs/cs42l51.c | 7 +- + sound/soc/codecs/cx20442.c | 16 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/jz4740.c | 11 +- + sound/soc/codecs/max98088.c | 13 +- + sound/soc/codecs/ssm2602.c | 10 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 5 +- + sound/soc/codecs/tlv320aic3x.c | 71 +- + sound/soc/codecs/tlv320dac33.c | 73 +- + sound/soc/codecs/tpa6130a2.c | 100 +- + sound/soc/codecs/tpa6130a2.h | 1 + + sound/soc/codecs/twl4030.c | 56 +- + sound/soc/codecs/twl6040.c | 855 ++++- + sound/soc/codecs/twl6040.h | 8 + + sound/soc/codecs/uda134x.c | 3 +- + sound/soc/codecs/uda1380.c | 15 +- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm2000.c | 6 +- + sound/soc/codecs/wm8350.c | 105 +- + sound/soc/codecs/wm8400.c | 12 +- + sound/soc/codecs/wm8510.c | 12 +- + sound/soc/codecs/wm8523.c | 12 +- + sound/soc/codecs/wm8580.c | 23 +- + sound/soc/codecs/wm8711.c | 11 +- + sound/soc/codecs/wm8728.c | 12 +- + sound/soc/codecs/wm8731.c | 102 +- + sound/soc/codecs/wm8737.c | 754 ++++ + sound/soc/codecs/wm8737.h | 322 ++ + sound/soc/codecs/wm8741.c | 10 +- + sound/soc/codecs/wm8750.c | 13 +- + sound/soc/codecs/wm8753.c | 49 +- + sound/soc/codecs/wm8770.c | 749 ++++ + sound/soc/codecs/wm8770.h | 51 + + sound/soc/codecs/wm8776.c | 10 +- + sound/soc/codecs/wm8804.c | 7 +- + sound/soc/codecs/wm8900.c | 13 +- + sound/soc/codecs/wm8903.c | 222 +- + sound/soc/codecs/wm8903.h | 25 - + sound/soc/codecs/wm8904.c | 36 +- + sound/soc/codecs/wm8940.c | 8 +- + sound/soc/codecs/wm8955.c | 12 +- + sound/soc/codecs/wm8960.c | 29 +- + sound/soc/codecs/wm8961.c | 13 +- + sound/soc/codecs/wm8962.c | 41 +- + sound/soc/codecs/wm8971.c | 30 +- + sound/soc/codecs/wm8974.c | 13 +- + sound/soc/codecs/wm8978.c | 13 +- + sound/soc/codecs/wm8985.c | 12 +- + sound/soc/codecs/wm8988.c | 11 +- + sound/soc/codecs/wm8990.c | 12 +- + sound/soc/codecs/wm8993.c | 21 +- + sound/soc/codecs/wm8994-tables.c | 3147 +++++++++++++++ + sound/soc/codecs/wm8994.c | 2544 ++++-------- + sound/soc/codecs/wm8994.h | 14 + + sound/soc/codecs/wm8995.c | 1818 +++++++++ + sound/soc/codecs/wm8995.h | 4269 ++++++++++++++++++++ + sound/soc/codecs/wm9081.c | 15 +- + sound/soc/codecs/wm9090.c | 18 +- + sound/soc/codecs/wm9705.c | 7 +- + sound/soc/codecs/wm9712.c | 10 +- + sound/soc/codecs/wm9713.c | 9 +- + sound/soc/codecs/wm_hubs.c | 108 +- + sound/soc/codecs/wm_hubs.h | 3 + + sound/soc/davinci/davinci-evm.c | 23 +- + sound/soc/davinci/davinci-sffsdr.c | 1 - + sound/soc/ep93xx/ep93xx-i2s.c | 4 +- + sound/soc/ep93xx/ep93xx-pcm.c | 4 +- + sound/soc/ep93xx/snappercl15.c | 6 +- + sound/soc/imx/eukrea-tlv320.c | 1 - + sound/soc/imx/imx-ssi.c | 4 +- + sound/soc/imx/phycore-ac97.c | 1 - + sound/soc/imx/wm1133-ev1.c | 8 +- + sound/soc/jz4740/jz4740-i2s.c | 1 - + sound/soc/jz4740/qi_lb60.c | 14 +- + sound/soc/kirkwood/Kconfig | 11 +- + sound/soc/kirkwood/Makefile | 2 + + sound/soc/kirkwood/kirkwood-openrd.c | 2 +- + sound/soc/kirkwood/kirkwood-t5325.c | 141 + + sound/soc/nuc900/nuc900-audio.c | 1 - + sound/soc/omap/am3517evm.c | 14 +- + sound/soc/omap/ams-delta.c | 82 +- + sound/soc/omap/igep0020.c | 1 - + sound/soc/omap/n810.c | 44 +- + sound/soc/omap/omap2evm.c | 1 - + sound/soc/omap/omap3beagle.c | 1 - + sound/soc/omap/omap3evm.c | 1 - + sound/soc/omap/omap3pandora.c | 45 +- + sound/soc/omap/osk5912.c | 14 +- + sound/soc/omap/overo.c | 1 - + sound/soc/omap/rx51.c | 27 +- + sound/soc/omap/sdp3430.c | 44 +- + sound/soc/omap/sdp4430.c | 57 +- + sound/soc/omap/zoom2.c | 36 +- + sound/soc/pxa/corgi.c | 52 +- + sound/soc/pxa/e740_wm9705.c | 30 +- + sound/soc/pxa/e750_wm9705.c | 30 +- + sound/soc/pxa/e800_wm9712.c | 8 +- + sound/soc/pxa/em-x270.c | 1 - + sound/soc/pxa/magician.c | 36 +- + sound/soc/pxa/mioa701_wm9713.c | 18 +- + sound/soc/pxa/palm27x.c | 34 +- + sound/soc/pxa/poodle.c | 26 +- + sound/soc/pxa/raumfeld.c | 1 - + sound/soc/pxa/saarb.c | 18 +- + sound/soc/pxa/spitz.c | 70 +- + sound/soc/pxa/tavorevb3.c | 18 +- + sound/soc/pxa/tosa.c | 38 +- + sound/soc/pxa/z2.c | 16 +- + sound/soc/pxa/zylonite.c | 12 +- + sound/soc/s3c24xx/Kconfig | 171 - + sound/soc/s3c24xx/Makefile | 55 - + sound/soc/s3c24xx/aquila_wm8994.c | 295 -- + sound/soc/s3c24xx/s3c64xx-i2s-v4.c | 230 -- + sound/soc/s3c24xx/s3c64xx-i2s.c | 242 -- + sound/soc/s3c24xx/s3c64xx-i2s.h | 41 - + sound/soc/s6000/s6105-ipcam.c | 42 +- + sound/soc/samsung/Kconfig | 171 + + sound/soc/samsung/Makefile | 55 + + sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} | 22 +- + sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} | 8 +- + sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} | 134 +- + sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} | 2 +- + sound/soc/{s3c24xx => samsung}/goni_wm8994.c | 66 +- + .../rx1950_uda1380.c => samsung/h1940_uda1380.c} | 249 +- + sound/soc/samsung/i2s.c | 1258 ++++++ + sound/soc/samsung/i2s.h | 29 + + sound/soc/{s3c24xx => samsung}/jive_wm8750.c | 26 +- + sound/soc/{s3c24xx => samsung}/lm4857.h | 0 + sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c | 9 +- + .../{s3c24xx => samsung}/neo1973_gta02_wm8753.c | 72 +- + sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c | 130 +- + sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} | 6 +- + sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} | 2 +- + sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h | 0 + sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c | 17 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c | 4 +- + sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c | 2 +- + sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h | 0 + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c | 5 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h | 2 +- + .../{s3c24xx => samsung}/s3c24xx_simtec_hermes.c | 24 +- + .../s3c24xx_simtec_tlv320aic23.c | 22 +- + sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c | 5 +- + sound/soc/{s3c24xx => samsung}/smartq_wm8987.c | 64 +- + sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c | 9 +- + sound/soc/{s3c24xx => samsung}/smdk_spdif.c | 21 +- + .../smdk64xx_wm8580.c => samsung/smdk_wm8580.c} | 174 +- + sound/soc/samsung/smdk_wm8994.c | 176 + + sound/soc/{s3c24xx => samsung}/smdk_wm9713.c | 26 +- + sound/soc/{s3c24xx => samsung}/spdif.c | 4 +- + sound/soc/{s3c24xx => samsung}/spdif.h | 2 +- + sound/soc/sh/Kconfig | 4 +- + sound/soc/sh/fsi-ak4642.c | 140 +- + sound/soc/sh/fsi-da7210.c | 2 +- + sound/soc/sh/fsi.c | 273 +- + sound/soc/sh/migor.c | 6 +- + sound/soc/sh/sh7760-ac97.c | 3 +- + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_dai.c | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/soc-cache.c | 1065 +++++- + sound/soc/soc-core.c | 575 ++- + sound/soc/soc-dapm.c | 860 +++-- + sound/soc/soc-jack.c | 31 +- + 226 files changed, 20959 insertions(+), 5562 deletions(-) + create mode 100644 arch/arm/plat-samsung/dev-asocdma.c + create mode 100644 include/sound/alc5623.h + create mode 100644 include/trace/events/asoc.h + create mode 100644 sound/soc/codecs/alc5623.c + create mode 100644 sound/soc/codecs/alc5623.h + create mode 100644 sound/soc/codecs/wm8737.c + create mode 100644 sound/soc/codecs/wm8737.h + create mode 100644 sound/soc/codecs/wm8770.c + create mode 100644 sound/soc/codecs/wm8770.h + create mode 100644 sound/soc/codecs/wm8994-tables.c + create mode 100644 sound/soc/codecs/wm8995.c + create mode 100644 sound/soc/codecs/wm8995.h + create mode 100644 sound/soc/kirkwood/kirkwood-t5325.c + delete mode 100644 sound/soc/s3c24xx/Kconfig + delete mode 100644 sound/soc/s3c24xx/Makefile + delete mode 100644 sound/soc/s3c24xx/aquila_wm8994.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s-v4.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.c + delete mode 100644 sound/soc/s3c24xx/s3c64xx-i2s.h + create mode 100644 sound/soc/samsung/Kconfig + create mode 100644 sound/soc/samsung/Makefile + rename sound/soc/{s3c24xx/s3c-ac97.c => samsung/ac97.c} (96%) + rename sound/soc/{s3c24xx/s3c-ac97.h => samsung/ac97.h} (73%) + rename sound/soc/{s3c24xx/s3c-dma.c => samsung/dma.c} (74%) + rename sound/soc/{s3c24xx/s3c-dma.h => samsung/dma.h} (97%) + rename sound/soc/{s3c24xx => samsung}/goni_wm8994.c (84%) + copy sound/soc/{s3c24xx/rx1950_uda1380.c => samsung/h1940_uda1380.c} (56%) + create mode 100644 sound/soc/samsung/i2s.c + create mode 100644 sound/soc/samsung/i2s.h + rename sound/soc/{s3c24xx => samsung}/jive_wm8750.c (88%) + rename sound/soc/{s3c24xx => samsung}/lm4857.h (100%) + rename sound/soc/{s3c24xx => samsung}/ln2440sbc_alc650.c (92%) + rename sound/soc/{s3c24xx => samsung}/neo1973_gta02_wm8753.c (88%) + rename sound/soc/{s3c24xx => samsung}/neo1973_wm8753.c (83%) + rename sound/soc/{s3c24xx/s3c-pcm.c => samsung/pcm.c} (99%) + rename sound/soc/{s3c24xx/s3c-pcm.h => samsung/pcm.h} (99%) + rename sound/soc/{s3c24xx => samsung}/regs-i2s-v2.h (100%) + rename sound/soc/{s3c24xx => samsung}/rx1950_uda1380.c (95%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c-i2s-v2.h (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.c (98%) + rename sound/soc/{s3c24xx => samsung}/s3c2412-i2s.h (95%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx-i2s.h (100%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.c (99%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec.h (94%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_hermes.c (87%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_simtec_tlv320aic23.c (86%) + rename sound/soc/{s3c24xx => samsung}/s3c24xx_uda134x.c (99%) + rename sound/soc/{s3c24xx => samsung}/smartq_wm8987.c (82%) + rename sound/soc/{s3c24xx => samsung}/smdk2443_wm9710.c (92%) + rename sound/soc/{s3c24xx => samsung}/smdk_spdif.c (95%) + rename sound/soc/{s3c24xx/smdk64xx_wm8580.c => samsung/smdk_wm8580.c} (55%) + create mode 100644 sound/soc/samsung/smdk_wm8994.c + rename sound/soc/{s3c24xx => samsung}/smdk_wm9713.c (87%) + rename sound/soc/{s3c24xx => samsung}/spdif.c (99%) + rename sound/soc/{s3c24xx => samsung}/spdif.h (94%) +Merging sound/for-next +$ git merge sound/for-next +Auto-merging MAINTAINERS +Removing sound/pci/oxygen/hifier.c +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 20 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 1 - + MAINTAINERS | 43 ++ + include/sound/asound.h | 3 + + include/sound/control.h | 4 +- + include/sound/hdsp.h | 1 + + include/sound/minors.h | 4 +- + include/sound/pcm.h | 1 + + sound/ac97_bus.c | 4 +- + sound/aoa/codecs/onyx.c | 1 - + sound/core/control.c | 28 +- + sound/core/oss/pcm_oss.c | 4 +- + sound/core/pcm_lib.c | 22 + + sound/core/pcm_native.c | 3 + + sound/core/seq/seq.c | 4 + + sound/core/sound.c | 18 +- + sound/core/timer.c | 7 +- + sound/drivers/ml403-ac97cr.c | 4 +- + sound/pci/Kconfig | 23 +- + sound/pci/azt3328.c | 406 +++++++------- + sound/pci/bt87x.c | 10 +- + sound/pci/cmipci.c | 25 +- + sound/pci/hda/hda_codec.c | 3 + + sound/pci/hda/hda_intel.c | 9 +- + sound/pci/hda/patch_analog.c | 72 ++-- + sound/pci/hda/patch_conexant.c | 108 ++-- + sound/pci/hda/patch_hdmi.c | 43 ++- + sound/pci/hda/patch_realtek.c | 659 ++++++++++++----------- + sound/pci/hda/patch_sigmatel.c | 15 +- + sound/pci/ice1712/delta.c | 49 ++- + sound/pci/ice1712/delta.h | 11 + + sound/pci/oxygen/Makefile | 4 +- + sound/pci/oxygen/cs4245.h | 107 ++++ + sound/pci/oxygen/hifier.c | 239 -------- + sound/pci/oxygen/oxygen.c | 267 ++++++++-- + sound/pci/oxygen/oxygen.h | 19 +- + sound/pci/oxygen/oxygen_io.c | 4 +- + sound/pci/oxygen/oxygen_lib.c | 65 ++- + sound/pci/oxygen/oxygen_mixer.c | 110 +++- + sound/pci/oxygen/oxygen_pcm.c | 55 ++- + sound/pci/oxygen/oxygen_regs.h | 16 +- + sound/pci/oxygen/xonar.h | 2 + + sound/pci/oxygen/xonar_cs43xx.c | 84 ++-- + sound/pci/oxygen/xonar_dg.c | 571 ++++++++++++++++++++ + sound/pci/oxygen/xonar_dg.h | 8 + + sound/pci/oxygen/xonar_hdmi.c | 2 +- + sound/pci/oxygen/xonar_lib.c | 6 +- + sound/pci/oxygen/xonar_pcm179x.c | 473 +++++++++-------- + sound/pci/oxygen/xonar_wm87x6.c | 317 ++++++++++-- + sound/pci/rme9652/hdsp.c | 538 +++++++++++++++++-- + sound/pci/ymfpci/ymfpci_main.c | 12 +- + sound/usb/format.c | 5 +- + sound/usb/midi.c | 8 +- + sound/usb/mixer.c | 11 +- + sound/usb/quirks-table.h | 4 +- + 55 files changed, 3072 insertions(+), 1460 deletions(-) + create mode 100644 sound/pci/oxygen/cs4245.h + delete mode 100644 sound/pci/oxygen/hifier.c + create mode 100644 sound/pci/oxygen/xonar_dg.c + create mode 100644 sound/pci/oxygen/xonar_dg.h +Merging cpufreq/next +$ git merge cpufreq/next +Merge made by recursive. + drivers/cpufreq/cpufreq_conservative.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/lguest/boot.c +Merge made by recursive. + Documentation/lguest/lguest.c | 73 ++++++++++++++++++++++++--- + Documentation/lguest/lguest.txt | 5 ++ + arch/x86/kernel/head_32.S | 4 +- + arch/x86/lguest/boot.c | 2 +- + arch/x86/lguest/i386_head.S | 105 +++++++++++++++++++++++++++++++++++++++ + drivers/lguest/page_tables.c | 2 +- + drivers/lguest/x86/core.c | 4 +- + 7 files changed, 181 insertions(+), 14 deletions(-) +Merging input/next +$ git merge input/next +Merge made by recursive. + drivers/input/touchscreen/ad7879-i2c.c | 17 ++++++++++------- + drivers/input/touchscreen/cy8ctmg110_ts.c | 15 +++++++++------ + drivers/input/touchscreen/eeti_ts.c | 16 +++++++++------- + drivers/input/touchscreen/mcs5000_ts.c | 17 ++++++++++------- + drivers/input/touchscreen/migor_ts.c | 12 ++++++++---- + 5 files changed, 46 insertions(+), 31 deletions(-) +Merging input-mt/next +$ git merge input-mt/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging block/blk-merge.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/floppy.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/md.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging fs/block_dev.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/splice.c +Auto-merging fs/super.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/fs.h +Auto-merging include/scsi/scsi.h +Auto-merging kernel/power/swap.c +Merge made by recursive. + Documentation/cgroups/blkio-controller.txt | 27 + + block/blk-cgroup.c | 4 - + block/blk-core.c | 40 ++- + block/blk-ioc.c | 5 +- + block/blk-merge.c | 3 +- + block/cfq-iosched.c | 112 +++-- + block/genhd.c | 550 +++++++++++++++++++-- + block/ioctl.c | 5 +- + drivers/block/cciss.c | 23 +- + drivers/block/cciss.h | 4 +- + drivers/block/cciss_cmd.h | 2 +- + drivers/block/drbd/drbd_int.h | 2 - + drivers/block/drbd/drbd_main.c | 7 +- + drivers/block/drbd/drbd_nl.c | 105 ++--- + drivers/block/floppy.c | 15 +- + drivers/block/loop.c | 6 +- + drivers/block/pktcdvd.c | 22 +- + drivers/cdrom/cdrom.c | 56 ++- + drivers/char/raw.c | 14 +- + drivers/md/dm-table.c | 20 +- + drivers/md/dm.c | 6 +- + drivers/md/md.c | 16 +- + drivers/mtd/devices/block2mtd.c | 10 +- + drivers/s390/block/dasd_genhd.c | 2 +- + drivers/scsi/scsi_lib.c | 13 +- + drivers/scsi/sd.c | 10 +- + drivers/scsi/sr.c | 174 ++++--- + drivers/scsi/sr.h | 3 +- + drivers/scsi/sr_ioctl.c | 2 +- + drivers/usb/gadget/storage_common.c | 7 +- + fs/bio-integrity.c | 7 +- + fs/block_dev.c | 741 ++++++++++------------------ + fs/btrfs/volumes.c | 28 +- + fs/btrfs/volumes.h | 2 +- + fs/char_dev.c | 2 +- + fs/ext3/super.c | 12 +- + fs/ext4/super.c | 12 +- + fs/gfs2/ops_fstype.c | 8 +- + fs/jfs/jfs_logmgr.c | 17 +- + fs/logfs/dev_bdev.c | 7 +- + fs/nfsd/vfs.c | 5 - + fs/nilfs2/super.c | 8 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/partitions/check.c | 106 +---- + fs/reiserfs/journal.c | 21 +- + fs/splice.c | 43 +-- + fs/super.c | 19 +- + fs/xfs/linux-2.6/xfs_super.c | 5 +- + include/linux/blkdev.h | 5 +- + include/linux/cdrom.h | 6 + + include/linux/fs.h | 26 +- + include/linux/genhd.h | 45 ++- + include/scsi/scsi.h | 1 + + include/trace/events/block.h | 12 +- + kernel/power/swap.c | 5 +- + kernel/trace/blktrace.c | 37 +- + mm/swapfile.c | 7 +- + 57 files changed, 1348 insertions(+), 1106 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm.c +Merge made by recursive. + Documentation/device-mapper/dm-crypt.txt | 7 +- + drivers/md/dm-crypt.c | 618 ++++++++++++++++++++++++------ + drivers/md/dm-delay.c | 2 +- + drivers/md/dm-ioctl.c | 111 ++++-- + drivers/md/dm-kcopyd.c | 57 +++- + drivers/md/dm-log-userspace-base.c | 139 ++++++-- + drivers/md/dm-log-userspace-transfer.c | 1 + + drivers/md/dm-log.c | 2 +- + drivers/md/dm-mpath.c | 19 +- + drivers/md/dm-raid1.c | 19 +- + drivers/md/dm-snap-persistent.c | 4 +- + drivers/md/dm-snap.c | 62 +--- + drivers/md/dm-stripe.c | 27 +- + drivers/md/dm.c | 23 +- + include/linux/dm-ioctl.h | 14 +- + include/linux/dm-log-userspace.h | 13 +- + 16 files changed, 830 insertions(+), 288 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Auto-merging drivers/power/ds2760_battery.c +Auto-merging drivers/power/intel_mid_battery.c +Merge made by recursive. + drivers/power/Kconfig | 10 ++ + drivers/power/Makefile | 1 + + drivers/power/collie_battery.c | 13 +-- + drivers/power/ds2760_battery.c | 2 +- + drivers/power/gpio-charger.c | 188 +++++++++++++++++++++++++++++++++ + drivers/power/intel_mid_battery.c | 2 +- + drivers/power/isp1704_charger.c | 201 +++++++++++++++++++++++++++++------- + drivers/power/jz4740-battery.c | 13 +++ + drivers/power/power_supply_core.c | 6 +- + drivers/power/s3c_adc_battery.c | 12 ++- + drivers/power/tosa_battery.c | 13 +-- + drivers/power/wm97xx_battery.c | 4 +- + drivers/power/z2_battery.c | 6 +- + include/linux/power/gpio-charger.h | 41 ++++++++ + include/linux/s3c_adc_battery.h | 1 + + 15 files changed, 447 insertions(+), 66 deletions(-) + create mode 100644 drivers/power/gpio-charger.c + create mode 100644 include/linux/power/gpio-charger.h +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Auto-merging drivers/leds/leds-gpio.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eb98040] Merge remote branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/host/Kconfig +Removing drivers/mmc/host/tmio_mmc.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + arch/arm/mach-dove/common.c | 4 +- + arch/arm/mach-tegra/include/mach/sdhci.h | 29 + + drivers/mfd/sh_mobile_sdhi.c | 6 + + drivers/mmc/card/Kconfig | 1 + + drivers/mmc/core/Kconfig | 11 + + drivers/mmc/core/bus.c | 8 +- + drivers/mmc/core/core.c | 206 ++-- + drivers/mmc/core/core.h | 9 +- + drivers/mmc/core/debugfs.c | 5 + + drivers/mmc/core/host.c | 206 ++++- + drivers/mmc/core/host.h | 21 + + drivers/mmc/core/mmc.c | 91 +- + drivers/mmc/core/mmc_ops.c | 101 ++ + drivers/mmc/core/mmc_ops.h | 1 + + drivers/mmc/core/sd.c | 16 +- + drivers/mmc/core/sdio.c | 36 +- + drivers/mmc/core/sdio_bus.c | 32 - + drivers/mmc/host/Kconfig | 37 + + drivers/mmc/host/Makefile | 3 + + drivers/mmc/host/davinci_mmc.c | 80 ++- + drivers/mmc/host/dw_mmc.c | 1796 ++++++++++++++++++++++++++++++ + drivers/mmc/host/dw_mmc.h | 168 +++ + drivers/mmc/host/mxcmmc.c | 53 +- + drivers/mmc/host/sdhci-dove.c | 70 ++ + drivers/mmc/host/sdhci-pci.c | 161 +++- + drivers/mmc/host/sdhci-pltfm.c | 6 + + drivers/mmc/host/sdhci-pltfm.h | 2 + + drivers/mmc/host/sdhci-s3c.c | 66 ++ + drivers/mmc/host/sdhci-tegra.c | 257 +++++ + drivers/mmc/host/sdhci.c | 45 +- + drivers/mmc/host/sdhci.h | 3 +- + drivers/mmc/host/tmio_mmc.c | 561 +++++++++-- + drivers/mmc/host/tmio_mmc.h | 228 ---- + drivers/mmc/host/ushc.c | 1 - + include/linux/mfd/tmio.h | 5 + + include/linux/mmc/dw_mmc.h | 217 ++++ + include/linux/mmc/host.h | 19 + + include/linux/mmc/mmc.h | 2 + + include/linux/mmc/sdhci.h | 6 + + include/linux/pci_ids.h | 7 + + 40 files changed, 4083 insertions(+), 493 deletions(-) + create mode 100644 arch/arm/mach-tegra/include/mach/sdhci.h + create mode 100644 drivers/mmc/host/dw_mmc.c + create mode 100644 drivers/mmc/host/dw_mmc.h + create mode 100644 drivers/mmc/host/sdhci-dove.c + create mode 100644 drivers/mmc/host/sdhci-tegra.c + delete mode 100644 drivers/mmc/host/tmio_mmc.h + create mode 100644 include/linux/mmc/dw_mmc.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging drivers/serial/kgdboc.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 4 ++-- + drivers/misc/kgdbts.c | 2 +- + drivers/serial/kgdboc.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + 4 files changed, 5 insertions(+), 5 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/mfd/Makefile' using previous resolution. +Resolved 'drivers/mfd/wm8994-core.c' using previous resolution. +Auto-merging drivers/gpio/cs5535-gpio.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/mfd/ab8500-core.c +Removing drivers/mfd/ab8500-spi.c +Auto-merging drivers/mfd/sh_mobile_sdhi.c +Auto-merging drivers/mfd/tps65010.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mfd/twl6030-irq.c +Auto-merging drivers/mfd/wm831x-core.c +Auto-merging drivers/mfd/wm8994-core.c +CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e6c67aa] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/cs5535-gpio.c | 93 ++--- + drivers/mfd/88pm860x-core.c | 36 +- + drivers/mfd/Kconfig | 16 +- + drivers/mfd/Makefile | 3 +- + drivers/mfd/ab3550-core.c | 28 +- + drivers/mfd/ab8500-core.c | 270 +++++++++- + drivers/mfd/ab8500-debugfs.c | 1016 +++++++++++++++++----------------- + drivers/mfd/ab8500-spi.c | 143 ----- + drivers/mfd/asic3.c | 62 ++-- + drivers/mfd/cs5535-mfd.c | 151 ++++++ + drivers/mfd/ezx-pcap.c | 25 +- + drivers/mfd/htc-egpio.c | 27 +- + drivers/mfd/htc-i2cpld.c | 40 +- + drivers/mfd/jz4740-adc.c | 25 +- + drivers/mfd/max8925-core.c | 30 +- + drivers/mfd/max8998-irq.c | 37 +- + drivers/mfd/max8998.c | 108 ++++ + drivers/mfd/mc13xxx-core.c | 2 +- + drivers/mfd/mfd-core.c | 4 + + drivers/mfd/sm501.c | 9 +- + drivers/mfd/stmpe.c | 28 +- + drivers/mfd/t7l66xb.c | 20 +- + drivers/mfd/tc6393xb.c | 22 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/tps6586x.c | 36 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl4030-irq.c | 28 +- + drivers/mfd/twl6030-irq.c | 2 +- + drivers/mfd/vx855.c | 2 +- + drivers/mfd/wm831x-core.c | 17 +- + drivers/mfd/wm831x-i2c.c | 1 + + drivers/mfd/wm831x-irq.c | 42 +- + drivers/mfd/wm831x-spi.c | 18 + + drivers/mfd/wm8350-irq.c | 32 +- + drivers/mfd/wm8994-core.c | 48 +- + drivers/mfd/wm8994-irq.c | 32 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/cs5535-mfgpt.c | 73 +-- + include/linux/mfd/ab8500.h | 4 +- + include/linux/mfd/core.h | 6 + + include/linux/mfd/max8998-private.h | 2 + + include/linux/mfd/max8998.h | 1 + + include/linux/mfd/wm831x/core.h | 1 + + 43 files changed, 1429 insertions(+), 1117 deletions(-) + delete mode 100644 drivers/mfd/ab8500-spi.c + create mode 100644 drivers/mfd/cs5535-mfd.c +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_fb.c +Removing include/linux/intel-gtt.h +Merge made by recursive. + drivers/char/agp/agp.h | 1 - + drivers/char/agp/compat_ioctl.c | 1 - + drivers/char/agp/compat_ioctl.h | 1 - + drivers/char/agp/frontend.c | 8 - + drivers/char/agp/generic.c | 27 - + drivers/char/agp/intel-agp.c | 5 - + drivers/char/agp/intel-agp.h | 14 +- + drivers/char/agp/intel-gtt.c | 778 +++--- + drivers/gpu/drm/drm_agpsupport.c | 6 - + drivers/gpu/drm/drm_crtc_helper.c | 18 +- + drivers/gpu/drm/drm_fb_helper.c | 61 +- + drivers/gpu/drm/drm_fops.c | 2 + + drivers/gpu/drm/drm_irq.c | 566 ++++- + drivers/gpu/drm/drm_mm.c | 40 +- + drivers/gpu/drm/drm_stub.c | 10 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/i915_debugfs.c | 471 +++- + drivers/gpu/drm/i915/i915_dma.c | 794 +++--- + drivers/gpu/drm/i915/i915_drv.c | 80 +- + drivers/gpu/drm/i915/i915_drv.h | 605 +++-- + drivers/gpu/drm/i915/i915_gem.c | 3974 +++++++++----------------- + drivers/gpu/drm/i915/i915_gem_debug.c | 23 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 125 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1343 +++++++++ + drivers/gpu/drm/i915/i915_gem_gtt.c | 99 + + drivers/gpu/drm/i915/i915_gem_tiling.c | 139 +- + drivers/gpu/drm/i915/i915_irq.c | 724 +++-- + drivers/gpu/drm/i915/i915_reg.h | 193 ++- + drivers/gpu/drm/i915/i915_suspend.c | 104 +- + drivers/gpu/drm/i915/i915_trace.h | 91 +- + drivers/gpu/drm/i915/intel_display.c | 999 +++++-- + drivers/gpu/drm/i915/intel_dp.c | 3 +- + drivers/gpu/drm/i915/intel_drv.h | 22 +- + drivers/gpu/drm/i915/intel_fb.c | 32 +- + drivers/gpu/drm/i915/intel_i2c.c | 21 +- + drivers/gpu/drm/i915/intel_lvds.c | 43 +- + drivers/gpu/drm/i915/intel_opregion.c | 8 +- + drivers/gpu/drm/i915/intel_overlay.c | 116 +- + drivers/gpu/drm/i915/intel_panel.c | 52 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1007 ++++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 136 +- + drivers/gpu/drm/i915/intel_sdvo.c | 7 +- + drivers/gpu/drm/i915/intel_tv.c | 14 +- + drivers/gpu/drm/nouveau/Kconfig | 2 +- + drivers/gpu/drm/nouveau/Makefile | 17 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 102 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 319 ++- + drivers/gpu/drm/nouveau/nouveau_channel.c | 383 ++-- + drivers/gpu/drm/nouveau/nouveau_connector.c | 54 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 207 ++ + drivers/gpu/drm/nouveau/nouveau_dma.c | 32 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 58 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 425 ++- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 189 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 18 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 117 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 171 +- + drivers/gpu/drm/nouveau/nouveau_hw.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_irq.c | 1210 +-------- + drivers/gpu/drm/nouveau/nouveau_mem.c | 426 ++-- + drivers/gpu/drm/nouveau/nouveau_mm.c | 271 ++ + drivers/gpu/drm/nouveau/nouveau_mm.h | 67 + + drivers/gpu/drm/nouveau/nouveau_notifier.c | 44 +- + drivers/gpu/drm/nouveau/nouveau_object.c | 754 +++--- + drivers/gpu/drm/nouveau/nouveau_pm.c | 33 +- + drivers/gpu/drm/nouveau/nouveau_ramht.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_ramht.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_reg.h | 75 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 212 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 300 ++- + drivers/gpu/drm/nouveau/nouveau_util.c | 69 + + drivers/gpu/drm/nouveau/nouveau_util.h | 45 + + drivers/gpu/drm/nouveau/nouveau_vm.c | 439 +++ + drivers/gpu/drm/nouveau/nouveau_vm.h | 113 + + drivers/gpu/drm/nouveau/nv04_crtc.c | 8 +- + drivers/gpu/drm/nouveau/nv04_dac.c | 12 +- + drivers/gpu/drm/nouveau/nv04_display.c | 21 + + drivers/gpu/drm/nouveau/nv04_fbcon.c | 102 +- + drivers/gpu/drm/nouveau/nv04_fifo.c | 240 ++- + drivers/gpu/drm/nouveau/nv04_graph.c | 645 +++-- + drivers/gpu/drm/nouveau/nv04_instmem.c | 50 +- + drivers/gpu/drm/nouveau/nv10_fb.c | 124 +- + drivers/gpu/drm/nouveau/nv10_fifo.c | 19 +- + drivers/gpu/drm/nouveau/nv10_graph.c | 203 +- + drivers/gpu/drm/nouveau/nv20_graph.c | 244 ++- + drivers/gpu/drm/nouveau/nv30_fb.c | 23 +- + drivers/gpu/drm/nouveau/nv40_fb.c | 22 +- + drivers/gpu/drm/nouveau/nv40_fifo.c | 20 +- + drivers/gpu/drm/nouveau/nv40_graph.c | 205 ++- + drivers/gpu/drm/nouveau/nv50_crtc.c | 27 +- + drivers/gpu/drm/nouveau/nv50_display.c | 422 +--- + drivers/gpu/drm/nouveau/nv50_display.h | 2 - + drivers/gpu/drm/nouveau/nv50_evo.c | 345 +++ + drivers/gpu/drm/nouveau/nv50_evo.h | 10 + + drivers/gpu/drm/nouveau/nv50_fb.c | 71 +- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 114 +- + drivers/gpu/drm/nouveau/nv50_fifo.c | 42 +- + drivers/gpu/drm/nouveau/nv50_gpio.c | 198 ++- + drivers/gpu/drm/nouveau/nv50_graph.c | 677 ++++- + drivers/gpu/drm/nouveau/nv50_instmem.c | 375 ++-- + drivers/gpu/drm/nouveau/nv50_vm.c | 180 ++ + drivers/gpu/drm/nouveau/nv50_vram.c | 190 ++ + drivers/gpu/drm/nouveau/nv84_crypt.c | 140 + + drivers/gpu/drm/nouveau/nvc0_fbcon.c | 269 ++ + drivers/gpu/drm/nouveau/nvc0_fifo.c | 365 +++ + drivers/gpu/drm/nouveau/nvc0_graph.c | 705 +++++- + drivers/gpu/drm/nouveau/nvc0_graph.h | 64 + + drivers/gpu/drm/nouveau/nvc0_grctx.c | 2874 +++++++++++++++++++ + drivers/gpu/drm/nouveau/nvc0_instmem.c | 317 +- + drivers/gpu/drm/nouveau/nvc0_vm.c | 123 + + drivers/gpu/drm/nouveau/nvc0_vram.c | 99 + + drivers/gpu/drm/nouveau/nvreg.h | 3 +- + drivers/gpu/drm/radeon/Makefile | 5 +- + drivers/gpu/drm/radeon/ObjectID.h | 48 + + drivers/gpu/drm/radeon/atom.c | 14 +- + drivers/gpu/drm/radeon/atombios.h | 997 ++++++- + drivers/gpu/drm/radeon/atombios_crtc.c | 57 +- + drivers/gpu/drm/radeon/evergreen.c | 806 ++++-- + drivers/gpu/drm/radeon/evergreen_blit_kms.c | 92 +- + drivers/gpu/drm/radeon/evergreen_reg.h | 6 + + drivers/gpu/drm/radeon/evergreend.h | 53 +- + drivers/gpu/drm/radeon/ni.c | 316 ++ + drivers/gpu/drm/radeon/ni_reg.h | 86 + + drivers/gpu/drm/radeon/nid.h | 41 + + drivers/gpu/drm/radeon/r100.c | 78 +- + drivers/gpu/drm/radeon/r100d.h | 2 +- + drivers/gpu/drm/radeon/r300.c | 21 +- + drivers/gpu/drm/radeon/r300d.h | 1 + + drivers/gpu/drm/radeon/r500_reg.h | 4 + + drivers/gpu/drm/radeon/r600.c | 357 ++- + drivers/gpu/drm/radeon/r600d.h | 48 + + drivers/gpu/drm/radeon/radeon.h | 151 +- + drivers/gpu/drm/radeon/radeon_asic.c | 153 +- + drivers/gpu/drm/radeon/radeon_asic.h | 65 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 1246 +++++---- + drivers/gpu/drm/radeon/radeon_bios.c | 41 + + drivers/gpu/drm/radeon/radeon_combios.c | 3 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 9 +- + drivers/gpu/drm/radeon/radeon_cs.c | 17 +- + drivers/gpu/drm/radeon/radeon_device.c | 35 +- + drivers/gpu/drm/radeon/radeon_display.c | 391 +++- + drivers/gpu/drm/radeon/radeon_drv.c | 11 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 205 ++- + drivers/gpu/drm/radeon/radeon_family.h | 4 + + drivers/gpu/drm/radeon/radeon_fb.c | 4 - + drivers/gpu/drm/radeon/radeon_fence.c | 4 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 46 +- + drivers/gpu/drm/radeon/radeon_kms.c | 64 +- + drivers/gpu/drm/radeon/radeon_mode.h | 16 +- + drivers/gpu/drm/radeon/radeon_object.c | 57 +- + drivers/gpu/drm/radeon/radeon_object.h | 7 +- + drivers/gpu/drm/radeon/radeon_pm.c | 94 +- + drivers/gpu/drm/radeon/radeon_reg.h | 13 + + drivers/gpu/drm/radeon/radeon_trace.h | 82 + + drivers/gpu/drm/radeon/radeon_trace_points.c | 9 + + drivers/gpu/drm/radeon/reg_srcs/rv515 | 16 + + drivers/gpu/drm/radeon/rs600.c | 118 +- + drivers/gpu/drm/radeon/rv770.c | 196 ++- + drivers/gpu/drm/radeon/rv770d.h | 47 + + drivers/gpu/drm/ttm/ttm_bo.c | 156 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 138 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 29 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 169 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 - + drivers/gpu/vga/vga_switcheroo.c | 78 +- + include/drm/drmP.h | 102 +- + include/drm/drm_crtc.h | 9 + + include/drm/drm_fb_helper.h | 3 - + include/drm/drm_mm.h | 7 + + include/drm/drm_pciids.h | 40 + + include/drm/i915_drm.h | 12 + + include/drm/intel-gtt.h | 35 +- + include/drm/nouveau_drm.h | 5 +- + include/drm/radeon_drm.h | 1 + + include/drm/ttm/ttm_bo_api.h | 50 +- + include/drm/ttm/ttm_bo_driver.h | 152 +- + include/drm/ttm/ttm_execbuf_util.h | 11 +- + include/linux/agp_backend.h | 2 - + include/linux/intel-gtt.h | 20 - + include/linux/kref.h | 2 + + include/linux/vga_switcheroo.h | 2 + + lib/kref.c | 30 + + 187 files changed, 24886 insertions(+), 10827 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_execbuffer.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_gtt.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_mm.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_mm.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_util.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_util.h + create mode 100644 drivers/gpu/drm/nouveau/nouveau_vm.c + create mode 100644 drivers/gpu/drm/nouveau/nouveau_vm.h + create mode 100644 drivers/gpu/drm/nouveau/nv50_evo.c + create mode 100644 drivers/gpu/drm/nouveau/nv50_vm.c + create mode 100644 drivers/gpu/drm/nouveau/nv50_vram.c + create mode 100644 drivers/gpu/drm/nouveau/nv84_crypt.c + create mode 100644 drivers/gpu/drm/nouveau/nvc0_fbcon.c + create mode 100644 drivers/gpu/drm/nouveau/nvc0_graph.h + create mode 100644 drivers/gpu/drm/nouveau/nvc0_grctx.c + create mode 100644 drivers/gpu/drm/nouveau/nvc0_vm.c + create mode 100644 drivers/gpu/drm/nouveau/nvc0_vram.c + create mode 100644 drivers/gpu/drm/radeon/ni.c + create mode 100644 drivers/gpu/drm/radeon/ni_reg.h + create mode 100644 drivers/gpu/drm/radeon/nid.h + create mode 100644 drivers/gpu/drm/radeon/radeon_trace.h + create mode 100644 drivers/gpu/drm/radeon/radeon_trace_points.c + delete mode 100644 include/linux/intel-gtt.h +Merging fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/regulator/core.c' using previous resolution. +Resolved 'drivers/regulator/mc13783-regulator.c' using previous resolution. +Auto-merging arch/arm/mach-imx/mach-pcm038.c +Auto-merging arch/arm/mach-mx3/mach-mx31_3ds.c +Auto-merging arch/arm/mach-mx3/mach-mx31moboard.c +Auto-merging arch/arm/mach-ux500/board-mop500.c +Auto-merging drivers/regulator/core.c +CONFLICT (content): Merge conflict in drivers/regulator/core.c +Auto-merging drivers/regulator/mc13783-regulator.c +CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c +Auto-merging drivers/regulator/tps6586x-regulator.c +Auto-merging drivers/regulator/twl-regulator.c +Auto-merging drivers/regulator/wm8994-regulator.c +Auto-merging include/linux/mfd/ab8500.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f21d838] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-imx/mach-pcm038.c | 4 +- + arch/arm/mach-mx3/mach-mx31_3ds.c | 4 +- + arch/arm/mach-mx3/mach-mx31moboard.c | 4 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 153 +++--- + arch/arm/mach-ux500/board-mop500-regulators.h | 19 + + arch/arm/mach-ux500/board-mop500.c | 3 + + drivers/regulator/88pm8607.c | 3 +- + drivers/regulator/Kconfig | 22 + + drivers/regulator/Makefile | 3 + + drivers/regulator/ab3100.c | 5 +- + drivers/regulator/ab8500.c | 453 ++++++++++++----- + drivers/regulator/core.c | 462 +++++++++++----- + drivers/regulator/da903x.c | 17 +- + drivers/regulator/isl6271a-regulator.c | 8 +- + drivers/regulator/lp3971.c | 10 +- + drivers/regulator/lp3972.c | 10 +- + drivers/regulator/max1586.c | 30 +- + drivers/regulator/max8649.c | 3 +- + drivers/regulator/max8660.c | 14 +- + drivers/regulator/max8925-regulator.c | 3 +- + drivers/regulator/max8952.c | 3 +- + drivers/regulator/max8998.c | 8 +- + drivers/regulator/mc13783-regulator.c | 385 +++----------- + drivers/regulator/mc13892-regulator.c | 635 ++++++++++++++++++++++ + drivers/regulator/mc13xxx-regulator-core.c | 241 +++++++++ + drivers/regulator/mc13xxx.h | 101 ++++ + drivers/regulator/pcap-regulator.c | 7 +- + drivers/regulator/pcf50633-regulator.c | 5 +- + drivers/regulator/tps65023-regulator.c | 9 +- + drivers/regulator/tps6507x-regulator.c | 10 +- + drivers/regulator/tps6524x-regulator.c | 693 +++++++++++++++++++++++++ + drivers/regulator/tps6586x-regulator.c | 15 +- + drivers/regulator/twl-regulator.c | 11 +- + drivers/regulator/wm831x-dcdc.c | 31 +- + drivers/regulator/wm831x-ldo.c | 59 ++- + drivers/regulator/wm8350-regulator.c | 24 +- + drivers/regulator/wm8400-regulator.c | 8 +- + drivers/regulator/wm8994-regulator.c | 22 +- + include/linux/mfd/ab8500.h | 5 +- + include/linux/mfd/mc13783.h | 67 ++-- + include/linux/mfd/mc13892.h | 39 ++ + include/linux/regulator/ab8500.h | 24 +- + include/linux/regulator/consumer.h | 1 + + include/linux/regulator/driver.h | 19 +- + include/trace/events/regulator.h | 141 +++++ + 45 files changed, 2960 insertions(+), 833 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-mop500-regulators.h + create mode 100644 drivers/regulator/mc13892-regulator.c + create mode 100644 drivers/regulator/mc13xxx-regulator-core.c + create mode 100644 drivers/regulator/mc13xxx.h + create mode 100644 drivers/regulator/tps6524x-regulator.c + create mode 100644 include/linux/mfd/mc13892.h + create mode 100644 include/trace/events/regulator.h +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging selinux/master +$ git merge selinux/master +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 +Renaming arch/m68k/include/asm/m548xgpt.h => arch/m68k/include/asm/m54xxgpt.h +Auto-merging arch/m68k/include/asm/m54xxgpt.h +Merge made by recursive. + arch/m68k/include/asm/m54xxgpt.h | 2 + + drivers/watchdog/Kconfig | 52 ++++- + drivers/watchdog/Makefile | 6 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/ath79_wdt.c | 305 +++++++++++++++++++++++ + drivers/watchdog/booke_wdt.c | 35 +++- + drivers/watchdog/f71808e_wdt.c | 78 +++++-- + drivers/watchdog/iTCO_wdt.c | 12 +- + drivers/watchdog/ks8695_wdt.c | 2 +- + drivers/watchdog/m548x_wdt.c | 227 +++++++++++++++++ + drivers/watchdog/nv_tco.c | 512 ++++++++++++++++++++++++++++++++++++++ + drivers/watchdog/nv_tco.h | 64 +++++ + drivers/watchdog/sp5100_tco.c | 480 +++++++++++++++++++++++++++++++++++ + drivers/watchdog/sp5100_tco.h | 41 +++ + drivers/watchdog/w83627hf_wdt.c | 8 +- + 16 files changed, 1796 insertions(+), 32 deletions(-) + create mode 100644 drivers/watchdog/ath79_wdt.c + create mode 100644 drivers/watchdog/m548x_wdt.c + create mode 100644 drivers/watchdog/nv_tco.c + create mode 100644 drivers/watchdog/nv_tco.h + create mode 100644 drivers/watchdog/sp5100_tco.c + create mode 100644 drivers/watchdog/sp5100_tco.h +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 +Renaming drivers/net/wireless/wl12xx/wl1271.h => drivers/net/wireless/wl12xx/wl12xx.h +Auto-merging drivers/net/wireless/wl12xx/wl12xx.h +Renaming drivers/net/wireless/wl12xx/wl1271_acx.h => drivers/net/wireless/wl12xx/acx.h +Auto-merging drivers/net/wireless/wl12xx/acx.h +Renaming sound/soc/s3c24xx/smdk_spdif.c => sound/soc/samsung/smdk_spdif.c +Auto-merging sound/soc/samsung/smdk_spdif.c +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/kvm/api.txt +Auto-merging Documentation/lguest/lguest.txt +Auto-merging Documentation/networking/dccp.txt +Auto-merging Documentation/powerpc/booting-without-of.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/common/it8152.c +Auto-merging arch/arm/mach-imx/pm-imx27.c +Auto-merging arch/arm/mach-msm/io.c +Auto-merging arch/arm/mach-omap1/pm.c +Auto-merging arch/arm/mach-omap2/cpuidle34xx.c +Auto-merging arch/arm/mach-omap2/pm24xx.c +Auto-merging arch/arm/mach-omap2/pm34xx.c +Auto-merging arch/arm/mach-omap2/pm44xx.c +Auto-merging arch/arm/mach-omap2/serial.c +Auto-merging arch/arm/mach-pxa/mxm8x10.c +Auto-merging arch/arm/mach-pxa/sharpsl_pm.c +Auto-merging arch/arm/mach-s3c64xx/dma.c +Auto-merging arch/arm/mm/flush.c +Auto-merging arch/arm/plat-mxc/include/mach/irqs.h +Auto-merging arch/arm/plat-omap/include/plat/omap_hwmod.h +Auto-merging arch/arm/plat-samsung/pm.c +Auto-merging arch/blackfin/mach-bf537/include/mach/defBF534.h +Auto-merging arch/blackfin/mach-common/pm.c +Auto-merging arch/mips/txx9/generic/pci.c +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/kernel/head_32.S +Auto-merging block/cfq-iosched.c +Auto-merging drivers/acpi/apei/erst.c +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/base/power/main.c +Auto-merging drivers/dma/intel_mid_dma.c +Auto-merging drivers/edac/edac_core.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_bios.c +Auto-merging drivers/gpu/drm/radeon/atombios.h +Auto-merging drivers/i2c/busses/i2c-nomadik.c +Auto-merging drivers/infiniband/hw/cxgb4/iw_cxgb4.h +Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c +Auto-merging drivers/input/serio/Kconfig +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/media/video/cx25840/cx25840-ir.c +Auto-merging drivers/media/video/omap/omap_vout.c +Auto-merging drivers/media/video/saa7164/saa7164-core.c +Auto-merging drivers/media/video/via-camera.c +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/bnx2x/bnx2x_reg.h +Auto-merging drivers/net/bonding/bond_3ad.c +Auto-merging drivers/net/cxgb3/t3_hw.c +Auto-merging drivers/net/e1000/e1000_hw.h +Auto-merging drivers/net/e1000/e1000_main.c +Auto-merging drivers/net/e1000e/82571.c +Auto-merging drivers/net/e1000e/ich8lan.c +Auto-merging drivers/net/e1000e/phy.c +Auto-merging drivers/net/eepro.c +Auto-merging drivers/net/ixgbe/ixgbe_82599.c +Auto-merging drivers/net/ll_temac_main.c +Auto-merging drivers/net/tehuti.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/vxge/vxge-traffic.h +Auto-merging drivers/net/wan/dscc4.c +Auto-merging drivers/net/wimax/i2400m/driver.c +Auto-merging drivers/net/wimax/i2400m/i2400m.h +Auto-merging drivers/net/wireless/ath/ath5k/reg.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-sta.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00mac.c +Auto-merging drivers/net/wireless/wl1251/wl1251.h +Auto-merging drivers/platform/x86/fujitsu-laptop.c +Auto-merging drivers/power/s3c_adc_battery.c +Auto-merging drivers/s390/net/lcs.c +Auto-merging drivers/s390/scsi/zfcp_cfdc.c +Auto-merging 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_init.c +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging Resolved 'drivers/net/wireless/iwlwifi/iwl-core.c' using previous resolution. +Resolved 'fs/ext4/ext4.h' using previous resolution. +drivers/scsi/scsi_sysfs.c +Auto-merging drivers/usb/gadget/imx_udc.c +Auto-merging drivers/usb/gadget/langwell_udc.c +Auto-merging drivers/usb/musb/musb_gadget.c +Auto-merging drivers/video/aty/atyfb_base.c +Auto-merging fs/anon_inodes.c +Auto-merging fs/coda/inode.c +Auto-merging fs/ext4/ext4.h +CONFLICT (content): Merge conflict in fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/mfd/core.h +Auto-merging include/linux/suspend.h +Auto-merging init/Kconfig +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/hrtimer.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/power/hibernate.c +Auto-merging kernel/power/suspend.c +Auto-merging kernel/power/swap.c +Auto-merging kernel/sched.c +Auto-merging kernel/sysctl_binary.c +Auto-merging kernel/time/clocksource.c +Auto-merging lib/nlattr.c +Auto-merging mm/page-writeback.c +Auto-merging mm/percpu.c +Auto-merging net/Kconfig +Auto-merging net/core/dev.c +Auto-merging net/decnet/dn_dev.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging scripts/kconfig/confdata.c +Auto-merging scripts/mod/modpost.c +Auto-merging security/apparmor/include/match.h +Auto-merging sound/core/pcm_native.c +Auto-merging sound/soc/codecs/max98088.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 53064d1] 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/iostats.txt | 2 +- + Documentation/kdump/kdump.txt | 15 +++++++++------ + Documentation/kernel-parameters.txt | 5 ----- + Documentation/ko_KR/HOWTO | 4 ++-- + Documentation/kprobes.txt | 2 +- + Documentation/kvm/api.txt | 2 +- + Documentation/lguest/lguest.txt | 7 +++++-- + Documentation/networking/bridge.txt | 4 ++-- + Documentation/networking/caif/spi_porting.txt | 2 +- + Documentation/networking/dccp.txt | 4 ++-- + Documentation/networking/generic_netlink.txt | 2 +- + Documentation/powerpc/booting-without-of.txt | 2 +- + Documentation/scheduler/00-INDEX | 2 +- + Documentation/scsi/ChangeLog.lpfc | 2 +- + Documentation/timers/timer_stats.txt | 2 +- + Documentation/trace/events.txt | 8 ++++---- + Documentation/zh_CN/HOWTO | 4 ++-- + Documentation/zh_CN/SubmittingDrivers | 2 +- + MAINTAINERS | 10 +++++----- + arch/arm/common/it8152.c | 2 +- + arch/arm/common/vic.c | 2 +- + arch/arm/mach-at91/board-ecbat91.c | 6 +++--- + arch/arm/mach-at91/pm.c | 2 +- + arch/arm/mach-bcmring/csp/chipc/chipcHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw.c | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 2 +- + arch/arm/mach-bcmring/csp/tmr/tmrHw.c | 2 +- + arch/arm/mach-bcmring/dma.c | 2 +- + arch/arm/mach-bcmring/include/csp/dmacHw.h | 2 +- + arch/arm/mach-bcmring/include/csp/tmrHw.h | 4 ++-- + .../mach-bcmring/include/mach/csp/dmacHw_priv.h | 2 +- + .../arm/mach-bcmring/include/mach/csp/dmacHw_reg.h | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-gemini/include/mach/hardware.h | 2 +- + arch/arm/mach-imx/pm-imx27.c | 2 +- + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-msm/include/mach/entry-macro-qgic.S | 2 +- + arch/arm/mach-msm/io.c | 2 +- + arch/arm/mach-omap1/pm.c | 2 +- + arch/arm/mach-omap2/cpuidle34xx.c | 2 +- + arch/arm/mach-omap2/pm24xx.c | 2 +- + arch/arm/mach-omap2/pm34xx.c | 2 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-pnx4008/pm.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-sa1100/pm.c | 2 +- + arch/arm/mach-spear3xx/spear300.c | 4 ++-- + arch/arm/mach-spear3xx/spear310.c | 2 +- + arch/arm/mach-spear3xx/spear320.c | 2 +- + arch/arm/mach-spear3xx/spear3xx.c | 6 +++--- + arch/arm/mach-spear6xx/spear6xx.c | 4 ++-- + arch/arm/mach-u300/Kconfig | 2 +- + arch/arm/mach-u300/include/mach/coh901318.h | 4 ++-- + arch/arm/mm/flush.c | 1 - + arch/arm/plat-mxc/include/mach/irqs.h | 2 +- + arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 +- + arch/arm/plat-samsung/pm.c | 2 +- + arch/avr32/mach-at32ap/pm.c | 2 +- + arch/blackfin/mach-bf537/include/mach/defBF534.h | 2 +- + arch/blackfin/mach-common/pm.c | 2 +- + arch/cris/arch-v32/lib/nand_init.S | 2 +- + arch/cris/include/asm/etraxgpio.h | 2 +- + arch/h8300/Kconfig.debug | 2 +- + arch/ia64/kvm/mmio.c | 2 +- + arch/m68k/ifpsp060/src/fpsp.S | 2 +- + arch/m68k/mac/psc.c | 2 +- + arch/mips/alchemy/common/power.c | 2 +- + arch/mips/alchemy/devboards/pm.c | 2 +- + arch/mips/include/asm/mach-powertv/ioremap.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 4 ++-- + arch/mips/jz4740/gpio.c | 2 +- + arch/mips/jz4740/pm.c | 2 +- + arch/mips/loongson/common/pm.c | 2 +- + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/pci/pcie-octeon.c | 2 +- + arch/mips/powertv/memory.c | 2 +- + arch/mips/txx9/generic/pci.c | 2 +- + arch/powerpc/include/asm/8xx_immap.h | 4 ++-- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + arch/powerpc/platforms/52xx/lite5200_pm.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_pm.c | 2 +- + arch/powerpc/platforms/83xx/suspend-asm.S | 6 +++--- + arch/powerpc/platforms/83xx/suspend.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 4 ++-- + arch/powerpc/platforms/ps3/interrupt.c | 2 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/powerpc/sysdev/fsl_pmc.c | 2 +- + arch/sh/boards/mach-hp6xx/pm.c | 2 +- + arch/sh/kernel/cpu/shmobile/pm.c | 2 +- + arch/sh/mm/cache-sh5.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/x86/include/asm/pgalloc.h | 2 +- + arch/x86/include/asm/processor.h | 2 +- + arch/x86/kernel/amd_iommu.c | 4 ++-- + arch/x86/kernel/head_32.S | 2 +- + arch/x86/platform/mrst/early_printk_mrst.c | 2 +- + block/cfq-iosched.c | 2 +- + drivers/acpi/acpica/acobject.h | 2 +- + drivers/acpi/apei/einj.c | 2 +- + drivers/acpi/apei/erst.c | 2 +- + drivers/acpi/sleep.c | 8 ++++---- + drivers/acpi/video.c | 2 +- + drivers/ata/libata-core.c | 4 ++-- + drivers/ata/sata_vsc.c | 2 +- + drivers/atm/idt77252.h | 2 +- + drivers/atm/iphase.c | 4 ++-- + drivers/base/bus.c | 2 +- + drivers/base/power/main.c | 2 +- + drivers/dma/intel_mid_dma.c | 6 +++--- + drivers/edac/amd8131_edac.h | 2 +- + drivers/edac/cell_edac.c | 4 ++-- + drivers/edac/edac_core.h | 2 +- + drivers/edac/i7core_edac.c | 6 +++--- + drivers/edac/ppc4xx_edac.c | 6 +++--- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 4 ++-- + drivers/gpu/drm/nouveau/nouveau_bios.c | 4 ++-- + drivers/gpu/drm/radeon/atombios.h | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 4 ++-- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 2 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 - + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/input/serio/Kconfig | 2 +- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/isdn/gigaset/bas-gigaset.c | 4 ++-- + drivers/isdn/gigaset/ser-gigaset.c | 4 ++-- + drivers/isdn/gigaset/usb-gigaset.c | 4 ++-- + drivers/isdn/hardware/mISDN/ipac.h | 4 ++-- + drivers/isdn/hardware/mISDN/isar.h | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 2 +- + drivers/macintosh/via-pmu-backlight.c | 4 ++-- + drivers/macintosh/via-pmu.c | 2 +- + drivers/media/video/cx18/cx23418.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/tvp7002.c | 2 +- + drivers/media/video/via-camera.c | 2 -- + drivers/message/fusion/lsi/mpi_log_sas.h | 2 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/arm-charlcd.c | 2 +- + drivers/mmc/card/block.c | 2 +- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/au1xmmc.c | 2 +- + drivers/mmc/host/sdricoh_cs.c | 4 ++-- + drivers/mtd/nand/nand_base.c | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 2 +- + drivers/net/bnx2x/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 6 +++--- + drivers/net/chelsio/subr.c | 2 +- + drivers/net/cxgb3/mc5.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 2 +- + drivers/net/e1000/e1000_hw.h | 2 +- + drivers/net/e1000/e1000_main.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/ich8lan.c | 2 +- + drivers/net/e1000e/phy.c | 2 +- + drivers/net/eepro.c | 2 +- + drivers/net/irda/donauboe.h | 2 +- + drivers/net/ixgbe/ixgbe_82599.c | 4 ++-- + drivers/net/ll_temac_main.c | 2 +- + drivers/net/sis900.c | 2 +- + drivers/net/tehuti.c | 6 +++--- + drivers/net/tun.c | 2 +- + drivers/net/via-velocity.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 | 4 ++-- + 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-agn-ict.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 4 ++-- + 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/wl1251/acx.h | 4 ++-- + drivers/net/wireless/wl1251/wl1251.h | 2 +- + drivers/net/wireless/wl12xx/acx.h | 4 ++-- + drivers/net/wireless/wl12xx/wl12xx.h | 4 ++-- + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/pcmcia/m32r_cfc.h | 2 +- + drivers/pcmcia/m32r_pcc.h | 2 +- + drivers/pcmcia/m8xx_pcmcia.c | 2 +- + drivers/platform/x86/acer-wmi.c | 2 +- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/asus_acpi.c | 2 +- + drivers/platform/x86/dell-laptop.c | 2 +- + drivers/platform/x86/eeepc-laptop.c | 2 +- + drivers/platform/x86/fujitsu-laptop.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 4 ++-- + drivers/platform/x86/toshiba_acpi.c | 2 +- + drivers/power/s3c_adc_battery.c | 4 ++-- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/scsi/zfcp_cfdc.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 2 +- + drivers/scsi/aic94xx/aic94xx_reg_def.h | 4 ++-- + drivers/scsi/aic94xx/aic94xx_scb.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 6 +++--- + drivers/scsi/bfa/bfa_fcpim.c | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/dc395x.c | 8 ++++---- + drivers/scsi/libfc/fc_fcp.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/megaraid.h | 2 +- + drivers/scsi/megaraid/megaraid_mm.c | 2 +- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/scsi/scsi_sysfs.c | 6 ++++-- + drivers/scsi/sym53c8xx_2/sym_glue.c | 2 +- + drivers/spi/atmel_spi.c | 4 ++-- + drivers/spi/spidev.c | 2 +- + drivers/staging/msm/msm_fb_bl.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- + drivers/staging/samsung-laptop/samsung-laptop.c | 2 +- + drivers/telephony/ixj.c | 3 ++- + drivers/usb/gadget/imx_udc.c | 2 +- + drivers/usb/gadget/langwell_udc.c | 4 ++-- + drivers/usb/host/fhci-hcd.c | 4 ++-- + drivers/usb/host/fhci-tds.c | 4 ++-- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/misc/adutux.c | 2 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/ldusb.c | 2 +- + drivers/usb/musb/musb_gadget.c | 4 ++-- + drivers/usb/wusbcore/wa-rpipe.c | 2 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/aty/aty128fb.c | 2 +- + drivers/video/aty/atyfb_base.c | 2 +- + drivers/video/aty/radeon_backlight.c | 2 +- + drivers/video/backlight/88pm860x_bl.c | 2 +- + drivers/video/backlight/max8925_bl.c | 2 +- + drivers/video/nvidia/nv_backlight.c | 2 +- + drivers/video/omap2/displays/panel-taal.c | 2 +- + drivers/video/riva/fbdev.c | 2 +- + drivers/video/sstfb.c | 2 +- + fs/anon_inodes.c | 6 +++--- + fs/coda/inode.c | 2 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents.c | 4 ++-- + fs/ext4/inode.c | 6 +++--- + fs/jbd/transaction.c | 2 +- + fs/jbd2/transaction.c | 2 +- + fs/notify/fanotify/Kconfig | 2 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/suballoc.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 2 +- + include/acpi/actbl1.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/firewire-cdev.h | 2 +- + include/linux/mfd/core.h | 2 +- + include/linux/poll.h | 2 +- + include/linux/suspend.h | 8 ++++---- + include/linux/u64_stats_sync.h | 12 ++++++------ + include/media/davinci/vpss.h | 2 +- + include/net/sctp/user.h | 4 ++-- + include/scsi/fc/fc_fcp.h | 4 ++-- + init/Kconfig | 2 +- + kernel/audit.c | 2 +- + kernel/debug/kdb/kdb_main.c | 2 +- + kernel/hrtimer.c | 2 +- + kernel/kexec.c | 2 +- + kernel/perf_event.c | 2 +- + kernel/power/hibernate.c | 4 ++-- + kernel/power/suspend.c | 4 ++-- + kernel/power/swap.c | 2 +- + kernel/sched.c | 2 +- + kernel/sysctl_binary.c | 2 +- + kernel/time.c | 4 ++-- + kernel/time/clocksource.c | 2 +- + kernel/trace/trace_entries.h | 2 +- + lib/nlattr.c | 2 +- + lib/swiotlb.c | 2 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 2 +- + mm/percpu.c | 2 +- + mm/rmap.c | 2 +- + mm/sparse-vmemmap.c | 2 +- + net/Kconfig | 4 +++- + net/core/dev.c | 2 +- + net/dccp/Kconfig | 4 +++- + net/decnet/dn_dev.c | 2 +- + net/ipv4/Kconfig | 4 +++- + net/ipv4/tcp_output.c | 2 +- + net/ipv6/af_inet6.c | 2 +- + net/sched/Kconfig | 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/ca0106/ca0106_main.c | 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/ppc/snd_ps3.c | 2 +- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/samsung/smdk_spdif.c | 6 +++--- + 323 files changed, 437 insertions(+), 431 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0ae6131] 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 +Auto-merging drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/rtc/rtc-dev.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/rtc/rtc-dev.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-dev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c13890] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + drivers/rtc/class.c | 13 + + drivers/rtc/interface.c | 574 ++++++++++++++++++++++++++++------------------ + drivers/rtc/rtc-dev.c | 104 --------- + drivers/rtc/rtc-lib.c | 28 +++ + include/linux/rtc.h | 51 +++-- + 5 files changed, 426 insertions(+), 344 deletions(-) +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date! +Merge made by recursive. +Merging xen/upstream/xen +$ git merge xen/upstream/xen +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/xen/events.c +Merge made by recursive. + drivers/xen/Kconfig | 7 + + drivers/xen/Makefile | 2 + + drivers/xen/gntdev.c | 647 +++++++++++++++++++++++++++++++++++++++++++++ + include/xen/gntdev.h | 119 +++++++++ + include/xen/grant_table.h | 39 +++- + 5 files changed, 813 insertions(+), 1 deletions(-) + create mode 100644 drivers/xen/gntdev.c + create mode 100644 include/xen/gntdev.h +Merging swiotlb-xen/master +$ git merge swiotlb-xen/master +Resolved 'drivers/xen/Kconfig' using previous resolution. +Auto-merging drivers/gpu/drm/nouveau/nouveau_sgdma.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/net/Kconfig +Auto-merging drivers/xen/Kconfig +CONFLICT (content): Merge conflict in drivers/xen/Kconfig +Auto-merging include/drm/ttm/ttm_bo_driver.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 82f80b8] Merge remote branch 'swiotlb-xen/master' +$ git diff -M --stat --summary HEAD^.. + drivers/block/Kconfig | 1 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 31 ++- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 36 ++- + drivers/gpu/drm/radeon/radeon_ttm.c | 8 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 35 +++- + drivers/gpu/drm/ttm/ttm_tt.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 3 +- + drivers/net/Kconfig | 1 + + drivers/pci/Kconfig | 1 + + drivers/xen/Kconfig | 11 + + drivers/xen/manage.c | 3 +- + drivers/xen/xenbus/Makefile | 5 + + drivers/xen/xenbus/xenbus_probe.c | 351 +++++----------------------- + drivers/xen/xenbus/xenbus_probe.h | 31 ++-- + drivers/xen/xenbus/xenbus_probe_backend.c | 276 ++++++++++++++++++++++ + drivers/xen/xenbus/xenbus_probe_frontend.c | 294 +++++++++++++++++++++++ + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/ttm/ttm_page_alloc.h | 8 +- + include/xen/xenbus.h | 2 +- + 21 files changed, 773 insertions(+), 349 deletions(-) + create mode 100644 drivers/xen/xenbus/xenbus_probe_backend.c + create mode 100644 drivers/xen/xenbus/xenbus_probe_frontend.c +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Auto-merging arch/x86/include/asm/xen/page.h +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/x86/xen/mmu.c +Auto-merging include/xen/interface/memory.h +Merge made by recursive. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Auto-merging drivers/edac/edac_core.h +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + include/linux/lockdep.h | 3 +++ + kernel/workqueue.c | 17 +++++++++++++---- + 2 files changed, 16 insertions(+), 4 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/acer-wmi.c +Auto-merging drivers/platform/x86/eeepc-laptop.c +Auto-merging drivers/platform/x86/fujitsu-laptop.c +Auto-merging drivers/platform/x86/sony-laptop.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Merge made by recursive. + .../ABI/testing/sysfs-platform-ideapad-laptop | 6 + + MAINTAINERS | 8 + + drivers/platform/x86/Kconfig | 27 +- + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 429 ++++++++++++++- + drivers/platform/x86/classmate-laptop.c | 19 +- + drivers/platform/x86/compal-laptop.c | 8 + + drivers/platform/x86/eeepc-laptop.c | 11 + + drivers/platform/x86/eeepc-wmi.c | 609 +++++++++++++++++--- + drivers/platform/x86/fujitsu-laptop.c | 2 +- + drivers/platform/x86/ideapad-laptop.c | 259 ++++++--- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/platform/x86/intel_pmic_gpio.c | 6 +- + drivers/platform/x86/intel_scu_ipc.c | 4 +- + drivers/platform/x86/intel_scu_ipcutil.c | 133 +++++ + drivers/platform/x86/sony-laptop.c | 12 +- + drivers/platform/x86/thinkpad_acpi.c | 3 +- + drivers/platform/x86/wmi.c | 135 +++-- + include/linux/sonypi.h | 1 + + 19 files changed, 1432 insertions(+), 243 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-ideapad-laptop + create mode 100644 drivers/platform/x86/intel_scu_ipcutil.c +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Auto-merging drivers/base/bus.c +Auto-merging drivers/base/core.c +Auto-merging include/linux/device.h +Merge made by recursive. + drivers/base/base.h | 62 +++++++++++++++++++---------------------------- + drivers/base/bus.c | 13 ++++----- + drivers/base/class.c | 42 ++++++++++++++++---------------- + drivers/base/core.c | 24 ++++++++++-------- + fs/sysfs/group.c | 10 +------ + include/linux/device.h | 7 ++--- + 6 files changed, 70 insertions(+), 88 deletions(-) +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Resolved 'drivers/video/udlfb.c' using previous resolution. +Renaming drivers/staging/udlfb/udlfb.c => drivers/video/udlfb.c +Auto-merging drivers/video/udlfb.c +CONFLICT (rename/modify): Merge conflict in drivers/video/udlfb.c +Auto-merging MAINTAINERS +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/adis16255/Kconfig +Removing drivers/staging/adis16255/Makefile +Removing drivers/staging/adis16255/adis16255.c +Removing drivers/staging/adis16255/adis16255.h +Removing drivers/staging/batman-adv/Kconfig +Removing drivers/staging/batman-adv/Makefile +Removing drivers/staging/batman-adv/README +Removing drivers/staging/batman-adv/TODO +Removing drivers/staging/batman-adv/aggregation.c +Removing drivers/staging/batman-adv/aggregation.h +Removing drivers/staging/batman-adv/bat_debugfs.c +Removing drivers/staging/batman-adv/bat_debugfs.h +Removing drivers/staging/batman-adv/bat_sysfs.c +Removing drivers/staging/batman-adv/bat_sysfs.h +Removing drivers/staging/batman-adv/bitarray.c +Removing drivers/staging/batman-adv/bitarray.h +Removing drivers/staging/batman-adv/hard-interface.c +Removing drivers/staging/batman-adv/hard-interface.h +Removing drivers/staging/batman-adv/hash.c +Removing drivers/staging/batman-adv/hash.h +Removing drivers/staging/batman-adv/icmp_socket.c +Removing drivers/staging/batman-adv/icmp_socket.h +Removing drivers/staging/batman-adv/main.c +Removing drivers/staging/batman-adv/main.h +Removing drivers/staging/batman-adv/originator.c +Removing drivers/staging/batman-adv/originator.h +Removing drivers/staging/batman-adv/packet.h +Removing drivers/staging/batman-adv/ring_buffer.c +Removing drivers/staging/batman-adv/ring_buffer.h +Removing drivers/staging/batman-adv/routing.c +Removing drivers/staging/batman-adv/routing.h +Removing drivers/staging/batman-adv/send.c +Removing drivers/staging/batman-adv/send.h +Removing drivers/staging/batman-adv/soft-interface.c +Removing drivers/staging/batman-adv/soft-interface.h +Removing drivers/staging/batman-adv/sysfs-class-net-batman-adv +Removing drivers/staging/batman-adv/sysfs-class-net-mesh +Removing drivers/staging/batman-adv/translation-table.c +Removing drivers/staging/batman-adv/translation-table.h +Removing drivers/staging/batman-adv/types.h +Removing drivers/staging/batman-adv/unicast.c +Removing drivers/staging/batman-adv/unicast.h +Removing drivers/staging/batman-adv/vis.c +Removing drivers/staging/batman-adv/vis.h +Removing drivers/staging/bcm/Arp.c +Removing drivers/staging/bcm/Debug.c +Removing drivers/staging/bcm/HostMibs.h +Auto-merging drivers/staging/bcm/InterfaceInit.c +Removing drivers/staging/bcm/Interfacemain.h +Removing drivers/staging/bcm/Osal_Misc.c +Removing drivers/staging/bcm/osal_misc.h +Removing drivers/staging/brcm80211/include/bcm_rpc.h +Removing drivers/staging/brcm80211/include/bcm_rpc_tp.h +Removing drivers/staging/brcm80211/include/bcm_xdr.h +Removing drivers/staging/brcm80211/include/dbus.h +Removing drivers/staging/brcm80211/include/epivers.h +Removing drivers/staging/brcm80211/include/linux_osl.h +Removing drivers/staging/brcm80211/include/linuxver.h +Removing drivers/staging/brcm80211/sys/wlc_rpc.h +Removing drivers/staging/brcm80211/sys/wlc_rpctx.h +Auto-merging drivers/staging/cx25821/cx25821-alsa.c +Removing drivers/staging/hv/vmbus.c +Auto-merging drivers/staging/sm7xx/smtcfb.c +Removing drivers/staging/winbond/mlmetxrx.c +Removing drivers/staging/winbond/mlmetxrx_f.h +Removing drivers/staging/winbond/sysdef.h +Removing drivers/staging/winbond/wbhal_f.h +Removing drivers/staging/winbond/wblinux_f.h +Removing drivers/staging/winbond/wbusb_s.h +Auto-merging drivers/staging/zram/zram_drv.c +Auto-merging drivers/usb/serial/option.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ad8be54] Merge remote branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 +- + drivers/staging/Kconfig | 10 +- + drivers/staging/Makefile | 5 +- + drivers/staging/adis16255/Kconfig | 11 - + drivers/staging/adis16255/Makefile | 1 - + drivers/staging/adis16255/adis16255.c | 468 --- + drivers/staging/adis16255/adis16255.h | 12 - + drivers/staging/asus_oled/asus_oled.c | 2 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 4 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 2 +- + drivers/staging/autofs/dirhash.c | 87 +- + drivers/staging/batman-adv/Kconfig | 26 - + drivers/staging/batman-adv/Makefile | 22 - + drivers/staging/batman-adv/README | 240 -- + drivers/staging/batman-adv/TODO | 14 - + drivers/staging/batman-adv/aggregation.c | 275 -- + drivers/staging/batman-adv/aggregation.h | 43 - + drivers/staging/batman-adv/bat_debugfs.c | 343 -- + drivers/staging/batman-adv/bat_debugfs.h | 33 - + drivers/staging/batman-adv/bat_sysfs.c | 558 --- + drivers/staging/batman-adv/bat_sysfs.h | 42 - + drivers/staging/batman-adv/bitarray.c | 201 -- + drivers/staging/batman-adv/bitarray.h | 47 - + drivers/staging/batman-adv/hard-interface.c | 647 ---- + drivers/staging/batman-adv/hard-interface.h | 58 - + drivers/staging/batman-adv/hash.c | 306 -- + drivers/staging/batman-adv/hash.h | 100 - + drivers/staging/batman-adv/icmp_socket.c | 359 -- + drivers/staging/batman-adv/icmp_socket.h | 34 - + drivers/staging/batman-adv/main.c | 217 -- + drivers/staging/batman-adv/main.h | 183 - + drivers/staging/batman-adv/originator.c | 533 --- + drivers/staging/batman-adv/originator.h | 36 - + drivers/staging/batman-adv/packet.h | 134 - + drivers/staging/batman-adv/ring_buffer.c | 52 - + drivers/staging/batman-adv/ring_buffer.h | 28 - + drivers/staging/batman-adv/routing.c | 1389 -------- + drivers/staging/batman-adv/routing.h | 46 - + drivers/staging/batman-adv/send.c | 580 ---- + drivers/staging/batman-adv/send.h | 41 - + drivers/staging/batman-adv/soft-interface.c | 398 --- + drivers/staging/batman-adv/soft-interface.h | 32 - + .../staging/batman-adv/sysfs-class-net-batman-adv | 14 - + drivers/staging/batman-adv/sysfs-class-net-mesh | 41 - + drivers/staging/batman-adv/translation-table.c | 518 --- + drivers/staging/batman-adv/translation-table.h | 45 - + drivers/staging/batman-adv/types.h | 241 -- + drivers/staging/batman-adv/unicast.c | 269 -- + drivers/staging/batman-adv/unicast.h | 39 - + drivers/staging/batman-adv/vis.c | 895 ----- + drivers/staging/batman-adv/vis.h | 37 - + drivers/staging/bcm/Adapter.h | 134 +- + drivers/staging/bcm/Arp.c | 94 - + drivers/staging/bcm/Bcmchar.c | 967 ++---- + drivers/staging/bcm/Bcmnet.c | 404 +-- + drivers/staging/bcm/CmHost.c | 139 +- + drivers/staging/bcm/CmHost.h | 3 - + drivers/staging/bcm/DDRInit.c | 17 +- + drivers/staging/bcm/Debug.c | 41 - + drivers/staging/bcm/Debug.h | 88 +- + drivers/staging/bcm/HandleControlPacket.c | 39 +- + drivers/staging/bcm/HostMibs.h | 7 - + drivers/staging/bcm/IPv6Protocol.c | 10 +- + drivers/staging/bcm/IPv6ProtocolHdr.h | 3 - + drivers/staging/bcm/InterfaceDld.c | 136 +- + drivers/staging/bcm/InterfaceIdleMode.c | 20 +- + drivers/staging/bcm/InterfaceIdleMode.h | 2 - + drivers/staging/bcm/InterfaceInit.c | 854 ++--- + drivers/staging/bcm/InterfaceInit.h | 28 +- + drivers/staging/bcm/InterfaceIsr.c | 44 +- + drivers/staging/bcm/InterfaceMisc.c | 29 +- + drivers/staging/bcm/InterfaceMisc.h | 3 - + drivers/staging/bcm/InterfaceRx.c | 40 +- + drivers/staging/bcm/InterfaceTx.c | 74 +- + drivers/staging/bcm/InterfaceTx.h | 6 - + drivers/staging/bcm/Interfacemain.h | 10 - + drivers/staging/bcm/LeakyBucket.c | 72 +- + drivers/staging/bcm/Macros.h | 40 +- + drivers/staging/bcm/Makefile | 4 +- + drivers/staging/bcm/Misc.c | 536 +--- + drivers/staging/bcm/Osal_Misc.c | 27 - + drivers/staging/bcm/PHSModule.c | 234 +- + drivers/staging/bcm/PHSModule.h | 45 - + drivers/staging/bcm/Protocol.h | 6 +- + drivers/staging/bcm/Prototypes.h | 122 +- + drivers/staging/bcm/Qos.c | 106 +- + drivers/staging/bcm/TODO | 25 +- + drivers/staging/bcm/Transmit.c | 393 +-- + drivers/staging/bcm/cntrl_SignalingInterface.h | 254 -- + drivers/staging/bcm/headers.h | 40 +- + drivers/staging/bcm/hostmibs.c | 35 +- + drivers/staging/bcm/led_control.c | 135 +- + drivers/staging/bcm/nvm.c | 642 +--- + drivers/staging/bcm/nvm.h | 80 - + drivers/staging/bcm/osal_misc.h | 49 - + drivers/staging/brcm80211/README | 10 +- + drivers/staging/brcm80211/brcmfmac/README | 5 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 12 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 270 +-- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 59 +- + .../brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c | 4 +- + drivers/staging/brcm80211/brcmfmac/dhd.h | 19 +- + drivers/staging/brcm80211/brcmfmac/dhd_bus.h | 6 +- + drivers/staging/brcm80211/brcmfmac/dhd_cdc.c | 40 +- + drivers/staging/brcm80211/brcmfmac/dhd_common.c | 18 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 36 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 148 +- + .../staging/brcm80211/brcmfmac/dhd_linux_sched.c | 1 - + drivers/staging/brcm80211/brcmfmac/dhd_proto.h | 7 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 348 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 586 ++-- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h | 48 +- + drivers/staging/brcm80211/brcmfmac/wl_iw.c | 578 ++-- + drivers/staging/brcm80211/brcmfmac/wl_iw.h | 2 +- + drivers/staging/brcm80211/include/bcm_rpc.h | 79 - + drivers/staging/brcm80211/include/bcm_rpc_tp.h | 137 - + drivers/staging/brcm80211/include/bcm_xdr.h | 60 - + drivers/staging/brcm80211/include/bcmdefs.h | 63 +- + drivers/staging/brcm80211/include/bcmsdbus.h | 6 +- + drivers/staging/brcm80211/include/bcmsdh.h | 12 +- + drivers/staging/brcm80211/include/bcmsdh_sdmmc.h | 6 +- + drivers/staging/brcm80211/include/bcmsrom.h | 8 +- + drivers/staging/brcm80211/include/bcmutils.h | 60 +- + drivers/staging/brcm80211/include/d11.h | 7 - + drivers/staging/brcm80211/include/dbus.h | 353 -- + drivers/staging/brcm80211/include/epivers.h | 44 - + drivers/staging/brcm80211/include/hnddma.h | 91 +- + drivers/staging/brcm80211/include/hndpmu.h | 44 +- + drivers/staging/brcm80211/include/linux_osl.h | 407 --- + drivers/staging/brcm80211/include/linuxver.h | 38 - + drivers/staging/brcm80211/include/nicpci.h | 12 +- + drivers/staging/brcm80211/include/osl.h | 209 +- + drivers/staging/brcm80211/include/proto/ethernet.h | 54 +- + drivers/staging/brcm80211/include/proto/wpa.h | 94 - + drivers/staging/brcm80211/include/rpc_osl.h | 2 +- + drivers/staging/brcm80211/include/siutils.h | 28 +- + drivers/staging/brcm80211/include/wlioctl.h | 342 +-- + drivers/staging/brcm80211/phy/wlc_phy_cmn.c | 63 +- + drivers/staging/brcm80211/phy/wlc_phy_hal.h | 6 - + drivers/staging/brcm80211/phy/wlc_phy_int.h | 4 +- + drivers/staging/brcm80211/phy/wlc_phy_lcn.c | 13 +- + drivers/staging/brcm80211/phy/wlc_phy_n.c | 59 +- + drivers/staging/brcm80211/phy/wlc_phytbl_lcn.c | 3 + + drivers/staging/brcm80211/phy/wlc_phytbl_n.c | 3 + + drivers/staging/brcm80211/sys/wl_dbg.h | 72 +- + drivers/staging/brcm80211/sys/wl_export.h | 8 +- + drivers/staging/brcm80211/sys/wl_mac80211.c | 1026 ++----- + drivers/staging/brcm80211/sys/wl_mac80211.h | 50 +- + drivers/staging/brcm80211/sys/wl_ucode.h | 12 + + drivers/staging/brcm80211/sys/wl_ucode_loader.c | 13 +- + drivers/staging/brcm80211/sys/wlc_alloc.c | 70 +- + drivers/staging/brcm80211/sys/wlc_alloc.h | 12 +- + drivers/staging/brcm80211/sys/wlc_ampdu.c | 316 +- + drivers/staging/brcm80211/sys/wlc_ampdu.h | 30 +- + drivers/staging/brcm80211/sys/wlc_antsel.c | 49 +- + drivers/staging/brcm80211/sys/wlc_antsel.h | 16 +- + drivers/staging/brcm80211/sys/wlc_bmac.c | 806 +++--- + drivers/staging/brcm80211/sys/wlc_bmac.h | 182 +- + drivers/staging/brcm80211/sys/wlc_bsscfg.h | 3 +- + drivers/staging/brcm80211/sys/wlc_cfg.h | 24 - + drivers/staging/brcm80211/sys/wlc_channel.c | 102 +- + drivers/staging/brcm80211/sys/wlc_event.c | 16 +- + drivers/staging/brcm80211/sys/wlc_event.h | 5 +- + drivers/staging/brcm80211/sys/wlc_mac80211.c | 1297 +++----- + drivers/staging/brcm80211/sys/wlc_mac80211.h | 312 +- + drivers/staging/brcm80211/sys/wlc_phy_shim.c | 14 +- + drivers/staging/brcm80211/sys/wlc_pub.h | 48 +- + drivers/staging/brcm80211/sys/wlc_rate.c | 6 +- + drivers/staging/brcm80211/sys/wlc_rpc.h | 527 --- + drivers/staging/brcm80211/sys/wlc_rpctx.h | 71 - + drivers/staging/brcm80211/sys/wlc_scb.h | 2 +- + drivers/staging/brcm80211/sys/wlc_stf.c | 72 +- + drivers/staging/brcm80211/sys/wlc_stf.h | 31 +- + drivers/staging/brcm80211/sys/wlc_types.h | 31 +- + drivers/staging/brcm80211/util/aiutils.c | 25 +- + drivers/staging/brcm80211/util/bcmotp.c | 22 +- + drivers/staging/brcm80211/util/bcmsrom.c | 95 +- + drivers/staging/brcm80211/util/bcmutils.c | 112 +- + drivers/staging/brcm80211/util/bcmwifi.c | 4 + + drivers/staging/brcm80211/util/hnddma.c | 136 +- + drivers/staging/brcm80211/util/hndpmu.c | 174 +- + drivers/staging/brcm80211/util/linux_osl.c | 247 +-- + drivers/staging/brcm80211/util/nicpci.c | 125 +- + drivers/staging/brcm80211/util/nvram/nvram_ro.c | 4 +- + drivers/staging/brcm80211/util/sbutils.c | 13 +- + drivers/staging/brcm80211/util/siutils.c | 206 +- + drivers/staging/comedi/drivers.c | 30 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 2 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 66 +- + drivers/staging/comedi/drivers/jr3_pci.c | 7 + + drivers/staging/comedi/drivers/ni_tiocmd.c | 71 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/s526.c | 139 +- + drivers/staging/comedi/drivers/usbdux.c | 2 +- + drivers/staging/cptm1217/Kconfig | 12 + + drivers/staging/cptm1217/Makefile | 2 + + drivers/staging/cptm1217/TODO | 5 + + drivers/staging/cptm1217/clearpad_tm1217.c | 675 ++++ + drivers/staging/cptm1217/cp_tm1217.h | 9 + + drivers/staging/crystalhd/crystalhd_hw.c | 2 +- + drivers/staging/crystalhd/crystalhd_lnx.c | 6 +- + drivers/staging/cx25821/cx25821-alsa.c | 2 +- + drivers/staging/cxt1e1/comet.c | 8 +- + drivers/staging/cxt1e1/functions.c | 8 +- + drivers/staging/cxt1e1/hwprobe.c | 4 +- + drivers/staging/cxt1e1/linux.c | 18 +- + drivers/staging/cxt1e1/musycc.c | 58 +- + drivers/staging/cxt1e1/pmcc4_drv.c | 38 +- + drivers/staging/cxt1e1/sbecom_inline_linux.h | 4 +- + drivers/staging/easycap/Kconfig | 1 - + drivers/staging/easycap/Makefile | 1 + + drivers/staging/easycap/README | 93 +- + drivers/staging/easycap/easycap.h | 186 +- + drivers/staging/easycap/easycap_debug.h | 2 + + drivers/staging/easycap/easycap_ioctl.c | 2286 +++++++------ + drivers/staging/easycap/easycap_low.c | 895 +++-- + drivers/staging/easycap/easycap_main.c | 2782 ++++++++++------ + drivers/staging/easycap/easycap_settings.c | 272 ++- + drivers/staging/easycap/easycap_sound.c | 603 +++-- + drivers/staging/easycap/easycap_testcard.c | 372 ++- + drivers/staging/et131x/et131x_initpci.c | 2 +- + drivers/staging/frontier/alphatrack.c | 4 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 54 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c | 8 +- + drivers/staging/ft1000/ft1000-usb/Makefile | 2 +- + .../ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} | 435 +-- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 386 ++-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 433 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.h | 4 +- + drivers/staging/ft1000/ft1000-usb/ft1000_proc.c | 373 ++- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.c | 34 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 62 +- + drivers/staging/go7007/go7007-driver.c | 2 +- + drivers/staging/hv/Makefile | 2 +- + drivers/staging/hv/blkvsc.c | 52 +- + drivers/staging/hv/blkvsc_drv.c | 117 +- + drivers/staging/hv/channel.c | 338 +- + drivers/staging/hv/channel_mgmt.c | 244 +- + drivers/staging/hv/channel_mgmt.h | 245 +- + drivers/staging/hv/connection.c | 56 +- + drivers/staging/hv/hv.c | 346 +- + drivers/staging/hv/hv.h | 36 +- + drivers/staging/hv/hv_api.h | 278 +- + drivers/staging/hv/hv_utils.c | 99 +- + drivers/staging/hv/netvsc.c | 937 +++--- + drivers/staging/hv/netvsc.h | 164 +- + drivers/staging/hv/netvsc_api.h | 64 +- + drivers/staging/hv/netvsc_drv.c | 83 +- + drivers/staging/hv/osd.c | 108 +- + drivers/staging/hv/osd.h | 22 +- + drivers/staging/hv/ring_buffer.c | 404 ++-- + drivers/staging/hv/ring_buffer.h | 56 +- + drivers/staging/hv/rndis.h | 353 +- + drivers/staging/hv/rndis_filter.c | 640 ++-- + drivers/staging/hv/rndis_filter.h | 2 +- + drivers/staging/hv/storvsc.c | 584 ++-- + drivers/staging/hv/storvsc_api.h | 54 +- + drivers/staging/hv/storvsc_drv.c | 95 +- + drivers/staging/hv/vmbus.c | 274 -- + drivers/staging/hv/vmbus_api.h | 24 - + drivers/staging/hv/vmbus_drv.c | 351 ++- + drivers/staging/hv/vmbus_private.h | 7 +- + drivers/staging/hv/vstorage.h | 106 +- + drivers/staging/iio/Documentation/sysfs-bus-iio | 627 +++-- + .../staging/iio/Documentation/sysfs-bus-iio-dds | 93 + + drivers/staging/iio/Kconfig | 6 +- + drivers/staging/iio/Makefile | 7 +- + drivers/staging/iio/TODO | 4 + + drivers/staging/iio/accel/Kconfig | 27 + + drivers/staging/iio/accel/Makefile | 12 + + drivers/staging/iio/accel/accel.h | 20 + + drivers/staging/iio/accel/adis16201.h | 150 + + drivers/staging/iio/accel/adis16201_core.c | 659 ++++ + drivers/staging/iio/accel/adis16201_ring.c | 218 ++ + drivers/staging/iio/accel/adis16201_trigger.c | 122 + + drivers/staging/iio/accel/adis16203.h | 143 + + drivers/staging/iio/accel/adis16203_core.c | 568 ++++ + drivers/staging/iio/accel/adis16203_ring.c | 211 ++ + drivers/staging/iio/accel/adis16203_trigger.c | 122 + + drivers/staging/iio/accel/adis16204.h | 151 + + drivers/staging/iio/accel/adis16204_core.c | 613 ++++ + drivers/staging/iio/accel/adis16204_ring.c | 206 ++ + drivers/staging/iio/accel/adis16204_trigger.c | 122 + + drivers/staging/iio/accel/adis16209_ring.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 2 +- + drivers/staging/iio/adc/Kconfig | 91 +- + drivers/staging/iio/adc/Makefile | 15 + + drivers/staging/iio/adc/ad7150.c | 877 +++++ + drivers/staging/iio/adc/ad7152.c | 610 ++++ + drivers/staging/iio/adc/ad7291.c | 1039 ++++++ + drivers/staging/iio/adc/ad7298.c | 501 +++ + drivers/staging/iio/adc/ad7314.c | 308 ++ + drivers/staging/iio/adc/ad7745.c | 734 ++++ + drivers/staging/iio/adc/ad7816.c | 535 +++ + drivers/staging/iio/adc/ad7887.h | 105 + + drivers/staging/iio/adc/ad7887_core.c | 305 ++ + drivers/staging/iio/adc/ad7887_ring.c | 266 ++ + drivers/staging/iio/adc/adt7310.c | 952 ++++++ + drivers/staging/iio/adc/adt7410.c | 915 +++++ + drivers/staging/iio/adc/adt75.c | 732 ++++ + drivers/staging/iio/addac/Kconfig | 25 + + drivers/staging/iio/addac/Makefile | 7 + + drivers/staging/iio/addac/adt7316-i2c.c | 170 + + drivers/staging/iio/addac/adt7316-spi.c | 180 + + drivers/staging/iio/addac/adt7316.c | 2402 +++++++++++++ + drivers/staging/iio/addac/adt7316.h | 33 + + drivers/staging/iio/dac/Kconfig | 21 + + drivers/staging/iio/dac/Makefile | 6 + + drivers/staging/iio/dac/ad5446.c | 323 ++ + drivers/staging/iio/dac/ad5446.h | 96 + + drivers/staging/iio/dac/ad5624r.h | 21 + + drivers/staging/iio/dac/ad5624r_spi.c | 300 ++ + drivers/staging/iio/dac/dac.h | 6 + + drivers/staging/iio/dds/Kconfig | 56 + + drivers/staging/iio/dds/Makefile | 11 + + drivers/staging/iio/dds/ad5930.c | 170 + + drivers/staging/iio/dds/ad9832.c | 264 ++ + drivers/staging/iio/dds/ad9834.c | 477 +++ + drivers/staging/iio/dds/ad9834.h | 112 + + drivers/staging/iio/dds/ad9850.c | 156 + + drivers/staging/iio/dds/ad9852.c | 305 ++ + drivers/staging/iio/dds/ad9910.c | 440 +++ + drivers/staging/iio/dds/ad9951.c | 249 ++ + drivers/staging/iio/dds/dds.h | 110 + + drivers/staging/iio/gyro/Kconfig | 38 +- + drivers/staging/iio/gyro/Makefile | 12 + + drivers/staging/iio/gyro/adis16060.h | 101 + + drivers/staging/iio/gyro/adis16060_core.c | 319 ++ + drivers/staging/iio/gyro/adis16080.h | 102 + + drivers/staging/iio/gyro/adis16080_core.c | 271 ++ + drivers/staging/iio/gyro/adis16130.h | 108 + + drivers/staging/iio/gyro/adis16130_core.c | 313 ++ + drivers/staging/iio/gyro/adis16251.h | 185 + + drivers/staging/iio/gyro/adis16251_core.c | 777 +++++ + drivers/staging/iio/gyro/adis16260.h | 3 + + drivers/staging/iio/gyro/adis16260_core.c | 142 +- + drivers/staging/iio/gyro/adis16260_platform_data.h | 19 + + drivers/staging/iio/gyro/gyro.h | 9 + + drivers/staging/iio/imu/adis16350_core.c | 1 + + drivers/staging/iio/meter/Kconfig | 61 + + drivers/staging/iio/meter/Makefile | 15 + + drivers/staging/iio/meter/ade7753.c | 730 ++++ + drivers/staging/iio/meter/ade7753.h | 140 + + drivers/staging/iio/meter/ade7754.c | 756 +++++ + drivers/staging/iio/meter/ade7754.h | 161 + + drivers/staging/iio/meter/ade7758.h | 171 + + drivers/staging/iio/meter/ade7758_core.c | 866 +++++ + drivers/staging/iio/meter/ade7758_ring.c | 212 ++ + drivers/staging/iio/meter/ade7758_trigger.c | 125 + + drivers/staging/iio/meter/ade7759.c | 670 ++++ + drivers/staging/iio/meter/ade7759.h | 122 + + drivers/staging/iio/meter/ade7854-i2c.c | 272 ++ + drivers/staging/iio/meter/ade7854-spi.c | 360 ++ + drivers/staging/iio/meter/ade7854.c | 680 ++++ + drivers/staging/iio/meter/ade7854.h | 245 ++ + drivers/staging/iio/meter/meter.h | 396 +++ + drivers/staging/iio/resolver/Kconfig | 54 + + drivers/staging/iio/resolver/Makefile | 7 + + drivers/staging/iio/resolver/ad2s120x.c | 310 ++ + drivers/staging/iio/resolver/ad2s1210.c | 872 +++++ + drivers/staging/iio/resolver/ad2s90.c | 159 + + drivers/staging/iio/sysfs.h | 6 + + drivers/staging/intel_sst/Kconfig | 1 + + drivers/staging/intel_sst/intel_sst.c | 116 +- + drivers/staging/intel_sst/intel_sst.h | 8 +- + .../staging/intel_sst/intel_sst_app_interface.c | 314 ++- + drivers/staging/intel_sst/intel_sst_common.h | 10 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 209 +- + drivers/staging/intel_sst/intel_sst_dsp.c | 70 +- + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 113 +- + drivers/staging/intel_sst/intel_sst_ioctl.h | 15 +- + drivers/staging/intel_sst/intel_sst_ipc.c | 194 +- + drivers/staging/intel_sst/intel_sst_pvt.c | 36 +- + drivers/staging/intel_sst/intel_sst_stream.c | 20 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 214 +- + drivers/staging/intel_sst/intelmid.c | 192 +- + drivers/staging/intel_sst/intelmid.h | 5 - + drivers/staging/intel_sst/intelmid_ctrl.c | 28 +- + drivers/staging/intel_sst/intelmid_msic_control.c | 24 +- + drivers/staging/intel_sst/intelmid_pvt.c | 54 +- + drivers/staging/intel_sst/intelmid_v0_control.c | 32 +- + drivers/staging/intel_sst/intelmid_v1_control.c | 70 +- + drivers/staging/intel_sst/intelmid_v2_control.c | 96 +- + drivers/staging/keucr/init.c | 420 ++-- + drivers/staging/keucr/init.h | 3 + + drivers/staging/keucr/ms.c | 10 +- + drivers/staging/keucr/smilmain.c | 4 +- + drivers/staging/keucr/smilsub.c | 4 +- + drivers/staging/line6/capture.c | 2 +- + drivers/staging/line6/midi.c | 4 +- + drivers/staging/line6/playback.c | 2 +- + drivers/staging/memrar/memrar.h | 19 + + drivers/staging/msm/Makefile | 4 +- + drivers/staging/msm/lcdc_toshiba_wvga_pt.c | 2 +- + drivers/staging/msm/tvenc.c | 5 +- + drivers/staging/phison/phison.c | 2 +- + drivers/staging/pohmelfs/crypto.c | 6 +- + drivers/staging/rt2860/chip/mac_pci.h | 7 +- + drivers/staging/rt2860/chip/mac_usb.h | 5 +- + drivers/staging/rt2860/chip/rtmp_mac.h | 19 +- + drivers/staging/rt2860/chip/rtmp_phy.h | 14 +- + drivers/staging/rt2860/chips/rt3090.c | 8 +- + drivers/staging/rt2860/chips/rt30xx.c | 13 +- + drivers/staging/rt2860/common/ba_action.c | 18 +- + drivers/staging/rt2860/common/cmm_data.c | 2 +- + drivers/staging/rt2860/common/cmm_data_pci.c | 4 +- + drivers/staging/rt2860/common/cmm_mac_pci.c | 10 +- + drivers/staging/rt2860/common/cmm_mac_usb.c | 2 +- + drivers/staging/rt2860/common/cmm_wpa.c | 22 +- + drivers/staging/rt2860/common/ee_efuse.c | 15 +- + drivers/staging/rt2860/common/mlme.c | 13 +- + drivers/staging/rt2860/common/rt_rf.c | 3 +- + drivers/staging/rt2860/common/rtmp_init.c | 24 +- + drivers/staging/rt2860/common/rtmp_mcu.c | 4 +- + drivers/staging/rt2860/common/spectrum.c | 2 +- + drivers/staging/rt2860/mlme.h | 41 +- + drivers/staging/rt2860/oid.h | 15 +- + drivers/staging/rt2860/pci_main_dev.c | 22 +- + drivers/staging/rt2860/rt_linux.c | 35 +- + drivers/staging/rt2860/rt_linux.h | 11 +- + drivers/staging/rt2860/rt_main_dev.c | 18 +- + drivers/staging/rt2860/rt_pci_rbus.c | 7 +- + drivers/staging/rt2860/rt_usb.c | 45 +- + drivers/staging/rt2860/rtmp.h | 71 +- + drivers/staging/rt2860/rtmp_def.h | 37 +- + drivers/staging/rt2860/rtmp_timer.h | 13 +- + drivers/staging/rt2860/spectrum.h | 12 +- + drivers/staging/rt2860/sta/assoc.c | 15 +- + drivers/staging/rt2860/sta/auth.c | 10 +- + drivers/staging/rt2860/sta/connect.c | 38 +- + drivers/staging/rt2860/sta/rtmp_data.c | 35 +- + drivers/staging/rt2860/sta/sanity.c | 5 +- + drivers/staging/rt2860/sta/sync.c | 25 +- + drivers/staging/rt2860/sta/wpa.c | 5 +- + drivers/staging/rt2860/sta_ioctl.c | 25 +- + drivers/staging/rt2860/usb_main_dev.c | 20 +- + drivers/staging/rt2860/wpa.h | 5 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192u/Makefile | 1 - + drivers/staging/rtl8192u/dot11d.h | 2 - + drivers/staging/rtl8192u/ieee80211/Makefile | 2 - + drivers/staging/rtl8192u/ieee80211/dot11d.c | 2 - + drivers/staging/rtl8192u/ieee80211/dot11d.h | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 8 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 12 - + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 47 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 4 - + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 27 +- + drivers/staging/rtl8192u/r8192U_wx.c | 6 - + drivers/staging/rtl8192u/r819xU_phy.c | 6 +- + drivers/staging/rtl8712/TODO | 1 - + drivers/staging/rtl8712/osdep_service.h | 25 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/usb_intf.c | 2 +- + drivers/staging/sep/Kconfig | 10 + + drivers/staging/sep/Makefile | 2 + + drivers/staging/sep/TODO | 5 + + drivers/staging/sep/sep_dev.h | 156 + + drivers/staging/sep/sep_driver.c | 3577 ++++++++++++++++++++ + drivers/staging/sep/sep_driver_api.h | 297 ++ + drivers/staging/sep/sep_driver_config.h | 239 ++ + drivers/staging/sep/sep_driver_hw_defs.h | 233 ++ + drivers/staging/sm7xx/smtcfb.c | 2 +- + drivers/staging/solo6x10/Kconfig | 4 +- + drivers/staging/solo6x10/TODO | 4 - + drivers/staging/solo6x10/solo6010-core.c | 42 +- + drivers/staging/solo6x10/solo6010-disp.c | 6 +- + drivers/staging/solo6x10/solo6010-enc.c | 6 +- + drivers/staging/solo6x10/solo6010-g723.c | 22 +- + drivers/staging/solo6x10/solo6010-gpio.c | 4 +- + drivers/staging/solo6x10/solo6010-i2c.c | 13 +- + drivers/staging/solo6x10/solo6010-osd-font.h | 60 +- + drivers/staging/solo6x10/solo6010-p2m.c | 156 +- + drivers/staging/solo6x10/solo6010-tw28.c | 118 +- + drivers/staging/solo6x10/solo6010-v4l2-enc.c | 370 ++- + drivers/staging/solo6x10/solo6010-v4l2.c | 197 +- + drivers/staging/solo6x10/solo6010.h | 39 +- + drivers/staging/speakup/spk_types.h | 2 +- + drivers/staging/spectra/ffsport.c | 61 +- + drivers/staging/spectra/ffsport.h | 1 + + drivers/staging/spectra/flash.c | 4 +- + drivers/staging/spectra/lld_emu.c | 6 +- + drivers/staging/spectra/lld_nand.c | 177 +- + drivers/staging/ste_rmi4/Kconfig | 9 + + drivers/staging/ste_rmi4/Makefile | 4 + + drivers/staging/ste_rmi4/TODO | 7 + + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 1179 +++++++ + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h | 50 + + drivers/staging/tidspbridge/core/tiomap3430.c | 4 +- + drivers/staging/tidspbridge/rmgr/nldr.c | 2 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 235 +- + drivers/staging/vme/bridges/vme_ca91cx42.h | 2 +- + drivers/staging/vme/bridges/vme_tsi148.c | 264 +- + drivers/staging/vme/bridges/vme_tsi148.h | 2 +- + drivers/staging/vme/devices/vme_user.c | 79 +- + drivers/staging/vme/vme.c | 116 +- + drivers/staging/vme/vme_bridge.h | 2 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/vt6655/wpa2.c | 4 +- + drivers/staging/vt6656/baseband.c | 2 +- + drivers/staging/vt6656/card.c | 2 +- + drivers/staging/vt6656/dpc.c | 4 +- + drivers/staging/vt6656/iwctl.c | 2 +- + drivers/staging/vt6656/power.c | 2 +- + drivers/staging/vt6656/rxtx.c | 3 +- + drivers/staging/vt6656/tkip.c | 37 +- + drivers/staging/vt6656/wpa2.c | 4 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 10 +- + drivers/staging/winbond/Makefile | 1 - + drivers/staging/winbond/core.h | 2 +- + drivers/staging/winbond/mac_structures.h | 545 --- + drivers/staging/winbond/mds.c | 70 +- + drivers/staging/winbond/mds_f.h | 3 +- + drivers/staging/winbond/mds_s.h | 4 - + drivers/staging/winbond/mlmetxrx.c | 62 - + drivers/staging/winbond/mlmetxrx_f.h | 23 - + drivers/staging/winbond/mto.c | 5 +- + drivers/staging/winbond/phy_calibration.c | 5 +- + drivers/staging/winbond/phy_calibration.h | 2 +- + drivers/staging/winbond/reg.c | 36 +- + drivers/staging/winbond/sysdef.h | 31 - + drivers/staging/winbond/wb35reg.c | 33 +- + drivers/staging/winbond/wb35reg_f.h | 2 +- + drivers/staging/winbond/wb35reg_s.h | 77 +- + drivers/staging/winbond/wb35rx.c | 30 +- + drivers/staging/winbond/wb35rx_f.h | 2 +- + drivers/staging/winbond/wb35tx.c | 31 +- + drivers/staging/winbond/wb35tx_f.h | 1 - + drivers/staging/winbond/{wbhal_s.h => wbhal.h} | 14 +- + drivers/staging/winbond/wbhal_f.h | 81 - + drivers/staging/winbond/wblinux_f.h | 17 - + drivers/staging/winbond/wbusb.c | 50 +- + drivers/staging/winbond/wbusb_s.h | 18 - + drivers/staging/wlags49_h2/wl_pci.c | 2 +- + drivers/staging/wlags49_h2/wl_profile.c | 2 +- + drivers/staging/wlags49_h2/wl_sysfs.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 45 +- + drivers/staging/wlan-ng/p80211conv.h | 6 +- + drivers/staging/wlan-ng/p80211netdev.c | 6 +- + drivers/staging/wlan-ng/p80211netdev.h | 10 +- + drivers/staging/wlan-ng/p80211types.h | 4 +- + drivers/staging/wlan-ng/prism2mgmt.c | 26 +- + drivers/staging/xgifb/XGI_main_26.c | 9 +- + drivers/staging/zram/xvmalloc.c | 6 +- + drivers/staging/zram/zram_drv.c | 3 +- + drivers/usb/serial/option.c | 1 - + drivers/video/udlfb.c | 5 +- + include/linux/rar_register.h | 16 + + 563 files changed, 51120 insertions(+), 32253 deletions(-) + delete mode 100644 drivers/staging/adis16255/Kconfig + delete mode 100644 drivers/staging/adis16255/Makefile + delete mode 100644 drivers/staging/adis16255/adis16255.c + delete mode 100644 drivers/staging/adis16255/adis16255.h + delete mode 100644 drivers/staging/batman-adv/Kconfig + delete mode 100644 drivers/staging/batman-adv/Makefile + delete mode 100644 drivers/staging/batman-adv/README + delete mode 100644 drivers/staging/batman-adv/TODO + delete mode 100644 drivers/staging/batman-adv/aggregation.c + delete mode 100644 drivers/staging/batman-adv/aggregation.h + delete mode 100644 drivers/staging/batman-adv/bat_debugfs.c + delete mode 100644 drivers/staging/batman-adv/bat_debugfs.h + delete mode 100644 drivers/staging/batman-adv/bat_sysfs.c + delete mode 100644 drivers/staging/batman-adv/bat_sysfs.h + delete mode 100644 drivers/staging/batman-adv/bitarray.c + delete mode 100644 drivers/staging/batman-adv/bitarray.h + delete mode 100644 drivers/staging/batman-adv/hard-interface.c + delete mode 100644 drivers/staging/batman-adv/hard-interface.h + delete mode 100644 drivers/staging/batman-adv/hash.c + delete mode 100644 drivers/staging/batman-adv/hash.h + delete mode 100644 drivers/staging/batman-adv/icmp_socket.c + delete mode 100644 drivers/staging/batman-adv/icmp_socket.h + delete mode 100644 drivers/staging/batman-adv/main.c + delete mode 100644 drivers/staging/batman-adv/main.h + delete mode 100644 drivers/staging/batman-adv/originator.c + delete mode 100644 drivers/staging/batman-adv/originator.h + delete mode 100644 drivers/staging/batman-adv/packet.h + delete mode 100644 drivers/staging/batman-adv/ring_buffer.c + delete mode 100644 drivers/staging/batman-adv/ring_buffer.h + delete mode 100644 drivers/staging/batman-adv/routing.c + delete mode 100644 drivers/staging/batman-adv/routing.h + delete mode 100644 drivers/staging/batman-adv/send.c + delete mode 100644 drivers/staging/batman-adv/send.h + delete mode 100644 drivers/staging/batman-adv/soft-interface.c + delete mode 100644 drivers/staging/batman-adv/soft-interface.h + delete mode 100644 drivers/staging/batman-adv/sysfs-class-net-batman-adv + delete mode 100644 drivers/staging/batman-adv/sysfs-class-net-mesh + delete mode 100644 drivers/staging/batman-adv/translation-table.c + delete mode 100644 drivers/staging/batman-adv/translation-table.h + delete mode 100644 drivers/staging/batman-adv/types.h + delete mode 100644 drivers/staging/batman-adv/unicast.c + delete mode 100644 drivers/staging/batman-adv/unicast.h + delete mode 100644 drivers/staging/batman-adv/vis.c + delete mode 100644 drivers/staging/batman-adv/vis.h + delete mode 100644 drivers/staging/bcm/Arp.c + delete mode 100644 drivers/staging/bcm/Debug.c + delete mode 100644 drivers/staging/bcm/HostMibs.h + delete mode 100644 drivers/staging/bcm/Interfacemain.h + delete mode 100644 drivers/staging/bcm/Osal_Misc.c + delete mode 100644 drivers/staging/bcm/osal_misc.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_rpc_tp.h + delete mode 100644 drivers/staging/brcm80211/include/bcm_xdr.h + delete mode 100644 drivers/staging/brcm80211/include/dbus.h + delete mode 100644 drivers/staging/brcm80211/include/epivers.h + delete mode 100644 drivers/staging/brcm80211/include/linux_osl.h + delete mode 100644 drivers/staging/brcm80211/include/linuxver.h + delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpc.h + delete mode 100644 drivers/staging/brcm80211/sys/wlc_rpctx.h + create mode 100644 drivers/staging/cptm1217/Kconfig + create mode 100644 drivers/staging/cptm1217/Makefile + create mode 100644 drivers/staging/cptm1217/TODO + create mode 100644 drivers/staging/cptm1217/clearpad_tm1217.c + create mode 100644 drivers/staging/cptm1217/cp_tm1217.h + rename drivers/staging/ft1000/ft1000-usb/{ft1000_chdev.c => ft1000_debug.c} (61%) + delete mode 100644 drivers/staging/hv/vmbus.c + create mode 100644 drivers/staging/iio/Documentation/sysfs-bus-iio-dds + create mode 100644 drivers/staging/iio/accel/adis16201.h + create mode 100644 drivers/staging/iio/accel/adis16201_core.c + create mode 100644 drivers/staging/iio/accel/adis16201_ring.c + create mode 100644 drivers/staging/iio/accel/adis16201_trigger.c + create mode 100644 drivers/staging/iio/accel/adis16203.h + create mode 100644 drivers/staging/iio/accel/adis16203_core.c + create mode 100644 drivers/staging/iio/accel/adis16203_ring.c + create mode 100644 drivers/staging/iio/accel/adis16203_trigger.c + create mode 100644 drivers/staging/iio/accel/adis16204.h + create mode 100644 drivers/staging/iio/accel/adis16204_core.c + create mode 100644 drivers/staging/iio/accel/adis16204_ring.c + create mode 100644 drivers/staging/iio/accel/adis16204_trigger.c + create mode 100644 drivers/staging/iio/adc/ad7150.c + create mode 100644 drivers/staging/iio/adc/ad7152.c + create mode 100644 drivers/staging/iio/adc/ad7291.c + create mode 100644 drivers/staging/iio/adc/ad7298.c + create mode 100644 drivers/staging/iio/adc/ad7314.c + create mode 100644 drivers/staging/iio/adc/ad7745.c + create mode 100644 drivers/staging/iio/adc/ad7816.c + create mode 100644 drivers/staging/iio/adc/ad7887.h + create mode 100644 drivers/staging/iio/adc/ad7887_core.c + create mode 100644 drivers/staging/iio/adc/ad7887_ring.c + create mode 100644 drivers/staging/iio/adc/adt7310.c + create mode 100644 drivers/staging/iio/adc/adt7410.c + create mode 100644 drivers/staging/iio/adc/adt75.c + create mode 100644 drivers/staging/iio/addac/Kconfig + create mode 100644 drivers/staging/iio/addac/Makefile + create mode 100644 drivers/staging/iio/addac/adt7316-i2c.c + create mode 100644 drivers/staging/iio/addac/adt7316-spi.c + create mode 100644 drivers/staging/iio/addac/adt7316.c + create mode 100644 drivers/staging/iio/addac/adt7316.h + create mode 100644 drivers/staging/iio/dac/Kconfig + create mode 100644 drivers/staging/iio/dac/Makefile + create mode 100644 drivers/staging/iio/dac/ad5446.c + create mode 100644 drivers/staging/iio/dac/ad5446.h + create mode 100644 drivers/staging/iio/dac/ad5624r.h + create mode 100644 drivers/staging/iio/dac/ad5624r_spi.c + create mode 100644 drivers/staging/iio/dac/dac.h + create mode 100644 drivers/staging/iio/dds/Kconfig + create mode 100644 drivers/staging/iio/dds/Makefile + create mode 100644 drivers/staging/iio/dds/ad5930.c + create mode 100644 drivers/staging/iio/dds/ad9832.c + create mode 100644 drivers/staging/iio/dds/ad9834.c + create mode 100644 drivers/staging/iio/dds/ad9834.h + create mode 100644 drivers/staging/iio/dds/ad9850.c + create mode 100644 drivers/staging/iio/dds/ad9852.c + create mode 100644 drivers/staging/iio/dds/ad9910.c + create mode 100644 drivers/staging/iio/dds/ad9951.c + create mode 100644 drivers/staging/iio/dds/dds.h + create mode 100644 drivers/staging/iio/gyro/adis16060.h + create mode 100644 drivers/staging/iio/gyro/adis16060_core.c + create mode 100644 drivers/staging/iio/gyro/adis16080.h + create mode 100644 drivers/staging/iio/gyro/adis16080_core.c + create mode 100644 drivers/staging/iio/gyro/adis16130.h + create mode 100644 drivers/staging/iio/gyro/adis16130_core.c + create mode 100644 drivers/staging/iio/gyro/adis16251.h + create mode 100644 drivers/staging/iio/gyro/adis16251_core.c + create mode 100644 drivers/staging/iio/gyro/adis16260_platform_data.h + create mode 100644 drivers/staging/iio/meter/Kconfig + create mode 100644 drivers/staging/iio/meter/Makefile + create mode 100644 drivers/staging/iio/meter/ade7753.c + create mode 100644 drivers/staging/iio/meter/ade7753.h + create mode 100644 drivers/staging/iio/meter/ade7754.c + create mode 100644 drivers/staging/iio/meter/ade7754.h + create mode 100644 drivers/staging/iio/meter/ade7758.h + create mode 100644 drivers/staging/iio/meter/ade7758_core.c + create mode 100644 drivers/staging/iio/meter/ade7758_ring.c + create mode 100644 drivers/staging/iio/meter/ade7758_trigger.c + create mode 100644 drivers/staging/iio/meter/ade7759.c + create mode 100644 drivers/staging/iio/meter/ade7759.h + create mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + create mode 100644 drivers/staging/iio/meter/ade7854-spi.c + create mode 100644 drivers/staging/iio/meter/ade7854.c + create mode 100644 drivers/staging/iio/meter/ade7854.h + create mode 100644 drivers/staging/iio/meter/meter.h + create mode 100644 drivers/staging/iio/resolver/Kconfig + create mode 100644 drivers/staging/iio/resolver/Makefile + create mode 100644 drivers/staging/iio/resolver/ad2s120x.c + create mode 100644 drivers/staging/iio/resolver/ad2s1210.c + create mode 100644 drivers/staging/iio/resolver/ad2s90.c + create mode 100644 drivers/staging/sep/Kconfig + create mode 100644 drivers/staging/sep/Makefile + create mode 100644 drivers/staging/sep/TODO + create mode 100644 drivers/staging/sep/sep_dev.h + create mode 100644 drivers/staging/sep/sep_driver.c + create mode 100644 drivers/staging/sep/sep_driver_api.h + create mode 100644 drivers/staging/sep/sep_driver_config.h + create mode 100644 drivers/staging/sep/sep_driver_hw_defs.h + create mode 100644 drivers/staging/ste_rmi4/Kconfig + create mode 100644 drivers/staging/ste_rmi4/Makefile + create mode 100644 drivers/staging/ste_rmi4/TODO + create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c + create mode 100644 drivers/staging/ste_rmi4/synaptics_i2c_rmi4.h + create mode 100644 drivers/staging/vme/bridges/Module.symvers + delete mode 100644 drivers/staging/winbond/mlmetxrx.c + delete mode 100644 drivers/staging/winbond/mlmetxrx_f.h + delete mode 100644 drivers/staging/winbond/sysdef.h + rename drivers/staging/winbond/{wbhal_s.h => wbhal.h} (98%) + delete mode 100644 drivers/staging/winbond/wbhal_f.h + delete mode 100644 drivers/staging/winbond/wblinux_f.h + delete mode 100644 drivers/staging/winbond/wbusb_s.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-trivial/trivial +$ git merge bkl-trivial/trivial +Already up-to-date. +Merging bkl-llseek/llseek +$ git merge bkl-llseek/llseek +Already up-to-date. +Merging bkl-vfs/vfs +$ git merge bkl-vfs/vfs +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Resolved 'arch/powerpc/kernel/setup_64.c' using previous resolution. +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Resolved 'include/linux/hardirq.h' using previous resolution. +Resolved 'include/linux/smp_lock.h' using previous resolution. +Auto-merging arch/powerpc/kernel/setup_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c +Auto-merging arch/tile/kernel/compat.c +Auto-merging arch/tile/kernel/compat_signal.c +Auto-merging arch/tile/kernel/signal.c +Auto-merging block/compat_ioctl.c +Auto-merging block/ioctl.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/block/drbd/drbd_worker.c +Auto-merging drivers/char/agp/frontend.c +Auto-merging drivers/char/amiserial.c +Auto-merging drivers/char/specialix.c +Auto-merging drivers/gpu/drm/drm_fops.c +Auto-merging drivers/hid/hidraw.c +Auto-merging drivers/hid/usbhid/hiddev.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/radio/si470x/radio-si470x.h +Auto-merging drivers/media/video/bt8xx/bttv-driver.c +Auto-merging drivers/media/video/cx88/cx88-blackbird.c +Auto-merging drivers/media/video/cx88/cx88-video.c +Auto-merging drivers/media/video/pwc/pwc-if.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-empress.c +Auto-merging drivers/media/video/saa7164/saa7164.h +Auto-merging drivers/media/video/usbvision/usbvision-video.c +Auto-merging drivers/media/video/v4l2-compat-ioctl32.c +Auto-merging drivers/pci/proc.c +Auto-merging drivers/s390/block/dasd_eer.c +Auto-merging drivers/s390/char/vmlogrdr.c +Auto-merging drivers/s390/char/vmur.c +Auto-merging drivers/s390/crypto/zcrypt_api.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/serial/serial_core.c +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/cx25821/cx25821.h +Auto-merging drivers/staging/easycap/easycap.h +Auto-merging drivers/staging/intel_sst/intel_sst_app_interface.c +Auto-merging drivers/staging/rtl8712/osdep_service.h +CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree. +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/core/inode.c +Auto-merging drivers/usb/gadget/f_fs.c +Auto-merging drivers/usb/host/isp1362-hcd.c +Auto-merging drivers/usb/mon/mon_bin.c +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/xen/xenfs/privcmd.c +Auto-merging fs/block_dev.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/compat_ioctl.c +Auto-merging fs/ecryptfs/super.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ioctl.c +Auto-merging fs/lockd/clntlock.c +Auto-merging fs/lockd/clntproc.c +Auto-merging fs/lockd/svc4proc.c +Auto-merging fs/lockd/svclock.c +Auto-merging fs/lockd/svcproc.c +Auto-merging fs/locks.c +Auto-merging fs/namespace.c +Auto-merging fs/ncpfs/dir.c +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/nfs/callback.c +Auto-merging fs/nfs/delegation.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/proc/inode.c +Auto-merging fs/reiserfs/ioctl.c +Auto-merging fs/reiserfs/journal.c +Auto-merging fs/reiserfs/super.c +Auto-merging include/linux/hardirq.h +CONFLICT (content): Merge conflict in include/linux/hardirq.h +Auto-merging include/linux/smp_lock.h +CONFLICT (content): Merge conflict in include/linux/smp_lock.h +Auto-merging include/linux/tty.h +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/irda/af_irda.c +Auto-merging net/sunrpc/svc_xprt.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/core/sound.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/stradis/Kconfig +arch/powerpc/kernel/setup_64.c: needs merge +drivers/staging/stradis/Kconfig: needs merge +fs/nfsd/nfs4state.c: needs merge +include/linux/hardirq.h: needs merge +include/linux/smp_lock.h: needs merge +rm 'drivers/staging/stradis/Kconfig' +$ git commit -v -a +[master 263c654] Merge remote branch 'bkl-config/config' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/Kconfig | 4 ++-- + drivers/gpu/drm/i810/i810_dma.c | 18 +----------------- + drivers/gpu/drm/i810/i810_drv.c | 6 +++++- + drivers/staging/Kconfig | 11 +++++++++++ + drivers/staging/cx25821/cx25821.h | 1 - + include/linux/smp_lock.h | 15 ++------------- + lib/Kconfig.debug | 9 --------- + 7 files changed, 21 insertions(+), 43 deletions(-) +Merging irqflags/master +$ git merge irqflags/master +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 870e458] 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 clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Applying: [SCSI] sd: implement sd_check_events() +Applying: [SCSI] sd,sr: kill compat SDEV_MEDIA_CHANGE event +Applying: [SCSI] target: Add LIO target core v4.0.0-rc6 +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Updating 870e458..20a02da +Fast-forward + Documentation/target/tcm_mod_builder.py | 1094 +++++ + Documentation/target/tcm_mod_builder.txt | 145 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/scsi/sd.c | 103 +- + drivers/scsi/sd.h | 1 - + drivers/scsi/sr.c | 4 - + drivers/target/Kconfig | 32 + + drivers/target/Makefile | 24 + + drivers/target/target_core_alua.c | 1991 +++++++++ + drivers/target/target_core_alua.h | 126 + + drivers/target/target_core_cdb.c | 1131 +++++ + drivers/target/target_core_configfs.c | 3225 ++++++++++++++ + drivers/target/target_core_device.c | 1694 +++++++ + drivers/target/target_core_fabric_configfs.c | 1001 +++++ + drivers/target/target_core_fabric_lib.c | 451 ++ + drivers/target/target_core_file.c | 688 +++ + drivers/target/target_core_file.h | 50 + + drivers/target/target_core_hba.c | 185 + + drivers/target/target_core_hba.h | 7 + + drivers/target/target_core_iblock.c | 808 ++++ + drivers/target/target_core_iblock.h | 40 + + drivers/target/target_core_mib.c | 1078 +++++ + drivers/target/target_core_mib.h | 28 + + drivers/target/target_core_pr.c | 4251 ++++++++++++++++++ + drivers/target/target_core_pr.h | 67 + + drivers/target/target_core_pscsi.c | 1470 ++++++ + drivers/target/target_core_pscsi.h | 65 + + drivers/target/target_core_rd.c | 1091 +++++ + drivers/target/target_core_rd.h | 73 + + drivers/target/target_core_scdb.c | 105 + + drivers/target/target_core_scdb.h | 10 + + drivers/target/target_core_tmr.c | 395 ++ + drivers/target/target_core_tpg.c | 826 ++++ + drivers/target/target_core_transport.c | 6133 ++++++++++++++++++++++++++ + drivers/target/target_core_ua.c | 332 ++ + drivers/target/target_core_ua.h | 36 + + include/target/configfs_macros.h | 147 + + include/target/target_core_base.h | 937 ++++ + include/target/target_core_configfs.h | 52 + + include/target/target_core_device.h | 61 + + include/target/target_core_fabric_configfs.h | 106 + + include/target/target_core_fabric_lib.h | 28 + + include/target/target_core_fabric_ops.h | 100 + + include/target/target_core_tmr.h | 43 + + include/target/target_core_tpg.h | 35 + + include/target/target_core_transport.h | 350 ++ + 47 files changed, 30564 insertions(+), 58 deletions(-) + create mode 100755 Documentation/target/tcm_mod_builder.py + create mode 100644 Documentation/target/tcm_mod_builder.txt + create mode 100644 drivers/target/Kconfig + create mode 100644 drivers/target/Makefile + create mode 100644 drivers/target/target_core_alua.c + create mode 100644 drivers/target/target_core_alua.h + create mode 100644 drivers/target/target_core_cdb.c + create mode 100644 drivers/target/target_core_configfs.c + create mode 100644 drivers/target/target_core_device.c + create mode 100644 drivers/target/target_core_fabric_configfs.c + create mode 100644 drivers/target/target_core_fabric_lib.c + create mode 100644 drivers/target/target_core_file.c + create mode 100644 drivers/target/target_core_file.h + create mode 100644 drivers/target/target_core_hba.c + create mode 100644 drivers/target/target_core_hba.h + create mode 100644 drivers/target/target_core_iblock.c + create mode 100644 drivers/target/target_core_iblock.h + create mode 100644 drivers/target/target_core_mib.c + create mode 100644 drivers/target/target_core_mib.h + create mode 100644 drivers/target/target_core_pr.c + create mode 100644 drivers/target/target_core_pr.h + create mode 100644 drivers/target/target_core_pscsi.c + create mode 100644 drivers/target/target_core_pscsi.h + create mode 100644 drivers/target/target_core_rd.c + create mode 100644 drivers/target/target_core_rd.h + create mode 100644 drivers/target/target_core_scdb.c + create mode 100644 drivers/target/target_core_scdb.h + create mode 100644 drivers/target/target_core_tmr.c + create mode 100644 drivers/target/target_core_tpg.c + create mode 100644 drivers/target/target_core_transport.c + create mode 100644 drivers/target/target_core_ua.c + create mode 100644 drivers/target/target_core_ua.h + create mode 100644 include/target/configfs_macros.h + create mode 100644 include/target/target_core_base.h + create mode 100644 include/target/target_core_configfs.h + create mode 100644 include/target/target_core_device.h + create mode 100644 include/target/target_core_fabric_configfs.h + create mode 100644 include/target/target_core_fabric_lib.h + create mode 100644 include/target/target_core_fabric_ops.h + create mode 100644 include/target/target_core_tmr.h + create mode 100644 include/target/target_core_tpg.h + create mode 100644 include/target/target_core_transport.h +$ rm -rf ../rebase-tmp +$ git am -3 ../patches/0001-ALSA-include-delay.h-for-msleep-in-Xonar-DG-support.patch +Applying: ALSA: include delay.h for msleep in Xonar DG support diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5d3074ec9fb0 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,10 @@ +Importing i2c based on 2.6.37-git4 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.37-git4 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.37-rc4 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.37-rc5 +Unchanged quilt series rr +Importing device-mapper based on v2.6.37-rc6-186-ge5fcdb7 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..bcd0eb2751fc --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110111 |