diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 18:15:52 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-11-13 18:15:52 +1100 |
| commit | 8315c79f2e2b74e2e35538e15f7b2e7aabb22b28 (patch) | |
| tree | f99f4af0efd261c691625e5998267f714a11c21a | |
| parent | 40798575390b7d1ba6ab3e7a49bbfb5f091b725b (diff) | |
Add linux-next specific files for 20091113next-20091113
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 150 | ||||
| -rw-r--r-- | Next/Trees | 152 | ||||
| -rw-r--r-- | Next/merge.log | 7617 | ||||
| -rw-r--r-- | Next/quilt-import.log | 112 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8032 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..4030ce864101 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,150 @@ +Name SHA1 +---- ---- +origin 031fc8f313f55595c677c50b1d6d5c410fadee60 +fixes 031fc8f313f55595c677c50b1d6d5c410fadee60 +arm-current 65f69e5c16f8eee17b7f71bfad9e8e58f44c7386 +m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 +powerpc-merge aa021baa3295fa6e3f367d80f8955dd5176656eb +sparc-current 1c9d80ddc60f8ac26344ec3db9830e5f8016c16d +scsi-rc-fixes 1a0f437235ccb15361bfe0a37c7023f6234c2e9f +net-current d01032e4fd33110f9f3a085a36cb819c1dfc5827 +sound-current cc2cef505ccd434acd7fb3cee2b9cbf2a5294369 +pci-current eb647138acefc897c0eb6eddd5d3650966dfe627 +wireless-current d01032e4fd33110f9f3a085a36cb819c1dfc5827 +kbuild-current 7e50a1b6c27265fa74f355b29b1190f1db25bf84 +driver-core.current b419148e567728f6af0c3b01965c1cc141e3e13a +tty.current 8879b21cff5afc0e78f80d4e5b7cb6bf53af03e0 +usb.current 0434f8dfbdbbbfe9ecbe0cd8ffe8e1a6a281d6b0 +staging.current 0434f8dfbdbbbfe9ecbe0cd8ffe8e1a6a281d6b0 +cpufreq-current 11da3e01e45042d4d58d01194c7866d483105dc4 +input-current bf3204cbff7d2606e758afb0994e8da6ae1c6c26 +md-current 8dee7211467a56b7eb4e4359efb0aa4a72e1b6f3 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current e8edb3cbd7dd8acf6c748a02d06ec1d82c4124ea +ide-curent 0fb18c4777ff424c1db694af98443a201fa4fc30 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 5144cbee8441b2eac8ffb63c887a2250f599acfd +davinci f4744e1284448f4bf17f4e5250daa2f52d38e875 +msm 333a07437c31ea8c16a2b82071629a540ae1e50f +omap 8364ad1b90a47b049912ccddc1f9c827a108734e +pxa b0bd7b56ff4a0672d11751e4f20505d1cad1e132 +avr32 5416bf33f92a4104dbcd6062bf377c8421ca3cfd +blackfin 796dada9f5584a677a0a2a1972090bfc538903ff +cris f25234f1c21ad9878bd38719381e13f4ef1990ce +ia64 7c9abfb884b8737f0afdc8a88bcea77526f0da87 +m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f +m68knommu 264025170bae7a88716455a3a1a653af61c45583 +microblaze 0eca52a92735f43462165efe00a7e394345fb38e +mips 5c32be3a4199f4589961bc292f90fa45cdd52b11 +parisc 44a0c2cbf63e9342f5c357944f787a952cf988b6 +powerpc 0526484aa345adbf790d1201a6f5d09be0a648a3 +4xx 59e1d4952d4cb81ee9a4c22c6cfa23604c5e1ea1 +52xx-and-virtex 02d9e58e464b8aeed9a9cba951c3ae3c6bd06e30 +galak cc7b36106a4e4fda28677eb4675cbd9c363b2b88 +s390 9ade65ff140315be4ff1e01a94d55db1fe2336fc +sh 3af539e59cf3213cbe31ce7008f1db51c52665ca +sparc ddaf1b27edf72372242d752730d526b79312a44e +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph fef320ff8887c702cde7ca6b8dbfff3a341d49fe +cifs 799dd75b1a8380a967c929a4551895788c374b31 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs f19c974b10cb68db1d361e879cc05bd41b19f3f5 +ext3 f086bc5a4c017aba06f1b5497dd80a1315b5b26c +ext4 2b1dae3fa8d78ba5eec894ca59bdabc0bb8bd293 +fatfs 817b33d38f81c8736d39283c35c886ae4668f1af +fuse 5219f346b0ea2a2a8821f1e966b190788c285b0b +gfs2 c2f46d484b4fff0c6ce9124af706cb165c678f3c +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs 96d25e532234bec1a1989e6e1baf702d43a78b0d +nfsd ea4878a24d7e6a467d369b962bab95bd6a12cbe0 +nilfs2 82d3b449bbcd5a81997530adc7d56084df403284 +ocfs2 9d758e6c486738ec08262df835b8b0fbc7519f97 +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a +v9fs 47d425b937566337d4a7afdf01040a3006781007 +ubifs 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 +xfs 943c7bf944d496529dcc41ad602b120252ac91bc +reiserfs-bkl 27b3a5c51b50a234fb4a21146841e6723b5934ce +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 8c8def26bfaa704db67d515da3eb92cf26067548 +hid 53674e5ebac3d04063ca619a105c18ceb7a4b120 +i2c cb48f6df43f8c2c06c202e94f6c9f61face1bc3e +jdelvare-hwmon 77817c7aad8aec3a5284e3552eae50a421ecbb74 +kernel-doc c595314267ffdf7358e7166cae65952ac2fad534 +v4l-dvb 81e4885f1eb5a23ff842d53c6c44f739c977cfbd +kbuild 197e1cc97d0e57753d990e13283f64664f02eef1 +kconfig 7b76bfc86757ca5e7b0a62f50003752da77c115b +ide 73ba32320da60b2e872b4f7ba9b7d4fd1218e5b3 +libata 964fe080d94db82a3268443e9b9ece4c60246414 +infiniband 980aa332063e9947bbd85db4db82924ae4666dbb +acpi d378dd0ef445f7a49bbf0301dd047ffeaf3711cd +ieee1394 db7d0c08c249574183b727f2240a92e606f3ac6c +ubi a5eddf8faaadb50906924fd9b54add306a03a4a2 +kvm aa5ec3085dbbf0a395177ce504f9cb968ab40b08 +dlm 9c1fe834c1bd7725b411055c66886b64c928083d +scsi ae412d09fcdcaceb596c16f08edb40c93294713c +async_tx 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f +net 805003a41c035ccbe37d3d5ef5e6df8874346b5a +wireless 41a2617064a8458178ccdf31ed2be2b4eade4a2a +mtd 8ce110ac19bc88b82e3feacfbb3a2ee08a07fe22 +crypto fd650a6394b3242edf125ba9c4d500349a6d7178 +sound 1ca958e2f20260cb2d814c5e2025eafc5c0c8180 +cpufreq b02d803d0fa3a395ba32bc5e5e3e7a3385ca7237 +rr a2b3b20fb0ec4aebbe37a27aadb48674c2b7d6f4 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input c977d19fc6767f8e45c6680766e8d8dacaabd724 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 9b9f334cf1ffe1474e8c32f4f7a759d0a8aa212a +device-mapper af75ccc9da8b6d4ca6df52d44f3986f9ba07f973 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b285fab4185a9b3db953726f0dd9d343a6e389db +battery f056878332a91ed984a116bad4e7d49aefff9e6e +leds 729da07e5a33e8834dd7bd1276a97855c4163b44 +backlight 1e7a0a8e45a04a19c581ebb8950bcaa592ff244e +kgdb 98517d8f092cceea77ab93f15437c182b5615d9e +slab 70c1198da4e8043f6ed72a74be0aaf04aff0e76b +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md da17bf4306fd3a52e938b121df82a7baa10eb282 +mfd 3a69e7d9f6b1fb6c6db7f23e22351e3db7d55ebb +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm fe625f137d28d1ebe22a71ee064ffab2841055a5 +voltage b162b3a273f6c9a5ef9744261856be8b87e34683 +security-testing dd8dbf2e6880e30c00b18600c962d0cb5a03c555 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 049211d10e644fb36c8582336c9d5a917123bd98 +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog 490d655ff331c414852118aa6bd6d43d0a718e16 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu aa697079ee66315c4b9747a5eb3e48487fb1b8be +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 64ac8e00e36e78c0de3b99e0b79ba1147f2f571b +jc_docs 1243ba98e3abecd12e9e90dd390801b95ef070f2 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 46e06ac2d4a0d10f832f3e0e8aef3573c8c2232b +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend fd30f5863571b943eccbb5a15362d9ecede498e6 +bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 +fsnotify fb8ae94673d1e9cb7b98a3f4a016312398a89849 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd ed814525f2e45188964c270fc3a5a0b644f7e4a9 +catalin d6ad05a86bde20cdb4efbccc6ea9b24edf001886 +alacrity 3879e1cdcbb1e24717360232f7c5a1fe21a61c84 +i7core_edac 0480ce880b999703fbb73912054f4de187da543a +devicetree e91edcf5a2940bb7f1f316c871dfe9e2aaf9d6d9 +limits c1b9b7eaf7386a7f142d59a2bb433ac8217b0ad1 +tip a18d4106b0dea619003d78d5d3749f89ebec68a6 +oprofile 374576a8b6f865022c0fd1ca62396889b23d66dd +percpu 545695fb41da117928ab946067a42d9e15fd009d +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017 +sysctl 757010f026ab3044c594003e216d00a33ed95c56 +driver-core 76ddddf04764aad6749f10deed401cb40501b5e1 +tty 012ea1ac75e5eabad75917dc65b64c061fa0d129 +usb 9d474496e3a7ad226e71e3a4802fbebdf285eb97 +staging a614be9a8b28bdedd2778aa0b443dcee62443989 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..58e873a197e1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,152 @@ +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/sam/kbuild-fixes.git#master +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +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 +msm git git://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +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 +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 +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next.git#master +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 +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 +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound 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/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +tmio-mmc git git://git.mnementh.co.uk/linux-2.6-im#linux-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +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 +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-08-staging/ +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..ad634c4c32b4 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7617 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at aa021ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable +Merging origin/master +$ git merge origin/master +Updating aa021ba..031fc8f +Fast forward + MAINTAINERS | 39 +++++++-------- + arch/alpha/include/asm/fcntl.h | 4 +- + arch/alpha/include/asm/thread_info.h | 4 +- + arch/arm/configs/ams_delta_defconfig | 24 +++++++--- + arch/arm/configs/omap3_pandora_defconfig | 49 +++++++++++++++++-- + arch/arm/configs/omap_3430sdp_defconfig | 9 +++- + arch/arm/mach-omap2/board-omap3beagle.c | 2 +- + arch/arm/mach-omap2/board-omap3pandora.c | 78 +++++++++++++++--------------- + arch/arm/mach-omap2/gpmc.c | 2 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/dma.c | 14 +++++ + drivers/gpio/gpiolib.c | 8 ++-- + drivers/mmc/host/omap.c | 1 + + drivers/pps/kapi.c | 20 ++++++-- + drivers/pps/pps.c | 11 +++- + drivers/rtc/rtc-pcf50633.c | 7 ++- + drivers/rtc/rtc-v3020.c | 2 +- + drivers/rtc/rtc-vr41xx.c | 9 ++-- + drivers/serial/8250.c | 2 +- + drivers/serial/8250_pci.c | 8 +++- + drivers/video/Kconfig | 2 +- + drivers/video/atafb.c | 6 -- + drivers/video/atmel_lcdfb.c | 11 +++- + drivers/video/console/fbcon.c | 5 +-- + drivers/video/msm/mddi.c | 1 + + drivers/video/msm/mddi_client_nt35399.c | 1 + + drivers/video/msm/mddi_client_toshiba.c | 1 + + drivers/video/msm/mdp.c | 18 ------- + drivers/video/msm/mdp_ppp.c | 20 -------- + drivers/video/savage/savagefb_driver.c | 20 +------- + drivers/video/uvesafb.c | 28 ----------- + fs/compat_ioctl.c | 4 +- + fs/exec.c | 8 +-- + fs/ioctl.c | 2 +- + fs/jbd/journal.c | 1 + + fs/proc/base.c | 3 +- + include/asm-generic/fcntl.h | 19 ++++--- + include/linux/fb.h | 6 -- + include/linux/pci_ids.h | 2 + + mm/migrate.c | 2 +- + mm/page_alloc.c | 4 +- + scripts/get_maintainer.pl | 4 +- + 43 files changed, 233 insertions(+), 232 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Merge made by recursive. + drivers/scsi/bfa/bfad_fwimg.c | 2 + + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/ipr.c | 42 ++++++++++++++++++++++++++++------- + drivers/scsi/ipr.h | 1 + + drivers/scsi/libsas/sas_expander.c | 1 - + drivers/scsi/pmcraid.c | 10 ++++---- + drivers/scsi/scsi_transport_fc.c | 3 ++ + include/scsi/scsi_host.h | 29 +++++++++--------------- + 9 files changed, 57 insertions(+), 35 deletions(-) +Merging net-current/master +$ git merge net-current/master +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Merge made by recursive. + MAINTAINERS | 1 + + drivers/net/wireless/ath/ath5k/base.c | 1 - + drivers/net/wireless/ath/ath5k/led.c | 4 ++++ + drivers/net/wireless/b43/main.c | 3 +-- + drivers/net/wireless/iwlwifi/iwl-1000.c | 1 + + drivers/net/wireless/iwlwifi/iwl-6000.c | 5 +++++ + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 9 +++++++++ + drivers/net/wireless/iwlwifi/iwl-agn.c | 10 +++++++--- + drivers/net/wireless/iwlwifi/iwl-core.h | 2 ++ + drivers/net/wireless/libertas/ethtool.c | 17 ++++++++++------- + drivers/net/wireless/rtl818x/rtl8187_rfkill.c | 1 + + drivers/ssb/scan.c | 6 +++++- + 12 files changed, 46 insertions(+), 14 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 +Already up-to-date. +Merging kbuild-current/master +$ git merge kbuild-current/master +Merge made by recursive. + scripts/Makefile.lib | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Merge made by recursive. + drivers/char/tty_port.c | 3 +++ + drivers/usb/serial/cp210x.c | 21 +++++++++++++++++++++ + 2 files changed, 24 insertions(+), 0 deletions(-) +Merging quilt/usb.current +$ git merge quilt/usb.current +Merge made by recursive. + drivers/usb/class/cdc-acm.c | 18 ++++++++++++------ + drivers/usb/host/ohci-hcd.c | 5 +++++ + drivers/usb/host/ohci-pci.c | 20 ++++++++++++++++++++ + drivers/usb/host/ohci-q.c | 18 ++++++++++++------ + drivers/usb/host/ohci.h | 9 +++++++++ + drivers/usb/host/xhci-mem.c | 10 ++++++---- + drivers/usb/host/xhci-ring.c | 7 +++++-- + drivers/usb/mon/mon_bin.c | 11 +++++++---- + drivers/usb/serial/option.c | 2 ++ + 9 files changed, 78 insertions(+), 22 deletions(-) +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Merge made by recursive. + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 23 +++++++++++++++++------ + arch/x86/kernel/cpu/cpufreq/longhaul.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 2 +- + drivers/cpufreq/cpufreq.c | 16 ++++++++++------ + 4 files changed, 29 insertions(+), 14 deletions(-) +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/ff-core.c | 20 +++++++++++--------- + drivers/input/ff-memless.c | 26 +++++++++++--------------- + include/linux/input.h | 4 ++++ + 3 files changed, 26 insertions(+), 24 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Merge made by recursive. + drivers/crypto/padlock-aes.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging arch/arm/mach-at91/at91sam9g45_devices.c +Merge made by recursive. + arch/arm/configs/at91rm9200dk_defconfig | 1 + + arch/arm/include/asm/memory.h | 2 + + arch/arm/include/asm/swab.h | 19 +++ + arch/arm/mach-at91/Kconfig | 5 + + arch/arm/mach-at91/Makefile | 2 + + arch/arm/mach-at91/at91sam9g45_devices.c | 56 +++++++ + arch/arm/mach-at91/board-eco920.c | 158 +++++++++++++++++++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 1 + + arch/arm/mach-at91/cpuidle.c | 94 +++++++++++ + arch/arm/mach-at91/include/mach/board.h | 1 + + arch/arm/mach-at91/pm.c | 62 +------- + arch/arm/mach-at91/pm.h | 67 ++++++++ + arch/arm/mach-u300/Makefile | 1 + + arch/arm/mach-u300/i2c.c | 249 ++++++++++++++++++++++++++++++ + arch/arm/mach-u300/mmc.c | 64 +------- + arch/arm/mach-u300/regulator.c | 88 +++++++++++ + drivers/dma/Kconfig | 2 +- + 17 files changed, 753 insertions(+), 119 deletions(-) + create mode 100644 arch/arm/mach-at91/board-eco920.c + create mode 100644 arch/arm/mach-at91/cpuidle.c + create mode 100644 arch/arm/mach-at91/pm.h + create mode 100644 arch/arm/mach-u300/regulator.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Removing arch/arm/configs/da830_omapl137_defconfig +Merge made by recursive. + arch/arm/configs/da830_omapl137_defconfig | 1254 -------------------- + ...50_omapl138_defconfig => da8xx_omapl_defconfig} | 257 +++-- + arch/arm/configs/davinci_all_defconfig | 125 ++- + arch/arm/mach-davinci/Kconfig | 52 + + arch/arm/mach-davinci/Makefile | 4 + + arch/arm/mach-davinci/board-da830-evm.c | 466 +++++++- + arch/arm/mach-davinci/board-da850-evm.c | 437 ++++++- + arch/arm/mach-davinci/board-dm355-evm.c | 16 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 13 +- + arch/arm/mach-davinci/board-dm365-evm.c | 60 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 15 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 86 ++- + arch/arm/mach-davinci/board-sffsdr.c | 20 +- + arch/arm/mach-davinci/clock.c | 231 +++- + arch/arm/mach-davinci/clock.h | 17 +- + arch/arm/mach-davinci/common.c | 4 +- + arch/arm/mach-davinci/cp_intc.c | 3 - + arch/arm/mach-davinci/cpufreq.c | 226 ++++ + arch/arm/mach-davinci/cpuidle.c | 197 +++ + arch/arm/mach-davinci/da830.c | 75 +- + arch/arm/mach-davinci/da850.c | 298 +++++- + arch/arm/mach-davinci/devices-da8xx.c | 106 ++- + arch/arm/mach-davinci/devices.c | 6 +- + arch/arm/mach-davinci/dm355.c | 2 - + arch/arm/mach-davinci/dm365.c | 107 ++- + arch/arm/mach-davinci/dm644x.c | 2 - + arch/arm/mach-davinci/dm646x.c | 11 +- + arch/arm/mach-davinci/dma.c | 105 +- + arch/arm/mach-davinci/gpio.c | 9 - + arch/arm/mach-davinci/include/mach/asp.h | 3 + + arch/arm/mach-davinci/include/mach/common.h | 6 - + arch/arm/mach-davinci/include/mach/cpufreq.h | 26 + + arch/arm/mach-davinci/include/mach/cpuidle.h | 17 + + arch/arm/mach-davinci/include/mach/da8xx.h | 26 +- + arch/arm/mach-davinci/include/mach/dm365.h | 10 + + arch/arm/mach-davinci/include/mach/dm644x.h | 1 - + arch/arm/mach-davinci/include/mach/irqs.h | 1 + + arch/arm/mach-davinci/include/mach/mux.h | 15 +- + arch/arm/mach-davinci/include/mach/system.h | 3 - + arch/arm/mach-davinci/include/mach/usb.h | 59 + + arch/arm/mach-davinci/mux.c | 1 - + arch/arm/mach-davinci/psc.c | 3 - + arch/arm/mach-davinci/serial.c | 6 - + arch/arm/mach-davinci/sram.c | 3 - + arch/arm/mach-davinci/time.c | 6 - + arch/arm/mach-davinci/usb.c | 84 ++- + 46 files changed, 2712 insertions(+), 1762 deletions(-) + delete mode 100644 arch/arm/configs/da830_omapl137_defconfig + rename arch/arm/configs/{da850_omapl138_defconfig => da8xx_omapl_defconfig} (85%) + create mode 100644 arch/arm/mach-davinci/cpufreq.c + create mode 100644 arch/arm/mach-davinci/cpuidle.c + create mode 100644 arch/arm/mach-davinci/include/mach/cpufreq.h + create mode 100644 arch/arm/mach-davinci/include/mach/cpuidle.h + create mode 100644 arch/arm/mach-davinci/include/mach/usb.h +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/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/gpmc.c +Auto-merging arch/arm/mach-omap2/mailbox.c +Auto-merging arch/arm/plat-omap/cpu-omap.c +Auto-merging arch/arm/plat-omap/dma.c +Auto-merging drivers/mmc/host/omap.c +Auto-merging sound/soc/omap/omap-pcm.c +Merge made by recursive. + arch/arm/configs/cm_t35_defconfig | 1733 ++++++++++++++++++++ + arch/arm/configs/omap3_evm_defconfig | 2 +- + arch/arm/configs/omap_3630sdp_defconfig | 1606 ++++++++++++++++++ + arch/arm/configs/omap_zoom2_defconfig | 3 +- + arch/arm/configs/omap_zoom3_defconfig | 1605 ++++++++++++++++++ + arch/arm/mach-omap1/Kconfig | 1 + + arch/arm/mach-omap1/board-ams-delta.c | 12 +- + arch/arm/mach-omap1/board-fsample.c | 32 +- + arch/arm/mach-omap1/board-generic.c | 8 +- + arch/arm/mach-omap1/board-h2-mmc.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 16 +- + arch/arm/mach-omap1/board-h3-mmc.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 14 +- + arch/arm/mach-omap1/board-innovator.c | 14 +- + arch/arm/mach-omap1/board-nokia770.c | 22 +- + arch/arm/mach-omap1/board-osk.c | 10 +- + arch/arm/mach-omap1/board-palmte.c | 16 +- + arch/arm/mach-omap1/board-palmtt.c | 18 +- + arch/arm/mach-omap1/board-palmz71.c | 18 +- + arch/arm/mach-omap1/board-perseus2.c | 32 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 4 +- + arch/arm/mach-omap1/board-sx1.c | 18 +- + arch/arm/mach-omap1/board-voiceblue.c | 8 +- + arch/arm/mach-omap1/clock.c | 38 +- + arch/arm/mach-omap1/clock.h | 22 + + arch/arm/mach-omap1/devices.c | 23 +- + arch/arm/mach-omap1/fpga.c | 2 +- + arch/arm/mach-omap1/id.c | 2 +- + arch/arm/mach-omap1/include/mach/clkdev.h | 5 + + arch/arm/mach-omap1/include/mach/debug-macro.S | 45 + + arch/arm/mach-omap1/include/mach/entry-macro.S | 58 + + arch/arm/mach-omap1/include/mach/gpio.h | 5 + + arch/arm/mach-omap1/include/mach/hardware.h | 5 + + arch/arm/mach-omap1/include/mach/io.h | 5 + + arch/arm/mach-omap1/include/mach/irqs.h | 5 + + arch/arm/mach-omap1/include/mach/memory.h | 5 + + .../include/mach/mtd-xip.h | 0 + arch/arm/mach-omap1/include/mach/smp.h | 5 + + arch/arm/mach-omap1/include/mach/system.h | 5 + + arch/arm/mach-omap1/include/mach/timex.h | 5 + + arch/arm/mach-omap1/include/mach/uncompress.h | 5 + + .../include/mach/vmalloc.h | 5 +- + arch/arm/mach-omap1/io.c | 49 +- + arch/arm/mach-omap1/irq.c | 34 +- + arch/arm/mach-omap1/leds-h2p2-debug.c | 2 +- + arch/arm/mach-omap1/leds.c | 2 +- + arch/arm/mach-omap1/mailbox.c | 2 +- + arch/arm/mach-omap1/mcbsp.c | 42 +- + arch/arm/mach-omap1/mux.c | 77 +- + arch/arm/mach-omap1/pm.c | 114 +- + arch/arm/mach-omap1/pm.h | 53 +- + arch/arm/mach-omap1/serial.c | 32 +- + arch/arm/mach-omap1/sleep.S | 22 +- + arch/arm/mach-omap1/timer32k.c | 2 +- + arch/arm/mach-omap2/Kconfig | 12 + + arch/arm/mach-omap2/Makefile | 16 +- + arch/arm/mach-omap2/board-2430sdp.c | 14 +- + arch/arm/mach-omap2/board-3430sdp.c | 33 +- + arch/arm/mach-omap2/board-3630sdp.c | 101 ++ + arch/arm/mach-omap2/board-4430sdp.c | 23 +- + arch/arm/mach-omap2/board-apollon.c | 16 +- + arch/arm/mach-omap2/board-cm-t35.c | 507 ++++++ + arch/arm/mach-omap2/board-generic.c | 10 +- + arch/arm/mach-omap2/board-h4.c | 20 +- + arch/arm/mach-omap2/board-ldp.c | 14 +- + arch/arm/mach-omap2/board-n8x0.c | 16 +- + arch/arm/mach-omap2/board-omap3beagle.c | 29 +- + arch/arm/mach-omap2/board-omap3evm.c | 73 +- + arch/arm/mach-omap2/board-omap3pandora.c | 25 +- + arch/arm/mach-omap2/board-overo.c | 37 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 16 +- + arch/arm/mach-omap2/board-rx51.c | 16 +- + arch/arm/mach-omap2/board-zoom-debugboard.c | 2 +- + arch/arm/mach-omap2/board-zoom-peripherals.c | 259 +++ + arch/arm/mach-omap2/board-zoom2.c | 240 +--- + arch/arm/mach-omap2/board-zoom3.c | 60 + + arch/arm/mach-omap2/clock.c | 10 +- + arch/arm/mach-omap2/clock.h | 2 +- + arch/arm/mach-omap2/clock24xx.c | 8 +- + arch/arm/mach-omap2/clock34xx.c | 8 +- + arch/arm/mach-omap2/clock34xx.h | 2 +- + arch/arm/mach-omap2/clockdomain.c | 6 +- + arch/arm/mach-omap2/clockdomains.h | 2 +- + arch/arm/mach-omap2/cm.h | 6 +- + arch/arm/mach-omap2/control.c | 385 +++++- + arch/arm/mach-omap2/cpuidle34xx.c | 318 ++++ + arch/arm/mach-omap2/devices.c | 56 +- + arch/arm/mach-omap2/gpmc-onenand.c | 6 +- + arch/arm/mach-omap2/gpmc-smc91x.c | 6 +- + arch/arm/mach-omap2/gpmc.c | 102 ++- + arch/arm/mach-omap2/id.c | 169 ++- + arch/arm/mach-omap2/include/mach/clkdev.h | 5 + + .../include/mach/debug-macro.S | 19 +- + .../include/mach/entry-macro.S | 62 +- + arch/arm/mach-omap2/include/mach/gpio.h | 5 + + arch/arm/mach-omap2/include/mach/hardware.h | 5 + + arch/arm/mach-omap2/include/mach/io.h | 5 + + arch/arm/mach-omap2/include/mach/irqs.h | 5 + + arch/arm/mach-omap2/include/mach/memory.h | 5 + + arch/arm/mach-omap2/include/mach/smp.h | 5 + + arch/arm/mach-omap2/include/mach/system.h | 5 + + arch/arm/mach-omap2/include/mach/timex.h | 5 + + arch/arm/mach-omap2/include/mach/uncompress.h | 5 + + .../include/mach/vmalloc.h | 3 +- + arch/arm/mach-omap2/io.c | 38 +- + arch/arm/mach-omap2/iommu2.c | 2 +- + arch/arm/mach-omap2/irq.c | 78 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 8 +- + arch/arm/mach-omap2/mmc-twl4030.c | 23 +- + arch/arm/mach-omap2/mux.c | 12 +- + arch/arm/mach-omap2/omap-smp.c | 29 +- + arch/arm/mach-omap2/omap3-iommu.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 28 +- + arch/arm/mach-omap2/omap_hwmod_2420.h | 6 +- + arch/arm/mach-omap2/omap_hwmod_2430.h | 6 +- + arch/arm/mach-omap2/omap_hwmod_34xx.h | 6 +- + arch/arm/mach-omap2/pm-debug.c | 40 +- + arch/arm/mach-omap2/pm.h | 16 +- + arch/arm/mach-omap2/pm24xx.c | 16 +- + arch/arm/mach-omap2/pm34xx.c | 419 ++++- + arch/arm/mach-omap2/powerdomain.c | 6 +- + arch/arm/mach-omap2/powerdomains.h | 2 +- + arch/arm/mach-omap2/powerdomains24xx.h | 2 +- + arch/arm/mach-omap2/powerdomains34xx.h | 10 +- + arch/arm/mach-omap2/prcm.c | 411 +++++- + arch/arm/mach-omap2/prm-regbits-34xx.h | 2 + + arch/arm/mach-omap2/prm.h | 6 +- + arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h | 51 + + arch/arm/mach-omap2/sdram-micron-mt46h32m32lf-6.h | 2 +- + .../mach-omap2/sdram-qimonda-hyb18m512160af-6.h | 2 +- + arch/arm/mach-omap2/sdrc.c | 35 +- + arch/arm/mach-omap2/sdrc.h | 11 +- + arch/arm/mach-omap2/sdrc2xxx.c | 8 +- + arch/arm/mach-omap2/serial.c | 30 +- + arch/arm/mach-omap2/sleep24xx.S | 2 +- + arch/arm/mach-omap2/sleep34xx.S | 220 +++- + arch/arm/mach-omap2/sram242x.S | 4 +- + arch/arm/mach-omap2/sram243x.S | 4 +- + arch/arm/mach-omap2/timer-gp.c | 7 +- + arch/arm/mach-omap2/usb-ehci.c | 192 +++ + arch/arm/mach-omap2/usb-musb.c | 4 +- + arch/arm/mach-omap2/usb-tusb6010.c | 4 +- + arch/arm/plat-omap/Kconfig | 5 +- + arch/arm/plat-omap/clock.c | 2 +- + arch/arm/plat-omap/common.c | 59 +- + arch/arm/plat-omap/cpu-omap.c | 2 +- + arch/arm/plat-omap/debug-devices.c | 2 +- + arch/arm/plat-omap/debug-leds.c | 2 +- + arch/arm/plat-omap/devices.c | 38 +- + arch/arm/plat-omap/dma.c | 86 +- + arch/arm/plat-omap/dmtimer.c | 18 +- + arch/arm/plat-omap/fb.c | 6 +- + arch/arm/plat-omap/gpio.c | 517 +++--- + arch/arm/plat-omap/i2c.c | 2 +- + .../plat-omap/include/{mach => plat}/blizzard.h | 0 + .../include/{mach => plat}/board-ams-delta.h | 0 + .../plat-omap/include/{mach => plat}/board-sx1.h | 0 + .../include/{mach => plat}/board-voiceblue.h | 0 + arch/arm/plat-omap/include/{mach => plat}/board.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/clkdev.h | 0 + arch/arm/plat-omap/include/{mach => plat}/clock.h | 0 + .../plat-omap/include/{mach => plat}/clockdomain.h | 6 +- + arch/arm/plat-omap/include/{mach => plat}/common.h | 3 + + .../arm/plat-omap/include/{mach => plat}/control.h | 114 ++- + arch/arm/plat-omap/include/{mach => plat}/cpu.h | 91 +- + arch/arm/plat-omap/include/{mach => plat}/dma.h | 5 + + .../arm/plat-omap/include/{mach => plat}/dmtimer.h | 0 + .../plat-omap/include/{mach => plat}/dsp_common.h | 0 + arch/arm/plat-omap/include/{mach => plat}/fpga.h | 0 + .../plat-omap/include/{mach => plat}/gpio-switch.h | 0 + arch/arm/plat-omap/include/{mach => plat}/gpio.h | 3 +- + .../plat-omap/include/{mach => plat}/gpmc-smc91x.h | 0 + arch/arm/plat-omap/include/{mach => plat}/gpmc.h | 3 + + .../plat-omap/include/{mach => plat}/hardware.h | 16 +- + arch/arm/plat-omap/include/{mach => plat}/hwa742.h | 0 + arch/arm/plat-omap/include/{mach => plat}/io.h | 124 +- + arch/arm/plat-omap/include/{mach => plat}/iommu.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/iommu2.h | 0 + arch/arm/plat-omap/include/{mach => plat}/iovmm.h | 0 + arch/arm/plat-omap/include/{mach => plat}/irda.h | 0 + arch/arm/plat-omap/include/{mach => plat}/irqs.h | 234 +-- + arch/arm/plat-omap/include/{mach => plat}/keypad.h | 0 + .../plat-omap/include/{mach => plat}/lcd_mipid.h | 0 + arch/arm/plat-omap/include/{mach => plat}/led.h | 0 + .../arm/plat-omap/include/{mach => plat}/mailbox.h | 3 +- + arch/arm/plat-omap/include/{mach => plat}/mcbsp.h | 8 +- + arch/arm/plat-omap/include/{mach => plat}/mcspi.h | 0 + arch/arm/plat-omap/include/{mach => plat}/memory.h | 0 + .../plat-omap/include/{mach => plat}/menelaus.h | 0 + arch/arm/plat-omap/include/{mach => plat}/mmc.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/mux.h | 109 +- + arch/arm/plat-omap/include/{mach => plat}/nand.h | 0 + .../plat-omap/include/{mach => plat}/omap-alsa.h | 4 +- + .../arm/plat-omap/include/{mach => plat}/omap-pm.h | 0 + .../plat-omap/include/{mach => plat}/omap1510.h | 0 + .../plat-omap/include/{mach => plat}/omap16xx.h | 0 + .../plat-omap/include/{mach => plat}/omap24xx.h | 0 + .../plat-omap/include/{mach => plat}/omap34xx.h | 6 +- + .../plat-omap/include/{mach => plat}/omap44xx.h | 10 +- + .../arm/plat-omap/include/{mach => plat}/omap730.h | 0 + .../include/{mach/omap730.h => plat/omap7xx.h} | 86 +- + .../arm/plat-omap/include/{mach => plat}/omap850.h | 0 + .../plat-omap/include/{mach => plat}/omap_device.h | 2 +- + .../plat-omap/include/{mach => plat}/omap_hwmod.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/omapfb.h | 2 +- + .../arm/plat-omap/include/{mach => plat}/onenand.h | 0 + arch/arm/plat-omap/include/{mach => plat}/param.h | 0 + .../plat-omap/include/{mach => plat}/powerdomain.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/prcm.h | 6 +- + arch/arm/plat-omap/include/{mach => plat}/sdrc.h | 14 +- + arch/arm/plat-omap/include/{mach => plat}/serial.h | 4 - + arch/arm/plat-omap/include/{mach => plat}/smp.h | 0 + arch/arm/plat-omap/include/{mach => plat}/sram.h | 7 + + arch/arm/plat-omap/include/{mach => plat}/system.h | 2 +- + arch/arm/plat-omap/include/{mach => plat}/tc.h | 0 + .../plat-omap/include/{mach => plat}/timer-gp.h | 0 + arch/arm/plat-omap/include/{mach => plat}/timex.h | 0 + .../plat-omap/include/{mach => plat}/uncompress.h | 11 +- + arch/arm/plat-omap/include/{mach => plat}/usb.h | 19 +- + arch/arm/plat-omap/io.c | 44 +- + arch/arm/plat-omap/iommu-debug.c | 4 +- + arch/arm/plat-omap/iommu.c | 2 +- + arch/arm/plat-omap/iovmm.c | 17 +- + arch/arm/plat-omap/mailbox.c | 194 +-- + arch/arm/plat-omap/mcbsp.c | 4 +- + arch/arm/plat-omap/mux.c | 2 +- + arch/arm/plat-omap/omap-pm-noop.c | 4 +- + arch/arm/plat-omap/omap_device.c | 54 +- + arch/arm/plat-omap/sram.c | 40 +- + arch/arm/plat-omap/usb.c | 38 +- + drivers/input/keyboard/omap-keypad.c | 6 +- + drivers/leds/leds-ams-delta.c | 2 +- + drivers/mfd/menelaus.c | 2 +- + drivers/mfd/twl4030-core.c | 2 +- + drivers/mmc/host/omap.c | 10 +- + drivers/mmc/host/omap_hsmmc.c | 8 +- + drivers/mtd/maps/omap_nor.c | 2 +- + drivers/mtd/nand/ams-delta.c | 2 +- + drivers/mtd/nand/omap2.c | 6 +- + drivers/mtd/onenand/omap2.c | 8 +- + drivers/pcmcia/omap_cf.c | 4 +- + drivers/spi/omap2_mcspi.c | 4 +- + drivers/spi/omap_uwire.c | 10 +- + drivers/usb/gadget/omap_udc.c | 25 +- + drivers/usb/host/ohci-omap.c | 6 +- + drivers/usb/musb/omap2430.c | 2 +- + drivers/usb/musb/omap2430.h | 2 +- + drivers/usb/musb/tusb6010_omap.c | 4 +- + drivers/usb/otg/isp1301_omap.c | 4 +- + drivers/video/backlight/omap1_bl.c | 4 +- + drivers/video/omap/blizzard.c | 6 +- + drivers/video/omap/dispc.c | 26 +- + drivers/video/omap/hwa742.c | 6 +- + drivers/video/omap/lcd_2430sdp.c | 4 +- + drivers/video/omap/lcd_ams_delta.c | 4 +- + drivers/video/omap/lcd_apollon.c | 4 +- + drivers/video/omap/lcd_h3.c | 2 +- + drivers/video/omap/lcd_h4.c | 2 +- + drivers/video/omap/lcd_inn1510.c | 4 +- + drivers/video/omap/lcd_inn1610.c | 2 +- + drivers/video/omap/lcd_ldp.c | 4 +- + drivers/video/omap/lcd_mipid.c | 4 +- + drivers/video/omap/lcd_omap2evm.c | 4 +- + drivers/video/omap/lcd_omap3beagle.c | 4 +- + drivers/video/omap/lcd_omap3evm.c | 4 +- + drivers/video/omap/lcd_osk.c | 4 +- + drivers/video/omap/lcd_overo.c | 4 +- + drivers/video/omap/lcd_palmte.c | 4 +- + drivers/video/omap/lcd_palmtt.c | 2 +- + drivers/video/omap/lcd_palmz71.c | 2 +- + drivers/video/omap/lcdc.c | 4 +- + drivers/video/omap/omapfb_main.c | 4 +- + drivers/video/omap/rfbi.c | 2 +- + drivers/video/omap/sossi.c | 4 +- + drivers/watchdog/omap_wdt.c | 2 +- + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/omap/n810.c | 2 +- + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-pcm.c | 2 +- + sound/soc/omap/omap2evm.c | 2 +- + sound/soc/omap/omap3beagle.c | 2 +- + sound/soc/omap/omap3evm.c | 2 +- + sound/soc/omap/osk5912.c | 2 +- + sound/soc/omap/overo.c | 2 +- + sound/soc/omap/sdp3430.c | 2 +- + sound/soc/omap/zoom2.c | 2 +- + 287 files changed, 10492 insertions(+), 2182 deletions(-) + create mode 100644 arch/arm/configs/cm_t35_defconfig + create mode 100644 arch/arm/configs/omap_3630sdp_defconfig + create mode 100644 arch/arm/configs/omap_zoom3_defconfig + create mode 100644 arch/arm/mach-omap1/include/mach/clkdev.h + create mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-omap1/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-omap1/include/mach/gpio.h + create mode 100644 arch/arm/mach-omap1/include/mach/hardware.h + create mode 100644 arch/arm/mach-omap1/include/mach/io.h + create mode 100644 arch/arm/mach-omap1/include/mach/irqs.h + create mode 100644 arch/arm/mach-omap1/include/mach/memory.h + rename arch/arm/{plat-omap => mach-omap1}/include/mach/mtd-xip.h (100%) + create mode 100644 arch/arm/mach-omap1/include/mach/smp.h + create mode 100644 arch/arm/mach-omap1/include/mach/system.h + create mode 100644 arch/arm/mach-omap1/include/mach/timex.h + create mode 100644 arch/arm/mach-omap1/include/mach/uncompress.h + copy arch/arm/{plat-omap => mach-omap1}/include/mach/vmalloc.h (88%) + create mode 100755 arch/arm/mach-omap2/board-3630sdp.c + create mode 100644 arch/arm/mach-omap2/board-cm-t35.c + create mode 100755 arch/arm/mach-omap2/board-zoom-peripherals.c + create mode 100644 arch/arm/mach-omap2/board-zoom3.c + create mode 100644 arch/arm/mach-omap2/cpuidle34xx.c + create mode 100644 arch/arm/mach-omap2/include/mach/clkdev.h + rename arch/arm/{plat-omap => mach-omap2}/include/mach/debug-macro.S (72%) + rename arch/arm/{plat-omap => mach-omap2}/include/mach/entry-macro.S (68%) + create mode 100644 arch/arm/mach-omap2/include/mach/gpio.h + create mode 100644 arch/arm/mach-omap2/include/mach/hardware.h + create mode 100644 arch/arm/mach-omap2/include/mach/io.h + create mode 100644 arch/arm/mach-omap2/include/mach/irqs.h + create mode 100644 arch/arm/mach-omap2/include/mach/memory.h + create mode 100644 arch/arm/mach-omap2/include/mach/smp.h + create mode 100644 arch/arm/mach-omap2/include/mach/system.h + create mode 100644 arch/arm/mach-omap2/include/mach/timex.h + create mode 100644 arch/arm/mach-omap2/include/mach/uncompress.h + rename arch/arm/{plat-omap => mach-omap2}/include/mach/vmalloc.h (94%) + create mode 100644 arch/arm/mach-omap2/sdram-hynix-h8mbx00u0mer-0em.h + create mode 100644 arch/arm/mach-omap2/usb-ehci.c + rename arch/arm/plat-omap/include/{mach => plat}/blizzard.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-ams-delta.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-sx1.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board-voiceblue.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/board.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/clkdev.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/clock.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/clockdomain.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/common.h (96%) + rename arch/arm/plat-omap/include/{mach => plat}/control.h (70%) + rename arch/arm/plat-omap/include/{mach => plat}/cpu.h (80%) + rename arch/arm/plat-omap/include/{mach => plat}/dma.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/dmtimer.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/dsp_common.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/fpga.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpio-switch.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpio.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/gpmc-smc91x.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/gpmc.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/hardware.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/hwa742.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/io.h (60%) + rename arch/arm/plat-omap/include/{mach => plat}/iommu.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/iommu2.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/iovmm.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/irda.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/irqs.h (70%) + rename arch/arm/plat-omap/include/{mach => plat}/keypad.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/lcd_mipid.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/led.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/mailbox.h (95%) + rename arch/arm/plat-omap/include/{mach => plat}/mcbsp.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/mcspi.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/memory.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/menelaus.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/mmc.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/mux.h (90%) + rename arch/arm/plat-omap/include/{mach => plat}/nand.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap-alsa.h (98%) + rename arch/arm/plat-omap/include/{mach => plat}/omap-pm.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap1510.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap16xx.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap24xx.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap34xx.h (93%) + rename arch/arm/plat-omap/include/{mach => plat}/omap44xx.h (79%) + copy arch/arm/plat-omap/include/{mach => plat}/omap730.h (100%) + rename arch/arm/plat-omap/include/{mach/omap730.h => plat/omap7xx.h} (56%) + rename arch/arm/plat-omap/include/{mach => plat}/omap850.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/omap_device.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/omap_hwmod.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/omapfb.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/onenand.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/param.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/powerdomain.h (99%) + rename arch/arm/plat-omap/include/{mach => plat}/prcm.h (89%) + rename arch/arm/plat-omap/include/{mach => plat}/sdrc.h (89%) + rename arch/arm/plat-omap/include/{mach => plat}/serial.h (94%) + rename arch/arm/plat-omap/include/{mach => plat}/smp.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/sram.h (93%) + rename arch/arm/plat-omap/include/{mach => plat}/system.h (97%) + rename arch/arm/plat-omap/include/{mach => plat}/tc.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/timer-gp.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/timex.h (100%) + rename arch/arm/plat-omap/include/{mach => plat}/uncompress.h (90%) + rename arch/arm/plat-omap/include/{mach => plat}/usb.h (90%) +Merging pxa/for-next +$ git merge pxa/for-next +Auto-merging MAINTAINERS +Removing arch/arm/mach-pxa/include/mach/treo680.h +Merge made by recursive. + MAINTAINERS | 13 + + arch/arm/configs/cm_x300_defconfig | 351 ++++++++---- + arch/arm/mach-mmp/aspenite.c | 42 ++ + arch/arm/mach-mmp/clock.c | 15 + + arch/arm/mach-mmp/clock.h | 1 + + arch/arm/mach-mmp/include/mach/irqs.h | 4 +- + arch/arm/mach-mmp/include/mach/mfp-pxa910.h | 2 +- + arch/arm/mach-mmp/include/mach/pxa168.h | 7 + + arch/arm/mach-mmp/include/mach/pxa910.h | 7 + + arch/arm/mach-mmp/pxa168.c | 5 + + arch/arm/mach-mmp/pxa910.c | 4 + + arch/arm/mach-mmp/ttc_dkb.c | 87 +++ + arch/arm/mach-pxa/Kconfig | 637 +++++++++++--------- + arch/arm/mach-pxa/Makefile | 90 ++-- + arch/arm/mach-pxa/balloon3.c | 4 + + arch/arm/mach-pxa/cm-x2xx.c | 4 + + arch/arm/mach-pxa/cm-x300.c | 230 +++++++- + arch/arm/mach-pxa/colibri-pxa270.c | 3 + + arch/arm/mach-pxa/colibri-pxa300.c | 4 + + arch/arm/mach-pxa/colibri-pxa320.c | 8 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- + arch/arm/mach-pxa/corgi.c | 4 + + arch/arm/mach-pxa/corgi_pm.c | 4 +- + arch/arm/mach-pxa/csb726.c | 3 + + arch/arm/mach-pxa/devices.c | 30 +- + arch/arm/mach-pxa/e330.c | 3 + + arch/arm/mach-pxa/e350.c | 3 + + arch/arm/mach-pxa/e400.c | 3 + + arch/arm/mach-pxa/e740.c | 3 + + arch/arm/mach-pxa/e750.c | 3 + + arch/arm/mach-pxa/e800.c | 3 + + arch/arm/mach-pxa/em-x270.c | 4 + + arch/arm/mach-pxa/ezx.c | 24 + + arch/arm/mach-pxa/generic.h | 5 + + arch/arm/mach-pxa/gumstix.c | 5 + + arch/arm/mach-pxa/h5000.c | 3 + + arch/arm/mach-pxa/himalaya.c | 3 + + arch/arm/mach-pxa/hx4700.c | 4 + + arch/arm/mach-pxa/idp.c | 3 + + arch/arm/mach-pxa/imote2.c | 6 +- + arch/arm/mach-pxa/include/mach/entry-macro.S | 1 + + arch/arm/mach-pxa/include/mach/palmtreo.h | 67 ++ + arch/arm/mach-pxa/include/mach/regs-u2d.h | 199 ++++++ + arch/arm/mach-pxa/include/mach/treo680.h | 49 -- + arch/arm/mach-pxa/littleton.c | 8 +- + arch/arm/mach-pxa/lpd270.c | 4 + + arch/arm/mach-pxa/lubbock.c | 4 + + arch/arm/mach-pxa/magician.c | 4 + + arch/arm/mach-pxa/mainstone.c | 4 + + arch/arm/mach-pxa/mioa701.c | 3 + + arch/arm/mach-pxa/mp900.c | 3 + + arch/arm/mach-pxa/palmld.c | 4 + + arch/arm/mach-pxa/palmt5.c | 4 + + arch/arm/mach-pxa/palmtc.c | 5 + + arch/arm/mach-pxa/palmte2.c | 4 + + arch/arm/mach-pxa/{treo680.c => palmtreo.c} | 365 +++++++++--- + arch/arm/mach-pxa/palmtx.c | 4 + + arch/arm/mach-pxa/palmz72.c | 4 + + arch/arm/mach-pxa/pcm027.c | 4 + + arch/arm/mach-pxa/poodle.c | 4 + + arch/arm/mach-pxa/pxa25x.c | 7 +- + arch/arm/mach-pxa/pxa27x.c | 3 - + arch/arm/mach-pxa/pxa3xx.c | 47 ++- + arch/arm/mach-pxa/saar.c | 100 +++- + arch/arm/mach-pxa/sharpsl.h | 4 +- + arch/arm/mach-pxa/sharpsl_pm.c | 112 ++-- + arch/arm/mach-pxa/spitz.c | 4 + + arch/arm/mach-pxa/spitz_pm.c | 14 +- + arch/arm/mach-pxa/ssp.c | 73 +-- + arch/arm/mach-pxa/stargate2.c | 4 + + arch/arm/mach-pxa/tavorevb.c | 4 + + arch/arm/mach-pxa/tosa.c | 5 + + arch/arm/mach-pxa/trizeps4.c | 4 + + arch/arm/mach-pxa/viper.c | 4 + + arch/arm/mach-pxa/xcep.c | 5 + + arch/arm/mach-pxa/zylonite.c | 6 +- + arch/arm/mm/mmu.c | 2 +- + .../mach => plat-pxa/include/plat}/pxa3xx_nand.h | 0 + drivers/mmc/host/pxamci.c | 10 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 82 +++- + drivers/video/pxafb.c | 22 +- + 82 files changed, 2121 insertions(+), 773 deletions(-) + create mode 100644 arch/arm/mach-pxa/include/mach/palmtreo.h + create mode 100644 arch/arm/mach-pxa/include/mach/regs-u2d.h + delete mode 100644 arch/arm/mach-pxa/include/mach/treo680.h + rename arch/arm/mach-pxa/{treo680.c => palmtreo.c} (53%) + rename arch/arm/{mach-pxa/include/mach => plat-pxa/include/plat}/pxa3xx_nand.h (100%) +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Resolved 'arch/avr32/mach-at32ap/include/mach/cpu.h' using previous resolution. +Auto-merging arch/avr32/mach-at32ap/include/mach/cpu.h +CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 78439d4] Merge remote branch 'avr32/avr32-arch' +$ git diff -M --stat --summary HEAD^.. + arch/avr32/boards/atngw100/mrmt.c | 1 + + arch/avr32/boards/atngw100/setup.c | 5 -- + arch/avr32/kernel/vmlinux.lds.S | 64 ++++----------------------- + arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++------- + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + 5 files changed, 30 insertions(+), 76 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- + arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- + arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- + 3 files changed, 5 insertions(+), 5 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Resolved 'drivers/rtc/Kconfig' using previous resolution. +Auto-merging drivers/rtc/Kconfig +CONFLICT (content): Merge conflict in drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c581e7a] Merge remote branch 'm68k/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/rtc/Kconfig | 19 +++ + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-msm6242.c | 268 +++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-rp5c01.c | 222 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 511 insertions(+), 0 deletions(-) + create mode 100644 drivers/rtc/rtc-msm6242.c + create mode 100644 drivers/rtc/rtc-rp5c01.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/processor.h | 2 + + arch/m68k/include/asm/ptrace.h | 12 ++++ + arch/m68k/include/asm/thread_info_no.h | 4 +- + arch/m68knommu/Kconfig | 7 ++ + arch/m68knommu/kernel/ptrace.c | 18 +++++- + arch/m68knommu/kernel/setup.c | 92 ++++++++++++++++++++++++++++++- + arch/m68knommu/kernel/vmlinux.lds.S | 47 +++++----------- + arch/m68knommu/platform/523x/gpio.c | 5 +- + arch/m68knommu/platform/527x/gpio.c | 6 +- + arch/m68knommu/platform/528x/gpio.c | 2 +- + arch/m68knommu/platform/coldfire/head.S | 10 +++ + drivers/serial/mcf.c | 2 +- + 12 files changed, 161 insertions(+), 46 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Removing arch/mips/alchemy/common/puts.c +Removing arch/mips/alchemy/devboards/db1x00/irqmap.c +Removing arch/mips/alchemy/devboards/pb1200/irqmap.c +Removing arch/mips/alchemy/mtx-1/irqmap.c +Removing arch/mips/alchemy/xxs1500/irqmap.c +Removing arch/mips/boot/addinitrd.c +Removing arch/mips/include/asm/mach-pb1x00/pb1100.h +Removing arch/mips/include/asm/mach-pb1x00/pb1500.h +Auto-merging drivers/mtd/maps/Makefile +Removing drivers/mtd/maps/alchemy-flash.c +Removing drivers/pcmcia/au1000_db1x00.c +Removing drivers/pcmcia/au1000_xxs1500.c +Auto-merging drivers/serial/8250.c +Removing sound/soc/au1x/sample-ac97.c +Merge made by recursive. + arch/mips/Kconfig | 69 +- + arch/mips/Makefile | 41 +- + arch/mips/alchemy/Kconfig | 14 + + arch/mips/alchemy/common/Makefile | 2 +- + arch/mips/alchemy/common/dbdma.c | 74 +- + arch/mips/alchemy/common/dma.c | 36 +- + arch/mips/alchemy/common/irq.c | 343 ++-- + arch/mips/alchemy/common/platform.c | 60 +- + arch/mips/alchemy/common/puts.c | 68 - + arch/mips/alchemy/common/reset.c | 3 - + arch/mips/alchemy/common/setup.c | 3 +- + arch/mips/alchemy/common/time.c | 35 +- + arch/mips/alchemy/devboards/Makefile | 6 +- + arch/mips/alchemy/devboards/bcsr.c | 148 ++ + arch/mips/alchemy/devboards/db1200/Makefile | 1 + + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++ + arch/mips/alchemy/devboards/db1200/setup.c | 137 ++ + arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 127 ++- + arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 - + arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ + arch/mips/alchemy/devboards/pb1000/board_setup.c | 30 +- + arch/mips/alchemy/devboards/pb1100/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1100/board_setup.c | 32 +- + arch/mips/alchemy/devboards/pb1100/platform.c | 50 + + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1200/board_setup.c | 86 +- + arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- + arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- + arch/mips/alchemy/devboards/pb1500/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 40 +- + arch/mips/alchemy/devboards/pb1500/platform.c | 49 + + arch/mips/alchemy/devboards/pb1550/Makefile | 3 +- + arch/mips/alchemy/devboards/pb1550/board_setup.c | 45 +- + arch/mips/alchemy/devboards/pb1550/platform.c | 69 + + arch/mips/alchemy/devboards/platform.c | 193 ++ + arch/mips/alchemy/devboards/platform.h | 21 + + arch/mips/alchemy/devboards/prom.c | 5 + + arch/mips/alchemy/mtx-1/Makefile | 2 +- + arch/mips/alchemy/mtx-1/board_setup.c | 24 + + arch/mips/alchemy/mtx-1/init.c | 6 + + arch/mips/alchemy/mtx-1/irqmap.c | 56 - + arch/mips/alchemy/xxs1500/Makefile | 4 +- + arch/mips/alchemy/xxs1500/board_setup.c | 37 +- + arch/mips/alchemy/xxs1500/init.c | 6 + + arch/mips/alchemy/xxs1500/irqmap.c | 52 - + arch/mips/alchemy/xxs1500/platform.c | 63 + + arch/mips/basler/excite/excite_iodev.c | 1 - + arch/mips/bcm47xx/prom.c | 10 +- + arch/mips/boot/Makefile | 8 +- + arch/mips/boot/addinitrd.c | 131 -- + arch/mips/boot/compressed/Makefile | 100 ++ + arch/mips/boot/compressed/dbg.c | 37 + + arch/mips/boot/compressed/decompress.c | 126 ++ + arch/mips/boot/compressed/dummy.c | 4 + + arch/mips/boot/compressed/head.S | 56 + + arch/mips/boot/compressed/ld.script | 150 ++ + arch/mips/boot/compressed/uart-16550.c | 43 + + arch/mips/cavium-octeon/octeon-platform.c | 88 + + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/cavium-octeon_defconfig | 1 - + arch/mips/configs/db1200_defconfig | 1481 +++++++++------- + arch/mips/configs/fuloong2e_defconfig | 93 +- + arch/mips/configs/lemote2f_defconfig | 1836 ++++++++++++++++++++ + arch/mips/configs/powertv_defconfig | 1549 +++++++++++++++++ + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/fw/arc/cmdline.c | 5 - + arch/mips/include/asm/bootinfo.h | 4 +- + arch/mips/include/asm/dma-mapping.h | 11 +- + arch/mips/include/asm/fpu_emulator.h | 24 +- + arch/mips/include/asm/mach-au1x00/au1000.h | 883 +++++------ + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 74 +- + arch/mips/include/asm/mach-db1x00/bcsr.h | 238 +++ + arch/mips/include/asm/mach-db1x00/db1200.h | 156 +-- + arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- + .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 305 ++++ + .../include/asm/mach-loongson/cs5536/cs5536_pci.h | 153 ++ + .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 31 + + .../mips/include/asm/mach-loongson/dma-coherence.h | 4 + + arch/mips/include/asm/mach-loongson/loongson.h | 277 +++- + arch/mips/include/asm/mach-loongson/machine.h | 9 +- + arch/mips/include/asm/mach-loongson/mem.h | 27 +- + arch/mips/include/asm/mach-loongson/pci.h | 34 +- + arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 - + arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- + arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - + arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 - + arch/mips/include/asm/mach-powertv/asic.h | 107 ++ + arch/mips/include/asm/mach-powertv/asic_regs.h | 155 ++ + arch/mips/include/asm/mach-powertv/dma-coherence.h | 119 ++ + arch/mips/include/asm/mach-powertv/interrupts.h | 254 +++ + arch/mips/include/asm/mach-powertv/ioremap.h | 90 + + arch/mips/include/asm/mach-powertv/irq.h | 25 + + arch/mips/include/asm/mach-powertv/powertv-clock.h | 29 + + arch/mips/include/asm/mach-powertv/war.h | 28 + + arch/mips/include/asm/mips-boards/bonito64.h | 5 - + arch/mips/include/asm/mmu_context.h | 29 +- + arch/mips/include/asm/octeon/cvmx-agl-defs.h | 1194 +++++++++++++ + arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 248 +++ + arch/mips/include/asm/octeon/cvmx-smix-defs.h | 178 ++ + arch/mips/include/asm/sgialib.h | 3 +- + arch/mips/include/asm/stackframe.h | 40 +- + arch/mips/kernel/Makefile | 1 + + arch/mips/kernel/csrc-powertv.c | 180 ++ + arch/mips/kernel/linux32.c | 1 - + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/setup.c | 24 +- + arch/mips/kernel/vpe.c | 1 - + arch/mips/lasat/prom.c | 4 +- + arch/mips/loongson/Kconfig | 84 +- + arch/mips/loongson/Makefile | 6 + + arch/mips/loongson/common/Makefile | 9 +- + arch/mips/loongson/common/bonito-irq.c | 13 +- + arch/mips/loongson/common/cmdline.c | 4 +- + arch/mips/loongson/common/cs5536/Makefile | 8 + + arch/mips/loongson/common/cs5536/cs5536_acc.c | 140 ++ + arch/mips/loongson/common/cs5536/cs5536_ehci.c | 158 ++ + arch/mips/loongson/common/cs5536/cs5536_ide.c | 179 ++ + arch/mips/loongson/common/cs5536/cs5536_isa.c | 316 ++++ + arch/mips/loongson/common/cs5536/cs5536_ohci.c | 147 ++ + arch/mips/loongson/common/cs5536/cs5536_pci.c | 87 + + arch/mips/loongson/common/early_printk.c | 17 +- + arch/mips/loongson/common/init.c | 21 +- + arch/mips/loongson/common/irq.c | 12 +- + arch/mips/loongson/common/machtype.c | 17 +- + arch/mips/loongson/common/mem.c | 25 + + arch/mips/loongson/common/pci.c | 20 +- + arch/mips/loongson/common/reset.c | 2 +- + arch/mips/loongson/common/serial.c | 70 + + arch/mips/loongson/common/uart_base.c | 34 + + arch/mips/loongson/fuloong-2e/irq.c | 4 +- + arch/mips/loongson/fuloong-2e/reset.c | 4 +- + arch/mips/loongson/lemote-2f/Makefile | 5 + + arch/mips/loongson/lemote-2f/irq.c | 132 ++ + arch/mips/loongson/lemote-2f/reset.c | 172 ++ + arch/mips/math-emu/cp1emu.c | 143 +- + arch/mips/math-emu/dsemul.c | 4 +- + arch/mips/mipssim/sim_setup.c | 1 - + arch/mips/mm/dma-default.c | 7 + + arch/mips/mm/init.c | 2 + + arch/mips/mm/tlbex.c | 28 +- + arch/mips/mm/uasm.c | 16 +- + arch/mips/mm/uasm.h | 7 + + arch/mips/mti-malta/malta-memory.c | 2 +- + arch/mips/oprofile/op_model_loongson2.c | 5 +- + arch/mips/pci/Makefile | 3 +- + arch/mips/pci/fixup-fuloong2e.c | 5 +- + arch/mips/pci/fixup-lemote2f.c | 162 ++ + arch/mips/pci/ops-bonito64.c | 7 - + arch/mips/pci/ops-loongson2.c | 208 +++ + arch/mips/powertv/Kconfig | 21 + + arch/mips/powertv/Makefile | 28 + + arch/mips/powertv/asic/Kconfig | 28 + + arch/mips/powertv/asic/Makefile | 23 + + arch/mips/powertv/asic/asic-calliope.c | 98 ++ + arch/mips/powertv/asic/asic-cronus.c | 98 ++ + arch/mips/powertv/asic/asic-zeus.c | 98 ++ + arch/mips/powertv/asic/asic_devices.c | 787 +++++++++ + arch/mips/powertv/asic/asic_int.c | 125 ++ + arch/mips/powertv/asic/irq_asic.c | 116 ++ + arch/mips/powertv/asic/prealloc-calliope.c | 620 +++++++ + arch/mips/powertv/asic/prealloc-cronus.c | 608 +++++++ + arch/mips/powertv/asic/prealloc-cronuslite.c | 290 +++ + arch/mips/powertv/asic/prealloc-zeus.c | 459 +++++ + arch/mips/powertv/cmdline.c | 52 + + arch/mips/powertv/init.c | 128 ++ + arch/mips/powertv/init.h | 28 + + arch/mips/powertv/memory.c | 186 ++ + arch/mips/powertv/pci/Makefile | 21 + + arch/mips/powertv/pci/fixup-powertv.c | 36 + + arch/mips/powertv/pci/powertv-pci.h | 31 + + arch/mips/powertv/powertv-clock.h | 26 + + arch/mips/powertv/powertv_setup.c | 351 ++++ + arch/mips/powertv/reset.c | 65 + + arch/mips/powertv/reset.h | 26 + + .../mips/{mipssim/sim_cmdline.c => powertv/time.c} | 21 +- + arch/mips/rb532/prom.c | 4 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/sibyte/common/sb_tbprof.c | 1 - + arch/mips/txx9/generic/setup.c | 4 +- + drivers/ide/au1xxx-ide.c | 21 +- + drivers/mmc/host/au1xmmc.c | 8 +- + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/alchemy-flash.c | 166 -- + drivers/mtd/nand/au1550nd.c | 4 +- + drivers/net/Kconfig | 2 + + drivers/net/Makefile | 2 + + drivers/net/irda/au1k_ir.c | 14 +- + drivers/net/octeon/Kconfig | 10 + + drivers/net/octeon/Makefile | 2 + + drivers/net/octeon/octeon_mgmt.c | 1176 +++++++++++++ + drivers/net/phy/Kconfig | 11 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mdio-octeon.c | 180 ++ + drivers/pcmcia/Kconfig | 21 + + drivers/pcmcia/Makefile | 12 +- + drivers/pcmcia/au1000_db1x00.c | 305 ---- + drivers/pcmcia/au1000_generic.h | 12 +- + drivers/pcmcia/au1000_pb1x00.c | 119 +-- + drivers/pcmcia/au1000_xxs1500.c | 188 -- + drivers/pcmcia/db1xxx_ss.c | 630 +++++++ + drivers/pcmcia/xxs1500_ss.c | 357 ++++ + drivers/serial/8250.c | 15 +- + drivers/serial/bcm63xx_uart.c | 4 +- + drivers/spi/au1550_spi.c | 6 +- + drivers/spi/spi_txx9.c | 13 +- + drivers/staging/octeon/Kconfig | 3 +- + drivers/staging/octeon/ethernet-mdio.c | 206 +-- + drivers/staging/octeon/ethernet-mdio.h | 2 +- + drivers/staging/octeon/ethernet-proc.c | 112 -- + drivers/staging/octeon/ethernet-rgmii.c | 52 +- + drivers/staging/octeon/ethernet-sgmii.c | 2 +- + drivers/staging/octeon/ethernet-spi.c | 2 +- + drivers/staging/octeon/ethernet-xaui.c | 2 +- + drivers/staging/octeon/ethernet.c | 76 +- + drivers/staging/octeon/octeon-ethernet.h | 6 +- + drivers/video/gbefb.c | 2 +- + drivers/video/tdfxfb.c | 4 +- + sound/oss/au1550_ac97.c | 16 +- + sound/soc/au1x/Kconfig | 10 +- + sound/soc/au1x/Makefile | 4 +- + sound/soc/au1x/db1200.c | 141 ++ + sound/soc/au1x/dbdma2.c | 14 +- + sound/soc/au1x/sample-ac97.c | 144 -- + 226 files changed, 20542 insertions(+), 4369 deletions(-) + delete mode 100644 arch/mips/alchemy/common/puts.c + create mode 100644 arch/mips/alchemy/devboards/bcsr.c + create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile + create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c + create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.h + delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c + delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c + create mode 100644 arch/mips/alchemy/xxs1500/platform.c + delete mode 100644 arch/mips/boot/addinitrd.c + create mode 100644 arch/mips/boot/compressed/Makefile + create mode 100644 arch/mips/boot/compressed/dbg.c + create mode 100644 arch/mips/boot/compressed/decompress.c + create mode 100644 arch/mips/boot/compressed/dummy.c + create mode 100644 arch/mips/boot/compressed/head.S + create mode 100644 arch/mips/boot/compressed/ld.script + create mode 100644 arch/mips/boot/compressed/uart-16550.c + create mode 100644 arch/mips/configs/lemote2f_defconfig + create mode 100644 arch/mips/configs/powertv_defconfig + create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_pci.h + create mode 100644 arch/mips/include/asm/mach-loongson/cs5536/cs5536_vsm.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h + create mode 100644 arch/mips/include/asm/mach-powertv/asic.h + create mode 100644 arch/mips/include/asm/mach-powertv/asic_regs.h + create mode 100644 arch/mips/include/asm/mach-powertv/dma-coherence.h + create mode 100644 arch/mips/include/asm/mach-powertv/interrupts.h + create mode 100644 arch/mips/include/asm/mach-powertv/ioremap.h + create mode 100644 arch/mips/include/asm/mach-powertv/irq.h + create mode 100644 arch/mips/include/asm/mach-powertv/powertv-clock.h + create mode 100644 arch/mips/include/asm/mach-powertv/war.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-agl-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-mixx-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-smix-defs.h + create mode 100644 arch/mips/kernel/csrc-powertv.c + create mode 100644 arch/mips/loongson/common/cs5536/Makefile + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_acc.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ehci.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ide.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_isa.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_ohci.c + create mode 100644 arch/mips/loongson/common/cs5536/cs5536_pci.c + create mode 100644 arch/mips/loongson/common/serial.c + create mode 100644 arch/mips/loongson/common/uart_base.c + create mode 100644 arch/mips/loongson/lemote-2f/Makefile + create mode 100644 arch/mips/loongson/lemote-2f/irq.c + create mode 100644 arch/mips/loongson/lemote-2f/reset.c + create mode 100644 arch/mips/pci/fixup-lemote2f.c + create mode 100644 arch/mips/pci/ops-loongson2.c + create mode 100644 arch/mips/powertv/Kconfig + create mode 100644 arch/mips/powertv/Makefile + create mode 100644 arch/mips/powertv/asic/Kconfig + create mode 100644 arch/mips/powertv/asic/Makefile + create mode 100644 arch/mips/powertv/asic/asic-calliope.c + create mode 100644 arch/mips/powertv/asic/asic-cronus.c + create mode 100644 arch/mips/powertv/asic/asic-zeus.c + create mode 100644 arch/mips/powertv/asic/asic_devices.c + create mode 100644 arch/mips/powertv/asic/asic_int.c + create mode 100644 arch/mips/powertv/asic/irq_asic.c + create mode 100644 arch/mips/powertv/asic/prealloc-calliope.c + create mode 100644 arch/mips/powertv/asic/prealloc-cronus.c + create mode 100644 arch/mips/powertv/asic/prealloc-cronuslite.c + create mode 100644 arch/mips/powertv/asic/prealloc-zeus.c + create mode 100644 arch/mips/powertv/cmdline.c + create mode 100644 arch/mips/powertv/init.c + create mode 100644 arch/mips/powertv/init.h + create mode 100644 arch/mips/powertv/memory.c + create mode 100644 arch/mips/powertv/pci/Makefile + create mode 100644 arch/mips/powertv/pci/fixup-powertv.c + create mode 100644 arch/mips/powertv/pci/powertv-pci.h + create mode 100644 arch/mips/powertv/powertv-clock.h + create mode 100644 arch/mips/powertv/powertv_setup.c + create mode 100644 arch/mips/powertv/reset.c + create mode 100644 arch/mips/powertv/reset.h + rename arch/mips/{mipssim/sim_cmdline.c => powertv/time.c} (60%) + delete mode 100644 drivers/mtd/maps/alchemy-flash.c + create mode 100644 drivers/net/octeon/Kconfig + create mode 100644 drivers/net/octeon/Makefile + create mode 100644 drivers/net/octeon/octeon_mgmt.c + create mode 100644 drivers/net/phy/mdio-octeon.c + delete mode 100644 drivers/pcmcia/au1000_db1x00.c + delete mode 100644 drivers/pcmcia/au1000_xxs1500.c + create mode 100644 drivers/pcmcia/db1xxx_ss.c + create mode 100644 drivers/pcmcia/xxs1500_ss.c + create mode 100644 sound/soc/au1x/db1200.c + delete mode 100644 sound/soc/au1x/sample-ac97.c +Merging parisc/next +$ git merge parisc/next +Merge made by recursive. + arch/parisc/include/asm/ftrace.h | 14 ++++++++++ + arch/parisc/kernel/asm-offsets.c | 3 -- + arch/parisc/kernel/signal.c | 1 - + arch/parisc/kernel/unwind.c | 54 ++++++++++++++++++++++++++++---------- + 4 files changed, 54 insertions(+), 18 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + arch/powerpc/Kconfig | 34 +- + arch/powerpc/include/asm/exception-64s.h | 2 + + arch/powerpc/include/asm/hugetlb.h | 27 +- + arch/powerpc/include/asm/hw_irq.h | 5 - + arch/powerpc/include/asm/irq.h | 9 +- + arch/powerpc/include/asm/kvm.h | 2 + + arch/powerpc/include/asm/kvm_asm.h | 39 + + arch/powerpc/include/asm/kvm_book3s.h | 136 +++ + arch/powerpc/include/asm/kvm_book3s_64_asm.h | 58 ++ + arch/powerpc/include/asm/kvm_host.h | 79 ++- + arch/powerpc/include/asm/kvm_ppc.h | 1 + + arch/powerpc/include/asm/mmu-hash64.h | 15 +- + arch/powerpc/include/asm/mmu_context.h | 2 + + arch/powerpc/include/asm/nvram.h | 1 - + arch/powerpc/include/asm/paca.h | 9 + + arch/powerpc/include/asm/page.h | 14 + + arch/powerpc/include/asm/page_64.h | 2 +- + arch/powerpc/include/asm/pgalloc-32.h | 10 +- + arch/powerpc/include/asm/pgalloc-64.h | 60 +- + arch/powerpc/include/asm/pgalloc.h | 30 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 14 +- + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/kernel/Makefile | 3 +- + arch/powerpc/kernel/asm-offsets.c | 18 + + arch/powerpc/kernel/crash.c | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 8 + + arch/powerpc/kernel/head_64.S | 7 + + arch/powerpc/kernel/irq.c | 131 ++- + arch/powerpc/kernel/lparcfg.c | 4 +- + arch/powerpc/kernel/nvram_64.c | 42 +- + arch/powerpc/kernel/perf_callchain.c | 20 +- + arch/powerpc/kernel/ppc_ksyms.c | 1 - + .../kernel/{proc_ppc64.c => proc_powerpc.c} | 102 ++- + arch/powerpc/kernel/rtas_flash.c | 10 +- + arch/powerpc/{platforms/pseries => kernel}/rtasd.c | 48 +- + arch/powerpc/kernel/setup_64.c | 5 - + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kvm/Kconfig | 17 + + arch/powerpc/kvm/Makefile | 27 +- + arch/powerpc/kvm/book3s.c | 925 ++++++++++++++++++++ + arch/powerpc/kvm/book3s_32_mmu.c | 372 ++++++++ + arch/powerpc/kvm/book3s_64_emulate.c | 337 +++++++ + arch/powerpc/kvm/book3s_64_exports.c | 24 + + arch/powerpc/kvm/book3s_64_interrupts.S | 392 +++++++++ + arch/powerpc/kvm/book3s_64_mmu.c | 476 ++++++++++ + arch/powerpc/kvm/book3s_64_mmu_host.c | 408 +++++++++ + arch/powerpc/kvm/book3s_64_rmhandlers.S | 131 +++ + arch/powerpc/kvm/book3s_64_slb.S | 262 ++++++ + arch/powerpc/kvm/booke.c | 5 + + arch/powerpc/kvm/emulate.c | 66 ++- + arch/powerpc/kvm/powerpc.c | 25 +- + arch/powerpc/kvm/timing.c | 1 + + arch/powerpc/kvm/trace.h | 6 +- + arch/powerpc/mm/Makefile | 5 +- + arch/powerpc/mm/gup.c | 149 +--- + arch/powerpc/mm/hash_utils_64.c | 40 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 139 +++ + arch/powerpc/mm/hugetlbpage.c | 783 ++++++----------- + arch/powerpc/mm/init_64.c | 76 ++- + arch/powerpc/mm/mem.c | 17 +- + arch/powerpc/mm/mmu_context_hash64.c | 24 +- + arch/powerpc/mm/pgtable.c | 25 +- + arch/powerpc/mm/tlb_hash64.c | 8 +- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 +- + arch/powerpc/platforms/52xx/media5200.c | 2 +- + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- + arch/powerpc/platforms/86xx/gef_pic.c | 2 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- + arch/powerpc/platforms/Kconfig | 5 + + arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- + arch/powerpc/platforms/cell/spider-pic.c | 4 +- + arch/powerpc/platforms/chrp/Kconfig | 2 + + arch/powerpc/platforms/chrp/setup.c | 50 -- + arch/powerpc/platforms/iseries/irq.c | 2 +- + arch/powerpc/platforms/powermac/pic.c | 8 +- + arch/powerpc/platforms/ps3/mm.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 3 +- + arch/powerpc/platforms/pseries/Makefile | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 29 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 18 +- + arch/powerpc/platforms/pseries/reconfig.c | 6 +- + arch/powerpc/platforms/pseries/scanlog.c | 4 +- + arch/powerpc/platforms/pseries/xics.c | 8 +- + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/cpm2_pic.c | 10 +- + arch/powerpc/sysdev/fsl_msi.c | 2 +- + arch/powerpc/sysdev/i8259.c | 4 +- + arch/powerpc/sysdev/ipic.c | 2 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/mpic.c | 18 +- + arch/powerpc/sysdev/mv64x60_pic.c | 2 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 4 +- + arch/powerpc/sysdev/tsi108_pci.c | 2 +- + arch/powerpc/sysdev/uic.c | 6 +- + arch/powerpc/sysdev/xilinx_intc.c | 2 +- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/of/platform.c | 305 ++++++- + fs/proc/proc_devtree.c | 41 +- + virt/kvm/kvm_main.c | 5 +- + 100 files changed, 5107 insertions(+), 1153 deletions(-) + create mode 100644 arch/powerpc/include/asm/kvm_book3s.h + create mode 100644 arch/powerpc/include/asm/kvm_book3s_64_asm.h + rename arch/powerpc/kernel/{proc_ppc64.c => proc_powerpc.c} (87%) + rename arch/powerpc/{platforms/pseries => kernel}/rtasd.c (95%) + create mode 100644 arch/powerpc/kvm/book3s.c + create mode 100644 arch/powerpc/kvm/book3s_32_mmu.c + create mode 100644 arch/powerpc/kvm/book3s_64_emulate.c + create mode 100644 arch/powerpc/kvm/book3s_64_exports.c + create mode 100644 arch/powerpc/kvm/book3s_64_interrupts.S + create mode 100644 arch/powerpc/kvm/book3s_64_mmu.c + create mode 100644 arch/powerpc/kvm/book3s_64_mmu_host.c + create mode 100644 arch/powerpc/kvm/book3s_64_rmhandlers.S + create mode 100644 arch/powerpc/kvm/book3s_64_slb.S + create mode 100644 arch/powerpc/mm/hugetlbpage-hash64.c +Merging 4xx/next +$ git merge 4xx/next +Merge made by recursive. + arch/powerpc/boot/dts/canyonlands.dts | 2 ++ + arch/powerpc/boot/dts/eiger.dts | 6 ++++++ + arch/powerpc/boot/dts/glacier.dts | 6 ++++++ + arch/powerpc/boot/dts/haleakala.dts | 2 ++ + arch/powerpc/boot/dts/katmai.dts | 14 +++++++++++--- + arch/powerpc/boot/dts/kilauea.dts | 4 ++++ + arch/powerpc/boot/dts/makalu.dts | 4 ++++ + arch/powerpc/boot/dts/redwood.dts | 1 + + 8 files changed, 36 insertions(+), 3 deletions(-) +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Merge made by recursive. + arch/powerpc/include/asm/mpc52xx.h | 46 ++ + arch/powerpc/kernel/io.c | 4 +- + arch/powerpc/platforms/52xx/Kconfig | 5 + + arch/powerpc/platforms/52xx/Makefile | 1 + + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 133 ++++++- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 560 +++++++++++++++++++++++++ + drivers/mmc/host/of_mmc_spi.c | 2 + + drivers/spi/Kconfig | 8 + + drivers/spi/Makefile | 1 + + drivers/spi/mpc52xx_psc_spi.c | 25 +- + drivers/spi/mpc52xx_spi.c | 520 +++++++++++++++++++++++ + drivers/spi/xilinx_spi.c | 3 +- + include/linux/spi/mpc52xx_spi.h | 10 + + 13 files changed, 1297 insertions(+), 21 deletions(-) + create mode 100644 arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c + create mode 100644 drivers/spi/mpc52xx_spi.c + create mode 100644 include/linux/spi/mpc52xx_spi.h +Merging galak/next +$ git merge galak/next +Auto-merging drivers/spi/Kconfig +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/board.txt | 4 + + arch/powerpc/Kconfig | 11 +- + arch/powerpc/boot/dts/gef_ppc9a.dts | 6 + + arch/powerpc/boot/dts/gef_sbc310.dts | 6 + + arch/powerpc/boot/dts/gef_sbc610.dts | 6 + + arch/powerpc/boot/dts/kmeter1.dts | 7 + + arch/powerpc/boot/dts/mpc832x_mds.dts | 9 + + arch/powerpc/boot/dts/mpc832x_rdb.dts | 9 + + arch/powerpc/boot/dts/mpc836x_mds.dts | 9 + + arch/powerpc/boot/dts/mpc836x_rdk.dts | 9 + + arch/powerpc/boot/dts/mpc8568mds.dts | 119 +++-- + arch/powerpc/boot/dts/mpc8569mds.dts | 111 +++-- + arch/powerpc/boot/dts/mpc8610_hpcd.dts | 26 + + arch/powerpc/boot/dts/p1020rdb.dts | 477 +++++++++++++++++ + arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 363 +++++++++++++ + arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 184 +++++++ + arch/powerpc/configs/86xx/gef_ppc9a_defconfig | 2 +- + arch/powerpc/configs/86xx/gef_sbc310_defconfig | 2 +- + arch/powerpc/configs/86xx/gef_sbc610_defconfig | 4 +- + arch/powerpc/include/asm/cpm.h | 82 +++ + arch/powerpc/include/asm/cpm1.h | 45 -- + arch/powerpc/include/asm/cpm2.h | 47 -- + arch/powerpc/include/asm/immap_cpm2.h | 2 +- + arch/powerpc/include/asm/immap_qe.h | 8 +- + arch/powerpc/include/asm/qe.h | 43 ++- + arch/powerpc/kernel/asm-offsets.c | 3 - + arch/powerpc/kernel/head_fsl_booke.S | 22 - + arch/powerpc/mm/fsl_booke_mmu.c | 132 +++-- + arch/powerpc/mm/mmu_decl.h | 11 - + arch/powerpc/platforms/83xx/suspend.c | 1 + + arch/powerpc/platforms/85xx/Kconfig | 11 +- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 + + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 34 ++- + arch/powerpc/platforms/86xx/Kconfig | 3 + + arch/powerpc/platforms/86xx/gef_ppc9a.c | 5 + + arch/powerpc/platforms/86xx/gef_sbc310.c | 5 + + arch/powerpc/platforms/86xx/gef_sbc610.c | 5 + + arch/powerpc/platforms/86xx/mpc8610_hpcd.c | 48 ++- + arch/powerpc/platforms/Kconfig | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 17 +- + arch/powerpc/platforms/Makefile | 2 +- + arch/powerpc/sysdev/Makefile | 1 + + arch/powerpc/sysdev/cpm_common.c | 5 +- + arch/powerpc/sysdev/fsl_pci.c | 18 +- + arch/powerpc/sysdev/fsl_pmc.c | 88 +++ + arch/powerpc/sysdev/fsl_soc.c | 2 +- + arch/powerpc/sysdev/qe_lib/qe.c | 61 ++- + drivers/spi/Kconfig | 3 - + drivers/spi/spi_mpc8xxx.c | 623 +++++++++++++++++++--- + drivers/usb/gadget/fsl_qe_udc.h | 15 - + include/linux/fsl_devices.h | 6 +- + include/linux/pci_ids.h | 14 + + 52 files changed, 2308 insertions(+), 421 deletions(-) + create mode 100644 arch/powerpc/boot/dts/p1020rdb.dts + create mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core0.dts + create mode 100644 arch/powerpc/boot/dts/p2020rdb_camp_core1.dts + create mode 100644 arch/powerpc/sysdev/fsl_pmc.c +Merging s390/features +$ git merge s390/features +Auto-merging MAINTAINERS +Removing arch/s390/include/asm/todclk.h +Merge made by recursive. + MAINTAINERS | 3 + + arch/s390/Kconfig | 15 - + arch/s390/defconfig | 1 - + arch/s390/include/asm/atomic.h | 8 +- + arch/s390/include/asm/ccwdev.h | 4 + + arch/s390/include/asm/mmu_context.h | 4 +- + arch/s390/include/asm/pgalloc.h | 3 +- + arch/s390/include/asm/setup.h | 17 +- + arch/s390/include/asm/smp.h | 54 +-- + arch/s390/include/asm/sockios.h | 21 +- + arch/s390/include/asm/termbits.h | 206 +------- + arch/s390/include/asm/todclk.h | 23 - + arch/s390/include/asm/uaccess.h | 2 + + arch/s390/kernel/setup.c | 36 +- + arch/s390/kernel/vdso.c | 9 +- + arch/s390/kvm/Kconfig | 1 - + arch/s390/lib/uaccess_mvcos.c | 4 - + arch/s390/lib/uaccess_pt.c | 147 ++---- + arch/s390/mm/cmm.c | 61 ++- + arch/s390/mm/fault.c | 378 +++++++------- + arch/s390/mm/pgtable.c | 2 +- + drivers/s390/block/dasd.c | 8 - + drivers/s390/block/dasd_3990_erp.c | 1 - + drivers/s390/block/dasd_diag.c | 20 +- + drivers/s390/block/dasd_eckd.c | 17 +- + drivers/s390/block/dasd_fba.c | 1 - + drivers/s390/char/tape_core.c | 3 +- + drivers/s390/cio/Makefile | 2 +- + drivers/s390/cio/ccwreq.c | 328 ++++++++++++ + drivers/s390/cio/cio.h | 8 +- + drivers/s390/cio/css.c | 57 ++- + drivers/s390/cio/css.h | 3 + + drivers/s390/cio/device.c | 1006 +++++++++++++++-------------------- + drivers/s390/cio/device.h | 25 +- + drivers/s390/cio/device_fsm.c | 411 ++++----------- + drivers/s390/cio/device_id.c | 375 +++++--------- + drivers/s390/cio/device_ops.c | 144 +++--- + drivers/s390/cio/device_pgid.c | 963 ++++++++++++++++----------------- + drivers/s390/cio/device_status.c | 3 - + drivers/s390/cio/io_sch.h | 73 +++- + drivers/s390/crypto/ap_bus.c | 20 +- + drivers/s390/crypto/ap_bus.h | 18 +- + drivers/s390/crypto/zcrypt_api.c | 9 +- + drivers/s390/crypto/zcrypt_api.h | 2 + + drivers/s390/crypto/zcrypt_cex2a.c | 75 ++- + drivers/s390/crypto/zcrypt_pcica.c | 2 + + drivers/s390/crypto/zcrypt_pcicc.c | 2 + + drivers/s390/crypto/zcrypt_pcixcc.c | 38 ++- + 48 files changed, 2182 insertions(+), 2431 deletions(-) + delete mode 100644 arch/s390/include/asm/todclk.h + create mode 100644 drivers/s390/cio/ccwreq.c +Merging sh/master +$ git merge sh/master +Removing arch/sh/drivers/pci/Kconfig +Removing arch/sh/include/asm/irqflags_32.h +Removing arch/sh/include/asm/irqflags_64.h +Removing arch/sh/kernel/cpu/ubc.S +Removing arch/sh/mm/pmb-fixed.c +Removing arch/sh/oprofile/op_model_sh7750.c +Merge made by recursive. + arch/sh/Kconfig | 29 +- + arch/sh/Makefile | 1 + + arch/sh/boards/Makefile | 1 - + arch/sh/boards/mach-ap325rxa/Makefile | 2 + + arch/sh/boards/mach-ap325rxa/sdram.S | 69 +++ + .../{board-ap325rxa.c => mach-ap325rxa/setup.c} | 97 +++- + arch/sh/boards/mach-ecovec24/Makefile | 2 +- + arch/sh/boards/mach-ecovec24/sdram.S | 52 ++ + arch/sh/boards/mach-ecovec24/setup.c | 167 +++++-- + arch/sh/boards/mach-highlander/setup.c | 2 +- + arch/sh/boards/mach-kfr2r09/Makefile | 2 +- + arch/sh/boards/mach-kfr2r09/sdram.S | 80 +++ + arch/sh/boards/mach-kfr2r09/setup.c | 185 +++++++ + arch/sh/boards/mach-migor/Makefile | 2 +- + arch/sh/boards/mach-migor/sdram.S | 69 +++ + arch/sh/boards/mach-migor/setup.c | 63 ++- + arch/sh/boards/mach-r2d/irq.c | 2 +- + arch/sh/boards/mach-se/7722/irq.c | 32 +- + arch/sh/boards/mach-se/7722/setup.c | 15 +- + arch/sh/boards/mach-se/7724/Makefile | 2 +- + arch/sh/boards/mach-se/7724/sdram.S | 52 ++ + arch/sh/boards/mach-se/7724/setup.c | 94 ++++- + arch/sh/boot/compressed/misc.c | 2 +- + arch/sh/drivers/pci/Kconfig | 19 - + arch/sh/include/asm/addrspace.h | 9 +- + arch/sh/include/asm/atomic.h | 9 +- + arch/sh/include/asm/bitops.h | 4 +- + arch/sh/include/asm/bugs.h | 4 + + arch/sh/include/asm/dma-mapping.h | 233 +++------- + arch/sh/include/asm/dwarf.h | 28 ++ + arch/sh/include/asm/fixmap.h | 6 +- + arch/sh/include/asm/ftrace.h | 17 + + arch/sh/include/asm/hardirq.h | 13 +- + arch/sh/include/asm/io.h | 16 +- + arch/sh/include/asm/irqflags.h | 31 +-- + arch/sh/include/asm/irqflags_32.h | 99 ---- + arch/sh/include/asm/irqflags_64.h | 85 ---- + arch/sh/include/asm/mmu.h | 13 +- + arch/sh/include/asm/pci.h | 30 +- + arch/sh/include/asm/perf_event.h | 31 ++- + arch/sh/include/asm/pgtable.h | 26 +- + arch/sh/include/asm/pgtable_32.h | 2 +- + arch/sh/include/asm/scatterlist.h | 2 +- + arch/sh/include/asm/suspend.h | 65 +++ + arch/sh/include/asm/system.h | 4 - + arch/sh/include/asm/system_32.h | 29 ++ + arch/sh/include/asm/system_64.h | 26 + + arch/sh/include/asm/thread_info.h | 26 +- + arch/sh/include/asm/topology.h | 8 + + arch/sh/include/asm/ubc.h | 11 - + arch/sh/include/asm/watchdog.h | 59 +++- + arch/sh/include/cpu-sh4/cpu/watchdog.h | 13 + + arch/sh/include/mach-se/mach/se7722.h | 11 +- + arch/sh/kernel/Makefile | 9 +- + arch/sh/kernel/asm-offsets.c | 23 + + arch/sh/kernel/cpu/Makefile | 1 - + arch/sh/kernel/cpu/init.c | 11 - + arch/sh/kernel/cpu/sh3/entry.S | 33 -- + arch/sh/kernel/cpu/sh4/Makefile | 8 +- + arch/sh/kernel/cpu/sh4/perf_event.c | 253 ++++++++++ + arch/sh/kernel/cpu/sh4a/Makefile | 1 + + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 2 +- + arch/sh/kernel/cpu/sh4a/perf_event.c | 269 +++++++++++ + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 249 ++++++++++ + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 45 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 37 +- + arch/sh/kernel/cpu/sh5/entry.S | 2 +- + arch/sh/kernel/cpu/shmobile/cpuidle.c | 42 +- + arch/sh/kernel/cpu/shmobile/pm.c | 117 ++++- + arch/sh/kernel/cpu/shmobile/sleep.S | 344 ++++++++------ + arch/sh/kernel/cpu/ubc.S | 59 --- + arch/sh/kernel/dma-nommu.c | 82 ++++ + arch/sh/kernel/dwarf.c | 222 +++++++-- + arch/sh/kernel/entry-common.S | 2 +- + arch/sh/kernel/ftrace.c | 146 ++++++- + arch/sh/kernel/head_32.S | 2 +- + arch/sh/kernel/idle.c | 78 +++- + arch/sh/kernel/io_generic.c | 4 +- + arch/sh/kernel/irq.c | 14 + + arch/sh/kernel/irq_32.c | 57 +++ + arch/sh/kernel/irq_64.c | 51 ++ + arch/sh/kernel/machine_kexec.c | 6 - + arch/sh/kernel/machvec.c | 4 + + arch/sh/kernel/module.c | 9 +- + arch/sh/kernel/perf_callchain.c | 98 ++++ + arch/sh/kernel/perf_event.c | 312 ++++++++++++ + arch/sh/kernel/process_32.c | 2 + + arch/sh/kernel/process_64.c | 2 + + arch/sh/kernel/return_address.c | 54 +++ + arch/sh/kernel/setup.c | 4 + + arch/sh/kernel/sh_ksyms_32.c | 67 +--- + arch/sh/kernel/sh_ksyms_64.c | 10 - + arch/sh/kernel/signal_32.c | 24 +- + arch/sh/kernel/signal_64.c | 13 +- + arch/sh/kernel/smp.c | 4 +- + arch/sh/kernel/topology.c | 26 + + arch/sh/kernel/traps.c | 8 +- + arch/sh/kernel/traps_32.c | 5 - + arch/sh/mm/Kconfig | 19 +- + arch/sh/mm/Makefile | 3 +- + arch/sh/mm/cache-sh4.c | 503 +++----------------- + arch/sh/mm/cache-sh5.c | 2 +- + arch/sh/mm/cache-sh7705.c | 2 +- + arch/sh/mm/cache.c | 18 +- + arch/sh/mm/consistent.c | 28 +- + arch/sh/mm/init.c | 19 + + arch/sh/mm/kmap.c | 4 +- + arch/sh/mm/numa.c | 2 +- + arch/sh/mm/pmb-fixed.c | 45 -- + arch/sh/mm/pmb.c | 268 ++++++------ + arch/sh/oprofile/Makefile | 4 - + arch/sh/oprofile/common.c | 38 +-- + arch/sh/oprofile/op_impl.h | 2 +- + arch/sh/oprofile/op_model_sh7750.c | 255 ---------- + drivers/cdrom/gdrom.c | 10 +- + drivers/mfd/Kconfig | 8 + + drivers/mfd/Makefile | 1 + + drivers/mfd/sh_mobile_sdhi.c | 145 ++++++ + drivers/mmc/host/Kconfig | 2 +- + drivers/sh/intc.c | 123 +++++- + drivers/sh/maple/maple.c | 4 +- + drivers/video/sh_mobile_lcdcfb.c | 32 +- + include/linux/sh_intc.h | 7 +- + 123 files changed, 4198 insertions(+), 2108 deletions(-) + create mode 100644 arch/sh/boards/mach-ap325rxa/Makefile + create mode 100644 arch/sh/boards/mach-ap325rxa/sdram.S + rename arch/sh/boards/{board-ap325rxa.c => mach-ap325rxa/setup.c} (87%) + create mode 100644 arch/sh/boards/mach-ecovec24/sdram.S + create mode 100644 arch/sh/boards/mach-kfr2r09/sdram.S + create mode 100644 arch/sh/boards/mach-migor/sdram.S + create mode 100644 arch/sh/boards/mach-se/7724/sdram.S + delete mode 100644 arch/sh/drivers/pci/Kconfig + delete mode 100644 arch/sh/include/asm/irqflags_32.h + delete mode 100644 arch/sh/include/asm/irqflags_64.h + create mode 100644 arch/sh/kernel/cpu/sh4/perf_event.c + create mode 100644 arch/sh/kernel/cpu/sh4a/perf_event.c + delete mode 100644 arch/sh/kernel/cpu/ubc.S + create mode 100644 arch/sh/kernel/dma-nommu.c + create mode 100644 arch/sh/kernel/irq_32.c + create mode 100644 arch/sh/kernel/irq_64.c + create mode 100644 arch/sh/kernel/perf_callchain.c + create mode 100644 arch/sh/kernel/perf_event.c + create mode 100644 arch/sh/kernel/return_address.c + delete mode 100644 arch/sh/mm/pmb-fixed.c + delete mode 100644 arch/sh/oprofile/op_model_sh7750.c + create mode 100644 drivers/mfd/sh_mobile_sdhi.c +Merging sparc/master +$ git merge sparc/master +Merge made by recursive. + arch/sparc/include/asm/leon.h | 28 ++ + arch/sparc/include/asm/smp_32.h | 9 + + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/apc.c | 37 +-- + arch/sparc/kernel/entry.S | 33 ++ + arch/sparc/kernel/head_32.S | 22 ++ + arch/sparc/kernel/ioport.c | 5 + + arch/sparc/kernel/leon_kernel.c | 84 +++++ + arch/sparc/kernel/leon_smp.c | 468 ++++++++++++++++++++++++ + arch/sparc/kernel/smp_32.c | 10 + + arch/sparc/kernel/trampoline_32.S | 69 ++++- + arch/sparc/mm/srmmu.c | 5 +- + drivers/serial/Kconfig | 13 + + drivers/serial/Makefile | 1 + + drivers/serial/apbuart.c | 710 +++++++++++++++++++++++++++++++++++++ + drivers/serial/apbuart.h | 64 ++++ + drivers/watchdog/riowd.c | 6 +- + include/linux/serial_core.h | 3 + + 18 files changed, 1536 insertions(+), 33 deletions(-) + create mode 100644 arch/sparc/kernel/leon_smp.c + create mode 100644 drivers/serial/apbuart.c + create mode 100644 drivers/serial/apbuart.h +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Merge made by recursive. + Documentation/filesystems/ceph.txt | 139 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ceph/Kconfig | 26 + + fs/ceph/Makefile | 36 + + fs/ceph/README | 20 + + fs/ceph/addr.c | 1115 +++++++++++++ + fs/ceph/buffer.c | 34 + + fs/ceph/buffer.h | 55 + + fs/ceph/caps.c | 2863 +++++++++++++++++++++++++++++++++ + fs/ceph/ceph_debug.h | 37 + + fs/ceph/ceph_frag.c | 21 + + fs/ceph/ceph_frag.h | 109 ++ + fs/ceph/ceph_fs.c | 74 + + fs/ceph/ceph_fs.h | 637 ++++++++ + fs/ceph/ceph_hash.c | 118 ++ + fs/ceph/ceph_hash.h | 13 + + fs/ceph/ceph_strings.c | 163 ++ + fs/ceph/crush/crush.c | 151 ++ + fs/ceph/crush/crush.h | 180 +++ + fs/ceph/crush/hash.c | 149 ++ + fs/ceph/crush/hash.h | 17 + + fs/ceph/crush/mapper.c | 596 +++++++ + fs/ceph/crush/mapper.h | 20 + + fs/ceph/debugfs.c | 425 +++++ + fs/ceph/decode.h | 153 ++ + fs/ceph/dir.c | 1214 ++++++++++++++ + fs/ceph/export.c | 223 +++ + fs/ceph/file.c | 904 +++++++++++ + fs/ceph/inode.c | 1624 +++++++++++++++++++ + fs/ceph/ioctl.c | 157 ++ + fs/ceph/ioctl.h | 39 + + fs/ceph/mds_client.c | 2903 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 321 ++++ + fs/ceph/mdsmap.c | 167 ++ + fs/ceph/mdsmap.h | 53 + + fs/ceph/messenger.c | 2065 ++++++++++++++++++++++++ + fs/ceph/messenger.h | 244 +++ + fs/ceph/mon_client.c | 739 +++++++++ + fs/ceph/mon_client.h | 109 ++ + fs/ceph/msgpool.c | 181 +++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1308 +++++++++++++++ + fs/ceph/osd_client.h | 144 ++ + fs/ceph/osdmap.c | 916 +++++++++++ + fs/ceph/osdmap.h | 124 ++ + fs/ceph/rados.h | 370 +++++ + fs/ceph/snap.c | 897 +++++++++++ + fs/ceph/super.c | 947 +++++++++++ + fs/ceph/super.h | 891 +++++++++++ + fs/ceph/types.h | 29 + + fs/ceph/xattr.c | 840 ++++++++++ + 55 files changed, 24757 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/buffer.c + create mode 100644 fs/ceph/buffer.h + create mode 100644 fs/ceph/caps.c + create mode 100644 fs/ceph/ceph_debug.h + create mode 100644 fs/ceph/ceph_frag.c + create mode 100644 fs/ceph/ceph_frag.h + create mode 100644 fs/ceph/ceph_fs.c + create mode 100644 fs/ceph/ceph_fs.h + create mode 100644 fs/ceph/ceph_hash.c + create mode 100644 fs/ceph/ceph_hash.h + create mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/crush/crush.c + create mode 100644 fs/ceph/crush/crush.h + create mode 100644 fs/ceph/crush/hash.c + create mode 100644 fs/ceph/crush/hash.h + create mode 100644 fs/ceph/crush/mapper.c + create mode 100644 fs/ceph/crush/mapper.h + create mode 100644 fs/ceph/debugfs.c + create mode 100644 fs/ceph/decode.h + create mode 100644 fs/ceph/dir.c + create mode 100644 fs/ceph/export.c + create mode 100644 fs/ceph/file.c + create mode 100644 fs/ceph/inode.c + create mode 100644 fs/ceph/ioctl.c + create mode 100644 fs/ceph/ioctl.h + create mode 100644 fs/ceph/mds_client.c + create mode 100644 fs/ceph/mds_client.h + create mode 100644 fs/ceph/mdsmap.c + create mode 100644 fs/ceph/mdsmap.h + create mode 100644 fs/ceph/messenger.c + create mode 100644 fs/ceph/messenger.h + create mode 100644 fs/ceph/mon_client.c + create mode 100644 fs/ceph/mon_client.h + create mode 100644 fs/ceph/msgpool.c + create mode 100644 fs/ceph/msgpool.h + create mode 100644 fs/ceph/msgr.h + create mode 100644 fs/ceph/osd_client.c + create mode 100644 fs/ceph/osd_client.h + create mode 100644 fs/ceph/osdmap.c + create mode 100644 fs/ceph/osdmap.h + create mode 100644 fs/ceph/rados.h + create mode 100644 fs/ceph/snap.c + create mode 100644 fs/ceph/super.c + create mode 100644 fs/ceph/super.h + create mode 100644 fs/ceph/types.h + create mode 100644 fs/ceph/xattr.c +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 +Merge made by recursive. + fs/ecryptfs/inode.c | 97 ++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 65 insertions(+), 32 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging arch/alpha/include/asm/fcntl.h +Auto-merging arch/mips/loongson/common/mem.c +Auto-merging include/asm-generic/fcntl.h +Merge made by recursive. + Documentation/filesystems/vfs.txt | 2 +- + arch/alpha/include/asm/fcntl.h | 19 ++- + arch/blackfin/include/asm/fcntl.h | 2 - + arch/mips/include/asm/fcntl.h | 17 ++- + arch/mips/kernel/kspd.c | 1 + + arch/mips/loongson/common/mem.c | 2 +- + arch/mips/mm/cache.c | 2 +- + arch/parisc/include/asm/fcntl.h | 5 +- + arch/sparc/include/asm/fcntl.h | 19 ++- + arch/x86/mm/pat.c | 3 +- + drivers/char/mem.c | 6 +- + drivers/usb/gadget/file_storage.c | 2 +- + fs/afs/write.c | 8 - + fs/btrfs/file.c | 4 +- + fs/cifs/dir.c | 3 +- + fs/cifs/file.c | 6 +- + fs/isofs/compress.c | 533 ++++++++++++++++++++----------------- + fs/isofs/rock.c | 3 +- + fs/jbd2/commit.c | 2 +- + fs/namei.c | 9 + + fs/nfs/file.c | 4 +- + fs/nfs/write.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/ocfs2/quota_local.c | 2 +- + fs/quota/dquot.c | 2 + + fs/quota/quota_v1.c | 2 +- + fs/quota/quota_v2.c | 2 +- + fs/sync.c | 13 +- + fs/ubifs/file.c | 13 +- + fs/xfs/linux-2.6/xfs_lrw.c | 2 +- + include/asm-generic/fcntl.h | 25 ++- + include/linux/fs.h | 2 - + include/linux/quota.h | 4 +- + mm/filemap.c | 49 +--- + sound/core/rawmidi.c | 2 +- + 35 files changed, 417 insertions(+), 357 deletions(-) +Merging ext4/next +$ git merge ext4/next +Merge made by recursive. +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 +Auto-merging fs/quota/dquot.c +Auto-merging include/linux/quota.h +Merge made by recursive. + fs/gfs2/Kconfig | 2 + + fs/gfs2/acl.c | 357 +++++++++++++++++++++++---------------- + fs/gfs2/acl.h | 24 +-- + fs/gfs2/aops.c | 8 +- + fs/gfs2/dir.c | 34 +---- + fs/gfs2/glock.c | 10 +- + fs/gfs2/glock.h | 9 - + fs/gfs2/glops.c | 5 +- + fs/gfs2/incore.h | 5 + + fs/gfs2/inode.c | 4 +- + fs/gfs2/log.c | 2 + + fs/gfs2/lops.c | 4 + + fs/gfs2/ops_fstype.c | 154 +++++++++++++++--- + fs/gfs2/quota.c | 393 +++++++++++++++++++++++++++++++++---------- + fs/gfs2/quota.h | 5 +- + fs/gfs2/recovery.c | 2 + + fs/gfs2/rgrp.c | 14 +- + fs/gfs2/super.c | 110 +++++++++++-- + fs/gfs2/super.h | 4 +- + fs/gfs2/sys.c | 14 +- + fs/gfs2/xattr.c | 74 +++++---- + fs/gfs2/xattr.h | 8 +- + fs/quota/Kconfig | 2 +- + fs/quota/dquot.c | 93 +--------- + fs/quota/quota.c | 93 ++++++++++ + fs/xattr_acl.c | 2 +- + include/linux/gfs2_ondisk.h | 6 +- + include/linux/posix_acl.h | 14 ++ + include/linux/quota.h | 11 ++ + 29 files changed, 983 insertions(+), 480 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/nfs4proc.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + Documentation/filesystems/00-INDEX | 12 +--- + Documentation/filesystems/nfs/00-INDEX | 16 +++++ + Documentation/filesystems/{ => nfs}/Exporting | 0 + .../filesystems/{ => nfs}/knfsd-stats.txt | 0 + Documentation/filesystems/{ => nfs}/nfs-rdma.txt | 0 + Documentation/filesystems/{ => nfs}/nfs.txt | 0 + .../filesystems/{ => nfs}/nfs41-server.txt | 9 +++- + Documentation/filesystems/{ => nfs}/nfsroot.txt | 0 + Documentation/filesystems/{ => nfs}/rpc-cache.txt | 0 + Documentation/filesystems/porting | 2 +- + Documentation/kernel-parameters.txt | 6 +- + fs/cifs/export.c | 2 +- + fs/exportfs/expfs.c | 2 +- + fs/isofs/export.c | 2 +- + fs/nfs/Kconfig | 2 +- + fs/nfsd/export.c | 22 ++++++- + fs/nfsd/nfs2acl.c | 13 ++++- + fs/nfsd/nfs3acl.c | 2 +- + fs/nfsd/nfs4acl.c | 2 +- + fs/nfsd/nfs4state.c | 64 ++++++++++---------- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/vfs.c | 62 +++++++++++-------- + include/linux/exportfs.h | 2 +- + include/linux/nfsd/state.h | 7 ++ + net/ipv4/Kconfig | 6 +- + net/ipv4/ipconfig.c | 2 +- + net/sunrpc/svcauth_unix.c | 53 +++++++++------- + 27 files changed, 176 insertions(+), 113 deletions(-) + create mode 100644 Documentation/filesystems/nfs/00-INDEX + rename Documentation/filesystems/{ => nfs}/Exporting (100%) + rename Documentation/filesystems/{ => nfs}/knfsd-stats.txt (100%) + rename Documentation/filesystems/{ => nfs}/nfs-rdma.txt (100%) + rename Documentation/filesystems/{ => nfs}/nfs.txt (100%) + rename Documentation/filesystems/{ => nfs}/nfs41-server.txt (96%) + rename Documentation/filesystems/{ => nfs}/nfsroot.txt (100%) + rename Documentation/filesystems/{ => nfs}/rpc-cache.txt (100%) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/btree.c | 18 ++++++++++++++++-- + fs/nilfs2/btree.h | 22 ---------------------- + fs/nilfs2/cpfile.c | 2 -- + fs/nilfs2/ioctl.c | 6 +++++- + include/linux/nilfs2_fs.h | 22 ++++++++++++++++++++++ + 5 files changed, 43 insertions(+), 27 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/file.c +Merge made by recursive. + fs/ocfs2/Kconfig | 10 +---- + fs/ocfs2/Makefile | 7 +-- + fs/ocfs2/acl.h | 22 --------- + fs/ocfs2/file.c | 3 +- + fs/ocfs2/ocfs2.h | 8 ++- + fs/ocfs2/refcounttree.c | 69 ++++++++++++++++++++++++++-- + fs/ocfs2/super.c | 115 +++++++++++++++++++++++++---------------------- + fs/ocfs2/xattr.c | 4 -- + fs/ocfs2/xattr.h | 2 - + 9 files changed, 135 insertions(+), 105 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Auto-merging fs/9p/vfs_inode.c +Merge made by recursive. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +Auto-merging fs/xfs/linux-2.6/xfs_quotaops.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_aops.c | 112 +++++++++++++---------------------------- + fs/xfs/linux-2.6/xfs_super.c | 49 ++++++++++++++++-- + fs/xfs/linux-2.6/xfs_sync.c | 15 ++---- + fs/xfs/linux-2.6/xfs_sync.h | 1 - + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_iget.c | 3 + + fs/xfs/xfs_iomap.c | 9 +++- + fs/xfs/xfs_mount.c | 2 +- + fs/xfs/xfs_rw.h | 7 --- + fs/xfs/xfs_trans.c | 7 ++- + fs/xfs/xfs_trans.h | 2 +- + fs/xfs/xfs_vnodeops.c | 74 ++++++++++------------------ + fs/xfs/xfs_vnodeops.h | 1 - + 13 files changed, 128 insertions(+), 156 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Auto-merging fs/reiserfs/super.c +Merge made by recursive. + fs/reiserfs/Makefile | 2 +- + fs/reiserfs/bitmap.c | 4 + + fs/reiserfs/dir.c | 10 +++- + fs/reiserfs/do_balan.c | 17 ++---- + fs/reiserfs/file.c | 2 +- + fs/reiserfs/fix_node.c | 19 +++++- + fs/reiserfs/inode.c | 95 ++++++++++++++++------------- + fs/reiserfs/ioctl.c | 77 +++++++++++++---------- + fs/reiserfs/journal.c | 130 ++++++++++++++++++++++++++++++---------- + fs/reiserfs/lock.c | 88 +++++++++++++++++++++++++++ + fs/reiserfs/namei.c | 20 ++++-- + fs/reiserfs/prints.c | 4 - + fs/reiserfs/resize.c | 2 + + fs/reiserfs/stree.c | 53 ++++++++++++++--- + fs/reiserfs/super.c | 52 ++++++++++++---- + fs/reiserfs/xattr.c | 6 +- + include/linux/reiserfs_fs.h | 71 +++++++++++++++++++--- + include/linux/reiserfs_fs_sb.h | 20 ++++++ + 18 files changed, 502 insertions(+), 170 deletions(-) + create mode 100644 fs/reiserfs/lock.c +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging arch/x86/xen/enlighten.c +Auto-merging drivers/char/hvc_xen.c +Merge made by recursive. + arch/ia64/include/asm/xen/hypervisor.h | 28 +---- + arch/ia64/pci/pci.c | 33 +++-- + arch/sparc/include/asm/pci_64.h | 2 - + arch/sparc/kernel/pci.c | 7 + + arch/x86/include/asm/xen/hypervisor.h | 27 ---- + arch/x86/pci/Makefile | 5 + + arch/x86/pci/acpi.c | 74 ++++++++-- + arch/x86/pci/amd_bus.c | 45 +++---- + arch/x86/pci/bus_numa.h | 26 ++++ + arch/x86/pci/common.c | 20 ++-- + arch/x86/pci/i386.c | 25 +++- + arch/x86/pci/intel_bus.c | 90 ++++++++++++ + arch/x86/pci/mmconfig-shared.c | 31 +++-- + arch/x86/xen/enlighten.c | 1 + + drivers/acpi/Makefile | 1 + + drivers/acpi/hest.c | 135 +++++++++++++++++ + drivers/block/xen-blkfront.c | 1 + + drivers/char/hvc_xen.c | 2 + + drivers/input/xen-kbdfront.c | 3 + + drivers/net/xen-netfront.c | 1 + + drivers/pci/Kconfig | 15 ++- + drivers/pci/Makefile | 2 + + drivers/pci/hotplug/Makefile | 12 +- + drivers/pci/hotplug/acpi_pcihp.c | 5 +- + drivers/pci/hotplug/acpiphp.h | 6 - + drivers/pci/hotplug/acpiphp_glue.c | 248 +++----------------------------- + drivers/pci/hotplug/pci_hotplug_core.c | 22 ++-- + drivers/pci/hotplug/pciehp_core.c | 119 +++++---------- + drivers/pci/hotplug/pciehp_ctrl.c | 30 +---- + drivers/pci/hotplug/pciehp_hpc.c | 85 +++--------- + drivers/pci/ioapic.c | 127 ++++++++++++++++ + drivers/pci/pci-sysfs.c | 8 + + drivers/pci/pci.c | 113 ++++++++++----- + drivers/pci/pci.h | 2 + + drivers/pci/pcie/aer/aer_inject.c | 56 +++++--- + drivers/pci/pcie/aer/aerdrv_core.c | 24 +++- + drivers/pci/probe.c | 82 +++++++----- + drivers/pci/quirks.c | 40 +++++- + drivers/pci/search.c | 34 +++--- + drivers/pci/setup-bus.c | 101 +++++++------- + drivers/pci/setup-res.c | 68 +++++----- + drivers/pcmcia/cardbus.c | 23 ++- + drivers/pnp/quirks.c | 13 +-- + drivers/pnp/resource.c | 10 +- + drivers/pnp/support.c | 43 +----- + drivers/pnp/system.c | 14 +- + drivers/video/xen-fbfront.c | 3 + + drivers/xen/balloon.c | 2 + + drivers/xen/cpu_hotplug.c | 1 + + drivers/xen/evtchn.c | 2 + + drivers/xen/grant-table.c | 1 + + drivers/xen/sys-hypervisor.c | 1 + + drivers/xen/xenbus/xenbus_probe.c | 2 + + drivers/xen/xenfs/super.c | 2 + + include/acpi/acpi_hest.h | 12 ++ + include/linux/pci.h | 13 ++- + include/linux/pci_regs.h | 18 +++ + include/xen/xen.h | 32 ++++ + kernel/resource.c | 26 ++-- + lib/vsprintf.c | 87 +++++++++--- + 60 files changed, 1200 insertions(+), 861 deletions(-) + create mode 100644 arch/x86/pci/bus_numa.h + create mode 100644 arch/x86/pci/intel_bus.c + create mode 100644 drivers/acpi/hest.c + create mode 100644 drivers/pci/ioapic.c + create mode 100644 include/acpi/acpi_hest.h + create mode 100644 include/xen/xen.h +Merging hid/for-next +$ git merge hid/for-next +Merge made by recursive. + drivers/hid/hid-core.c | 6 ++++-- + drivers/hid/hid-ids.h | 1 + + drivers/hid/usbhid/hid-core.c | 12 ++++++------ + drivers/hid/usbhid/hid-pidff.c | 5 ++--- + drivers/hid/usbhid/hid-quirks.c | 3 ++- + drivers/hid/usbhid/hiddev.c | 5 ----- + include/linux/hid.h | 1 + + 7 files changed, 16 insertions(+), 17 deletions(-) +Merging quilt/i2c +$ git merge quilt/i2c +Removing Documentation/i2c/busses/i2c-voodoo3 +Removing drivers/i2c/busses/i2c-voodoo3.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/i2c/busses/i2c-voodoo3 | 62 ------- + Documentation/i2c/old-module-parameters | 44 +++++ + arch/powerpc/include/asm/pmac_low_i2c.h | 6 +- + arch/powerpc/platforms/powermac/low_i2c.c | 25 +--- + drivers/i2c/Kconfig | 1 + + drivers/i2c/busses/Kconfig | 16 -- + drivers/i2c/busses/Makefile | 3 - + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-iop3xx.c | 6 - + drivers/i2c/busses/i2c-mv64xxx.c | 3 - + drivers/i2c/busses/i2c-powermac.c | 139 ++++++++------- + drivers/i2c/busses/i2c-scmi.c | 33 +++- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-voodoo3.c | 248 ---------------------------- + drivers/i2c/chips/Kconfig | 10 - + drivers/i2c/chips/Makefile | 1 - + drivers/i2c/chips/tsl2550.c | 3 + + drivers/i2c/i2c-core.c | 169 +++++--------------- + drivers/i2c/i2c-dev.c | 22 +-- + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/{i2c/chips => misc}/ds1682.c | 0 + drivers/misc/ics932s401.c | 37 ++--- + include/linux/i2c.h | 98 +----------- + 28 files changed, 234 insertions(+), 723 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + create mode 100644 Documentation/i2c/old-module-parameters + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c + rename drivers/{i2c/chips => misc}/ds1682.c (100%) +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Merge made by recursive. + Documentation/hwmon/f71882fg | 10 + + Documentation/hwmon/it87 | 1 - + Documentation/hwmon/mc13783-adc | 50 ++++++ + Documentation/hwmon/w83627hf | 29 +++- + drivers/hwmon/Kconfig | 23 ++- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1021.c | 76 +++------ + drivers/hwmon/adm1025.c | 73 +++------ + drivers/hwmon/adm1026.c | 47 ++--- + drivers/hwmon/adm1029.c | 57 ++----- + drivers/hwmon/adm1031.c | 26 +-- + drivers/hwmon/adm9240.c | 61 +++----- + drivers/hwmon/ads7828.c | 22 +-- + drivers/hwmon/adt7462.c | 25 +-- + drivers/hwmon/adt7470.c | 25 +-- + drivers/hwmon/adt7473.c | 25 +-- + drivers/hwmon/adt7475.c | 31 ++-- + drivers/hwmon/asb100.c | 55 ++---- + drivers/hwmon/dme1737.c | 32 ++--- + drivers/hwmon/ds1621.c | 22 +-- + drivers/hwmon/f71882fg.c | 350 ++++++++++++++++++++++++++------------- + drivers/hwmon/f75375s.c | 31 +--- + drivers/hwmon/fschmd.c | 53 +++---- + drivers/hwmon/gl518sm.c | 29 +--- + drivers/hwmon/gl520sm.c | 12 +- + drivers/hwmon/it87.c | 47 +++++- + drivers/hwmon/lm63.c | 54 +++---- + drivers/hwmon/lm73.c | 205 +++++++++++++++++++++++ + drivers/hwmon/lm75.c | 56 +++---- + drivers/hwmon/lm77.c | 80 +++++----- + drivers/hwmon/lm78.c | 60 +++----- + drivers/hwmon/lm83.c | 81 +++------ + drivers/hwmon/lm85.c | 157 +++++++---------- + drivers/hwmon/lm87.c | 41 ++--- + drivers/hwmon/lm90.c | 228 +++++++++++--------------- + drivers/hwmon/lm92.c | 31 ++--- + drivers/hwmon/lm93.c | 32 ++--- + drivers/hwmon/lm95241.c | 48 +----- + drivers/hwmon/max1619.c | 64 +++----- + drivers/hwmon/max6650.c | 20 +-- + drivers/hwmon/mc13783-adc.c | 224 +++++++++++++++++++++++++ + drivers/hwmon/s3c-hwmon.c | 11 +- + drivers/hwmon/smsc47m192.c | 28 ++-- + drivers/hwmon/thmc50.c | 37 ++--- + drivers/hwmon/tmp401.c | 55 +++---- + drivers/hwmon/tmp421.c | 45 +++--- + drivers/hwmon/w83627hf.c | 96 +++++------ + drivers/hwmon/w83781d.c | 131 ++++++--------- + drivers/hwmon/w83791d.c | 60 ++----- + drivers/hwmon/w83792d.c | 61 ++----- + drivers/hwmon/w83793.c | 53 ++---- + drivers/hwmon/w83l785ts.c | 70 +++------ + drivers/hwmon/w83l786ng.c | 58 ++----- + 53 files changed, 1701 insertions(+), 1599 deletions(-) + create mode 100644 Documentation/hwmon/mc13783-adc + create mode 100644 drivers/hwmon/lm73.c + create mode 100644 drivers/hwmon/mc13783-adc.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + Documentation/DMA-mapping.txt | 6 +++--- + Documentation/DocBook/kernel-hacking.tmpl | 2 +- + Documentation/filesystems/proc.txt | 4 ++-- + Documentation/gpio.txt | 4 ++-- + Documentation/{ => misc-devices}/c2port.txt | 0 + Documentation/{ => misc-devices}/ics932s401 | 0 + 6 files changed, 8 insertions(+), 8 deletions(-) + rename Documentation/{ => misc-devices}/c2port.txt (100%) + rename Documentation/{ => misc-devices}/ics932s401 (100%) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'drivers/media/common/tuners/tda18271-fe.c' using previous resolution. +Auto-merging drivers/media/common/tuners/tda18271-fe.c +CONFLICT (content): Merge conflict in drivers/media/common/tuners/tda18271-fe.c +Auto-merging drivers/media/dvb/dvb-usb/dib0700_devices.c +Auto-merging drivers/media/dvb/frontends/dib7000p.c +Auto-merging drivers/media/video/em28xx/em28xx-audio.c +Auto-merging drivers/media/video/gspca/mr97310a.c +Auto-merging drivers/media/video/gspca/ov519.c +Auto-merging drivers/media/video/s2255drv.c +Auto-merging drivers/media/video/saa7134/saa7134-cards.c +Auto-merging drivers/media/video/saa7134/saa7134.h +Auto-merging drivers/media/video/sh_mobile_ceu_camera.c +Auto-merging drivers/media/video/uvc/uvc_ctrl.c +Auto-merging drivers/media/video/uvc/uvc_video.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 81dbfc5] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/dvb/dvbapi.xml | 13 + + .../DocBook/dvb/{isdbt.xml => dvbproperty.xml} | 4 + + Documentation/DocBook/dvb/frontend.h.xml | 415 ++++++ + Documentation/DocBook/dvb/frontend.xml | 185 ++- + Documentation/DocBook/media-entities.tmpl | 3 +- + Documentation/video4linux/CARDLIST.em28xx | 2 +- + Documentation/video4linux/CARDLIST.saa7134 | 2 + + Documentation/video4linux/gspca.txt | 3 + + drivers/media/common/ir-functions.c | 3 +- + drivers/media/common/ir-keymaps.c | 96 ++ + drivers/media/common/saa7146_video.c | 16 +- + drivers/media/common/tuners/tda18271-common.c | 16 +- + drivers/media/common/tuners/tda18271-fe.c | 114 +- + drivers/media/common/tuners/tda18271-maps.c | 1 + + drivers/media/common/tuners/tda18271-priv.h | 47 +- + drivers/media/common/tuners/tda18271.h | 12 +- + drivers/media/common/tuners/tda8290.c | 1 + + drivers/media/common/tuners/tda9887.c | 2 +- + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/media/common/tuners/xc5000.c | 97 ++- + drivers/media/common/tuners/xc5000.h | 6 + + drivers/media/dvb/dvb-core/dvb_demux.c | 39 + + drivers/media/dvb/dvb-core/dvb_demux.h | 5 + + drivers/media/dvb/dvb-core/dvb_frontend.c | 179 +-- + drivers/media/dvb/dvb-core/dvbdev.h | 28 + + drivers/media/dvb/dvb-usb/af9015.c | 27 +- + drivers/media/dvb/dvb-usb/af9015.h | 215 ++- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 182 ++- + drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 1 + + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/dvb-usb/dvb-usb.h | 3 + + drivers/media/dvb/dvb-usb/friio-fe.c | 59 +- + drivers/media/dvb/frontends/au8522_decoder.c | 22 +- + drivers/media/dvb/frontends/au8522_priv.h | 2 + + drivers/media/dvb/frontends/dib7000p.c | 33 +- + drivers/media/dvb/frontends/dib7000p.h | 13 + + drivers/media/dvb/frontends/dib8000.c | 21 +- + drivers/media/dvb/frontends/dib8000.h | 14 + + drivers/media/dvb/frontends/stv0900_core.c | 58 +- + drivers/media/dvb/frontends/stv0900_priv.h | 2 +- + drivers/media/dvb/frontends/stv0900_sw.c | 31 +- + drivers/media/dvb/siano/sms-cards.c | 2 + + drivers/media/dvb/siano/smscoreapi.c | 2 +- + drivers/media/radio/Kconfig | 12 + + drivers/media/radio/Makefile | 1 + + drivers/media/radio/radio-mr800.c | 346 ++--- + drivers/media/radio/tef6862.c | 232 +++ + drivers/media/video/Kconfig | 31 +- + drivers/media/video/Makefile | 2 + + drivers/media/video/adv7180.c | 323 ++++- + drivers/media/video/au0828/au0828-video.c | 2 +- + drivers/media/video/bt819.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 4 +- + drivers/media/video/cx231xx/cx231xx-video.c | 2 +- + drivers/media/video/cx23885/Makefile | 1 + + drivers/media/video/cx23885/cx23885-417.c | 10 +- + drivers/media/video/cx23885/cx23885-cards.c | 94 ++- + drivers/media/video/cx23885/cx23885-core.c | 99 ++- + drivers/media/video/cx23885/cx23885-dvb.c | 44 +- + drivers/media/video/cx23885/cx23885-input.c | 418 ++++++ + drivers/media/video/cx23885/cx23885-input.h | 30 + + drivers/media/video/cx23885/cx23885-ioctl.c | 208 +++ + drivers/media/video/cx23885/cx23885-ioctl.h | 39 + + drivers/media/video/cx23885/cx23885-ir.c | 101 ++ + drivers/media/video/cx23885/cx23885-ir.h | 31 + + drivers/media/video/cx23885/cx23885-reg.h | 5 +- + drivers/media/video/cx23885/cx23885-video.c | 44 +- + drivers/media/video/cx23885/cx23885.h | 28 +- + drivers/media/video/cx23885/cx23888-ir.c | 1239 +++++++++++++++ + drivers/media/video/cx23885/cx23888-ir.h | 28 + + drivers/media/video/cx25840/cx25840-audio.c | 463 +++++-- + drivers/media/video/cx25840/cx25840-core.c | 324 +++- + drivers/media/video/cx25840/cx25840-core.h | 22 +- + drivers/media/video/cx25840/cx25840-firmware.c | 10 +- + drivers/media/video/cx88/cx88-cards.c | 2 +- + drivers/media/video/cx88/cx88-dvb.c | 4 +- + drivers/media/video/cx88/cx88-input.c | 24 + + drivers/media/video/cx88/cx88-video.c | 2 +- + drivers/media/video/davinci/dm355_ccdc.c | 4 +- + drivers/media/video/davinci/dm644x_ccdc.c | 4 +- + drivers/media/video/davinci/vpfe_capture.c | 2 +- + drivers/media/video/em28xx/em28xx-audio.c | 4 +- + drivers/media/video/em28xx/em28xx-cards.c | 20 +- + drivers/media/video/em28xx/em28xx-dvb.c | 24 +- + drivers/media/video/em28xx/em28xx-video.c | 2 +- + drivers/media/video/em28xx/em28xx.h | 1 - + drivers/media/video/gspca/Kconfig | 23 +- + drivers/media/video/gspca/Makefile | 4 + + drivers/media/video/gspca/gl860/gl860-mi1320.c | 55 +- + drivers/media/video/gspca/gl860/gl860-mi2020.c | 69 +- + drivers/media/video/gspca/gl860/gl860-ov2640.c | 140 +- + drivers/media/video/gspca/gl860/gl860-ov9655.c | 43 +- + drivers/media/video/gspca/gl860/gl860.c | 51 +- + drivers/media/video/gspca/gl860/gl860.h | 7 +- + drivers/media/video/gspca/gspca.c | 57 +- + drivers/media/video/gspca/gspca.h | 1 + + drivers/media/video/gspca/jeilinj.c | 27 +- + drivers/media/video/gspca/mr97310a.c | 591 +++++--- + drivers/media/video/gspca/ov519.c | 1455 ++++++++++++++++-- + drivers/media/video/gspca/pac207.c | 2 +- + drivers/media/video/gspca/pac7302.c | 962 ++++++++++++ + drivers/media/video/gspca/pac7311.c | 528 ++----- + drivers/media/video/gspca/pac_common.h | 91 +- + drivers/media/video/gspca/sonixj.c | 375 +++--- + drivers/media/video/gspca/sq905.c | 56 +- + drivers/media/video/gspca/sq905c.c | 23 +- + drivers/media/video/gspca/stv0680.c | 365 +++++ + drivers/media/video/gspca/w996Xcf.c | 610 ++++++++ + drivers/media/video/gspca/zc3xx.c | 642 +++------ + drivers/media/video/hexium_gemini.c | 2 +- + drivers/media/video/hexium_orion.c | 2 +- + drivers/media/video/ir-kbd-i2c.c | 10 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/mxb.c | 2 +- + drivers/media/video/ov9640.c | 801 ++++++++++ + drivers/media/video/ov9640.h | 209 +++ + drivers/media/video/pvrusb2/pvrusb2-debugifc.c | 3 + + drivers/media/video/pvrusb2/pvrusb2-encoder.c | 5 +- + drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h | 1 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 31 +- + drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 15 +- + drivers/media/video/pwc/pwc-if.c | 23 +- + drivers/media/video/rj54n1cb0c.c | 1219 +++++++++++++++ + drivers/media/video/s2255drv.c | 2 +- + drivers/media/video/saa7110.c | 2 +- + drivers/media/video/saa7134/saa7134-cards.c | 55 + + drivers/media/video/saa7134/saa7134-core.c | 6 +- + drivers/media/video/saa7134/saa7134-dvb.c | 66 +- + drivers/media/video/saa7134/saa7134-input.c | 40 +- + drivers/media/video/saa7134/saa7134-video.c | 2 +- + drivers/media/video/saa7134/saa7134.h | 3 +- + drivers/media/video/saa7164/saa7164-core.c | 4 +- + drivers/media/video/saa7164/saa7164-dvb.c | 1 + + drivers/media/video/saa717x.c | 2 +- + drivers/media/video/sh_mobile_ceu_camera.c | 83 +- + drivers/media/video/tuner-core.c | 20 +- + drivers/media/video/tvaudio.c | 2 +- + drivers/media/video/tvp514x.c | 2 +- + drivers/media/video/usbvision/usbvision-video.c | 2 +- + drivers/media/video/uvc/uvc_ctrl.c | 7 + + drivers/media/video/uvc/uvc_driver.c | 181 ++- + drivers/media/video/uvc/uvc_v4l2.c | 44 +- + drivers/media/video/uvc/uvc_video.c | 26 +- + drivers/media/video/uvc/uvcvideo.h | 9 +- + drivers/media/video/videobuf-core.c | 7 +- + drivers/media/video/videobuf-dma-sg.c | 4 +- + drivers/media/video/videobuf-dvb.c | 11 +- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/zoran/zoran_driver.c | 2 +- + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 15 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/hack.c | 252 ++++ + drivers/staging/tm6000/hack.h | 45 + + drivers/staging/tm6000/tm6000-alsa.c | 413 +++++ + drivers/staging/tm6000/tm6000-cards.c | 630 ++++++++ + drivers/staging/tm6000/tm6000-core.c | 511 +++++++ + drivers/staging/tm6000/tm6000-dvb.c | 322 ++++ + drivers/staging/tm6000/tm6000-i2c.c | 245 +++ + drivers/staging/tm6000/tm6000-regs.h | 86 ++ + drivers/staging/tm6000/tm6000-stds.c | 873 +++++++++++ + drivers/staging/tm6000/tm6000-usb-isoc.h | 53 + + drivers/staging/tm6000/tm6000-video.c | 1573 ++++++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 279 ++++ + include/linux/videodev2.h | 2 + + include/media/cx25840.h | 1 + + include/media/ir-common.h | 3 + + include/media/v4l2-chip-ident.h | 23 + + include/media/v4l2-subdev.h | 101 ++- + include/media/videobuf-dvb.h | 4 +- + 171 files changed, 17923 insertions(+), 2929 deletions(-) + rename Documentation/DocBook/dvb/{isdbt.xml => dvbproperty.xml} (99%) + create mode 100644 Documentation/DocBook/dvb/frontend.h.xml + create mode 100644 drivers/media/radio/tef6862.c + create mode 100644 drivers/media/video/cx23885/cx23885-input.c + create mode 100644 drivers/media/video/cx23885/cx23885-input.h + create mode 100644 drivers/media/video/cx23885/cx23885-ioctl.c + create mode 100644 drivers/media/video/cx23885/cx23885-ioctl.h + create mode 100644 drivers/media/video/cx23885/cx23885-ir.c + create mode 100644 drivers/media/video/cx23885/cx23885-ir.h + create mode 100644 drivers/media/video/cx23885/cx23888-ir.c + create mode 100644 drivers/media/video/cx23885/cx23888-ir.h + create mode 100644 drivers/media/video/gspca/pac7302.c + create mode 100644 drivers/media/video/gspca/stv0680.c + create mode 100644 drivers/media/video/gspca/w996Xcf.c + create mode 100644 drivers/media/video/ov9640.c + create mode 100644 drivers/media/video/ov9640.h + create mode 100644 drivers/media/video/rj54n1cb0c.c + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/hack.c + create mode 100644 drivers/staging/tm6000/hack.h + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging kbuild/master +$ git merge kbuild/master +Auto-merging Makefile +Auto-merging arch/powerpc/platforms/chrp/setup.c +Auto-merging arch/sh/Makefile +Removing arch/sh/include/asm/.gitignore +Auto-merging drivers/staging/panel/panel.c +Auto-merging kernel/trace/trace.c +Merge made by recursive. + .gitignore | 6 -- + Documentation/dontdiff | 1 + + Documentation/kbuild/kconfig.txt | 3 +- + Kbuild | 4 +- + Makefile | 80 +++++------------------ + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/include/asm/asm-offsets.h | 1 + + arch/arm/Makefile | 14 +---- + arch/arm/include/asm/asm-offsets.h | 1 + + arch/arm/include/asm/mach-types.h | 1 + + arch/arm/tools/Makefile | 2 +- + arch/arm/tools/gen-mach-types | 2 +- + arch/avr32/include/asm/asm-offsets.h | 1 + + arch/blackfin/include/asm/asm-offsets.h | 1 + + arch/cris/arch-v32/kernel/head.S | 1 - + arch/cris/include/asm/asm-offsets.h | 1 + + arch/cris/kernel/asm-offsets.c | 1 - + arch/cris/kernel/vmlinux.lds.S | 1 - + arch/frv/include/asm/asm-offsets.h | 1 + + arch/frv/kernel/setup.c | 2 +- + arch/h8300/include/asm/asm-offsets.h | 1 + + arch/ia64/Makefile | 2 +- + arch/ia64/include/asm/asm-offsets.h | 1 + + arch/ia64/include/asm/irq.h | 2 +- + arch/ia64/kernel/Makefile | 7 +-- + arch/ia64/kvm/asm-offsets.c | 1 - + arch/m68k/include/asm/asm-offsets.h | 1 + + arch/m68k/kernel/head.S | 2 +- + arch/microblaze/include/asm/asm-offsets.h | 1 + + arch/mips/include/asm/asm-offsets.h | 1 + + arch/mn10300/include/asm/asm-offsets.h | 1 + + arch/parisc/include/asm/asm-offsets.h | 1 + + arch/powerpc/include/asm/asm-offsets.h | 1 + + arch/powerpc/platforms/52xx/efika.c | 2 +- + arch/powerpc/platforms/amigaone/setup.c | 2 +- + arch/powerpc/platforms/cell/spufs/Makefile | 6 +- + arch/powerpc/platforms/chrp/setup.c | 2 +- + arch/powerpc/platforms/powermac/bootx_init.c | 2 +- + arch/s390/include/asm/asm-offsets.h | 1 + + arch/sh/Makefile | 10 +-- + arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- + arch/sh/include/asm/.gitignore | 1 - + arch/sh/include/asm/asm-offsets.h | 1 + + arch/sh/include/asm/machvec.h | 2 +- + arch/sh/tools/Makefile | 4 +- + arch/sh/tools/gen-mach-types | 2 +- + arch/sparc/include/asm/asm-offsets.h | 1 + + arch/um/Makefile | 2 +- + arch/um/include/asm/asm-offsets.h | 1 + + arch/x86/boot/header.S | 2 +- + arch/x86/boot/version.c | 4 +- + arch/x86/include/asm/asm-offsets.h | 1 + + arch/xtensa/include/asm/asm-offsets.h | 1 + + drivers/accessibility/braille/braille_console.c | 1 - + drivers/hid/hid-lg.h | 2 - + drivers/platform/x86/compal-laptop.c | 1 - + drivers/staging/iio/ring_sw.h | 1 - + drivers/staging/panel/panel.c | 2 +- + include/linux/mmdebug.h | 2 - + include/linux/mmzone.h | 2 +- + include/linux/page-flags.h | 2 +- + include/linux/vermagic.h | 2 +- + init/Makefile | 8 +-- + init/version.c | 4 +- + kernel/bounds.c | 2 +- + kernel/kexec.c | 2 +- + kernel/trace/trace.c | 2 +- + scripts/basic/fixdep.c | 10 ++-- + scripts/headers.sh | 2 - + scripts/kconfig/confdata.c | 2 +- + scripts/mkcompile_h | 2 +- + 73 files changed, 91 insertions(+), 159 deletions(-) + create mode 100644 arch/alpha/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/asm-offsets.h + create mode 100644 arch/arm/include/asm/mach-types.h + create mode 100644 arch/avr32/include/asm/asm-offsets.h + create mode 100644 arch/blackfin/include/asm/asm-offsets.h + create mode 100644 arch/cris/include/asm/asm-offsets.h + create mode 100644 arch/frv/include/asm/asm-offsets.h + create mode 100644 arch/h8300/include/asm/asm-offsets.h + create mode 100644 arch/ia64/include/asm/asm-offsets.h + create mode 100644 arch/m68k/include/asm/asm-offsets.h + create mode 100644 arch/microblaze/include/asm/asm-offsets.h + create mode 100644 arch/mips/include/asm/asm-offsets.h + create mode 100644 arch/mn10300/include/asm/asm-offsets.h + create mode 100644 arch/parisc/include/asm/asm-offsets.h + create mode 100644 arch/powerpc/include/asm/asm-offsets.h + create mode 100644 arch/s390/include/asm/asm-offsets.h + delete mode 100644 arch/sh/include/asm/.gitignore + create mode 100644 arch/sh/include/asm/asm-offsets.h + create mode 100644 arch/sparc/include/asm/asm-offsets.h + create mode 100644 arch/um/include/asm/asm-offsets.h + create mode 100644 arch/x86/include/asm/asm-offsets.h + create mode 100644 arch/xtensa/include/asm/asm-offsets.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Auto-merging Documentation/dontdiff +Removing scripts/binoffset.c +Merge made by recursive. + Documentation/dontdiff | 1 - + scripts/.gitignore | 1 - + scripts/binoffset.c | 163 ---------------------------------------------- + scripts/extract-ikconfig | 127 ++++++++++++----------------------- + 4 files changed, 44 insertions(+), 248 deletions(-) + delete mode 100644 scripts/binoffset.c +Merging ide/master +$ git merge ide/master +Merge made by recursive. + drivers/ide/Kconfig | 43 +++++++++---------------------------------- + drivers/ide/hpt366.c | 2 -- + drivers/ide/ide-tape.c | 21 +++++++++++++++------ + 3 files changed, 24 insertions(+), 42 deletions(-) +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/core/sa_query.c | 6 ++ + drivers/infiniband/core/ucma.c | 49 ++++++++++++ + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 25 +++--- + drivers/infiniband/ulp/iser/iser_memory.c | 122 +++++++++++++---------------- + drivers/net/mlx4/fw.c | 1 + + include/linux/mlx4/device.h | 1 + + include/rdma/ib_sa.h | 6 ++ + include/rdma/ib_user_sa.h | 16 ++++ + include/rdma/rdma_user_cm.h | 6 +- + 10 files changed, 152 insertions(+), 82 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/acpica/dswload.c | 50 +++++--- + drivers/acpi/acpica/evregion.c | 64 +++++++++- + drivers/acpi/acpica/nsrepair.c | 110 ++++++++++++---- + drivers/acpi/dock.c | 266 +++++++++++++------------------------- + drivers/acpi/processor_core.c | 6 +- + drivers/acpi/processor_perflib.c | 50 +++++++- + drivers/platform/x86/wmi.c | 175 +++++++++++++++++++++++++- + include/acpi/acpixf.h | 2 +- + include/acpi/processor.h | 5 +- + 9 files changed, 496 insertions(+), 232 deletions(-) +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/core-cdev.c +Auto-merging drivers/media/dvb/firewire/firedtv-avc.c +Merge made by recursive. + drivers/firewire/core-card.c | 75 +++--- + drivers/firewire/core-cdev.c | 113 +++++---- + drivers/firewire/core-topology.c | 17 +- + drivers/firewire/core-transaction.c | 19 +- + drivers/firewire/core.h | 9 +- + drivers/firewire/ohci.c | 39 ++-- + drivers/firewire/sbp2.c | 9 +- + drivers/media/dvb/firewire/Kconfig | 7 +- + drivers/media/dvb/firewire/Makefile | 1 + + drivers/media/dvb/firewire/firedtv-1394.c | 37 ++- + drivers/media/dvb/firewire/firedtv-avc.c | 50 ++-- + drivers/media/dvb/firewire/firedtv-dvb.c | 15 +- + drivers/media/dvb/firewire/firedtv-fw.c | 385 +++++++++++++++++++++++++++++ + drivers/media/dvb/firewire/firedtv-rc.c | 2 + + drivers/media/dvb/firewire/firedtv.h | 17 +- + include/linux/firewire.h | 17 +-- + 16 files changed, 628 insertions(+), 184 deletions(-) + create mode 100644 drivers/media/dvb/firewire/firedtv-fw.c +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/kapi.c | 40 ++++++++++++++++++++++++++++++++++++++++ + include/linux/mtd/ubi.h | 2 ++ + 2 files changed, 42 insertions(+), 0 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Resolved 'arch/powerpc/kvm/timing.h' using previous resolution. +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/timing.h +CONFLICT (content): Merge conflict in arch/powerpc/kvm/timing.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kvm/x86.c +Auto-merging virt/kvm/kvm_main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c250c95] Merge remote branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kvm/api.txt | 60 +++ + arch/Kconfig | 10 + + arch/ia64/include/asm/kvm.h | 1 + + arch/ia64/include/asm/kvm_host.h | 1 - + arch/ia64/kvm/Makefile | 2 +- + arch/ia64/kvm/kvm-ia64.c | 19 +- + arch/powerpc/kvm/powerpc.c | 5 +- + arch/powerpc/kvm/timing.h | 2 +- + arch/s390/kvm/kvm-s390.c | 5 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/kvm.h | 2 + + arch/x86/include/asm/kvm_host.h | 32 +- + arch/x86/include/asm/svm.h | 3 +- + arch/x86/include/asm/thread_info.h | 7 +- + arch/x86/include/asm/vmx.h | 4 + + arch/x86/kernel/process.c | 2 + + arch/x86/kernel/signal.c | 3 + + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/Makefile | 3 +- + arch/x86/kvm/emulate.c | 154 +++++- + arch/x86/kvm/i8254.c | 2 - + arch/x86/kvm/i8259.c | 44 +- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 1 - + arch/x86/kvm/svm.c | 309 +++++++----- + arch/x86/kvm/trace.h | 165 ++++++ + arch/x86/kvm/vmx.c | 391 +++++++------- + arch/x86/kvm/x86.c | 422 ++++++++++++---- + include/linux/kvm.h | 26 + + include/linux/kvm_host.h | 53 ++- + include/linux/user-return-notifier.h | 42 ++ + kernel/Makefile | 1 + + kernel/user-return-notifier.c | 46 ++ + virt/kvm/assigned-dev.c | 818 +++++++++++++++++++++++++++++ + virt/kvm/eventfd.c | 2 - + virt/kvm/ioapic.c | 80 +++- + virt/kvm/ioapic.h | 5 + + virt/kvm/irq_comm.c | 228 +++++---- + virt/kvm/kvm_main.c | 960 +++++---------------------------- + 41 files changed, 2489 insertions(+), 1434 deletions(-) + create mode 100644 include/linux/user-return-notifier.h + create mode 100644 kernel/user-return-notifier.c + create mode 100644 virt/kvm/assigned-dev.c +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/bfa/bfad_fwimg.c +Auto-merging drivers/scsi/bfa/bfad_im.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/scsi_transport_fc.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/scsi/scsi_host.h +Merge made by recursive. + Documentation/ABI/stable/sysfs-driver-qla2xxx | 8 + + Documentation/scsi/ChangeLog.megaraid_sas | 62 + + MAINTAINERS | 15 + + drivers/ata/libata-scsi.c | 7 +- + drivers/ata/sata_nv.c | 2 +- + drivers/md/dm-mpath.c | 8 +- + drivers/message/fusion/mptbase.h | 4 +- + drivers/message/fusion/mptctl.c | 5 +- + drivers/message/fusion/mptscsih.c | 95 +- + drivers/message/fusion/mptscsih.h | 3 +- + drivers/s390/scsi/zfcp_scsi.c | 17 +- + drivers/scsi/3w-9xxx.c | 6 +- + drivers/scsi/3w-sas.c | 1924 +++++++++++ + drivers/scsi/3w-sas.h | 396 +++ + drivers/scsi/3w-xxxx.c | 8 +- + drivers/scsi/53c700.c | 7 +- + drivers/scsi/Kconfig | 29 +- + drivers/scsi/Makefile | 3 + + drivers/scsi/aacraid/linit.c | 6 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 5 +- + drivers/scsi/be2iscsi/be.h | 24 +- + drivers/scsi/be2iscsi/be_cmds.c | 263 ++- + drivers/scsi/be2iscsi/be_cmds.h | 37 +- + drivers/scsi/be2iscsi/be_iscsi.c | 23 +- + drivers/scsi/be2iscsi/be_main.c | 1017 +++++-- + drivers/scsi/be2iscsi/be_main.h | 49 +- + drivers/scsi/be2iscsi/be_mgmt.c | 69 +- + drivers/scsi/be2iscsi/be_mgmt.h | 8 +- + drivers/scsi/bfa/bfa_cb_ioim_macros.h | 10 +- + drivers/scsi/bfa/bfa_cee.c | 2 +- + drivers/scsi/bfa/bfa_csdebug.c | 4 +- + drivers/scsi/bfa/bfa_fcpim.c | 4 +- + drivers/scsi/bfa/bfa_fcpim_priv.h | 4 +- + drivers/scsi/bfa/bfa_fcport.c | 59 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 11 +- + drivers/scsi/bfa/bfa_fcxp.c | 8 +- + drivers/scsi/bfa/bfa_intr.c | 2 +- + drivers/scsi/bfa/bfa_intr_priv.h | 18 +- + drivers/scsi/bfa/bfa_ioc.c | 10 +- + drivers/scsi/bfa/bfa_ioc.h | 12 +- + drivers/scsi/bfa/bfa_iocfc.c | 8 +- + drivers/scsi/bfa/bfa_iocfc.h | 8 +- + drivers/scsi/bfa/bfa_ioim.c | 4 +- + drivers/scsi/bfa/bfa_itnim.c | 6 +- + drivers/scsi/bfa/bfa_log.c | 4 +- + drivers/scsi/bfa/bfa_port_priv.h | 4 +- + drivers/scsi/bfa/bfa_rport.c | 6 +- + drivers/scsi/bfa/bfa_tskim.c | 9 +- + drivers/scsi/bfa/bfa_uf.c | 2 +- + drivers/scsi/bfa/bfad.c | 6 +- + drivers/scsi/bfa/bfad_fwimg.c | 8 +- + drivers/scsi/bfa/bfad_im.c | 2 +- + drivers/scsi/bfa/bfad_im_compat.h | 2 +- + drivers/scsi/bfa/bfad_intr.c | 3 +- + drivers/scsi/bfa/fabric.c | 18 +- + drivers/scsi/bfa/fcbuild.c | 190 +- + drivers/scsi/bfa/fcbuild.h | 6 +- + drivers/scsi/bfa/fcpim.c | 7 +- + drivers/scsi/bfa/fcs.h | 2 +- + drivers/scsi/bfa/fdmi.c | 8 +- + drivers/scsi/bfa/include/aen/bfa_aen.h | 2 +- + drivers/scsi/bfa/include/bfa.h | 10 +- + drivers/scsi/bfa/include/bfa_svc.h | 8 +- + drivers/scsi/bfa/include/bfi/bfi.h | 12 +- + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi_lps.h | 4 +- + drivers/scsi/bfa/include/bfi/bfi_rport.h | 8 +- + drivers/scsi/bfa/include/cs/bfa_checksum.h | 6 +- + drivers/scsi/bfa/include/cs/bfa_sm.h | 6 +- + drivers/scsi/bfa/include/cs/bfa_trc.h | 2 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_fabric.h | 2 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 17 +- + drivers/scsi/bfa/include/protocol/ct.h | 10 +- + drivers/scsi/bfa/include/protocol/fc.h | 22 +- + drivers/scsi/bfa/loop.c | 233 +-- + drivers/scsi/bfa/lport_api.c | 15 +- + drivers/scsi/bfa/ns.c | 5 +- + drivers/scsi/bfa/plog.c | 2 +- + drivers/scsi/bfa/rport_ftrs.c | 28 +- + drivers/scsi/bfa/vfapi.c | 2 +- + drivers/scsi/bfa/vport.c | 20 +- + drivers/scsi/constants.c | 1 + + drivers/scsi/device_handler/scsi_dh.c | 17 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 139 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 7 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 94 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 115 +- + drivers/scsi/fcoe/fcoe.c | 1119 +++++-- + drivers/scsi/fcoe/fcoe.h | 82 +- + drivers/scsi/fcoe/libfcoe.c | 413 ++-- + drivers/scsi/fnic/fnic.h | 25 +- + drivers/scsi/fnic/fnic_fcs.c | 499 ++-- + drivers/scsi/fnic/fnic_isr.c | 18 +- + drivers/scsi/fnic/fnic_main.c | 104 +- + drivers/scsi/fnic/fnic_res.c | 5 +- + drivers/scsi/fnic/fnic_res.h | 54 +- + drivers/scsi/fnic/fnic_scsi.c | 96 +- + drivers/scsi/fnic/vnic_scsi.h | 1 + + drivers/scsi/hptiop.c | 5 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 335 ++- + drivers/scsi/ibmvscsi/ibmvfc.h | 12 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 7 +- + drivers/scsi/ipr.c | 7 +- + drivers/scsi/libfc/Makefile | 4 +- + drivers/scsi/libfc/fc_disc.c | 85 +- + drivers/scsi/libfc/fc_elsct.c | 79 +- + drivers/scsi/libfc/fc_exch.c | 932 ++++-- + drivers/scsi/libfc/fc_fcp.c | 1044 ++++--- + drivers/scsi/libfc/fc_frame.c | 13 +- + drivers/scsi/libfc/fc_libfc.c | 134 + + drivers/scsi/libfc/fc_libfc.h | 112 + + drivers/scsi/libfc/fc_lport.c | 854 ++++-- + drivers/scsi/libfc/fc_npiv.c | 161 + + drivers/scsi/libfc/fc_rport.c | 333 ++- + drivers/scsi/libiscsi.c | 5 +- + drivers/scsi/libsas/sas_scsi_host.c | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 30 +- + drivers/scsi/megaraid/megaraid_mbox.c | 7 +- + drivers/scsi/megaraid/megaraid_sas.c | 738 ++++- + drivers/scsi/megaraid/megaraid_sas.h | 149 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 5 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 274 ++- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 18 +- + drivers/scsi/mpt2sas/mpi/mpi2_raid.h | 14 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 16 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 152 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 37 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 197 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 4 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 819 ++++-- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 86 +- + drivers/scsi/pm8001/Makefile | 12 + + drivers/scsi/pm8001/pm8001_chips.h | 89 + + drivers/scsi/pm8001/pm8001_ctl.c | 573 ++++ + drivers/scsi/pm8001/pm8001_ctl.h | 67 + + drivers/scsi/pm8001/pm8001_defs.h | 112 + + drivers/scsi/pm8001/pm8001_hwi.c | 4371 +++++++++++++++++++++++++ + drivers/scsi/pm8001/pm8001_hwi.h | 1011 ++++++ + drivers/scsi/pm8001/pm8001_init.c | 888 +++++ + drivers/scsi/pm8001/pm8001_sas.c | 1104 +++++++ + drivers/scsi/pm8001/pm8001_sas.h | 480 +++ + drivers/scsi/pmcraid.c | 7 +- + drivers/scsi/qla2xxx/qla_dbg.c | 78 +- + drivers/scsi/qla2xxx/qla_def.h | 9 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_init.c | 12 +- + drivers/scsi/qla2xxx/qla_isr.c | 144 +- + drivers/scsi/qla2xxx/qla_mbx.c | 50 +- + drivers/scsi/qla2xxx/qla_mid.c | 2 - + drivers/scsi/qla2xxx/qla_os.c | 67 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qlogicpti.h | 2 +- + drivers/scsi/scsi.c | 10 +- + drivers/scsi/scsi_debug.c | 351 ++- + drivers/scsi/scsi_error.c | 65 +- + drivers/scsi/scsi_lib.c | 11 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_sysfs.c | 44 +- + drivers/scsi/scsi_transport_fc.c | 98 +- + drivers/scsi/stex.c | 282 ++- + drivers/scsi/vmw_pvscsi.c | 1407 ++++++++ + drivers/scsi/vmw_pvscsi.h | 397 +++ + include/linux/libata.h | 2 +- + include/linux/pci_ids.h | 2 + + include/scsi/Kbuild | 1 + + include/scsi/fc/Kbuild | 4 + + include/scsi/fc/fc_els.h | 6 +- + include/scsi/fc/fc_fcp.h | 6 + + include/scsi/fc/fc_fs.h | 2 + + include/scsi/fc/fc_gs.h | 2 + + include/scsi/fc/fc_ns.h | 35 +- + include/scsi/fc_encode.h | 68 +- + include/scsi/fc_frame.h | 22 +- + include/scsi/libfc.h | 1148 ++++---- + include/scsi/libfcoe.h | 92 +- + include/scsi/libiscsi.h | 3 +- + include/scsi/libsas.h | 3 +- + include/scsi/scsi.h | 4 + + include/scsi/scsi_device.h | 12 +- + include/scsi/scsi_dh.h | 6 +- + include/scsi/scsi_host.h | 8 +- + include/scsi/scsi_transport_fc.h | 1 + + 182 files changed, 22808 insertions(+), 4800 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-qla2xxx + create mode 100644 drivers/scsi/3w-sas.c + create mode 100644 drivers/scsi/3w-sas.h + create mode 100644 drivers/scsi/libfc/fc_libfc.c + create mode 100644 drivers/scsi/libfc/fc_libfc.h + create mode 100644 drivers/scsi/libfc/fc_npiv.c + create mode 100644 drivers/scsi/pm8001/Makefile + create mode 100644 drivers/scsi/pm8001/pm8001_chips.h + create mode 100644 drivers/scsi/pm8001/pm8001_ctl.c + create mode 100644 drivers/scsi/pm8001/pm8001_ctl.h + create mode 100644 drivers/scsi/pm8001/pm8001_defs.h + create mode 100644 drivers/scsi/pm8001/pm8001_hwi.c + create mode 100644 drivers/scsi/pm8001/pm8001_hwi.h + create mode 100644 drivers/scsi/pm8001/pm8001_init.c + create mode 100644 drivers/scsi/pm8001/pm8001_sas.c + create mode 100644 drivers/scsi/pm8001/pm8001_sas.h + create mode 100644 drivers/scsi/vmw_pvscsi.c + create mode 100644 drivers/scsi/vmw_pvscsi.h + create mode 100644 include/scsi/fc/Kbuild +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Resolved 'drivers/net/wireless/libertas/cmd.c' using previous resolution. +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Resolved 'drivers/staging/rtl8187se/Kconfig' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/blackfin/mach-common/entry.S +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/bonding/bond_sysfs.c +Auto-merging drivers/net/e100.c +Auto-merging drivers/net/ethoc.c +Auto-merging drivers/net/hamachi.c +Auto-merging drivers/net/hamradio/baycom_epp.c +Auto-merging drivers/net/igb/igb_ethtool.c +Removing drivers/net/sfc/boards.c +Removing drivers/net/sfc/boards.h +Removing drivers/net/sfc/falcon_hwdefs.h +Removing drivers/net/sfc/falcon_io.h +Removing drivers/net/sfc/gmii.h +CONFLICT (delete/modify): drivers/net/sfc/sfe4001.c deleted in net/master and modified in HEAD. Version HEAD of drivers/net/sfc/sfe4001.c left in tree. +Auto-merging drivers/net/skge.c +Auto-merging drivers/net/slip.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/wan/cosa.c +Auto-merging drivers/net/wireless/b43/pio.c +Auto-merging drivers/net/wireless/b43legacy/main.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-hcmd.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/iwmc3200wifi/cfg80211.c +Auto-merging drivers/net/wireless/iwmc3200wifi/commands.c +Auto-merging drivers/net/wireless/iwmc3200wifi/main.c +Auto-merging drivers/net/wireless/iwmc3200wifi/rx.c +Removing drivers/net/wireless/libertas/11d.c +Removing drivers/net/wireless/libertas/11d.h +Auto-merging drivers/net/wireless/libertas/cmd.c +CONFLICT (content): Merge conflict in drivers/net/wireless/libertas/cmd.c +Removing drivers/net/wireless/libertas/hostcmd.h +Auto-merging drivers/net/wireless/libertas/tx.c +Removing drivers/net/wireless/wl12xx/wl1251_netlink.h +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/rtl8187se/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/rtl8187se/Kconfig +Auto-merging drivers/staging/rtl8192e/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/rtl8192e/Kconfig +Removing firmware/bnx2x-e1-5.0.21.0.fw.ihex +Removing firmware/bnx2x-e1h-5.0.21.0.fw.ihex +Auto-merging fs/compat_ioctl.c +Auto-merging net/sunrpc/svcauth_unix.c +Auto-merging net/wireless/core.c +Removing net/wireless/wext.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/sfc/sfe4001.c +drivers/net/sfc/sfe4001.c: needs merge +drivers/net/wireless/libertas/cmd.c: needs merge +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/rtl8187se/Kconfig: needs merge +drivers/staging/rtl8192e/Kconfig: needs merge +rm 'drivers/net/sfc/sfe4001.c' +$ git commit -v -a +Recorded resolution for 'drivers/staging/rtl8192e/Kconfig'. +[master 3809f92] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/isdn/README.gigaset | 34 +- + Documentation/kernel-parameters.txt | 3 + + Documentation/networking/bonding.txt | 42 +- + Documentation/networking/ip-sysctl.txt | 18 + + MAINTAINERS | 1 - + arch/alpha/include/asm/socket.h | 2 + + arch/alpha/kernel/systbls.S | 1 + + arch/arm/include/asm/socket.h | 2 + + arch/arm/kernel/calls.S | 1 + + arch/avr32/include/asm/socket.h | 2 + + arch/avr32/kernel/syscall_table.S | 1 + + arch/blackfin/mach-common/entry.S | 1 + + arch/cris/include/asm/socket.h | 2 + + arch/frv/include/asm/socket.h | 2 + + arch/h8300/include/asm/socket.h | 2 + + arch/ia64/include/asm/socket.h | 2 + + arch/ia64/include/asm/unistd.h | 3 +- + arch/ia64/kernel/entry.S | 1 + + arch/m32r/include/asm/socket.h | 2 + + arch/m68k/include/asm/socket.h | 2 + + arch/microblaze/kernel/syscall_table.S | 1 + + arch/mips/include/asm/socket.h | 2 + + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mn10300/include/asm/socket.h | 2 + + arch/parisc/include/asm/socket.h | 2 + + arch/powerpc/include/asm/socket.h | 2 + + arch/s390/appldata/appldata_net_sum.c | 8 +- + arch/s390/include/asm/socket.h | 2 + + arch/sh/include/asm/sh_eth.h | 1 + + arch/sh/kernel/syscalls_64.S | 1 + + arch/sparc/include/asm/socket.h | 2 + + arch/sparc/include/asm/unistd.h | 3 +- + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/x86/ia32/ia32entry.S | 1 + + arch/x86/include/asm/unistd_32.h | 3 +- + arch/x86/include/asm/unistd_64.h | 2 + + arch/x86/kernel/syscall_table_32.S | 1 + + arch/xtensa/include/asm/socket.h | 2 + + arch/xtensa/include/asm/unistd.h | 4 +- + drivers/atm/ambassador.c | 1 + + drivers/atm/fore200e.c | 4 +- + drivers/atm/he.c | 2 +- + drivers/atm/solos-pci.c | 3 + + drivers/ieee802154/fakehard.c | 59 +- + drivers/infiniband/hw/nes/nes_nic.c | 12 +- + drivers/isdn/gigaset/Kconfig | 25 +- + drivers/isdn/gigaset/Makefile | 5 +- + drivers/isdn/gigaset/asyncdata.c | 662 +- + drivers/isdn/gigaset/bas-gigaset.c | 72 +- + drivers/isdn/gigaset/capi.c | 2292 ++++ + drivers/isdn/gigaset/common.c | 137 +- + drivers/isdn/gigaset/dummyll.c | 68 + + drivers/isdn/gigaset/ev-layer.c | 578 +- + drivers/isdn/gigaset/gigaset.h | 176 +- + drivers/isdn/gigaset/i4l.c | 563 +- + drivers/isdn/gigaset/interface.c | 39 +- + drivers/isdn/gigaset/isocdata.c | 186 +- + drivers/isdn/gigaset/proc.c | 2 +- + drivers/isdn/gigaset/ser-gigaset.c | 56 +- + drivers/isdn/gigaset/usb-gigaset.c | 69 +- + drivers/isdn/hardware/mISDN/speedfax.c | 1 + + drivers/isdn/mISDN/socket.c | 5 +- + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 1 + + drivers/misc/iwmc3200top/Kconfig | 20 + + drivers/misc/iwmc3200top/Makefile | 29 + + drivers/misc/iwmc3200top/debugfs.c | 133 + + drivers/misc/iwmc3200top/debugfs.h | 58 + + drivers/misc/iwmc3200top/fw-download.c | 359 + + drivers/misc/iwmc3200top/fw-msg.h | 113 + + drivers/misc/iwmc3200top/iwmc3200top.h | 206 + + drivers/misc/iwmc3200top/log.c | 347 + + drivers/misc/iwmc3200top/log.h | 158 + + drivers/misc/iwmc3200top/main.c | 699 ++ + drivers/net/3c59x.c | 3 +- + drivers/net/8139cp.c | 8 +- + drivers/net/8139too.c | 3 +- + drivers/net/Kconfig | 2 +- + drivers/net/arm/ks8695net.c | 142 +- + drivers/net/atl1c/atl1c.h | 22 +- + drivers/net/atl1c/atl1c_main.c | 86 +- + drivers/net/atl1e/atl1e_main.c | 4 +- + drivers/net/atlx/atl1.c | 11 +- + drivers/net/atlx/atl2.c | 3 +- + drivers/net/bcm63xx_enet.c | 5 +- + drivers/net/benet/be.h | 16 +- + drivers/net/benet/be_cmds.c | 96 +- + drivers/net/benet/be_cmds.h | 82 +- + drivers/net/benet/be_ethtool.c | 79 +- + drivers/net/benet/be_main.c | 17 +- + drivers/net/bnx2.c | 4 + + drivers/net/bnx2x.h | 74 +- + drivers/net/bnx2x_hsi.h | 21 +- + drivers/net/bnx2x_link.c | 317 +- + drivers/net/bnx2x_link.h | 3 +- + drivers/net/bnx2x_main.c | 1077 ++- + drivers/net/bnx2x_reg.h | 23 +- + drivers/net/bonding/bond_3ad.c | 14 +- + drivers/net/bonding/bond_alb.c | 3 - + drivers/net/bonding/bond_ipv6.c | 7 +- + drivers/net/bonding/bond_main.c | 326 +- + drivers/net/bonding/bond_sysfs.c | 92 +- + drivers/net/bonding/bonding.h | 31 +- + drivers/net/can/Kconfig | 13 + + drivers/net/can/Makefile | 2 + + drivers/net/can/at91_can.c | 34 +- + drivers/net/can/dev.c | 76 +- + drivers/net/can/mcp251x.c | 1164 ++ + drivers/net/can/sja1000/sja1000.c | 17 +- + drivers/net/can/sja1000/sja1000.h | 2 + + drivers/net/can/ti_hecc.c | 993 ++ + drivers/net/can/usb/ems_usb.c | 20 +- + drivers/net/cnic.c | 1820 +++- + drivers/net/cnic.h | 64 + + drivers/net/cnic_defs.h | 1917 +++ + drivers/net/cnic_if.h | 14 +- + drivers/net/cpmac.c | 6 +- + drivers/net/cxgb3/adapter.h | 16 + + drivers/net/cxgb3/common.h | 8 +- + drivers/net/cxgb3/cxgb3_main.c | 47 +- + drivers/net/cxgb3/sge.c | 31 +- + drivers/net/davinci_emac.c | 56 +- + drivers/net/dl2k.c | 18 +- + drivers/net/dm9000.c | 143 +- + drivers/net/dm9000.h | 7 + + drivers/net/e100.c | 25 +- + drivers/net/e1000/e1000.h | 1 - + drivers/net/e1000/e1000_ethtool.c | 35 +- + drivers/net/e1000/e1000_main.c | 70 +- + drivers/net/e1000e/e1000.h | 1 - + drivers/net/e1000e/ethtool.c | 53 +- + drivers/net/e1000e/netdev.c | 80 +- + drivers/net/ehea/ehea_main.c | 9 +- + drivers/net/enic/enic_main.c | 15 +- + drivers/net/ethoc.c | 4 +- + drivers/net/fsl_pq_mdio.c | 67 +- + drivers/net/fsl_pq_mdio.h | 11 +- + drivers/net/gianfar.c | 1826 ++- + drivers/net/gianfar.h | 412 +- + drivers/net/gianfar_ethtool.c | 376 +- + drivers/net/gianfar_sysfs.c | 77 +- + drivers/net/hamachi.c | 12 +- + drivers/net/hamradio/6pack.c | 21 + + drivers/net/hamradio/baycom_epp.c | 6 +- + drivers/net/hamradio/mkiss.c | 21 + + drivers/net/ibm_newemac/core.c | 10 +- + drivers/net/ifb.c | 6 +- + drivers/net/igb/e1000_82575.c | 306 +- + drivers/net/igb/e1000_82575.h | 26 + + drivers/net/igb/e1000_defines.h | 33 + + drivers/net/igb/e1000_hw.h | 8 +- + drivers/net/igb/e1000_mac.c | 100 +- + drivers/net/igb/e1000_mbx.c | 82 +- + drivers/net/igb/e1000_mbx.h | 10 +- + drivers/net/igb/e1000_nvm.c | 36 +- + drivers/net/igb/e1000_phy.c | 207 +- + drivers/net/igb/e1000_phy.h | 4 +- + drivers/net/igb/e1000_regs.h | 75 +- + drivers/net/igb/igb.h | 130 +- + drivers/net/igb/igb_ethtool.c | 581 +- + drivers/net/igb/igb_main.c | 3214 +++--- + drivers/net/igbvf/ethtool.c | 25 +- + drivers/net/igbvf/netdev.c | 8 +- + drivers/net/ipg.c | 7 +- + drivers/net/ixgb/ixgb.h | 1 - + drivers/net/ixgb/ixgb_ethtool.c | 69 +- + drivers/net/ixgb/ixgb_main.c | 56 +- + drivers/net/ixgbe/ixgbe.h | 4 +- + drivers/net/ixgbe/ixgbe_82599.c | 178 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 2 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 63 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 46 + + drivers/net/ixgbe/ixgbe_main.c | 43 +- + drivers/net/ixgbe/ixgbe_type.h | 26 + + drivers/net/ixp2000/ixpdev.c | 3 +- + drivers/net/korina.c | 5 +- + drivers/net/ks8842.c | 5 +- + drivers/net/lib82596.c | 11 +- + drivers/net/macvlan.c | 10 +- + drivers/net/mdio.c | 12 +- + drivers/net/myri10ge/myri10ge.c | 9 +- + drivers/net/netx-eth.c | 3 + + drivers/net/netxen/netxen_nic.h | 78 +- + drivers/net/netxen/netxen_nic_ethtool.c | 6 +- + drivers/net/netxen/netxen_nic_hdr.h | 76 +- + drivers/net/netxen/netxen_nic_hw.c | 916 +- + drivers/net/netxen/netxen_nic_init.c | 361 +- + drivers/net/netxen/netxen_nic_main.c | 314 +- + drivers/net/niu.c | 13 +- + drivers/net/pasemi_mac_ethtool.c | 14 + + drivers/net/pcmcia/pcnet_cs.c | 7 + + drivers/net/phy/broadcom.c | 208 +- + drivers/net/ppp_async.c | 5 +- + drivers/net/ppp_synctty.c | 5 +- + drivers/net/pppoe.c | 19 +- + drivers/net/pppol2tp.c | 22 +- + drivers/net/pppox.c | 5 +- + drivers/net/qlge/qlge.h | 229 +- + drivers/net/qlge/qlge_dbg.c | 180 + + drivers/net/qlge/qlge_ethtool.c | 290 + + drivers/net/qlge/qlge_main.c | 483 +- + drivers/net/qlge/qlge_mpi.c | 210 +- + drivers/net/r8169.c | 3 +- + drivers/net/sb1250-mac.c | 1 - + drivers/net/sc92031.c | 4 +- + drivers/net/sfc/Makefile | 4 +- + drivers/net/sfc/bitfield.h | 13 - + drivers/net/sfc/boards.c | 328 - + drivers/net/sfc/boards.h | 28 - + drivers/net/sfc/efx.c | 89 +- + drivers/net/sfc/efx.h | 11 +- + drivers/net/sfc/ethtool.c | 8 +- + drivers/net/sfc/falcon.c | 1123 +- + drivers/net/sfc/falcon.h | 4 +- + drivers/net/sfc/falcon_boards.c | 752 ++ + drivers/net/sfc/falcon_gmac.c | 95 +- + drivers/net/sfc/falcon_hwdefs.h | 1333 -- + drivers/net/sfc/falcon_io.h | 258 - + drivers/net/sfc/falcon_xmac.c | 178 +- + drivers/net/sfc/gmii.h | 60 - + drivers/net/sfc/io.h | 256 + + drivers/net/sfc/mdio_10g.c | 121 +- + drivers/net/sfc/mdio_10g.h | 1 - + drivers/net/sfc/net_driver.h | 56 +- + drivers/net/sfc/phy.h | 6 +- + drivers/net/sfc/{xfp_phy.c => qt202x_phy.c} | 80 +- + drivers/net/sfc/regs.h | 3180 +++++ + drivers/net/sfc/rx.c | 31 +- + drivers/net/sfc/selftest.c | 5 +- + drivers/net/sfc/sfe4001.c | 435 - + drivers/net/sfc/tenxpress.c | 14 +- + drivers/net/sfc/tx.c | 83 +- + drivers/net/sfc/workarounds.h | 2 + + drivers/net/sgiseeq.c | 7 +- + drivers/net/sh_eth.c | 54 +- + drivers/net/sh_eth.h | 1 + + drivers/net/sis190.c | 3 +- + drivers/net/skge.c | 7 +- + drivers/net/sky2.c | 129 +- + drivers/net/sky2.h | 185 +- + drivers/net/slip.c | 25 + + drivers/net/smsc911x.c | 3 + + drivers/net/spider_net.c | 1 + + drivers/net/sungem.c | 4 +- + drivers/net/tc35815.c | 290 +- + drivers/net/tehuti.c | 29 +- + drivers/net/tehuti.h | 2 - + drivers/net/tg3.c | 205 +- + drivers/net/tg3.h | 39 +- + drivers/net/tlan.c | 7 +- + drivers/net/tokenring/tms380tr.c | 2 + + drivers/net/tsi108_eth.c | 10 +- + drivers/net/tun.c | 58 +- + drivers/net/usb/asix.c | 12 +- + drivers/net/usb/cdc_ether.c | 38 +- + drivers/net/usb/dm9601.c | 2 +- + drivers/net/usb/kaweth.c | 11 +- + drivers/net/usb/usbnet.c | 21 +- + drivers/net/veth.c | 21 +- + drivers/net/via-rhine.c | 8 +- + drivers/net/via-velocity.c | 42 +- + drivers/net/via-velocity.h | 2 - + drivers/net/virtio_net.c | 7 +- + drivers/net/vmxnet3/vmxnet3_int.h | 5 - + drivers/net/vxge/vxge-config.c | 300 +- + drivers/net/vxge/vxge-config.h | 2 + + drivers/net/vxge/vxge-main.c | 109 +- + drivers/net/vxge/vxge-main.h | 1 - + drivers/net/vxge/vxge-reg.h | 4 - + drivers/net/vxge/vxge-traffic.c | 4 +- + drivers/net/vxge/vxge-traffic.h | 2 + + drivers/net/vxge/vxge-version.h | 4 +- + drivers/net/wan/cosa.c | 20 +- + drivers/net/wan/x25_asy.c | 19 + + drivers/net/wimax/i2400m/Kconfig | 8 + + drivers/net/wimax/i2400m/control.c | 16 +- + drivers/net/wimax/i2400m/debugfs.c | 2 +- + drivers/net/wimax/i2400m/driver.c | 500 +- + drivers/net/wimax/i2400m/fw.c | 886 ++- + drivers/net/wimax/i2400m/i2400m-sdio.h | 16 +- + drivers/net/wimax/i2400m/i2400m-usb.h | 16 +- + drivers/net/wimax/i2400m/i2400m.h | 209 +- + drivers/net/wimax/i2400m/netdev.c | 127 +- + drivers/net/wimax/i2400m/rx.c | 170 +- + drivers/net/wimax/i2400m/sdio-fw.c | 11 +- + drivers/net/wimax/i2400m/sdio-rx.c | 42 +- + drivers/net/wimax/i2400m/sdio-tx.c | 5 +- + drivers/net/wimax/i2400m/sdio.c | 205 +- + drivers/net/wimax/i2400m/tx.c | 20 +- + drivers/net/wimax/i2400m/usb-fw.c | 37 +- + drivers/net/wimax/i2400m/usb-notif.c | 35 +- + drivers/net/wimax/i2400m/usb-rx.c | 60 +- + drivers/net/wimax/i2400m/usb-tx.c | 61 +- + drivers/net/wimax/i2400m/usb.c | 189 +- + drivers/net/wireless/Kconfig | 212 +- + drivers/net/wireless/Makefile | 10 - + drivers/net/wireless/airo.c | 3 +- + drivers/net/wireless/at76c50x-usb.c | 10 + + drivers/net/wireless/ath/Kconfig | 9 +- + drivers/net/wireless/ath/Makefile | 9 +- + drivers/net/wireless/ath/ar9170/Kconfig | 2 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 6 +- + drivers/net/wireless/ath/ar9170/cmd.c | 3 +- + drivers/net/wireless/ath/ar9170/cmd.h | 1 + + drivers/net/wireless/ath/ar9170/hw.h | 6 +- + drivers/net/wireless/ath/ar9170/mac.c | 15 +- + drivers/net/wireless/ath/ar9170/main.c | 41 +- + drivers/net/wireless/ath/ar9170/phy.c | 99 +- + drivers/net/wireless/ath/ar9170/usb.c | 12 +- + drivers/net/wireless/ath/ar9170/usb.h | 2 +- + drivers/net/wireless/ath/ath.h | 41 + + drivers/net/wireless/ath/ath5k/Kconfig | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 53 +- + drivers/net/wireless/ath/ath5k/attach.c | 33 +- + drivers/net/wireless/ath/ath5k/base.c | 116 +- + drivers/net/wireless/ath/ath5k/base.h | 12 - + drivers/net/wireless/ath/ath5k/initvals.c | 4 +- + drivers/net/wireless/ath/ath5k/led.c | 2 + + drivers/net/wireless/ath/ath5k/pcu.c | 193 +- + drivers/net/wireless/ath/ath5k/phy.c | 185 +- + drivers/net/wireless/ath/ath5k/reg.h | 19 +- + drivers/net/wireless/ath/ath5k/reset.c | 33 +- + drivers/net/wireless/ath/ath9k/Kconfig | 10 +- + drivers/net/wireless/ath/ath9k/Makefile | 27 +- + drivers/net/wireless/ath/ath9k/ahb.c | 29 +- + drivers/net/wireless/ath/ath9k/ani.c | 141 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 73 +- + drivers/net/wireless/ath/ath9k/beacon.c | 112 +- + drivers/net/wireless/ath/ath9k/btcoex.c | 383 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 64 +- + drivers/net/wireless/ath/ath9k/calib.c | 421 +- + drivers/net/wireless/ath/ath9k/calib.h | 2 + + drivers/net/wireless/ath/ath9k/debug.c | 55 +- + drivers/net/wireless/ath/ath9k/debug.h | 36 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 8 +- + drivers/net/wireless/ath/ath9k/eeprom.h | 9 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 94 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 97 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 183 +- + drivers/net/wireless/ath/ath9k/hw.c | 1244 +-- + drivers/net/wireless/ath/ath9k/hw.h | 85 +- + drivers/net/wireless/ath/ath9k/initvals.h | 101 +- + drivers/net/wireless/ath/ath9k/mac.c | 162 +- + drivers/net/wireless/ath/ath9k/mac.h | 11 +- + drivers/net/wireless/ath/ath9k/main.c | 899 +- + drivers/net/wireless/ath/ath9k/pci.c | 47 +- + drivers/net/wireless/ath/ath9k/phy.c | 1124 ++- + drivers/net/wireless/ath/ath9k/phy.h | 41 +- + drivers/net/wireless/ath/ath9k/rc.c | 33 +- + drivers/net/wireless/ath/ath9k/recv.c | 65 +- + drivers/net/wireless/ath/ath9k/reg.h | 8 +- + drivers/net/wireless/ath/ath9k/virtual.c | 22 +- + drivers/net/wireless/ath/ath9k/xmit.c | 118 +- + drivers/net/wireless/ath/debug.c | 32 + + drivers/net/wireless/ath/debug.h | 77 + + drivers/net/wireless/ath/hw.c | 126 + + drivers/net/wireless/ath/reg.h | 27 + + drivers/net/wireless/ath/regd.h | 8 + + drivers/net/wireless/ath/regd_common.h | 32 +- + drivers/net/wireless/b43/Kconfig | 2 +- + drivers/net/wireless/b43/b43.h | 18 +- + drivers/net/wireless/b43/main.c | 6 +- + drivers/net/wireless/b43/phy_lp.c | 777 +- + drivers/net/wireless/b43/phy_lp.h | 11 +- + drivers/net/wireless/b43/pio.c | 79 +- + drivers/net/wireless/b43/xmit.c | 8 +- + drivers/net/wireless/b43legacy/Kconfig | 2 +- + drivers/net/wireless/b43legacy/b43legacy.h | 2 - + drivers/net/wireless/b43legacy/dma.c | 17 +- + drivers/net/wireless/b43legacy/main.c | 6 +- + drivers/net/wireless/b43legacy/xmit.c | 1 - + drivers/net/wireless/hostap/Kconfig | 3 +- + drivers/net/wireless/ipw2x00/Kconfig | 11 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 1 + + drivers/net/wireless/iwlwifi/Kconfig | 30 +- + drivers/net/wireless/iwlwifi/Makefile | 12 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 50 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 12 - + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 371 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 102 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 286 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 45 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 3 - + drivers/net/wireless/iwlwifi/iwl-4965.c | 233 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 348 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 369 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 85 + + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 32 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 574 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 101 + + drivers/net/wireless/iwlwifi/iwl-agn.c | 411 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 76 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 252 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 651 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 60 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 18 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 693 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 112 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 13 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 178 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 64 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 20 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 25 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 16 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 323 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 46 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 232 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 3 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 177 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 22 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 131 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 1 + + drivers/net/wireless/iwlwifi/iwl-tx.c | 82 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 309 +- + drivers/net/wireless/iwmc3200wifi/Kconfig | 3 +- + drivers/net/wireless/iwmc3200wifi/cfg80211.c | 47 +- + drivers/net/wireless/iwmc3200wifi/commands.c | 31 +- + drivers/net/wireless/iwmc3200wifi/commands.h | 70 +- + drivers/net/wireless/iwmc3200wifi/fw.c | 9 + + drivers/net/wireless/iwmc3200wifi/iwm.h | 6 + + drivers/net/wireless/iwmc3200wifi/lmac.h | 8 + + drivers/net/wireless/iwmc3200wifi/main.c | 48 + + drivers/net/wireless/iwmc3200wifi/netdev.c | 1 + + drivers/net/wireless/iwmc3200wifi/rx.c | 84 +- + drivers/net/wireless/iwmc3200wifi/sdio.c | 10 +- + drivers/net/wireless/iwmc3200wifi/umac.h | 5 + + drivers/net/wireless/libertas/11d.c | 696 -- + drivers/net/wireless/libertas/11d.h | 105 - + drivers/net/wireless/libertas/Kconfig | 39 + + drivers/net/wireless/libertas/Makefile | 14 +- + drivers/net/wireless/libertas/README | 26 +- + drivers/net/wireless/libertas/assoc.c | 445 +- + drivers/net/wireless/libertas/assoc.h | 141 +- + drivers/net/wireless/libertas/cfg.c | 198 + + drivers/net/wireless/libertas/cfg.h | 16 + + drivers/net/wireless/libertas/cmd.c | 537 +- + drivers/net/wireless/libertas/cmd.h | 127 +- + drivers/net/wireless/libertas/cmdresp.c | 116 +- + drivers/net/wireless/libertas/debugfs.c | 27 +- + drivers/net/wireless/libertas/decl.h | 59 +- + drivers/net/wireless/libertas/defs.h | 3 +- + drivers/net/wireless/libertas/dev.h | 419 +- + drivers/net/wireless/libertas/host.h | 959 ++- + drivers/net/wireless/libertas/hostcmd.h | 800 -- + drivers/net/wireless/libertas/if_cs.c | 3 + + drivers/net/wireless/libertas/if_sdio.c | 56 + + drivers/net/wireless/libertas/if_sdio.h | 3 +- + drivers/net/wireless/libertas/if_spi.c | 139 +- + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas/main.c | 373 +- + drivers/net/wireless/libertas/persistcfg.c | 8 +- + drivers/net/wireless/libertas/rx.c | 2 +- + drivers/net/wireless/libertas/scan.c | 250 +- + drivers/net/wireless/libertas/scan.h | 30 + + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/types.h | 4 +- + drivers/net/wireless/libertas/wext.c | 196 +- + drivers/net/wireless/libertas/wext.h | 8 + + drivers/net/wireless/mac80211_hwsim.c | 67 +- + drivers/net/wireless/mwl8k.c | 1258 ++- + drivers/net/wireless/orinoco/Kconfig | 6 +- + drivers/net/wireless/orinoco/hw.c | 33 +- + drivers/net/wireless/orinoco/hw.h | 3 +- + drivers/net/wireless/orinoco/main.c | 34 +- + drivers/net/wireless/orinoco/orinoco.h | 1 - + drivers/net/wireless/p54/Kconfig | 2 +- + drivers/net/wireless/p54/eeprom.c | 31 +- + drivers/net/wireless/rt2x00/Kconfig | 46 +- + drivers/net/wireless/rt2x00/Makefile | 3 + + drivers/net/wireless/rt2x00/rt2800.h | 1816 +++ + drivers/net/wireless/rt2x00/rt2800lib.c | 1817 +++ + drivers/net/wireless/rt2x00/rt2800lib.h | 134 + + drivers/net/wireless/rt2x00/rt2800pci.c | 1685 +++ + drivers/net/wireless/rt2x00/rt2800pci.h | 180 + + drivers/net/wireless/rt2x00/rt2800usb.c | 1828 +--- + drivers/net/wireless/rt2x00/rt2800usb.h | 1818 +--- + drivers/net/wireless/rt2x00/rt2x00.h | 50 + + drivers/net/wireless/rt2x00/rt2x00leds.h | 4 - + drivers/net/wireless/rt2x00/rt2x00pci.h | 24 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 159 + + drivers/net/wireless/rt2x00/rt2x00soc.h | 52 + + drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 17 +- + drivers/net/wireless/rtl818x/rtl8187.h | 1 - + drivers/net/wireless/rtl818x/rtl8187_dev.c | 13 +- + drivers/net/wireless/wl12xx/Kconfig | 3 +- + drivers/net/wireless/wl12xx/wl1251_main.c | 10 +- + drivers/net/wireless/wl12xx/wl1251_netlink.h | 30 - + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_spi.c | 2 +- + drivers/net/wireless/wl12xx/wl1271.h | 95 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 369 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 586 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 218 +- + drivers/net/wireless/wl12xx/wl1271_boot.h | 22 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 396 +- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 118 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 919 ++ + drivers/net/wireless/wl12xx/wl1271_event.c | 117 +- + drivers/net/wireless/wl12xx/wl1271_event.h | 37 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 162 +- + drivers/net/wireless/wl12xx/wl1271_init.h | 53 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 976 ++- + drivers/net/wireless/wl12xx/wl1271_ps.c | 68 +- + drivers/net/wireless/wl12xx/wl1271_ps.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_reg.h | 47 +- + drivers/net/wireless/wl12xx/wl1271_rx.c | 88 +- + drivers/net/wireless/wl12xx/wl1271_rx.h | 4 +- + drivers/net/wireless/wl12xx/wl1271_spi.c | 311 +- + drivers/net/wireless/wl12xx/wl1271_spi.h | 65 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 76 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 18 +- + drivers/net/wireless/wl12xx/wl12xx_80211.h | 4 +- + drivers/net/wireless/zd1211rw/Kconfig | 2 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 4 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 18 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 202 +- + drivers/net/wireless/zd1211rw/zd_mac.h | 25 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 4 +- + drivers/parisc/led.c | 7 +- + drivers/s390/net/ctcm_main.c | 59 +- + drivers/s390/net/lcs.c | 14 +- + drivers/s390/net/qeth_core.h | 2 +- + drivers/s390/net/qeth_core_main.c | 11 +- + drivers/s390/net/qeth_l2_main.c | 4 +- + drivers/s390/net/qeth_l3_main.c | 2 +- + drivers/ssb/driver_pcicore.c | 4 +- + drivers/staging/Kconfig | 8 + + drivers/staging/Makefile | 5 + + drivers/staging/arlan/Kconfig | 15 + + drivers/staging/arlan/Makefile | 3 + + drivers/staging/arlan/TODO | 7 + + .../{net/wireless => staging/arlan}/arlan-main.c | 0 + .../{net/wireless => staging/arlan}/arlan-proc.c | 0 + drivers/{net/wireless => staging/arlan}/arlan.h | 0 + drivers/staging/netwave/Kconfig | 11 + + drivers/staging/netwave/Makefile | 1 + + drivers/staging/netwave/TODO | 7 + + .../{net/wireless => staging/netwave}/netwave_cs.c | 0 + drivers/staging/rtl8187se/Kconfig | 3 +- + drivers/staging/rtl8192e/Kconfig | 3 +- + drivers/staging/strip/Kconfig | 22 + + drivers/staging/strip/Makefile | 1 + + drivers/staging/strip/TODO | 7 + + drivers/{net/wireless => staging/strip}/strip.c | 17 + + drivers/staging/vt6655/Kconfig | 4 +- + drivers/staging/vt6656/Kconfig | 4 +- + drivers/staging/wavelan/Kconfig | 38 + + drivers/staging/wavelan/Makefile | 2 + + drivers/staging/wavelan/TODO | 7 + + drivers/{net/wireless => staging/wavelan}/i82586.h | 0 + drivers/{net/wireless => staging/wavelan}/i82593.h | 0 + .../{net/wireless => staging/wavelan}/wavelan.c | 0 + .../{net/wireless => staging/wavelan}/wavelan.h | 0 + .../{net/wireless => staging/wavelan}/wavelan.p.h | 0 + .../{net/wireless => staging/wavelan}/wavelan_cs.c | 0 + .../{net/wireless => staging/wavelan}/wavelan_cs.h | 0 + .../wireless => staging/wavelan}/wavelan_cs.p.h | 0 + firmware/Makefile | 2 +- + firmware/WHENCE | 4 +- + firmware/bnx2x-e1-5.0.21.0.fw.ihex |10184 ---------------- + firmware/bnx2x-e1-5.2.7.0.fw.ihex |10178 ++++++++++++++++ + firmware/bnx2x-e1h-5.0.21.0.fw.ihex |12855 -------------------- + firmware/bnx2x-e1h-5.2.7.0.fw.ihex |12847 +++++++++++++++++++ + fs/compat_ioctl.c | 745 -- + fs/ocfs2/cluster/netdebug.c | 8 +- + include/asm-generic/socket.h | 1 + + include/linux/brcmphy.h | 19 +- + include/linux/can/core.h | 2 - + include/linux/can/dev.h | 20 +- + include/linux/can/platform/mcp251x.h | 36 + + include/linux/can/platform/ti_hecc.h | 40 + + include/linux/compat.h | 44 + + include/linux/dn.h | 9 +- + include/linux/errqueue.h | 6 +- + include/linux/ethtool.h | 38 +- + include/linux/fib_rules.h | 9 +- + include/linux/filter.h | 10 +- + include/linux/gen_stats.h | 15 +- + include/linux/ieee80211.h | 12 +- + include/linux/if.h | 15 +- + include/linux/if_addr.h | 9 +- + include/linux/if_addrlabel.h | 6 +- + include/linux/if_arcnet.h | 18 +- + include/linux/if_arp.h | 3 +- + include/linux/if_bonding.h | 3 +- + include/linux/if_bridge.h | 9 +- + include/linux/if_ec.h | 12 +- + include/linux/if_fddi.h | 22 +- + include/linux/if_hippi.h | 15 +- + include/linux/if_link.h | 27 +- + include/linux/if_packet.h | 27 +- + include/linux/if_plip.h | 3 +- + include/linux/if_pppol2tp.h | 3 +- + include/linux/if_tunnel.h | 18 +- + include/linux/if_vlan.h | 40 +- + include/linux/igmp.h | 15 +- + include/linux/in.h | 18 +- + include/linux/in6.h | 9 +- + include/linux/inetdevice.h | 9 +- + include/linux/ip_vs.h | 3 +- + include/linux/ipv6.h | 4 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/mroute.h | 31 +- + include/linux/mroute6.h | 15 +- + include/linux/neighbour.h | 18 +- + include/linux/net.h | 90 +- + include/linux/netdevice.h | 72 +- + include/linux/netfilter.h | 6 +- + include/linux/netfilter/nf_conntrack_common.h | 6 +- + include/linux/netfilter/nf_conntrack_ftp.h | 3 +- + include/linux/netfilter/nf_conntrack_sctp.h | 3 +- + include/linux/netfilter/nf_conntrack_tcp.h | 3 +- + include/linux/netfilter/nfnetlink.h | 6 +- + include/linux/netfilter/nfnetlink_compat.h | 3 +- + include/linux/netfilter/x_tables.h | 45 +- + include/linux/netfilter/xt_connbytes.h | 3 +- + include/linux/netfilter/xt_esp.h | 3 +- + include/linux/netfilter/xt_multiport.h | 9 +- + include/linux/netfilter/xt_policy.h | 18 +- + include/linux/netfilter/xt_state.h | 3 +- + include/linux/netfilter/xt_string.h | 3 +- + include/linux/netfilter/xt_tcpudp.h | 6 +- + include/linux/netfilter_arp/arp_tables.h | 21 +- + include/linux/netfilter_bridge/ebt_802_3.h | 3 +- + include/linux/netfilter_bridge/ebt_among.h | 9 +- + include/linux/netfilter_bridge/ebt_arpreply.h | 3 +- + include/linux/netfilter_bridge/ebt_ip.h | 3 +- + include/linux/netfilter_bridge/ebt_ip6.h | 3 +- + include/linux/netfilter_bridge/ebt_limit.h | 3 +- + include/linux/netfilter_bridge/ebt_log.h | 3 +- + include/linux/netfilter_bridge/ebt_mark_m.h | 3 +- + include/linux/netfilter_bridge/ebt_mark_t.h | 3 +- + include/linux/netfilter_bridge/ebt_nat.h | 3 +- + include/linux/netfilter_bridge/ebt_pkttype.h | 3 +- + include/linux/netfilter_bridge/ebt_redirect.h | 3 +- + include/linux/netfilter_bridge/ebt_stp.h | 6 +- + include/linux/netfilter_bridge/ebtables.h | 39 +- + include/linux/netfilter_ipv4/ip_tables.h | 27 +- + include/linux/netfilter_ipv4/ipt_SAME.h | 3 +- + include/linux/netfilter_ipv4/ipt_ah.h | 3 +- + include/linux/netfilter_ipv6/ip6_tables.h | 27 +- + include/linux/netfilter_ipv6/ip6t_ah.h | 3 +- + include/linux/netfilter_ipv6/ip6t_frag.h | 3 +- + include/linux/netfilter_ipv6/ip6t_ipv6header.h | 3 +- + include/linux/netfilter_ipv6/ip6t_mh.h | 3 +- + include/linux/netfilter_ipv6/ip6t_opts.h | 3 +- + include/linux/netfilter_ipv6/ip6t_rt.h | 3 +- + include/linux/netlink.h | 24 +- + include/linux/nl80211.h | 2 + + include/linux/nl802154.h | 6 + + include/linux/notifier.h | 1 + + include/linux/pkt_cls.h | 84 +- + include/linux/pkt_sched.h | 111 +- + include/linux/rculist.h | 14 + + include/linux/rds.h | 8 + + include/linux/route.h | 3 +- + include/linux/rtnetlink.h | 63 +- + include/linux/skbuff.h | 19 +- + include/linux/smsc911x.h | 1 + + include/linux/socket.h | 13 + + include/linux/ssb/ssb.h | 20 +- + include/linux/syscalls.h | 4 + + include/linux/tc_act/tc_defact.h | 6 +- + include/linux/tc_act/tc_gact.h | 9 +- + include/linux/tc_act/tc_ipt.h | 3 +- + include/linux/tc_act/tc_mirred.h | 6 +- + include/linux/tc_act/tc_nat.h | 6 +- + include/linux/tc_act/tc_pedit.h | 9 +- + include/linux/tc_act/tc_skbedit.h | 2 + + include/linux/tc_ematch/tc_em_cmp.h | 6 +- + include/linux/tc_ematch/tc_em_meta.h | 15 +- + include/linux/tc_ematch/tc_em_nbyte.h | 3 +- + include/linux/tc_ematch/tc_em_text.h | 3 +- + include/linux/tcp.h | 6 +- + include/linux/udp.h | 15 +- + include/linux/usb/usbnet.h | 2 + + include/linux/wimax/debug.h | 72 + + include/linux/wimax/i2400m.h | 13 +- + include/linux/xfrm.h | 27 +- + include/net/ah.h | 33 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/cfg80211.h | 40 +- + include/net/compat.h | 14 +- + include/net/dn_dev.h | 12 +- + include/net/dn_fib.h | 3 +- + include/net/dn_nsp.h | 24 +- + include/net/dst.h | 23 +- + include/net/fib_rules.h | 9 +- + include/net/gen_stats.h | 4 +- + include/net/genetlink.h | 12 +- + include/net/ieee80211_radiotap.h | 2 +- + include/net/ieee802154_netdev.h | 16 +- + include/net/if_inet6.h | 24 +- + include/net/inet6_hashtables.h | 4 +- + include/net/inet_hashtables.h | 16 +- + include/net/inet_sock.h | 36 +- + include/net/inet_timewait_sock.h | 2 +- + include/net/inetpeer.h | 3 +- + include/net/ip.h | 27 +- + include/net/ip6_fib.h | 15 +- + include/net/ip6_route.h | 3 +- + include/net/ip_fib.h | 25 +- + include/net/ip_vs.h | 6 +- + include/net/ipip.h | 25 +- + include/net/ipv6.h | 12 +- + include/net/iw_handler.h | 26 +- + include/net/mac80211.h | 148 +- + include/net/neighbour.h | 18 +- + include/net/net_namespace.h | 6 +- + include/net/netfilter/nf_conntrack_ecache.h | 3 +- + include/net/netfilter/nf_conntrack_expect.h | 6 +- + include/net/netfilter/nf_conntrack_extend.h | 6 +- + include/net/netfilter/nf_conntrack_helper.h | 3 +- + include/net/netfilter/nf_conntrack_l3proto.h | 3 +- + include/net/netfilter/nf_conntrack_l4proto.h | 3 +- + include/net/netfilter/nf_conntrack_tuple.h | 12 +- + include/net/netfilter/nf_nat.h | 15 +- + include/net/netfilter/nf_nat_protocol.h | 3 +- + include/net/phonet/phonet.h | 2 + + include/net/phonet/pn_dev.h | 6 + + include/net/pkt_cls.h | 24 +- + include/net/pkt_sched.h | 3 +- + include/net/protocol.h | 7 +- + include/net/red.h | 6 +- + include/net/route.h | 12 +- + include/net/rtnetlink.h | 11 +- + include/net/sch_generic.h | 30 +- + include/net/scm.h | 9 +- + include/net/sctp/sctp.h | 3 +- + include/net/sock.h | 46 +- + include/net/tc_act/tc_skbedit.h | 2 + + include/net/tcp.h | 6 +- + include/net/udp.h | 42 +- + include/net/wext.h | 49 +- + include/net/wimax.h | 6 + + include/net/wpan-phy.h | 22 +- + include/net/xfrm.h | 35 +- + kernel/sys_ni.c | 2 + + kernel/time/clocksource.c | 6 +- + kernel/time/timecompare.c | 6 +- + net/8021q/vlan.c | 17 +- + net/8021q/vlan.h | 4 +- + net/8021q/vlan_core.c | 21 +- + net/8021q/vlan_dev.c | 15 +- + net/8021q/vlan_netlink.c | 4 +- + net/8021q/vlanproc.c | 13 +- + net/appletalk/ddp.c | 132 +- + net/atm/common.c | 2 +- + net/atm/ioctl.c | 177 +- + net/atm/pvc.c | 5 +- + net/atm/svc.c | 9 +- + net/ax25/af_ax25.c | 12 +- + net/bluetooth/af_bluetooth.c | 11 +- + net/bluetooth/bnep/sock.c | 5 +- + net/bluetooth/cmtp/sock.c | 5 +- + net/bluetooth/hci_sock.c | 5 +- + net/bluetooth/hidp/sock.c | 5 +- + net/bluetooth/l2cap.c | 7 +- + net/bluetooth/rfcomm/sock.c | 7 +- + net/bluetooth/sco.c | 5 +- + net/bridge/br_device.c | 1 + + net/bridge/br_if.c | 19 +- + net/bridge/br_ioctl.c | 4 +- + net/can/af_can.c | 10 +- + net/can/bcm.c | 9 +- + net/can/raw.c | 5 +- + net/compat.c | 36 +- + net/core/datagram.c | 1 + + net/core/dev.c | 378 +- + net/core/drop_monitor.c | 2 +- + net/core/ethtool.c | 81 +- + net/core/filter.c | 6 + + net/core/gen_stats.c | 8 +- + net/core/net-sysfs.c | 55 +- + net/core/pktgen.c | 16 +- + net/core/rtnetlink.c | 179 +- + net/core/skbuff.c | 3 + + net/core/sock.c | 58 +- + net/dccp/ccids/ccid2.c | 327 +- + net/dccp/ccids/ccid2.h | 46 +- + net/dccp/ccids/ccid3.c | 400 +- + net/dccp/ccids/ccid3.h | 120 +- + net/dccp/ipv4.c | 41 +- + net/dccp/ipv6.c | 32 +- + net/dccp/output.c | 4 +- + net/dccp/probe.c | 31 +- + net/dccp/proto.c | 17 +- + net/dccp/timer.c | 4 +- + net/decnet/af_decnet.c | 13 +- + net/decnet/dn_dev.c | 47 +- + net/decnet/dn_fib.c | 6 +- + net/decnet/dn_route.c | 6 +- + net/econet/af_econet.c | 13 +- + net/ieee802154/Makefile | 4 +- + net/ieee802154/af_ieee802154.c | 4 +- + net/ieee802154/dgram.c | 3 +- + net/ieee802154/ieee802154.h | 53 + + net/ieee802154/netlink.c | 613 +- + net/ieee802154/nl-mac.c | 617 + + net/ieee802154/nl-phy.c | 344 + + net/ieee802154/nl_policy.c | 2 + + net/ieee802154/raw.c | 3 +- + net/ieee802154/wpan-class.c | 77 +- + net/ipv4/af_inet.c | 74 +- + net/ipv4/ah4.c | 295 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/datagram.c | 18 +- + net/ipv4/devinet.c | 96 +- + net/ipv4/fib_frontend.c | 26 +- + net/ipv4/fib_hash.c | 25 +- + net/ipv4/fib_rules.c | 2 +- + net/ipv4/fib_trie.c | 26 +- + net/ipv4/icmp.c | 13 +- + net/ipv4/igmp.c | 18 +- + net/ipv4/inet_connection_sock.c | 21 +- + net/ipv4/inet_diag.c | 28 +- + net/ipv4/inet_hashtables.c | 36 +- + net/ipv4/inet_timewait_sock.c | 14 +- + net/ipv4/ip_fragment.c | 7 +- + net/ipv4/ip_gre.c | 62 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ip_sockglue.c | 12 +- + net/ipv4/ipip.c | 71 +- + net/ipv4/ipmr.c | 29 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 8 +- + net/ipv4/raw.c | 33 +- + net/ipv4/route.c | 3 - + net/ipv4/syncookies.c | 30 +- + net/ipv4/tcp.c | 15 +- + net/ipv4/tcp_input.c | 28 +- + net/ipv4/tcp_ipv4.c | 97 +- + net/ipv4/tcp_minisocks.c | 10 +- + net/ipv4/tcp_output.c | 22 +- + net/ipv4/tcp_probe.c | 11 +- + net/ipv4/tcp_timer.c | 12 +- + net/ipv4/udp.c | 470 +- + net/ipv4/udplite.c | 5 +- + net/ipv6/Kconfig | 19 + + net/ipv6/addrconf.c | 80 +- + net/ipv6/af_inet6.c | 53 +- + net/ipv6/ah6.c | 352 +- + net/ipv6/anycast.c | 6 +- + net/ipv6/datagram.c | 48 +- + net/ipv6/inet6_connection_sock.c | 10 +- + net/ipv6/inet6_hashtables.c | 14 +- + net/ipv6/ip6_tunnel.c | 66 +- + net/ipv6/ip6mr.c | 17 +- + net/ipv6/ipv6_sockglue.c | 9 +- + net/ipv6/ndisc.c | 1 + + net/ipv6/raw.c | 60 +- + net/ipv6/reassembly.c | 13 +- + net/ipv6/route.c | 3 +- + net/ipv6/sit.c | 311 +- + net/ipv6/syncookies.c | 31 +- + net/ipv6/tcp_ipv6.c | 44 +- + net/ipv6/udp.c | 265 +- + net/ipv6/udplite.c | 1 - + net/ipv6/xfrm6_tunnel.c | 47 +- + net/ipx/af_ipx.c | 59 +- + net/irda/af_irda.c | 340 +- + net/iucv/af_iucv.c | 10 +- + net/key/af_key.c | 7 +- + net/llc/af_llc.c | 7 +- + net/mac80211/cfg.c | 7 - + net/mac80211/debugfs.c | 73 +- + net/mac80211/debugfs.h | 2 - + net/mac80211/debugfs_key.c | 44 +- + net/mac80211/debugfs_netdev.c | 174 +- + net/mac80211/debugfs_sta.c | 38 +- + net/mac80211/ibss.c | 4 + + net/mac80211/ieee80211_i.h | 123 +- + net/mac80211/iface.c | 22 +- + net/mac80211/key.h | 12 - + net/mac80211/main.c | 11 +- + net/mac80211/mesh.c | 4 +- + net/mac80211/mlme.c | 22 +- + net/mac80211/rate.c | 7 +- + net/mac80211/rx.c | 194 +- + net/mac80211/scan.c | 129 +- + net/mac80211/sta_info.c | 136 +- + net/mac80211/sta_info.h | 47 +- + net/mac80211/tx.c | 99 +- + net/mac80211/util.c | 8 +- + net/netfilter/xt_socket.c | 2 +- + net/netlabel/netlabel_unlabeled.c | 6 +- + net/netlink/af_netlink.c | 7 +- + net/netlink/genetlink.c | 32 +- + net/netrom/af_netrom.c | 5 +- + net/netrom/nr_route.c | 15 +- + net/packet/af_packet.c | 58 +- + net/phonet/af_phonet.c | 61 +- + net/phonet/datagram.c | 6 +- + net/phonet/pep.c | 31 +- + net/phonet/pn_dev.c | 131 +- + net/phonet/pn_netlink.c | 132 +- + net/phonet/socket.c | 78 +- + net/rds/af_rds.c | 8 +- + net/rds/cong.c | 2 + + net/rds/ib.h | 2 + + net/rds/ib_cm.c | 2 + + net/rds/ib_rdma.c | 5 +- + net/rds/ib_recv.c | 35 +- + net/rds/iw.h | 2 + + net/rds/iw_cm.c | 2 + + net/rds/iw_rdma.c | 5 +- + net/rds/iw_recv.c | 35 +- + net/rds/rdma.c | 24 + + net/rds/rdma.h | 1 + + net/rds/tcp_listen.c | 8 +- + net/rose/af_rose.c | 5 +- + net/rose/rose_route.c | 18 +- + net/rxrpc/af_rxrpc.c | 5 +- + net/rxrpc/ar-recvmsg.c | 2 +- + net/sched/act_api.c | 3 +- + net/sched/act_skbedit.c | 17 +- + net/sched/cls_api.c | 4 +- + net/sched/em_meta.c | 12 +- + net/sched/sch_api.c | 9 +- + net/sched/sch_cbq.c | 2 +- + net/sched/sch_drr.c | 2 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sctp/ipv6.c | 21 +- + net/sctp/protocol.c | 16 +- + net/sctp/socket.c | 32 +- + net/socket.c | 831 ++- + net/sunrpc/svcauth_unix.c | 3 +- + net/sunrpc/svcsock.c | 8 +- + net/tipc/socket.c | 6 +- + net/unix/af_unix.c | 7 +- + net/wimax/op-msg.c | 2 + + net/wimax/op-rfkill.c | 10 +- + net/wimax/stack.c | 11 + + net/wireless/Kconfig | 50 +- + net/wireless/Makefile | 10 +- + net/wireless/core.c | 27 +- + net/wireless/core.h | 11 - + net/wireless/debugfs.c | 15 +- + net/wireless/debugfs.h | 3 - + net/wireless/ethtool.c | 45 + + net/wireless/ethtool.h | 6 + + net/wireless/ibss.c | 10 +- + net/wireless/mlme.c | 49 +- + net/wireless/nl80211.c | 40 +- + net/wireless/scan.c | 12 +- + net/wireless/sme.c | 12 +- + net/wireless/wext-compat.c | 6 +- + net/wireless/wext-core.c | 1063 ++ + net/wireless/wext-priv.c | 248 + + net/wireless/wext-proc.c | 155 + + net/wireless/wext-spy.c | 231 + + net/wireless/wext.c | 1775 --- + net/x25/af_x25.c | 78 +- + net/x25/x25_in.c | 2 +- + net/x25/x25_route.c | 2 +- + net/xfrm/xfrm_algo.c | 78 - + net/xfrm/xfrm_state.c | 30 +- + security/lsm_audit.c | 12 +- + 967 files changed, 85726 insertions(+), 56664 deletions(-) + create mode 100644 drivers/isdn/gigaset/capi.c + create mode 100644 drivers/isdn/gigaset/dummyll.c + create mode 100644 drivers/misc/iwmc3200top/Kconfig + create mode 100644 drivers/misc/iwmc3200top/Makefile + create mode 100644 drivers/misc/iwmc3200top/debugfs.c + create mode 100644 drivers/misc/iwmc3200top/debugfs.h + create mode 100644 drivers/misc/iwmc3200top/fw-download.c + create mode 100644 drivers/misc/iwmc3200top/fw-msg.h + create mode 100644 drivers/misc/iwmc3200top/iwmc3200top.h + create mode 100644 drivers/misc/iwmc3200top/log.c + create mode 100644 drivers/misc/iwmc3200top/log.h + create mode 100644 drivers/misc/iwmc3200top/main.c + create mode 100644 drivers/net/can/mcp251x.c + create mode 100644 drivers/net/can/ti_hecc.c + delete mode 100644 drivers/net/sfc/boards.c + delete mode 100644 drivers/net/sfc/boards.h + create mode 100644 drivers/net/sfc/falcon_boards.c + delete mode 100644 drivers/net/sfc/falcon_hwdefs.h + delete mode 100644 drivers/net/sfc/falcon_io.h + delete mode 100644 drivers/net/sfc/gmii.h + create mode 100644 drivers/net/sfc/io.h + rename drivers/net/sfc/{xfp_phy.c => qt202x_phy.c} (73%) + create mode 100644 drivers/net/sfc/regs.h + delete mode 100644 drivers/net/sfc/sfe4001.c + create mode 100644 drivers/net/wireless/ath/debug.c + create mode 100644 drivers/net/wireless/ath/debug.h + create mode 100644 drivers/net/wireless/ath/hw.c + create mode 100644 drivers/net/wireless/ath/reg.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-agn-led.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.c + create mode 100644 drivers/net/wireless/iwlwifi/iwl-devtrace.h + delete mode 100644 drivers/net/wireless/libertas/11d.c + delete mode 100644 drivers/net/wireless/libertas/11d.h + create mode 100644 drivers/net/wireless/libertas/Kconfig + create mode 100644 drivers/net/wireless/libertas/cfg.c + create mode 100644 drivers/net/wireless/libertas/cfg.h + delete mode 100644 drivers/net/wireless/libertas/hostcmd.h + create mode 100644 drivers/net/wireless/rt2x00/rt2800.h + create mode 100644 drivers/net/wireless/rt2x00/rt2800lib.c + create mode 100644 drivers/net/wireless/rt2x00/rt2800lib.h + create mode 100644 drivers/net/wireless/rt2x00/rt2800pci.c + create mode 100644 drivers/net/wireless/rt2x00/rt2800pci.h + create mode 100644 drivers/net/wireless/rt2x00/rt2x00soc.c + create mode 100644 drivers/net/wireless/rt2x00/rt2x00soc.h + delete mode 100644 drivers/net/wireless/wl12xx/wl1251_netlink.h + create mode 100644 drivers/net/wireless/wl12xx/wl1271_conf.h + create mode 100644 drivers/staging/arlan/Kconfig + create mode 100644 drivers/staging/arlan/Makefile + create mode 100644 drivers/staging/arlan/TODO + rename drivers/{net/wireless => staging/arlan}/arlan-main.c (100%) + rename drivers/{net/wireless => staging/arlan}/arlan-proc.c (100%) + rename drivers/{net/wireless => staging/arlan}/arlan.h (100%) + create mode 100644 drivers/staging/netwave/Kconfig + create mode 100644 drivers/staging/netwave/Makefile + create mode 100644 drivers/staging/netwave/TODO + rename drivers/{net/wireless => staging/netwave}/netwave_cs.c (100%) + create mode 100644 drivers/staging/strip/Kconfig + create mode 100644 drivers/staging/strip/Makefile + create mode 100644 drivers/staging/strip/TODO + rename drivers/{net/wireless => staging/strip}/strip.c (99%) + create mode 100644 drivers/staging/wavelan/Kconfig + create mode 100644 drivers/staging/wavelan/Makefile + create mode 100644 drivers/staging/wavelan/TODO + rename drivers/{net/wireless => staging/wavelan}/i82586.h (100%) + rename drivers/{net/wireless => staging/wavelan}/i82593.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.c (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan.p.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.c (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.h (100%) + rename drivers/{net/wireless => staging/wavelan}/wavelan_cs.p.h (100%) + delete mode 100644 firmware/bnx2x-e1-5.0.21.0.fw.ihex + create mode 100644 firmware/bnx2x-e1-5.2.7.0.fw.ihex + delete mode 100644 firmware/bnx2x-e1h-5.0.21.0.fw.ihex + create mode 100644 firmware/bnx2x-e1h-5.2.7.0.fw.ihex + create mode 100644 include/linux/can/platform/mcp251x.h + create mode 100644 include/linux/can/platform/ti_hecc.h + create mode 100644 net/ieee802154/ieee802154.h + create mode 100644 net/ieee802154/nl-mac.c + create mode 100644 net/ieee802154/nl-phy.c + create mode 100644 net/wireless/ethtool.c + create mode 100644 net/wireless/ethtool.h + create mode 100644 net/wireless/wext-core.c + create mode 100644 net/wireless/wext-priv.c + create mode 100644 net/wireless/wext-proc.c + create mode 100644 net/wireless/wext-spy.c + delete mode 100644 net/wireless/wext.c +$ git am -3 ../patches/0001-net-merge-fixup-for-drivers-net-sfc-falcon_boards.c.patch +Applying: net: merge fixup for drivers/net/sfc/falcon_boards.c +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/sfc/falcon_boards.c +$ git add . +$ git commit -v -a --amend +[master 54a6498] Merge remote branch 'net/master' +Merging wireless/master +$ git merge wireless/master +Auto-merging drivers/net/wireless/b43/pio.c +Auto-merging drivers/net/wireless/ipw2x00/ipw2200.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-4965.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-hcmd.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-tx.c +Auto-merging drivers/net/wireless/iwlwifi/iwl3945-base.c +Auto-merging drivers/net/wireless/prism54/islpci_dev.c +Auto-merging drivers/net/wireless/ray_cs.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c +Merge made by recursive. + drivers/net/wireless/at76c50x-usb.c | 45 ++-- + drivers/net/wireless/ath/ath.h | 28 ++ + drivers/net/wireless/ath/ath5k/base.c | 32 ++- + drivers/net/wireless/ath/ath5k/base.h | 2 - + drivers/net/wireless/ath/ath9k/Kconfig | 3 + + drivers/net/wireless/ath/ath9k/Makefile | 3 + + drivers/net/wireless/ath/ath9k/ath9k.h | 130 +------- + drivers/net/wireless/ath/ath9k/common.c | 285 +++++++++++++++ + drivers/net/wireless/ath/ath9k/common.h | 123 +++++++ + drivers/net/wireless/ath/ath9k/hw.c | 15 + + drivers/net/wireless/ath/ath9k/hw.h | 1 + + drivers/net/wireless/ath/ath9k/main.c | 243 +++++++------ + drivers/net/wireless/ath/ath9k/rc.h | 2 + + drivers/net/wireless/ath/ath9k/recv.c | 313 +++-------------- + drivers/net/wireless/ath/ath9k/virtual.c | 79 ++++- + drivers/net/wireless/ath/ath9k/xmit.c | 21 +- + drivers/net/wireless/atmel.c | 16 + + drivers/net/wireless/b43/dma.c | 48 +-- + drivers/net/wireless/b43/pio.c | 6 +- + drivers/net/wireless/b43/xmit.h | 19 + + drivers/net/wireless/ipw2x00/ipw2100.c | 6 + + drivers/net/wireless/ipw2x00/ipw2200.c | 5 + + drivers/net/wireless/iwlwifi/iwl-3945.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 106 +------ + drivers/net/wireless/iwlwifi/iwl-agn.c | 79 +++-- + drivers/net/wireless/iwlwifi/iwl-commands.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 54 ++-- + drivers/net/wireless/iwlwifi/iwl-core.h | 5 + + drivers/net/wireless/iwlwifi/iwl-dev.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 20 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 19 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 18 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 12 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 42 ++- + drivers/net/wireless/iwmc3200wifi/sdio.c | 3 + + drivers/net/wireless/libertas/if_cs.c | 1 + + drivers/net/wireless/libertas/if_sdio.c | 6 + + drivers/net/wireless/libertas/if_spi.c | 4 + + drivers/net/wireless/libertas/if_usb.c | 2 + + drivers/net/wireless/libertas_tf/if_usb.c | 2 + + drivers/net/wireless/mwl8k.c | 3 + + drivers/net/wireless/orinoco/fw.c | 6 + + drivers/net/wireless/prism54/islpci_dev.c | 3 + + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 136 +-------- + drivers/net/wireless/rt2x00/rt2500usb.h | 2 +- + drivers/net/wireless/rt2x00/rt2800.h | 38 ++- + drivers/net/wireless/rt2x00/rt2800lib.c | 477 +++++++++++++++++++++++++- + drivers/net/wireless/rt2x00/rt2800lib.h | 6 + + drivers/net/wireless/rt2x00/rt2800pci.c | 415 ++--------------------- + drivers/net/wireless/rt2x00/rt2800pci.h | 37 +-- + drivers/net/wireless/rt2x00/rt2800usb.c | 417 +--------------------- + drivers/net/wireless/rt2x00/rt2800usb.h | 46 ++-- + drivers/net/wireless/rt2x00/rt2x00.h | 10 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00debug.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00dump.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00leds.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00leds.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 16 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 90 +----- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00reg.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 8 +- + drivers/net/wireless/rt2x00/rt2x00soc.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 4 +- + drivers/net/wireless/rt2x00/rt61pci.c | 38 +- + drivers/net/wireless/rt2x00/rt61pci.h | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 2 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 +- + drivers/net/wireless/wl12xx/wl1251_main.c | 1 + + drivers/net/wireless/wl12xx/wl1271_main.c | 1 + + drivers/net/wireless/zd1201.c | 3 + + drivers/net/wireless/zd1211rw/zd_usb.c | 7 + + drivers/staging/arlan/Kconfig | 2 +- + drivers/staging/netwave/Kconfig | 2 +- + drivers/staging/wavelan/Kconfig | 4 +- + include/linux/ieee80211.h | 2 +- + include/linux/nl80211.h | 4 + + include/net/cfg80211.h | 2 + + net/mac80211/Kconfig | 13 + + net/mac80211/cfg.c | 32 ++- + net/mac80211/ieee80211_i.h | 15 +- + net/mac80211/iface.c | 4 + + net/mac80211/mesh.c | 80 ++--- + net/mac80211/mesh.h | 5 +- + net/mac80211/mesh_hwmp.c | 67 +++-- + net/mac80211/mesh_plink.c | 51 ++- + net/mac80211/rx.c | 38 ++- + net/mac80211/sta_info.c | 3 + + net/mac80211/tx.c | 45 ++- + net/wireless/nl80211.c | 11 + + net/wireless/util.c | 4 +- + 111 files changed, 2060 insertions(+), 2016 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath9k/common.c + create mode 100644 drivers/net/wireless/ath/ath9k/common.h +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/devices/m25p80.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/Makefile +Removing drivers/mtd/maps/ipaq-flash.c +Auto-merging drivers/mtd/mtd_blkdevs.c +Auto-merging drivers/mtd/nand/Kconfig +Merge made by recursive. + arch/arm/mach-bcmring/arch.c | 10 + + arch/arm/mach-bcmring/include/mach/reg_nand.h | 66 +++ + arch/arm/mach-bcmring/include/mach/reg_umi.h | 237 ++++++++++ + arch/arm/mach-nomadik/board-nhk8815.c | 11 +- + drivers/mtd/devices/m25p80.c | 7 +- + drivers/mtd/devices/mtd_dataflash.c | 19 +- + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/ipaq-flash.c | 460 ------------------- + drivers/mtd/maps/pcmciamtd.c | 175 ++++---- + drivers/mtd/maps/physmap.c | 19 +- + drivers/mtd/maps/sa1100-flash.c | 6 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/nand/Kconfig | 16 + + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/atmel_nand.c | 1 - + drivers/mtd/nand/bcm_umi_bch.c | 213 +++++++++ + drivers/mtd/nand/bcm_umi_nand.c | 581 +++++++++++++++++++++++++ + drivers/mtd/nand/davinci_nand.c | 2 +- + drivers/mtd/nand/mxc_nand.c | 18 +- + drivers/mtd/nand/nand_bcm_umi.c | 149 +++++++ + drivers/mtd/nand/nand_bcm_umi.h | 358 +++++++++++++++ + drivers/mtd/nand/plat_nand.c | 50 ++- + drivers/mtd/onenand/onenand_base.c | 176 +++++--- + drivers/mtd/tests/mtd_oobtest.c | 18 +- + include/linux/mtd/bbm.h | 35 +- + include/linux/mtd/flashchip.h | 7 + + include/linux/mtd/nand.h | 93 +---- + include/linux/mtd/onenand.h | 19 +- + 29 files changed, 1940 insertions(+), 816 deletions(-) + create mode 100644 arch/arm/mach-bcmring/include/mach/reg_nand.h + create mode 100644 arch/arm/mach-bcmring/include/mach/reg_umi.h + delete mode 100644 drivers/mtd/maps/ipaq-flash.c + create mode 100644 drivers/mtd/nand/bcm_umi_bch.c + create mode 100644 drivers/mtd/nand/bcm_umi_nand.c + create mode 100644 drivers/mtd/nand/nand_bcm_umi.c + create mode 100644 drivers/mtd/nand/nand_bcm_umi.h +Merging crypto/master +$ git merge crypto/master +Removing crypto/digest.c +Removing crypto/hash.c +Merge made by recursive. + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/ghash-clmulni-intel_asm.S | 164 ++++++++++++++ + arch/x86/crypto/ghash-clmulni-intel_glue.c | 333 ++++++++++++++++++++++++++++ + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/i387.h | 7 + + arch/x86/include/asm/inst.h | 150 +++++++++++++ + crypto/Kconfig | 9 + + crypto/ansi_cprng.c | 82 ++++++- + crypto/cryptd.c | 7 + + crypto/digest.c | 240 -------------------- + crypto/hash.c | 183 --------------- + crypto/proc.c | 7 - + crypto/testmgr.c | 2 +- + include/crypto/algapi.h | 1 - + include/crypto/cryptd.h | 1 + + include/linux/crypto.h | 27 --- + 16 files changed, 746 insertions(+), 471 deletions(-) + create mode 100644 arch/x86/crypto/ghash-clmulni-intel_asm.S + create mode 100644 arch/x86/crypto/ghash-clmulni-intel_glue.c + create mode 100644 arch/x86/include/asm/inst.h + delete mode 100644 crypto/digest.c + delete mode 100644 crypto/hash.c +Merging sound/for-next +$ git merge sound/for-next +Recorded preimage for 'arch/arm/mach-omap2/board-zoom2.c' +Resolved 'arch/arm/mach-omap2/board-omap3evm.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Auto-merging arch/arm/mach-omap2/board-omap3beagle.c +Auto-merging arch/arm/mach-omap2/board-omap3evm.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c +Auto-merging arch/arm/mach-omap2/board-omap3pandora.c +Auto-merging arch/arm/mach-omap2/board-overo.c +Auto-merging arch/arm/mach-omap2/board-zoom2.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom2.c +Removing arch/arm/plat-s3c/include/plat/audio.h +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/twl4030-core.c +Removing include/sound/sscape_ioctl.h +Auto-merging sound/core/rawmidi.c +Removing sound/oss/sscape.c +Auto-merging sound/soc/au1x/dbdma2.c +Auto-merging sound/soc/omap/ams-delta.c +Auto-merging sound/soc/omap/omap-mcbsp.c +Auto-merging sound/soc/omap/omap3evm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm/mach-omap2/board-zoom2.c'. +[master c50b7d7] Merge remote branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/ALSA-Configuration.txt | 10 +- + Documentation/sound/alsa/ControlNames.txt | 3 +- + arch/arm/mach-omap2/board-3430sdp.c | 10 + + arch/arm/mach-omap2/board-omap3beagle.c | 10 + + arch/arm/mach-omap2/board-omap3evm.c | 10 + + arch/arm/mach-omap2/board-omap3pandora.c | 10 + + arch/arm/mach-omap2/board-overo.c | 10 + + arch/arm/plat-s3c/include/plat/audio.h | 45 - + arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h | 2 + + arch/sh/boards/mach-hp6xx/setup.c | 55 + + arch/sh/include/mach-common/mach/hp6xx.h | 4 + + drivers/mfd/Kconfig | 6 + + drivers/mfd/Makefile | 1 + + drivers/mfd/twl4030-codec.c | 276 ++ + drivers/mfd/twl4030-core.c | 14 + + include/linux/i2c/twl4030.h | 19 + + include/linux/mfd/twl4030-codec.h | 272 ++ + include/sound/Kbuild | 1 - + include/sound/ak4113.h | 321 ++ + include/sound/ak4114.h | 12 +- + include/sound/ak4xxx-adda.h | 5 +- + include/sound/control.h | 5 +- + include/sound/pcm.h | 3 + + include/sound/rawmidi.h | 2 + + include/sound/sh_dac_audio.h | 21 + + include/sound/soc-dai.h | 14 +- + include/sound/soc-dapm.h | 17 + + include/sound/soc.h | 14 +- + include/sound/sscape_ioctl.h | 21 - + include/sound/tlv320dac33-plat.h | 20 + + include/sound/tpa6130a2-plat.h | 30 + + include/sound/wss.h | 1 - + sound/core/control.c | 7 +- + sound/core/isadma.c | 10 +- + sound/core/oss/mixer_oss.c | 4 +- + sound/core/pcm.c | 6 +- + sound/core/rawmidi.c | 17 +- + sound/drivers/pcsp/pcsp.c | 32 +- + sound/drivers/pcsp/pcsp.h | 2 +- + sound/drivers/pcsp/pcsp_mixer.c | 35 +- + sound/i2c/other/Makefile | 3 +- + sound/i2c/other/ak4113.c | 639 ++++ + sound/i2c/other/ak4xxx-adda.c | 136 +- + sound/isa/Kconfig | 12 +- + sound/isa/cmi8330.c | 4 +- + sound/isa/cs423x/cs4236.c | 13 +- + sound/isa/cs423x/cs4236_lib.c | 50 +- + sound/isa/es1688/es1688_lib.c | 2 +- + sound/isa/es18xx.c | 221 +- + sound/isa/sb/sb_mixer.c | 4 +- + sound/isa/sscape.c | 727 ++--- + sound/isa/wss/wss_lib.c | 101 +- + sound/oss/Kconfig | 12 - + sound/oss/Makefile | 1 - + sound/oss/audio.c | 2 +- + sound/oss/sh_dac_audio.c | 3 - + sound/oss/sscape.c | 1480 --------- + sound/pci/ac97/ac97_codec.c | 6 +- + sound/pci/ac97/ac97_patch.c | 12 +- + sound/pci/azt3328.c | 4 +- + sound/pci/ca0106/ca0106_mixer.c | 4 +- + sound/pci/ca0106/ca0106_proc.c | 4 +- + sound/pci/cmipci.c | 4 +- + sound/pci/ctxfi/ctatc.c | 2 +- + sound/pci/emu10k1/emu10k1x.c | 3 +- + sound/pci/emu10k1/emumixer.c | 4 +- + sound/pci/emu10k1/emuproc.c | 4 +- + sound/pci/emu10k1/io.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/hda/hda_codec.c | 90 +- + sound/pci/hda/hda_codec.h | 7 + + sound/pci/hda/hda_eld.c | 5 +- + sound/pci/hda/hda_hwdep.c | 38 + + sound/pci/hda/hda_intel.c | 33 +- + sound/pci/hda/hda_local.h | 15 +- + sound/pci/hda/hda_proc.c | 16 +- + sound/pci/hda/patch_cmedia.c | 4 +- + sound/pci/hda/patch_intelhdmi.c | 411 ++- + sound/pci/hda/patch_realtek.c | 146 +- + sound/pci/hda/patch_sigmatel.c | 49 +- + sound/pci/hda/patch_via.c | 3516 +++++++++++++++++++-- + sound/pci/ice1712/Makefile | 2 +- + sound/pci/ice1712/ice1712.c | 12 + + sound/pci/ice1712/ice1712.h | 14 +- + sound/pci/ice1712/ice1724.c | 103 +- + sound/pci/ice1712/juli.c | 24 +- + sound/pci/ice1712/quartet.c | 1130 +++++++ + sound/pci/ice1712/quartet.h | 10 + + sound/pci/oxygen/Makefile | 3 +- + sound/pci/oxygen/cs2000.h | 83 + + sound/pci/oxygen/hifier.c | 61 +- + sound/pci/oxygen/oxygen.c | 248 ++- + sound/pci/oxygen/oxygen.h | 5 + + sound/pci/oxygen/oxygen_lib.c | 29 +- + sound/pci/oxygen/oxygen_mixer.c | 52 +- + sound/pci/oxygen/oxygen_pcm.c | 19 +- + sound/pci/oxygen/virtuoso.c | 1105 +------- + sound/pci/oxygen/xonar.h | 50 + + sound/pci/oxygen/xonar_cs43xx.c | 434 +++ + sound/pci/oxygen/xonar_hdmi.c | 128 + + sound/pci/oxygen/xonar_lib.c | 132 + + sound/pci/oxygen/xonar_pcm179x.c | 1115 +++++++ + sound/ppc/awacs.c | 12 +- + sound/ppc/burgundy.c | 8 +- + sound/ppc/tumbler.c | 2 +- + sound/sh/Kconfig | 8 + + sound/sh/Makefile | 2 + + sound/sh/sh_dac_audio.c | 453 +++ + sound/soc/Makefile | 2 +- + sound/soc/atmel/playpaq_wm8510.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/au1x/dbdma2.c | 117 +- + sound/soc/au1x/psc-ac97.c | 243 +- + sound/soc/au1x/psc-i2s.c | 189 +- + sound/soc/au1x/psc.h | 7 +- + sound/soc/blackfin/bf5xx-ad1836.c | 7 + + sound/soc/blackfin/bf5xx-ad1938.c | 9 +- + sound/soc/blackfin/bf5xx-i2s.c | 15 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 9 +- + sound/soc/blackfin/bf5xx-tdm.c | 45 +- + sound/soc/blackfin/bf5xx-tdm.h | 11 + + sound/soc/codecs/Kconfig | 21 + + sound/soc/codecs/Makefile | 10 + + sound/soc/codecs/ac97.c | 3 - + sound/soc/codecs/ad1836.c | 11 - + sound/soc/codecs/ad1938.c | 11 - + sound/soc/codecs/ad1980.c | 5 - + sound/soc/codecs/ad73311.c | 8 - + sound/soc/codecs/ak4104.c | 8 - + sound/soc/codecs/ak4535.c | 8 - + sound/soc/codecs/ak4642.c | 9 - + sound/soc/codecs/ak4671.c | 816 +++++ + sound/soc/codecs/ak4671.h | 156 + + sound/soc/codecs/cs4270.c | 28 +- + sound/soc/codecs/cx20442.c | 11 - + sound/soc/codecs/pcm3008.c | 9 - + sound/soc/codecs/ssm2602.c | 8 - + sound/soc/codecs/stac9766.c | 3 - + sound/soc/codecs/tlv320aic23.c | 10 +- + sound/soc/codecs/tlv320aic26.c | 11 - + sound/soc/codecs/tlv320aic3x.c | 10 - + sound/soc/codecs/tlv320dac33.c | 1229 +++++++ + sound/soc/codecs/tlv320dac33.h | 267 ++ + sound/soc/codecs/tpa6130a2.c | 463 +++ + sound/soc/codecs/tpa6130a2.h | 61 + + sound/soc/codecs/twl4030.c | 451 ++-- + sound/soc/codecs/twl4030.h | 242 +-- + sound/soc/codecs/uda134x.c | 9 - + sound/soc/codecs/uda1380.c | 8 - + sound/soc/codecs/wm8350.c | 30 +- + sound/soc/codecs/wm8400.c | 31 +- + sound/soc/codecs/wm8510.c | 13 +- + sound/soc/codecs/wm8523.c | 25 - + sound/soc/codecs/wm8580.c | 29 +- + sound/soc/codecs/wm8711.c | 634 ++++ + sound/soc/codecs/wm8711.h | 42 + + sound/soc/codecs/wm8727.c | 135 + + sound/soc/codecs/wm8727.h | 21 + + sound/soc/codecs/wm8728.c | 8 - + sound/soc/codecs/wm8731.c | 93 +- + sound/soc/codecs/wm8750.c | 8 - + sound/soc/codecs/wm8753.c | 48 +- + sound/soc/codecs/wm8776.c | 43 - + sound/soc/codecs/wm8900.c | 32 +- + sound/soc/codecs/wm8903.c | 26 - + sound/soc/codecs/wm8940.c | 27 +- + sound/soc/codecs/wm8960.c | 29 +- + sound/soc/codecs/wm8961.c | 26 - + sound/soc/codecs/wm8971.c | 9 +- + sound/soc/codecs/wm8974.c | 35 +- + sound/soc/codecs/wm8988.c | 43 - + sound/soc/codecs/wm8990.c | 13 +- + sound/soc/codecs/wm8993.c | 47 +- + sound/soc/codecs/wm9081.c | 26 - + sound/soc/codecs/wm9705.c | 8 - + sound/soc/codecs/wm9712.c | 8 - + sound/soc/codecs/wm9713.c | 33 +- + sound/soc/codecs/wm_hubs.c | 35 + + sound/soc/codecs/wm_hubs.h | 5 + + sound/soc/davinci/Kconfig | 4 +- + sound/soc/davinci/davinci-evm.c | 7 +- + sound/soc/davinci/davinci-i2s.c | 2 + + sound/soc/davinci/davinci-mcasp.c | 17 +- + sound/soc/davinci/davinci-pcm.c | 21 +- + sound/soc/davinci/davinci-pcm.h | 1 + + sound/soc/fsl/mpc5200_dma.c | 123 +- + sound/soc/fsl/mpc5200_dma.h | 24 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 39 +- + sound/soc/imx/mx27vis_wm8974.c | 2 +- + sound/soc/omap/Kconfig | 9 + + sound/soc/omap/Makefile | 2 + + sound/soc/omap/am3517evm.c | 202 ++ + sound/soc/omap/ams-delta.c | 4 +- + sound/soc/omap/omap-mcbsp.c | 63 +- + sound/soc/omap/omap3evm.c | 7 + + sound/soc/omap/omap3pandora.c | 24 +- + sound/soc/pxa/Kconfig | 3 +- + sound/soc/pxa/magician.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 20 +- + sound/soc/pxa/zylonite.c | 5 +- + sound/soc/s3c24xx/Kconfig | 9 + + sound/soc/s3c24xx/Makefile | 2 + + sound/soc/s3c24xx/neo1973_gta02_wm8753.c | 8 +- + sound/soc/s3c24xx/neo1973_wm8753.c | 9 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 31 +- + sound/soc/s3c24xx/s3c2412-i2s.c | 1 - + sound/soc/s3c24xx/s3c2443-ac97.c | 1 - + sound/soc/s3c24xx/s3c24xx-i2s.c | 2 +- + sound/soc/s3c24xx/s3c24xx-pcm.c | 1 - + sound/soc/s3c24xx/s3c64xx-i2s.c | 20 +- + sound/soc/s3c24xx/s3c64xx-i2s.h | 1 + + sound/soc/s3c24xx/smdk64xx_wm8580.c | 268 ++ + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/fsi.c | 234 +- + sound/soc/soc-cache.c | 46 +- + sound/soc/soc-core.c | 566 ++-- + sound/soc/soc-dapm.c | 135 +- + sound/soc/soc-jack.c | 6 +- + sound/soc/soc-utils.c | 68 + + sound/usb/usbmidi.c | 107 +- + sound/usb/usx2y/us122l.c | 75 +- + 221 files changed, 16451 insertions(+), 6219 deletions(-) + delete mode 100644 arch/arm/plat-s3c/include/plat/audio.h + create mode 100644 drivers/mfd/twl4030-codec.c + create mode 100644 include/linux/mfd/twl4030-codec.h + create mode 100644 include/sound/ak4113.h + create mode 100644 include/sound/sh_dac_audio.h + delete mode 100644 include/sound/sscape_ioctl.h + create mode 100644 include/sound/tlv320dac33-plat.h + create mode 100644 include/sound/tpa6130a2-plat.h + create mode 100644 sound/i2c/other/ak4113.c + delete mode 100644 sound/oss/sscape.c + create mode 100644 sound/pci/ice1712/quartet.c + create mode 100644 sound/pci/ice1712/quartet.h + create mode 100644 sound/pci/oxygen/cs2000.h + create mode 100644 sound/pci/oxygen/xonar.h + create mode 100644 sound/pci/oxygen/xonar_cs43xx.c + create mode 100644 sound/pci/oxygen/xonar_hdmi.c + create mode 100644 sound/pci/oxygen/xonar_lib.c + create mode 100644 sound/pci/oxygen/xonar_pcm179x.c + create mode 100644 sound/sh/sh_dac_audio.c + create mode 100644 sound/soc/codecs/ak4671.c + create mode 100644 sound/soc/codecs/ak4671.h + create mode 100644 sound/soc/codecs/tlv320dac33.c + create mode 100644 sound/soc/codecs/tlv320dac33.h + create mode 100644 sound/soc/codecs/tpa6130a2.c + create mode 100644 sound/soc/codecs/tpa6130a2.h + create mode 100644 sound/soc/codecs/wm8711.c + create mode 100644 sound/soc/codecs/wm8711.h + create mode 100644 sound/soc/codecs/wm8727.c + create mode 100644 sound/soc/codecs/wm8727.h + create mode 100644 sound/soc/omap/am3517evm.c + create mode 100644 sound/soc/s3c24xx/smdk64xx_wm8580.c + create mode 100644 sound/soc/soc-utils.c +$ git am -3 ../patches/0001-sound-merger-fixup-for-omap-board-zoom2-updates.patch +Applying: sound: merger fixup for omap board-zoom2 updates +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/mach-omap2/board-zoom-peripherals.c +$ git add . +$ git commit -v -a --amend +[master f1230cf] Merge remote branch 'sound/for-next' +Merging cpufreq/next +$ git merge cpufreq/next +Resolved 'include/acpi/processor.h' using previous resolution. +Auto-merging drivers/acpi/processor_perflib.c +Auto-merging include/acpi/processor.h +CONFLICT (content): Merge conflict in include/acpi/processor.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3843288] Merge remote branch 'cpufreq/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 18 +++ + Documentation/cpu-freq/user-guide.txt | 11 ++ + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 17 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k6.c | 2 +- + arch/x86/kernel/cpu/cpufreq/powernow-k7.c | 17 ++-- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 32 +++-- + drivers/acpi/processor_perflib.c | 13 ++ + drivers/cpufreq/cpufreq.c | 21 +++ + drivers/cpufreq/cpufreq_conservative.c | 129 +++++++++++++++++--- + include/acpi/processor.h | 6 + + include/linux/cpufreq.h | 1 + + 11 files changed, 218 insertions(+), 49 deletions(-) +Merging quilt/rr +$ git merge quilt/rr +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/powerpc/kernel/ppc_ksyms.c +Auto-merging arch/sparc/kernel/pci.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging drivers/net/myri10ge/myri10ge.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/wireless/libertas/if_sdio.c +Auto-merging drivers/net/wireless/libertas/if_usb.c +Auto-merging drivers/net/wireless/libertas_tf/if_usb.c +Auto-merging drivers/scsi/bfa/bfad.c +Auto-merging drivers/video/uvesafb.c +Auto-merging init/Kconfig +Auto-merging net/mac80211/rate.c +Auto-merging scripts/Makefile.lib +Merge made by recursive. + Documentation/lguest/lguest.c | 1 - + MAINTAINERS | 9 + + Makefile | 24 +- + arch/arm/kernel/armksyms.c | 20 - + arch/arm/kernel/vmlinux.lds.S | 13 +- + arch/blackfin/Kconfig | 4 + + arch/blackfin/include/asm/module.h | 2 - + arch/blackfin/kernel/vmlinux.lds.S | 2 - + arch/h8300/Kconfig | 4 + + arch/h8300/include/asm/module.h | 2 - + arch/h8300/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kernel/ppc_ksyms.c | 2 - + arch/sparc/kernel/pci.c | 1 - + arch/sparc/kernel/sparc_ksyms_64.c | 12 - + arch/um/drivers/hostaudio_kern.c | 10 + + arch/x86/kernel/x8664_ksyms_64.c | 4 +- + arch/x86/kvm/Kconfig | 1 + + drivers/Makefile | 1 + + drivers/acpi/debug.c | 32 +- + drivers/char/ipmi/ipmi_watchdog.c | 42 +- + drivers/ide/ide.c | 20 +- + drivers/input/misc/ati_remote2.c | 26 +- + drivers/input/mouse/psmouse-base.c | 14 +- + drivers/message/fusion/mptbase.c | 3 +- + drivers/misc/lkdtm.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 54 ++- + drivers/net/tun.c | 101 +++- + drivers/net/wireless/libertas/if_sdio.c | 32 +- + drivers/net/wireless/libertas/if_usb.c | 3 + + drivers/net/wireless/libertas_tf/if_usb.c | 3 + + drivers/scsi/bfa/bfad.c | 2 + + drivers/staging/rtl8187se/r8180_core.c | 6 +- + drivers/staging/rtl8192e/r8192E_core.c | 6 +- + drivers/staging/rtl8192su/r8192U_core.c | 6 +- + drivers/usb/atm/ueagle-atm.c | 2 + + drivers/vhost/Kconfig | 11 + + drivers/vhost/Makefile | 2 + + drivers/vhost/net.c | 648 +++++++++++++++++++ + drivers/vhost/vhost.c | 965 +++++++++++++++++++++++++++++ + drivers/vhost/vhost.h | 159 +++++ + drivers/video/uvesafb.c | 7 +- + drivers/video/vt8623fb.c | 2 + + fs/nfs/callback.c | 11 +- + include/asm-generic/vmlinux.lds.h | 47 +- + include/linux/Kbuild | 1 + + include/linux/bsearch.h | 9 + + include/linux/gfp.h | 2 +- + include/linux/if_tun.h | 14 + + include/linux/kernel.h | 32 +- + include/linux/kmemcheck.h | 2 +- + include/linux/miscdevice.h | 1 + + include/linux/mod_export.h | 149 +++++ + include/linux/module.h | 145 ++--- + include/linux/moduleparam.h | 282 +++++++-- + include/linux/vhost.h | 130 ++++ + include/linux/virtio_config.h | 5 +- + init/Kconfig | 5 + + init/main.c | 8 +- + kernel/module.c | 388 +++++++------ + kernel/params.c | 213 +++++-- + lib/Makefile | 2 +- + lib/bsearch.c | 53 ++ + mm/mmu_context.c | 3 + + net/mac80211/rate.c | 2 + + net/sunrpc/xprtsock.c | 26 +- + scripts/Makefile.lib | 5 + + scripts/Makefile.modpost | 2 +- + scripts/mod/Makefile | 2 +- + scripts/mod/mk_elfconfig.c | 9 - + scripts/mod/modpost.c | 85 +++- + 70 files changed, 3305 insertions(+), 591 deletions(-) + create mode 100644 drivers/vhost/Kconfig + create mode 100644 drivers/vhost/Makefile + create mode 100644 drivers/vhost/net.c + create mode 100644 drivers/vhost/vhost.c + create mode 100644 drivers/vhost/vhost.h + create mode 100644 include/linux/bsearch.h + create mode 100644 include/linux/mod_export.h + create mode 100644 include/linux/vhost.h + create mode 100644 lib/bsearch.c +$ git am -3 ../patches/0001-modpost-autoconf.h-has-moved-to-include-generated.patch +Applying: modpost: autoconf.h has moved to include/generated +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/mod/modpost.c +$ git add . +$ git commit -v -a --amend +[master 982e1a5] Merge branch 'quilt/rr' +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging tmio-mmc/linux-next +$ git merge tmio-mmc/linux-next +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/core.h +Merge made by recursive. + drivers/mfd/Makefile | 6 +- + drivers/mfd/asic3.c | 43 +++++++++++++++---- + drivers/mfd/t7l66xb.c | 31 +++++++++++-- + drivers/mfd/tc6387xb.c | 97 ++++++++++++++++++++++++++++++++++-------- + drivers/mfd/tc6393xb.c | 56 +++++++++++++++++++++---- + drivers/mfd/tmio_core.c | 62 +++++++++++++++++++++++++++ + drivers/mmc/core/core.c | 4 +- + drivers/mmc/core/core.h | 10 ++++ + drivers/mmc/host/tmio_mmc.c | 78 +++++++++++++++-------------------- + drivers/mmc/host/tmio_mmc.h | 46 +++------------------ + include/linux/mfd/tmio.h | 40 ++++++++++++++++++ + 11 files changed, 342 insertions(+), 131 deletions(-) + create mode 100644 drivers/mfd/tmio_core.c +Merging input/next +$ git merge input/next +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging include/linux/input.h +Merge made by recursive. + arch/arm/configs/rx51_defconfig | 2 +- + arch/arm/mach-davinci/include/mach/keyscan.h | 41 +++ + arch/arm/mach-omap2/board-rx51-peripherals.c | 82 +++++ + drivers/input/input-polldev.c | 7 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/davinci_keyscan.c | 337 +++++++++++++++++ + drivers/input/keyboard/gpio_keys.c | 102 +++--- + drivers/input/keyboard/lkkbd.c | 496 ++++++++++++------------- + drivers/input/misc/wistron_btns.c | 2 +- + drivers/input/mouse/synaptics_i2c.c | 6 +- + drivers/input/mouse/vsxxxaa.c | 374 +++++++++----------- + drivers/input/serio/Kconfig | 8 + + drivers/input/serio/Makefile | 1 + + drivers/input/serio/altera_ps2.c | 200 +++++++++++ + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/dynapro.c | 206 +++++++++++ + drivers/input/touchscreen/ucb1400_ts.c | 11 +- + drivers/mfd/ucb1400_core.c | 7 + + include/linux/input-polldev.h | 11 +- + include/linux/input.h | 7 +- + include/linux/serio.h | 1 + + include/linux/ucb1400.h | 4 + + 24 files changed, 1412 insertions(+), 517 deletions(-) + create mode 100644 arch/arm/mach-davinci/include/mach/keyscan.h + create mode 100644 drivers/input/keyboard/davinci_keyscan.c + create mode 100644 drivers/input/serio/altera_ps2.c + create mode 100644 drivers/input/touchscreen/dynapro.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging MAINTAINERS +Removing block/as-iosched.c +Auto-merging include/linux/fs.h +Auto-merging lib/Makefile +Merge made by recursive. + .../blockdev/drbd/DRBD-8.3-data-packets.svg | 588 +++ + Documentation/blockdev/drbd/DRBD-data-packets.svg | 459 ++ + Documentation/blockdev/drbd/README.txt | 16 + + Documentation/blockdev/drbd/conn-states-8.dot | 18 + + Documentation/blockdev/drbd/disk-states-8.dot | 16 + + .../drbd/drbd-connection-state-overview.dot | 85 + + Documentation/blockdev/drbd/node-states-8.dot | 14 + + MAINTAINERS | 13 + + block/Kconfig.iosched | 26 +- + block/Makefile | 1 - + block/as-iosched.c | 1520 ------- + block/blk-settings.c | 49 +- + block/blk-sysfs.c | 22 + + block/bsg.c | 3 +- + block/cfq-iosched.c | 656 +++- + block/elevator.c | 10 +- + block/genhd.c | 12 + + block/scsi_ioctl.c | 6 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/drbd/Kconfig | 71 + + drivers/block/drbd/Makefile | 5 + + drivers/block/drbd/drbd_actlog.c | 1424 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2252 ++++++++++ + drivers/block/drbd/drbd_main.c | 3699 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2364 +++++++++++ + drivers/block/drbd/drbd_proc.c | 265 ++ + drivers/block/drbd/drbd_receiver.c | 4423 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1125 +++++ + drivers/block/drbd/drbd_req.h | 326 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1512 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + drivers/block/ps3vram.c | 10 +- + fs/aio.c | 62 +- + fs/block_dev.c | 12 +- + fs/direct-io.c | 10 +- + fs/partitions/check.c | 12 + + fs/read_write.c | 2 - + fs/splice.c | 24 +- + include/linux/backing-dev.h | 13 + + include/linux/bio.h | 8 +- + include/linux/blkdev.h | 31 +- + include/linux/drbd.h | 350 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/fs.h | 2 - + include/linux/genhd.h | 1 + + include/linux/iocontext.h | 5 - + include/linux/lru_cache.h | 294 ++ + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 56 files changed, 22895 insertions(+), 1728 deletions(-) + create mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + create mode 100644 Documentation/blockdev/drbd/README.txt + create mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + create mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + create mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + create mode 100644 Documentation/blockdev/drbd/node-states-8.dot + delete mode 100644 block/as-iosched.c + create mode 100644 drivers/block/drbd/Kconfig + create mode 100644 drivers/block/drbd/Makefile + create mode 100644 drivers/block/drbd/drbd_actlog.c + create mode 100644 drivers/block/drbd/drbd_bitmap.c + create mode 100644 drivers/block/drbd/drbd_int.h + create mode 100644 drivers/block/drbd/drbd_main.c + create mode 100644 drivers/block/drbd/drbd_nl.c + create mode 100644 drivers/block/drbd/drbd_proc.c + create mode 100644 drivers/block/drbd/drbd_receiver.c + create mode 100644 drivers/block/drbd/drbd_req.c + create mode 100644 drivers/block/drbd/drbd_req.h + create mode 100644 drivers/block/drbd/drbd_strings.c + create mode 100644 drivers/block/drbd/drbd_vli.h + create mode 100644 drivers/block/drbd/drbd_worker.c + create mode 100644 drivers/block/drbd/drbd_wrappers.h + create mode 100644 include/linux/drbd.h + create mode 100644 include/linux/drbd_limits.h + create mode 100644 include/linux/drbd_nl.h + create mode 100644 include/linux/drbd_tag_magic.h + create mode 100644 include/linux/lru_cache.h + create mode 100644 lib/lru_cache.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Auto-merging drivers/md/dm-mpath.c +Merge made by recursive. + drivers/md/dm-exception-store.c | 33 +-- + drivers/md/dm-exception-store.h | 34 ++- + drivers/md/dm-io.c | 120 ++++++--- + drivers/md/dm-ioctl.c | 35 ++- + drivers/md/dm-kcopyd.c | 5 +- + drivers/md/dm-mpath.c | 19 +- + drivers/md/dm-snap-persistent.c | 83 +++--- + drivers/md/dm-snap-transient.c | 24 +- + drivers/md/dm-snap.c | 247 ++++++++++------- + drivers/md/dm-sysfs.c | 8 + + drivers/md/dm-uevent.c | 9 +- + drivers/md/dm.c | 561 ++++++++++++++++++++++----------------- + drivers/md/dm.h | 3 + + include/linux/device-mapper.h | 2 +- + 14 files changed, 690 insertions(+), 493 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 +Resolved 'drivers/mtd/maps/pcmciamtd.c' using previous resolution. +Resolved 'drivers/net/wireless/ray_cs.c' using previous resolution. +Resolved 'drivers/pcmcia/Makefile' using previous resolution. +Auto-merging drivers/mtd/maps/pcmciamtd.c +CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c +Auto-merging drivers/net/pcmcia/pcnet_cs.c +Auto-merging drivers/net/wireless/libertas/if_cs.c +Auto-merging drivers/net/wireless/ray_cs.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ray_cs.c +Auto-merging drivers/pcmcia/Kconfig +Auto-merging drivers/pcmcia/Makefile +CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile +Auto-merging drivers/pcmcia/cardbus.c +Auto-merging drivers/pcmcia/cs.c +Auto-merging drivers/serial/serial_cs.c +Auto-merging include/linux/pci_ids.h +Auto-merging include/pcmcia/ss.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7c84dd7] Merge remote branch 'pcmcia/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/pcmcia/driver-changes.txt | 12 + + drivers/ata/pata_pcmcia.c | 16 +- + drivers/bluetooth/bluecard_cs.c | 12 +- + drivers/bluetooth/bt3c_cs.c | 9 +- + drivers/bluetooth/btuart_cs.c | 9 +- + drivers/bluetooth/dtl1_cs.c | 8 +- + drivers/char/pcmcia/cm4000_cs.c | 71 ++--- + drivers/char/pcmcia/cm4040_cs.c | 46 ++-- + drivers/char/pcmcia/ipwireless/main.c | 288 ++++++------------ + drivers/char/pcmcia/synclink_cs.c | 77 ++--- + drivers/ide/ide-cs.c | 32 +-- + drivers/isdn/hardware/avm/avm_cs.c | 2 - + drivers/isdn/hisax/avma1_cs.c | 26 +-- + drivers/isdn/hisax/elsa_cs.c | 45 +--- + drivers/isdn/hisax/sedlbauer_cs.c | 59 ++--- + drivers/isdn/hisax/teles_cs.c | 37 +-- + drivers/mtd/maps/pcmciamtd.c | 16 +- + drivers/net/pcmcia/3c574_cs.c | 84 +++--- + drivers/net/pcmcia/3c589_cs.c | 96 ++---- + drivers/net/pcmcia/axnet_cs.c | 53 ++--- + drivers/net/pcmcia/com20020_cs.c | 55 ++-- + drivers/net/pcmcia/fmvj18x_cs.c | 169 +++++------- + drivers/net/pcmcia/ibmtr_cs.c | 54 ++-- + drivers/net/pcmcia/nmclan_cs.c | 167 +++++------ + drivers/net/pcmcia/pcnet_cs.c | 67 ++--- + drivers/net/pcmcia/smc91c92_cs.c | 326 +++++++-------------- + drivers/net/pcmcia/xirc2ps_cs.c | 254 +++++++---------- + drivers/net/wireless/airo_cs.c | 48 +-- + drivers/net/wireless/atmel_cs.c | 46 +-- + drivers/net/wireless/b43/pcmcia.c | 20 -- + drivers/net/wireless/hostap/hostap_cs.c | 44 +--- + drivers/net/wireless/libertas/if_cs.c | 67 ++--- + drivers/net/wireless/orinoco/orinoco_cs.c | 27 +- + drivers/net/wireless/orinoco/spectrum_cs.c | 54 ++-- + drivers/net/wireless/ray_cs.c | 347 +++++++++++----------- + drivers/net/wireless/wl3501_cs.c | 67 ++--- + drivers/parport/parport_cs.c | 37 +-- + drivers/pcmcia/Kconfig | 42 ++-- + drivers/pcmcia/Makefile | 10 +- + drivers/pcmcia/cardbus.c | 4 +- + drivers/pcmcia/cirrus.h | 10 - + drivers/pcmcia/cistpl.c | 71 ++++- + drivers/pcmcia/cs.c | 67 +++-- + drivers/pcmcia/cs_internal.h | 38 +-- + drivers/pcmcia/ds.c | 188 +++---------- + drivers/pcmcia/i82365.c | 37 +-- + drivers/pcmcia/m32r_cfc.c | 105 +++---- + drivers/pcmcia/m32r_pcc.c | 51 ++-- + drivers/pcmcia/m8xx_pcmcia.c | 40 +-- + drivers/pcmcia/o2micro.h | 22 -- + drivers/pcmcia/pcmcia_ioctl.c | 31 +-- + drivers/pcmcia/pcmcia_resource.c | 331 +++++++++++++++----- + drivers/pcmcia/pd6729.c | 70 +++-- + drivers/pcmcia/pd6729.h | 7 - + drivers/pcmcia/pxa2xx_base.c | 94 ++++-- + drivers/pcmcia/pxa2xx_base.h | 3 + + drivers/pcmcia/pxa2xx_cm_x255.c | 2 +- + drivers/pcmcia/pxa2xx_cm_x270.c | 2 +- + drivers/pcmcia/pxa2xx_e740.c | 2 +- + drivers/pcmcia/pxa2xx_lubbock.c | 14 +- + drivers/pcmcia/pxa2xx_mainstone.c | 2 +- + drivers/pcmcia/pxa2xx_palmld.c | 2 +- + drivers/pcmcia/pxa2xx_palmtx.c | 2 +- + drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- + drivers/pcmcia/pxa2xx_trizeps4.c | 4 +- + drivers/pcmcia/pxa2xx_viper.c | 2 +- + drivers/pcmcia/rsrc_mgr.c | 1 + + drivers/pcmcia/sa1100_assabet.c | 2 +- + drivers/pcmcia/sa1100_badge4.c | 11 +- + drivers/pcmcia/sa1100_cerf.c | 2 +- + drivers/pcmcia/sa1100_generic.c | 11 +- + drivers/pcmcia/sa1100_h3600.c | 4 +- + drivers/pcmcia/sa1100_jornada720.c | 42 ++-- + drivers/pcmcia/sa1100_neponset.c | 13 +- + drivers/pcmcia/sa1100_shannon.c | 2 +- + drivers/pcmcia/sa1100_simpad.c | 2 +- + drivers/pcmcia/sa1111_generic.c | 69 ++++- + drivers/pcmcia/sa1111_generic.h | 17 +- + drivers/pcmcia/sa11xx_base.c | 99 ++++--- + drivers/pcmcia/sa11xx_base.h | 2 + + drivers/pcmcia/soc_common.c | 225 ++++++-------- + drivers/pcmcia/soc_common.h | 10 +- + drivers/pcmcia/tcic.c | 29 +-- + drivers/pcmcia/topic.h | 15 +- + drivers/scsi/pcmcia/aha152x_stub.c | 41 +-- + drivers/scsi/pcmcia/fdomain_stub.c | 43 +-- + drivers/scsi/pcmcia/qlogic_stub.c | 44 +-- + drivers/scsi/pcmcia/sym53c500_cs.c | 41 +-- + drivers/serial/serial_cs.c | 140 +++------- + drivers/ssb/pcmcia.c | 232 ++++++++------- + drivers/staging/comedi/drivers/cb_das16_cs.c | 220 ++++---------- + drivers/staging/comedi/drivers/das08_cs.c | 202 ++++--------- + drivers/staging/comedi/drivers/ni_daq_700.c | 236 +++++---------- + drivers/staging/comedi/drivers/ni_daq_dio24.c | 235 +++++---------- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 224 +++++--------- + drivers/staging/comedi/drivers/ni_mio_cs.c | 127 ++------ + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 215 ++++---------- + drivers/staging/netwave/netwave_cs.c | 88 +++---- + drivers/staging/wavelan/wavelan_cs.c | 24 -- + drivers/telephony/ixj_pcmcia.c | 36 +-- + drivers/usb/host/sl811_cs.c | 46 +-- + include/linux/pci_ids.h | 2 + + include/pcmcia/ds.h | 76 ++--- + include/pcmcia/ss.h | 2 +- + 104 files changed, 2748 insertions(+), 4184 deletions(-) +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 27 ++ + drivers/leds/Makefile | 3 + + drivers/leds/leds-adp5520.c | 230 +++++++++++++++ + drivers/leds/leds-alix2.c | 115 ++++++-- + drivers/leds/leds-lt3593.c | 217 ++++++++++++++ + drivers/leds/leds-ss4200.c | 556 +++++++++++++++++++++++++++++++++++ + drivers/video/backlight/corgi_lcd.c | 5 +- + drivers/video/backlight/lcd.c | 2 +- + 8 files changed, 1121 insertions(+), 34 deletions(-) + create mode 100644 drivers/leds/leds-adp5520.c + create mode 100644 drivers/leds/leds-lt3593.c + create mode 100644 drivers/leds/leds-ss4200.c +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + Documentation/laptops/thinkpad-acpi.txt | 51 +++++++----------------------- + drivers/platform/x86/thinkpad_acpi.c | 24 ++++++++++++++- + 2 files changed, 35 insertions(+), 40 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +Auto-merging kernel/softlockup.c +Merge made by recursive. + arch/x86/kernel/kgdb.c | 12 ++++++++---- + include/linux/sched.h | 4 ++++ + kernel/kgdb.c | 31 +++++++++++++++++++++++-------- + kernel/softlockup.c | 16 ++++++++++++++++ + 4 files changed, 51 insertions(+), 12 deletions(-) +Merging slab/for-next +$ git merge slab/for-next +Auto-merging include/linux/rcupdate.h +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/ABI/testing/sysfs-kernel-slab | 109 +- + Documentation/vm/slqbinfo.c | 1047 ++++++++ + include/linux/rcu_types.h | 18 + + include/linux/rcupdate.h | 11 +- + include/linux/slab.h | 10 +- + include/linux/slqb_def.h | 301 +++ + init/Kconfig | 7 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3793 +++++++++++++++++++++++++++ + mm/slub.c | 18 +- + 11 files changed, 5270 insertions(+), 65 deletions(-) + create mode 100644 Documentation/vm/slqbinfo.c + create mode 100644 include/linux/rcu_types.h + create mode 100644 include/linux/slqb_def.h + create mode 100644 mm/slqb.c +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 +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/asic3.c +Auto-merging drivers/mfd/twl4030-core.c +Auto-merging drivers/rtc/rtc-pcf50633.c +Auto-merging include/linux/i2c/twl4030.h +Auto-merging sound/soc/codecs/wm8350.c +Merge made by recursive. + arch/arm/mach-omap2/board-rx51-peripherals.c | 118 +++-- + drivers/gpio/adp5520-gpio.c | 36 +- + drivers/gpio/wm831x-gpio.c | 4 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5520-keys.c | 220 ++++++++ + drivers/input/misc/pcf50633-input.c | 7 +- + drivers/mfd/88pm8607.c | 302 ++++++++++ + drivers/mfd/Kconfig | 36 ++- + drivers/mfd/Makefile | 4 + + drivers/mfd/ab3100-core.c | 3 - + drivers/mfd/ab4500-core.c | 208 +++++++ + drivers/mfd/adp5520.c | 379 +++++++++++++ + drivers/mfd/asic3.c | 2 +- + drivers/mfd/ezx-pcap.c | 1 - + drivers/mfd/mc13783-core.c | 751 +++++++++++++++++--------- + drivers/mfd/pcf50633-adc.c | 5 +- + drivers/mfd/pcf50633-core.c | 76 ++-- + drivers/mfd/tps65010.c | 30 +- + drivers/mfd/twl4030-core.c | 11 +- + drivers/mfd/twl4030-power.c | 70 ++- + drivers/mfd/wm831x-core.c | 216 ++++++-- + drivers/mfd/wm8350-core.c | 769 +------------------------- + drivers/mfd/wm8350-irq.c | 529 ++++++++++++++++++ + drivers/power/pcf50633-charger.c | 3 +- + drivers/power/wm8350_power.c | 63 +-- + drivers/regulator/pcf50633-regulator.c | 5 +- + drivers/regulator/wm8350-regulator.c | 10 +- + drivers/rtc/rtc-pcf50633.c | 5 +- + drivers/rtc/rtc-wm8350.c | 25 +- + drivers/video/backlight/adp5520_bl.c | 123 +++-- + include/linux/i2c/tps65010.h | 19 + + include/linux/i2c/twl4030.h | 9 + + include/linux/mfd/88pm8607.h | 217 ++++++++ + include/linux/mfd/ab4500.h | 262 +++++++++ + include/linux/mfd/adp5520.h | 299 ++++++++++ + include/linux/mfd/mc13783-private.h | 208 +------- + include/linux/mfd/mc13783.h | 120 ++++- + include/linux/mfd/pcf50633/core.h | 10 +- + include/linux/mfd/wm831x/core.h | 3 + + include/linux/mfd/wm8350/core.h | 14 +- + include/linux/mfd/wm8350/gpio.h | 18 + + sound/soc/codecs/wm8350.c | 25 +- + 43 files changed, 3698 insertions(+), 1528 deletions(-) + create mode 100644 drivers/input/keyboard/adp5520-keys.c + create mode 100644 drivers/mfd/88pm8607.c + create mode 100644 drivers/mfd/ab4500-core.c + create mode 100644 drivers/mfd/adp5520.c + create mode 100644 drivers/mfd/wm8350-irq.c + create mode 100644 include/linux/mfd/88pm8607.h + create mode 100644 include/linux/mfd/ab4500.h + create mode 100644 include/linux/mfd/adp5520.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/drm_irq.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging include/drm/drmP.h +Merge made by recursive. + drivers/gpu/drm/drm_fops.c | 98 +++++++++++++++++++++++++++++++++++- + drivers/gpu/drm/drm_irq.c | 95 ++++++++++++++++++++++++++++++++++ + drivers/gpu/drm/drm_stub.c | 2 + + drivers/gpu/drm/i915/i915_drv.c | 1 + + drivers/gpu/drm/radeon/radeon_cp.c | 45 ++--------------- + include/drm/drm.h | 33 +++++++++++- + include/drm/drmP.h | 26 ++++++++++ + 7 files changed, 255 insertions(+), 45 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Removing drivers/regulator/mc13783.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 8f80538] Merge remote branch 'voltage/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/mfd/Makefile | 2 +- + drivers/regulator/88pm8607.c | 685 +++++++++++++++++++++++++++++++++ + drivers/regulator/Kconfig | 13 + + drivers/regulator/Makefile | 4 +- + drivers/regulator/ab3100.c | 33 +-- + drivers/regulator/core.c | 235 +++++++----- + drivers/regulator/da903x.c | 2 +- + drivers/regulator/max8660.c | 510 ++++++++++++++++++++++++ + drivers/regulator/mc13783-regulator.c | 245 ++++++++++++ + drivers/regulator/mc13783.c | 410 -------------------- + drivers/regulator/wm831x-dcdc.c | 207 +++++++++- + drivers/regulator/wm831x-ldo.c | 6 +- + include/linux/mfd/wm831x/pdata.h | 17 + + include/linux/regulator/consumer.h | 2 + + include/linux/regulator/machine.h | 6 +- + include/linux/regulator/max8660.h | 57 +++ + 16 files changed, 1877 insertions(+), 557 deletions(-) + create mode 100644 drivers/regulator/88pm8607.c + create mode 100644 drivers/regulator/max8660.c + create mode 100644 drivers/regulator/mc13783-regulator.c + delete mode 100644 drivers/regulator/mc13783.c + create mode 100644 include/linux/regulator/max8660.h +Merging security-testing/next +$ git merge security-testing/next +Resolved 'Documentation/dontdiff' using previous resolution. +Auto-merging Documentation/dontdiff +CONFLICT (content): Merge conflict in Documentation/dontdiff +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/char/tpm/tpm.c +Auto-merging fs/exec.c +Auto-merging include/linux/Kbuild +Auto-merging security/lsm_audit.c +Removing security/root_plug.c +Removing security/selinux/include/av_inherit.h +Removing security/selinux/include/av_perm_to_string.h +Removing security/selinux/include/av_permissions.h +Removing security/selinux/include/class_to_string.h +Removing security/selinux/include/common_perm_to_string.h +Removing security/selinux/include/flask.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1c2a73] Merge remote branch 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/dontdiff | 3 + + Documentation/kernel-parameters.txt | 10 - + drivers/char/tpm/tpm.c | 2 +- + drivers/char/tpm/tpm_tis.c | 11 +- + fs/exec.c | 4 - + fs/file_table.c | 2 - + fs/inode.c | 10 - + fs/namespace.c | 20 +- + fs/open.c | 27 +- + include/linux/Kbuild | 1 + + include/linux/lsm_audit.h | 18 +- + include/linux/securebits.h | 24 +- + include/linux/security.h | 48 ++- + include/linux/tpm.h | 9 +- + kernel/capability.c | 9 +- + kernel/kmod.c | 8 +- + mm/mmap.c | 4 - + scripts/selinux/Makefile | 4 +- + scripts/selinux/genheaders/.gitignore | 1 + + scripts/selinux/genheaders/Makefile | 5 + + scripts/selinux/genheaders/genheaders.c | 118 +++ + scripts/selinux/mdp/mdp.c | 151 +--- + security/Kconfig | 45 +- + security/Makefile | 1 - + security/capability.c | 21 +- + security/commoncap.c | 2 +- + security/integrity/ima/Kconfig | 1 + + security/lsm_audit.c | 4 + + security/min_addr.c | 3 + + security/root_plug.c | 90 --- + security/security.c | 61 ++- + security/selinux/.gitignore | 2 + + security/selinux/Makefile | 10 +- + security/selinux/avc.c | 76 +-- + security/selinux/hooks.c | 25 +- + security/selinux/include/av_inherit.h | 34 - + security/selinux/include/av_perm_to_string.h | 183 ----- + security/selinux/include/av_permissions.h | 870 ---------------------- + security/selinux/include/avc_ss.h | 21 +- + security/selinux/include/class_to_string.h | 80 -- + security/selinux/include/classmap.h | 150 ++++ + security/selinux/include/common_perm_to_string.h | 58 -- + security/selinux/include/flask.h | 91 --- + security/selinux/include/security.h | 13 +- + security/selinux/selinuxfs.c | 4 +- + security/selinux/ss/Makefile | 2 +- + security/selinux/ss/mls.c | 2 +- + security/selinux/ss/policydb.c | 47 ++- + security/selinux/ss/policydb.h | 7 +- + security/selinux/ss/services.c | 555 +++++++------- + security/tomoyo/realpath.c | 13 +- + 51 files changed, 953 insertions(+), 2007 deletions(-) + create mode 100644 scripts/selinux/genheaders/.gitignore + create mode 100644 scripts/selinux/genheaders/Makefile + create mode 100644 scripts/selinux/genheaders/genheaders.c + delete mode 100644 security/root_plug.c + create mode 100644 security/selinux/.gitignore + delete mode 100644 security/selinux/include/av_inherit.h + delete mode 100644 security/selinux/include/av_perm_to_string.h + delete mode 100644 security/selinux/include/av_permissions.h + delete mode 100644 security/selinux/include/class_to_string.h + create mode 100644 security/selinux/include/classmap.h + delete mode 100644 security/selinux/include/common_perm_to_string.h + delete mode 100644 security/selinux/include/flask.h +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. + drivers/watchdog/s3c2410_wdt.c | 89 ++++++++++++++++++++++++++++++++++++++- + 1 files changed, 86 insertions(+), 3 deletions(-) +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 43 +++++++++++++++++++++++++++++++++++++++-- + drivers/pci/intel-iommu.c | 27 ++++++++++++++++++------- + drivers/pci/intr_remapping.c | 3 +- + include/linux/intel-iommu.h | 1 + + 4 files changed, 62 insertions(+), 12 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging Documentation/filesystems/00-INDEX +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/exofs.txt | 23 ++-- + drivers/scsi/osd/osd_initiator.c | 26 +++- + drivers/scsi/osd/osd_uld.c | 259 ++++++++++++++++++++++++----------- + fs/exofs/inode.c | 23 ++- + fs/exofs/super.c | 11 ++ + include/scsi/osd_initiator.h | 55 ++++++-- + include/scsi/osd_sense.h | 3 + + 8 files changed, 283 insertions(+), 119 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging arch/arm/mach-s3c6410/Kconfig +Auto-merging drivers/media/video/cx23885/cx23885-core.c +Auto-merging drivers/media/video/saa7134/saa7134-core.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/net/bonding/bond_alb.c +Auto-merging drivers/net/sky2.c +Auto-merging drivers/net/wireless/ath/ath5k/base.h +Auto-merging drivers/net/wireless/b43/main.c +Auto-merging drivers/net/wireless/b43legacy/main.c +Auto-merging drivers/scsi/3w-9xxx.c +Auto-merging drivers/scsi/3w-xxxx.c +Auto-merging drivers/video/atmel_lcdfb.c +Auto-merging drivers/video/omap/lcd_ams_delta.c +Auto-merging drivers/video/omap/lcd_mipid.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/inode.c +Auto-merging kernel/irq/spurious.c +Auto-merging kernel/time/clocksource.c +Auto-merging net/sched/act_api.c +Auto-merging sound/oss/Kconfig +Auto-merging sound/pci/ice1712/juli.c +Merge made by recursive. + Documentation/edac.txt | 7 ++--- + Documentation/oops-tracing.txt | 2 + + Documentation/sysctl/kernel.txt | 6 ++-- + Documentation/timers/hpet.txt | 2 +- + arch/arm/mach-s3c2400/Kconfig | 6 ---- + arch/arm/mach-s3c2410/Kconfig | 2 - + arch/arm/mach-s3c2412/Kconfig | 4 --- + arch/arm/mach-s3c2440/Kconfig | 3 -- + arch/arm/mach-s3c2442/Kconfig | 4 --- + arch/arm/mach-s3c2443/Kconfig | 2 - + arch/arm/mach-s3c6400/Kconfig | 2 - + arch/arm/mach-s3c6410/Kconfig | 2 - + arch/arm/mach-s5pc100/Kconfig | 2 - + arch/arm/plat-mxc/include/mach/mx2x.h | 2 +- + arch/arm/plat-s3c/Kconfig | 2 - + arch/arm/plat-s3c24xx/Kconfig | 2 - + arch/arm/plat-s3c64xx/Kconfig | 2 - + arch/arm/plat-s5pc1xx/Kconfig | 2 - + arch/cris/arch-v10/mm/fault.c | 3 +- + arch/cris/arch-v10/mm/tlb.c | 22 ---------------- + arch/parisc/kernel/perf.c | 2 +- + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/oprofile/op_model_cell.c | 2 +- + drivers/Kconfig | 2 - + drivers/acpi/video_detect.c | 10 +++--- + drivers/ata/libata-sff.c | 6 ++-- + drivers/ata/pata_cs5535.c | 2 +- + drivers/block/ataflop.c | 3 -- + drivers/char/tty_ioctl.c | 2 +- + drivers/cpuidle/governor.c | 4 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/isdn/act2000/Kconfig | 4 --- + drivers/isdn/capi/Kconfig | 4 --- + drivers/isdn/hysdn/Kconfig | 4 --- + drivers/isdn/i4l/isdn_net.c | 2 +- + drivers/isdn/icn/Kconfig | 4 --- + drivers/isdn/pcbit/Kconfig | 4 --- + drivers/isdn/sc/Kconfig | 4 --- + drivers/md/dm-crypt.c | 2 +- + drivers/media/dvb/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb/frontends/drx397xD.c | 2 +- + drivers/media/video/ov772x.c | 2 +- + drivers/mmc/card/sdio_uart.c | 40 +++++++++++++++------------- + drivers/mtd/chips/Kconfig | 3 -- + drivers/mtd/devices/Kconfig | 3 -- + drivers/mtd/lpddr/Kconfig | 3 -- + drivers/mtd/maps/Kconfig | 2 - + drivers/mtd/nand/Kconfig | 2 - + drivers/mtd/onenand/Kconfig | 4 --- + drivers/mtd/ubi/Kconfig | 2 - + drivers/net/bonding/bond_alb.c | 2 +- + drivers/net/irda/smsc-ircc2.c | 2 +- + drivers/net/ps3_gelic_wireless.h | 2 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/s2io.c | 2 +- + drivers/net/sky2.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/wireless/ath/ath5k/base.h | 2 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 2 +- + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/b43legacy/main.c | 2 +- + drivers/net/wireless/orinoco/hermes_dld.c | 4 +- + drivers/platform/Kconfig | 2 - + drivers/rtc/rtc-ds1511.c | 4 +- + drivers/rtc/rtc-stk17ta8.c | 2 +- + drivers/s390/block/dasd_proc.c | 2 +- + drivers/scsi/3w-9xxx.c | 2 +- + drivers/scsi/3w-xxxx.c | 2 +- + drivers/scsi/aic7xxx/aic79xx.seq | 2 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx.seq | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 2 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/dc395x.c | 2 +- + drivers/scsi/nsp32.c | 2 +- + drivers/spi/spidev.c | 2 +- + drivers/staging/rtl8187se/r8180.h | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/uwb/neh.c | 2 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/fb_defio.c | 2 +- + drivers/video/omap/lcd_ams_delta.c | 4 +- + drivers/video/omap/lcd_mipid.c | 4 +- + drivers/video/sgivwfb.c | 4 +- + drivers/watchdog/sb_wdog.c | 4 +- + fs/debugfs/inode.c | 6 ++-- + fs/ext3/inode.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/inode.c | 2 +- + fs/ocfs2/blockcheck.c | 2 +- + fs/qnx4/bitmap.c | 2 +- + fs/qnx4/dir.c | 6 ++-- + fs/qnx4/inode.c | 26 +++++++++--------- + fs/qnx4/namei.c | 6 ++-- + include/linux/dm-log-userspace.h | 2 +- + include/linux/spi/spi_bitbang.h | 2 +- + include/linux/sysctl.h | 10 +++--- + include/sound/ac97_codec.h | 2 +- + include/video/sgivw.h | 11 +++---- + ipc/msg.c | 2 +- + kernel/irq/chip.c | 4 +- + kernel/irq/spurious.c | 2 +- + kernel/time/clocksource.c | 2 +- + lib/idr.c | 4 +- + mm/kmemleak.c | 4 +- + mm/memcontrol.c | 2 +- + mm/truncate.c | 2 +- + net/bluetooth/bnep/core.c | 4 +- + net/sched/act_api.c | 2 +- + net/sctp/sm_statefuns.c | 2 +- + samples/Kconfig | 3 -- + sound/Kconfig | 4 --- + sound/oss/Kconfig | 2 - + sound/pci/hda/patch_cirrus.c | 2 +- + sound/pci/ice1712/juli.c | 2 +- + sound/synth/emux/soundfont.c | 2 +- + 117 files changed, 152 insertions(+), 267 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging drivers/pci/pci.c +Removing kernel/power/swsusp.c +Merge made by recursive. + drivers/acpi/glue.c | 3 + + drivers/acpi/scan.c | 1 + + drivers/base/core.c | 4 + + drivers/base/power/Makefile | 2 +- + drivers/base/power/common.c | 283 ++++++++++++++++ + drivers/base/power/main.c | 677 ++++++++++++++++++++++++++++++++++++--- + drivers/base/power/power.h | 42 ++- + drivers/base/power/runtime.c | 4 - + drivers/base/power/sysfs.c | 47 +++ + drivers/pci/pci.c | 1 + + drivers/pci/pcie/portdrv_core.c | 1 + + include/linux/device.h | 11 + + include/linux/pm.h | 13 +- + include/linux/pm_link.h | 30 ++ + include/linux/resume-trace.h | 7 + + kernel/power/Kconfig | 14 + + kernel/power/Makefile | 2 +- + kernel/power/hibernate.c | 26 ++ + kernel/power/main.c | 31 ++- + kernel/power/process.c | 14 +- + kernel/power/swap.c | 107 ++++++- + kernel/power/swsusp.c | 188 ----------- + 22 files changed, 1241 insertions(+), 267 deletions(-) + create mode 100644 drivers/base/power/common.c + create mode 100644 include/linux/pm_link.h + delete mode 100644 kernel/power/swsusp.c +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/exec.c +Auto-merging fs/inode.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging fs/read_write.c +Auto-merging include/linux/fs.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Merge made by recursive. + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 2 +- + fs/nfsd/vfs.c | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++++++++++------------ + fs/notify/fsnotify.c | 101 +++++++++--- + fs/notify/fsnotify.h | 16 ++- + fs/notify/group.c | 142 +++++++--------- + fs/notify/inode_mark.c | 210 ++++++++++++++---------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 112 +++++++++---- + fs/notify/inotify/inotify_user.c | 301 +++++++++++++++++++++------------- + fs/notify/notification.c | 170 ++++++++++--------- + fs/open.c | 2 +- + fs/read_write.c | 8 +- + include/linux/fs.h | 2 +- + include/linux/fsnotify.h | 68 ++++---- + include/linux/fsnotify_backend.h | 110 ++++++++----- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 222 ++++++++++++++----------- + kernel/audit_watch.c | 295 +++++++++++++++++++-------------- + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 9 +- + 26 files changed, 1186 insertions(+), 883 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Auto-merging drivers/net/irda/irda-usb.c +Merge made by recursive. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 274651bf] Merge remote branch 'hwlat/for-linus' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/for-jens +$ git merge drbd/for-jens +Already up-to-date. +Merging catalin/for-next +$ git merge catalin/for-next +Auto-merging kernel/module.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/kmemleak.c +Merge made by recursive. + include/linux/kmemleak.h | 6 +- + kernel/module.c | 13 ++- + lib/Kconfig.debug | 1 + + mm/kmemleak.c | 188 +++++++++++++++++++++++++--------------------- + mm/slab.c | 10 ++- + 5 files changed, 118 insertions(+), 100 deletions(-) +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'drivers/net/Kconfig' 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 +Auto-merging drivers/net/Kconfig +CONFLICT (content): Merge conflict in 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 ec93c8f] 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 | 1557 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 216 ++++++ + drivers/vbus/pci-bridge.c | 1029 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 415 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 81 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 296 ++++++++ + lib/shm_signal.c | 192 ++++++ + 20 files changed, 4354 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 Documentation/edac.txt +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 43 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2466 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +$ git am -3 ../patches/0001-i7core_edac-do-not-export-static-functions.patch +Applying: i7core_edac: do not export static functions +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/pci/legacy.c +$ git add . +$ git commit -v -a --amend +[master eda44b9] Merge remote branch 'i7core_edac/linux_next' +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Merge made by recursive. + arch/microblaze/include/asm/prom.h | 135 +-------------------------------- + arch/microblaze/kernel/head.S | 2 +- + arch/microblaze/kernel/prom.c | 23 ------ + arch/powerpc/include/asm/prom.h | 147 +----------------------------------- + arch/powerpc/kernel/prom.c | 23 ------ + arch/sparc/include/asm/prom.h | 55 +------------- + drivers/of/base.c | 26 ++++++- + include/linux/of.h | 103 +++++++++++++++++++++++++ + include/linux/of_fdt.h | 86 +++++++++++++++++++++ + 9 files changed, 221 insertions(+), 379 deletions(-) + create mode 100644 include/linux/of_fdt.h +Merging limits/writable_limits +$ git merge limits/writable_limits +Auto-merging fs/proc/base.c +Auto-merging include/linux/security.h +Auto-merging kernel/sys.c +Auto-merging security/capability.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Merge made by recursive. + fs/proc/base.c | 78 ++++++++++++++++++++++++++++++++++++++++- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 +++-- + kernel/posix-cpu-timers.c | 10 +++--- + kernel/sys.c | 68 ++++++++++++++++++++++++------------ + security/capability.c | 3 +- + security/security.c | 5 ++- + security/selinux/hooks.c | 10 +++-- + 9 files changed, 146 insertions(+), 41 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Resolved 'arch/x86/kernel/kgdb.c' using previous resolution. +Resolved 'kernel/irq/chip.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/filesystems/proc.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/irq.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/time.c +Auto-merging arch/x86/Kconfig +Removing arch/x86/include/asm/apicnum.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging arch/x86/kernel/kgdb.c +CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/x86/kernel/x8664_ksyms_64.c +Auto-merging arch/x86/mm/pat.c +Auto-merging drivers/pci/dmar.c +Auto-merging drivers/pci/intel-iommu.c +Auto-merging drivers/pci/intr_remapping.c +Auto-merging drivers/xen/cpu_hotplug.c +Auto-merging include/linux/kernel.h +Auto-merging include/linux/net.h +Auto-merging include/linux/rcupdate.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/irq/chip.c +CONFLICT (content): Merge conflict in kernel/irq/chip.c +Auto-merging kernel/irq/spurious.c +Auto-merging kernel/kgdb.c +Auto-merging kernel/trace/trace.c +Removing tools/perf/util/module.c +Removing tools/perf/util/module.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9459b40] Merge remote branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/trace.txt | 254 +---- + Documentation/RCU/whatisRCU.txt | 2 +- + Documentation/feature-removal-schedule.txt | 15 + + Documentation/filesystems/proc.txt | 3 +- + Documentation/kernel-parameters.txt | 27 +- + Documentation/trace/ftrace-design.txt | 13 +- + Documentation/trace/kprobetrace.txt | 149 +++ + arch/ia64/kernel/pci-swiotlb.c | 4 +- + arch/powerpc/Kconfig.debug | 2 +- + arch/powerpc/configs/pseries_defconfig | 2 +- + arch/powerpc/include/asm/emulated_ops.h | 19 +- + arch/powerpc/include/asm/hvcall.h | 2 + + arch/powerpc/include/asm/reg.h | 2 + + arch/powerpc/include/asm/trace.h | 133 +++ + arch/powerpc/kernel/align.c | 12 +- + arch/powerpc/kernel/entry_64.S | 4 +- + arch/powerpc/kernel/exceptions-64s.S | 3 + + arch/powerpc/kernel/irq.c | 6 + + arch/powerpc/kernel/perf_event.c | 2 +- + arch/powerpc/kernel/power5+-pmu.c | 4 - + arch/powerpc/kernel/power5-pmu.c | 6 +- + arch/powerpc/kernel/power6-pmu.c | 2 +- + arch/powerpc/kernel/power7-pmu.c | 6 +- + arch/powerpc/kernel/ppc970-pmu.c | 4 - + arch/powerpc/kernel/setup-common.c | 1 + + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/powerpc/kernel/time.c | 6 + + arch/powerpc/kernel/traps.c | 18 +- + arch/powerpc/lib/copypage_64.S | 4 +- + arch/powerpc/platforms/pseries/hvCall.S | 132 ++- + arch/powerpc/platforms/pseries/hvCall_inst.c | 38 + + arch/powerpc/platforms/pseries/lpar.c | 33 + + arch/s390/include/asm/cputime.h | 8 + + arch/s390/kernel/ftrace.c | 67 +-- + arch/s390/kernel/s390_ext.c | 2 + + arch/s390/kernel/vtime.c | 2 + + arch/x86/Kconfig | 14 +- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/Kconfig.debug | 23 + + arch/x86/Makefile | 3 + + arch/x86/Makefile_32.cpu | 2 +- + arch/x86/boot/compressed/head_64.S | 3 +- + arch/x86/include/asm/acpi.h | 1 + + arch/x86/include/asm/amd_iommu.h | 4 - + arch/x86/include/asm/apic.h | 21 +- + arch/x86/include/asm/apicnum.h | 12 - + arch/x86/include/asm/cacheflush.h | 1 + + arch/x86/include/asm/calgary.h | 2 - + arch/x86/include/asm/cmpxchg_32.h | 218 ++--- + arch/x86/include/asm/cmpxchg_64.h | 234 ++--- + arch/x86/include/asm/elf.h | 20 +- + arch/x86/include/asm/entry_arch.h | 2 +- + arch/x86/include/asm/gart.h | 9 +- + arch/x86/include/asm/hardirq.h | 2 +- + arch/x86/include/asm/hpet.h | 7 +- + arch/x86/include/asm/hw_irq.h | 34 +- + arch/x86/include/asm/inat.h | 220 ++++ + arch/x86/include/asm/inat_types.h | 29 + + arch/x86/include/asm/insn.h | 184 ++++ + arch/x86/include/asm/iommu.h | 3 +- + arch/x86/include/asm/irq.h | 3 +- + arch/x86/include/asm/irq_vectors.h | 2 +- + arch/x86/include/asm/k8.h | 5 +- + arch/x86/include/asm/mce.h | 14 +- + arch/x86/include/asm/microcode.h | 2 + + arch/x86/include/asm/mpspec.h | 16 +- + arch/x86/include/asm/msr.h | 8 +- + arch/x86/include/asm/page_types.h | 3 +- + arch/x86/include/asm/perf_event.h | 13 +- + arch/x86/include/asm/ptrace.h | 62 ++ + arch/x86/include/asm/sections.h | 6 + + arch/x86/include/asm/string_32.h | 9 + + arch/x86/include/asm/swiotlb.h | 5 +- + arch/x86/include/asm/syscalls.h | 8 +- + arch/x86/include/asm/system.h | 2 - + arch/x86/include/asm/uaccess.h | 1 - + arch/x86/include/asm/uaccess_32.h | 27 +- + arch/x86/include/asm/uaccess_64.h | 19 +- + arch/x86/include/asm/uv/uv_irq.h | 14 +- + arch/x86/include/asm/x86_init.h | 10 + + arch/x86/kernel/acpi/boot.c | 1 + + arch/x86/kernel/amd_iommu.c | 2 +- + arch/x86/kernel/amd_iommu_init.c | 25 +- + arch/x86/kernel/aperture_64.c | 4 +- + arch/x86/kernel/apic/Makefile | 2 +- + arch/x86/kernel/apic/apic.c | 25 +- + arch/x86/kernel/apic/apic_noop.c | 200 ++++ + arch/x86/kernel/apic/bigsmp_32.c | 13 +- + arch/x86/kernel/apic/es7000_32.c | 16 +- + arch/x86/kernel/apic/io_apic.c | 321 +++--- + arch/x86/kernel/apic/nmi.c | 11 +- + arch/x86/kernel/apic/numaq_32.c | 13 +- + arch/x86/kernel/apic/probe_32.c | 2 +- + arch/x86/kernel/apic/summit_32.c | 10 +- + arch/x86/kernel/apm_32.c | 14 +- + arch/x86/kernel/cpu/common.c | 4 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce-inject.c | 22 +- + arch/x86/kernel/cpu/mcheck/mce.c | 94 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 31 +- + arch/x86/kernel/cpu/perf_event.c | 185 +++- + arch/x86/kernel/cpuid.c | 17 +- + arch/x86/kernel/crash.c | 5 +- + arch/x86/kernel/dumpstack.c | 7 +- + arch/x86/kernel/entry_32.S | 31 +- + arch/x86/kernel/entry_64.S | 29 +- + arch/x86/kernel/ftrace.c | 101 +-- + arch/x86/kernel/head_64.S | 3 +- + arch/x86/kernel/hpet.c | 60 +- + arch/x86/kernel/ioport.c | 11 +- + arch/x86/kernel/irq.c | 110 ++- + arch/x86/kernel/irq_32.c | 45 - + arch/x86/kernel/irq_64.c | 58 - + arch/x86/kernel/irqinit.c | 4 +- + arch/x86/kernel/kgdb.c | 4 +- + arch/x86/kernel/kprobes.c | 248 ++--- + arch/x86/kernel/microcode_amd.c | 70 +- + arch/x86/kernel/microcode_core.c | 8 +- + arch/x86/kernel/msr.c | 16 +- + arch/x86/kernel/pci-calgary_64.c | 19 +- + arch/x86/kernel/pci-dma.c | 36 +- + arch/x86/kernel/pci-gart_64.c | 24 +- + arch/x86/kernel/pci-nommu.c | 9 - + arch/x86/kernel/pci-swiotlb.c | 19 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 35 +- + arch/x86/kernel/ptrace.c | 112 ++ + arch/x86/kernel/reboot.c | 4 +- + arch/x86/kernel/setup.c | 16 +- + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/uv_irq.c | 239 ++++- + arch/x86/kernel/uv_time.c | 77 +- + arch/x86/kernel/visws_quirks.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 28 + + arch/x86/kernel/x8664_ksyms_64.c | 2 +- + arch/x86/kernel/x86_init.c | 7 + + arch/x86/lib/.gitignore | 1 + + arch/x86/lib/Makefile | 13 + + arch/x86/lib/copy_user_64.S | 4 +- + arch/x86/lib/inat.c | 90 ++ + arch/x86/lib/insn.c | 516 +++++++++ + arch/x86/lib/msr.c | 46 +- + arch/x86/lib/usercopy_32.c | 10 +- + arch/x86/lib/x86-opcode-map.txt | 893 +++++++++++++++ + arch/x86/mm/extable.c | 31 - + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/init_32.c | 10 +- + arch/x86/mm/init_64.c | 35 +- + arch/x86/mm/ioremap.c | 26 +- + arch/x86/mm/k8topology_64.c | 89 +- + arch/x86/mm/numa_32.c | 4 +- + arch/x86/mm/numa_64.c | 221 ++++- + arch/x86/mm/pageattr.c | 16 + + arch/x86/mm/pat.c | 7 +- + arch/x86/mm/srat_64.c | 29 +- + arch/x86/mm/testmmiotrace.c | 29 +- + arch/x86/tools/Makefile | 15 + + arch/x86/tools/distill.awk | 42 + + arch/x86/tools/gen-insn-attr-x86.awk | 380 +++++++ + arch/x86/tools/test_get_len.c | 108 ++ + arch/x86/xen/smp.c | 2 +- + drivers/acpi/numa.c | 10 +- + drivers/edac/edac_mce_amd.c | 21 +- + drivers/misc/sgi-xp/xpc_uv.c | 5 +- + drivers/pci/dmar.c | 7 +- + drivers/pci/intel-iommu.c | 6 +- + drivers/pci/intr_remapping.c | 89 ++- + drivers/pci/intr_remapping.h | 7 + + drivers/s390/cio/cio.c | 1 + + drivers/xen/cpu_hotplug.c | 2 +- + fs/proc/array.c | 11 + + fs/proc/stat.c | 19 +- + include/linux/bootmem.h | 1 + + include/linux/clocksource.h | 1 - + include/linux/compiler-gcc.h | 1 + + include/linux/compiler-gcc4.h | 6 + + include/linux/compiler.h | 15 + + include/linux/dmar.h | 25 +- + include/linux/ftrace_event.h | 43 +- + include/linux/hardirq.h | 24 + + include/linux/hpet.h | 2 + + include/linux/interrupt.h | 6 - + include/linux/irqflags.h | 2 +- + include/linux/kernel.h | 5 +- + include/linux/kernel_stat.h | 1 + + include/linux/kprobes.h | 2 + + include/linux/net.h | 1 + + include/linux/perf_counter.h | 3 + + include/linux/perf_event.h | 8 + + include/linux/poison.h | 16 +- + include/linux/ratelimit.h | 33 +- + include/linux/rcupdate.h | 6 + + include/linux/rcutiny.h | 95 ++ + include/linux/sched.h | 25 +- + include/linux/smp_lock.h | 21 +- + include/linux/srcu.h | 1 + + include/linux/swiotlb.h | 10 +- + include/linux/syscalls.h | 12 +- + include/linux/tick.h | 3 + + include/linux/timex.h | 9 +- + include/trace/events/bkl.h | 61 + + include/trace/events/irq.h | 8 +- + include/trace/events/mce.h | 69 ++ + include/trace/events/power.h | 2 - + include/trace/events/sched.h | 44 +- + include/trace/events/timer.h | 79 +- + include/trace/ftrace.h | 74 +- + include/trace/syscall.h | 13 +- + init/Kconfig | 9 + + kernel/Makefile | 1 + + kernel/cpuset.c | 27 +- + kernel/irq/chip.c | 4 +- + kernel/irq/manage.c | 2 +- + kernel/irq/proc.c | 2 + + kernel/irq/spurious.c | 14 +- + kernel/kgdb.c | 2 +- + kernel/kprobes.c | 72 +- + kernel/notifier.c | 2 +- + kernel/perf_event.c | 82 ++- + kernel/printk.c | 7 +- + kernel/rcupdate.c | 4 + + kernel/rcutiny.c | 291 +++++ + kernel/rcutorture.c | 31 +- + kernel/rcutree.c | 238 +++-- + kernel/rcutree.h | 15 +- + kernel/rcutree_plugin.h | 6 +- + kernel/rcutree_trace.c | 8 +- + kernel/sched.c | 138 ++- + kernel/sched_debug.c | 4 + + kernel/sched_fair.c | 35 +- + kernel/sched_rt.c | 61 +- + kernel/signal.c | 46 +- + kernel/smp.c | 11 +- + kernel/softirq.c | 2 +- + kernel/srcu.c | 74 +- + kernel/sysctl.c | 3 + + kernel/time.c | 1 - + kernel/time/tick-sched.c | 75 +- + kernel/time/timekeeping.c | 108 ++- + kernel/trace/Kconfig | 17 + + kernel/trace/Makefile | 1 + + kernel/trace/ftrace.c | 370 ++++--- + kernel/trace/ring_buffer.c | 15 +- + kernel/trace/trace.c | 4 +- + kernel/trace/trace.h | 71 +- + kernel/trace/trace_event_profile.c | 45 +- + kernel/trace/trace_events.c | 191 +++-- + kernel/trace/trace_events_filter.c | 423 +++++--- + kernel/trace/trace_export.c | 43 +- + kernel/trace/trace_kprobe.c | 1513 ++++++++++++++++++++++++++ + kernel/trace/trace_syscalls.c | 166 +++- + lib/kernel_lock.c | 20 +- + lib/ratelimit.c | 45 +- + lib/swiotlb.c | 46 +- + mm/bootmem.c | 24 + + net/core/sysctl_net_core.c | 2 + + net/core/utils.c | 2 + + scripts/recordmcount.pl | 211 ++-- + tools/perf/Documentation/perf-bench.txt | 120 ++ + tools/perf/Documentation/perf-probe.txt | 49 + + tools/perf/Documentation/perf-report.txt | 8 +- + tools/perf/Documentation/perf-timechart.txt | 5 +- + tools/perf/Makefile | 80 ++- + tools/perf/bench/bench.h | 16 + + tools/perf/bench/sched-messaging.c | 336 ++++++ + tools/perf/bench/sched-pipe.c | 124 +++ + tools/perf/builtin-annotate.c | 644 +++--------- + tools/perf/builtin-bench.c | 183 ++++ + tools/perf/builtin-help.c | 12 +- + tools/perf/builtin-probe.c | 435 ++++++++ + tools/perf/builtin-record.c | 304 ++---- + tools/perf/builtin-report.c | 961 +++------------- + tools/perf/builtin-sched.c | 312 +++--- + tools/perf/builtin-stat.c | 31 +- + tools/perf/builtin-timechart.c | 120 ++- + tools/perf/builtin-top.c | 305 +++--- + tools/perf/builtin-trace.c | 176 +--- + tools/perf/builtin.h | 2 + + tools/perf/command-list.txt | 2 + + tools/perf/design.txt | 2 + + tools/perf/perf.c | 62 +- + tools/perf/perf.h | 6 + + tools/perf/util/cache.h | 11 +- + tools/perf/util/callchain.c | 2 +- + tools/perf/util/callchain.h | 2 +- + tools/perf/util/color.h | 6 +- + tools/perf/util/data_map.c | 252 +++++ + tools/perf/util/data_map.h | 32 + + tools/perf/util/debug.c | 4 +- + tools/perf/util/debug.h | 7 +- + tools/perf/util/debugfs.c | 241 ++++ + tools/perf/util/debugfs.h | 25 + + tools/perf/util/event.c | 177 +++ + tools/perf/util/event.h | 47 +- + tools/perf/util/exec_cmd.h | 6 +- + tools/perf/util/header.c | 158 +++- + tools/perf/util/header.h | 34 +- + tools/perf/util/help.h | 6 +- + tools/perf/util/hist.c | 210 ++++ + tools/perf/util/hist.h | 50 + + tools/perf/util/include/asm/asm-offsets.h | 1 + + tools/perf/util/include/asm/bitops.h | 18 + + tools/perf/util/include/asm/byteorder.h | 2 + + tools/perf/util/include/asm/swab.h | 1 + + tools/perf/util/include/asm/uaccess.h | 14 + + tools/perf/util/include/linux/bitmap.h | 3 + + tools/perf/util/include/linux/bitops.h | 27 + + tools/perf/util/include/linux/compiler.h | 10 + + tools/perf/util/include/linux/ctype.h | 1 + + tools/perf/util/include/linux/kernel.h | 76 ++ + tools/perf/util/include/linux/string.h | 1 + + tools/perf/util/include/linux/types.h | 9 + + tools/perf/util/levenshtein.h | 6 +- + tools/perf/util/map.c | 72 ++- + tools/perf/util/module.c | 545 --------- + tools/perf/util/module.h | 53 - + tools/perf/util/parse-events.c | 69 +- + tools/perf/util/parse-events.h | 8 +- + tools/perf/util/parse-options.h | 6 +- + tools/perf/util/probe-finder.c | 732 +++++++++++++ + tools/perf/util/probe-finder.h | 57 + + tools/perf/util/quote.h | 6 +- + tools/perf/util/run-command.h | 6 +- + tools/perf/util/sigchain.h | 6 +- + tools/perf/util/sort.c | 290 +++++ + tools/perf/util/sort.h | 99 ++ + tools/perf/util/strbuf.h | 6 +- + tools/perf/util/string.c | 11 + + tools/perf/util/string.h | 7 +- + tools/perf/util/strlist.h | 6 +- + tools/perf/util/svghelper.h | 6 +- + tools/perf/util/symbol.c | 922 +++++++++++----- + tools/perf/util/symbol.h | 59 +- + tools/perf/util/thread.c | 167 ++- + tools/perf/util/thread.h | 31 +- + tools/perf/util/trace-event-info.c | 6 +- + tools/perf/util/trace-event-parse.c | 537 +++++++--- + tools/perf/util/trace-event-read.c | 7 +- + tools/perf/util/trace-event.h | 41 +- + tools/perf/util/types.h | 6 +- + tools/perf/util/util.h | 12 + + tools/perf/util/values.h | 6 +- + 343 files changed, 16108 insertions(+), 6260 deletions(-) + create mode 100644 Documentation/trace/kprobetrace.txt + create mode 100644 arch/powerpc/include/asm/trace.h + delete mode 100644 arch/x86/include/asm/apicnum.h + create mode 100644 arch/x86/include/asm/inat.h + create mode 100644 arch/x86/include/asm/inat_types.h + create mode 100644 arch/x86/include/asm/insn.h + create mode 100644 arch/x86/kernel/apic/apic_noop.c + create mode 100644 arch/x86/lib/.gitignore + create mode 100644 arch/x86/lib/inat.c + create mode 100644 arch/x86/lib/insn.c + create mode 100644 arch/x86/lib/x86-opcode-map.txt + create mode 100644 arch/x86/tools/Makefile + create mode 100644 arch/x86/tools/distill.awk + create mode 100644 arch/x86/tools/gen-insn-attr-x86.awk + create mode 100644 arch/x86/tools/test_get_len.c + create mode 100644 include/linux/rcutiny.h + create mode 100644 include/trace/events/bkl.h + create mode 100644 include/trace/events/mce.h + create mode 100644 kernel/rcutiny.c + create mode 100644 kernel/trace/trace_kprobe.c + create mode 100644 tools/perf/Documentation/perf-bench.txt + create mode 100644 tools/perf/Documentation/perf-probe.txt + create mode 100644 tools/perf/bench/bench.h + create mode 100644 tools/perf/bench/sched-messaging.c + create mode 100644 tools/perf/bench/sched-pipe.c + create mode 100644 tools/perf/builtin-bench.c + create mode 100644 tools/perf/builtin-probe.c + create mode 100644 tools/perf/util/data_map.c + create mode 100644 tools/perf/util/data_map.h + create mode 100644 tools/perf/util/debugfs.c + create mode 100644 tools/perf/util/debugfs.h + create mode 100644 tools/perf/util/event.c + create mode 100644 tools/perf/util/hist.c + create mode 100644 tools/perf/util/hist.h + create mode 100644 tools/perf/util/include/asm/asm-offsets.h + create mode 100644 tools/perf/util/include/asm/bitops.h + create mode 100644 tools/perf/util/include/asm/byteorder.h + create mode 100644 tools/perf/util/include/asm/swab.h + create mode 100644 tools/perf/util/include/asm/uaccess.h + create mode 100644 tools/perf/util/include/linux/bitmap.h + create mode 100644 tools/perf/util/include/linux/bitops.h + create mode 100644 tools/perf/util/include/linux/compiler.h + create mode 100644 tools/perf/util/include/linux/ctype.h + create mode 100644 tools/perf/util/include/linux/string.h + create mode 100644 tools/perf/util/include/linux/types.h + delete mode 100644 tools/perf/util/module.c + delete mode 100644 tools/perf/util/module.h + create mode 100644 tools/perf/util/probe-finder.c + create mode 100644 tools/perf/util/probe-finder.h + create mode 100644 tools/perf/util/sort.c + create mode 100644 tools/perf/util/sort.h +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Resolved 'arch/powerpc/platforms/pseries/hvCall.S' using previous resolution. +Resolved 'arch/x86/kvm/svm.c' using previous resolution. +Resolved 'kernel/softlockup.c' using previous resolution. +Resolved 'mm/percpu.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/entry.S +Auto-merging arch/powerpc/kernel/perf_callchain.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/powerpc/platforms/pseries/hvCall.S +CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hvCall.S +Auto-merging arch/x86/include/asm/system.h +Auto-merging arch/x86/kernel/apic/nmi.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging arch/x86/kvm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c +Auto-merging arch/x86/xen/smp.c +Auto-merging crypto/cryptd.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/crypto/padlock-aes.c +Auto-merging drivers/net/veth.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging include/linux/compiler.h +Auto-merging include/net/neighbour.h +Auto-merging include/net/netfilter/nf_conntrack.h +Auto-merging kernel/lockdep.c +Auto-merging kernel/module.c +Auto-merging kernel/rcutorture.c +Auto-merging kernel/sched.c +Auto-merging kernel/softirq.c +Auto-merging kernel/softlockup.c +CONFLICT (content): Merge conflict in kernel/softlockup.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_hw_branches.c +Auto-merging mm/Makefile +Removing mm/allocpercpu.c +Auto-merging mm/percpu.c +CONFLICT (content): Merge conflict in mm/percpu.c +Auto-merging mm/slab.c +Auto-merging mm/vmalloc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 367edc2] Merge remote branch 'percpu/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/blackfin/mach-common/entry.S | 4 +- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v32/mm/mmu.S | 2 +- + arch/ia64/Kconfig | 3 - + arch/ia64/include/asm/meminit.h | 2 +- + arch/ia64/include/asm/percpu.h | 4 +- + arch/ia64/include/asm/pgtable.h | 3 +- + arch/ia64/include/asm/processor.h | 6 +- + arch/ia64/kernel/acpi.c | 33 +- + arch/ia64/kernel/head.S | 4 +- + arch/ia64/kernel/ia64_ksyms.c | 4 +- + arch/ia64/kernel/mca_asm.S | 2 +- + arch/ia64/kernel/relocate_kernel.S | 2 +- + arch/ia64/kernel/setup.c | 27 +-- + arch/ia64/kernel/vmlinux.lds.S | 11 +- + arch/ia64/mm/contig.c | 99 +++++-- + arch/ia64/mm/discontig.c | 129 +++++++- + arch/ia64/mm/init.c | 4 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 8 +- + arch/ia64/xen/irq_xen.c | 131 ++++---- + arch/ia64/xen/time.c | 22 +- + arch/microblaze/include/asm/entry.h | 2 +- + arch/mn10300/kernel/kprobes.c | 61 ++-- + arch/parisc/lib/fixup.S | 8 +- + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/kernel/perf_callchain.c | 4 +- + arch/powerpc/kernel/setup-common.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 14 +- + arch/powerpc/platforms/pseries/dtl.c | 4 +- + arch/sparc/kernel/nmi.c | 8 +- + arch/sparc/kernel/rtrap_64.S | 8 +- + arch/x86/include/asm/percpu.h | 141 +++++++-- + arch/x86/include/asm/system.h | 8 +- + arch/x86/kernel/apic/nmi.c | 8 +- + arch/x86/kernel/cpu/common.c | 8 +- + arch/x86/kernel/cpu/cpu_debug.c | 30 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 28 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 54 ++-- + arch/x86/kernel/ds.c | 4 +- + arch/x86/kernel/head_32.S | 6 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/kvm/svm.c | 63 ++-- + arch/x86/xen/smp.c | 41 ++-- + arch/x86/xen/time.c | 24 +- + arch/x86/xen/xen-asm_32.S | 4 +- + crypto/cryptd.c | 2 +- + drivers/cpufreq/cpufreq.c | 16 +- + drivers/cpufreq/freq_table.c | 12 +- + drivers/crypto/padlock-aes.c | 12 +- + drivers/dma/dmaengine.c | 36 +-- + drivers/infiniband/hw/ehca/ehca_irq.c | 3 +- + drivers/lguest/x86/core.c | 6 +- + drivers/net/chelsio/sge.c | 5 +- + drivers/net/loopback.c | 2 +- + drivers/net/veth.c | 7 +- + drivers/oprofile/cpu_buffer.c | 19 +- + drivers/oprofile/cpu_buffer.h | 4 +- + drivers/oprofile/oprofile_stats.c | 4 +- + drivers/s390/net/netiucv.c | 8 +- + fs/ext4/mballoc.c | 2 +- + fs/nfs/iostat.h | 24 +-- + fs/xfs/xfs_mount.c | 12 +- + include/asm-generic/percpu.h | 23 +- + include/linux/compiler.h | 4 +- + include/linux/percpu-defs.h | 41 ++- + include/linux/percpu.h | 464 +++++++++++++++++++++++++--- + include/linux/vmstat.h | 10 +- + include/net/neighbour.h | 7 +- + include/net/netfilter/nf_conntrack.h | 4 +- + include/net/snmp.h | 50 +-- + kernel/lockdep.c | 11 +- + kernel/module.c | 150 --------- + kernel/rcutorture.c | 8 +- + kernel/sched.c | 8 +- + kernel/softirq.c | 4 +- + kernel/softlockup.c | 54 ++-- + kernel/time/timer_stats.c | 11 +- + kernel/trace/trace.c | 12 +- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_functions_graph.c | 4 +- + kernel/trace/trace_hw_branches.c | 51 ++-- + mm/Makefile | 4 - + mm/allocpercpu.c | 177 ----------- + mm/percpu.c | 3 +- + mm/slab.c | 18 +- + mm/vmalloc.c | 4 +- + mm/vmstat.c | 7 +- + 88 files changed, 1294 insertions(+), 1053 deletions(-) + delete mode 100644 mm/allocpercpu.c +$ git am -3 ../patches/0001-percpu-merge-fixup-for-variable-renaming.patch +Applying: percpu: merge fixup for variable renaming +$ git reset HEAD^ +Unstaged changes after reset: +M kernel/softlockup.c +$ git add . +$ git commit -v -a --amend +[master 7352073] Merge remote branch 'percpu/for-next' +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + include/asm-generic/unistd.h | 4 ++-- + lib/checksum.c | 14 ++++++++------ + 2 files changed, 10 insertions(+), 8 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Auto-merging arch/mips/kernel/linux32.c +Auto-merging arch/mips/kernel/scall64-n32.S +Auto-merging arch/mips/kernel/scall64-o32.S +Auto-merging arch/sparc/kernel/systbls_64.S +Auto-merging arch/x86/ia32/ia32entry.S +Auto-merging include/linux/sysctl.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/sys_ni.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Merge made by recursive. + arch/ia64/ia32/ia32_entry.S | 2 +- + arch/ia64/ia32/sys_ia32.c | 55 -- + arch/mips/kernel/linux32.c | 61 -- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/parisc/kernel/sys_parisc32.c | 71 -- + arch/parisc/kernel/syscall_table.S | 2 +- + arch/powerpc/kernel/sys_ppc32.c | 52 -- + arch/s390/kernel/compat_linux.c | 53 -- + arch/s390/kernel/compat_linux.h | 2 - + arch/s390/kernel/compat_wrapper.S | 6 +- + arch/sparc/kernel/sys_sparc32.c | 57 -- + arch/sparc/kernel/systbls_64.S | 2 +- + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/ia32/sys_ia32.c | 56 -- + arch/x86/include/asm/sys_ia32.h | 5 - + fs/proc/proc_sysctl.c | 4 +- + include/linux/sysctl.h | 21 +- + init/Kconfig | 1 + + kernel/Makefile | 2 +- + kernel/sys_ni.c | 1 - + kernel/sysctl.c | 587 +-------------- + kernel/sysctl_binary.c | 1507 ++++++++++++++++++++++++++++++++++++ + kernel/sysctl_check.c | 1376 +-------------------------------- + lib/Kconfig.debug | 2 +- + 25 files changed, 1539 insertions(+), 2392 deletions(-) + create mode 100644 kernel/sysctl_binary.c +Merging quilt/driver-core +$ git merge quilt/driver-core +Auto-merging drivers/base/core.c +Auto-merging drivers/usb/atm/ueagle-atm.c +Auto-merging include/linux/device.h +Merge made by recursive. + drivers/base/core.c | 5 +- + drivers/base/devtmpfs.c | 98 +++++++++++++-------------- + drivers/base/firmware_class.c | 14 ++-- + drivers/firmware/dell_rbu.c | 9 ++- + drivers/misc/hpilo.h | 13 +++- + drivers/serial/ucc_uart.c | 8 ++- + drivers/staging/comedi/drivers/usbdux.c | 5 +- + drivers/staging/comedi/drivers/usbduxfast.c | 5 +- + drivers/usb/atm/ueagle-atm.c | 7 +- + fs/sysfs/inode.c | 3 +- + include/linux/device.h | 2 +- + include/linux/firmware.h | 5 +- + 12 files changed, 98 insertions(+), 76 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Removing Documentation/serial/hayes-esp.txt +Removing drivers/char/esp.c +Auto-merging drivers/serial/8250.c +Auto-merging include/linux/Kbuild +Removing include/linux/hayesesp.h +Merge made by recursive. + Documentation/serial/hayes-esp.txt | 154 -- + Documentation/serial/tty.txt | 9 +- + arch/xtensa/platforms/iss/console.c | 2 +- + drivers/char/Kconfig | 13 - + drivers/char/Makefile | 1 - + drivers/char/bfin_jtag_comm.c | 2 +- + drivers/char/epca.c | 2 +- + drivers/char/esp.c | 2533 ---------------------------------- + drivers/char/istallion.c | 8 +- + drivers/char/pcmcia/ipwireless/tty.c | 2 +- + drivers/char/stallion.c | 13 +- + drivers/char/tty_port.c | 51 +- + drivers/serial/8250.c | 16 +- + drivers/serial/jsm/jsm.h | 8 - + drivers/serial/jsm/jsm_driver.c | 48 +- + drivers/serial/jsm/jsm_neo.c | 8 - + drivers/serial/jsm/jsm_tty.c | 6 +- + drivers/serial/pxa.c | 13 +- + drivers/serial/serial_core.c | 33 +- + drivers/usb/serial/opticon.c | 7 +- + drivers/usb/serial/usb-serial.c | 83 +- + include/linux/Kbuild | 1 - + include/linux/hayesesp.h | 114 -- + include/linux/tty.h | 10 +- + include/linux/usb/serial.h | 3 - + 25 files changed, 192 insertions(+), 2948 deletions(-) + delete mode 100644 Documentation/serial/hayes-esp.txt + delete mode 100644 drivers/char/esp.c + delete mode 100644 include/linux/hayesesp.h +Merging quilt/usb +$ git merge quilt/usb +Renaming arch/arm/plat-omap/include/mach/usb.h => arch/arm/plat-omap/include/plat/usb.h +Auto-merging arch/arm/plat-omap/include/plat/usb.h +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging drivers/usb/host/ehci-hcd.c +Merge made by recursive. + .../ABI/testing/sysfs-class-uwb_rc-wusbhc | 13 + + Documentation/powerpc/dts-bindings/xilinx.txt | 11 + + arch/arm/plat-mxc/Makefile | 1 + + arch/arm/plat-mxc/ehci.c | 92 + + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 37 + + arch/arm/plat-omap/include/plat/usb.h | 15 + + drivers/usb/Kconfig | 2 + + drivers/usb/Makefile | 2 + + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/core/generic.c | 2 +- + drivers/usb/core/hcd.c | 14 +- + drivers/usb/core/hub.c | 68 +- + drivers/usb/core/message.c | 11 +- + drivers/usb/core/sysfs.c | 23 + + drivers/usb/core/urb.c | 22 +- + drivers/usb/core/usb.h | 1 + + drivers/usb/gadget/at91_udc.c | 6 +- + drivers/usb/gadget/audio.c | 115 - + drivers/usb/gadget/composite.c | 54 +- + drivers/usb/gadget/f_acm.c | 28 + + drivers/usb/gadget/f_audio.c | 76 +- + drivers/usb/gadget/f_mass_storage.c | 3166 ++++++++++++++++++++ + drivers/usb/gadget/f_rndis.c | 35 +- + drivers/usb/gadget/file_storage.c | 876 +----- + drivers/usb/gadget/storage_common.c | 768 +++++ + drivers/usb/host/Kconfig | 22 +- + drivers/usb/host/ehci-hcd.c | 19 +- + drivers/usb/host/ehci-hub.c | 2 +- + drivers/usb/host/ehci-mxc.c | 296 ++ + drivers/usb/host/ehci-omap.c | 755 +++++ + drivers/usb/host/ehci-q.c | 32 +- + drivers/usb/host/ehci-sched.c | 36 +- + drivers/usb/host/ehci-xilinx-of.c | 300 ++ + drivers/usb/host/ohci-at91.c | 10 +- + drivers/usb/host/ohci-pnx4008.c | 8 +- + drivers/usb/host/whci/debug.c | 20 +- + drivers/usb/host/whci/hcd.c | 1 + + drivers/usb/host/whci/qset.c | 350 ++- + drivers/usb/host/whci/whcd.h | 9 + + drivers/usb/host/whci/whci-hc.h | 14 +- + drivers/usb/host/xhci-hcd.c | 107 +- + drivers/usb/host/xhci-mem.c | 15 +- + drivers/usb/host/xhci-pci.c | 2 + + drivers/usb/host/xhci-ring.c | 187 +- + drivers/usb/host/xhci.h | 27 +- + drivers/usb/mon/mon_bin.c | 51 +- + drivers/usb/mon/mon_text.c | 23 +- + drivers/usb/otg/Kconfig | 9 + + drivers/usb/otg/Makefile | 1 + + drivers/usb/otg/ulpi.c | 136 + + drivers/usb/serial/ftdi_sio.c | 18 +- + drivers/usb/serial/sierra.c | 89 +- + drivers/usb/storage/scsiglue.c | 3 +- + drivers/usb/storage/usb.c | 25 +- + drivers/usb/storage/usb.h | 1 + + drivers/usb/usb-skeleton.c | 4 +- + drivers/usb/wusbcore/wusbhc.c | 32 + + drivers/usb/wusbcore/wusbhc.h | 1 + + include/linux/usb.h | 1 + + include/linux/usb/composite.h | 1 + + include/linux/usb/otg.h | 68 +- + include/linux/usb/ulpi.h | 7 + + 62 files changed, 7014 insertions(+), 1110 deletions(-) + create mode 100644 arch/arm/plat-mxc/ehci.c + create mode 100644 arch/arm/plat-mxc/include/mach/mxc_ehci.h + create mode 100644 drivers/usb/gadget/f_mass_storage.c + create mode 100644 drivers/usb/gadget/storage_common.c + create mode 100644 drivers/usb/host/ehci-mxc.c + create mode 100644 drivers/usb/host/ehci-omap.c + create mode 100644 drivers/usb/host/ehci-xilinx-of.c + create mode 100644 drivers/usb/otg/ulpi.c + create mode 100644 include/linux/usb/ulpi.h +Merging quilt/staging +$ git merge quilt/staging +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Removing drivers/staging/android/Kconfig +Removing drivers/staging/android/Makefile +Removing drivers/staging/android/TODO +Removing drivers/staging/android/binder.c +Removing drivers/staging/android/binder.h +Removing drivers/staging/android/logger.c +Removing drivers/staging/android/logger.h +Removing drivers/staging/android/lowmemorykiller.c +Removing drivers/staging/android/ram_console.c +Removing drivers/staging/android/timed_gpio.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_output.h +Auto-merging drivers/staging/comedi/drivers/cb_das16_cs.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c +Auto-merging drivers/staging/comedi/drivers/ni_labpc_cs.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c +Auto-merging drivers/staging/comedi/drivers/ni_mio_cs.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c +Auto-merging drivers/staging/comedi/drivers/quatech_daqp_cs.c +Removing drivers/staging/dream/Kconfig +Removing drivers/staging/dream/Makefile +Removing drivers/staging/dream/camera/Kconfig +Removing drivers/staging/dream/camera/Makefile +Removing drivers/staging/dream/camera/msm_camera.c +Removing drivers/staging/dream/camera/msm_io7x.c +Removing drivers/staging/dream/camera/msm_io8x.c +Removing drivers/staging/dream/camera/msm_v4l2.c +Removing drivers/staging/dream/camera/msm_vfe7x.c +Removing drivers/staging/dream/camera/msm_vfe7x.h +Removing drivers/staging/dream/camera/msm_vfe8x.c +Removing drivers/staging/dream/camera/msm_vfe8x.h +Removing drivers/staging/dream/camera/msm_vfe8x_proc.c +Removing drivers/staging/dream/camera/msm_vfe8x_proc.h +Removing drivers/staging/dream/camera/mt9d112.c +Removing drivers/staging/dream/camera/mt9d112.h +Removing drivers/staging/dream/camera/mt9d112_reg.c +Removing drivers/staging/dream/camera/mt9p012.h +Removing drivers/staging/dream/camera/mt9p012_fox.c +Removing drivers/staging/dream/camera/mt9p012_reg.c +Removing drivers/staging/dream/camera/mt9t013.c +Removing drivers/staging/dream/camera/mt9t013.h +Removing drivers/staging/dream/camera/mt9t013_reg.c +Removing drivers/staging/dream/camera/s5k3e2fx.c +Removing drivers/staging/dream/camera/s5k3e2fx.h +Removing drivers/staging/dream/gpio_axis.c +Removing drivers/staging/dream/gpio_event.c +Removing drivers/staging/dream/gpio_input.c +Removing drivers/staging/dream/gpio_matrix.c +Removing drivers/staging/dream/gpio_output.c +Removing drivers/staging/dream/qdsp5/Makefile +Removing drivers/staging/dream/qdsp5/adsp.c +Removing drivers/staging/dream/qdsp5/adsp.h +Removing drivers/staging/dream/qdsp5/adsp_6210.c +Removing drivers/staging/dream/qdsp5/adsp_6220.c +Removing drivers/staging/dream/qdsp5/adsp_6225.c +Removing drivers/staging/dream/qdsp5/adsp_driver.c +Removing drivers/staging/dream/qdsp5/adsp_info.c +Removing drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c +Removing drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c +Removing drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c +Removing drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c +Removing drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c +Removing drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c +Removing drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c +Removing drivers/staging/dream/qdsp5/audio_aac.c +Removing drivers/staging/dream/qdsp5/audio_amrnb.c +Removing drivers/staging/dream/qdsp5/audio_evrc.c +Removing drivers/staging/dream/qdsp5/audio_in.c +Removing drivers/staging/dream/qdsp5/audio_mp3.c +Removing drivers/staging/dream/qdsp5/audio_out.c +Removing drivers/staging/dream/qdsp5/audio_qcelp.c +Removing drivers/staging/dream/qdsp5/audmgr.c +Removing drivers/staging/dream/qdsp5/audmgr.h +Removing drivers/staging/dream/qdsp5/audmgr_new.h +Removing drivers/staging/dream/qdsp5/audpp.c +Removing drivers/staging/dream/qdsp5/evlog.h +Removing drivers/staging/dream/qdsp5/snd.c +Removing drivers/staging/dream/smd/Kconfig +Removing drivers/staging/dream/smd/Makefile +Removing drivers/staging/dream/smd/rpc_server_dog_keepalive.c +Removing drivers/staging/dream/smd/rpc_server_time_remote.c +Removing drivers/staging/dream/smd/smd.c +Removing drivers/staging/dream/smd/smd_private.h +Removing drivers/staging/dream/smd/smd_qmi.c +Removing drivers/staging/dream/smd/smd_rpcrouter.c +Removing drivers/staging/dream/smd/smd_rpcrouter.h +Removing drivers/staging/dream/smd/smd_rpcrouter_device.c +Removing drivers/staging/dream/smd/smd_rpcrouter_servers.c +Removing drivers/staging/dream/smd/smd_tty.c +Removing drivers/staging/dream/synaptics_i2c_rmi.c +Removing drivers/staging/dream/synaptics_i2c_rmi.h +Auto-merging drivers/staging/iio/ring_sw.h +Auto-merging drivers/staging/octeon/ethernet-rgmii.c +Removing drivers/staging/rt2860/2860_main_dev.c +Removing drivers/staging/rt2860/aironet.h +Removing drivers/staging/rt2860/common/2860_rtmp_init.c +Removing drivers/staging/rt2860/common/md5.c +Removing drivers/staging/rt2860/common/rtmp_tkip.c +Removing drivers/staging/rt2860/common/rtmp_wep.c +Removing drivers/staging/rt2860/config.mk +Removing drivers/staging/rt2860/md5.h +Removing drivers/staging/rt2860/rt2860.h +Removing drivers/staging/rt2860/rt28xx.h +Removing drivers/staging/rt2860/rt_profile.c +Removing drivers/staging/rt2860/sta/aironet.c +Removing drivers/staging/rt2870/2870_main_dev.c +Removing drivers/staging/rt2870/common/2870_rtmp_init.c +Removing drivers/staging/rt2870/common/cmm_data_2870.c +Removing drivers/staging/rt2870/rt2870.h +Removing drivers/staging/rt3090/Kconfig +Removing drivers/staging/rt3090/Makefile +Removing drivers/staging/rt3090/action.h +Removing drivers/staging/rt3090/ap.h +Removing drivers/staging/rt3090/ap_apcli.h +Removing drivers/staging/rt3090/ap_autoChSel.h +Removing drivers/staging/rt3090/ap_autoChSel_cmm.h +Removing drivers/staging/rt3090/ap_cfg.h +Removing drivers/staging/rt3090/ap_ids.h +Removing drivers/staging/rt3090/ap_mbss.h +Removing drivers/staging/rt3090/ap_uapsd.h +Removing drivers/staging/rt3090/ap_wds.h +Removing drivers/staging/rt3090/chips/rt3370.c +Removing drivers/staging/rt3090/chips/rt3390.c +Removing drivers/staging/rt3090/chips/rt33xx.c +Removing drivers/staging/rt3090/chlist.h +Removing drivers/staging/rt3090/common/action.c +Removing drivers/staging/rt3090/common/ba_action.c +Removing drivers/staging/rt3090/common/cmm_asic.c +Removing drivers/staging/rt3090/common/cmm_data.c +Removing drivers/staging/rt3090/common/cmm_data_pci.c +Removing drivers/staging/rt3090/common/cmm_info.c +Removing drivers/staging/rt3090/common/cmm_mac_pci.c +Removing drivers/staging/rt3090/common/cmm_profile.c +Removing drivers/staging/rt3090/common/cmm_sanity.c +Removing drivers/staging/rt3090/common/cmm_sync.c +Removing drivers/staging/rt3090/common/cmm_tkip.c +Removing drivers/staging/rt3090/common/cmm_wpa.c +Removing drivers/staging/rt3090/common/crypt_aes.c +Removing drivers/staging/rt3090/common/crypt_biginteger.c +Removing drivers/staging/rt3090/common/crypt_dh.c +Removing drivers/staging/rt3090/common/crypt_hmac.c +Removing drivers/staging/rt3090/common/crypt_md5.c +Removing drivers/staging/rt3090/common/crypt_sha2.c +Removing drivers/staging/rt3090/common/dfs.c +Removing drivers/staging/rt3090/common/ee_efuse.c +Removing drivers/staging/rt3090/common/ee_prom.c +Removing drivers/staging/rt3090/common/eeprom.c +Removing drivers/staging/rt3090/common/igmp_snoop.c +Removing drivers/staging/rt3090/common/mlme.c +Removing drivers/staging/rt3090/common/mlme_ex.c +Removing drivers/staging/rt3090/common/netif_block.c +Removing drivers/staging/rt3090/common/rt_channel.c +Removing drivers/staging/rt3090/common/rtmp_init.c +Removing drivers/staging/rt3090/common/rtmp_mcu.c +Removing drivers/staging/rt3090/common/spectrum.c +Removing drivers/staging/rt3090/config.mk +Removing drivers/staging/rt3090/crypt_sha2.h +Removing drivers/staging/rt3090/dfs.h +Removing drivers/staging/rt3090/igmp_snoop.h +Removing drivers/staging/rt3090/ipv6.h +Removing drivers/staging/rt3090/link_list.h +Removing drivers/staging/rt3090/mlme.h +Removing dResolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/Makefile' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/cb_das16_cs.c' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/ni_labpc_cs.c' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/ni_mio_cs.c' using previous resolution. +rivers/staging/rt3090/mlme_ex.h +Removing drivers/staging/rt3090/mlme_ex_def.h +Removing drivers/staging/rt3090/oid.h +Removing drivers/staging/rt3090/pci_main_dev.c +Removing drivers/staging/rt3090/rt3390.h +Removing drivers/staging/rt3090/rt_ate.c +Removing drivers/staging/rt3090/rt_ate.h +Removing drivers/staging/rt3090/rt_config.h +Removing drivers/staging/rt3090/rt_linux.c +Removing drivers/staging/rt3090/rt_linux.h +Removing drivers/staging/rt3090/rt_main_dev.c +Removing drivers/staging/rt3090/rt_pci_rbus.c +Removing drivers/staging/rt3090/rt_profile.c +Removing drivers/staging/rt3090/rtmp.h +Removing drivers/staging/rt3090/rtmp_chip.h +Removing drivers/staging/rt3090/rtmp_def.h +Removing drivers/staging/rt3090/rtmp_dot11.h +Removing drivers/staging/rt3090/rtmp_mac.h +Removing drivers/staging/rt3090/rtmp_type.h +Removing drivers/staging/rt3090/spectrum.h +Removing drivers/staging/rt3090/spectrum_def.h +Removing drivers/staging/rt3090/sta/assoc.c +Removing drivers/staging/rt3090/sta/auth.c +Removing drivers/staging/rt3090/sta/auth_rsp.c +Removing drivers/staging/rt3090/sta/connect.c +Removing drivers/staging/rt3090/sta/dls.c +Removing drivers/staging/rt3090/sta/rtmp_ckipmic.c +Removing drivers/staging/rt3090/sta/rtmp_data.c +Removing drivers/staging/rt3090/sta/sanity.c +Removing drivers/staging/rt3090/sta/sync.c +Removing drivers/staging/rt3090/sta/wpa.c +Removing drivers/staging/rt3090/sta_ioctl.c +Removing drivers/staging/rt3090/wpa.h +Removing drivers/staging/vt6655/kcompat.h +Removing drivers/staging/vt6656/kcompat.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fc95674] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 14 +- + drivers/staging/Makefile | 7 +- + drivers/staging/android/Kconfig | 96 - + drivers/staging/android/Makefile | 6 - + drivers/staging/android/TODO | 10 - + drivers/staging/android/binder.c | 3767 ------- + drivers/staging/android/binder.h | 330 - + drivers/staging/android/logger.c | 607 -- + drivers/staging/android/logger.h | 48 - + drivers/staging/android/lowmemorykiller.c | 173 - + drivers/staging/android/ram_console.c | 410 - + drivers/staging/android/timed_gpio.c | 166 - + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 121 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/b3dfg/b3dfg.c | 12 - + drivers/staging/comedi/comedi.h | 8 - + drivers/staging/comedi/comedi_compat32.c | 149 +- + drivers/staging/comedi/comedi_compat32.h | 16 +- + drivers/staging/comedi/comedi_fops.c | 15 - + drivers/staging/comedi/comedidev.h | 60 +- + drivers/staging/comedi/drivers.c | 2 +- + drivers/staging/comedi/drivers/8253.h | 3 +- + drivers/staging/comedi/drivers/8255.c | 23 +- + drivers/staging/comedi/drivers/acl7225b.c | 9 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 3 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 4 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 5 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 2 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 53 +- + drivers/staging/comedi/drivers/adl_pci7296.c | 19 +- + drivers/staging/comedi/drivers/adl_pci7432.c | 32 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 37 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 18 +- + drivers/staging/comedi/drivers/cb_das16_cs.c | 16 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 2 +- + drivers/staging/comedi/drivers/comedi_fc.c | 5 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/dt2814.c | 2 +- + drivers/staging/comedi/drivers/dt282x.c | 4 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 126 +- + drivers/staging/comedi/drivers/icp_multi.c | 345 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 83 +- + drivers/staging/comedi/drivers/ke_counter.c | 21 +- + drivers/staging/comedi/drivers/mite.c | 231 +- + drivers/staging/comedi/drivers/mite.h | 7 - + drivers/staging/comedi/drivers/multiq3.c | 25 +- + drivers/staging/comedi/drivers/ni_6527.c | 33 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 6 +- + drivers/staging/comedi/drivers/ni_atmio16d.c | 90 +- + drivers/staging/comedi/drivers/ni_labpc.h | 52 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 13 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_cs.c | 12 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/pcl726.c | 41 +- + drivers/staging/comedi/drivers/pcm_common.c | 4 +- + drivers/staging/comedi/drivers/pcmmio.c | 231 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 2 +- + drivers/staging/comedi/drivers/rtd520.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/s626.h | 8 - + drivers/staging/comedi/drivers/serial2002.c | 9 +- + drivers/staging/comedi/drivers/skel.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/comedi/drivers/vmk80xx.c | 24 +- + drivers/staging/cx25821/cx25821-core.c | 4 +- + drivers/staging/dream/Kconfig | 12 - + drivers/staging/dream/Makefile | 4 - + drivers/staging/dream/camera/Kconfig | 46 - + drivers/staging/dream/camera/Makefile | 7 - + drivers/staging/dream/camera/msm_camera.c | 2181 ---- + drivers/staging/dream/camera/msm_io7x.c | 291 - + drivers/staging/dream/camera/msm_io8x.c | 320 - + drivers/staging/dream/camera/msm_v4l2.c | 797 -- + drivers/staging/dream/camera/msm_vfe7x.c | 701 -- + drivers/staging/dream/camera/msm_vfe7x.h | 255 - + drivers/staging/dream/camera/msm_vfe8x.c | 756 -- + drivers/staging/dream/camera/msm_vfe8x.h | 895 -- + drivers/staging/dream/camera/msm_vfe8x_proc.c | 4003 -------- + drivers/staging/dream/camera/msm_vfe8x_proc.h | 1549 --- + drivers/staging/dream/camera/mt9d112.c | 761 -- + drivers/staging/dream/camera/mt9d112.h | 36 - + drivers/staging/dream/camera/mt9d112_reg.c | 307 - + drivers/staging/dream/camera/mt9p012.h | 51 - + drivers/staging/dream/camera/mt9p012_fox.c | 1305 --- + drivers/staging/dream/camera/mt9p012_reg.c | 573 -- + drivers/staging/dream/camera/mt9t013.c | 1496 --- + drivers/staging/dream/camera/mt9t013.h | 48 - + drivers/staging/dream/camera/mt9t013_reg.c | 266 - + drivers/staging/dream/camera/s5k3e2fx.c | 1310 --- + drivers/staging/dream/camera/s5k3e2fx.h | 9 - + drivers/staging/dream/gpio_axis.c | 180 - + drivers/staging/dream/gpio_event.c | 224 - + drivers/staging/dream/gpio_input.c | 343 - + drivers/staging/dream/gpio_matrix.c | 406 - + drivers/staging/dream/gpio_output.c | 84 - + drivers/staging/dream/qdsp5/Makefile | 17 - + drivers/staging/dream/qdsp5/adsp.c | 1163 --- + drivers/staging/dream/qdsp5/adsp.h | 369 - + drivers/staging/dream/qdsp5/adsp_6210.c | 283 - + drivers/staging/dream/qdsp5/adsp_6220.c | 284 - + drivers/staging/dream/qdsp5/adsp_6225.c | 328 - + drivers/staging/dream/qdsp5/adsp_driver.c | 641 -- + drivers/staging/dream/qdsp5/adsp_info.c | 121 - + .../staging/dream/qdsp5/adsp_jpeg_patch_event.c | 31 - + drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c | 182 - + drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c | 65 - + drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c | 54 - + drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c | 239 - + .../staging/dream/qdsp5/adsp_video_verify_cmd.c | 163 - + .../staging/dream/qdsp5/adsp_videoenc_verify_cmd.c | 235 - + drivers/staging/dream/qdsp5/audio_aac.c | 1052 -- + drivers/staging/dream/qdsp5/audio_amrnb.c | 873 -- + drivers/staging/dream/qdsp5/audio_evrc.c | 845 -- + drivers/staging/dream/qdsp5/audio_in.c | 967 -- + drivers/staging/dream/qdsp5/audio_mp3.c | 971 -- + drivers/staging/dream/qdsp5/audio_out.c | 851 -- + drivers/staging/dream/qdsp5/audio_qcelp.c | 856 -- + drivers/staging/dream/qdsp5/audmgr.c | 313 - + drivers/staging/dream/qdsp5/audmgr.h | 215 - + drivers/staging/dream/qdsp5/audmgr_new.h | 213 - + drivers/staging/dream/qdsp5/audpp.c | 429 - + drivers/staging/dream/qdsp5/evlog.h | 133 - + drivers/staging/dream/qdsp5/snd.c | 279 - + drivers/staging/dream/smd/Kconfig | 26 - + drivers/staging/dream/smd/Makefile | 6 - + .../staging/dream/smd/rpc_server_dog_keepalive.c | 68 - + drivers/staging/dream/smd/rpc_server_time_remote.c | 77 - + drivers/staging/dream/smd/smd.c | 1330 --- + drivers/staging/dream/smd/smd_private.h | 171 - + drivers/staging/dream/smd/smd_qmi.c | 860 -- + drivers/staging/dream/smd/smd_rpcrouter.c | 1274 --- + drivers/staging/dream/smd/smd_rpcrouter.h | 195 - + drivers/staging/dream/smd/smd_rpcrouter_device.c | 376 - + drivers/staging/dream/smd/smd_rpcrouter_servers.c | 229 - + drivers/staging/dream/smd/smd_tty.c | 213 - + drivers/staging/dream/synaptics_i2c_rmi.c | 658 -- + drivers/staging/dream/synaptics_i2c_rmi.h | 53 - + drivers/staging/dst/state.c | 2 +- + drivers/staging/et131x/et1310_address_map.h | 343 +- + drivers/staging/et131x/et1310_eeprom.c | 436 +- + drivers/staging/et131x/et1310_eeprom.h | 42 +- + drivers/staging/et131x/et1310_mac.c | 102 +- + drivers/staging/et131x/et1310_phy.c | 1167 +-- + drivers/staging/et131x/et1310_phy.h | 35 +- + drivers/staging/et131x/et1310_rx.c | 539 +- + drivers/staging/et131x/et1310_rx.h | 50 +- + drivers/staging/et131x/et1310_tx.c | 620 +- + drivers/staging/et131x/et1310_tx.h | 218 +- + drivers/staging/et131x/et131x_adapter.h | 13 +- + drivers/staging/et131x/et131x_defs.h | 1 - + drivers/staging/et131x/et131x_initpci.c | 596 +- + drivers/staging/et131x/et131x_initpci.h | 2 +- + drivers/staging/et131x/et131x_isr.c | 16 +- + drivers/staging/et131x/et131x_netdev.c | 31 +- + drivers/staging/iio/Kconfig | 10 +- + drivers/staging/iio/accel/Kconfig | 1 + + drivers/staging/iio/adc/Kconfig | 1 + + drivers/staging/iio/chrdev.h | 4 +- + drivers/staging/iio/iio.h | 36 +- + drivers/staging/iio/ring_generic.h | 73 +- + drivers/staging/iio/ring_sw.h | 68 +- + drivers/staging/iio/sysfs.h | 114 +- + drivers/staging/iio/trigger.h | 35 +- + drivers/staging/iio/trigger/Kconfig | 6 +- + drivers/staging/iio/trigger_consumer.h | 8 +- + drivers/staging/line6/driver.c | 103 +- + drivers/staging/octeon/ethernet-rgmii.c | 4 +- + drivers/staging/otus/apdbg.c | 667 +- + drivers/staging/otus/athr_common.h | 10 +- + drivers/staging/otus/oal_dt.h | 10 +- + drivers/staging/otus/oal_marc.h | 84 +- + drivers/staging/otus/usbdrv.c | 35 +- + drivers/staging/otus/usbdrv.h | 140 +- + drivers/staging/otus/wrap_buf.c | 20 +- + drivers/staging/otus/wrap_dbg.c | 61 +- + drivers/staging/otus/wrap_ev.c | 350 +- + drivers/staging/otus/wrap_mem.c | 90 +- + drivers/staging/otus/wrap_mis.c | 61 +- + drivers/staging/otus/wrap_pkt.c | 210 +- + drivers/staging/otus/wrap_sec.c | 123 +- + drivers/staging/otus/wrap_usb.c | 213 +- + drivers/staging/otus/zdusb.h | 4 +- + drivers/staging/p9auth/p9auth.c | 3 +- + drivers/staging/phison/phison.c | 4 +- + drivers/staging/poch/README | 124 +- + drivers/staging/poch/poch.c | 198 +- + drivers/staging/poch/poch.h | 16 +- + drivers/staging/ramzswap/Kconfig | 21 + + drivers/staging/ramzswap/Makefile | 3 + + drivers/staging/ramzswap/TODO | 6 + + drivers/staging/ramzswap/ramzswap.txt | 51 + + drivers/staging/ramzswap/ramzswap_drv.c | 1435 +++ + drivers/staging/ramzswap/ramzswap_drv.h | 171 + + drivers/staging/ramzswap/ramzswap_ioctl.h | 49 + + drivers/staging/ramzswap/xvmalloc.c | 507 + + drivers/staging/ramzswap/xvmalloc.h | 30 + + drivers/staging/ramzswap/xvmalloc_int.h | 86 + + drivers/staging/rt2860/2860_main_dev.c | 1319 --- + drivers/staging/rt2860/Kconfig | 7 +- + drivers/staging/rt2860/Makefile | 31 +- + drivers/staging/rt2860/TODO | 1 - + drivers/staging/rt2860/aironet.h | 210 - + drivers/staging/rt2860/ap.h | 46 +- + drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h | 233 +- + drivers/staging/rt2860/chip/mac_usb.h | 347 + + .../{rt3090/netif_block.h => rt2860/chip/rt2860.h} | 42 +- + .../{rt3090/rt33xx.h => rt2860/chip/rt2870.h} | 30 +- + .../{rt3090/rt3370.h => rt2860/chip/rt3070.h} | 27 +- + drivers/staging/{rt3090 => rt2860/chip}/rt3090.h | 21 +- + drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h | 9 +- + drivers/staging/rt2860/chip/rtmp_mac.h | 1307 +++ + drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h | 191 +- + drivers/staging/rt2860/chips/rt3070.c | 169 + + drivers/staging/{rt3090 => rt2860}/chips/rt3090.c | 72 +- + drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c | 429 +- + drivers/staging/rt2860/chlist.h | 1250 +--- + drivers/staging/rt2860/common/2860_rtmp_init.c | 897 -- + drivers/staging/rt2860/common/action.c | 658 +- + drivers/staging/rt2860/common/action.h | 31 +- + drivers/staging/rt2860/common/ba_action.c | 1813 ++-- + .../staging/{rt3090 => rt2860}/common/cmm_aes.c | 1319 +-- + drivers/staging/rt2860/common/cmm_asic.c | 2565 +++++ + .../staging/{rt3090 => rt2860}/common/cmm_cfg.c | 239 +- + drivers/staging/rt2860/common/cmm_data.c | 2879 +++---- + drivers/staging/rt2860/common/cmm_data_pci.c | 1096 +++ + drivers/staging/rt2860/common/cmm_data_usb.c | 951 ++ + drivers/staging/rt2860/common/cmm_info.c | 3503 ++------ + drivers/staging/rt2860/common/cmm_mac_pci.c | 1661 ++++ + drivers/staging/rt2860/common/cmm_mac_usb.c | 1165 +++ + drivers/staging/rt2860/common/cmm_sanity.c | 1635 ++-- + drivers/staging/rt2860/common/cmm_sync.c | 789 +- + drivers/staging/rt2860/common/cmm_tkip.c | 833 ++ + .../staging/{rt3090 => rt2860}/common/cmm_wep.c | 225 +- + drivers/staging/rt2860/common/cmm_wpa.c | 3120 +++++- + drivers/staging/rt2860/common/crypt_hmac.c | 187 + + drivers/staging/rt2860/common/crypt_md5.c | 339 + + drivers/staging/rt2860/common/crypt_sha2.c | 269 + + drivers/staging/rt2860/common/dfs.c | 372 +- + drivers/staging/rt2860/common/ee_efuse.c | 344 + + drivers/staging/rt2860/common/ee_prom.c | 197 + + drivers/staging/rt2860/common/eeprom.c | 1482 +--- + drivers/staging/rt2860/common/firmware.h | 2 +- + drivers/staging/rt2860/common/firmware_3070.h | 517 + + drivers/staging/rt2860/common/md5.c | 1415 --- + drivers/staging/rt2860/common/mlme.c |10400 +++++++------------- + drivers/staging/rt2860/common/rt_channel.c | 1705 ++++ + drivers/staging/{rt3090 => rt2860}/common/rt_rf.c | 103 +- + drivers/staging/rt2860/common/rtmp_init.c | 4299 ++++----- + drivers/staging/rt2860/common/rtmp_mcu.c | 291 + + .../staging/{rt3090 => rt2860}/common/rtmp_timer.c | 163 +- + drivers/staging/rt2860/common/rtmp_tkip.c | 1586 --- + drivers/staging/rt2860/common/rtmp_wep.c | 497 - + drivers/staging/rt2860/common/spectrum.c | 1975 +++-- + drivers/staging/rt2860/config.mk | 241 - + drivers/staging/{rt3090 => rt2860}/crypt_hmac.h | 46 +- + drivers/staging/{rt3090 => rt2860}/crypt_md5.h | 51 +- + .../{rt3090/vr_ikans.h => rt2860/crypt_sha2.h} | 68 +- + drivers/staging/rt2860/dfs.h | 51 +- + drivers/staging/{rt3090 => rt2860}/eeprom.h | 61 +- + .../staging/{rt3090 => rt2860/iface}/rtmp_pci.h | 56 +- + drivers/staging/rt2860/iface/rtmp_usb.h | 182 + + drivers/staging/rt2860/md5.h | 107 - + drivers/staging/rt2860/mlme.h | 1874 ++-- + drivers/staging/rt2860/oid.h | 1240 ++-- + drivers/staging/rt2860/pci_main_dev.c | 1190 +++ + drivers/staging/rt2860/rt2860.h | 333 - + drivers/staging/rt2860/rt28xx.h | 1688 ---- + drivers/staging/rt2860/rt_config.h | 29 +- + drivers/staging/rt2860/rt_linux.c | 1371 ++- + drivers/staging/rt2860/rt_linux.h | 1015 +- + drivers/staging/rt2860/rt_main_dev.c | 1006 +-- + drivers/staging/rt2860/rt_pci_rbus.c | 840 ++ + drivers/staging/rt2860/rt_profile.c | 1862 ---- + drivers/staging/rt2860/rt_usb.c | 799 ++ + drivers/staging/rt2860/rtmp.h | 9536 +++++++----------- + drivers/staging/rt2860/rtmp_chip.h | 258 + + drivers/staging/rt2860/rtmp_ckipmic.h | 45 +- + drivers/staging/rt2860/rtmp_def.h | 1107 +-- + drivers/staging/rt2860/rtmp_dot11.h | 100 + + drivers/staging/{rt3090 => rt2860}/rtmp_iface.h | 64 +- + drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h | 18 +- + drivers/staging/{rt3090 => rt2860}/rtmp_os.h | 55 +- + drivers/staging/{rt3090 => rt2860}/rtmp_timer.h | 107 +- + drivers/staging/rt2860/rtmp_type.h | 85 +- + drivers/staging/rt2860/rtusb_io.h | 185 + + drivers/staging/rt2860/spectrum.h | 223 +- + drivers/staging/rt2860/spectrum_def.h | 189 +- + drivers/staging/rt2860/sta/aironet.c | 1312 --- + drivers/staging/rt2860/sta/assoc.c | 2082 ++--- + drivers/staging/rt2860/sta/auth.c | 635 +- + drivers/staging/rt2860/sta/auth_rsp.c | 134 +- + drivers/staging/rt2860/sta/connect.c | 3214 +++--- + drivers/staging/rt2860/sta/rtmp_data.c | 3022 +++--- + drivers/staging/rt2860/sta/sanity.c | 535 +- + drivers/staging/rt2860/sta/sync.c | 2712 +++--- + drivers/staging/rt2860/sta/wpa.c | 2158 +---- + drivers/staging/rt2860/sta_ioctl.c | 4866 ++++------ + drivers/staging/rt2860/usb_main_dev.c | 887 ++ + drivers/staging/rt2860/wpa.h | 454 +- + drivers/staging/rt2870/2870_main_dev.c | 1530 --- + drivers/staging/rt2870/Kconfig | 2 + + drivers/staging/rt2870/Makefile | 32 +- + drivers/staging/rt2870/chips/rt3070.c | 1 + + drivers/staging/rt2870/chips/rt30xx.c | 1 + + drivers/staging/rt2870/common/2870_rtmp_init.c | 1730 ---- + drivers/staging/rt2870/common/acction.c | 1 + + drivers/staging/rt2870/common/cmm_aes.c | 1 + + drivers/staging/rt2870/common/cmm_asic.c | 1 + + drivers/staging/rt2870/common/cmm_cfg.c | 1 + + drivers/staging/rt2870/common/cmm_data_2870.c | 936 -- + drivers/staging/rt2870/common/cmm_data_usb.c | 1 + + drivers/staging/rt2870/common/cmm_mac_usb.c | 1 + + drivers/staging/rt2870/common/cmm_profile.c | 1 + + drivers/staging/rt2870/common/cmm_tkip.c | 1 + + drivers/staging/rt2870/common/cmm_wep.c | 1 + + drivers/staging/rt2870/common/crypt_hmac.c | 1 + + drivers/staging/rt2870/common/crypt_md5.c | 1 + + drivers/staging/rt2870/common/crypt_sha2.c | 1 + + drivers/staging/rt2870/common/ee_efuse.c | 1 + + drivers/staging/rt2870/common/rt_channel.c | 1 + + drivers/staging/rt2870/common/rt_rf.c | 1 + + drivers/staging/rt2870/common/rtmp_mcu.c | 1 + + drivers/staging/rt2870/common/rtmp_timer.c | 1 + + drivers/staging/rt2870/common/rtusb_bulk.c | 1067 +- + drivers/staging/rt2870/common/rtusb_data.c | 220 +- + drivers/staging/rt2870/common/rtusb_io.c | 2672 +++--- + drivers/staging/rt2870/rt2870.h | 583 -- + drivers/staging/rt2870/rt_usb.c | 1 + + drivers/staging/rt2870/usb_main_dev.c | 1 + + drivers/staging/rt3070/firmware.h | 2 +- + drivers/staging/rt3070/md4.h | 12 +- + drivers/staging/rt3090/Kconfig | 5 - + drivers/staging/rt3090/Makefile | 80 - + drivers/staging/rt3090/action.h | 66 - + drivers/staging/rt3090/ap.h | 512 - + drivers/staging/rt3090/ap_apcli.h | 276 - + drivers/staging/rt3090/ap_autoChSel.h | 79 - + drivers/staging/rt3090/ap_autoChSel_cmm.h | 66 - + drivers/staging/rt3090/ap_cfg.h | 118 - + drivers/staging/rt3090/ap_ids.h | 82 - + drivers/staging/rt3090/ap_mbss.h | 72 - + drivers/staging/rt3090/ap_uapsd.h | 636 -- + drivers/staging/rt3090/ap_wds.h | 212 - + drivers/staging/rt3090/chips/rt3370.c | 121 - + drivers/staging/rt3090/chips/rt3390.c | 122 - + drivers/staging/rt3090/chips/rt33xx.c | 536 - + drivers/staging/rt3090/chlist.h | 130 - + drivers/staging/rt3090/common/action.c | 1057 -- + drivers/staging/rt3090/common/ba_action.c | 1779 ---- + drivers/staging/rt3090/common/cmm_asic.c | 2753 ------ + drivers/staging/rt3090/common/cmm_data.c | 2763 ------ + drivers/staging/rt3090/common/cmm_data_pci.c | 1576 --- + drivers/staging/rt3090/common/cmm_info.c | 3718 ------- + drivers/staging/rt3090/common/cmm_mac_pci.c | 1757 ---- + drivers/staging/rt3090/common/cmm_profile.c | 2321 ----- + drivers/staging/rt3090/common/cmm_sanity.c | 1718 ---- + drivers/staging/rt3090/common/cmm_sync.c | 734 -- + drivers/staging/rt3090/common/cmm_tkip.c | 966 -- + drivers/staging/rt3090/common/cmm_wpa.c | 3149 ------ + drivers/staging/rt3090/common/crypt_aes.c | 1007 -- + drivers/staging/rt3090/common/crypt_biginteger.c | 1119 --- + drivers/staging/rt3090/common/crypt_dh.c | 234 - + drivers/staging/rt3090/common/crypt_hmac.c | 279 - + drivers/staging/rt3090/common/crypt_md5.c | 353 - + drivers/staging/rt3090/common/crypt_sha2.c | 536 - + drivers/staging/rt3090/common/dfs.c | 481 - + drivers/staging/rt3090/common/ee_efuse.c | 1548 --- + drivers/staging/rt3090/common/ee_prom.c | 308 - + drivers/staging/rt3090/common/eeprom.c | 98 - + drivers/staging/rt3090/common/igmp_snoop.c | 1365 --- + drivers/staging/rt3090/common/mlme.c | 6550 ------------ + drivers/staging/rt3090/common/mlme_ex.c | 215 - + drivers/staging/rt3090/common/netif_block.c | 147 - + drivers/staging/rt3090/common/rt_channel.c | 1287 --- + drivers/staging/rt3090/common/rtmp_init.c | 3882 -------- + drivers/staging/rt3090/common/rtmp_mcu.c | 560 -- + drivers/staging/rt3090/common/spectrum.c | 2221 ----- + drivers/staging/rt3090/config.mk | 187 - + drivers/staging/rt3090/crypt_sha2.h | 107 - + drivers/staging/rt3090/dfs.h | 137 - + drivers/staging/rt3090/firmware.h | 2 +- + drivers/staging/rt3090/igmp_snoop.h | 152 - + drivers/staging/rt3090/ipv6.h | 215 - + drivers/staging/rt3090/link_list.h | 133 - + drivers/staging/rt3090/mlme.h | 1360 --- + drivers/staging/rt3090/mlme_ex.h | 83 - + drivers/staging/rt3090/mlme_ex_def.h | 53 - + drivers/staging/rt3090/oid.h | 1144 --- + drivers/staging/rt3090/pci_main_dev.c | 1195 --- + drivers/staging/rt3090/rt3390.h | 77 - + drivers/staging/rt3090/rt_ate.c | 6089 ------------ + drivers/staging/rt3090/rt_ate.h | 314 - + drivers/staging/rt3090/rt_config.h | 126 - + drivers/staging/rt3090/rt_linux.c | 1624 --- + drivers/staging/rt3090/rt_linux.h | 1034 -- + drivers/staging/rt3090/rt_main_dev.c | 897 -- + drivers/staging/rt3090/rt_pci_rbus.c | 989 -- + drivers/staging/rt3090/rt_profile.c | 101 - + drivers/staging/rt3090/rtmp.h | 6873 ------------- + drivers/staging/rt3090/rtmp_chip.h | 355 - + drivers/staging/rt3090/rtmp_def.h | 1650 ---- + drivers/staging/rt3090/rtmp_dot11.h | 146 - + drivers/staging/rt3090/rtmp_mac.h | 2304 ----- + drivers/staging/rt3090/rtmp_type.h | 147 - + drivers/staging/rt3090/spectrum.h | 234 - + drivers/staging/rt3090/spectrum_def.h | 257 - + drivers/staging/rt3090/sta/assoc.c | 1673 ---- + drivers/staging/rt3090/sta/auth.c | 491 - + drivers/staging/rt3090/sta/auth_rsp.c | 151 - + drivers/staging/rt3090/sta/connect.c | 2759 ------ + drivers/staging/rt3090/sta/dls.c | 2207 ----- + drivers/staging/rt3090/sta/rtmp_ckipmic.c | 579 -- + drivers/staging/rt3090/sta/rtmp_data.c | 2661 ----- + drivers/staging/rt3090/sta/sanity.c | 382 - + drivers/staging/rt3090/sta/sync.c | 1840 ---- + drivers/staging/rt3090/sta/wpa.c | 396 - + drivers/staging/rt3090/sta_ioctl.c | 7557 -------------- + drivers/staging/rt3090/wpa.h | 447 - + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 1 - + drivers/staging/rtl8192su/Kconfig | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 1 - + drivers/staging/rtl8192u/Kconfig | 6 + + drivers/staging/rtl8192u/Makefile | 33 + + drivers/staging/rtl8192u/authors | 1 + + drivers/staging/rtl8192u/changes | 5 + + drivers/staging/rtl8192u/copying | 340 + + drivers/staging/rtl8192u/dot11d.h | 102 + + drivers/staging/rtl8192u/ieee80211.h | 2638 +++++ + drivers/staging/rtl8192u/ieee80211/EndianFree.h | 194 + + drivers/staging/rtl8192u/ieee80211/Makefile | 139 + + drivers/staging/rtl8192u/ieee80211/aes.c | 469 + + drivers/staging/rtl8192u/ieee80211/api.c | 246 + + drivers/staging/rtl8192u/ieee80211/arc4.c | 103 + + drivers/staging/rtl8192u/ieee80211/autoload.c | 40 + + drivers/staging/rtl8192u/ieee80211/cipher.c | 299 + + drivers/staging/rtl8192u/ieee80211/compress.c | 64 + + drivers/staging/rtl8192u/ieee80211/crypto_compat.h | 60 + + drivers/staging/rtl8192u/ieee80211/digest.c | 108 + + drivers/staging/rtl8192u/ieee80211/dot11d.c | 223 + + drivers/staging/rtl8192u/ieee80211/dot11d.h | 102 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2639 +++++ + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 244 + + .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 86 + + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 480 + + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 780 ++ + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 297 + + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 324 + + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2668 +++++ + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3287 +++++++ + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 615 ++ + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 912 ++ + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 878 ++ + drivers/staging/rtl8192u/ieee80211/internal.h | 99 + + drivers/staging/rtl8192u/ieee80211/kmap_types.h | 20 + + drivers/staging/rtl8192u/ieee80211/michael_mic.c | 194 + + drivers/staging/rtl8192u/ieee80211/proc.c | 116 + + drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h | 69 + + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 737 ++ + drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 481 + + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 1462 +++ + drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h | 583 ++ + drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 56 + + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 628 ++ + drivers/staging/rtl8192u/ieee80211/rtl_crypto.h | 399 + + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 126 + + drivers/staging/rtl8192u/ieee80211/scatterwalk.h | 51 + + drivers/staging/rtl8192u/ieee80211_crypt.h | 86 + + drivers/staging/rtl8192u/r8180_93cx6.c | 146 + + drivers/staging/rtl8192u/r8180_93cx6.h | 40 + + drivers/staging/rtl8192u/r8180_pm.c | 48 + + drivers/staging/rtl8192u/r8180_pm.h | 28 + + drivers/staging/rtl8192u/r8190_rtl8256.c | 312 + + drivers/staging/rtl8192u/r8190_rtl8256.h | 27 + + drivers/staging/rtl8192u/r8192U.h | 1263 +++ + drivers/staging/rtl8192u/r8192U_core.c | 6085 ++++++++++++ + drivers/staging/rtl8192u/r8192U_dm.c | 3890 ++++++++ + drivers/staging/rtl8192u/r8192U_dm.h | 254 + + drivers/staging/rtl8192u/r8192U_hw.h | 411 + + drivers/staging/rtl8192u/r8192U_wx.c | 1228 +++ + drivers/staging/rtl8192u/r8192U_wx.h | 23 + + drivers/staging/rtl8192u/r819xU_HTGen.h | 13 + + drivers/staging/rtl8192u/r819xU_HTType.h | 391 + + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 791 ++ + drivers/staging/rtl8192u/r819xU_cmdpkt.h | 207 + + drivers/staging/rtl8192u/r819xU_firmware.c | 434 + + drivers/staging/rtl8192u/r819xU_firmware.h | 27 + + drivers/staging/rtl8192u/r819xU_firmware_img.c | 3447 +++++++ + drivers/staging/rtl8192u/r819xU_firmware_img.h | 35 + + drivers/staging/rtl8192u/r819xU_phy.c | 1777 ++++ + drivers/staging/rtl8192u/r819xU_phy.h | 90 + + drivers/staging/rtl8192u/r819xU_phyreg.h | 871 ++ + drivers/staging/slicoss/slicoss.c | 1 - + drivers/staging/vme/TODO | 2 +- + drivers/staging/vme/bridges/vme_ca91cx42.c | 82 +- + drivers/staging/vme/bridges/vme_tsi148.c | 161 +- + drivers/staging/vme/devices/vme_user.c | 3 +- + drivers/staging/vme/vme.c | 101 +- + drivers/staging/vme/vme.h | 8 +- + drivers/staging/vme/vme_api.txt | 8 +- + drivers/staging/vme/vme_bridge.h | 9 +- + drivers/staging/vt6655/device.h | 2 - + drivers/staging/vt6655/kcompat.h | 39 - + drivers/staging/vt6655/rxtx.h | 17 - + drivers/staging/vt6655/wcmd.c | 1 - + drivers/staging/vt6655/wroute.c | 2 +- + drivers/staging/vt6656/baseband.c | 1 - + drivers/staging/vt6656/device.h | 4 +- + drivers/staging/vt6656/hostap.c | 1 - + drivers/staging/vt6656/kcompat.h | 39 - + drivers/staging/vt6656/main_usb.c | 8 - + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/vt6656/wcmd.c | 1 - + drivers/staging/wlags49_h2/Kconfig | 9 + + drivers/staging/wlags49_h2/Makefile | 81 + + drivers/staging/wlags49_h2/README.ubuntu | 180 + + drivers/staging/wlags49_h2/README.wlags49 | 641 ++ + drivers/staging/wlags49_h2/TODO | 33 + + drivers/staging/wlags49_h2/WARNING.txt | 3 + + drivers/staging/wlags49_h2/ap_h2.c | 3337 +++++++ + drivers/staging/wlags49_h2/ap_h25.c | 4094 ++++++++ + drivers/staging/wlags49_h2/debug.h | 229 + + drivers/staging/wlags49_h2/dhf.c | 390 + + drivers/staging/wlags49_h2/dhf.h | 226 + + drivers/staging/wlags49_h2/dhfcfg.h | 175 + + drivers/staging/wlags49_h2/hcf.c | 4881 +++++++++ + drivers/staging/wlags49_h2/hcf.h | 405 + + drivers/staging/wlags49_h2/hcfcfg.h | 2344 +++++ + drivers/staging/wlags49_h2/hcfdef.h | 809 ++ + drivers/staging/wlags49_h2/man/wlags49.4 | 734 ++ + drivers/staging/wlags49_h2/mdd.h | 1156 +++ + drivers/staging/wlags49_h2/mmd.c | 251 + + drivers/staging/wlags49_h2/mmd.h | 78 + + drivers/staging/wlags49_h2/sta_h2.c | 4480 +++++++++ + drivers/staging/wlags49_h2/sta_h25.c | 5255 ++++++++++ + drivers/staging/wlags49_h2/wl_cs.c | 715 ++ + drivers/staging/wlags49_h2/wl_cs.h | 112 + + drivers/staging/wlags49_h2/wl_enc.c | 248 + + drivers/staging/wlags49_h2/wl_enc.h | 135 + + drivers/staging/wlags49_h2/wl_if.h | 232 + + drivers/staging/wlags49_h2/wl_internal.h | 1073 ++ + drivers/staging/wlags49_h2/wl_main.c | 3878 ++++++++ + drivers/staging/wlags49_h2/wl_main.h | 155 + + drivers/staging/wlags49_h2/wl_netdev.c | 2085 ++++ + drivers/staging/wlags49_h2/wl_netdev.h | 171 + + drivers/staging/wlags49_h2/wl_pci.c | 1596 +++ + drivers/staging/wlags49_h2/wl_pci.h | 126 + + drivers/staging/wlags49_h2/wl_priv.c | 2095 ++++ + drivers/staging/wlags49_h2/wl_priv.h | 138 + + drivers/staging/wlags49_h2/wl_profile.c | 1128 +++ + drivers/staging/wlags49_h2/wl_profile.h | 104 + + drivers/staging/wlags49_h2/wl_sysfs.c | 135 + + drivers/staging/wlags49_h2/wl_sysfs.h | 7 + + drivers/staging/wlags49_h2/wl_util.c | 1604 +++ + drivers/staging/wlags49_h2/wl_util.h | 119 + + drivers/staging/wlags49_h2/wl_version.h | 193 + + drivers/staging/wlags49_h2/wl_wext.c | 4138 ++++++++ + drivers/staging/wlags49_h2/wl_wext.h | 113 + + drivers/staging/wlags49_h25/Kconfig | 9 + + drivers/staging/wlags49_h25/Makefile | 81 + + drivers/staging/wlags49_h25/README.txt | 30 + + drivers/staging/wlags49_h25/TODO | 33 + + drivers/staging/wlags49_h25/ap_h25.c | 2 + + drivers/staging/wlags49_h25/debug.h | 2 + + drivers/staging/wlags49_h25/dhf.c | 2 + + drivers/staging/wlags49_h25/dhf.h | 2 + + drivers/staging/wlags49_h25/dhfcfg.h | 2 + + drivers/staging/wlags49_h25/hcf.c | 2 + + drivers/staging/wlags49_h25/hcf.h | 2 + + drivers/staging/wlags49_h25/hcfcfg.h | 2 + + drivers/staging/wlags49_h25/hcfdef.h | 2 + + drivers/staging/wlags49_h25/mdd.h | 2 + + drivers/staging/wlags49_h25/mmd.c | 2 + + drivers/staging/wlags49_h25/mmd.h | 2 + + drivers/staging/wlags49_h25/sta_h25.c | 2 + + drivers/staging/wlags49_h25/wl_cs.c | 2 + + drivers/staging/wlags49_h25/wl_cs.h | 2 + + drivers/staging/wlags49_h25/wl_enc.c | 2 + + drivers/staging/wlags49_h25/wl_enc.h | 2 + + drivers/staging/wlags49_h25/wl_if.h | 2 + + drivers/staging/wlags49_h25/wl_internal.h | 2 + + drivers/staging/wlags49_h25/wl_main.c | 2 + + drivers/staging/wlags49_h25/wl_main.h | 2 + + drivers/staging/wlags49_h25/wl_netdev.c | 2 + + drivers/staging/wlags49_h25/wl_netdev.h | 2 + + drivers/staging/wlags49_h25/wl_priv.c | 2 + + drivers/staging/wlags49_h25/wl_priv.h | 2 + + drivers/staging/wlags49_h25/wl_profile.c | 2 + + drivers/staging/wlags49_h25/wl_profile.h | 2 + + drivers/staging/wlags49_h25/wl_sysfs.c | 2 + + drivers/staging/wlags49_h25/wl_sysfs.h | 2 + + drivers/staging/wlags49_h25/wl_util.c | 2 + + drivers/staging/wlags49_h25/wl_util.h | 2 + + drivers/staging/wlags49_h25/wl_version.h | 2 + + drivers/staging/wlags49_h25/wl_wext.c | 2 + + drivers/staging/wlags49_h25/wl_wext.h | 2 + + 607 files changed, 154685 insertions(+), 208440 deletions(-) + delete mode 100644 drivers/staging/android/Kconfig + delete mode 100644 drivers/staging/android/Makefile + delete mode 100644 drivers/staging/android/TODO + delete mode 100644 drivers/staging/android/binder.c + delete mode 100644 drivers/staging/android/binder.h + delete mode 100644 drivers/staging/android/logger.c + delete mode 100644 drivers/staging/android/logger.h + delete mode 100644 drivers/staging/android/lowmemorykiller.c + delete mode 100644 drivers/staging/android/ram_console.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/dream/Kconfig + delete mode 100644 drivers/staging/dream/Makefile + delete mode 100644 drivers/staging/dream/camera/Kconfig + delete mode 100644 drivers/staging/dream/camera/Makefile + delete mode 100644 drivers/staging/dream/camera/msm_camera.c + delete mode 100644 drivers/staging/dream/camera/msm_io7x.c + delete mode 100644 drivers/staging/dream/camera/msm_io8x.c + delete mode 100644 drivers/staging/dream/camera/msm_v4l2.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe7x.h + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x.h + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.c + delete mode 100644 drivers/staging/dream/camera/msm_vfe8x_proc.h + delete mode 100644 drivers/staging/dream/camera/mt9d112.c + delete mode 100644 drivers/staging/dream/camera/mt9d112.h + delete mode 100644 drivers/staging/dream/camera/mt9d112_reg.c + delete mode 100644 drivers/staging/dream/camera/mt9p012.h + delete mode 100644 drivers/staging/dream/camera/mt9p012_fox.c + delete mode 100644 drivers/staging/dream/camera/mt9p012_reg.c + delete mode 100644 drivers/staging/dream/camera/mt9t013.c + delete mode 100644 drivers/staging/dream/camera/mt9t013.h + delete mode 100644 drivers/staging/dream/camera/mt9t013_reg.c + delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.c + delete mode 100644 drivers/staging/dream/camera/s5k3e2fx.h + delete mode 100644 drivers/staging/dream/gpio_axis.c + delete mode 100644 drivers/staging/dream/gpio_event.c + delete mode 100644 drivers/staging/dream/gpio_input.c + delete mode 100644 drivers/staging/dream/gpio_matrix.c + delete mode 100644 drivers/staging/dream/gpio_output.c + delete mode 100644 drivers/staging/dream/qdsp5/Makefile + delete mode 100644 drivers/staging/dream/qdsp5/adsp.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp.h + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6210.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6220.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_6225.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_driver.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_info.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_patch_event.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_jpeg_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_lpm_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_patch_event.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_vfe_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_video_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/adsp_videoenc_verify_cmd.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_aac.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_amrnb.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_evrc.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_in.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_mp3.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_out.c + delete mode 100644 drivers/staging/dream/qdsp5/audio_qcelp.c + delete mode 100644 drivers/staging/dream/qdsp5/audmgr.c + delete mode 100644 drivers/staging/dream/qdsp5/audmgr.h + delete mode 100644 drivers/staging/dream/qdsp5/audmgr_new.h + delete mode 100644 drivers/staging/dream/qdsp5/audpp.c + delete mode 100644 drivers/staging/dream/qdsp5/evlog.h + delete mode 100644 drivers/staging/dream/qdsp5/snd.c + delete mode 100644 drivers/staging/dream/smd/Kconfig + delete mode 100644 drivers/staging/dream/smd/Makefile + delete mode 100644 drivers/staging/dream/smd/rpc_server_dog_keepalive.c + delete mode 100644 drivers/staging/dream/smd/rpc_server_time_remote.c + delete mode 100644 drivers/staging/dream/smd/smd.c + delete mode 100644 drivers/staging/dream/smd/smd_private.h + delete mode 100644 drivers/staging/dream/smd/smd_qmi.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter.h + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_device.c + delete mode 100644 drivers/staging/dream/smd/smd_rpcrouter_servers.c + delete mode 100644 drivers/staging/dream/smd/smd_tty.c + delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.c + delete mode 100644 drivers/staging/dream/synaptics_i2c_rmi.h + create mode 100644 drivers/staging/ramzswap/Kconfig + create mode 100644 drivers/staging/ramzswap/Makefile + create mode 100644 drivers/staging/ramzswap/TODO + create mode 100644 drivers/staging/ramzswap/ramzswap.txt + create mode 100644 drivers/staging/ramzswap/ramzswap_drv.c + create mode 100644 drivers/staging/ramzswap/ramzswap_drv.h + create mode 100644 drivers/staging/ramzswap/ramzswap_ioctl.h + create mode 100644 drivers/staging/ramzswap/xvmalloc.c + create mode 100644 drivers/staging/ramzswap/xvmalloc.h + create mode 100644 drivers/staging/ramzswap/xvmalloc_int.h + delete mode 100644 drivers/staging/rt2860/2860_main_dev.c + delete mode 100644 drivers/staging/rt2860/aironet.h + rename drivers/staging/{rt3090 => rt2860/chip}/mac_pci.h (70%) + create mode 100644 drivers/staging/rt2860/chip/mac_usb.h + rename drivers/staging/{rt3090/netif_block.h => rt2860/chip/rt2860.h} (67%) + rename drivers/staging/{rt3090/rt33xx.h => rt2860/chip/rt2870.h} (77%) + rename drivers/staging/{rt3090/rt3370.h => rt2860/chip/rt3070.h} (87%) + rename drivers/staging/{rt3090 => rt2860/chip}/rt3090.h (83%) + rename drivers/staging/{rt3090 => rt2860/chip}/rt30xx.h (93%) + create mode 100644 drivers/staging/rt2860/chip/rtmp_mac.h + rename drivers/staging/{rt3090 => rt2860/chip}/rtmp_phy.h (78%) + create mode 100644 drivers/staging/rt2860/chips/rt3070.c + rename drivers/staging/{rt3090 => rt2860}/chips/rt3090.c (65%) + rename drivers/staging/{rt3090 => rt2860}/chips/rt30xx.c (54%) + delete mode 100644 drivers/staging/rt2860/common/2860_rtmp_init.c + rename drivers/staging/{rt3090 => rt2860}/common/cmm_aes.c (51%) + create mode 100644 drivers/staging/rt2860/common/cmm_asic.c + rename drivers/staging/{rt3090 => rt2860}/common/cmm_cfg.c (56%) + create mode 100644 drivers/staging/rt2860/common/cmm_data_pci.c + create mode 100644 drivers/staging/rt2860/common/cmm_data_usb.c + create mode 100644 drivers/staging/rt2860/common/cmm_mac_pci.c + create mode 100644 drivers/staging/rt2860/common/cmm_mac_usb.c + create mode 100644 drivers/staging/rt2860/common/cmm_tkip.c + rename drivers/staging/{rt3090 => rt2860}/common/cmm_wep.c (75%) + create mode 100644 drivers/staging/rt2860/common/crypt_hmac.c + create mode 100644 drivers/staging/rt2860/common/crypt_md5.c + create mode 100644 drivers/staging/rt2860/common/crypt_sha2.c + create mode 100644 drivers/staging/rt2860/common/ee_efuse.c + create mode 100644 drivers/staging/rt2860/common/ee_prom.c + create mode 100644 drivers/staging/rt2860/common/firmware_3070.h + delete mode 100644 drivers/staging/rt2860/common/md5.c + create mode 100644 drivers/staging/rt2860/common/rt_channel.c + rename drivers/staging/{rt3090 => rt2860}/common/rt_rf.c (69%) + create mode 100644 drivers/staging/rt2860/common/rtmp_mcu.c + rename drivers/staging/{rt3090 => rt2860}/common/rtmp_timer.c (69%) + delete mode 100644 drivers/staging/rt2860/common/rtmp_tkip.c + delete mode 100644 drivers/staging/rt2860/common/rtmp_wep.c + delete mode 100644 drivers/staging/rt2860/config.mk + rename drivers/staging/{rt3090 => rt2860}/crypt_hmac.h (71%) + rename drivers/staging/{rt3090 => rt2860}/crypt_md5.h (67%) + rename drivers/staging/{rt3090/vr_ikans.h => rt2860/crypt_sha2.h} (54%) + rename drivers/staging/{rt3090 => rt2860}/eeprom.h (68%) + rename drivers/staging/{rt3090 => rt2860/iface}/rtmp_pci.h (62%) + create mode 100644 drivers/staging/rt2860/iface/rtmp_usb.h + delete mode 100644 drivers/staging/rt2860/md5.h + create mode 100644 drivers/staging/rt2860/pci_main_dev.c + delete mode 100644 drivers/staging/rt2860/rt2860.h + delete mode 100644 drivers/staging/rt2860/rt28xx.h + create mode 100644 drivers/staging/rt2860/rt_pci_rbus.c + delete mode 100644 drivers/staging/rt2860/rt_profile.c + create mode 100644 drivers/staging/rt2860/rt_usb.c + create mode 100644 drivers/staging/rt2860/rtmp_chip.h + create mode 100644 drivers/staging/rt2860/rtmp_dot11.h + rename drivers/staging/{rt3090 => rt2860}/rtmp_iface.h (70%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_mcu.h (86%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_os.h (77%) + rename drivers/staging/{rt3090 => rt2860}/rtmp_timer.h (65%) + create mode 100644 drivers/staging/rt2860/rtusb_io.h + delete mode 100644 drivers/staging/rt2860/sta/aironet.c + create mode 100644 drivers/staging/rt2860/usb_main_dev.c + delete mode 100644 drivers/staging/rt2870/2870_main_dev.c + create mode 100644 drivers/staging/rt2870/chips/rt3070.c + create mode 100644 drivers/staging/rt2870/chips/rt30xx.c + delete mode 100644 drivers/staging/rt2870/common/2870_rtmp_init.c + create mode 100644 drivers/staging/rt2870/common/acction.c + create mode 100644 drivers/staging/rt2870/common/cmm_aes.c + create mode 100644 drivers/staging/rt2870/common/cmm_asic.c + create mode 100644 drivers/staging/rt2870/common/cmm_cfg.c + delete mode 100644 drivers/staging/rt2870/common/cmm_data_2870.c + create mode 100644 drivers/staging/rt2870/common/cmm_data_usb.c + create mode 100644 drivers/staging/rt2870/common/cmm_mac_usb.c + create mode 100644 drivers/staging/rt2870/common/cmm_profile.c + create mode 100644 drivers/staging/rt2870/common/cmm_tkip.c + create mode 100644 drivers/staging/rt2870/common/cmm_wep.c + create mode 100644 drivers/staging/rt2870/common/crypt_hmac.c + create mode 100644 drivers/staging/rt2870/common/crypt_md5.c + create mode 100644 drivers/staging/rt2870/common/crypt_sha2.c + create mode 100644 drivers/staging/rt2870/common/ee_efuse.c + create mode 100644 drivers/staging/rt2870/common/rt_channel.c + create mode 100644 drivers/staging/rt2870/common/rt_rf.c + create mode 100644 drivers/staging/rt2870/common/rtmp_mcu.c + create mode 100644 drivers/staging/rt2870/common/rtmp_timer.c + delete mode 100644 drivers/staging/rt2870/rt2870.h + create mode 100644 drivers/staging/rt2870/rt_usb.c + create mode 100644 drivers/staging/rt2870/usb_main_dev.c + delete mode 100644 drivers/staging/rt3090/Kconfig + delete mode 100644 drivers/staging/rt3090/Makefile + delete mode 100644 drivers/staging/rt3090/action.h + delete mode 100644 drivers/staging/rt3090/ap.h + delete mode 100644 drivers/staging/rt3090/ap_apcli.h + delete mode 100644 drivers/staging/rt3090/ap_autoChSel.h + delete mode 100644 drivers/staging/rt3090/ap_autoChSel_cmm.h + delete mode 100644 drivers/staging/rt3090/ap_cfg.h + delete mode 100644 drivers/staging/rt3090/ap_ids.h + delete mode 100644 drivers/staging/rt3090/ap_mbss.h + delete mode 100644 drivers/staging/rt3090/ap_uapsd.h + delete mode 100644 drivers/staging/rt3090/ap_wds.h + delete mode 100644 drivers/staging/rt3090/chips/rt3370.c + delete mode 100644 drivers/staging/rt3090/chips/rt3390.c + delete mode 100644 drivers/staging/rt3090/chips/rt33xx.c + delete mode 100644 drivers/staging/rt3090/chlist.h + delete mode 100644 drivers/staging/rt3090/common/action.c + delete mode 100644 drivers/staging/rt3090/common/ba_action.c + delete mode 100644 drivers/staging/rt3090/common/cmm_asic.c + delete mode 100644 drivers/staging/rt3090/common/cmm_data.c + delete mode 100644 drivers/staging/rt3090/common/cmm_data_pci.c + delete mode 100644 drivers/staging/rt3090/common/cmm_info.c + delete mode 100644 drivers/staging/rt3090/common/cmm_mac_pci.c + delete mode 100644 drivers/staging/rt3090/common/cmm_profile.c + delete mode 100644 drivers/staging/rt3090/common/cmm_sanity.c + delete mode 100644 drivers/staging/rt3090/common/cmm_sync.c + delete mode 100644 drivers/staging/rt3090/common/cmm_tkip.c + delete mode 100644 drivers/staging/rt3090/common/cmm_wpa.c + delete mode 100644 drivers/staging/rt3090/common/crypt_aes.c + delete mode 100644 drivers/staging/rt3090/common/crypt_biginteger.c + delete mode 100644 drivers/staging/rt3090/common/crypt_dh.c + delete mode 100644 drivers/staging/rt3090/common/crypt_hmac.c + delete mode 100644 drivers/staging/rt3090/common/crypt_md5.c + delete mode 100644 drivers/staging/rt3090/common/crypt_sha2.c + delete mode 100644 drivers/staging/rt3090/common/dfs.c + delete mode 100644 drivers/staging/rt3090/common/ee_efuse.c + delete mode 100644 drivers/staging/rt3090/common/ee_prom.c + delete mode 100644 drivers/staging/rt3090/common/eeprom.c + delete mode 100644 drivers/staging/rt3090/common/igmp_snoop.c + delete mode 100644 drivers/staging/rt3090/common/mlme.c + delete mode 100644 drivers/staging/rt3090/common/mlme_ex.c + delete mode 100644 drivers/staging/rt3090/common/netif_block.c + delete mode 100644 drivers/staging/rt3090/common/rt_channel.c + delete mode 100644 drivers/staging/rt3090/common/rtmp_init.c + delete mode 100644 drivers/staging/rt3090/common/rtmp_mcu.c + delete mode 100644 drivers/staging/rt3090/common/spectrum.c + delete mode 100644 drivers/staging/rt3090/config.mk + delete mode 100644 drivers/staging/rt3090/crypt_sha2.h + delete mode 100644 drivers/staging/rt3090/dfs.h + delete mode 100644 drivers/staging/rt3090/igmp_snoop.h + delete mode 100644 drivers/staging/rt3090/ipv6.h + delete mode 100644 drivers/staging/rt3090/link_list.h + delete mode 100644 drivers/staging/rt3090/mlme.h + delete mode 100644 drivers/staging/rt3090/mlme_ex.h + delete mode 100644 drivers/staging/rt3090/mlme_ex_def.h + delete mode 100644 drivers/staging/rt3090/oid.h + delete mode 100644 drivers/staging/rt3090/pci_main_dev.c + delete mode 100644 drivers/staging/rt3090/rt3390.h + delete mode 100644 drivers/staging/rt3090/rt_ate.c + delete mode 100644 drivers/staging/rt3090/rt_ate.h + delete mode 100644 drivers/staging/rt3090/rt_config.h + delete mode 100644 drivers/staging/rt3090/rt_linux.c + delete mode 100644 drivers/staging/rt3090/rt_linux.h + delete mode 100644 drivers/staging/rt3090/rt_main_dev.c + delete mode 100644 drivers/staging/rt3090/rt_pci_rbus.c + delete mode 100644 drivers/staging/rt3090/rt_profile.c + delete mode 100644 drivers/staging/rt3090/rtmp.h + delete mode 100644 drivers/staging/rt3090/rtmp_chip.h + delete mode 100644 drivers/staging/rt3090/rtmp_def.h + delete mode 100644 drivers/staging/rt3090/rtmp_dot11.h + delete mode 100644 drivers/staging/rt3090/rtmp_mac.h + delete mode 100644 drivers/staging/rt3090/rtmp_type.h + delete mode 100644 drivers/staging/rt3090/spectrum.h + delete mode 100644 drivers/staging/rt3090/spectrum_def.h + delete mode 100644 drivers/staging/rt3090/sta/assoc.c + delete mode 100644 drivers/staging/rt3090/sta/auth.c + delete mode 100644 drivers/staging/rt3090/sta/auth_rsp.c + delete mode 100644 drivers/staging/rt3090/sta/connect.c + delete mode 100644 drivers/staging/rt3090/sta/dls.c + delete mode 100644 drivers/staging/rt3090/sta/rtmp_ckipmic.c + delete mode 100644 drivers/staging/rt3090/sta/rtmp_data.c + delete mode 100644 drivers/staging/rt3090/sta/sanity.c + delete mode 100644 drivers/staging/rt3090/sta/sync.c + delete mode 100644 drivers/staging/rt3090/sta/wpa.c + delete mode 100644 drivers/staging/rt3090/sta_ioctl.c + delete mode 100644 drivers/staging/rt3090/wpa.h + create mode 100644 drivers/staging/rtl8192u/Kconfig + create mode 100644 drivers/staging/rtl8192u/Makefile + create mode 100644 drivers/staging/rtl8192u/authors + create mode 100644 drivers/staging/rtl8192u/changes + create mode 100644 drivers/staging/rtl8192u/copying + create mode 100644 drivers/staging/rtl8192u/dot11d.h + create mode 100644 drivers/staging/rtl8192u/ieee80211.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/EndianFree.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/Makefile + create mode 100644 drivers/staging/rtl8192u/ieee80211/aes.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/api.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/arc4.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/autoload.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/cipher.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/compress.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/crypto_compat.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/digest.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/dot11d.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/dot11d.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_ccmp.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_wep.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_module.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_softmac_wx.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/internal.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/kmap_types.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/michael_mic.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/proc.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_BA.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_BAProc.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_HTProc.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_Qos.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/rtl_crypto.h + create mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.c + create mode 100644 drivers/staging/rtl8192u/ieee80211/scatterwalk.h + create mode 100644 drivers/staging/rtl8192u/ieee80211_crypt.h + create mode 100644 drivers/staging/rtl8192u/r8180_93cx6.c + create mode 100644 drivers/staging/rtl8192u/r8180_93cx6.h + create mode 100644 drivers/staging/rtl8192u/r8180_pm.c + create mode 100644 drivers/staging/rtl8192u/r8180_pm.h + create mode 100644 drivers/staging/rtl8192u/r8190_rtl8256.c + create mode 100644 drivers/staging/rtl8192u/r8190_rtl8256.h + create mode 100644 drivers/staging/rtl8192u/r8192U.h + create mode 100644 drivers/staging/rtl8192u/r8192U_core.c + create mode 100644 drivers/staging/rtl8192u/r8192U_dm.c + create mode 100644 drivers/staging/rtl8192u/r8192U_dm.h + create mode 100644 drivers/staging/rtl8192u/r8192U_hw.h + create mode 100644 drivers/staging/rtl8192u/r8192U_wx.c + create mode 100644 drivers/staging/rtl8192u/r8192U_wx.h + create mode 100644 drivers/staging/rtl8192u/r819xU_HTGen.h + create mode 100644 drivers/staging/rtl8192u/r819xU_HTType.h + create mode 100644 drivers/staging/rtl8192u/r819xU_cmdpkt.c + create mode 100644 drivers/staging/rtl8192u/r819xU_cmdpkt.h + create mode 100644 drivers/staging/rtl8192u/r819xU_firmware.c + create mode 100644 drivers/staging/rtl8192u/r819xU_firmware.h + create mode 100644 drivers/staging/rtl8192u/r819xU_firmware_img.c + create mode 100644 drivers/staging/rtl8192u/r819xU_firmware_img.h + create mode 100644 drivers/staging/rtl8192u/r819xU_phy.c + create mode 100644 drivers/staging/rtl8192u/r819xU_phy.h + create mode 100644 drivers/staging/rtl8192u/r819xU_phyreg.h + delete mode 100644 drivers/staging/vt6655/kcompat.h + delete mode 100644 drivers/staging/vt6656/kcompat.h + create mode 100644 drivers/staging/wlags49_h2/Kconfig + create mode 100644 drivers/staging/wlags49_h2/Makefile + create mode 100644 drivers/staging/wlags49_h2/README.ubuntu + create mode 100644 drivers/staging/wlags49_h2/README.wlags49 + create mode 100644 drivers/staging/wlags49_h2/TODO + create mode 100644 drivers/staging/wlags49_h2/WARNING.txt + create mode 100644 drivers/staging/wlags49_h2/ap_h2.c + create mode 100644 drivers/staging/wlags49_h2/ap_h25.c + create mode 100644 drivers/staging/wlags49_h2/debug.h + create mode 100644 drivers/staging/wlags49_h2/dhf.c + create mode 100644 drivers/staging/wlags49_h2/dhf.h + create mode 100644 drivers/staging/wlags49_h2/dhfcfg.h + create mode 100644 drivers/staging/wlags49_h2/hcf.c + create mode 100644 drivers/staging/wlags49_h2/hcf.h + create mode 100644 drivers/staging/wlags49_h2/hcfcfg.h + create mode 100644 drivers/staging/wlags49_h2/hcfdef.h + create mode 100644 drivers/staging/wlags49_h2/man/wlags49.4 + create mode 100644 drivers/staging/wlags49_h2/mdd.h + create mode 100644 drivers/staging/wlags49_h2/mmd.c + create mode 100644 drivers/staging/wlags49_h2/mmd.h + create mode 100644 drivers/staging/wlags49_h2/sta_h2.c + create mode 100644 drivers/staging/wlags49_h2/sta_h25.c + create mode 100644 drivers/staging/wlags49_h2/wl_cs.c + create mode 100644 drivers/staging/wlags49_h2/wl_cs.h + create mode 100644 drivers/staging/wlags49_h2/wl_enc.c + create mode 100644 drivers/staging/wlags49_h2/wl_enc.h + create mode 100644 drivers/staging/wlags49_h2/wl_if.h + create mode 100644 drivers/staging/wlags49_h2/wl_internal.h + create mode 100644 drivers/staging/wlags49_h2/wl_main.c + create mode 100644 drivers/staging/wlags49_h2/wl_main.h + create mode 100644 drivers/staging/wlags49_h2/wl_netdev.c + create mode 100644 drivers/staging/wlags49_h2/wl_netdev.h + create mode 100644 drivers/staging/wlags49_h2/wl_pci.c + create mode 100644 drivers/staging/wlags49_h2/wl_pci.h + create mode 100644 drivers/staging/wlags49_h2/wl_priv.c + create mode 100644 drivers/staging/wlags49_h2/wl_priv.h + create mode 100644 drivers/staging/wlags49_h2/wl_profile.c + create mode 100644 drivers/staging/wlags49_h2/wl_profile.h + create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.c + create mode 100644 drivers/staging/wlags49_h2/wl_sysfs.h + create mode 100644 drivers/staging/wlags49_h2/wl_util.c + create mode 100644 drivers/staging/wlags49_h2/wl_util.h + create mode 100644 drivers/staging/wlags49_h2/wl_version.h + create mode 100644 drivers/staging/wlags49_h2/wl_wext.c + create mode 100644 drivers/staging/wlags49_h2/wl_wext.h + create mode 100644 drivers/staging/wlags49_h25/Kconfig + create mode 100644 drivers/staging/wlags49_h25/Makefile + create mode 100644 drivers/staging/wlags49_h25/README.txt + create mode 100644 drivers/staging/wlags49_h25/TODO + create mode 100644 drivers/staging/wlags49_h25/ap_h25.c + create mode 100644 drivers/staging/wlags49_h25/debug.h + create mode 100644 drivers/staging/wlags49_h25/dhf.c + create mode 100644 drivers/staging/wlags49_h25/dhf.h + create mode 100644 drivers/staging/wlags49_h25/dhfcfg.h + create mode 100644 drivers/staging/wlags49_h25/hcf.c + create mode 100644 drivers/staging/wlags49_h25/hcf.h + create mode 100644 drivers/staging/wlags49_h25/hcfcfg.h + create mode 100644 drivers/staging/wlags49_h25/hcfdef.h + create mode 100644 drivers/staging/wlags49_h25/mdd.h + create mode 100644 drivers/staging/wlags49_h25/mmd.c + create mode 100644 drivers/staging/wlags49_h25/mmd.h + create mode 100644 drivers/staging/wlags49_h25/sta_h25.c + create mode 100644 drivers/staging/wlags49_h25/wl_cs.c + create mode 100644 drivers/staging/wlags49_h25/wl_cs.h + create mode 100644 drivers/staging/wlags49_h25/wl_enc.c + create mode 100644 drivers/staging/wlags49_h25/wl_enc.h + create mode 100644 drivers/staging/wlags49_h25/wl_if.h + create mode 100644 drivers/staging/wlags49_h25/wl_internal.h + create mode 100644 drivers/staging/wlags49_h25/wl_main.c + create mode 100644 drivers/staging/wlags49_h25/wl_main.h + create mode 100644 drivers/staging/wlags49_h25/wl_netdev.c + create mode 100644 drivers/staging/wlags49_h25/wl_netdev.h + create mode 100644 drivers/staging/wlags49_h25/wl_priv.c + create mode 100644 drivers/staging/wlags49_h25/wl_priv.h + create mode 100644 drivers/staging/wlags49_h25/wl_profile.c + create mode 100644 drivers/staging/wlags49_h25/wl_profile.h + create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.c + create mode 100644 drivers/staging/wlags49_h25/wl_sysfs.h + create mode 100644 drivers/staging/wlags49_h25/wl_util.c + create mode 100644 drivers/staging/wlags49_h25/wl_util.h + create mode 100644 drivers/staging/wlags49_h25/wl_version.h + create mode 100644 drivers/staging/wlags49_h25/wl_wext.c + create mode 100644 drivers/staging/wlags49_h25/wl_wext.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. +Merging origin/master +$ git fetch origin master:mtmp +From ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 + * [new branch] master -> mtmp +$ git merge mtmp +Auto-merging Makefile +Merge made by recursive. + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..4cba2a5530d2 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,112 @@ +Importing driver-core.current based on 2.6.32-rc6 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing staging.current based on quilt/usb.current +Unchanged quilt series staging.current +Importing i2c based on 2.6.32-rc6-git4 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.32-rc6-git4 +Unchanged quilt series jdelvare-hwmon +Importing kernel-doc based on 2.6.32-rc6 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.32-rc6-166-g799dd75 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 799dd75b1a8380a967c929a4551895788c374b31 +HEAD is now at 799dd75 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +param:neaten-param.c-exports.patch +param:param_ops.patch +param:param_ops-modpost-complaint-silence.patch +param:add-free-hook.patch +param:use-free-hook-for-charp.patch +param:params-are-const.patch +param:kernel_param_lock.patch +param:documentation.patch +param:cleanup-ide.patch +param:cleanup-mptbase.patch +param:remove-useless-writable-charp.patch +param:lock-charp-simple.patch +param:lock-charp-myri10ge.patch +param:lock-charp-if_sdio.patch +param:ipmi_watchdog.patch +param:acpi-use-ops.patch +misc:enhance-BUILD_BUG_ON.patch +misc:remove-MAYBE_BUILD_BUG_ON.patch +net:tun_export_underlying_socket.patch +mm:export_use_mm_unuse_mm.patch +virtio:vhost_net_a_kernel_level_server.patch +virtio:vhost_net_a_kernel_level_server-fix.patch +lguest:remove-unneeded-zlib-include.patch +sparc:no-inline-export.patch +ppc:no-inline-export.patch +arm:use_unified_discard_definition_in_linker_script.patch +arm:unexport_symbols_used_to_implement_floating_point_emulation.patch +x86:dont-export-inline.patch +module:make_symbol_prefix_into_a_config_option.patch +module:extract_export_symbol_from_h_into_mod_export_h.patch +kbuild:sort_the_list_of_symbols_exported_by_the_kernel_ksymtab.patch +module:refactor_symbol_tables_and_try_to_reduce_code_size_of_each_symbol.patch +module:refactor_symbol_tables_and_try_to_reduce_code_size_of_each_symbol-fix.patch +module:refactor_symbol_tables_and_try_to_reduce_code_size_of_each_symbol-fix2.patch +lib:add_generic_binary_search_function_to_the_kernel.patch +lib:bsearch_remove_redundant_special_case_for_arrays_of_size_0.patch +misc:bsearch_avoid_unneeded_decrement_arithmetic.patch +misc:bsearch_prevent_overflow_when_computing_middle_comparison_element.patch +module:speed_up_find_symbol_using_binary_search_on_the_builtin_symbol_tables.patch +module:fix_is_exported_to_return_true_for_all_types_of_exports.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 740d65e...a2b3b20 master -> quilt/rr (forced update) +Importing device-mapper based on v2.6.32-rc6-346-gaa021ba +$ cd ../quilt-tmp +$ git reset --hard aa021baa3295fa6e3f367d80f8955dd5176656eb +HEAD is now at aa021ba Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-avoid-_hash_lock-deadlock.patch +dm-exception-store-free-tmp_store-on-persistent-flag-error.patch +dm-sysfs-add-empty-release-function-to-avoid-debug-warning.patch +dm-io-use-slab-for-struct-io.patch +dm-io-remove-extra-bi_io_vec-region-hack.patch +dm-ioctl-prefer-strlcpy-over-strncpy.patch +dm-snapshot-avoid-else-clause-in-persistent_read_metadata.patch +dm-snapshot-simplify-sector_to_chunk-expression.patch +dm-snapshot-abstract-minimum_chunk_size-fn.patch +dm-snapshot-consolidate-insert-exception-functions.patch +dm-snapshot-rename-dm_snap_exception-to-dm_exception.patch +dm-snapshot-rename-exception_table-to-dm_exception_table.patch +dm-snapshot-rename-exception-functions.patch +dm-snapshot-add-allocated-metadata-to-snapshot-status.patch +dm-snapshot-move-cow-ref-from-exception-store-to-snap-core.patch +dm-snapshot-track-suspended-state-in-target.patch +dm-kcopyd-accept-zero-size-jobs.patch +dm-abstract-dm_in_flight-function.patch +dm-use-clone-in-map_request-function.patch +dm-pass-gfp_mask-to-alloc_rq_tio.patch +dm-abstract-clone_rq.patch +dm-simplify-request-based-suspend.patch +dm-use-md-pending-for-in-flight-IO-counting.patch +dm-refactor-request-based-completion-functions.patch +dm-move-dm_end_request.patch +dm-add-request-based-barrier-support.patch +dm-rename-dm_get_table-to-dm_get_live_table.patch +dm-mpath-flush-workqueues-before-suspend-completes.patch +dm-io-handle-empty-barriers.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + f2f6bd9...af75ccc master -> quilt/device-mapper (forced update) +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb +Importing staging based on quilt/usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e75cea1dd8b8 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20091113 |