diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-23 17:15:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-23 17:15:44 +1000 |
| commit | 468adc6d0658bc186466d8415a3f3c44c0d94e91 (patch) | |
| tree | ec285f7c52963d07bb91948fa6fb0c240652fd15 | |
| parent | 9abc1f58d597bd2d42e6cc84519221887f413d7d (diff) | |
Add linux-next specific files for 20090923next-20090923
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 141 | ||||
| -rw-r--r-- | Next/Trees | 143 | ||||
| -rw-r--r-- | Next/merge.log | 5676 | ||||
| -rw-r--r-- | Next/quilt-import.log | 391 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 6352 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7c8850b32624 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,141 @@ +Name SHA1 +---- ---- +origin 7fa07729e439a6184bd824746d06a49cca553f15 +fixes de55a8958f6e3ef5ce5f0971b80bd44bfcac7cf1 +arm-current 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 +m68k-current 9848484fad9ddeb18f18f02f9ecdcd330ac9a216 +powerpc-merge ebc79c4f8da0f92efa968e0328f32334a2ce80cf +sparc-current 0a375d75902c522ea36c6dc409296622f93db4a7 +scsi-rc-fixes 388ce4beb7135722c584b0af18f215e3ec657adf +net-current 44c852ead55b7450c8cff0dc90a3d48310300210 +sound-current 87bfa1dbfb22aab2bb6c1085c1fe7d56cdd2f044 +pci-current ab86e5765d41a5eb4239a1c04d613db87bea5ed8 +wireless-current 11ebd1bf07fafde8d16562966c96b05b0d4ced9e +kbuild-current 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef +driver-core.current df58bee21ed218cb7dfb561a590b1bd2a99531cf +tty.current 87cd45422ae6283c1aeedcd983c9c3acaefdd42e +usb.current c700413d9b0fcf19675d16e6b261756593c5095a +cpufreq-current f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +input-current 8120e735c28335c1f0f02c93917886643c4536db +md-current 592e9b44e6d990328c65a65586e3d90a5db9e992 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 4c6ab3ee4cdb86cbd4e9400dd22fad7701cbe795 +ide-curent 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 +davinci 85609c1ccda64af7d7c277469183f20e4f3b69c3 +pxa 52a7a1cec88acdaf3f8b36a6b1fe904f6eca7ee5 +thumb-2 4fb3c2e2ab3549308a1b1663296d165e45d72ba5 +avr32 2c731afd139a76d790862d33857654fea6ac2a1f +blackfin 248be44166a5292546e6d73c675d68e3014ab572 +cris 62f589c5e391dc2081db42e801382304c652e43a +ia64 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef +m68k b25ef35f34a9837e1133b3ef5fab8058155cc69f +m68knommu 04bbadcafb69511635def60844d91864515ab0d2 +microblaze d38a6c3548845c131491f6aa36d05b6984b356a3 +mips 4fa78c6123f21a399d48566c282c5eccf4296923 +parisc 1e0d061b462e48f9b1609a29aed9a5abcf65833e +powerpc ebc79c4f8da0f92efa968e0328f32334a2ce80cf +4xx c5b20d3926dfc9616265b8ff5967cb7a476f9344 +galak 1dcd8ffc81e80a170625883f63f6a5db3cd0428d +s390 ed87b27e00d2ca240f62f3903583a2f1541fb9ef +sh 064a16dc41be879d12bd5de5d2f9d38d890e0ee7 +sparc 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +cifs 48541bd3dd4739b4d574b44ea47660c88d833677 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 56ae43b324e66ecd5d6209950b8ad78921892658 +ext3 2844ce2c309ef2a28c41d1f6e2b4c50bc13e0a8f +ext4 e65931326c0b41f1114539ba3c290d8e6bf27d19 +fatfs ed248b290da7297c9b9a3ff180f5eee4db016224 +fuse 79a9d99434b104c562f30f21b75317667f444793 +gfs2 754aadfea6391444edc45500c7ad088478cea252 +jfs 4a19fb11a90fdbbcb3bc02effa036230d035ca28 +nfs 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef +nfsd 3c394ddaa7ea4205f933fd9b481166b2669368a9 +nilfs2 b4fe76d550d3d74a9fb51c7d6384b28266981586 +ocfs2 7b1c7dec9ef1ac8742721a2d7bbb8ff3304cb816 +squashfs e5d287539dba264a1d9d7607a25b8c8c61c9d658 +udf cbc8cc33529b0e0e55ae0ff077b8cb0b71d54c7a +v9fs b5198fe51951684126c21fd0197081657f039f82 +ubifs 7cce2f4cb7f5f641f78c8e3eea4e7b1b96cb71c0 +xfs 9ef96da6ec5e1b4cf7eb8e30852cd88ec7d5fdc0 +vfs aa7dfb8954ccf49e026ba13d12991a4eb7defb96 +pci 76baeebf7df493703eeb4428eac015bdb7fabda6 +hid 7fa07729e439a6184bd824746d06a49cca553f15 +i2c 3d3db2c0418df5a5b17fe4583868e6b8bfe8bbc9 +jdelvare-hwmon af663ff4d88e09c4e45661251e3c1eeff147ffc1 +kernel-doc 7fa07729e439a6184bd824746d06a49cca553f15 +v4l-dvb f25140438ef7ccdab2a53598ab8c974a29c35195 +quota dee865656f2d8b866f8ac22c60d6363b914e9f12 +kbuild abe1ee3a221d53778c3e58747bbec6e518e5471b +kconfig 48586218b6515b9bd70694e3cd8c901a6a6ee69c +ide 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +libata d15d6e6cc340566d53d953ffdec2c9e96816fa52 +infiniband 16e366791c052242eeb356127ecb4e6048787838 +acpi 193a6dec1c0246a80b6d0101e4f351ccf877bcac +ieee1394 625f0850a8e27b6a8d6fdb95056f35bc22d92b55 +ubi de75c771b4cc4da963164a538a8448128301bc35 +kvm cba2be0ef98862a68fa25ed03b370829634e6b0e +dlm 1329e3f2c898cfabb6ed236d3fb8c1725197af53 +scsi 338f43ee21f0a3a8fec25526aec21e60b7d30129 +async_tx 1f6672d44c1ae7408b43c06170ec34eb0a0e9b9f +net 4142e0d1def2c0176c27fd2e810243045a62eb6d +wireless bbac31f4c0339f6c51afbd0edfb4959df9b53fa9 +mtd 8b85e7cbcfedfcdc2fa1bcc8945f23fc6ad3d07f +crypto 81bd5f6c966cf2f137c2759dfc78abdffcff055e +sound 1a6f0f946b7e0e1a9f68e961a8d23bff8d8b8912 +cpufreq f0adb134d8dc9993a9998dc50845ec4f6ff4fadc +rr d3eae8d4cef8fad538bbafba6bf5c4322e66c613 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 9de48cc300fb10f7d9faa978670becf5e352462a +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 38cffa817734b85cbc8701ba874bdb3dbc16dd13 +device-mapper 38cffa817734b85cbc8701ba874bdb3dbc16dd13 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia b1769450da0eeae2d95aae5496acbdf4c6ba89b2 +battery 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3 +leds f16a5dba01ed942f427f56b0d1128251721275a5 +backlight 3b96ea9ef837c010f2187e0618d823fbdd8eeb54 +kgdb 98517d8f092cceea77ab93f15437c182b5615d9e +slab 11b7576bc42afa6096d966c3bc8737a5fe3c848a +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md 592e9b44e6d990328c65a65586e3d90a5db9e992 +mfd 75f2ba8f0006440e720e47ae14c917e07c452d72 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm aadd4e17452d3d5c2269cd2b000b7de7cfb6c79e +voltage a7627a1c67db6dbd7f233011c20086480db7637a +security-testing 86d710146fb9975f04c505ec78caa43d227c1018 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 121264827656f5f06328b17983c796af17dc5949 +uwb 0396c215f301e92677d1e9a064b405e31501dc1d +watchdog 376f38198f6d611fad991b098e22e9582fc002fd +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu b94996c99c8befed9cbbb8804a4625e203913318 +cputime 27bf8712477db47c891e6198000c985631cd18de +osd fb48922b3cf64d1b20d13468e4c4bb2988093e18 +jc_docs 6c19efb46aacf2c5043ad210b888ee58ffb848c0 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 7fa07729e439a6184bd824746d06a49cca553f15 +audit def57543418a5f47debae28a0a9dea2effc11692 +omap ebc79c4f8da0f92efa968e0328f32334a2ce80cf +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend 0cb583fd2862f19ea88b02eb307d11c09e51e2f8 +bluetooth 7e7430908c3ccaf71f0851050c8ccaf9ecfb3b56 +fsnotify cf71f3cf1697ab9ad9064635e23fecd57af2c327 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 57be4ab97610eb9fab96152cf7fa23a9e1e82b79 +kmemleak df58bee21ed218cb7dfb561a590b1bd2a99531cf +tip 1a4ce84c287f7f4a7d0b411383114633529bc161 +oprofile 8b5050255f993dda5e7b5908ab71d1cafc731bd1 +percpu 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef +sfi c602c65b2f81d14456771d1e3f15d1381f4b7efa +asm-generic 428bc597508e482cdea17b11b7b08eabd6b924a6 +hwpoison 465fdd97cbe16ef8727221857e96ef62dd352017 +driver-core c700413d9b0fcf19675d16e6b261756593c5095a +tty 495ba2447ec1580814b64f0ed91d1a35b2a475f8 +usb 3f5a8f6527276fa6ee0368e4fd30a47fedf8a5b2 +staging 3f5a8f6527276fa6ee0368e4fd30a47fedf8a5b2 +scsi-post-merge 15addcb9e65e9b7a9df5978ee7f105ce2afee257 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..eacb7d36ec1d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,143 @@ +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/ +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#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +thumb-2 git git://linux-arm.org/linux-2.6.git#thumb-2 +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 +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 +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 +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 +quota git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-quota-2.6.git#for_next +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 +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 +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.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#drbd +kmemleak git git://linux-arm.org/linux-2.6.git#kmemleak +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 +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-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..22eacec899ad --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5676 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at de55a89 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp +Merging origin/master +$ git merge origin/master +Updating de55a89..7fa0772 +Fast forward + Documentation/DocBook/Makefile | 10 +- + Documentation/DocBook/dvb/.gitignore | 1 + + Documentation/DocBook/dvb/audio.xml | 1473 ++ + Documentation/DocBook/dvb/ca.xml | 221 + + Documentation/DocBook/dvb/demux.xml | 973 + + Documentation/DocBook/dvb/dvbapi.xml | 87 + + Documentation/DocBook/dvb/dvbstb.pdf | Bin 0 -> 1881 bytes + Documentation/DocBook/dvb/dvbstb.png | Bin 0 -> 22655 bytes + Documentation/DocBook/dvb/examples.xml | 365 + + Documentation/DocBook/dvb/frontend.xml | 1766 ++ + Documentation/DocBook/dvb/intro.xml | 191 + + Documentation/DocBook/dvb/isdbt.xml | 314 + + Documentation/DocBook/dvb/kdapi.xml | 2309 ++ + Documentation/DocBook/dvb/net.xml | 12 + + Documentation/DocBook/dvb/video.xml | 1971 ++ + Documentation/DocBook/media-entities.tmpl | 364 + + Documentation/DocBook/media-indices.tmpl | 85 + + Documentation/DocBook/media.tmpl | 112 + + Documentation/DocBook/mtdnand.tmpl | 2 +- + Documentation/DocBook/scsi.tmpl | 2 +- + Documentation/DocBook/stylesheet.xsl | 1 + + Documentation/DocBook/v4l/.gitignore | 1 + + Documentation/DocBook/v4l/biblio.xml | 188 + + Documentation/DocBook/v4l/capture.c.xml | 659 + + Documentation/DocBook/v4l/common.xml | 1160 + + Documentation/DocBook/v4l/compat.xml | 2457 +++ + Documentation/DocBook/v4l/controls.xml | 2049 ++ + Documentation/DocBook/v4l/crop.gif | Bin 0 -> 5967 bytes + Documentation/DocBook/v4l/crop.pdf | Bin 0 -> 5846 bytes + Documentation/DocBook/v4l/dev-capture.xml | 115 + + Documentation/DocBook/v4l/dev-codec.xml | 26 + + Documentation/DocBook/v4l/dev-effect.xml | 25 + + Documentation/DocBook/v4l/dev-osd.xml | 164 + + Documentation/DocBook/v4l/dev-output.xml | 111 + + Documentation/DocBook/v4l/dev-overlay.xml | 379 + + Documentation/DocBook/v4l/dev-radio.xml | 57 + + Documentation/DocBook/v4l/dev-raw-vbi.xml | 347 + + Documentation/DocBook/v4l/dev-rds.xml | 168 + + Documentation/DocBook/v4l/dev-sliced-vbi.xml | 708 + + Documentation/DocBook/v4l/dev-teletext.xml | 40 + + Documentation/DocBook/v4l/driver.xml | 208 + + Documentation/DocBook/v4l/fdl-appendix.xml | 671 + + Documentation/DocBook/v4l/fieldseq_bt.gif | Bin 0 -> 25430 bytes + Documentation/DocBook/v4l/fieldseq_bt.pdf | Bin 0 -> 9185 bytes + Documentation/DocBook/v4l/fieldseq_tb.gif | Bin 0 -> 25323 bytes + Documentation/DocBook/v4l/fieldseq_tb.pdf | Bin 0 -> 9173 bytes + Documentation/DocBook/v4l/func-close.xml | 70 + + Documentation/DocBook/v4l/func-ioctl.xml | 146 + + Documentation/DocBook/v4l/func-mmap.xml | 185 + + Documentation/DocBook/v4l/func-munmap.xml | 83 + + Documentation/DocBook/v4l/func-open.xml | 121 + + Documentation/DocBook/v4l/func-poll.xml | 127 + + Documentation/DocBook/v4l/func-read.xml | 189 + + Documentation/DocBook/v4l/func-select.xml | 138 + + Documentation/DocBook/v4l/func-write.xml | 136 + + Documentation/DocBook/v4l/io.xml | 1073 + + Documentation/DocBook/v4l/keytable.c.xml | 172 + + Documentation/DocBook/v4l/libv4l.xml | 167 + + Documentation/DocBook/v4l/pixfmt-grey.xml | 70 + + Documentation/DocBook/v4l/pixfmt-nv12.xml | 151 + + Documentation/DocBook/v4l/pixfmt-nv16.xml | 174 + + Documentation/DocBook/v4l/pixfmt-packed-rgb.xml | 862 + + Documentation/DocBook/v4l/pixfmt-packed-yuv.xml | 244 + + Documentation/DocBook/v4l/pixfmt-sbggr16.xml | 91 + + Documentation/DocBook/v4l/pixfmt-sbggr8.xml | 75 + + Documentation/DocBook/v4l/pixfmt-sgbrg8.xml | 75 + + Documentation/DocBook/v4l/pixfmt-sgrbg8.xml | 75 + + Documentation/DocBook/v4l/pixfmt-uyvy.xml | 128 + + Documentation/DocBook/v4l/pixfmt-vyuy.xml | 128 + + Documentation/DocBook/v4l/pixfmt-y16.xml | 89 + + Documentation/DocBook/v4l/pixfmt-y41p.xml | 157 + + Documentation/DocBook/v4l/pixfmt-yuv410.xml | 141 + + Documentation/DocBook/v4l/pixfmt-yuv411p.xml | 155 + + Documentation/DocBook/v4l/pixfmt-yuv420.xml | 157 + + Documentation/DocBook/v4l/pixfmt-yuv422p.xml | 161 + + Documentation/DocBook/v4l/pixfmt-yuyv.xml | 128 + + Documentation/DocBook/v4l/pixfmt-yvyu.xml | 128 + + Documentation/DocBook/v4l/pixfmt.xml | 801 + + Documentation/DocBook/v4l/remote_controllers.xml | 175 + + Documentation/DocBook/v4l/v4l2.xml | 479 + + Documentation/DocBook/v4l/v4l2grab.c.xml | 164 + + Documentation/DocBook/v4l/vbi_525.gif | Bin 0 -> 4741 bytes + Documentation/DocBook/v4l/vbi_525.pdf | Bin 0 -> 3395 bytes + Documentation/DocBook/v4l/vbi_625.gif | Bin 0 -> 5095 bytes + Documentation/DocBook/v4l/vbi_625.pdf | Bin 0 -> 3683 bytes + Documentation/DocBook/v4l/vbi_hsync.gif | Bin 0 -> 2400 bytes + Documentation/DocBook/v4l/vbi_hsync.pdf | Bin 0 -> 7405 bytes + Documentation/DocBook/v4l/videodev2.h.xml | 1640 ++ + Documentation/DocBook/v4l/vidioc-cropcap.xml | 174 + + .../DocBook/v4l/vidioc-dbg-g-chip-ident.xml | 275 + + .../DocBook/v4l/vidioc-dbg-g-register.xml | 275 + + Documentation/DocBook/v4l/vidioc-encoder-cmd.xml | 204 + + Documentation/DocBook/v4l/vidioc-enum-fmt.xml | 164 + + .../DocBook/v4l/vidioc-enum-frameintervals.xml | 270 + + .../DocBook/v4l/vidioc-enum-framesizes.xml | 282 + + Documentation/DocBook/v4l/vidioc-enumaudio.xml | 86 + + Documentation/DocBook/v4l/vidioc-enumaudioout.xml | 89 + + Documentation/DocBook/v4l/vidioc-enuminput.xml | 287 + + Documentation/DocBook/v4l/vidioc-enumoutput.xml | 172 + + Documentation/DocBook/v4l/vidioc-enumstd.xml | 391 + + Documentation/DocBook/v4l/vidioc-g-audio.xml | 188 + + Documentation/DocBook/v4l/vidioc-g-audioout.xml | 154 + + Documentation/DocBook/v4l/vidioc-g-crop.xml | 143 + + Documentation/DocBook/v4l/vidioc-g-ctrl.xml | 130 + + Documentation/DocBook/v4l/vidioc-g-enc-index.xml | 213 + + Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml | 307 + + Documentation/DocBook/v4l/vidioc-g-fbuf.xml | 456 + + Documentation/DocBook/v4l/vidioc-g-fmt.xml | 201 + + Documentation/DocBook/v4l/vidioc-g-frequency.xml | 145 + + Documentation/DocBook/v4l/vidioc-g-input.xml | 100 + + Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml | 180 + + Documentation/DocBook/v4l/vidioc-g-modulator.xml | 246 + + Documentation/DocBook/v4l/vidioc-g-output.xml | 100 + + Documentation/DocBook/v4l/vidioc-g-parm.xml | 332 + + Documentation/DocBook/v4l/vidioc-g-priority.xml | 144 + + .../DocBook/v4l/vidioc-g-sliced-vbi-cap.xml | 264 + + Documentation/DocBook/v4l/vidioc-g-std.xml | 99 + + Documentation/DocBook/v4l/vidioc-g-tuner.xml | 535 + + Documentation/DocBook/v4l/vidioc-log-status.xml | 58 + + Documentation/DocBook/v4l/vidioc-overlay.xml | 83 + + Documentation/DocBook/v4l/vidioc-qbuf.xml | 168 + + Documentation/DocBook/v4l/vidioc-querybuf.xml | 103 + + Documentation/DocBook/v4l/vidioc-querycap.xml | 284 + + Documentation/DocBook/v4l/vidioc-queryctrl.xml | 428 + + Documentation/DocBook/v4l/vidioc-querystd.xml | 83 + + Documentation/DocBook/v4l/vidioc-reqbufs.xml | 160 + + .../DocBook/v4l/vidioc-s-hw-freq-seek.xml | 129 + + Documentation/DocBook/v4l/vidioc-streamon.xml | 106 + + Documentation/SubmittingPatches | 2 +- + Documentation/arm/OMAP/omap_pm | 129 + + Documentation/cpu-freq/user-guide.txt | 9 +- + Documentation/dontdiff | 1 - + Documentation/dvb/get_dvb_firmware | 37 +- + Documentation/dvb/technisat.txt | 75 +- + Documentation/feature-removal-schedule.txt | 10 - + Documentation/filesystems/ext4.txt | 24 +- + Documentation/filesystems/nfs41-server.txt | 54 + + Documentation/filesystems/nfsroot.txt | 2 +- + Documentation/filesystems/proc.txt | 22 +- + Documentation/gcov.txt | 2 +- + Documentation/hwmon/hpfall.c | 115 +- + Documentation/hwmon/pc87427 | 2 +- + Documentation/hwmon/wm831x | 37 + + Documentation/hwmon/wm8350 | 26 + + Documentation/kernel-doc-nano-HOWTO.txt | 4 +- + Documentation/kernel-parameters.txt | 8 +- + Documentation/kmemcheck.txt | 21 +- + Documentation/kref.txt | 1 - + Documentation/markers.txt | 104 - + Documentation/memory.txt | 31 +- + Documentation/networking/regulatory.txt | 2 +- + Documentation/numastat.txt | 8 +- + Documentation/powerpc/dts-bindings/marvell.txt | 2 +- + Documentation/scsi/ChangeLog.megaraid | 2 +- + Documentation/scsi/scsi_fc_transport.txt | 2 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- + Documentation/sysctl/kernel.txt | 30 +- + Documentation/sysctl/vm.txt | 4 +- + Documentation/trace/events-kmem.txt | 107 + + Documentation/trace/events.txt | 186 +- + Documentation/trace/ftrace-design.txt | 233 + + Documentation/trace/ftrace.txt | 8 +- + .../postprocess/trace-pagealloc-postprocess.pl | 418 + + Documentation/trace/power.txt | 17 - + Documentation/trace/tracepoint-analysis.txt | 327 + + Documentation/video4linux/CARDLIST.cx23885 | 1 + + Documentation/video4linux/CARDLIST.em28xx | 3 +- + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/CARDLIST.saa7164 | 9 + + Documentation/video4linux/CARDLIST.tuner | 2 + + Documentation/video4linux/gspca.txt | 2 + + Documentation/video4linux/soc-camera.txt | 40 + + Documentation/video4linux/v4l2-framework.txt | 61 +- + Documentation/vm/00-INDEX | 4 + + Documentation/vm/hugetlbpage.txt | 147 +- + Documentation/vm/ksm.txt | 89 + + Documentation/vm/map_hugetlb.c | 77 + + Documentation/x86/boot.txt | 1 + + MAINTAINERS | 183 +- + arch/Kconfig | 1 + + arch/alpha/Kconfig | 8 + + arch/alpha/boot/tools/objstrip.c | 2 +- + arch/alpha/include/asm/hardirq.h | 14 +- + arch/alpha/include/asm/mman.h | 5 + + arch/alpha/kernel/pci_iommu.c | 6 +- + arch/alpha/kernel/time.c | 79 +- + arch/alpha/mm/init.c | 2 +- + arch/alpha/mm/numa.c | 2 +- + arch/arm/Makefile | 2 +- + arch/arm/configs/da830_omapl137_defconfig | 1254 ++ + arch/arm/configs/da850_omapl138_defconfig | 1229 ++ + arch/arm/configs/davinci_all_defconfig | 173 +- + arch/arm/configs/n8x0_defconfig | 1104 + + arch/arm/configs/omap3_beagle_defconfig | 41 +- + arch/arm/configs/omap_3430sdp_defconfig | 20 +- + arch/arm/configs/omap_zoom2_defconfig | 484 +- + arch/arm/configs/rx51_defconfig | 1 + + arch/arm/include/asm/mman.h | 18 +- + arch/arm/include/asm/unistd.h | 2 +- + arch/arm/kernel/calls.S | 2 +- + arch/arm/mach-at91/board-afeb-9260v1.c | 2 +- + arch/arm/mach-at91/board-cam60.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-at91/board-qil-a9260.c | 2 +- + arch/arm/mach-at91/board-sam9260ek.c | 2 +- + arch/arm/mach-at91/board-sam9261ek.c | 2 +- + arch/arm/mach-at91/board-sam9263ek.c | 2 +- + arch/arm/mach-at91/board-sam9g20ek.c | 2 +- + arch/arm/mach-at91/board-sam9rlek.c | 2 +- + arch/arm/mach-at91/board-usb-a9260.c | 2 +- + arch/arm/mach-at91/board-usb-a9263.c | 2 +- + arch/arm/mach-davinci/Kconfig | 49 +- + arch/arm/mach-davinci/Makefile | 14 +- + arch/arm/mach-davinci/Makefile.boot | 10 + + arch/arm/mach-davinci/board-da830-evm.c | 157 + + arch/arm/mach-davinci/board-da850-evm.c | 415 + + arch/arm/mach-davinci/board-dm355-evm.c | 83 +- + arch/arm/mach-davinci/board-dm365-evm.c | 492 + + arch/arm/mach-davinci/board-dm644x-evm.c | 81 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 410 + + arch/arm/mach-davinci/clock.c | 5 +- + arch/arm/mach-davinci/da830.c | 1205 + + arch/arm/mach-davinci/da850.c | 820 + + arch/arm/mach-davinci/devices-da8xx.c | 450 + + arch/arm/mach-davinci/devices.c | 60 +- + arch/arm/mach-davinci/dm355.c | 174 +- + arch/arm/mach-davinci/dm365.c | 926 + + arch/arm/mach-davinci/dm644x.c | 141 +- + arch/arm/mach-davinci/dm646x.c | 321 +- + arch/arm/mach-davinci/dma.c | 955 +- + arch/arm/mach-davinci/gpio.c | 105 +- + arch/arm/mach-davinci/include/mach/asp.h | 56 +- + arch/arm/mach-davinci/include/mach/common.h | 2 +- + arch/arm/mach-davinci/include/mach/cputype.h | 24 + + arch/arm/mach-davinci/include/mach/da8xx.h | 121 + + arch/arm/mach-davinci/include/mach/debug-macro.S | 8 + + arch/arm/mach-davinci/include/mach/dm355.h | 7 + + arch/arm/mach-davinci/include/mach/dm365.h | 29 + + arch/arm/mach-davinci/include/mach/dm644x.h | 4 + + arch/arm/mach-davinci/include/mach/dm646x.h | 65 + + arch/arm/mach-davinci/include/mach/edma.h | 67 +- + arch/arm/mach-davinci/include/mach/gpio.h | 13 +- + arch/arm/mach-davinci/include/mach/hardware.h | 17 + + arch/arm/mach-davinci/include/mach/io.h | 23 +- + arch/arm/mach-davinci/include/mach/irqs.h | 205 +- + arch/arm/mach-davinci/include/mach/memory.h | 9 +- + arch/arm/mach-davinci/include/mach/mux.h | 731 + + arch/arm/mach-davinci/include/mach/psc.h | 62 + + arch/arm/mach-davinci/include/mach/serial.h | 6 +- + arch/arm/mach-davinci/include/mach/system.h | 4 +- + arch/arm/mach-davinci/include/mach/uncompress.h | 7 +- + arch/arm/mach-davinci/include/mach/vmalloc.h | 2 +- + arch/arm/mach-davinci/mux.c | 14 + + arch/arm/mach-davinci/sram.c | 2 +- + arch/arm/mach-davinci/time.c | 16 +- + arch/arm/mach-davinci/usb.c | 13 + + arch/arm/mach-omap1/board-ams-delta.c | 43 +- + arch/arm/mach-omap1/board-fsample.c | 5 - + arch/arm/mach-omap1/board-generic.c | 5 - + arch/arm/mach-omap1/board-h2.c | 5 - + arch/arm/mach-omap1/board-h3.c | 5 - + arch/arm/mach-omap1/board-innovator.c | 5 - + arch/arm/mach-omap1/board-osk.c | 5 - + arch/arm/mach-omap1/board-palmte.c | 5 - + arch/arm/mach-omap1/board-palmtt.c | 5 - + arch/arm/mach-omap1/board-palmz71.c | 5 - + arch/arm/mach-omap1/board-perseus2.c | 5 - + arch/arm/mach-omap1/board-sx1.c | 5 - + arch/arm/mach-omap1/board-voiceblue.c | 5 - + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/io.c | 6 +- + arch/arm/mach-omap1/pm.h | 4 +- + arch/arm/mach-omap1/serial.c | 17 +- + arch/arm/mach-omap1/sram.S | 12 +- + arch/arm/mach-omap1/time.c | 4 +- + arch/arm/mach-omap2/Kconfig | 9 + + arch/arm/mach-omap2/Makefile | 10 +- + arch/arm/mach-omap2/board-2430sdp.c | 18 +- + arch/arm/mach-omap2/board-3430sdp.c | 29 +- + arch/arm/mach-omap2/board-4430sdp.c | 5 +- + arch/arm/mach-omap2/board-apollon.c | 25 +- + arch/arm/mach-omap2/board-generic.c | 15 +- + arch/arm/mach-omap2/board-h4.c | 25 +- + arch/arm/mach-omap2/board-ldp.c | 25 +- + arch/arm/mach-omap2/board-n8x0.c | 150 + + arch/arm/mach-omap2/board-omap3beagle.c | 36 +- + arch/arm/mach-omap2/board-omap3evm.c | 17 +- + arch/arm/mach-omap2/board-omap3pandora.c | 25 +- + arch/arm/mach-omap2/board-overo.c | 24 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 122 +- + arch/arm/mach-omap2/board-rx51.c | 9 +- + arch/arm/mach-omap2/board-zoom-debugboard.c | 11 +- + arch/arm/mach-omap2/board-zoom2.c | 218 +- + arch/arm/mach-omap2/clock.c | 2 + + arch/arm/mach-omap2/clock34xx.c | 17 +- + arch/arm/mach-omap2/clock34xx.h | 21 +- + arch/arm/mach-omap2/clockdomain.c | 10 +- + arch/arm/mach-omap2/cm.c | 70 + + arch/arm/mach-omap2/cm.h | 10 +- + arch/arm/mach-omap2/cm4xxx.c | 68 + + arch/arm/mach-omap2/devices.c | 41 + + arch/arm/mach-omap2/io.c | 23 +- + arch/arm/mach-omap2/iommu2.c | 19 +- + arch/arm/mach-omap2/mux.c | 55 + + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 1554 ++ + arch/arm/mach-omap2/omap_hwmod_2420.h | 141 + + arch/arm/mach-omap2/omap_hwmod_2430.h | 143 + + arch/arm/mach-omap2/omap_hwmod_34xx.h | 168 + + arch/arm/mach-omap2/pm-debug.c | 431 +- + arch/arm/mach-omap2/pm.h | 11 + + arch/arm/mach-omap2/pm24xx.c | 4 +- + arch/arm/mach-omap2/pm34xx.c | 40 +- + arch/arm/mach-omap2/powerdomain.c | 114 +- + arch/arm/mach-omap2/prm.h | 6 +- + arch/arm/mach-omap2/sdrc.h | 6 +- + arch/arm/mach-omap2/serial.c | 67 +- + arch/arm/mach-omap2/sram242x.S | 4 +- + arch/arm/mach-omap2/sram243x.S | 4 +- + arch/arm/mach-omap2/timer-gp.c | 2 +- + arch/arm/mach-omap2/usb-musb.c | 12 - + arch/arm/mm/init.c | 4 +- + arch/arm/plat-omap/Kconfig | 17 + + arch/arm/plat-omap/Makefile | 6 + + arch/arm/plat-omap/clock.c | 2 +- + arch/arm/plat-omap/common.c | 95 +- + arch/arm/plat-omap/dma.c | 8 +- + arch/arm/plat-omap/dmtimer.c | 5 +- + arch/arm/plat-omap/gpio.c | 115 +- + arch/arm/plat-omap/include/mach/board.h | 2 - + arch/arm/plat-omap/include/mach/clockdomain.h | 3 +- + arch/arm/plat-omap/include/mach/control.h | 12 +- + arch/arm/plat-omap/include/mach/entry-macro.S | 8 +- + arch/arm/plat-omap/include/mach/gpio.h | 2 +- + arch/arm/plat-omap/include/mach/io.h | 97 +- + arch/arm/plat-omap/include/mach/iommu.h | 6 +- + arch/arm/plat-omap/include/mach/mtd-xip.h | 2 +- + arch/arm/plat-omap/include/mach/mux.h | 31 + + arch/arm/plat-omap/include/mach/omap-pm.h | 301 + + arch/arm/plat-omap/include/mach/omap44xx.h | 8 +- + arch/arm/plat-omap/include/mach/omap_device.h | 141 + + arch/arm/plat-omap/include/mach/omap_hwmod.h | 447 + + arch/arm/plat-omap/include/mach/powerdomain.h | 15 +- + arch/arm/plat-omap/include/mach/sdrc.h | 15 +- + arch/arm/plat-omap/include/mach/serial.h | 3 + + arch/arm/plat-omap/io.c | 62 +- + arch/arm/plat-omap/iommu-debug.c | 415 + + arch/arm/plat-omap/iommu.c | 23 +- + arch/arm/plat-omap/iovmm.c | 2 +- + arch/arm/plat-omap/omap-pm-noop.c | 296 + + arch/arm/plat-omap/omap_device.c | 687 + + arch/arm/plat-omap/sram.c | 18 +- + arch/avr32/include/asm/mman.h | 18 +- + arch/avr32/mm/init.c | 2 +- + arch/blackfin/include/asm/unistd.h | 2 +- + arch/blackfin/mach-bf538/include/mach/defBF539.h | 2 +- + arch/blackfin/mach-common/entry.S | 2 +- + arch/cris/include/asm/mman.h | 20 +- + arch/cris/mm/init.c | 2 +- + arch/frv/Kconfig | 2 +- + arch/frv/include/asm/mman.h | 19 +- + .../include/asm/{perf_counter.h => perf_event.h} | 10 +- + arch/frv/include/asm/unistd.h | 2 +- + arch/frv/kernel/entry.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 66 +- + arch/frv/lib/Makefile | 2 +- + arch/frv/lib/cache.S | 2 +- + arch/frv/lib/{perf_counter.c => perf_event.c} | 8 +- + arch/h8300/include/asm/hardirq.h | 15 +- + arch/h8300/include/asm/mman.h | 18 +- + arch/h8300/kernel/irq.c | 5 - + arch/h8300/kernel/timer/tpu.c | 1 - + arch/ia64/ia32/sys_ia32.c | 2 +- + arch/ia64/include/asm/mca.h | 2 + + arch/ia64/include/asm/mman.h | 14 +- + arch/ia64/include/asm/topology.h | 17 +- + arch/ia64/kernel/crash.c | 83 +- + arch/ia64/kernel/head.S | 6 +- + arch/ia64/kernel/machine_kexec.c | 15 + + arch/ia64/kernel/mca.c | 15 +- + arch/ia64/kernel/mca_asm.S | 47 + + arch/ia64/kernel/relocate_kernel.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 113 +- + arch/ia64/mm/init.c | 2 +- + arch/ia64/sn/pci/pcibr/pcibr_ate.c | 2 + + arch/m32r/Kconfig | 6 + + arch/m32r/include/asm/hardirq.h | 15 +- + arch/m32r/include/asm/mman.h | 18 +- + arch/m32r/kernel/ptrace.c | 5 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/m32r/kernel/time.c | 74 +- + arch/m32r/mm/init.c | 2 +- + arch/m68k/Kconfig | 6 + + arch/m68k/include/asm/hardirq_mm.h | 12 +- + arch/m68k/include/asm/mman.h | 18 +- + arch/m68k/include/asm/unistd.h | 2 +- + arch/m68k/kernel/entry.S | 2 +- + arch/m68k/kernel/time.c | 70 +- + arch/m68k/mm/init.c | 2 +- + arch/m68knommu/kernel/syscalltable.S | 2 +- + arch/m68knommu/kernel/time.c | 5 +- + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/kernel/syscall_table.S | 2 +- + arch/microblaze/mm/init.c | 2 +- + arch/mips/Kconfig | 88 +- + arch/mips/Makefile | 22 +- + arch/mips/alchemy/common/setup.c | 4 + + arch/mips/alchemy/common/time.c | 15 +- + arch/mips/ar7/platform.c | 32 + + arch/mips/bcm63xx/Kconfig | 25 + + arch/mips/bcm63xx/Makefile | 7 + + arch/mips/bcm63xx/boards/Kconfig | 11 + + arch/mips/bcm63xx/boards/Makefile | 3 + + arch/mips/bcm63xx/boards/board_bcm963xx.c | 837 + + arch/mips/bcm63xx/clk.c | 226 + + arch/mips/bcm63xx/cpu.c | 345 + + arch/mips/bcm63xx/cs.c | 144 + + arch/mips/bcm63xx/dev-dsp.c | 56 + + arch/mips/bcm63xx/dev-enet.c | 159 + + arch/mips/bcm63xx/early_printk.c | 30 + + arch/mips/bcm63xx/gpio.c | 134 + + arch/mips/bcm63xx/irq.c | 253 + + arch/mips/bcm63xx/prom.c | 55 + + arch/mips/bcm63xx/setup.c | 125 + + arch/mips/bcm63xx/timer.c | 205 + + arch/mips/boot/elf2ecoff.c | 4 +- + arch/mips/cavium-octeon/Makefile | 4 +- + arch/mips/cavium-octeon/octeon-platform.c | 164 + + arch/mips/cavium-octeon/setup.c | 103 - + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 972 + + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/cobalt_defconfig | 1 - + arch/mips/configs/db1000_defconfig | 1 - + arch/mips/configs/db1100_defconfig | 1 - + arch/mips/configs/db1200_defconfig | 1 - + arch/mips/configs/db1500_defconfig | 1 - + arch/mips/configs/db1550_defconfig | 1 - + arch/mips/configs/excite_defconfig | 1 - + .../{fulong_defconfig => fuloong2e_defconfig} | 473 +- + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/ip28_defconfig | 1 - + arch/mips/configs/ip32_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/lasat_defconfig | 1 - + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/markeins_defconfig | 1 - + arch/mips/configs/mipssim_defconfig | 1 - + arch/mips/configs/msp71xx_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/pb1100_defconfig | 1 - + arch/mips/configs/pb1500_defconfig | 1 - + arch/mips/configs/pb1550_defconfig | 1 - + arch/mips/configs/pnx8335-stb225_defconfig | 1 - + arch/mips/configs/pnx8550-jbs_defconfig | 1 - + arch/mips/configs/pnx8550-stb810_defconfig | 1 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/configs/sb1250-swarm_defconfig | 1 - + arch/mips/configs/wrppmc_defconfig | 1 - + arch/mips/configs/yosemite_defconfig | 1 - + arch/mips/dec/prom/memory.c | 2 +- + arch/mips/dec/time.c | 5 +- + arch/mips/emma/markeins/setup.c | 2 +- + arch/mips/fw/arc/Makefile | 2 + + arch/mips/fw/cfe/cfe_api.c | 4 +- + arch/mips/include/asm/atomic.h | 40 +- + arch/mips/include/asm/bitops.h | 34 +- + arch/mips/include/asm/bootinfo.h | 12 + + arch/mips/include/asm/cmpxchg.h | 4 +- + arch/mips/include/asm/cpu-features.h | 3 + + arch/mips/include/asm/cpu.h | 7 + + arch/mips/include/asm/delay.h | 2 + + arch/mips/include/asm/fixmap.h | 4 + + arch/mips/include/asm/hardirq.h | 12 +- + arch/mips/include/asm/lasat/lasat.h | 1 + + arch/mips/include/asm/local.h | 8 +- + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 9 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h | 12 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 538 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h | 10 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h | 13 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_enet.h | 45 + + .../include/asm/mach-bcm63xx/bcm63xx_dev_pci.h | 6 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h | 22 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h | 93 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h | 15 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 773 + + arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h | 11 + + .../mips/include/asm/mach-bcm63xx/board_bcm963xx.h | 60 + + .../asm/mach-bcm63xx/cpu-feature-overrides.h | 51 + + arch/mips/include/asm/mach-bcm63xx/gpio.h | 15 + + .../asm/{mach-lemote => mach-bcm63xx}/war.h | 6 +- + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 12 +- + arch/mips/include/asm/mach-ip27/topology.h | 1 - + .../cpu-feature-overrides.h | 6 +- + .../{mach-lemote => mach-loongson}/dma-coherence.h | 6 +- + arch/mips/include/asm/mach-loongson/loongson.h | 64 + + arch/mips/include/asm/mach-loongson/machine.h | 22 + + .../{mach-lemote => mach-loongson}/mc146818rtc.h | 6 +- + arch/mips/include/asm/mach-loongson/mem.h | 30 + + .../asm/{mach-lemote => mach-loongson}/pci.h | 21 +- + .../asm/{mach-lemote => mach-loongson}/war.h | 6 +- + .../include/asm/mach-malta/cpu-feature-overrides.h | 4 - + arch/mips/include/asm/mips-boards/bonito64.h | 2 +- + arch/mips/include/asm/mips-boards/generic.h | 2 - + arch/mips/include/asm/mman.h | 5 + + arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 88 + + arch/mips/include/asm/octeon/cvmx.h | 2 +- + arch/mips/include/asm/page.h | 5 +- + arch/mips/include/asm/pgtable-64.h | 11 +- + arch/mips/include/asm/pgtable.h | 10 + + arch/mips/include/asm/system.h | 18 +- + arch/mips/include/asm/unistd.h | 6 +- + arch/mips/kernel/asm-offsets.c | 3 - + arch/mips/kernel/cpu-bugs64.c | 2 +- + arch/mips/kernel/cpu-probe.c | 40 +- + arch/mips/kernel/kspd.c | 6 +- + arch/mips/kernel/mips-mt-fpaff.c | 2 +- + arch/mips/kernel/mips-mt.c | 10 +- + arch/mips/kernel/octeon_switch.S | 3 - + arch/mips/kernel/r2300_switch.S | 3 - + arch/mips/kernel/r4k_switch.S | 3 - + arch/mips/kernel/rtlx.c | 2 +- + arch/mips/kernel/scall32-o32.S | 74 +- + arch/mips/kernel/scall64-64.S | 74 +- + arch/mips/kernel/scall64-n32.S | 2 +- + arch/mips/kernel/scall64-o32.S | 2 +- + arch/mips/kernel/setup.c | 2 +- + arch/mips/kernel/smp.c | 3 +- + arch/mips/kernel/smtc.c | 10 +- + arch/mips/kernel/syscall.c | 112 +- + arch/mips/kernel/traps.c | 5 +- + arch/mips/kernel/vmlinux.lds.S | 93 +- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/lasat/ds1603.c | 5 +- + arch/mips/lasat/sysctl.c | 8 +- + arch/mips/lemote/lm2e/Makefile | 7 - + arch/mips/lemote/lm2e/bonito-irq.c | 74 - + arch/mips/lemote/lm2e/dbg_io.c | 146 - + arch/mips/lemote/lm2e/irq.c | 143 - + arch/mips/lemote/lm2e/pci.c | 97 - + arch/mips/lemote/lm2e/prom.c | 97 - + arch/mips/lemote/lm2e/reset.c | 41 - + arch/mips/lemote/lm2e/setup.c | 111 - + arch/mips/loongson/Kconfig | 31 + + arch/mips/loongson/Makefile | 11 + + arch/mips/loongson/common/Makefile | 11 + + arch/mips/loongson/common/bonito-irq.c | 51 + + arch/mips/loongson/common/cmdline.c | 52 + + arch/mips/loongson/common/early_printk.c | 38 + + arch/mips/loongson/common/env.c | 58 + + arch/mips/loongson/common/init.c | 30 + + arch/mips/loongson/common/irq.c | 74 + + arch/mips/loongson/common/machtype.c | 50 + + arch/mips/{lemote/lm2e => loongson/common}/mem.c | 22 +- + arch/mips/loongson/common/pci.c | 83 + + arch/mips/loongson/common/reset.c | 44 + + arch/mips/loongson/common/setup.c | 58 + + arch/mips/loongson/common/time.c | 28 + + arch/mips/loongson/fuloong-2e/Makefile | 7 + + arch/mips/loongson/fuloong-2e/irq.c | 71 + + arch/mips/loongson/fuloong-2e/reset.c | 23 + + arch/mips/mipssim/sim_setup.c | 2 +- + arch/mips/mm/fault.c | 12 +- + arch/mips/mm/init.c | 5 +- + arch/mips/mm/pgtable-64.c | 3 - + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlbex.c | 53 +- + arch/mips/mti-malta/malta-init.c | 2 +- + arch/mips/mti-malta/malta-reset.c | 7 +- + arch/mips/mti-malta/malta-setup.c | 1 - + arch/mips/mti-malta/malta-time.c | 5 +- + arch/mips/nxp/pnx833x/stb22x/board.c | 2 +- + arch/mips/nxp/pnx8550/common/proc.c | 6 +- + arch/mips/oprofile/Makefile | 1 + + arch/mips/oprofile/common.c | 4 + + arch/mips/oprofile/op_model_loongson2.c | 177 + + arch/mips/pci/Makefile | 4 +- + arch/mips/pci/fixup-bcm63xx.c | 21 + + arch/mips/pci/{fixup-lm2e.c => fixup-fuloong2e.c} | 18 - + arch/mips/pci/ops-bcm63xx.c | 467 + + arch/mips/pci/ops-bonito64.c | 4 +- + arch/mips/pci/pci-bcm1480.c | 2 +- + arch/mips/pci/pci-bcm1480ht.c | 2 +- + arch/mips/pci/pci-bcm63xx.c | 224 + + arch/mips/pci/pci-bcm63xx.h | 27 + + arch/mips/pci/pci-sb1250.c | 2 +- + arch/mips/pci/pci.c | 4 +- + arch/mips/pmc-sierra/yosemite/setup.c | 5 +- + arch/mips/power/hibernate.S | 3 +- + arch/mips/sgi-ip22/Makefile | 2 +- + arch/mips/sibyte/swarm/setup.c | 15 +- + arch/mips/sni/time.c | 5 +- + arch/mips/txx9/generic/pci.c | 13 + + arch/mips/txx9/generic/setup.c | 17 +- + arch/mn10300/include/asm/cacheflush.h | 4 +- + arch/mn10300/include/asm/mman.h | 29 +- + arch/mn10300/include/asm/unistd.h | 2 +- + arch/mn10300/kernel/asm-offsets.c | 6 +- + arch/mn10300/kernel/entry.S | 2 +- + arch/mn10300/mm/init.c | 2 +- + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/mman.h | 5 + + arch/parisc/include/asm/perf_counter.h | 7 - + arch/parisc/include/asm/perf_event.h | 7 + + arch/parisc/include/asm/unistd.h | 4 +- + arch/parisc/kernel/syscall_table.S | 2 +- + arch/parisc/mm/init.c | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/hw_irq.h | 22 +- + arch/powerpc/include/asm/mman.h | 2 + + arch/powerpc/include/asm/paca.h | 2 +- + .../include/asm/{perf_counter.h => perf_event.h} | 22 +- + arch/powerpc/include/asm/systbl.h | 2 +- + arch/powerpc/include/asm/topology.h | 9 +- + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/kernel/Makefile | 2 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/entry_64.S | 8 +- + arch/powerpc/kernel/irq.c | 8 +- + arch/powerpc/kernel/mpc7450-pmu.c | 2 +- + arch/powerpc/kernel/perf_callchain.c | 2 +- + .../kernel/{perf_counter.c => perf_event.c} | 567 +- + arch/powerpc/kernel/power4-pmu.c | 2 +- + arch/powerpc/kernel/power5+-pmu.c | 2 +- + arch/powerpc/kernel/power5-pmu.c | 2 +- + arch/powerpc/kernel/power6-pmu.c | 2 +- + arch/powerpc/kernel/power7-pmu.c | 2 +- + arch/powerpc/kernel/ppc970-pmu.c | 2 +- + arch/powerpc/kernel/time.c | 49 +- + arch/powerpc/kernel/udbg_16550.c | 2 +- + arch/powerpc/mm/fault.c | 8 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/platforms/Kconfig.cputype | 4 +- + arch/powerpc/platforms/cell/spufs/file.c | 1 - + arch/powerpc/platforms/cell/spufs/inode.c | 4 +- + arch/powerpc/platforms/cell/spufs/sched.c | 1 - + arch/powerpc/platforms/powermac/udbg_scc.c | 2 +- + arch/powerpc/sysdev/axonram.c | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/hypfs/inode.c | 6 +- + arch/s390/include/asm/mman.h | 13 +- + arch/s390/include/asm/perf_counter.h | 10 - + arch/s390/include/asm/perf_event.h | 10 + + arch/s390/include/asm/unistd.h | 2 +- + arch/s390/kernel/compat_wrapper.S | 8 +- + arch/s390/kernel/sys_s390.c | 1 - + arch/s390/kernel/syscalls.S | 2 +- + arch/s390/kernel/time.c | 38 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/mm/fault.c | 8 +- + arch/s390/mm/init.c | 2 +- + arch/score/Kconfig | 141 + + arch/score/Kconfig.debug | 37 + + arch/score/Makefile | 43 + + arch/score/boot/Makefile | 15 + + arch/score/configs/spct6600_defconfig | 717 + + arch/score/include/asm/Kbuild | 3 + + arch/score/include/asm/asmmacro.h | 161 + + arch/score/include/asm/atomic.h | 6 + + arch/score/include/asm/auxvec.h | 4 + + arch/score/include/asm/bitops.h | 16 + + arch/score/include/asm/bitsperlong.h | 6 + + arch/score/include/asm/bug.h | 6 + + arch/score/include/asm/bugs.h | 6 + + arch/score/include/asm/byteorder.h | 6 + + arch/score/include/asm/cache.h | 7 + + arch/score/include/asm/cacheflush.h | 45 + + arch/score/include/asm/checksum.h | 235 + + arch/score/include/asm/cputime.h | 6 + + arch/score/include/asm/current.h | 6 + + arch/score/include/asm/delay.h | 26 + + arch/score/include/asm/device.h | 6 + + arch/score/include/asm/div64.h | 6 + + arch/score/include/asm/dma-mapping.h | 6 + + arch/score/include/asm/dma.h | 8 + + arch/score/include/asm/elf.h | 103 + + arch/score/include/asm/emergency-restart.h | 6 + + arch/score/include/asm/errno.h | 6 + + arch/score/include/asm/fcntl.h | 6 + + arch/score/include/asm/fixmap.h | 82 + + arch/score/include/asm/ftrace.h | 4 + + arch/score/include/asm/futex.h | 6 + + arch/score/include/asm/hardirq.h | 6 + + arch/score/include/asm/hw_irq.h | 4 + + arch/score/include/asm/io.h | 9 + + arch/score/include/asm/ioctl.h | 6 + + arch/score/include/asm/ioctls.h | 6 + + arch/score/include/asm/ipcbuf.h | 6 + + arch/score/include/asm/irq.h | 25 + + arch/score/include/asm/irq_regs.h | 11 + + arch/score/include/asm/irqflags.h | 109 + + arch/score/include/asm/kdebug.h | 6 + + arch/score/include/asm/kmap_types.h | 6 + + arch/score/include/asm/linkage.h | 7 + + arch/score/include/asm/local.h | 6 + + arch/score/include/asm/mman.h | 6 + + arch/score/include/asm/mmu.h | 6 + + arch/score/include/asm/mmu_context.h | 113 + + arch/score/include/asm/module.h | 39 + + arch/score/include/asm/msgbuf.h | 6 + + arch/score/include/asm/mutex.h | 6 + + arch/score/include/asm/page.h | 92 + + arch/score/include/asm/param.h | 6 + + arch/score/include/asm/pci.h | 4 + + arch/score/include/asm/percpu.h | 6 + + arch/score/include/asm/pgalloc.h | 83 + + arch/score/include/asm/pgtable-bits.h | 25 + + arch/score/include/asm/pgtable.h | 287 + + arch/score/include/asm/poll.h | 6 + + arch/score/include/asm/posix_types.h | 6 + + arch/score/include/asm/processor.h | 106 + + arch/score/include/asm/ptrace.h | 97 + + arch/score/include/asm/resource.h | 6 + + arch/score/include/asm/scatterlist.h | 6 + + arch/score/include/asm/scoreregs.h | 51 + + arch/score/include/asm/sections.h | 6 + + arch/score/include/asm/segment.h | 21 + + arch/score/include/asm/sembuf.h | 6 + + arch/score/include/asm/setup.h | 41 + + arch/score/include/asm/shmbuf.h | 6 + + arch/score/include/asm/shmparam.h | 6 + + arch/score/include/asm/sigcontext.h | 22 + + arch/score/include/asm/siginfo.h | 6 + + arch/score/include/asm/signal.h | 6 + + arch/score/include/asm/socket.h | 6 + + arch/score/include/asm/sockios.h | 6 + + arch/score/include/asm/stat.h | 6 + + arch/score/include/asm/statfs.h | 6 + + arch/score/include/asm/string.h | 8 + + arch/score/include/asm/swab.h | 6 + + arch/score/include/asm/syscalls.h | 11 + + arch/score/include/asm/system.h | 90 + + arch/score/include/asm/termbits.h | 6 + + arch/score/include/asm/termios.h | 6 + + arch/score/include/asm/thread_info.h | 105 + + arch/score/include/asm/timex.h | 8 + + arch/score/include/asm/tlb.h | 17 + + arch/score/include/asm/tlbflush.h | 142 + + arch/score/include/asm/topology.h | 6 + + arch/score/include/asm/types.h | 6 + + arch/score/include/asm/uaccess.h | 424 + + arch/score/include/asm/ucontext.h | 1 + + arch/score/include/asm/unaligned.h | 6 + + arch/score/include/asm/unistd.h | 13 + + arch/score/include/asm/user.h | 21 + + arch/score/kernel/Makefile | 11 + + arch/score/kernel/asm-offsets.c | 216 + + arch/score/kernel/entry.S | 514 + + arch/score/kernel/head.S | 70 + + arch/score/kernel/init_task.c | 47 + + arch/score/kernel/irq.c | 148 + + arch/score/kernel/module.c | 165 + + arch/score/kernel/process.c | 168 + + arch/score/kernel/ptrace.c | 382 + + arch/score/kernel/setup.c | 159 + + arch/score/kernel/signal.c | 361 + + arch/score/kernel/sys_call_table.c | 12 + + arch/score/kernel/sys_score.c | 151 + + arch/score/kernel/time.c | 99 + + arch/score/kernel/traps.c | 349 + + arch/score/kernel/vmlinux.lds.S | 148 + + arch/score/lib/Makefile | 8 + + arch/score/lib/ashldi3.c | 46 + + arch/score/lib/ashrdi3.c | 48 + + arch/score/lib/checksum.S | 255 + + arch/score/lib/checksum_copy.c | 52 + + arch/score/lib/cmpdi2.c | 44 + + arch/score/lib/libgcc.h | 37 + + arch/score/lib/lshrdi3.c | 47 + + arch/score/lib/string.S | 184 + + arch/score/lib/ucmpdi2.c | 38 + + arch/score/mm/Makefile | 6 + + arch/score/mm/cache.c | 257 + + arch/score/mm/extable.c | 38 + + arch/score/mm/fault.c | 235 + + arch/score/mm/init.c | 161 + + arch/score/mm/pgtable.c | 52 + + arch/score/mm/tlb-miss.S | 199 + + arch/score/mm/tlb-score.c | 251 + + arch/sh/Kconfig | 46 +- + arch/sh/Kconfig.debug | 23 +- + arch/sh/Makefile | 26 +- + arch/sh/boards/Kconfig | 22 +- + arch/sh/boards/board-ap325rxa.c | 68 +- + arch/sh/boards/board-sh7785lcr.c | 18 + + arch/sh/boards/mach-ecovec24/Makefile | 9 + + arch/sh/boards/mach-ecovec24/setup.c | 670 + + arch/sh/boards/mach-highlander/setup.c | 7 + + arch/sh/boards/mach-kfr2r09/Makefile | 2 + + arch/sh/boards/mach-kfr2r09/lcd_wqvga.c | 332 + + arch/sh/boards/mach-kfr2r09/setup.c | 386 + + arch/sh/boards/mach-migor/setup.c | 11 +- + arch/sh/boards/mach-se/7722/setup.c | 4 + + arch/sh/boards/mach-se/7724/setup.c | 110 +- + arch/sh/boards/mach-x3proto/setup.c | 7 + + arch/sh/boot/.gitignore | 5 +- + arch/sh/boot/Makefile | 48 +- + arch/sh/boot/compressed/.gitignore | 1 + + arch/sh/boot/compressed/Makefile | 21 +- + arch/sh/boot/compressed/head_32.S | 2 +- + arch/sh/boot/compressed/misc.c | 149 + + arch/sh/boot/compressed/misc_32.c | 206 - + arch/sh/boot/compressed/misc_64.c | 210 - + arch/sh/boot/compressed/piggy.S | 8 - + arch/sh/boot/compressed/vmlinux.scr | 10 + + arch/sh/boot/romimage/Makefile | 19 + + arch/sh/boot/romimage/head.S | 10 + + arch/sh/boot/romimage/vmlinux.scr | 6 + + arch/sh/configs/ecovec24-romimage_defconfig | 1032 + + arch/sh/configs/ecovec24_defconfig | 1558 ++ + arch/sh/configs/kfr2r09-romimage_defconfig | 774 + + arch/sh/configs/kfr2r09_defconfig | 1059 + + arch/sh/configs/snapgear_defconfig | 77 +- + arch/sh/drivers/dma/Kconfig | 6 +- + arch/sh/drivers/heartbeat.c | 10 + + arch/sh/drivers/pci/pci.c | 4 + + arch/sh/include/asm/Kbuild | 2 +- + arch/sh/include/asm/bug.h | 31 + + arch/sh/include/asm/bugs.h | 24 +- + arch/sh/include/asm/cachectl.h | 19 + + arch/sh/include/asm/cacheflush.h | 114 +- + arch/sh/include/asm/device.h | 16 +- + arch/sh/include/asm/dma-sh.h | 1 + + arch/sh/include/asm/dwarf.h | 398 + + arch/sh/include/asm/entry-macros.S | 86 +- + arch/sh/include/asm/ftrace.h | 8 +- + arch/sh/include/asm/hardirq.h | 13 +- + arch/sh/include/asm/heartbeat.h | 1 + + arch/sh/include/asm/hwblk.h | 72 + + arch/sh/include/asm/io.h | 16 +- + arch/sh/include/asm/kdebug.h | 1 + + arch/sh/include/asm/kgdb.h | 3 - + arch/sh/include/asm/lmb.h | 6 + + arch/sh/include/asm/mmu_context.h | 2 +- + arch/sh/include/asm/page.h | 24 +- + arch/sh/include/asm/perf_counter.h | 9 - + arch/sh/include/asm/perf_event.h | 9 + + arch/sh/include/asm/pgtable.h | 34 +- + arch/sh/include/asm/pgtable_32.h | 30 +- + arch/sh/include/asm/pgtable_64.h | 5 + + arch/sh/include/asm/processor.h | 15 +- + arch/sh/include/asm/romimage-macros.h | 73 + + arch/sh/include/asm/sections.h | 1 + + arch/sh/include/asm/sh_keysc.h | 1 + + arch/sh/include/asm/stacktrace.h | 25 + + arch/sh/include/asm/suspend.h | 9 + + arch/sh/include/asm/syscall_32.h | 1 + + arch/sh/include/asm/system.h | 19 +- + arch/sh/include/asm/system_32.h | 43 +- + arch/sh/include/asm/system_64.h | 10 + + arch/sh/include/asm/thread_info.h | 11 +- + arch/sh/include/asm/topology.h | 10 +- + arch/sh/include/asm/types.h | 2 + + arch/sh/include/asm/unistd_32.h | 4 +- + arch/sh/include/asm/unistd_64.h | 4 +- + arch/sh/include/asm/unwinder.h | 31 + + arch/sh/include/asm/vmlinux.lds.h | 17 + + arch/sh/include/asm/watchdog.h | 19 +- + arch/sh/include/cpu-common/cpu/cacheflush.h | 44 - + arch/sh/include/cpu-sh2a/cpu/cacheflush.h | 34 - + arch/sh/include/cpu-sh3/cpu/cacheflush.h | 46 - + arch/sh/include/cpu-sh4/cpu/cacheflush.h | 43 - + arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 3 +- + arch/sh/include/cpu-sh4/cpu/freq.h | 4 + + arch/sh/include/cpu-sh4/cpu/sh7722.h | 14 + + arch/sh/include/cpu-sh4/cpu/sh7723.h | 17 + + arch/sh/include/cpu-sh4/cpu/sh7724.h | 17 + + arch/sh/include/cpu-sh4/cpu/sh7757.h | 243 + + arch/sh/include/cpu-sh5/cpu/cacheflush.h | 33 - + arch/sh/include/mach-common/mach/migor.h | 64 - + arch/sh/include/mach-common/mach/romimage.h | 1 + + arch/sh/include/mach-common/mach/sh7785lcr.h | 2 + + .../mach-ecovec24/mach/partner-jet-setup.txt | 82 + + arch/sh/include/mach-ecovec24/mach/romimage.h | 20 + + arch/sh/include/mach-kfr2r09/mach/kfr2r09.h | 21 + + .../mach-kfr2r09/mach/partner-jet-setup.txt | 143 + + arch/sh/include/mach-kfr2r09/mach/romimage.h | 20 + + arch/sh/include/mach-migor/mach/migor.h | 14 + + arch/sh/kernel/Makefile | 44 +- + arch/sh/kernel/Makefile_32 | 37 - + arch/sh/kernel/Makefile_64 | 19 - + arch/sh/kernel/asm-offsets.c | 1 + + arch/sh/kernel/cpu/Makefile | 2 +- + arch/sh/kernel/cpu/hwblk.c | 155 + + arch/sh/kernel/cpu/init.c | 36 +- + arch/sh/kernel/cpu/irq/ipr.c | 1 + + arch/sh/kernel/cpu/sh2/entry.S | 3 +- + arch/sh/kernel/cpu/sh2/probe.c | 1 + + arch/sh/kernel/cpu/sh2a/entry.S | 3 +- + arch/sh/kernel/cpu/sh2a/probe.c | 2 + + arch/sh/kernel/cpu/sh3/clock-sh7709.c | 11 - + arch/sh/kernel/cpu/sh3/entry.S | 102 +- + arch/sh/kernel/cpu/sh3/ex.S | 4 +- + arch/sh/kernel/cpu/sh3/probe.c | 2 + + arch/sh/kernel/cpu/sh4/probe.c | 21 +- + arch/sh/kernel/cpu/sh4a/Makefile | 9 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 63 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 113 +- + arch/sh/kernel/cpu/sh4a/clock-sh7724.c | 124 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 130 + + arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c | 106 + + arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c | 117 + + arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c | 121 + + arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c | 2019 ++ + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 39 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 42 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 43 + + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 513 + + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 55 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 + + arch/sh/kernel/cpu/sh5/probe.c | 2 + + arch/sh/kernel/cpu/shmobile/Makefile | 2 + + arch/sh/kernel/cpu/shmobile/cpuidle.c | 113 + + arch/sh/kernel/cpu/shmobile/pm.c | 42 +- + arch/sh/kernel/cpu/shmobile/pm_runtime.c | 303 + + arch/sh/kernel/cpu/shmobile/sleep.S | 155 +- + arch/sh/kernel/cpufreq.c | 10 +- + arch/sh/kernel/dumpstack.c | 123 + + arch/sh/kernel/dwarf.c | 972 + + arch/sh/kernel/early_printk.c | 5 +- + arch/sh/kernel/entry-common.S | 103 +- + arch/sh/kernel/ftrace.c | 188 + + arch/sh/kernel/io.c | 97 +- + arch/sh/kernel/io_generic.c | 50 +- + arch/sh/kernel/io_trapped.c | 10 +- + arch/sh/kernel/irq.c | 19 +- + arch/sh/kernel/kgdb.c | 4 - + arch/sh/kernel/localtimer.c | 9 +- + arch/sh/kernel/nmi_debug.c | 77 + + arch/sh/kernel/process_32.c | 25 +- + arch/sh/kernel/process_64.c | 24 +- + arch/sh/kernel/ptrace_32.c | 9 + + arch/sh/kernel/ptrace_64.c | 9 + + arch/sh/kernel/setup.c | 80 +- + arch/sh/kernel/sh_ksyms_32.c | 10 +- + arch/sh/kernel/sh_ksyms_64.c | 9 - + arch/sh/kernel/signal_32.c | 12 +- + arch/sh/kernel/signal_64.c | 38 +- + arch/sh/kernel/stacktrace.c | 98 +- + arch/sh/kernel/sys_sh.c | 43 + + arch/sh/kernel/syscalls_32.S | 4 +- + arch/sh/kernel/syscalls_64.S | 4 +- + arch/sh/kernel/time.c | 37 +- + arch/sh/kernel/traps.c | 45 +- + arch/sh/kernel/traps_32.c | 218 +- + arch/sh/kernel/unwinder.c | 164 + + arch/sh/kernel/vmlinux.lds.S | 94 +- + arch/sh/lib/Makefile | 4 +- + arch/sh/lib/{clear_page.S => __clear_user.S} | 48 +- + arch/sh/lib/copy_page.S | 11 +- + arch/sh/lib/delay.c | 5 +- + arch/sh/lib/mcount.S | 228 +- + arch/sh/lib64/Makefile | 2 +- + arch/sh/lib64/clear_page.S | 54 - + arch/sh/mm/Kconfig | 7 +- + arch/sh/mm/Makefile | 68 +- + arch/sh/mm/Makefile_32 | 43 - + arch/sh/mm/Makefile_64 | 46 - + arch/sh/mm/cache-sh2.c | 13 +- + arch/sh/mm/cache-sh2a.c | 23 +- + arch/sh/mm/cache-sh3.c | 25 +- + arch/sh/mm/cache-sh4.c | 362 +- + arch/sh/mm/cache-sh5.c | 307 +- + arch/sh/mm/cache-sh7705.c | 72 +- + arch/sh/mm/cache.c | 316 + + arch/sh/mm/fault_32.c | 204 +- + arch/sh/mm/fault_64.c | 11 +- + arch/sh/mm/flush-sh4.c | 108 + + arch/sh/mm/init.c | 52 +- + arch/sh/mm/ioremap_32.c | 8 - + arch/sh/mm/ioremap_64.c | 6 +- + arch/sh/mm/kmap.c | 65 + + arch/sh/mm/mmap.c | 2 +- + arch/sh/mm/nommu.c | 96 + + arch/sh/mm/numa.c | 36 +- + arch/sh/mm/pg-nommu.c | 38 - + arch/sh/mm/pg-sh4.c | 146 - + arch/sh/mm/pg-sh7705.c | 138 - + arch/sh/mm/tlb-nommu.c | 62 - + arch/sh/mm/tlb-pteaex.c | 28 +- + arch/sh/mm/tlb-sh3.c | 27 +- + arch/sh/mm/tlb-sh4.c | 37 +- + arch/sh/mm/tlb-sh5.c | 21 +- + arch/sh/mm/tlbflush_64.c | 30 +- + arch/sh/oprofile/backtrace.c | 84 +- + arch/sh/tools/mach-types | 3 + + arch/sparc/Kconfig | 4 +- + arch/sparc/configs/sparc32_defconfig | 44 +- + arch/sparc/configs/sparc64_defconfig | 51 +- + arch/sparc/include/asm/mman.h | 2 + + arch/sparc/include/asm/perf_counter.h | 14 - + arch/sparc/include/asm/perf_event.h | 14 + + arch/sparc/include/asm/topology_64.h | 7 +- + arch/sparc/include/asm/unistd.h | 2 +- + arch/sparc/kernel/Makefile | 2 +- + arch/sparc/kernel/irq_64.c | 2 +- + arch/sparc/kernel/nmi.c | 4 +- + arch/sparc/kernel/pcr.c | 10 +- + arch/sparc/kernel/{perf_counter.c => perf_event.c} | 179 +- + arch/sparc/kernel/setup_32.c | 2 - + arch/sparc/kernel/setup_64.c | 2 - + arch/sparc/kernel/systbls_32.S | 2 +- + arch/sparc/kernel/systbls_64.S | 4 +- + arch/sparc/kernel/vmlinux.lds.S | 75 +- + arch/sparc/mm/init_32.c | 2 +- + arch/um/drivers/net_kern.c | 2 +- + arch/um/drivers/ubd_kern.c | 2 +- + arch/um/include/asm/hardirq.h | 26 +- + arch/um/include/shared/ptrace_user.h | 2 +- + arch/um/kernel/mem.c | 2 +- + arch/um/kernel/skas/mmu.c | 4 +- + arch/um/os-Linux/helper.c | 1 - + arch/x86/Kconfig | 77 +- + arch/x86/ia32/ia32entry.S | 2 +- + arch/x86/include/asm/apic.h | 32 +- + arch/x86/include/asm/bootparam.h | 10 + + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/do_timer.h | 16 - + arch/x86/include/asm/e820.h | 2 - + arch/x86/include/asm/elf.h | 2 + + arch/x86/include/asm/entry_arch.h | 4 +- + arch/x86/include/asm/hypervisor.h | 2 +- + arch/x86/include/asm/io_apic.h | 7 +- + arch/x86/include/asm/irq.h | 3 +- + arch/x86/include/asm/mce.h | 32 +- + arch/x86/include/asm/mpspec.h | 47 +- + arch/x86/include/asm/msr-index.h | 11 + + arch/x86/include/asm/nops.h | 2 + + arch/x86/include/asm/paravirt.h | 51 +- + arch/x86/include/asm/paravirt_types.h | 28 - + .../include/asm/{perf_counter.h => perf_event.h} | 30 +- + arch/x86/include/asm/pgtable.h | 10 - + arch/x86/include/asm/pgtable_types.h | 4 +- + arch/x86/include/asm/processor.h | 30 + + arch/x86/include/asm/setup.h | 49 +- + arch/x86/include/asm/string_32.h | 1 - + arch/x86/include/asm/time.h | 53 - + arch/x86/include/asm/timer.h | 14 +- + arch/x86/include/asm/topology.h | 14 +- + arch/x86/include/asm/tsc.h | 3 +- + arch/x86/include/asm/uaccess_32.h | 2 +- + arch/x86/include/asm/unistd_32.h | 2 +- + arch/x86/include/asm/unistd_64.h | 4 +- + arch/x86/include/asm/uv/uv_hub.h | 19 +- + arch/x86/include/asm/vgtod.h | 1 + + arch/x86/include/asm/vmware.h | 2 +- + arch/x86/include/asm/x86_init.h | 133 + + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/apic/apic.c | 40 +- + arch/x86/kernel/apic/bigsmp_32.c | 2 +- + arch/x86/kernel/apic/io_apic.c | 56 +- + arch/x86/kernel/apic/nmi.c | 2 +- + arch/x86/kernel/apic/numaq_32.c | 57 +- + arch/x86/kernel/apic/probe_64.c | 15 +- + arch/x86/kernel/apic/summit_32.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 11 + + arch/x86/kernel/cpu/Makefile | 4 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/common.c | 5 +- + arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 116 +- + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 44 +- + arch/x86/kernel/cpu/hypervisor.c | 14 +- + arch/x86/kernel/cpu/intel.c | 6 + + arch/x86/kernel/cpu/mcheck/Makefile | 5 +- + arch/x86/kernel/cpu/mcheck/k7.c | 116 - + arch/x86/kernel/cpu/mcheck/mce-inject.c | 158 +- + arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 + + arch/x86/kernel/cpu/mcheck/mce-severity.c | 8 +- + arch/x86/kernel/cpu/mcheck/mce.c | 304 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 3 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 10 +- + arch/x86/kernel/cpu/mcheck/non-fatal.c | 94 - + arch/x86/kernel/cpu/mcheck/p4.c | 163 - + arch/x86/kernel/cpu/mcheck/p6.c | 127 - + arch/x86/kernel/cpu/mcheck/therm_throt.c | 13 +- + arch/x86/kernel/cpu/mtrr/if.c | 12 +- + .../kernel/cpu/{perf_counter.c => perf_event.c} | 601 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- + arch/x86/kernel/cpu/sched.c | 55 + + arch/x86/kernel/cpu/vmware.c | 27 +- + arch/x86/kernel/cpuid.c | 4 +- + arch/x86/kernel/e820.c | 21 +- + arch/x86/kernel/early_printk.c | 2 +- + arch/x86/kernel/efi.c | 4 + + arch/x86/kernel/entry_64.S | 8 +- + arch/x86/kernel/head32.c | 26 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/head_32.S | 1 + + arch/x86/kernel/i8253.c | 19 - + arch/x86/kernel/irq.c | 4 +- + arch/x86/kernel/irqinit.c | 40 +- + arch/x86/kernel/kvmclock.c | 11 +- + arch/x86/kernel/microcode_core.c | 6 +- + arch/x86/kernel/mpparse.c | 75 +- + arch/x86/kernel/mrst.c | 24 + + arch/x86/kernel/msr.c | 4 +- + arch/x86/kernel/paravirt.c | 36 +- + arch/x86/kernel/process.c | 25 +- + arch/x86/kernel/rtc.c | 17 +- + arch/x86/kernel/setup.c | 145 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/syscall_table_32.S | 2 +- + arch/x86/kernel/time.c | 121 + + arch/x86/kernel/time_32.c | 137 - + arch/x86/kernel/time_64.c | 135 - + arch/x86/kernel/trampoline.c | 4 +- + arch/x86/kernel/trampoline_32.S | 8 +- + arch/x86/kernel/trampoline_64.S | 5 +- + arch/x86/kernel/traps.c | 6 +- + arch/x86/kernel/tsc.c | 88 +- + arch/x86/kernel/visws_quirks.c | 54 +- + arch/x86/kernel/vmi_32.c | 12 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/kernel/vsyscall_64.c | 1 + + arch/x86/kernel/x86_init.c | 75 + + arch/x86/lguest/boot.c | 11 +- + arch/x86/mm/fault.c | 8 +- + arch/x86/mm/init_32.c | 6 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/kmemcheck/kmemcheck.c | 3 - + arch/x86/mm/kmemcheck/shadow.c | 1 - + arch/x86/mm/mmap.c | 17 +- + arch/x86/mm/pat.c | 12 +- + arch/x86/oprofile/op_model_ppro.c | 4 +- + arch/x86/oprofile/op_x86_model.h | 2 +- + arch/x86/power/cpu.c | 4 - + arch/x86/vdso/vclock_gettime.c | 39 +- + arch/x86/xen/enlighten.c | 26 +- + arch/x86/xen/irq.c | 5 +- + arch/x86/xen/mmu.c | 16 +- + arch/x86/xen/mmu.h | 2 +- + arch/x86/xen/xen-ops.h | 2 - + arch/xtensa/include/asm/mman.h | 5 + + arch/xtensa/kernel/time.c | 5 +- + arch/xtensa/mm/init.c | 2 +- + block/bsg.c | 4 +- + block/genhd.c | 8 +- + drivers/acpi/acpica/tbfadt.c | 1 - + drivers/ata/Kconfig | 9 + + drivers/ata/Makefile | 1 + + drivers/ata/ahci.c | 4 +- + drivers/ata/libata-core.c | 4 +- + drivers/ata/pata_amd.c | 3 + + drivers/ata/pata_atp867x.c | 548 + + drivers/ata/pata_hpt37x.c | 2 +- + drivers/ata/sata_promise.c | 155 +- + drivers/base/core.c | 19 +- + drivers/base/devtmpfs.c | 24 +- + drivers/base/node.c | 5 + + drivers/block/DAC960.c | 10 +- + drivers/block/amiflop.c | 2 +- + drivers/block/aoe/aoeblk.c | 2 +- + drivers/block/aoe/aoechr.c | 4 +- + drivers/block/ataflop.c | 2 +- + drivers/block/brd.c | 2 +- + drivers/block/cciss.c | 2 +- + drivers/block/cpqarray.c | 2 +- + drivers/block/floppy.c | 2 +- + drivers/block/hd.c | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/mg_disk.c | 2 +- + drivers/block/nbd.c | 2 +- + drivers/block/osdblk.c | 2 +- + drivers/block/paride/pcd.c | 2 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/paride/pf.c | 2 +- + drivers/block/pktcdvd.c | 8 +- + drivers/block/ps3disk.c | 2 +- + drivers/block/ps3vram.c | 2 +- + drivers/block/sunvdc.c | 2 +- + drivers/block/swim.c | 2 +- + drivers/block/swim3.c | 4 +- + drivers/block/sx8.c | 2 +- + drivers/block/ub.c | 2 +- + drivers/block/umem.c | 3 +- + drivers/block/viodasd.c | 2 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xd.c | 2 +- + drivers/block/xen-blkfront.c | 4 +- + drivers/block/xsysace.c | 2 +- + drivers/block/z2ram.c | 3 +- + drivers/cdrom/gdrom.c | 2 +- + drivers/cdrom/viocd.c | 2 +- + drivers/char/agp/backend.c | 4 +- + drivers/char/agp/uninorth-agp.c | 2 +- + drivers/char/cyclades.c | 2311 +-- + drivers/char/epca.c | 2 +- + drivers/char/esp.c | 7 +- + drivers/char/hw_random/Kconfig | 13 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/core.c | 2 +- + drivers/char/hw_random/octeon-rng.c | 147 + + drivers/char/ipmi/ipmi_poweroff.c | 4 +- + drivers/char/isicom.c | 57 +- + drivers/char/mbcs.c | 5 +- + drivers/char/mem.c | 29 +- + drivers/char/misc.c | 10 +- + drivers/char/mxser.c | 62 +- + drivers/char/n_tty.c | 79 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pty.c | 6 +- + drivers/char/raw.c | 4 +- + drivers/char/riscom8.c | 164 +- + drivers/char/sysrq.c | 4 +- + drivers/char/tty_io.c | 33 +- + drivers/char/tty_ioctl.c | 4 +- + drivers/char/tty_ldisc.c | 82 +- + drivers/char/tty_port.c | 31 +- + drivers/char/vt.c | 17 +- + drivers/char/vt_ioctl.c | 482 +- + drivers/cpufreq/cpufreq.c | 305 +- + drivers/cpufreq/cpufreq_ondemand.c | 139 +- + drivers/cpuidle/cpuidle.c | 2 + + drivers/cpuidle/governors/menu.c | 271 +- + drivers/edac/edac_core.h | 2 +- + drivers/firmware/memmap.c | 2 +- + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/bt8xxgpio.c | 4 +- + drivers/gpio/wm831x-gpio.c | 252 + + drivers/gpu/drm/Kconfig | 18 +- + drivers/gpu/drm/Makefile | 8 +- + drivers/gpu/drm/drm_bufs.c | 4 +- + drivers/gpu/drm/drm_cache.c | 46 +- + drivers/gpu/drm/drm_crtc.c | 77 +- + drivers/gpu/drm/drm_crtc_helper.c | 223 +- + drivers/gpu/drm/drm_drv.c | 4 +- + drivers/gpu/drm/drm_edid.c | 504 +- + drivers/gpu/drm/drm_encoder_slave.c | 116 + + drivers/gpu/drm/drm_fb_helper.c | 707 + + drivers/gpu/drm/drm_gem.c | 11 +- + drivers/gpu/drm/drm_irq.c | 27 + + drivers/gpu/drm/drm_mm.c | 21 + + drivers/gpu/drm/drm_modes.c | 435 +- + drivers/gpu/drm/drm_proc.c | 17 +- + drivers/gpu/drm/drm_sysfs.c | 32 +- + drivers/gpu/drm/i915/Makefile | 2 +- + .../i915/{i915_gem_debugfs.c => i915_debugfs.c} | 91 +- + drivers/gpu/drm/i915/i915_dma.c | 120 +- + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 63 +- + drivers/gpu/drm/i915/i915_gem.c | 14 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 80 +- + drivers/gpu/drm/i915/i915_irq.c | 21 + + drivers/gpu/drm/i915/i915_reg.h | 144 +- + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/intel_bios.c | 8 +- + drivers/gpu/drm/i915/intel_crt.c | 28 + + drivers/gpu/drm/i915/intel_display.c | 624 +- + drivers/gpu/drm/i915/intel_dp.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 8 +- + drivers/gpu/drm/i915/intel_fb.c | 737 +- + drivers/gpu/drm/i915/intel_i2c.c | 8 +- + drivers/gpu/drm/i915/intel_lvds.c | 22 +- + drivers/gpu/drm/i915/intel_sdvo.c | 331 +- + drivers/gpu/drm/i915/intel_tv.c | 30 + + drivers/gpu/drm/mga/mga_dma.c | 4 +- + drivers/gpu/drm/mga/mga_drv.h | 1 - + drivers/gpu/drm/mga/mga_state.c | 4 +- + drivers/gpu/drm/mga/mga_ucode.h |11645 ---------- + drivers/gpu/drm/mga/mga_warp.c | 180 +- + drivers/gpu/drm/r128/r128_cce.c | 116 +- + drivers/gpu/drm/r128/r128_drv.h | 8 + + drivers/gpu/drm/r128/r128_state.c | 36 +- + drivers/gpu/drm/radeon/Kconfig | 1 - + drivers/gpu/drm/radeon/Makefile | 43 +- + drivers/gpu/drm/radeon/atombios.h | 11 + + drivers/gpu/drm/radeon/atombios_crtc.c | 105 +- + drivers/gpu/drm/radeon/avivod.h | 69 + + drivers/gpu/drm/radeon/mkregtable.c | 720 + + drivers/gpu/drm/radeon/r100.c | 1232 +- + drivers/gpu/drm/radeon/r100_track.h | 124 + + drivers/gpu/drm/radeon/r100d.h | 607 + + drivers/gpu/drm/radeon/r200.c | 456 + + drivers/gpu/drm/radeon/r300.c | 556 +- + drivers/gpu/drm/radeon/r300.h | 36 - + drivers/gpu/drm/radeon/r300d.h | 101 + + drivers/gpu/drm/radeon/r420.c | 301 +- + drivers/gpu/drm/radeon/r420d.h | 249 + + drivers/gpu/drm/radeon/r520.c | 6 - + drivers/gpu/drm/radeon/r600.c | 1802 ++- + drivers/gpu/drm/radeon/r600_blit.c | 850 + + drivers/gpu/drm/radeon/r600_blit_kms.c | 805 + + drivers/gpu/drm/radeon/r600_blit_shaders.c | 1072 + + drivers/gpu/drm/radeon/r600_blit_shaders.h | 14 + + drivers/gpu/drm/radeon/r600_cp.c | 541 +- + drivers/gpu/drm/radeon/r600_cs.c | 657 + + drivers/gpu/drm/radeon/r600_microcode.h |23297 -------------------- + drivers/gpu/drm/radeon/r600d.h | 662 + + drivers/gpu/drm/radeon/radeon.h | 269 +- + drivers/gpu/drm/radeon/radeon_asic.h | 240 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 171 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 10 +- + drivers/gpu/drm/radeon/radeon_combios.c | 58 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 480 +- + drivers/gpu/drm/radeon/radeon_cp.c | 151 +- + drivers/gpu/drm/radeon/radeon_cs.c | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 423 +- + drivers/gpu/drm/radeon/radeon_display.c | 101 +- + drivers/gpu/drm/radeon/radeon_drv.c | 23 +- + drivers/gpu/drm/radeon/radeon_drv.h | 151 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 137 +- + drivers/gpu/drm/radeon/radeon_fb.c | 674 +- + drivers/gpu/drm/radeon/radeon_fence.c | 49 +- + drivers/gpu/drm/radeon/radeon_gart.c | 9 +- + drivers/gpu/drm/radeon/radeon_ioc32.c | 15 + + drivers/gpu/drm/radeon/radeon_irq.c | 18 + + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - + drivers/gpu/drm/radeon/radeon_kms.c | 25 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 85 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 368 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 904 + + drivers/gpu/drm/radeon/radeon_microcode.h | 1844 -- + drivers/gpu/drm/radeon/radeon_mode.h | 74 +- + drivers/gpu/drm/radeon/radeon_object.c | 10 + + drivers/gpu/drm/radeon/radeon_object.h | 1 + + drivers/gpu/drm/radeon/radeon_reg.h | 79 +- + drivers/gpu/drm/radeon/radeon_ring.c | 143 +- + drivers/gpu/drm/radeon/radeon_share.h | 39 - + drivers/gpu/drm/radeon/radeon_state.c | 23 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 96 +- + drivers/gpu/drm/radeon/reg_srcs/r100 | 105 + + drivers/gpu/drm/radeon/reg_srcs/r200 | 184 + + drivers/gpu/drm/radeon/reg_srcs/r300 | 729 + + drivers/gpu/drm/radeon/reg_srcs/rn50 | 30 + + drivers/gpu/drm/radeon/reg_srcs/rs600 | 729 + + drivers/gpu/drm/radeon/reg_srcs/rv515 | 486 + + drivers/gpu/drm/radeon/rs400.c | 56 +- + drivers/gpu/drm/radeon/rs600.c | 106 +- + drivers/gpu/drm/radeon/rs690.c | 4 - + drivers/gpu/drm/radeon/rs780.c | 102 - + drivers/gpu/drm/radeon/rv515.c | 524 +- + drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} | 56 +- + drivers/gpu/drm/radeon/rv770.c | 1050 +- + drivers/gpu/drm/radeon/rv770d.h | 341 + + drivers/gpu/drm/ttm/ttm_bo.c | 295 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +- + drivers/gpu/drm/ttm/ttm_global.c | 4 +- + drivers/gpu/drm/ttm/ttm_memory.c | 508 +- + drivers/gpu/drm/ttm/ttm_module.c | 58 +- + drivers/gpu/drm/ttm/ttm_tt.c | 104 +- + drivers/hid/Kconfig | 7 - + drivers/hid/hid-core.c | 14 +- + drivers/hid/usbhid/hid-core.c | 16 +- + drivers/hid/usbhid/hiddev.c | 4 +- + drivers/hwmon/Kconfig | 21 + + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adm1021.c | 79 +- + drivers/hwmon/applesmc.c | 38 +- + drivers/hwmon/coretemp.c | 4 +- + drivers/hwmon/lis3lv02d.c | 9 + + drivers/hwmon/lis3lv02d.h | 24 +- + drivers/hwmon/lis3lv02d_spi.c | 45 +- + drivers/hwmon/sht15.c | 6 +- + drivers/hwmon/wm831x-hwmon.c | 226 + + drivers/hwmon/wm8350-hwmon.c | 151 + + drivers/i2c/busses/i2c-imx.c | 3 +- + drivers/i2c/busses/i2c-mv64xxx.c | 4 +- + drivers/i2c/busses/i2c-sh_mobile.c | 39 +- + drivers/ide/ide-cd.c | 2 +- + drivers/ide/ide-gd.c | 2 +- + drivers/ide/ide-probe.c | 2 +- + drivers/ide/ide-tape.c | 2 +- + drivers/ide/umc8672.c | 4 +- + drivers/infiniband/hw/ipath/ipath_iba6110.c | 2 +- + drivers/input/input.c | 4 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/omap-keypad.c | 22 +- + drivers/input/keyboard/sh_keysc.c | 3 + + drivers/input/misc/Kconfig | 36 + + drivers/input/misc/Makefile | 4 + + drivers/input/misc/pcap_keys.c | 144 + + drivers/input/misc/winbond-cir.c | 1614 ++ + drivers/input/misc/wm831x-on.c | 163 + + drivers/input/touchscreen/Kconfig | 9 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/pcap_ts.c | 271 + + drivers/isdn/capi/capifs.c | 2 +- + drivers/isdn/capi/capiutil.c | 2 +- + drivers/isdn/gigaset/interface.c | 19 +- + drivers/isdn/i4l/isdn_common.c | 4 +- + drivers/lguest/page_tables.c | 2 +- + drivers/macintosh/rack-meter.c | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm.c | 4 +- + drivers/md/md.c | 4 +- + drivers/md/md.h | 2 +- + drivers/md/multipath.c | 3 +- + drivers/media/common/tuners/tda18271-common.c | 3 +- + drivers/media/common/tuners/tda18271-fe.c | 83 +- + drivers/media/common/tuners/tda18271-maps.c | 3 +- + drivers/media/common/tuners/tda18271-priv.h | 1 + + drivers/media/common/tuners/tda18271.h | 14 + + drivers/media/common/tuners/tuner-types.c | 27 + + drivers/media/dvb/Kconfig | 4 + + drivers/media/dvb/Makefile | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 218 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 17 + + drivers/media/dvb/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb/dvb-usb/Kconfig | 9 +- + drivers/media/dvb/dvb-usb/Makefile | 3 + + drivers/media/dvb/dvb-usb/af9015.c | 50 +- + drivers/media/dvb/dvb-usb/anysee.c | 14 +- + drivers/media/dvb/dvb-usb/ce6230.c | 2 +- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 501 +- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 11 + + drivers/media/dvb/dvb-usb/friio-fe.c | 483 + + drivers/media/dvb/dvb-usb/friio.c | 525 + + drivers/media/dvb/dvb-usb/friio.h | 99 + + drivers/media/dvb/dvb-usb/m920x.c | 2 + + drivers/media/dvb/frontends/Kconfig | 8 + + drivers/media/dvb/frontends/Makefile | 1 + + drivers/media/dvb/frontends/au8522_decoder.c | 5 + + drivers/media/dvb/frontends/dib0070.c | 803 +- + drivers/media/dvb/frontends/dib0070.h | 30 +- + drivers/media/dvb/frontends/dib7000p.c | 33 +- + drivers/media/dvb/frontends/dib8000.c | 2277 ++ + drivers/media/dvb/frontends/dib8000.h | 79 + + drivers/media/dvb/frontends/dibx000_common.c | 95 +- + drivers/media/dvb/frontends/dibx000_common.h | 31 +- + drivers/media/dvb/frontends/lgdt3304.c | 2 + + drivers/media/dvb/frontends/s921_module.c | 2 + + drivers/media/dvb/pt1/Kconfig | 12 + + drivers/media/dvb/pt1/Makefile | 5 + + drivers/media/dvb/pt1/pt1.c | 1057 + + drivers/media/dvb/pt1/va1j5jf8007s.c | 658 + + drivers/media/dvb/pt1/va1j5jf8007s.h | 40 + + drivers/media/dvb/pt1/va1j5jf8007t.c | 468 + + drivers/media/dvb/pt1/va1j5jf8007t.h | 40 + + drivers/media/dvb/siano/smscoreapi.c | 2 +- + drivers/media/dvb/siano/smscoreapi.h | 4 +- + drivers/media/radio/Kconfig | 2 +- + drivers/media/radio/radio-mr800.c | 2 +- + drivers/media/radio/radio-si4713.c | 1 - + drivers/media/video/Kconfig | 93 + + drivers/media/video/Makefile | 6 + + drivers/media/video/adv7180.c | 202 + + drivers/media/video/adv7343.c | 1 - + drivers/media/video/au0828/au0828-cards.c | 4 +- + drivers/media/video/bt8xx/bttv-cards.c | 44 +- + drivers/media/video/cafe_ccic.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 2 +- + drivers/media/video/cx18/cx18-i2c.c | 16 +- + drivers/media/video/cx18/cx18-streams.c | 4 +- + drivers/media/video/cx231xx/cx231xx-cards.c | 4 +- + drivers/media/video/cx23885/cimax2.c | 12 +- + drivers/media/video/cx23885/cx23885-cards.c | 14 +- + drivers/media/video/cx23885/cx23885-core.c | 1 + + drivers/media/video/cx23885/cx23885-dvb.c | 5 + + drivers/media/video/cx23885/cx23885-video.c | 6 +- + drivers/media/video/cx23885/cx23885.h | 2 + + drivers/media/video/cx23885/netup-eeprom.c | 6 +- + drivers/media/video/cx88/cx88-blackbird.c | 4 +- + drivers/media/video/cx88/cx88-cards.c | 14 +- + drivers/media/video/cx88/cx88-dvb.c | 4 +- + drivers/media/video/cx88/cx88-mpeg.c | 4 +- + drivers/media/video/cx88/cx88-video.c | 10 +- + drivers/media/video/dabusb.c | 4 +- + drivers/media/video/davinci/Makefile | 17 + + drivers/media/video/davinci/ccdc_hw_device.h | 110 + + drivers/media/video/davinci/dm355_ccdc.c | 978 + + drivers/media/video/davinci/dm355_ccdc_regs.h | 310 + + drivers/media/video/davinci/dm644x_ccdc.c | 878 + + drivers/media/video/davinci/dm644x_ccdc_regs.h | 145 + + drivers/media/video/davinci/vpfe_capture.c | 2124 ++ + drivers/media/video/davinci/vpif.c | 296 + + drivers/media/video/davinci/vpif.h | 642 + + drivers/media/video/davinci/vpif_capture.c | 2168 ++ + drivers/media/video/davinci/vpif_capture.h | 165 + + drivers/media/video/davinci/vpif_display.c | 1656 ++ + drivers/media/video/davinci/vpif_display.h | 175 + + drivers/media/video/davinci/vpss.c | 301 + + drivers/media/video/em28xx/Kconfig | 1 + + drivers/media/video/em28xx/Makefile | 2 +- + drivers/media/video/em28xx/em28xx-cards.c | 59 +- + drivers/media/video/em28xx/em28xx-core.c | 51 +- + drivers/media/video/em28xx/em28xx-dvb.c | 19 + + drivers/media/video/em28xx/em28xx-reg.h | 16 + + drivers/media/video/em28xx/em28xx-vbi.c | 142 + + drivers/media/video/em28xx/em28xx-video.c | 589 +- + drivers/media/video/em28xx/em28xx.h | 26 +- + drivers/media/video/et61x251/et61x251_core.c | 6 +- + drivers/media/video/gspca/Kconfig | 1 + + drivers/media/video/gspca/Makefile | 1 + + drivers/media/video/gspca/gl860/Kconfig | 8 + + drivers/media/video/gspca/gl860/Makefile | 10 + + drivers/media/video/gspca/gl860/gl860-mi1320.c | 537 + + drivers/media/video/gspca/gl860/gl860-mi2020.c | 937 + + drivers/media/video/gspca/gl860/gl860-ov2640.c | 505 + + drivers/media/video/gspca/gl860/gl860-ov9655.c | 337 + + drivers/media/video/gspca/gl860/gl860.c | 785 + + drivers/media/video/gspca/gl860/gl860.h | 108 + + drivers/media/video/gspca/jeilinj.c | 2 + + drivers/media/video/gspca/m5602/m5602_core.c | 2 +- + drivers/media/video/gspca/m5602/m5602_ov7660.c | 262 +- + drivers/media/video/gspca/m5602/m5602_ov7660.h | 138 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 13 + + drivers/media/video/gspca/stv06xx/stv06xx.c | 19 +- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 151 +- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.h | 2 +- + drivers/media/video/gspca/stv06xx/stv06xx_st6422.c | 15 +- + drivers/media/video/gspca/vc032x.c | 7 +- + drivers/media/video/ivtv/ivtv-driver.c | 2 +- + drivers/media/video/ivtv/ivtv-i2c.c | 18 +- + drivers/media/video/ivtv/ivtv-streams.c | 4 +- + drivers/media/video/mt9m001.c | 435 +- + drivers/media/video/mt9m111.c | 524 +- + drivers/media/video/mt9t031.c | 491 +- + drivers/media/video/mt9v022.c | 434 +- + drivers/media/video/mx1_camera.c | 78 +- + drivers/media/video/mx3_camera.c | 207 +- + drivers/media/video/mxb.c | 14 +- + drivers/media/video/ov772x.c | 381 +- + drivers/media/video/pvrusb2/pvrusb2-devattr.c | 2 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 10 +- + drivers/media/video/pxa_camera.c | 358 +- + drivers/media/video/saa7134/saa7134-cards.c | 53 +- + drivers/media/video/saa7134/saa7134-core.c | 6 +- + drivers/media/video/saa7134/saa7134-dvb.c | 30 + + drivers/media/video/saa7134/saa7134-input.c | 4 + + drivers/media/video/saa7134/saa7134.h | 1 + + drivers/media/video/saa7164/Kconfig | 18 + + drivers/media/video/saa7164/Makefile | 12 + + drivers/media/video/saa7164/saa7164-api.c | 600 + + drivers/media/video/saa7164/saa7164-buffer.c | 155 + + drivers/media/video/saa7164/saa7164-bus.c | 448 + + drivers/media/video/saa7164/saa7164-cards.c | 624 + + drivers/media/video/saa7164/saa7164-cmd.c | 572 + + drivers/media/video/saa7164/saa7164-core.c | 740 + + drivers/media/video/saa7164/saa7164-dvb.c | 602 + + drivers/media/video/saa7164/saa7164-fw.c | 613 + + drivers/media/video/saa7164/saa7164-i2c.c | 141 + + drivers/media/video/saa7164/saa7164-reg.h | 166 + + drivers/media/video/saa7164/saa7164-types.h | 287 + + drivers/media/video/saa7164/saa7164.h | 400 + + drivers/media/video/sh_mobile_ceu_camera.c | 1095 +- + drivers/media/video/sn9c102/sn9c102_core.c | 6 +- + drivers/media/video/soc_camera.c | 725 +- + drivers/media/video/soc_camera_platform.c | 163 +- + drivers/media/video/tuner-core.c | 12 + + drivers/media/video/tvp514x.c | 1030 +- + drivers/media/video/tvp514x_regs.h | 10 - + drivers/media/video/tw9910.c | 361 +- + drivers/media/video/usbvision/usbvision-i2c.c | 12 +- + drivers/media/video/uvc/uvc_video.c | 7 +- + drivers/media/video/v4l1-compat.c | 14 +- + drivers/media/video/v4l2-common.c | 133 - + drivers/media/video/v4l2-dev.c | 154 +- + drivers/media/video/vino.c | 8 +- + drivers/media/video/w9968cf.c | 4 +- + drivers/media/video/zc0301/zc0301_core.c | 6 +- + drivers/media/video/zoran/zoran_card.c | 8 +- + drivers/memstick/core/mspro_block.c | 2 +- + drivers/message/fusion/mptbase.c | 4 +- + drivers/message/i2o/i2o_block.c | 2 +- + drivers/mfd/Kconfig | 42 + + drivers/mfd/Makefile | 6 + + drivers/mfd/ab3100-core.c | 64 +- + drivers/mfd/ab3100-otp.c | 268 + + drivers/mfd/dm355evm_msp.c | 12 +- + drivers/mfd/ezx-pcap.c | 105 +- + drivers/mfd/mc13783-core.c | 427 + + drivers/mfd/mfd-core.c | 2 +- + drivers/mfd/pcf50633-adc.c | 32 +- + drivers/mfd/pcf50633-core.c | 5 +- + drivers/mfd/twl4030-core.c | 23 + + drivers/mfd/twl4030-irq.c | 2 +- + drivers/mfd/twl4030-power.c | 472 + + drivers/mfd/wm831x-core.c | 1549 ++ + drivers/mfd/wm831x-irq.c | 559 + + drivers/mfd/wm831x-otp.c | 83 + + drivers/mfd/wm8350-core.c | 27 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 +- + drivers/misc/sgi-xp/xpc_sn2.c | 40 +- + drivers/mmc/card/block.c | 2 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mtd/devices/m25p80.c | 4 +- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/ftl.c | 2 +- + drivers/mtd/maps/ixp2000.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/mtd/nand/ams-delta.c | 8 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/cmx270_nand.c | 4 +- + drivers/mtd/ubi/debug.c | 32 + + drivers/mtd/ubi/debug.h | 2 + + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/io.c | 51 +- + drivers/mtd/ubi/scan.c | 22 +- + drivers/mtd/ubi/scan.h | 2 + + drivers/mtd/ubi/ubi.h | 5 +- + drivers/net/Kconfig | 9 + + drivers/net/Makefile | 1 + + drivers/net/arcnet/arc-rawmode.c | 1 - + drivers/net/arcnet/capmode.c | 1 - + drivers/net/atl1e/atl1e.h | 9 + + drivers/net/atl1e/atl1e_main.c | 15 +- + drivers/net/b44.c | 7 +- + drivers/net/bcm63xx_enet.c | 1971 ++ + drivers/net/bcm63xx_enet.h | 303 + + drivers/net/benet/be.h | 1 + + drivers/net/benet/be_cmds.c | 412 +- + drivers/net/benet/be_cmds.h | 5 +- + drivers/net/benet/be_main.c | 42 +- + drivers/net/bnx2x_reg.h | 2 +- + drivers/net/bonding/bond_3ad.c | 2 +- + drivers/net/bonding/bond_main.c | 131 +- + drivers/net/can/vcan.c | 2 +- + drivers/net/e1000/e1000_hw.c | 2 +- + drivers/net/gianfar_ethtool.c | 2 +- + drivers/net/ibm_newemac/core.c | 8 +- + drivers/net/igb/e1000_82575.c | 198 +- + drivers/net/igb/e1000_82575.h | 2 +- + drivers/net/igb/e1000_defines.h | 2 +- + drivers/net/igb/e1000_phy.c | 5 +- + drivers/net/igb/igb_main.c | 4 +- + drivers/net/ixgbe/ixgbe_82598.c | 6 +- + drivers/net/ixgbe/ixgbe_82599.c | 3 + + drivers/net/ixgbe/ixgbe_main.c | 4 + + drivers/net/ixgbe/ixgbe_type.h | 2 + + drivers/net/ll_temac_main.c | 2 +- + drivers/net/macb.c | 2 +- + drivers/net/mlx4/catas.c | 11 +- + drivers/net/ni52.c | 4 +- + drivers/net/pcmcia/pcnet_cs.c | 10 +- + drivers/net/pppol2tp.c | 4 +- + drivers/net/qlge/qlge_main.c | 4 +- + drivers/net/rionet.c | 2 +- + drivers/net/skfp/pcmplc.c | 2 +- + drivers/net/skfp/pmf.c | 8 +- + drivers/net/skge.c | 2 +- + drivers/net/sky2.c | 26 +- + drivers/net/slip.c | 96 +- + drivers/net/smc91x.h | 28 - + drivers/net/tun.c | 2 +- + drivers/net/usb/cdc-phonet.c | 1 - + drivers/net/vxge/vxge-config.h | 2 +- + drivers/net/vxge/vxge-main.c | 2 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/ath/ath5k/reg.h | 2 +- + drivers/net/wireless/ath/ath9k/ani.c | 6 +- + drivers/net/wireless/atmel.c | 2 +- + drivers/net/wireless/b43/main.c | 8 +- + drivers/net/wireless/hostap/hostap_main.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 1 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 10 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 1 + + drivers/net/wireless/iwlwifi/iwl-power.c | 5 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 24 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 24 +- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/wl12xx/wl1271_main.c | 5 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 2 +- + drivers/oprofile/oprofilefs.c | 2 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/sba_iommu.c | 4 +- + drivers/pcmcia/pcmcia_ioctl.c | 36 +- + drivers/pcmcia/sa1100_jornada720.c | 156 +- + drivers/pcmcia/yenta_socket.c | 2 +- + drivers/pnp/driver.c | 10 + + drivers/regulator/Kconfig | 31 + + drivers/regulator/Makefile | 6 + + drivers/regulator/ab3100.c | 700 + + drivers/regulator/core.c | 24 + + drivers/regulator/mc13783.c | 410 + + drivers/regulator/pcap-regulator.c | 318 + + drivers/regulator/wm831x-dcdc.c | 862 + + drivers/regulator/wm831x-isink.c | 260 + + drivers/regulator/wm831x-ldo.c | 852 + + drivers/rtc/Kconfig | 19 + + drivers/rtc/Makefile | 2 + + drivers/rtc/rtc-ab3100.c | 281 + + drivers/rtc/rtc-ds1302.c | 69 +- + drivers/rtc/rtc-omap.c | 2 +- + drivers/rtc/rtc-sh.c | 97 +- + drivers/rtc/rtc-wm831x.c | 523 + + drivers/s390/block/dasd.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/block/xpram.c | 2 +- + drivers/s390/char/tape_block.c | 2 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/scsi/zfcp_scsi.c | 2 +- + drivers/sbus/char/jsflash.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/fcoe/libfcoe.c | 1 - + drivers/scsi/ibmvscsi/ibmvscsi.c | 1 - + drivers/scsi/lpfc/lpfc_ct.c | 2 +- + drivers/scsi/megaraid/megaraid_sas.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 4 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/serial/21285.c | 8 +- + drivers/serial/8250.c | 28 +- + drivers/serial/8250.h | 1 + + drivers/serial/amba-pl010.c | 6 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/atmel_serial.c | 14 +- + drivers/serial/bfin_5xx.c | 24 +- + drivers/serial/bfin_sport_uart.c | 6 +- + drivers/serial/clps711x.c | 4 +- + drivers/serial/cpm_uart/cpm_uart_core.c | 2 +- + drivers/serial/dz.c | 6 +- + drivers/serial/icom.c | 20 +- + drivers/serial/imx.c | 16 +- + drivers/serial/ioc3_serial.c | 54 +- + drivers/serial/ioc4_serial.c | 70 +- + drivers/serial/ip22zilog.c | 14 +- + drivers/serial/jsm/jsm_neo.c | 2 +- + drivers/serial/jsm/jsm_tty.c | 20 +- + drivers/serial/m32r_sio.c | 6 +- + drivers/serial/max3100.c | 16 +- + drivers/serial/mcf.c | 4 +- + drivers/serial/mpc52xx_uart.c | 4 +- + drivers/serial/mpsc.c | 4 +- + drivers/serial/msm_serial.c | 6 +- + drivers/serial/mux.c | 4 +- + drivers/serial/netx-serial.c | 6 +- + drivers/serial/nwpserial.c | 4 +- + drivers/serial/pmac_zilog.c | 20 +- + drivers/serial/pnx8xxx_uart.c | 8 +- + drivers/serial/pxa.c | 6 +- + drivers/serial/sa1100.c | 8 +- + drivers/serial/samsung.c | 8 +- + drivers/serial/sb1250-duart.c | 6 +- + drivers/serial/sc26xx.c | 10 +- + drivers/serial/serial_core.c | 876 +- + drivers/serial/serial_cs.c | 15 +- + drivers/serial/serial_ks8695.c | 6 +- + drivers/serial/serial_lh7a40x.c | 6 +- + drivers/serial/serial_txx9.c | 4 +- + drivers/serial/sh-sci.c | 18 +- + drivers/serial/sh-sci.h | 17 + + drivers/serial/sn_console.c | 22 +- + drivers/serial/sunhv.c | 8 +- + drivers/serial/sunsab.c | 10 +- + drivers/serial/sunsu.c | 6 +- + drivers/serial/sunzilog.c | 14 +- + drivers/serial/timbuart.c | 10 +- + drivers/serial/uartlite.c | 19 +- + drivers/serial/ucc_uart.c | 4 +- + drivers/serial/vr41xx_siu.c | 6 +- + drivers/serial/zs.c | 6 +- + drivers/sh/intc.c | 71 +- + drivers/spi/omap_uwire.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/ssb/pci.c | 1 + + drivers/ssb/sdio.c | 6 +- + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/cx25821/Kconfig | 34 + + drivers/staging/cx25821/Makefile | 14 + + drivers/staging/cx25821/README | 6 + + drivers/staging/cx25821/cx25821-alsa.c | 789 + + drivers/staging/cx25821/cx25821-audio-upstream.c | 804 + + drivers/staging/cx25821/cx25821-audio-upstream.h | 57 + + drivers/staging/cx25821/cx25821-audio.h | 57 + + drivers/staging/cx25821/cx25821-audups11.c | 434 + + drivers/staging/cx25821/cx25821-biffuncs.h | 45 + + drivers/staging/cx25821/cx25821-cards.c | 70 + + drivers/staging/cx25821/cx25821-core.c | 1551 ++ + drivers/staging/cx25821/cx25821-gpio.c | 98 + + drivers/staging/cx25821/cx25821-gpio.h | 2 + + drivers/staging/cx25821/cx25821-i2c.c | 419 + + drivers/staging/cx25821/cx25821-medusa-defines.h | 51 + + drivers/staging/cx25821/cx25821-medusa-reg.h | 455 + + drivers/staging/cx25821/cx25821-medusa-video.c | 869 + + drivers/staging/cx25821/cx25821-medusa-video.h | 49 + + drivers/staging/cx25821/cx25821-reg.h | 1592 ++ + drivers/staging/cx25821/cx25821-sram.h | 261 + + .../staging/cx25821/cx25821-video-upstream-ch2.c | 835 + + .../staging/cx25821/cx25821-video-upstream-ch2.h | 101 + + drivers/staging/cx25821/cx25821-video-upstream.c | 894 + + drivers/staging/cx25821/cx25821-video-upstream.h | 109 + + drivers/staging/cx25821/cx25821-video.c | 1299 ++ + drivers/staging/cx25821/cx25821-video.h | 194 + + drivers/staging/cx25821/cx25821-video0.c | 451 + + drivers/staging/cx25821/cx25821-video1.c | 451 + + drivers/staging/cx25821/cx25821-video2.c | 452 + + drivers/staging/cx25821/cx25821-video3.c | 451 + + drivers/staging/cx25821/cx25821-video4.c | 450 + + drivers/staging/cx25821/cx25821-video5.c | 450 + + drivers/staging/cx25821/cx25821-video6.c | 450 + + drivers/staging/cx25821/cx25821-video7.c | 449 + + drivers/staging/cx25821/cx25821-videoioctl.c | 496 + + drivers/staging/cx25821/cx25821-vidups10.c | 435 + + drivers/staging/cx25821/cx25821-vidups9.c | 433 + + drivers/staging/cx25821/cx25821.h | 602 + + drivers/staging/go7007/Kconfig | 84 +- + drivers/staging/go7007/Makefile | 20 +- + drivers/staging/go7007/go7007-driver.c | 35 +- + drivers/staging/go7007/go7007-fw.c | 3 +- + drivers/staging/go7007/go7007-i2c.c | 12 +- + drivers/staging/go7007/go7007-priv.h | 6 +- + drivers/staging/go7007/go7007-usb.c | 58 +- + drivers/staging/go7007/go7007-v4l2.c | 225 +- + drivers/staging/go7007/go7007.txt | 176 +- + drivers/staging/go7007/s2250-board.c | 107 +- + drivers/staging/go7007/s2250-loader.c | 8 +- + drivers/staging/go7007/snd-go7007.c | 2 +- + drivers/staging/go7007/wis-tw9903.c | 3 +- + drivers/staging/iio/industrialio-core.c | 4 +- + drivers/staging/octeon/cvmx-mdio.h | 2 +- + drivers/staging/rt2860/rtmp.h | 2 +- + drivers/uio/uio_pdrv_genirq.c | 54 + + drivers/usb/class/cdc-acm.c | 5 +- + drivers/usb/class/cdc-wdm.c | 2 - + drivers/usb/class/usblp.c | 4 +- + drivers/usb/core/file.c | 8 +- + drivers/usb/core/inode.c | 3 +- + drivers/usb/core/usb.c | 4 +- + drivers/usb/gadget/Kconfig | 28 +- + drivers/usb/gadget/Makefile | 1 + + drivers/usb/gadget/gadget_chips.h | 8 + + drivers/usb/gadget/inode.c | 2 +- + drivers/usb/gadget/m66592-udc.c | 286 +- + drivers/usb/gadget/m66592-udc.h | 90 +- + drivers/usb/gadget/r8a66597-udc.c | 1689 ++ + drivers/usb/gadget/r8a66597-udc.h | 256 + + drivers/usb/host/Kconfig | 7 - + drivers/usb/host/ehci-pci.c | 2 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/ohci-q.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 210 +- + drivers/usb/host/r8a66597.h | 442 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/iowarrior.c | 4 +- + drivers/usb/misc/legousbtower.c | 4 +- + drivers/usb/serial/ark3116.c | 51 +- + drivers/usb/serial/belkin_sa.c | 4 +- + drivers/usb/serial/ch341.c | 5 +- + drivers/usb/serial/console.c | 32 +- + drivers/usb/serial/cp210x.c | 12 +- + drivers/usb/serial/cyberjack.c | 4 +- + drivers/usb/serial/cypress_m8.c | 18 +- + drivers/usb/serial/cypress_m8.h | 2 +- + drivers/usb/serial/digi_acceleport.c | 6 +- + drivers/usb/serial/empeg.c | 18 +- + drivers/usb/serial/ftdi_sio.c | 6 +- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 3 +- + drivers/usb/serial/io_edgeport.c | 8 +- + drivers/usb/serial/io_ti.c | 3 +- + drivers/usb/serial/ipaq.c | 9 +- + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 6 +- + drivers/usb/serial/iuu_phoenix.c | 34 +- + drivers/usb/serial/keyspan.c | 3 +- + drivers/usb/serial/keyspan.h | 3 +- + drivers/usb/serial/keyspan_pda.c | 2 +- + drivers/usb/serial/kl5kusb105.c | 12 +- + drivers/usb/serial/kobil_sct.c | 28 +- + drivers/usb/serial/mct_u232.c | 15 +- + drivers/usb/serial/mos7720.c | 123 +- + drivers/usb/serial/mos7840.c | 118 +- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 6 +- + drivers/usb/serial/opticon.c | 3 +- + drivers/usb/serial/option.c | 6 +- + drivers/usb/serial/oti6858.c | 27 +- + drivers/usb/serial/pl2303.c | 5 +- + drivers/usb/serial/sierra.c | 3 +- + drivers/usb/serial/spcp8x5.c | 28 +- + drivers/usb/serial/symbolserial.c | 3 +- + drivers/usb/serial/ti_usb_3410_5052.c | 6 +- + drivers/usb/serial/usb-serial.c | 385 +- + drivers/usb/serial/usb_debug.c | 5 +- + drivers/usb/serial/visor.c | 6 +- + drivers/usb/serial/whiteheat.c | 11 +- + drivers/usb/wusbcore/wa-hc.h | 2 +- + drivers/uwb/i1480/i1480u-wlp/netdev.c | 2 +- + drivers/video/Kconfig | 2 +- + drivers/video/cfbcopyarea.c | 2 +- + drivers/video/console/.gitignore | 2 - + drivers/video/console/Kconfig | 9 +- + drivers/video/console/Makefile | 12 - + drivers/video/console/prom.uni | 11 - + drivers/video/console/promcon.c | 598 - + drivers/video/console/vgacon.c | 1 - + drivers/video/imxfb.c | 2 +- + drivers/video/omap/dispc.c | 6 +- + drivers/video/omap/lcd_h3.c | 4 +- + drivers/video/omap/lcd_h4.c | 4 +- + drivers/video/omap/lcd_inn1510.c | 4 +- + drivers/video/omap/lcd_inn1610.c | 4 +- + drivers/video/omap/lcd_osk.c | 4 +- + drivers/video/omap/lcd_palmte.c | 4 +- + drivers/video/omap/lcd_palmtt.c | 4 +- + drivers/video/omap/lcd_palmz71.c | 4 +- + drivers/video/s3c2410fb.c | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 292 +- + drivers/watchdog/Kconfig | 38 + + drivers/watchdog/Makefile | 3 + + drivers/watchdog/ar7_wdt.c | 107 +- + drivers/watchdog/booke_wdt.c | 57 +- + drivers/watchdog/coh901327_wdt.c | 2 +- + drivers/watchdog/davinci_wdt.c | 19 +- + drivers/watchdog/iop_wdt.c | 2 +- + drivers/watchdog/nuc900_wdt.c | 353 + + drivers/watchdog/rm9k_wdt.c | 2 +- + drivers/watchdog/sbc_fitpc2_wdt.c | 267 + + drivers/watchdog/sc1200wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 21 +- + drivers/watchdog/wm831x_wdt.c | 441 + + drivers/xen/balloon.c | 6 +- + drivers/xen/evtchn.c | 1 - + firmware/Makefile | 19 +- + firmware/WHENCE | 133 + + firmware/cis/MT5634ZLX.cis.ihex | 11 + + firmware/cis/PCMLM28.cis.ihex | 18 + + firmware/cis/RS-COM-2P.cis.ihex | 10 + + firmware/matrox/g200_warp.H16 | 28 + + firmware/matrox/g400_warp.H16 | 44 + + firmware/r128/r128_cce.bin.ihex | 129 + + firmware/radeon/R100_cp.bin.ihex | 130 + + firmware/radeon/R200_cp.bin.ihex | 130 + + firmware/radeon/R300_cp.bin.ihex | 130 + + firmware/radeon/R420_cp.bin.ihex | 130 + + firmware/radeon/R520_cp.bin.ihex | 130 + + firmware/radeon/R600_me.bin.ihex | 1345 ++ + firmware/radeon/R600_pfp.bin.ihex | 145 + + firmware/radeon/RS600_cp.bin.ihex | 130 + + firmware/radeon/RS690_cp.bin.ihex | 130 + + firmware/radeon/RS780_me.bin.ihex | 1345 ++ + firmware/radeon/RS780_pfp.bin.ihex | 145 + + firmware/radeon/RV610_me.bin.ihex | 1345 ++ + firmware/radeon/RV610_pfp.bin.ihex | 145 + + firmware/radeon/RV620_me.bin.ihex | 1345 ++ + firmware/radeon/RV620_pfp.bin.ihex | 145 + + firmware/radeon/RV630_me.bin.ihex | 1345 ++ + firmware/radeon/RV630_pfp.bin.ihex | 145 + + firmware/radeon/RV635_me.bin.ihex | 1345 ++ + firmware/radeon/RV635_pfp.bin.ihex | 145 + + firmware/radeon/RV670_me.bin.ihex | 1345 ++ + firmware/radeon/RV670_pfp.bin.ihex | 145 + + firmware/radeon/RV710_me.bin.ihex | 341 + + firmware/radeon/RV710_pfp.bin.ihex | 213 + + firmware/radeon/RV730_me.bin.ihex | 341 + + firmware/radeon/RV730_pfp.bin.ihex | 213 + + firmware/radeon/RV770_me.bin.ihex | 341 + + firmware/radeon/RV770_pfp.bin.ihex | 213 + + fs/Kconfig | 1 + + fs/afs/flock.c | 2 +- + fs/aio.c | 47 +- + fs/autofs/dirhash.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/binfmt_elf.c | 44 +- + fs/binfmt_elf_fdpic.c | 56 +- + fs/block_dev.c | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/inode.c | 28 +- + fs/btrfs/super.c | 4 +- + fs/btrfs/tree-log.c | 2 +- + fs/cifs/cifs_dfs_ref.c | 4 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifsfs.h | 2 +- + fs/dlm/lowcomms.c | 26 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/mmap.c | 2 +- + fs/exec.c | 6 +- + fs/ext2/xip.c | 2 +- + fs/ext3/fsync.c | 12 +- + fs/ext3/inode.c | 28 +- + fs/ext3/super.c | 4 +- + fs/ext4/Kconfig | 11 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 91 +- + fs/ext4/ext4_extents.h | 4 +- + fs/ext4/ext4_jbd2.c | 9 +- + fs/ext4/extents.c | 112 +- + fs/ext4/fsync.c | 13 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 152 +- + fs/ext4/ioctl.c | 7 +- + fs/ext4/mballoc.c | 429 +- + fs/ext4/mballoc.h | 22 +- + fs/ext4/migrate.c | 22 +- + fs/ext4/move_extent.c | 334 +- + fs/ext4/namei.c | 22 +- + fs/ext4/resize.c | 7 +- + fs/ext4/super.c | 159 +- + fs/ext4/xattr.c | 15 +- + fs/fuse/control.c | 138 +- + fs/fuse/dev.c | 10 +- + fs/fuse/fuse_i.h | 18 +- + fs/fuse/inode.c | 80 + + fs/gfs2/rgrp.c | 2 +- + fs/hugetlbfs/inode.c | 21 +- + fs/inode.c | 16 +- + fs/jbd/checkpoint.c | 6 +- + fs/jbd/commit.c | 2 +- + fs/jbd/journal.c | 30 +- + fs/jbd/recovery.c | 18 +- + fs/jbd/revoke.c | 16 +- + fs/jbd/transaction.c | 9 +- + fs/jbd2/commit.c | 11 +- + fs/jbd2/journal.c | 6 + + fs/jbd2/transaction.c | 7 +- + fs/jffs2/super.c | 2 +- + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 2 +- + fs/lockd/host.c | 4 +- + fs/lockd/mon.c | 2 +- + fs/lockd/svclock.c | 2 +- + fs/lockd/svcsubs.c | 2 +- + fs/locks.c | 2 +- + fs/nfs/callback_xdr.c | 2 +- + fs/nfs/client.c | 10 +- + fs/nfs/nfs4state.c | 2 +- + fs/nfs/super.c | 2 +- + fs/nfsd/export.c | 2 + + fs/nfsd/nfs3xdr.c | 75 +- + fs/nfsd/nfs4acl.c | 4 +- + fs/nfsd/nfs4callback.c | 263 +- + fs/nfsd/nfs4proc.c | 89 +- + fs/nfsd/nfs4state.c | 685 +- + fs/nfsd/nfs4xdr.c | 42 +- + fs/nfsd/nfsctl.c | 8 +- + fs/nfsd/nfsfh.c | 158 +- + fs/nfsd/nfssvc.c | 54 +- + fs/nfsd/vfs.c | 9 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/file.c | 2 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/inode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/namei.c | 6 +- + fs/nilfs2/nilfs.h | 10 +- + fs/nilfs2/super.c | 4 +- + fs/ntfs/layout.h | 2 +- + fs/ntfs/malloc.h | 2 +- + fs/ocfs2/quota.h | 2 +- + fs/ocfs2/quota_global.c | 4 +- + fs/ocfs2/super.c | 2 +- + fs/omfs/dir.c | 2 +- + fs/omfs/file.c | 4 +- + fs/omfs/inode.c | 2 +- + fs/omfs/omfs.h | 6 +- + fs/partitions/check.c | 2 +- + fs/proc/base.c | 44 +- + fs/proc/kcore.c | 35 +- + fs/proc/meminfo.c | 4 + + fs/proc/page.c | 5 + + fs/proc/task_mmu.c | 28 +- + fs/quota/dquot.c | 4 +- + fs/reiserfs/super.c | 4 +- + fs/romfs/super.c | 2 +- + fs/squashfs/super.c | 4 +- + fs/super.c | 2 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/commit.c | 2 +- + fs/ubifs/debug.c | 112 +- + fs/ubifs/debug.h | 5 + + fs/ubifs/file.c | 62 +- + fs/ubifs/gc.c | 2 +- + fs/ubifs/io.c | 29 +- + fs/ubifs/journal.c | 13 +- + fs/ubifs/key.h | 35 +- + fs/ubifs/log.c | 17 +- + fs/ubifs/lprops.c | 43 +- + fs/ubifs/master.c | 20 +- + fs/ubifs/orphan.c | 7 +- + fs/ubifs/recovery.c | 4 +- + fs/ubifs/replay.c | 6 +- + fs/ubifs/scan.c | 32 +- + fs/ubifs/super.c | 33 +- + fs/ubifs/tnc.c | 76 +- + fs/ubifs/tnc_commit.c | 2 +- + fs/ubifs/ubifs-media.h | 7 + + fs/ubifs/ubifs.h | 13 +- + fs/ubifs/xattr.c | 6 +- + fs/xfs/linux-2.6/xfs_quotaops.c | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 4 +- + fs/xfs/linux-2.6/xfs_super.h | 2 +- + fs/xfs/xfs_fs.h | 2 +- + include/acpi/acpi_bus.h | 1 - + include/acpi/actypes.h | 2 +- + include/acpi/platform/acgcc.h | 2 +- + include/asm-generic/mman-common.h | 3 + + include/asm-generic/mman.h | 1 + + include/asm-generic/unistd.h | 4 +- + include/asm-generic/vmlinux.lds.h | 5 +- + include/drm/drmP.h | 57 +- + include/drm/drm_cache.h | 38 + + include/drm/drm_crtc.h | 16 + + include/drm/drm_crtc_helper.h | 3 + + include/drm/drm_encoder_slave.h | 162 + + include/drm/drm_fb_helper.h | 82 + + include/drm/drm_memory.h | 2 - + include/drm/drm_mm.h | 7 + + include/drm/drm_mode.h | 11 +- + include/drm/drm_sysfs.h | 12 + + include/drm/radeon_drm.h | 12 +- + include/drm/ttm/ttm_bo_api.h | 13 +- + include/drm/ttm/ttm_bo_driver.h | 94 +- + include/drm/ttm/ttm_memory.h | 43 +- + include/drm/ttm/ttm_module.h | 2 + + include/keys/rxrpc-type.h | 107 + + include/linux/aio.h | 2 - + include/linux/bootmem.h | 5 +- + include/linux/capability.h | 2 +- + include/linux/clocksource.h | 122 +- + include/linux/cpufreq.h | 10 + + include/linux/cyclades.h | 11 +- + include/linux/delayacct.h | 1 - + include/linux/device.h | 7 +- + include/linux/dvb/frontend.h | 46 +- + include/linux/dvb/version.h | 2 +- + include/linux/flex_array.h | 32 +- + include/linux/fs.h | 8 +- + include/linux/ftrace.h | 1 - + include/linux/ftrace_event.h | 16 +- + include/linux/fuse.h | 29 +- + include/linux/genhd.h | 4 +- + include/linux/gfp.h | 13 - + include/linux/hayesesp.h | 1 - + include/linux/hid.h | 3 + + include/linux/hrtimer.h | 2 - + include/linux/hugetlb.h | 26 +- + include/linux/i2c/twl4030.h | 94 +- + include/linux/igmp.h | 2 + + include/linux/init_task.h | 14 +- + include/linux/jbd.h | 26 +- + include/linux/jbd2.h | 2 +- + include/linux/kfifo.h | 4 +- + include/linux/kmemcheck.h | 5 +- + include/linux/kprobes.h | 4 +- + include/linux/ksm.h | 79 + + include/linux/kvm_host.h | 1 - + include/linux/lis3lv02d.h | 11 +- + include/linux/lockd/lockd.h | 45 +- + include/linux/mISDNif.h | 2 +- + include/linux/marker.h | 221 - + include/linux/mempool.h | 10 +- + include/linux/mfd/ab3100.h | 37 +- + include/linux/mfd/core.h | 1 + + include/linux/mfd/ezx-pcap.h | 7 +- + include/linux/mfd/mc13783-private.h | 396 + + include/linux/mfd/mc13783.h | 84 + + include/linux/mfd/pcf50633/adc.h | 3 +- + include/linux/mfd/pcf50633/core.h | 1 + + include/linux/mfd/wm831x/auxadc.h | 216 + + include/linux/mfd/wm831x/core.h | 289 + + include/linux/mfd/wm831x/gpio.h | 55 + + include/linux/mfd/wm831x/irq.h | 764 + + include/linux/mfd/wm831x/otp.h | 162 + + include/linux/mfd/wm831x/pdata.h | 113 + + include/linux/mfd/wm831x/regulator.h | 1218 + + include/linux/mfd/wm831x/watchdog.h | 52 + + include/linux/mfd/wm8350/core.h | 7 +- + include/linux/miscdevice.h | 3 +- + include/linux/mm.h | 19 +- + include/linux/mm_inline.h | 31 +- + include/linux/mmu_context.h | 9 + + include/linux/mmu_notifier.h | 34 + + include/linux/mmzone.h | 17 +- + include/linux/module.h | 11 - + include/linux/namei.h | 2 +- + include/linux/net.h | 5 + + include/linux/netdevice.h | 3 +- + include/linux/netlink.h | 4 + + include/linux/nfs4.h | 2 +- + include/linux/nfsd/nfsd.h | 7 +- + include/linux/nfsd/state.h | 77 +- + include/linux/nfsd/xdr4.h | 19 +- + include/linux/notifier.h | 2 + + include/linux/oom.h | 11 + + include/linux/page-flags.h | 25 +- + include/linux/page_cgroup.h | 4 +- + include/linux/pci_ids.h | 2 + + include/linux/perf_counter.h | 462 +- + include/linux/perf_event.h | 858 + + include/linux/pnp.h | 1 + + include/linux/poison.h | 3 + + include/linux/prctl.h | 4 +- + include/linux/quotaops.h | 4 +- + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 29 +- + include/linux/rcutree.h | 6 +- + include/linux/regulator/driver.h | 2 + + include/linux/rmap.h | 6 +- + include/linux/rxrpc.h | 7 + + include/linux/sched.h | 56 +- + include/linux/serial.h | 2 + + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 93 +- + include/linux/sh_intc.h | 1 - + include/linux/sunrpc/auth.h | 4 +- + include/linux/sunrpc/clnt.h | 114 + + include/linux/sunrpc/svc.h | 2 - + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/svcsock.h | 1 + + include/linux/sunrpc/xprt.h | 19 + + include/linux/sunrpc/xprtrdma.h | 5 - + include/linux/sunrpc/xprtsock.h | 11 - + include/linux/swap.h | 20 +- + include/linux/syscalls.h | 30 +- + include/linux/taskstats_kern.h | 1 - + include/linux/time.h | 10 +- + include/linux/timer.h | 5 - + include/linux/topology.h | 32 +- + include/linux/tty.h | 19 +- + include/linux/usb.h | 6 +- + include/linux/usb/m66592.h | 44 + + include/linux/usb/r8a66597.h | 375 +- + include/linux/usb/serial.h | 10 +- + include/linux/videodev2.h | 3 +- + include/linux/vmstat.h | 16 +- + include/linux/vt.h | 32 +- + include/linux/vt_kern.h | 16 +- + include/linux/wait.h | 4 +- + include/linux/workqueue.h | 2 +- + include/media/davinci/ccdc_types.h | 43 + + include/media/davinci/dm355_ccdc.h | 321 + + include/media/davinci/dm644x_ccdc.h | 184 + + include/media/davinci/vpfe_capture.h | 198 + + include/media/davinci/vpfe_types.h | 51 + + include/media/davinci/vpss.h | 69 + + include/media/soc_camera.h | 113 +- + include/media/soc_camera_platform.h | 9 +- + include/media/tuner.h | 2 + + include/media/tvp514x.h | 4 - + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-common.h | 24 +- + include/media/v4l2-dev.h | 6 +- + include/net/addrconf.h | 2 + + include/net/protocol.h | 13 +- + include/net/sch_generic.h | 2 +- + include/net/tcp.h | 7 + + include/rdma/ib_cm.h | 2 +- + include/scsi/fc/fc_fc2.h | 3 +- + include/trace/events/block.h | 4 +- + include/trace/events/ext4.h | 142 +- + include/trace/events/irq.h | 21 +- + include/trace/events/jbd2.h | 2 +- + include/trace/events/kmem.h | 163 + + include/trace/events/power.h | 81 + + include/trace/events/sched.h | 33 + + include/trace/ftrace.h | 125 +- + init/Kconfig | 55 +- + init/main.c | 4 +- + ipc/mqueue.c | 4 +- + ipc/shm.c | 2 +- + kernel/Makefile | 3 +- + kernel/cgroup.c | 6 +- + kernel/delayacct.c | 1 + + kernel/exit.c | 8 +- + kernel/fork.c | 29 +- + kernel/hrtimer.c | 57 - + kernel/kfifo.c | 2 +- + kernel/marker.c | 930 - + kernel/module.c | 23 +- + kernel/panic.c | 2 +- + kernel/perf_counter.c | 4963 ----- + kernel/perf_event.c | 5000 +++++ + kernel/pid.c | 15 +- + kernel/posix-timers.c | 35 + + kernel/power/console.c | 63 +- + kernel/power/process.c | 1 + + kernel/power/snapshot.c | 2 +- + kernel/profile.c | 45 +- + kernel/rcupdate.c | 48 +- + kernel/rcutorture.c | 43 +- + kernel/rcutree.c | 105 +- + kernel/rcutree.h | 2 +- + kernel/rcutree_plugin.h | 110 +- + kernel/rcutree_trace.c | 2 +- + kernel/sched.c | 500 +- + kernel/sched_clock.c | 122 +- + kernel/sched_debug.c | 1 + + kernel/sched_fair.c | 464 +- + kernel/sched_features.h | 122 +- + kernel/sched_idletask.c | 11 +- + kernel/sched_rt.c | 20 +- + kernel/softirq.c | 2 +- + kernel/sys.c | 10 +- + kernel/sys_ni.c | 2 +- + kernel/sysctl.c | 22 +- + kernel/time.c | 9 +- + kernel/time/clocksource.c | 529 +- + kernel/time/jiffies.c | 6 +- + kernel/time/ntp.c | 7 +- + kernel/time/timekeeping.c | 535 +- + kernel/timer.c | 32 +- + kernel/trace/Kconfig | 30 +- + kernel/trace/Makefile | 2 +- + kernel/trace/ftrace.c | 179 +- + kernel/trace/power-traces.c | 20 + + kernel/trace/ring_buffer.c | 19 +- + kernel/trace/trace.c | 184 +- + kernel/trace/trace.h | 279 +- + kernel/trace/trace_boot.c | 8 +- + kernel/trace/trace_clock.c | 24 +- + kernel/trace/trace_entries.h | 366 + + kernel/trace/trace_event_profile.c | 87 +- + kernel/trace/trace_event_types.h | 178 - + kernel/trace/trace_events.c | 128 +- + kernel/trace/trace_events_filter.c | 41 + + kernel/trace/trace_export.c | 284 +- + kernel/trace/trace_functions.c | 2 +- + kernel/trace/trace_functions_graph.c | 66 +- + kernel/trace/trace_hw_branches.c | 2 +- + kernel/trace/trace_irqsoff.c | 16 +- + kernel/trace/trace_mmiotrace.c | 10 +- + kernel/trace/trace_output.c | 42 +- + kernel/trace/trace_output.h | 2 + + kernel/trace/trace_power.c | 218 - + kernel/trace/trace_printk.c | 1 - + kernel/trace/trace_sched_wakeup.c | 52 +- + kernel/trace/trace_syscalls.c | 99 +- + kernel/tracepoint.c | 2 +- + lib/Kconfig.kmemcheck | 3 + + lib/flex_array.c | 121 +- + lib/vsprintf.c | 30 +- + lib/zlib_deflate/deflate.c | 4 +- + mm/Kconfig | 12 + + mm/Kconfig.debug | 12 +- + mm/Makefile | 3 +- + mm/filemap.c | 4 + + mm/hugetlb.c | 251 +- + mm/internal.h | 10 +- + mm/ksm.c | 1703 ++ + mm/madvise.c | 53 +- + mm/memcontrol.c | 2 +- + mm/memory.c | 213 +- + mm/memory_hotplug.c | 7 +- + mm/mempool.c | 7 - + mm/migrate.c | 24 +- + mm/mlock.c | 128 +- + mm/mmap.c | 59 +- + mm/mmu_context.c | 58 + + mm/mmu_notifier.c | 20 + + mm/mprotect.c | 4 +- + mm/mremap.c | 14 + + mm/nommu.c | 45 +- + mm/oom_kill.c | 86 +- + mm/page-writeback.c | 16 +- + mm/page_alloc.c | 284 +- + mm/page_cgroup.c | 12 +- + mm/rmap.c | 78 +- + mm/shmem.c | 15 +- + mm/slab.c | 2 +- + mm/slub.c | 3 + + mm/sparse-vmemmap.c | 8 +- + mm/sparse.c | 9 +- + mm/swap.c | 8 +- + mm/swap_state.c | 145 +- + mm/swapfile.c | 4 +- + mm/vmalloc.c | 221 +- + mm/vmscan.c | 213 +- + mm/vmstat.c | 5 +- + net/appletalk/ddp.c | 2 +- + net/bluetooth/hidp/core.c | 7 - + net/can/af_can.c | 4 +- + net/core/dev.c | 4 +- + net/core/sock.c | 4 +- + net/dccp/ccids/Kconfig | 6 +- + net/dccp/ccids/ccid2.c | 2 - + net/dccp/ccids/ccid2.h | 8 +- + net/dccp/ccids/ccid3.c | 5 +- + net/dccp/ccids/ccid3.h | 50 +- + net/dccp/ccids/lib/loss_interval.c | 7 +- + net/dccp/ccids/lib/loss_interval.h | 2 - + net/dccp/ccids/lib/packet_history.c | 4 +- + net/dccp/ccids/lib/packet_history.h | 1 - + net/dccp/ccids/lib/tfrc.h | 4 +- + net/dccp/ccids/lib/tfrc_equation.c | 26 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 4 +- + net/dccp/proto.c | 6 +- + net/decnet/dn_route.c | 2 +- + net/ieee802154/dgram.c | 2 +- + net/ieee802154/netlink.c | 4 + + net/ieee802154/raw.c | 2 +- + net/ipv4/af_inet.c | 18 +- + net/ipv4/ah4.c | 2 +- + net/ipv4/devinet.c | 6 + + net/ipv4/esp4.c | 2 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 22 + + net/ipv4/ip_gre.c | 2 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ipcomp.c | 2 +- + net/ipv4/ipmr.c | 6 +- + net/ipv4/protocol.c | 6 +- + net/ipv4/route.c | 2 +- + net/ipv4/tcp.c | 6 +- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 4 +- + net/ipv4/tcp_minisocks.c | 4 +- + net/ipv4/tunnel4.c | 4 +- + net/ipv4/udplite.c | 2 +- + net/ipv6/addrconf.c | 23 +- + net/ipv6/af_inet6.c | 10 +- + net/ipv6/ah6.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/exthdrs.c | 6 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6mr.c | 6 +- + net/ipv6/ipcomp6.c | 2 +- + net/ipv6/mcast.c | 19 + + net/ipv6/protocol.c | 6 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/route.c | 2 +- + net/ipv6/tcp_ipv6.c | 7 +- + net/ipv6/tunnel6.c | 4 +- + net/ipv6/udp.c | 2 +- + net/ipv6/udplite.c | 2 +- + net/iucv/af_iucv.c | 33 +- + net/iucv/iucv.c | 38 +- + net/mac80211/rc80211_minstrel.c | 2 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/x_tables.c | 2 +- + net/netfilter/xt_hashlimit.c | 8 +- + net/netlink/af_netlink.c | 57 +- + net/netlink/genetlink.c | 5 +- + net/phonet/pn_dev.c | 9 +- + net/rds/af_rds.c | 2 +- + net/rose/af_rose.c | 4 +- + net/rxrpc/ar-ack.c | 6 +- + net/rxrpc/ar-call.c | 2 +- + net/rxrpc/ar-internal.h | 32 +- + net/rxrpc/ar-key.c | 914 +- + net/rxrpc/ar-security.c | 8 +- + net/rxrpc/rxkad.c | 47 +- + net/sched/sch_api.c | 29 +- + net/sched/sch_drr.c | 4 +- + net/sched/sch_hfsc.c | 2 +- + net/sched/sch_mq.c | 14 +- + net/sched/sch_multiq.c | 1 + + net/sched/sch_prio.c | 1 + + net/sctp/ipv6.c | 2 +- + net/sctp/protocol.c | 8 +- + net/socket.c | 3 +- + net/sunrpc/auth.c | 20 +- + net/sunrpc/auth_generic.c | 4 +- + net/sunrpc/auth_gss/svcauth_gss.c | 6 +- + net/sunrpc/cache.c | 109 +- + net/sunrpc/clnt.c | 1 + + net/sunrpc/rpc_pipe.c | 2 +- + net/sunrpc/sched.c | 7 +- + net/sunrpc/sunrpc.h | 14 + + net/sunrpc/svc_xprt.c | 25 +- + net/sunrpc/svcauth_unix.c | 1 + + net/sunrpc/svcsock.c | 335 +- + net/sunrpc/xprt.c | 15 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- + net/sunrpc/xprtsock.c | 242 +- + net/wireless/scan.c | 7 +- + net/wireless/sme.c | 21 +- + net/wireless/wext-compat.c | 2 +- + samples/Kconfig | 6 - + samples/Makefile | 2 +- + samples/markers/Makefile | 4 - + samples/markers/marker-example.c | 53 - + samples/markers/probe-example.c | 92 - + scripts/Makefile | 1 - + scripts/Makefile.modpost | 12 - + scripts/basic/fixdep.c | 4 +- + scripts/checkpatch.pl | 106 +- + scripts/get_maintainer.pl | 421 +- + scripts/kernel-doc | 21 +- + scripts/mod/sumversion.c | 2 - + scripts/tracing/power.pl | 108 - + sound/oss/swarm_cs4297a.c | 3 - + sound/oss/sys_timer.c | 3 - + sound/pci/hda/patch_realtek.c | 21 +- + sound/pci/hda/patch_sigmatel.c | 65 +- + sound/soc/codecs/ad1836.c | 1 - + sound/soc/codecs/ad1938.c | 1 - + sound/soc/codecs/wm8974.c | 1 - + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/davinci/davinci-pcm.c | 6 +- + sound/soc/fsl/mpc5200_dma.c | 33 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/s3c24xx/s3c-i2s-v2.c | 16 +- + sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 +- + sound/soc/soc-dapm.c | 7 +- + sound/sound_core.c | 4 +- + tools/perf/Documentation/perf-sched.txt | 41 + + tools/perf/Documentation/perf-timechart.txt | 38 + + tools/perf/Documentation/perf-trace.txt | 25 + + tools/perf/Makefile | 11 +- + tools/perf/builtin-annotate.c | 28 +- + tools/perf/builtin-record.c | 74 +- + tools/perf/builtin-report.c | 48 +- + tools/perf/builtin-sched.c | 2004 ++ + tools/perf/builtin-stat.c | 10 +- + tools/perf/builtin-timechart.c | 1158 + + tools/perf/builtin-top.c | 12 +- + tools/perf/builtin-trace.c | 22 +- + tools/perf/builtin.h | 6 +- + tools/perf/command-list.txt | 3 + + tools/perf/design.txt | 58 +- + tools/perf/perf.c | 2 + + tools/perf/perf.h | 12 +- + tools/perf/util/event.h | 14 +- + tools/perf/util/header.c | 73 +- + tools/perf/util/header.h | 14 +- + tools/perf/util/parse-events.c | 263 +- + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-options.h | 2 + + tools/perf/util/svghelper.c | 488 + + tools/perf/util/svghelper.h | 28 + + tools/perf/util/thread.c | 4 +- + tools/perf/util/thread.h | 9 +- + tools/perf/util/trace-event-info.c | 15 +- + tools/perf/util/trace-event-parse.c | 45 +- + tools/perf/util/trace-event-read.c | 6 +- + tools/perf/util/trace-event.h | 7 +- + 2523 files changed, 227070 insertions(+), 75180 deletions(-) + create mode 100644 Documentation/DocBook/dvb/.gitignore + create mode 100644 Documentation/DocBook/dvb/audio.xml + create mode 100644 Documentation/DocBook/dvb/ca.xml + create mode 100644 Documentation/DocBook/dvb/demux.xml + create mode 100644 Documentation/DocBook/dvb/dvbapi.xml + create mode 100644 Documentation/DocBook/dvb/dvbstb.pdf + create mode 100644 Documentation/DocBook/dvb/dvbstb.png + create mode 100644 Documentation/DocBook/dvb/examples.xml + create mode 100644 Documentation/DocBook/dvb/frontend.xml + create mode 100644 Documentation/DocBook/dvb/intro.xml + create mode 100644 Documentation/DocBook/dvb/isdbt.xml + create mode 100644 Documentation/DocBook/dvb/kdapi.xml + create mode 100644 Documentation/DocBook/dvb/net.xml + create mode 100644 Documentation/DocBook/dvb/video.xml + create mode 100644 Documentation/DocBook/media-entities.tmpl + create mode 100644 Documentation/DocBook/media-indices.tmpl + create mode 100644 Documentation/DocBook/media.tmpl + create mode 100644 Documentation/DocBook/v4l/.gitignore + create mode 100644 Documentation/DocBook/v4l/biblio.xml + create mode 100644 Documentation/DocBook/v4l/capture.c.xml + create mode 100644 Documentation/DocBook/v4l/common.xml + create mode 100644 Documentation/DocBook/v4l/compat.xml + create mode 100644 Documentation/DocBook/v4l/controls.xml + create mode 100644 Documentation/DocBook/v4l/crop.gif + create mode 100644 Documentation/DocBook/v4l/crop.pdf + create mode 100644 Documentation/DocBook/v4l/dev-capture.xml + create mode 100644 Documentation/DocBook/v4l/dev-codec.xml + create mode 100644 Documentation/DocBook/v4l/dev-effect.xml + create mode 100644 Documentation/DocBook/v4l/dev-osd.xml + create mode 100644 Documentation/DocBook/v4l/dev-output.xml + create mode 100644 Documentation/DocBook/v4l/dev-overlay.xml + create mode 100644 Documentation/DocBook/v4l/dev-radio.xml + create mode 100644 Documentation/DocBook/v4l/dev-raw-vbi.xml + create mode 100644 Documentation/DocBook/v4l/dev-rds.xml + create mode 100644 Documentation/DocBook/v4l/dev-sliced-vbi.xml + create mode 100644 Documentation/DocBook/v4l/dev-teletext.xml + create mode 100644 Documentation/DocBook/v4l/driver.xml + create mode 100644 Documentation/DocBook/v4l/fdl-appendix.xml + create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.gif + create mode 100644 Documentation/DocBook/v4l/fieldseq_bt.pdf + create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.gif + create mode 100644 Documentation/DocBook/v4l/fieldseq_tb.pdf + create mode 100644 Documentation/DocBook/v4l/func-close.xml + create mode 100644 Documentation/DocBook/v4l/func-ioctl.xml + create mode 100644 Documentation/DocBook/v4l/func-mmap.xml + create mode 100644 Documentation/DocBook/v4l/func-munmap.xml + create mode 100644 Documentation/DocBook/v4l/func-open.xml + create mode 100644 Documentation/DocBook/v4l/func-poll.xml + create mode 100644 Documentation/DocBook/v4l/func-read.xml + create mode 100644 Documentation/DocBook/v4l/func-select.xml + create mode 100644 Documentation/DocBook/v4l/func-write.xml + create mode 100644 Documentation/DocBook/v4l/io.xml + create mode 100644 Documentation/DocBook/v4l/keytable.c.xml + create mode 100644 Documentation/DocBook/v4l/libv4l.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-grey.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv12.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-nv16.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-rgb.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-packed-yuv.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr16.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-sbggr8.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-sgbrg8.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-sgrbg8.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-uyvy.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-vyuy.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-y16.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-y41p.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv410.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv411p.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv420.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuv422p.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yuyv.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt-yvyu.xml + create mode 100644 Documentation/DocBook/v4l/pixfmt.xml + create mode 100644 Documentation/DocBook/v4l/remote_controllers.xml + create mode 100644 Documentation/DocBook/v4l/v4l2.xml + create mode 100644 Documentation/DocBook/v4l/v4l2grab.c.xml + create mode 100644 Documentation/DocBook/v4l/vbi_525.gif + create mode 100644 Documentation/DocBook/v4l/vbi_525.pdf + create mode 100644 Documentation/DocBook/v4l/vbi_625.gif + create mode 100644 Documentation/DocBook/v4l/vbi_625.pdf + create mode 100644 Documentation/DocBook/v4l/vbi_hsync.gif + create mode 100644 Documentation/DocBook/v4l/vbi_hsync.pdf + create mode 100644 Documentation/DocBook/v4l/videodev2.h.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-cropcap.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-chip-ident.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-dbg-g-register.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-encoder-cmd.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enum-fmt.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enum-frameintervals.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enum-framesizes.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudio.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enumaudioout.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enuminput.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enumoutput.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-enumstd.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-audio.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-audioout.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-crop.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-ctrl.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-enc-index.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-ext-ctrls.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-fbuf.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-fmt.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-frequency.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-input.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-jpegcomp.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-modulator.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-output.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-parm.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-priority.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-sliced-vbi-cap.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-std.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-g-tuner.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-log-status.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-overlay.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-qbuf.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-querybuf.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-querycap.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-queryctrl.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-querystd.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-reqbufs.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-s-hw-freq-seek.xml + create mode 100644 Documentation/DocBook/v4l/vidioc-streamon.xml + create mode 100644 Documentation/arm/OMAP/omap_pm + create mode 100644 Documentation/hwmon/wm831x + create mode 100644 Documentation/hwmon/wm8350 + delete mode 100644 Documentation/markers.txt + create mode 100644 Documentation/trace/events-kmem.txt + create mode 100644 Documentation/trace/ftrace-design.txt + create mode 100644 Documentation/trace/postprocess/trace-pagealloc-postprocess.pl + delete mode 100644 Documentation/trace/power.txt + create mode 100644 Documentation/trace/tracepoint-analysis.txt + create mode 100644 Documentation/video4linux/CARDLIST.saa7164 + create mode 100644 Documentation/vm/ksm.txt + create mode 100644 Documentation/vm/map_hugetlb.c + create mode 100644 arch/arm/configs/da830_omapl137_defconfig + create mode 100644 arch/arm/configs/da850_omapl138_defconfig + create mode 100644 arch/arm/configs/n8x0_defconfig + create mode 100644 arch/arm/mach-davinci/board-da830-evm.c + create mode 100644 arch/arm/mach-davinci/board-da850-evm.c + create mode 100644 arch/arm/mach-davinci/board-dm365-evm.c + create mode 100644 arch/arm/mach-davinci/da830.c + create mode 100644 arch/arm/mach-davinci/da850.c + create mode 100644 arch/arm/mach-davinci/devices-da8xx.c + create mode 100644 arch/arm/mach-davinci/dm365.c + create mode 100644 arch/arm/mach-davinci/include/mach/da8xx.h + create mode 100644 arch/arm/mach-davinci/include/mach/dm365.h + create mode 100644 arch/arm/mach-omap2/board-n8x0.c + create mode 100644 arch/arm/mach-omap2/cm.c + create mode 100644 arch/arm/mach-omap2/cm4xxx.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2420.h + create mode 100644 arch/arm/mach-omap2/omap_hwmod_2430.h + create mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h + create mode 100644 arch/arm/plat-omap/include/mach/omap-pm.h + create mode 100644 arch/arm/plat-omap/include/mach/omap_device.h + create mode 100644 arch/arm/plat-omap/include/mach/omap_hwmod.h + create mode 100644 arch/arm/plat-omap/iommu-debug.c + create mode 100644 arch/arm/plat-omap/omap-pm-noop.c + create mode 100644 arch/arm/plat-omap/omap_device.c + rename arch/frv/include/asm/{perf_counter.h => perf_event.h} (69%) + rename arch/frv/lib/{perf_counter.c => perf_event.c} (72%) + create mode 100644 arch/mips/bcm63xx/Kconfig + create mode 100644 arch/mips/bcm63xx/Makefile + create mode 100644 arch/mips/bcm63xx/boards/Kconfig + create mode 100644 arch/mips/bcm63xx/boards/Makefile + create mode 100644 arch/mips/bcm63xx/boards/board_bcm963xx.c + create mode 100644 arch/mips/bcm63xx/clk.c + create mode 100644 arch/mips/bcm63xx/cpu.c + create mode 100644 arch/mips/bcm63xx/cs.c + create mode 100644 arch/mips/bcm63xx/dev-dsp.c + create mode 100644 arch/mips/bcm63xx/dev-enet.c + create mode 100644 arch/mips/bcm63xx/early_printk.c + create mode 100644 arch/mips/bcm63xx/gpio.c + create mode 100644 arch/mips/bcm63xx/irq.c + create mode 100644 arch/mips/bcm63xx/prom.c + create mode 100644 arch/mips/bcm63xx/setup.c + create mode 100644 arch/mips/bcm63xx/timer.c + create mode 100644 arch/mips/cavium-octeon/octeon-platform.c + create mode 100644 arch/mips/configs/bcm63xx_defconfig + rename arch/mips/configs/{fulong_defconfig => fuloong2e_defconfig} (85%) + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_board.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cs.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_dsp.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_enet.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_pci.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_io.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_irq.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_timer.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-bcm63xx/gpio.h + copy arch/mips/include/asm/{mach-lemote => mach-bcm63xx}/war.h (85%) + rename arch/mips/include/asm/{mach-lemote => mach-loongson}/cpu-feature-overrides.h (90%) + rename arch/mips/include/asm/{mach-lemote => mach-loongson}/dma-coherence.h (91%) + create mode 100644 arch/mips/include/asm/mach-loongson/loongson.h + create mode 100644 arch/mips/include/asm/mach-loongson/machine.h + rename arch/mips/include/asm/{mach-lemote => mach-loongson}/mc146818rtc.h (85%) + create mode 100644 arch/mips/include/asm/mach-loongson/mem.h + rename arch/mips/include/asm/{mach-lemote => mach-loongson}/pci.h (62%) + rename arch/mips/include/asm/{mach-lemote => mach-loongson}/war.h (85%) + create mode 100644 arch/mips/include/asm/octeon/cvmx-rnm-defs.h + delete mode 100644 arch/mips/lemote/lm2e/Makefile + delete mode 100644 arch/mips/lemote/lm2e/bonito-irq.c + delete mode 100644 arch/mips/lemote/lm2e/dbg_io.c + delete mode 100644 arch/mips/lemote/lm2e/irq.c + delete mode 100644 arch/mips/lemote/lm2e/pci.c + delete mode 100644 arch/mips/lemote/lm2e/prom.c + delete mode 100644 arch/mips/lemote/lm2e/reset.c + delete mode 100644 arch/mips/lemote/lm2e/setup.c + create mode 100644 arch/mips/loongson/Kconfig + create mode 100644 arch/mips/loongson/Makefile + create mode 100644 arch/mips/loongson/common/Makefile + create mode 100644 arch/mips/loongson/common/bonito-irq.c + create mode 100644 arch/mips/loongson/common/cmdline.c + create mode 100644 arch/mips/loongson/common/early_printk.c + create mode 100644 arch/mips/loongson/common/env.c + create mode 100644 arch/mips/loongson/common/init.c + create mode 100644 arch/mips/loongson/common/irq.c + create mode 100644 arch/mips/loongson/common/machtype.c + rename arch/mips/{lemote/lm2e => loongson/common}/mem.c (57%) + create mode 100644 arch/mips/loongson/common/pci.c + create mode 100644 arch/mips/loongson/common/reset.c + create mode 100644 arch/mips/loongson/common/setup.c + create mode 100644 arch/mips/loongson/common/time.c + create mode 100644 arch/mips/loongson/fuloong-2e/Makefile + create mode 100644 arch/mips/loongson/fuloong-2e/irq.c + create mode 100644 arch/mips/loongson/fuloong-2e/reset.c + create mode 100644 arch/mips/oprofile/op_model_loongson2.c + create mode 100644 arch/mips/pci/fixup-bcm63xx.c + rename arch/mips/pci/{fixup-lm2e.c => fixup-fuloong2e.c} (86%) + create mode 100644 arch/mips/pci/ops-bcm63xx.c + create mode 100644 arch/mips/pci/pci-bcm63xx.c + create mode 100644 arch/mips/pci/pci-bcm63xx.h + delete mode 100644 arch/parisc/include/asm/perf_counter.h + create mode 100644 arch/parisc/include/asm/perf_event.h + rename arch/powerpc/include/asm/{perf_counter.h => perf_event.h} (85%) + rename arch/powerpc/kernel/{perf_counter.c => perf_event.c} (61%) + delete mode 100644 arch/s390/include/asm/perf_counter.h + create mode 100644 arch/s390/include/asm/perf_event.h + create mode 100644 arch/score/Kconfig + create mode 100644 arch/score/Kconfig.debug + create mode 100644 arch/score/Makefile + create mode 100644 arch/score/boot/Makefile + create mode 100644 arch/score/configs/spct6600_defconfig + create mode 100644 arch/score/include/asm/Kbuild + create mode 100644 arch/score/include/asm/asmmacro.h + create mode 100644 arch/score/include/asm/atomic.h + create mode 100644 arch/score/include/asm/auxvec.h + create mode 100644 arch/score/include/asm/bitops.h + create mode 100644 arch/score/include/asm/bitsperlong.h + create mode 100644 arch/score/include/asm/bug.h + create mode 100644 arch/score/include/asm/bugs.h + create mode 100644 arch/score/include/asm/byteorder.h + create mode 100644 arch/score/include/asm/cache.h + create mode 100644 arch/score/include/asm/cacheflush.h + create mode 100644 arch/score/include/asm/checksum.h + create mode 100644 arch/score/include/asm/cputime.h + create mode 100644 arch/score/include/asm/current.h + create mode 100644 arch/score/include/asm/delay.h + create mode 100644 arch/score/include/asm/device.h + create mode 100644 arch/score/include/asm/div64.h + create mode 100644 arch/score/include/asm/dma-mapping.h + create mode 100644 arch/score/include/asm/dma.h + create mode 100644 arch/score/include/asm/elf.h + create mode 100644 arch/score/include/asm/emergency-restart.h + create mode 100644 arch/score/include/asm/errno.h + create mode 100644 arch/score/include/asm/fcntl.h + create mode 100644 arch/score/include/asm/fixmap.h + create mode 100644 arch/score/include/asm/ftrace.h + create mode 100644 arch/score/include/asm/futex.h + create mode 100644 arch/score/include/asm/hardirq.h + create mode 100644 arch/score/include/asm/hw_irq.h + create mode 100644 arch/score/include/asm/io.h + create mode 100644 arch/score/include/asm/ioctl.h + create mode 100644 arch/score/include/asm/ioctls.h + create mode 100644 arch/score/include/asm/ipcbuf.h + create mode 100644 arch/score/include/asm/irq.h + create mode 100644 arch/score/include/asm/irq_regs.h + create mode 100644 arch/score/include/asm/irqflags.h + create mode 100644 arch/score/include/asm/kdebug.h + create mode 100644 arch/score/include/asm/kmap_types.h + create mode 100644 arch/score/include/asm/linkage.h + create mode 100644 arch/score/include/asm/local.h + create mode 100644 arch/score/include/asm/mman.h + create mode 100644 arch/score/include/asm/mmu.h + create mode 100644 arch/score/include/asm/mmu_context.h + create mode 100644 arch/score/include/asm/module.h + create mode 100644 arch/score/include/asm/msgbuf.h + create mode 100644 arch/score/include/asm/mutex.h + create mode 100644 arch/score/include/asm/page.h + create mode 100644 arch/score/include/asm/param.h + create mode 100644 arch/score/include/asm/pci.h + create mode 100644 arch/score/include/asm/percpu.h + create mode 100644 arch/score/include/asm/pgalloc.h + create mode 100644 arch/score/include/asm/pgtable-bits.h + create mode 100644 arch/score/include/asm/pgtable.h + create mode 100644 arch/score/include/asm/poll.h + create mode 100644 arch/score/include/asm/posix_types.h + create mode 100644 arch/score/include/asm/processor.h + create mode 100644 arch/score/include/asm/ptrace.h + create mode 100644 arch/score/include/asm/resource.h + create mode 100644 arch/score/include/asm/scatterlist.h + create mode 100644 arch/score/include/asm/scoreregs.h + create mode 100644 arch/score/include/asm/sections.h + create mode 100644 arch/score/include/asm/segment.h + create mode 100644 arch/score/include/asm/sembuf.h + create mode 100644 arch/score/include/asm/setup.h + create mode 100644 arch/score/include/asm/shmbuf.h + create mode 100644 arch/score/include/asm/shmparam.h + create mode 100644 arch/score/include/asm/sigcontext.h + create mode 100644 arch/score/include/asm/siginfo.h + create mode 100644 arch/score/include/asm/signal.h + create mode 100644 arch/score/include/asm/socket.h + create mode 100644 arch/score/include/asm/sockios.h + create mode 100644 arch/score/include/asm/stat.h + create mode 100644 arch/score/include/asm/statfs.h + create mode 100644 arch/score/include/asm/string.h + create mode 100644 arch/score/include/asm/swab.h + create mode 100644 arch/score/include/asm/syscalls.h + create mode 100644 arch/score/include/asm/system.h + create mode 100644 arch/score/include/asm/termbits.h + create mode 100644 arch/score/include/asm/termios.h + create mode 100644 arch/score/include/asm/thread_info.h + create mode 100644 arch/score/include/asm/timex.h + create mode 100644 arch/score/include/asm/tlb.h + create mode 100644 arch/score/include/asm/tlbflush.h + create mode 100644 arch/score/include/asm/topology.h + create mode 100644 arch/score/include/asm/types.h + create mode 100644 arch/score/include/asm/uaccess.h + create mode 100644 arch/score/include/asm/ucontext.h + create mode 100644 arch/score/include/asm/unaligned.h + create mode 100644 arch/score/include/asm/unistd.h + create mode 100644 arch/score/include/asm/user.h + create mode 100644 arch/score/kernel/Makefile + create mode 100644 arch/score/kernel/asm-offsets.c + create mode 100644 arch/score/kernel/entry.S + create mode 100644 arch/score/kernel/head.S + create mode 100644 arch/score/kernel/init_task.c + create mode 100644 arch/score/kernel/irq.c + create mode 100644 arch/score/kernel/module.c + create mode 100644 arch/score/kernel/process.c + create mode 100644 arch/score/kernel/ptrace.c + create mode 100644 arch/score/kernel/setup.c + create mode 100644 arch/score/kernel/signal.c + create mode 100644 arch/score/kernel/sys_call_table.c + create mode 100644 arch/score/kernel/sys_score.c + create mode 100644 arch/score/kernel/time.c + create mode 100644 arch/score/kernel/traps.c + create mode 100644 arch/score/kernel/vmlinux.lds.S + create mode 100644 arch/score/lib/Makefile + create mode 100644 arch/score/lib/ashldi3.c + create mode 100644 arch/score/lib/ashrdi3.c + create mode 100644 arch/score/lib/checksum.S + create mode 100644 arch/score/lib/checksum_copy.c + create mode 100644 arch/score/lib/cmpdi2.c + create mode 100644 arch/score/lib/libgcc.h + create mode 100644 arch/score/lib/lshrdi3.c + create mode 100644 arch/score/lib/string.S + create mode 100644 arch/score/lib/ucmpdi2.c + create mode 100644 arch/score/mm/Makefile + create mode 100644 arch/score/mm/cache.c + create mode 100644 arch/score/mm/extable.c + create mode 100644 arch/score/mm/fault.c + create mode 100644 arch/score/mm/init.c + create mode 100644 arch/score/mm/pgtable.c + create mode 100644 arch/score/mm/tlb-miss.S + create mode 100644 arch/score/mm/tlb-score.c + create mode 100644 arch/sh/boards/mach-ecovec24/Makefile + create mode 100644 arch/sh/boards/mach-ecovec24/setup.c + create mode 100644 arch/sh/boards/mach-kfr2r09/Makefile + create mode 100644 arch/sh/boards/mach-kfr2r09/lcd_wqvga.c + create mode 100644 arch/sh/boards/mach-kfr2r09/setup.c + create mode 100644 arch/sh/boot/compressed/.gitignore + create mode 100644 arch/sh/boot/compressed/misc.c + delete mode 100644 arch/sh/boot/compressed/misc_32.c + delete mode 100644 arch/sh/boot/compressed/misc_64.c + delete mode 100644 arch/sh/boot/compressed/piggy.S + create mode 100644 arch/sh/boot/compressed/vmlinux.scr + create mode 100644 arch/sh/boot/romimage/Makefile + create mode 100644 arch/sh/boot/romimage/head.S + create mode 100644 arch/sh/boot/romimage/vmlinux.scr + create mode 100644 arch/sh/configs/ecovec24-romimage_defconfig + create mode 100644 arch/sh/configs/ecovec24_defconfig + create mode 100644 arch/sh/configs/kfr2r09-romimage_defconfig + create mode 100644 arch/sh/configs/kfr2r09_defconfig + create mode 100644 arch/sh/include/asm/cachectl.h + create mode 100644 arch/sh/include/asm/dwarf.h + create mode 100644 arch/sh/include/asm/hwblk.h + create mode 100644 arch/sh/include/asm/lmb.h + delete mode 100644 arch/sh/include/asm/perf_counter.h + create mode 100644 arch/sh/include/asm/perf_event.h + create mode 100644 arch/sh/include/asm/romimage-macros.h + create mode 100644 arch/sh/include/asm/stacktrace.h + create mode 100644 arch/sh/include/asm/unwinder.h + create mode 100644 arch/sh/include/asm/vmlinux.lds.h + delete mode 100644 arch/sh/include/cpu-common/cpu/cacheflush.h + delete mode 100644 arch/sh/include/cpu-sh2a/cpu/cacheflush.h + delete mode 100644 arch/sh/include/cpu-sh3/cpu/cacheflush.h + delete mode 100644 arch/sh/include/cpu-sh4/cpu/cacheflush.h + create mode 100644 arch/sh/include/cpu-sh4/cpu/sh7757.h + delete mode 100644 arch/sh/include/cpu-sh5/cpu/cacheflush.h + delete mode 100644 arch/sh/include/mach-common/mach/migor.h + create mode 100644 arch/sh/include/mach-common/mach/romimage.h + create mode 100644 arch/sh/include/mach-ecovec24/mach/partner-jet-setup.txt + create mode 100644 arch/sh/include/mach-ecovec24/mach/romimage.h + create mode 100644 arch/sh/include/mach-kfr2r09/mach/kfr2r09.h + create mode 100644 arch/sh/include/mach-kfr2r09/mach/partner-jet-setup.txt + create mode 100644 arch/sh/include/mach-kfr2r09/mach/romimage.h + create mode 100644 arch/sh/include/mach-migor/mach/migor.h + delete mode 100644 arch/sh/kernel/Makefile_32 + delete mode 100644 arch/sh/kernel/Makefile_64 + create mode 100644 arch/sh/kernel/cpu/hwblk.c + create mode 100644 arch/sh/kernel/cpu/sh4a/clock-sh7757.c + create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7722.c + create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7723.c + create mode 100644 arch/sh/kernel/cpu/sh4a/hwblk-sh7724.c + create mode 100644 arch/sh/kernel/cpu/sh4a/pinmux-sh7757.c + create mode 100644 arch/sh/kernel/cpu/sh4a/setup-sh7757.c + create mode 100644 arch/sh/kernel/cpu/shmobile/cpuidle.c + create mode 100644 arch/sh/kernel/cpu/shmobile/pm_runtime.c + create mode 100644 arch/sh/kernel/dumpstack.c + create mode 100644 arch/sh/kernel/dwarf.c + create mode 100644 arch/sh/kernel/nmi_debug.c + create mode 100644 arch/sh/kernel/unwinder.c + rename arch/sh/lib/{clear_page.S => __clear_user.S} (75%) + delete mode 100644 arch/sh/lib64/clear_page.S + delete mode 100644 arch/sh/mm/Makefile_32 + delete mode 100644 arch/sh/mm/Makefile_64 + create mode 100644 arch/sh/mm/cache.c + create mode 100644 arch/sh/mm/flush-sh4.c + create mode 100644 arch/sh/mm/kmap.c + create mode 100644 arch/sh/mm/nommu.c + delete mode 100644 arch/sh/mm/pg-nommu.c + delete mode 100644 arch/sh/mm/pg-sh4.c + delete mode 100644 arch/sh/mm/pg-sh7705.c + delete mode 100644 arch/sh/mm/tlb-nommu.c + delete mode 100644 arch/sparc/include/asm/perf_counter.h + create mode 100644 arch/sparc/include/asm/perf_event.h + rename arch/sparc/kernel/{perf_counter.c => perf_event.c} (68%) + delete mode 100644 arch/x86/include/asm/do_timer.h + rename arch/x86/include/asm/{perf_counter.h => perf_event.h} (76%) + create mode 100644 arch/x86/include/asm/x86_init.h + delete mode 100644 arch/x86/kernel/cpu/mcheck/k7.c + delete mode 100644 arch/x86/kernel/cpu/mcheck/non-fatal.c + delete mode 100644 arch/x86/kernel/cpu/mcheck/p4.c + delete mode 100644 arch/x86/kernel/cpu/mcheck/p6.c + rename arch/x86/kernel/cpu/{perf_counter.c => perf_event.c} (74%) + create mode 100644 arch/x86/kernel/cpu/sched.c + create mode 100644 arch/x86/kernel/mrst.c + create mode 100644 arch/x86/kernel/time.c + delete mode 100644 arch/x86/kernel/time_32.c + delete mode 100644 arch/x86/kernel/time_64.c + create mode 100644 arch/x86/kernel/x86_init.c + create mode 100644 drivers/ata/pata_atp867x.c + create mode 100644 drivers/char/hw_random/octeon-rng.c + create mode 100644 drivers/gpio/wm831x-gpio.c + create mode 100644 drivers/gpu/drm/drm_encoder_slave.c + create mode 100644 drivers/gpu/drm/drm_fb_helper.c + rename drivers/gpu/drm/i915/{i915_gem_debugfs.c => i915_debugfs.c} (79%) + delete mode 100644 drivers/gpu/drm/mga/mga_ucode.h + create mode 100644 drivers/gpu/drm/radeon/avivod.h + create mode 100644 drivers/gpu/drm/radeon/mkregtable.c + create mode 100644 drivers/gpu/drm/radeon/r100_track.h + create mode 100644 drivers/gpu/drm/radeon/r100d.h + create mode 100644 drivers/gpu/drm/radeon/r200.c + delete mode 100644 drivers/gpu/drm/radeon/r300.h + create mode 100644 drivers/gpu/drm/radeon/r300d.h + create mode 100644 drivers/gpu/drm/radeon/r420d.h + create mode 100644 drivers/gpu/drm/radeon/r600_blit.c + create mode 100644 drivers/gpu/drm/radeon/r600_blit_kms.c + create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.c + create mode 100644 drivers/gpu/drm/radeon/r600_blit_shaders.h + create mode 100644 drivers/gpu/drm/radeon/r600_cs.c + delete mode 100644 drivers/gpu/drm/radeon/r600_microcode.h + create mode 100644 drivers/gpu/drm/radeon/r600d.h + create mode 100644 drivers/gpu/drm/radeon/radeon_legacy_tv.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_microcode.h + delete mode 100644 drivers/gpu/drm/radeon/radeon_share.h + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r100 + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r200 + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r300 + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rn50 + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rs600 + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/rv515 + delete mode 100644 drivers/gpu/drm/radeon/rs780.c + rename drivers/gpu/drm/radeon/{rv515r.h => rv515d.h} (78%) + create mode 100644 drivers/gpu/drm/radeon/rv770d.h + create mode 100644 drivers/hwmon/wm831x-hwmon.c + create mode 100644 drivers/hwmon/wm8350-hwmon.c + create mode 100644 drivers/input/misc/pcap_keys.c + create mode 100644 drivers/input/misc/winbond-cir.c + create mode 100644 drivers/input/misc/wm831x-on.c + create mode 100644 drivers/input/touchscreen/pcap_ts.c + create mode 100644 drivers/media/dvb/dvb-usb/friio-fe.c + create mode 100644 drivers/media/dvb/dvb-usb/friio.c + create mode 100644 drivers/media/dvb/dvb-usb/friio.h + create mode 100644 drivers/media/dvb/frontends/dib8000.c + create mode 100644 drivers/media/dvb/frontends/dib8000.h + create mode 100644 drivers/media/dvb/pt1/Kconfig + create mode 100644 drivers/media/dvb/pt1/Makefile + create mode 100644 drivers/media/dvb/pt1/pt1.c + create mode 100644 drivers/media/dvb/pt1/va1j5jf8007s.c + create mode 100644 drivers/media/dvb/pt1/va1j5jf8007s.h + create mode 100644 drivers/media/dvb/pt1/va1j5jf8007t.c + create mode 100644 drivers/media/dvb/pt1/va1j5jf8007t.h + create mode 100644 drivers/media/video/adv7180.c + create mode 100644 drivers/media/video/davinci/Makefile + create mode 100644 drivers/media/video/davinci/ccdc_hw_device.h + create mode 100644 drivers/media/video/davinci/dm355_ccdc.c + create mode 100644 drivers/media/video/davinci/dm355_ccdc_regs.h + create mode 100644 drivers/media/video/davinci/dm644x_ccdc.c + create mode 100644 drivers/media/video/davinci/dm644x_ccdc_regs.h + create mode 100644 drivers/media/video/davinci/vpfe_capture.c + create mode 100644 drivers/media/video/davinci/vpif.c + create mode 100644 drivers/media/video/davinci/vpif.h + create mode 100644 drivers/media/video/davinci/vpif_capture.c + create mode 100644 drivers/media/video/davinci/vpif_capture.h + create mode 100644 drivers/media/video/davinci/vpif_display.c + create mode 100644 drivers/media/video/davinci/vpif_display.h + create mode 100644 drivers/media/video/davinci/vpss.c + create mode 100644 drivers/media/video/em28xx/em28xx-vbi.c + create mode 100644 drivers/media/video/gspca/gl860/Kconfig + create mode 100644 drivers/media/video/gspca/gl860/Makefile + create mode 100644 drivers/media/video/gspca/gl860/gl860-mi1320.c + create mode 100644 drivers/media/video/gspca/gl860/gl860-mi2020.c + create mode 100644 drivers/media/video/gspca/gl860/gl860-ov2640.c + create mode 100644 drivers/media/video/gspca/gl860/gl860-ov9655.c + create mode 100644 drivers/media/video/gspca/gl860/gl860.c + create mode 100644 drivers/media/video/gspca/gl860/gl860.h + create mode 100644 drivers/media/video/saa7164/Kconfig + create mode 100644 drivers/media/video/saa7164/Makefile + create mode 100644 drivers/media/video/saa7164/saa7164-api.c + create mode 100644 drivers/media/video/saa7164/saa7164-buffer.c + create mode 100644 drivers/media/video/saa7164/saa7164-bus.c + create mode 100644 drivers/media/video/saa7164/saa7164-cards.c + create mode 100644 drivers/media/video/saa7164/saa7164-cmd.c + create mode 100644 drivers/media/video/saa7164/saa7164-core.c + create mode 100644 drivers/media/video/saa7164/saa7164-dvb.c + create mode 100644 drivers/media/video/saa7164/saa7164-fw.c + create mode 100644 drivers/media/video/saa7164/saa7164-i2c.c + create mode 100644 drivers/media/video/saa7164/saa7164-reg.h + create mode 100644 drivers/media/video/saa7164/saa7164-types.h + create mode 100644 drivers/media/video/saa7164/saa7164.h + create mode 100644 drivers/mfd/ab3100-otp.c + create mode 100644 drivers/mfd/mc13783-core.c + create mode 100644 drivers/mfd/twl4030-power.c + create mode 100644 drivers/mfd/wm831x-core.c + create mode 100644 drivers/mfd/wm831x-irq.c + create mode 100644 drivers/mfd/wm831x-otp.c + create mode 100644 drivers/net/bcm63xx_enet.c + create mode 100644 drivers/net/bcm63xx_enet.h + create mode 100644 drivers/regulator/ab3100.c + create mode 100644 drivers/regulator/mc13783.c + create mode 100644 drivers/regulator/pcap-regulator.c + create mode 100644 drivers/regulator/wm831x-dcdc.c + create mode 100644 drivers/regulator/wm831x-isink.c + create mode 100644 drivers/regulator/wm831x-ldo.c + create mode 100644 drivers/rtc/rtc-ab3100.c + create mode 100644 drivers/rtc/rtc-wm831x.c + create mode 100644 drivers/staging/cx25821/Kconfig + create mode 100644 drivers/staging/cx25821/Makefile + create mode 100644 drivers/staging/cx25821/README + create mode 100644 drivers/staging/cx25821/cx25821-alsa.c + create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.c + create mode 100644 drivers/staging/cx25821/cx25821-audio-upstream.h + create mode 100644 drivers/staging/cx25821/cx25821-audio.h + create mode 100644 drivers/staging/cx25821/cx25821-audups11.c + create mode 100644 drivers/staging/cx25821/cx25821-biffuncs.h + create mode 100644 drivers/staging/cx25821/cx25821-cards.c + create mode 100644 drivers/staging/cx25821/cx25821-core.c + create mode 100644 drivers/staging/cx25821/cx25821-gpio.c + create mode 100644 drivers/staging/cx25821/cx25821-gpio.h + create mode 100644 drivers/staging/cx25821/cx25821-i2c.c + create mode 100644 drivers/staging/cx25821/cx25821-medusa-defines.h + create mode 100644 drivers/staging/cx25821/cx25821-medusa-reg.h + create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.c + create mode 100644 drivers/staging/cx25821/cx25821-medusa-video.h + create mode 100644 drivers/staging/cx25821/cx25821-reg.h + create mode 100644 drivers/staging/cx25821/cx25821-sram.h + create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.c + create mode 100644 drivers/staging/cx25821/cx25821-video-upstream-ch2.h + create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.c + create mode 100644 drivers/staging/cx25821/cx25821-video-upstream.h + create mode 100644 drivers/staging/cx25821/cx25821-video.c + create mode 100644 drivers/staging/cx25821/cx25821-video.h + create mode 100644 drivers/staging/cx25821/cx25821-video0.c + create mode 100644 drivers/staging/cx25821/cx25821-video1.c + create mode 100644 drivers/staging/cx25821/cx25821-video2.c + create mode 100644 drivers/staging/cx25821/cx25821-video3.c + create mode 100644 drivers/staging/cx25821/cx25821-video4.c + create mode 100644 drivers/staging/cx25821/cx25821-video5.c + create mode 100644 drivers/staging/cx25821/cx25821-video6.c + create mode 100644 drivers/staging/cx25821/cx25821-video7.c + create mode 100644 drivers/staging/cx25821/cx25821-videoioctl.c + create mode 100644 drivers/staging/cx25821/cx25821-vidups10.c + create mode 100644 drivers/staging/cx25821/cx25821-vidups9.c + create mode 100644 drivers/staging/cx25821/cx25821.h + create mode 100644 drivers/usb/gadget/r8a66597-udc.c + create mode 100644 drivers/usb/gadget/r8a66597-udc.h + delete mode 100644 drivers/video/console/.gitignore + delete mode 100644 drivers/video/console/prom.uni + delete mode 100644 drivers/video/console/promcon.c + create mode 100644 drivers/watchdog/nuc900_wdt.c + create mode 100644 drivers/watchdog/sbc_fitpc2_wdt.c + create mode 100644 drivers/watchdog/wm831x_wdt.c + create mode 100644 firmware/cis/MT5634ZLX.cis.ihex + create mode 100644 firmware/cis/PCMLM28.cis.ihex + create mode 100644 firmware/cis/RS-COM-2P.cis.ihex + create mode 100644 firmware/matrox/g200_warp.H16 + create mode 100644 firmware/matrox/g400_warp.H16 + create mode 100644 firmware/r128/r128_cce.bin.ihex + create mode 100644 firmware/radeon/R100_cp.bin.ihex + create mode 100644 firmware/radeon/R200_cp.bin.ihex + create mode 100644 firmware/radeon/R300_cp.bin.ihex + create mode 100644 firmware/radeon/R420_cp.bin.ihex + create mode 100644 firmware/radeon/R520_cp.bin.ihex + create mode 100644 firmware/radeon/R600_me.bin.ihex + create mode 100644 firmware/radeon/R600_pfp.bin.ihex + create mode 100644 firmware/radeon/RS600_cp.bin.ihex + create mode 100644 firmware/radeon/RS690_cp.bin.ihex + create mode 100644 firmware/radeon/RS780_me.bin.ihex + create mode 100644 firmware/radeon/RS780_pfp.bin.ihex + create mode 100644 firmware/radeon/RV610_me.bin.ihex + create mode 100644 firmware/radeon/RV610_pfp.bin.ihex + create mode 100644 firmware/radeon/RV620_me.bin.ihex + create mode 100644 firmware/radeon/RV620_pfp.bin.ihex + create mode 100644 firmware/radeon/RV630_me.bin.ihex + create mode 100644 firmware/radeon/RV630_pfp.bin.ihex + create mode 100644 firmware/radeon/RV635_me.bin.ihex + create mode 100644 firmware/radeon/RV635_pfp.bin.ihex + create mode 100644 firmware/radeon/RV670_me.bin.ihex + create mode 100644 firmware/radeon/RV670_pfp.bin.ihex + create mode 100644 firmware/radeon/RV710_me.bin.ihex + create mode 100644 firmware/radeon/RV710_pfp.bin.ihex + create mode 100644 firmware/radeon/RV730_me.bin.ihex + create mode 100644 firmware/radeon/RV730_pfp.bin.ihex + create mode 100644 firmware/radeon/RV770_me.bin.ihex + create mode 100644 firmware/radeon/RV770_pfp.bin.ihex + create mode 100644 include/drm/drm_cache.h + create mode 100644 include/drm/drm_encoder_slave.h + create mode 100644 include/drm/drm_fb_helper.h + create mode 100644 include/drm/drm_sysfs.h + create mode 100644 include/linux/ksm.h + delete mode 100644 include/linux/marker.h + create mode 100644 include/linux/mfd/mc13783-private.h + create mode 100644 include/linux/mfd/mc13783.h + create mode 100644 include/linux/mfd/wm831x/auxadc.h + create mode 100644 include/linux/mfd/wm831x/core.h + create mode 100644 include/linux/mfd/wm831x/gpio.h + create mode 100644 include/linux/mfd/wm831x/irq.h + create mode 100644 include/linux/mfd/wm831x/otp.h + create mode 100644 include/linux/mfd/wm831x/pdata.h + create mode 100644 include/linux/mfd/wm831x/regulator.h + create mode 100644 include/linux/mfd/wm831x/watchdog.h + create mode 100644 include/linux/mmu_context.h + create mode 100644 include/linux/perf_event.h + create mode 100644 include/linux/usb/m66592.h + create mode 100644 include/media/davinci/ccdc_types.h + create mode 100644 include/media/davinci/dm355_ccdc.h + create mode 100644 include/media/davinci/dm644x_ccdc.h + create mode 100644 include/media/davinci/vpfe_capture.h + create mode 100644 include/media/davinci/vpfe_types.h + create mode 100644 include/media/davinci/vpss.h + create mode 100644 include/trace/events/power.h + delete mode 100644 kernel/marker.c + delete mode 100644 kernel/perf_counter.c + create mode 100644 kernel/perf_event.c + create mode 100644 kernel/trace/power-traces.c + create mode 100644 kernel/trace/trace_entries.h + delete mode 100644 kernel/trace/trace_event_types.h + delete mode 100644 kernel/trace/trace_power.c + create mode 100644 mm/ksm.c + create mode 100644 mm/mmu_context.c + delete mode 100644 samples/markers/Makefile + delete mode 100644 samples/markers/marker-example.c + delete mode 100644 samples/markers/probe-example.c + delete mode 100644 scripts/tracing/power.pl + create mode 100644 tools/perf/Documentation/perf-sched.txt + create mode 100644 tools/perf/Documentation/perf-timechart.txt + create mode 100644 tools/perf/Documentation/perf-trace.txt + create mode 100644 tools/perf/builtin-sched.c + create mode 100644 tools/perf/builtin-timechart.c + create mode 100644 tools/perf/util/svghelper.c + create mode 100644 tools/perf/util/svghelper.h +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Recorded preimage for 'MAINTAINERS' +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/arm/mach-at91/board-neocore926.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 6b201f4] Merge remote branch 'arm-current/master' +$ git diff -M --stat --summary HEAD^.. + arch/arm/common/vic.c | 1 + + arch/arm/include/asm/atomic.h | 26 ++---- + arch/arm/include/asm/cache.h | 2 +- + arch/arm/include/asm/unified.h | 4 + + arch/arm/kernel/entry-armv.S | 19 +++-- + arch/arm/kernel/entry-header.S | 14 +++ + arch/arm/kernel/kprobes.c | 19 ++++- + arch/arm/lib/copy_page.S | 16 ++-- + arch/arm/mach-at91/at91cap9_devices.c | 10 +- + arch/arm/mach-at91/board-cap9adk.c | 2 +- + arch/arm/mach-at91/board-neocore926.c | 2 +- + arch/arm/mach-pxa/spitz.c | 1 + + arch/arm/mach-s3c2410/Kconfig | 5 + + arch/arm/mach-s3c2412/Kconfig | 3 + + arch/arm/mach-s3c2440/Kconfig | 6 ++ + arch/arm/mach-s3c6400/Kconfig | 1 + + arch/arm/mach-s3c6410/Kconfig | 1 + + arch/arm/mach-sa1100/dma.c | 2 +- + arch/arm/mm/Kconfig | 5 + + arch/arm/mm/fault.c | 110 ++++++++++++++----------- + arch/arm/plat-s3c/gpio.c | 2 +- + arch/arm/plat-s3c64xx/dma.c | 6 +- + arch/arm/plat-s3c64xx/include/plat/dma-plat.h | 2 +- + arch/arm/plat-s3c64xx/include/plat/irqs.h | 10 ++- + arch/arm/plat-s3c64xx/s3c6400-clock.c | 8 +- + arch/arm/plat-stmp3xxx/dma.c | 2 +- + arch/arm/tools/mach-types | 20 ++++- + 27 files changed, 191 insertions(+), 108 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +Recorded preimage for 'drivers/staging/Kconfig' +Recorded preimage for 'drivers/staging/Makefile' +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/cpc-usb/Kconfig +Removing drivers/staging/cpc-usb/Makefile +CONFLICT (delete/modify): drivers/staging/cpc-usb/TODO deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/TODO left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc-usb_drv.c deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc-usb_drv.c left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc.h left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpc_int.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpc_int.h left in tree. +CONFLICT (delete/modify): drivers/staging/cpc-usb/cpcusb.h deleted in net-current/master and modified in HEAD. Version HEAD of drivers/staging/cpc-usb/cpcusb.h left in tree. +Removing drivers/staging/cpc-usb/sja2m16c.h +Removing drivers/staging/cpc-usb/sja2m16c_2.c +Auto-merging kernel/sys_ni.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/cpc-usb/TODO drivers/staging/cpc-usb/cpc-usb_drv.c drivers/staging/cpc-usb/cpc.h drivers/staging/cpc-usb/cpc_int.h drivers/staging/cpc-usb/cpcusb.h +drivers/staging/Kconfig: needs merge +drivers/staging/Makefile: needs merge +drivers/staging/cpc-usb/TODO: needs merge +drivers/staging/cpc-usb/cpc-usb_drv.c: needs merge +drivers/staging/cpc-usb/cpc.h: needs merge +drivers/staging/cpc-usb/cpc_int.h: needs merge +drivers/staging/cpc-usb/cpcusb.h: needs merge +rm 'drivers/staging/cpc-usb/TODO' +rm 'drivers/staging/cpc-usb/cpc-usb_drv.c' +rm 'drivers/staging/cpc-usb/cpc.h' +rm 'drivers/staging/cpc-usb/cpc_int.h' +rm 'drivers/staging/cpc-usb/cpcusb.h' +$ git commit -v -a +Recorded resolution for 'drivers/staging/Kconfig'. +Recorded resolution for 'drivers/staging/Makefile'. +[master bd0fc22] Merge remote branch 'net-current/master' +$ git diff -M --stat --summary HEAD^.. + drivers/net/can/Kconfig | 7 + + drivers/net/can/Makefile | 2 + + drivers/net/can/usb/Makefile | 5 + + drivers/net/can/usb/ems_usb.c | 1155 ++++++++++++++++++++++++++++++++ + drivers/net/cpmac.c | 8 +- + drivers/net/igb/e1000_mac.c | 72 +- + drivers/net/igb/e1000_mac.h | 1 - + drivers/net/ixgbe/ixgbe.h | 6 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 75 ++- + drivers/net/ixgbe/ixgbe_main.c | 111 ++-- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/cpc-usb/Kconfig | 4 - + drivers/staging/cpc-usb/Makefile | 3 - + drivers/staging/cpc-usb/TODO | 10 - + drivers/staging/cpc-usb/cpc-usb_drv.c | 1184 --------------------------------- + drivers/staging/cpc-usb/cpc.h | 417 ------------ + drivers/staging/cpc-usb/cpc_int.h | 83 --- + drivers/staging/cpc-usb/cpcusb.h | 86 --- + drivers/staging/cpc-usb/sja2m16c.h | 41 -- + drivers/staging/cpc-usb/sja2m16c_2.c | 452 ------------- + kernel/sys_ni.c | 1 + + 22 files changed, 1342 insertions(+), 2384 deletions(-) + create mode 100644 drivers/net/can/usb/Makefile + create mode 100644 drivers/net/can/usb/ems_usb.c + delete mode 100644 drivers/staging/cpc-usb/Kconfig + delete mode 100644 drivers/staging/cpc-usb/Makefile + delete mode 100644 drivers/staging/cpc-usb/TODO + delete mode 100644 drivers/staging/cpc-usb/cpc-usb_drv.c + delete mode 100644 drivers/staging/cpc-usb/cpc.h + delete mode 100644 drivers/staging/cpc-usb/cpc_int.h + delete mode 100644 drivers/staging/cpc-usb/cpcusb.h + delete mode 100644 drivers/staging/cpc-usb/sja2m16c.h + delete mode 100644 drivers/staging/cpc-usb/sja2m16c_2.c +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 +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Auto-merging drivers/serial/bfin_5xx.c +Merge made by recursive. +Merging quilt/usb.current +$ git merge quilt/usb.current +Auto-merging drivers/usb/class/cdc-acm.c +Auto-merging drivers/usb/class/cdc-wdm.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/option.c +Auto-merging drivers/usb/serial/pl2303.c +Merge made by recursive. + drivers/usb/class/cdc-acm.c | 2 + + drivers/usb/class/cdc-wdm.c | 30 +++- + drivers/usb/core/config.c | 2 +- + drivers/usb/host/sl811-hcd.c | 8 +- + drivers/usb/host/xhci-dbg.c | 5 +- + drivers/usb/host/xhci-hcd.c | 370 ++++++++++++++++++++++++++++++++-------- + drivers/usb/host/xhci-mem.c | 64 +++++++- + drivers/usb/host/xhci-pci.c | 13 ++ + drivers/usb/host/xhci-ring.c | 232 ++++++++++++++++++++++--- + drivers/usb/host/xhci.h | 41 ++++- + drivers/usb/serial/ftdi_sio.c | 7 + + drivers/usb/serial/ftdi_sio.h | 10 + + drivers/usb/serial/option.c | 4 + + drivers/usb/serial/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 + + drivers/usb/storage/onetouch.c | 2 +- + 16 files changed, 679 insertions(+), 116 deletions(-) +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Auto-merging drivers/input/input.c +Auto-merging drivers/input/keyboard/atkbd.c +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/touchscreen/Makefile +Merge made by recursive. + drivers/input/input.c | 64 +++++- + drivers/input/keyboard/Kconfig | 40 +++ + drivers/input/keyboard/Makefile | 4 + + drivers/input/keyboard/adp5588-keys.c | 361 ++++++++++++++++++++++++++++ + drivers/input/keyboard/atkbd.c | 25 -- + drivers/input/keyboard/max7359_keypad.c | 330 +++++++++++++++++++++++++ + drivers/input/keyboard/opencores-kbd.c | 180 ++++++++++++++ + drivers/input/keyboard/qt2160.c | 399 +++++++++++++++++++++++++++++++ + drivers/input/misc/dm355evm_keys.c | 26 +-- + drivers/input/mouse/sentelic.c | 18 +- + drivers/input/mouse/synaptics_i2c.c | 51 +++-- + drivers/input/serio/i8042.c | 41 ++++ + drivers/input/serio/libps2.c | 28 ++- + drivers/input/touchscreen/Kconfig | 17 +- + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/ad7879.c | 6 +- + drivers/input/touchscreen/mcs5000_ts.c | 318 ++++++++++++++++++++++++ + drivers/leds/leds-clevo-mail.c | 8 + + drivers/platform/x86/acer-wmi.c | 2 + + include/linux/i2c/adp5588.h | 92 +++++++ + include/linux/i2c/mcs5000_ts.h | 24 ++ + include/linux/i8042.h | 30 +++ + include/linux/input.h | 2 +- + include/linux/libps2.h | 2 + + 24 files changed, 1989 insertions(+), 80 deletions(-) + create mode 100644 drivers/input/keyboard/adp5588-keys.c + create mode 100644 drivers/input/keyboard/max7359_keypad.c + create mode 100644 drivers/input/keyboard/opencores-kbd.c + create mode 100644 drivers/input/keyboard/qt2160.c + create mode 100644 drivers/input/touchscreen/mcs5000_ts.c + create mode 100644 include/linux/i2c/adp5588.h + create mode 100644 include/linux/i2c/mcs5000_ts.h +Merging md-current/for-linus +$ git merge md-current/for-linus +Auto-merging arch/sh/drivers/dma/Kconfig +Auto-merging arch/sh/include/asm/dma-sh.h +Auto-merging drivers/dma/at_hdmac.c +Auto-merging drivers/dma/dw_dmac.c +Removing drivers/dma/ioat.c +Removing drivers/dma/ioat_dma.c +Removing drivers/dma/ioatdma.h +Removing drivers/dma/ioatdma_hw.h +Auto-merging drivers/dma/txx9dmac.c +Auto-merging drivers/md/md.c +Auto-merging drivers/md/raid0.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid5.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/crypto/async-tx-api.txt | 75 +- + arch/arm/include/asm/hardware/iop3xx-adma.h | 81 +- + arch/arm/include/asm/hardware/iop_adma.h | 3 + + arch/arm/mach-iop13xx/include/mach/adma.h | 119 ++- + arch/arm/mach-iop13xx/setup.c | 17 +- + arch/arm/plat-iop/adma.c | 4 +- + arch/powerpc/include/asm/fsldma.h | 136 ++ + arch/sh/drivers/dma/Kconfig | 12 +- + arch/sh/drivers/dma/Makefile | 3 +- + arch/sh/include/asm/dma-sh.h | 13 + + crypto/async_tx/Kconfig | 9 + + crypto/async_tx/Makefile | 3 + + crypto/async_tx/async_memcpy.c | 44 +- + crypto/async_tx/async_memset.c | 43 +- + crypto/async_tx/async_pq.c | 395 +++++ + crypto/async_tx/async_raid6_recov.c | 455 +++++ + crypto/async_tx/async_tx.c | 87 +- + crypto/async_tx/async_xor.c | 207 ++-- + crypto/async_tx/raid6test.c | 240 +++ + drivers/dca/dca-core.c | 124 ++- + drivers/dma/Kconfig | 14 +- + drivers/dma/Makefile | 4 +- + drivers/dma/at_hdmac.c | 60 +- + drivers/dma/at_hdmac_regs.h | 1 + + drivers/dma/dmaengine.c | 94 +- + drivers/dma/dmatest.c | 40 + + drivers/dma/dw_dmac.c | 50 +- + drivers/dma/dw_dmac_regs.h | 1 + + drivers/dma/fsldma.c | 288 +++- + drivers/dma/fsldma.h | 4 +- + drivers/dma/ioat.c | 202 --- + drivers/dma/ioat/Makefile | 2 + + drivers/dma/{ioat_dca.c => ioat/dca.c} | 13 +- + drivers/dma/ioat/dma.c | 1238 ++++++++++++++ + drivers/dma/ioat/dma.h | 337 ++++ + drivers/dma/ioat/dma_v2.c | 870 ++++++++++ + drivers/dma/ioat/dma_v2.h | 190 +++ + drivers/dma/ioat/dma_v3.c | 1220 ++++++++++++++ + drivers/dma/ioat/hw.h | 215 +++ + drivers/dma/ioat/pci.c | 210 +++ + .../dma/{ioatdma_registers.h => ioat/registers.h} | 54 +- + drivers/dma/ioat_dma.c | 1741 -------------------- + drivers/dma/ioatdma.h | 165 -- + drivers/dma/ioatdma_hw.h | 70 - + drivers/dma/iop-adma.c | 491 +++++- + drivers/dma/iovlock.c | 10 + + drivers/dma/mv_xor.c | 7 +- + drivers/dma/mv_xor.h | 4 +- + drivers/dma/shdma.c | 786 +++++++++ + drivers/dma/shdma.h | 64 + + drivers/dma/txx9dmac.c | 24 +- + drivers/dma/txx9dmac.h | 1 + + drivers/idle/i7300_idle.c | 20 +- + drivers/md/Kconfig | 26 + + drivers/md/bitmap.c | 5 +- + drivers/md/md.c | 10 +- + drivers/md/raid0.c | 5 +- + drivers/md/raid10.c | 2 +- + drivers/md/raid5.c | 1484 +++++++++++------- + drivers/md/raid5.h | 28 +- + drivers/mmc/host/atmel-mci.c | 9 +- + include/linux/async_tx.h | 129 ++- + include/linux/dca.h | 11 +- + include/linux/dmaengine.h | 179 ++- + include/linux/pci_ids.h | 10 + + 65 files changed, 9137 insertions(+), 3321 deletions(-) + create mode 100644 arch/powerpc/include/asm/fsldma.h + create mode 100644 crypto/async_tx/async_pq.c + create mode 100644 crypto/async_tx/async_raid6_recov.c + create mode 100644 crypto/async_tx/raid6test.c + delete mode 100644 drivers/dma/ioat.c + create mode 100644 drivers/dma/ioat/Makefile + rename drivers/dma/{ioat_dca.c => ioat/dca.c} (98%) + create mode 100644 drivers/dma/ioat/dma.c + create mode 100644 drivers/dma/ioat/dma.h + create mode 100644 drivers/dma/ioat/dma_v2.c + create mode 100644 drivers/dma/ioat/dma_v2.h + create mode 100644 drivers/dma/ioat/dma_v3.c + create mode 100644 drivers/dma/ioat/hw.h + create mode 100644 drivers/dma/ioat/pci.c + rename drivers/dma/{ioatdma_registers.h => ioat/registers.h} (84%) + delete mode 100644 drivers/dma/ioat_dma.c + delete mode 100644 drivers/dma/ioatdma.h + delete mode 100644 drivers/dma/ioatdma_hw.h + create mode 100644 drivers/dma/shdma.c + create mode 100644 drivers/dma/shdma.h +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-sha.c | 14 ++++++++++++-- + 1 files changed, 12 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 MAINTAINERS +Removing arch/arm/configs/littleton_defconfig +Removing arch/arm/configs/zylonite_defconfig +Auto-merging arch/arm/kernel/vmlinux.lds.S +Auto-merging arch/arm/mach-at91/board-sam9rlek.c +Auto-merging arch/arm/mach-pxa/spitz.c +Auto-merging arch/arm/mm/init.c +Auto-merging drivers/rtc/rtc-sa1100.c +Auto-merging drivers/serial/pxa.c +Merge made by recursive. + Documentation/arm/tcm.txt | 145 +++ + MAINTAINERS | 8 +- + arch/arm/Kconfig | 5 + + arch/arm/common/locomo.c | 17 +- + arch/arm/configs/littleton_defconfig | 783 ------------ + arch/arm/configs/pxa3xx_defconfig | 1332 ++++++++++++++++++++ + arch/arm/configs/xcep_defconfig | 1129 +++++++++++++++++ + arch/arm/configs/zylonite_defconfig | 736 ----------- + arch/arm/include/asm/cputype.h | 10 +- + arch/arm/include/asm/tcm.h | 31 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/setup.c | 2 + + arch/arm/kernel/tcm.c | 246 ++++ + arch/arm/kernel/tcm.h | 17 + + arch/arm/kernel/vmlinux.lds.S | 57 + + arch/arm/mach-at91/at91sam9g45_devices.c | 104 ++ + arch/arm/mach-at91/at91sam9rl_devices.c | 102 ++ + arch/arm/mach-at91/board-sam9m10g45ek.c | 10 + + arch/arm/mach-at91/board-sam9rlek.c | 10 + + arch/arm/mach-integrator/integrator_cp.c | 4 +- + arch/arm/mach-pxa/Kconfig | 36 + + arch/arm/mach-pxa/Makefile | 4 + + arch/arm/mach-pxa/balloon3.c | 361 ++++++ + arch/arm/mach-pxa/clock.h | 1 - + arch/arm/mach-pxa/cm-x270.c | 146 ++- + arch/arm/mach-pxa/cm-x300.c | 71 +- + arch/arm/mach-pxa/colibri-pxa300.c | 1 + + arch/arm/mach-pxa/colibri-pxa320.c | 33 + + arch/arm/mach-pxa/colibri-pxa3xx.c | 52 +- + arch/arm/mach-pxa/corgi.c | 233 ++-- + arch/arm/mach-pxa/csb726.c | 54 +- + arch/arm/mach-pxa/devices.c | 27 + + arch/arm/mach-pxa/devices.h | 2 + + arch/arm/mach-pxa/e740.c | 1 - + arch/arm/mach-pxa/e750.c | 1 - + arch/arm/mach-pxa/em-x270.c | 45 +- + arch/arm/mach-pxa/eseries.c | 39 +- + arch/arm/mach-pxa/gumstix.c | 5 +- + arch/arm/mach-pxa/hx4700.c | 65 +- + arch/arm/mach-pxa/idp.c | 5 +- + arch/arm/mach-pxa/imote2.c | 3 + + arch/arm/mach-pxa/include/mach/balloon3.h | 134 ++ + arch/arm/mach-pxa/include/mach/colibri.h | 6 + + arch/arm/mach-pxa/include/mach/entry-macro.S | 25 +- + arch/arm/mach-pxa/include/mach/hardware.h | 17 + + arch/arm/mach-pxa/include/mach/irda.h | 2 + + arch/arm/mach-pxa/include/mach/irqs.h | 42 +- + arch/arm/mach-pxa/include/mach/mfp.h | 301 +----- + arch/arm/mach-pxa/include/mach/mmc.h | 5 + + arch/arm/mach-pxa/include/mach/palmtc.h | 86 ++ + arch/arm/mach-pxa/include/mach/palmtx.h | 5 + + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 4 +- + arch/arm/mach-pxa/include/mach/pxafb.h | 3 +- + arch/arm/mach-pxa/include/mach/regs-intc.h | 11 + + arch/arm/mach-pxa/include/mach/uncompress.h | 2 +- + arch/arm/mach-pxa/irq.c | 8 +- + arch/arm/mach-pxa/littleton.c | 43 +- + arch/arm/mach-pxa/lubbock.c | 18 +- + arch/arm/mach-pxa/magician.c | 59 +- + arch/arm/mach-pxa/mainstone.c | 16 +- + arch/arm/mach-pxa/mioa701.c | 84 +- + arch/arm/mach-pxa/palmld.c | 143 +-- + arch/arm/mach-pxa/palmt5.c | 111 +-- + arch/arm/mach-pxa/palmtc.c | 436 +++++++ + arch/arm/mach-pxa/palmte2.c | 110 +-- + arch/arm/mach-pxa/palmtx.c | 225 ++-- + arch/arm/mach-pxa/palmz72.c | 116 +-- + arch/arm/mach-pxa/pcm990-baseboard.c | 67 +- + arch/arm/mach-pxa/poodle.c | 80 +- + arch/arm/mach-pxa/pxa2xx.c | 1 + + arch/arm/mach-pxa/pxa300.c | 2 + + arch/arm/mach-pxa/pxa320.c | 2 + + arch/arm/mach-pxa/pxa930.c | 19 +- + arch/arm/mach-pxa/spitz.c | 237 ++-- + arch/arm/mach-pxa/tosa.c | 91 +-- + arch/arm/mach-pxa/treo680.c | 159 +-- + arch/arm/mach-pxa/trizeps4.c | 4 + + arch/arm/mach-pxa/xcep.c | 187 +++ + arch/arm/mach-pxa/zylonite.c | 3 + + arch/arm/mach-realview/core.c | 24 +- + arch/arm/mach-realview/core.h | 4 +- + arch/arm/mach-realview/realview_eb.c | 40 +- + arch/arm/mach-realview/realview_pb1176.c | 40 +- + arch/arm/mach-realview/realview_pb11mp.c | 40 +- + arch/arm/mach-realview/realview_pba8.c | 40 +- + arch/arm/mach-realview/realview_pbx.c | 40 +- + arch/arm/mach-u300/Kconfig | 12 + + arch/arm/mach-u300/Makefile | 3 + + arch/arm/mach-u300/core.c | 14 +- + arch/arm/mach-u300/dummyspichip.c | 290 +++++ + arch/arm/mach-u300/gpio.c | 13 - + arch/arm/mach-u300/i2c.c | 43 + + arch/arm/mach-u300/i2c.h | 23 + + arch/arm/mach-u300/include/mach/memory.h | 8 + + arch/arm/mach-u300/include/mach/syscon.h | 120 ++- + arch/arm/mach-u300/mmc.c | 22 +- + arch/arm/mach-u300/padmux.c | 395 ++++++- + arch/arm/mach-u300/padmux.h | 28 +- + arch/arm/mach-u300/spi.c | 124 ++ + arch/arm/mach-u300/spi.h | 26 + + arch/arm/mach-u300/timer.c | 15 + + arch/arm/mach-versatile/core.c | 4 +- + arch/arm/mach-versatile/versatile_pb.c | 4 +- + arch/arm/mm/init.c | 8 + + arch/arm/plat-pxa/dma.c | 281 ++++- + arch/arm/plat-pxa/include/plat/mfp.h | 73 +- + arch/arm/plat-pxa/mfp.c | 3 + + drivers/i2c/busses/Kconfig | 4 +- + drivers/mmc/host/mmci.c | 109 ++- + drivers/mmc/host/mmci.h | 3 +- + drivers/mmc/host/pxamci.c | 104 ++- + drivers/net/irda/pxaficp_ir.c | 47 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/pxa2xx_base.c | 18 +- + drivers/pcmcia/pxa2xx_palmtc.c | 230 ++++ + drivers/rtc/rtc-pxa.c | 27 +- + drivers/rtc/rtc-sa1100.c | 23 +- + drivers/serial/pxa.c | 20 +- + drivers/spi/amba-pl022.c | 8 +- + drivers/spi/pxa2xx_spi.c | 30 +- + drivers/usb/host/ohci-pxa27x.c | 30 +- + drivers/video/backlight/da903x_bl.c | 20 +- + drivers/video/pxafb.c | 32 +- + .../asm/mach/mmc.h => include/linux/amba/mmci.h | 9 +- + include/linux/amba/pl022.h | 8 +- + include/linux/fb.h | 1 + + sound/arm/pxa2xx-ac97.c | 20 +- + 127 files changed, 7642 insertions(+), 3637 deletions(-) + create mode 100644 Documentation/arm/tcm.txt + delete mode 100644 arch/arm/configs/littleton_defconfig + create mode 100644 arch/arm/configs/pxa3xx_defconfig + create mode 100644 arch/arm/configs/xcep_defconfig + delete mode 100644 arch/arm/configs/zylonite_defconfig + create mode 100644 arch/arm/include/asm/tcm.h + create mode 100644 arch/arm/kernel/tcm.c + create mode 100644 arch/arm/kernel/tcm.h + create mode 100644 arch/arm/mach-pxa/balloon3.c + create mode 100644 arch/arm/mach-pxa/include/mach/balloon3.h + create mode 100644 arch/arm/mach-pxa/include/mach/palmtc.h + create mode 100644 arch/arm/mach-pxa/palmtc.c + create mode 100644 arch/arm/mach-pxa/xcep.c + create mode 100644 arch/arm/mach-u300/dummyspichip.c + create mode 100644 arch/arm/mach-u300/i2c.c + create mode 100644 arch/arm/mach-u300/i2c.h + create mode 100644 arch/arm/mach-u300/spi.c + create mode 100644 arch/arm/mach-u300/spi.h + create mode 100644 drivers/pcmcia/pxa2xx_palmtc.c + rename arch/arm/include/asm/mach/mmc.h => include/linux/amba/mmci.h (63%) +Merging davinci/for-next +$ git merge davinci/for-next +Already up-to-date. +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging thumb-2/thumb-2 +$ git merge thumb-2/thumb-2 +Merge made by recursive. +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Merge made by recursive. + arch/avr32/boards/atngw100/mrmt.c | 1 + + arch/avr32/boards/atngw100/setup.c | 5 ---- + arch/avr32/mach-at32ap/at32ap700x.c | 35 ++++++++++++++------------ + arch/avr32/mach-at32ap/include/mach/board.h | 1 + + arch/avr32/mach-at32ap/include/mach/cpu.h | 2 + + 5 files changed, 23 insertions(+), 21 deletions(-) +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + arch/blackfin/Kconfig | 10 ++++--- + arch/blackfin/kernel/time.c | 63 +----------------------------------------- + 2 files changed, 8 insertions(+), 65 deletions(-) +Merging cris/for-next +$ git merge cris/for-next +Auto-merging drivers/net/cris/eth_v10.c +Merge made by recursive. + arch/cris/arch-v10/kernel/time.c | 1 - + arch/cris/arch-v32/kernel/smp.c | 2 -- + arch/cris/arch-v32/kernel/time.c | 1 - + arch/cris/arch-v32/mach-a3/io.c | 2 +- + arch/cris/arch-v32/mach-fs/io.c | 2 +- + arch/cris/include/arch-v10/arch/mmu.h | 9 +++++---- + arch/cris/include/arch-v32/arch/mmu.h | 10 ++++++---- + arch/cris/include/asm/hardirq.h | 12 ++---------- + arch/cris/include/asm/pgtable.h | 2 ++ + arch/cris/kernel/irq.c | 5 ----- + drivers/net/cris/eth_v10.c | 20 +++++++++++++++++--- + drivers/serial/crisv10.c | 1 + + 12 files changed, 35 insertions(+), 32 deletions(-) +Merging ia64/test +$ git merge ia64/test +Already up-to-date. +Merging m68k/for-next +$ git merge m68k/for-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by recursive. + 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/m68knommu/kernel/ptrace.c | 18 +++++++++++++++--- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging microblaze/next +$ git merge microblaze/next +Removing arch/microblaze/include/asm/ipc.h +Auto-merging arch/microblaze/mm/init.c +Merge made by recursive. + arch/microblaze/Kconfig | 1 + + arch/microblaze/Makefile | 31 ++++++-- + arch/microblaze/boot/Makefile | 41 ++++++++++- + arch/microblaze/boot/dts/system.dts | 1 + + arch/microblaze/boot/linked_dtb.S | 3 + + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/microblaze/configs/nommu_defconfig | 2 +- + arch/microblaze/include/asm/asm-compat.h | 17 ++++ + arch/microblaze/include/asm/io.h | 3 + + arch/microblaze/include/asm/ipc.h | 1 - + arch/microblaze/include/asm/page.h | 3 + + arch/microblaze/include/asm/setup.h | 2 +- + arch/microblaze/include/asm/syscall.h | 99 +++++++++++++++++++++++++ + arch/microblaze/kernel/cpu/cpuinfo.c | 3 + + arch/microblaze/kernel/entry.S | 72 +++++++++++++++--- + arch/microblaze/kernel/exceptions.c | 33 +++++--- + arch/microblaze/kernel/head.S | 14 +++- + arch/microblaze/kernel/hw_exception_handler.S | 10 ++- + arch/microblaze/kernel/process.c | 1 + + arch/microblaze/kernel/ptrace.c | 62 +++++++++++++++ + arch/microblaze/kernel/setup.c | 12 +++- + arch/microblaze/kernel/vmlinux.lds.S | 72 +++++++----------- + arch/microblaze/mm/init.c | 3 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/maps/Kconfig | 2 +- + drivers/usb/Kconfig | 1 - + kernel/gcov/Kconfig | 2 +- + 27 files changed, 404 insertions(+), 91 deletions(-) + create mode 120000 arch/microblaze/boot/dts/system.dts + create mode 100644 arch/microblaze/boot/linked_dtb.S + create mode 100644 arch/microblaze/include/asm/asm-compat.h + delete mode 100644 arch/microblaze/include/asm/ipc.h + create mode 100644 arch/microblaze/include/asm/syscall.h +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Recorded preimage for 'arch/mips/Kconfig' +Recorded preimage for 'arch/mips/bcm63xx/Makefile' +Recorded preimage for 'arch/mips/bcm63xx/boards/board_bcm963xx.c' +Renaming arch/mips/configs/fulong_defconfig->arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/configs/fuloong2e_defconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/bcm63xx/Makefile +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/Makefile +Auto-merging arch/mips/bcm63xx/boards/board_bcm963xx.c +CONFLICT (add/add): Merge conflict in arch/mips/bcm63xx/boards/board_bcm963xx.c +Auto-merging arch/mips/kernel/scall32-o32.S +Auto-merging arch/mips/kernel/scall64-64.S +CONFLICT (delete/modify): arch/mips/lemote/lm2e/Makefile deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/Makefile left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/pci.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/pci.c left in tree. +CONFLICT (delete/modify): arch/mips/lemote/lm2e/prom.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of arch/mips/lemote/lm2e/prom.c left in tree. +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/pci/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/mips/lemote/lm2e/Makefile arch/mips/lemote/lm2e/pci.c arch/mips/lemote/lm2e/prom.c +arch/mips/Kconfig: needs merge +arch/mips/bcm63xx/Makefile: needs merge +arch/mips/bcm63xx/boards/board_bcm963xx.c: needs merge +arch/mips/lemote/lm2e/Makefile: needs merge +arch/mips/lemote/lm2e/pci.c: needs merge +arch/mips/lemote/lm2e/prom.c: needs merge +rm 'arch/mips/lemote/lm2e/Makefile' +rm 'arch/mips/lemote/lm2e/pci.c' +rm 'arch/mips/lemote/lm2e/prom.c' +$ git checkout HEAD arch/mips/Kconfig arch/mips/bcm63xx/Makefile arch/mips/bcm63xx/boards/board_bcm963xx.c +$ git commit -v -a +Recorded resolution for 'arch/mips/Kconfig'. +Recorded resolution for 'arch/mips/bcm63xx/Makefile'. +Recorded resolution for 'arch/mips/bcm63xx/boards/board_bcm963xx.c'. +[master 595a8a7] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/mips/lemote/lm2e/early_printk.c | 41 ++++++++++++++++++++++++++++++++++ + 1 files changed, 41 insertions(+), 0 deletions(-) + create mode 100644 arch/mips/lemote/lm2e/early_printk.c +Merging parisc/next +$ git merge parisc/next +Resolved 'arch/parisc/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/parisc/kernel/entry.S' using previous resolution. +Resolved 'arch/parisc/kernel/signal.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/parisc/Kconfig +Auto-merging arch/parisc/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/parisc/include/asm/thread_info.h +Auto-merging arch/parisc/kernel/entry.S +CONFLICT (content): Merge conflict in arch/parisc/kernel/entry.S +Auto-merging arch/parisc/kernel/module.c +Auto-merging arch/parisc/kernel/signal.c +CONFLICT (content): Merge conflict in arch/parisc/kernel/signal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 95f119e] Merge remote branch 'parisc/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/elf.h | 1 + + arch/parisc/include/asm/hardirq.h | 20 +-- + arch/parisc/include/asm/ptrace.h | 38 +++- + arch/parisc/include/asm/syscall.h | 40 +++ + arch/parisc/include/asm/thread_info.h | 10 +- + arch/parisc/kernel/asm-offsets.c | 4 +- + arch/parisc/kernel/entry.S | 29 +- + arch/parisc/kernel/irq.c | 5 - + arch/parisc/kernel/module.c | 2 +- + arch/parisc/kernel/ptrace.c | 457 +++++++++++++++++++++++++++++++-- + arch/parisc/kernel/signal.c | 4 + + arch/parisc/kernel/syscall.S | 22 +- + 14 files changed, 560 insertions(+), 74 deletions(-) + create mode 100644 arch/parisc/include/asm/syscall.h +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Auto-merging drivers/s390/block/dasd_eckd.c +Merge made by recursive. + arch/s390/defconfig | 37 ++++-- + arch/s390/include/asm/lowcore.h | 9 ++ + arch/s390/include/asm/processor.h | 2 +- + arch/s390/kernel/asm-offsets.c | 7 +- + arch/s390/kernel/compat_linux.c | 83 ++---------- + arch/s390/kernel/compat_linux.h | 4 +- + arch/s390/kernel/compat_wrapper.S | 27 +++- + arch/s390/kernel/entry.h | 6 +- + arch/s390/kernel/process.c | 40 +++---- + arch/s390/kernel/ptrace.c | 19 +--- + arch/s390/kernel/sclp.S | 5 +- + arch/s390/kernel/smp.c | 50 +------- + arch/s390/kernel/suspend.c | 24 +--- + arch/s390/kernel/swsusp_asm64.S | 102 +++++++++++++-- + arch/s390/kernel/syscalls.S | 8 +- + arch/s390/mm/page-states.c | 52 +++++++-- + arch/s390/mm/pgtable.c | 17 +-- + drivers/s390/block/dasd_eckd.c | 13 +- + drivers/s390/cio/css.c | 252 +++++++++++++++++++------------------ + drivers/s390/cio/css.h | 3 + + drivers/s390/cio/device.c | 38 +++---- + drivers/s390/cio/device.h | 1 + + drivers/s390/cio/idset.c | 22 +++- + drivers/s390/cio/idset.h | 2 + + drivers/s390/cio/qdio_main.c | 32 ++--- + drivers/s390/crypto/ap_bus.c | 40 +++++-- + 26 files changed, 478 insertions(+), 417 deletions(-) +Merging sh/master +$ git merge sh/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +$ git am -3 ../patches/0001-kmemcheck-fix-build-warning.patch +Applying: kmemcheck: fix build warning +Merging cifs/master +$ git merge cifs/master +Merge made by recursive. + fs/cifs/cifsglob.h | 9 +++++---- + fs/cifs/cifsproto.h | 2 +- + fs/cifs/dir.c | 11 +++++------ + fs/cifs/file.c | 16 ++++++++++------ + fs/cifs/misc.c | 7 +++---- + 5 files changed, 24 insertions(+), 21 deletions(-) +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/mmap.c +Merge made by recursive. + fs/ecryptfs/Kconfig | 4 +++- + fs/ecryptfs/crypto.c | 39 ++++++++++++++++++++++----------------- + fs/ecryptfs/keystore.c | 39 ++++++++++++++++++++++++++------------- + fs/ecryptfs/kthread.c | 24 ++++++++---------------- + fs/ecryptfs/main.c | 3 +-- + fs/ecryptfs/mmap.c | 4 +++- + fs/ecryptfs/read_write.c | 32 ++++++++++++-------------------- + fs/ecryptfs/super.c | 2 -- + 8 files changed, 75 insertions(+), 72 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/super.c +Merge made by recursive. + Documentation/filesystems/ext3.txt | 16 ++++++++++++---- + fs/ext3/super.c | 13 ++++++++++++- + 2 files changed, 24 insertions(+), 5 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Merge made by recursive. +Merging fatfs/master +$ git merge fatfs/master +Auto-merging fs/fat/misc.c +Merge made by recursive. + Documentation/filesystems/vfat.txt | 2 +- + fs/fat/fat.h | 2 +- + fs/fat/inode.c | 18 +++++++++++------- + fs/fat/misc.c | 8 +++++--- + fs/fat/namei_vfat.c | 15 ++++----------- + fs/nls/nls_base.c | 8 ++++---- + 6 files changed, 26 insertions(+), 27 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Merge made by recursive. + fs/gfs2/glock.c | 10 ++++++++-- + fs/gfs2/incore.h | 4 ---- + fs/gfs2/ops_fstype.c | 3 +-- + fs/gfs2/recovery.c | 4 +--- + fs/gfs2/sys.c | 24 ------------------------ + 5 files changed, 10 insertions(+), 35 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Recorded preimage for 'fs/nilfs2/super.c' +Auto-merging fs/Kconfig +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/nilfs2/mdt.c +Auto-merging fs/nilfs2/super.c +CONFLICT (content): Merge conflict in fs/nilfs2/super.c +Auto-merging fs/nilfs2/the_nilfs.c +Automatic merge failed; fix conflicts and then commit the result. +$ git checkout HEAD fs/nilfs2/super.c +$ git commit -v -a +Recorded resolution for 'fs/nilfs2/super.c'. +[master c05af87] Merge remote branch 'nilfs2/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Recorded preimage for 'arch/x86/ia32/ia32entry.S' +Recorded preimage for 'arch/x86/include/asm/unistd_32.h' +Recorded preimage for 'arch/x86/include/asm/unistd_64.h' +Recorded preimage for 'arch/x86/kernel/syscall_table_32.S' +Auto-merging arch/x86/ia32/ia32entry.S +CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S +Auto-merging arch/x86/include/asm/unistd_32.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h +Auto-merging arch/x86/include/asm/unistd_64.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h +Auto-merging arch/x86/kernel/syscall_table_32.S +CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S +Auto-merging fs/namei.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/ioctl.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/super.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging security/capability.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/ia32/ia32entry.S'. +Recorded resolution for 'arch/x86/include/asm/unistd_32.h'. +Recorded resolution for 'arch/x86/include/asm/unistd_64.h'. +Recorded resolution for 'arch/x86/kernel/syscall_table_32.S'. +[master 291ecf9] Merge remote branch 'ocfs2/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/reflink.txt | 174 ++ + Documentation/filesystems/vfs.txt | 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 + + fs/namei.c | 137 ++ + fs/ocfs2/Makefile | 1 + + fs/ocfs2/alloc.c | 1342 ++++++----- + fs/ocfs2/alloc.h | 101 +- + fs/ocfs2/aops.c | 37 +- + fs/ocfs2/aops.h | 2 + + fs/ocfs2/buffer_head_io.c | 47 +- + fs/ocfs2/buffer_head_io.h | 8 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 1 + + fs/ocfs2/dir.c | 107 +- + fs/ocfs2/dlm/dlmthread.c | 6 +- + fs/ocfs2/dlmglue.c | 105 +- + fs/ocfs2/dlmglue.h | 6 + + fs/ocfs2/extent_map.c | 33 +- + fs/ocfs2/extent_map.h | 8 +- + fs/ocfs2/file.c | 151 ++- + fs/ocfs2/file.h | 2 + + fs/ocfs2/inode.c | 86 +- + fs/ocfs2/inode.h | 20 +- + fs/ocfs2/ioctl.c | 14 + + fs/ocfs2/journal.c | 82 +- + fs/ocfs2/journal.h | 94 +- + fs/ocfs2/localalloc.c | 12 +- + fs/ocfs2/namei.c | 343 +++- + fs/ocfs2/namei.h | 6 + + fs/ocfs2/ocfs2.h | 52 +- + fs/ocfs2/ocfs2_fs.h | 107 +- + fs/ocfs2/ocfs2_lockid.h | 5 + + fs/ocfs2/quota_global.c | 5 +- + fs/ocfs2/quota_local.c | 26 +- + fs/ocfs2/refcounttree.c | 4249 +++++++++++++++++++++++++++++++++ + fs/ocfs2/refcounttree.h | 108 + + fs/ocfs2/resize.c | 16 +- + fs/ocfs2/slot_map.c | 10 +- + fs/ocfs2/suballoc.c | 35 +- + fs/ocfs2/super.c | 13 +- + fs/ocfs2/uptodate.c | 265 ++- + fs/ocfs2/uptodate.h | 51 +- + fs/ocfs2/xattr.c | 2056 +++++++++++++++-- + fs/ocfs2/xattr.h | 15 +- + include/linux/fcntl.h | 8 + + include/linux/fs.h | 2 + + include/linux/security.h | 23 + + include/linux/syscalls.h | 3 + + security/capability.c | 7 + + security/security.c | 8 + + 53 files changed, 8824 insertions(+), 1177 deletions(-) + create mode 100644 Documentation/filesystems/reflink.txt + create mode 100644 fs/ocfs2/refcounttree.c + create mode 100644 fs/ocfs2/refcounttree.h +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +Merging udf/for_next +$ git merge udf/for_next +Already up-to-date. +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + Documentation/filesystems/9p.txt | 40 ++-- + fs/9p/Kconfig | 9 + + fs/9p/Makefile | 3 +- + fs/9p/cache.c | 474 ++++++++++++++++++++++++++++++++++++++ + fs/9p/cache.h | 175 ++++++++++++++ + fs/9p/v9fs.c | 194 ++++++++++++++-- + fs/9p/v9fs.h | 13 +- + fs/9p/v9fs_vfs.h | 6 + + fs/9p/vfs_addr.c | 88 +++++++- + fs/9p/vfs_file.c | 25 ++- + fs/9p/vfs_inode.c | 60 +++++- + fs/9p/vfs_super.c | 16 +- + include/net/9p/9p.h | 3 + + 13 files changed, 1041 insertions(+), 65 deletions(-) + create mode 100644 fs/9p/cache.c + create mode 100644 fs/9p/cache.h +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging MAINTAINERS +Merge made by recursive. + MAINTAINERS | 18 +---- + arch/x86/include/asm/pci.h | 6 ++- + arch/x86/pci/common.c | 2 +- + drivers/pci/hotplug/pciehp.h | 107 ++++++++--------------------- + drivers/pci/hotplug/pciehp_acpi.c | 17 +++-- + drivers/pci/hotplug/pciehp_core.c | 136 +++++++++++++++++-------------------- + drivers/pci/hotplug/pciehp_ctrl.c | 109 ++++++++++++------------------ + drivers/pci/hotplug/pciehp_hpc.c | 109 +++++++++--------------------- + drivers/pci/hotplug/pciehp_pci.c | 23 +++--- + drivers/pci/pcie/aer/aerdrv.c | 2 + + drivers/pci/pcie/aspm.c | 3 - + include/linux/vgaarb.h | 3 +- + 12 files changed, 203 insertions(+), 332 deletions(-) +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Removing Documentation/i2c/busses/i2c-voodoo3 +Removing Documentation/i2c/chips/pca9539 +Removing Documentation/i2c/chips/pcf8574 +Removing Documentation/i2c/chips/pcf8575 +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/Kconfig +Removing drivers/i2c/busses/i2c-voodoo3.c +Removing drivers/i2c/chips/pca9539.c +Removing drivers/i2c/chips/pcf8574.c +Removing drivers/i2c/chips/pcf8575.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 9 - + Documentation/hwmon/ltc4215 | 7 +- + Documentation/hwmon/ltc4245 | 7 +- + Documentation/i2c/busses/i2c-piix4 | 2 + + Documentation/i2c/busses/i2c-voodoo3 | 62 --- + Documentation/i2c/chips/pca9539 | 58 --- + Documentation/i2c/chips/pcf8574 | 65 --- + Documentation/i2c/chips/pcf8575 | 69 ---- + Documentation/{i2c/chips => misc-devices}/eeprom | 0 + Documentation/{i2c/chips => misc-devices}/max6875 | 6 +- + Documentation/w1/masters/ds2482 | 6 +- + MAINTAINERS | 16 + + drivers/gpio/pcf857x.c | 1 + + drivers/hwmon/ltc4215.c | 47 +-- + drivers/hwmon/ltc4245.c | 131 +------ + drivers/i2c/Kconfig | 8 + + drivers/i2c/busses/Kconfig | 35 +- + drivers/i2c/busses/Makefile | 6 +- + drivers/i2c/busses/i2c-piix4.c | 9 +- + drivers/i2c/busses/i2c-pnx.c | 7 +- + drivers/i2c/busses/i2c-scmi.c | 430 +++++++++++++++++++++ + drivers/i2c/busses/i2c-taos-evm.c | 45 ++- + drivers/i2c/busses/i2c-voodoo3.c | 248 ------------ + drivers/i2c/busses/scx200_acb.c | 6 +- + drivers/i2c/chips/Kconfig | 48 --- + drivers/i2c/chips/Makefile | 3 - + drivers/i2c/chips/pca9539.c | 152 -------- + drivers/i2c/chips/pcf8574.c | 215 ---------- + drivers/i2c/chips/pcf8575.c | 198 ---------- + drivers/i2c/chips/tsl2550.c | 42 +-- + drivers/i2c/i2c-core.c | 177 ++++++--- + drivers/misc/eeprom/max6875.c | 29 +-- + drivers/net/sfc/sfe4001.c | 4 +- + drivers/w1/masters/ds2482.c | 35 +-- + include/linux/i2c-id.h | 11 - + include/linux/i2c.h | 5 +- + include/linux/pci_ids.h | 1 + + 37 files changed, 685 insertions(+), 1515 deletions(-) + delete mode 100644 Documentation/i2c/busses/i2c-voodoo3 + delete mode 100644 Documentation/i2c/chips/pca9539 + delete mode 100644 Documentation/i2c/chips/pcf8574 + delete mode 100644 Documentation/i2c/chips/pcf8575 + rename Documentation/{i2c/chips => misc-devices}/eeprom (100%) + rename Documentation/{i2c/chips => misc-devices}/max6875 (94%) + create mode 100644 drivers/i2c/busses/i2c-scmi.c + delete mode 100644 drivers/i2c/busses/i2c-voodoo3.c + delete mode 100644 drivers/i2c/chips/pca9539.c + delete mode 100644 drivers/i2c/chips/pcf8574.c + delete mode 100644 drivers/i2c/chips/pcf8575.c +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Recorded preimage for 'drivers/hwmon/coretemp.c' +Auto-merging Documentation/feature-removal-schedule.txt +Removing Documentation/hwmon/fscher +Auto-merging drivers/hwmon/coretemp.c +CONFLICT (content): Merge conflict in drivers/hwmon/coretemp.c +Removing drivers/hwmon/fscher.c +Removing drivers/hwmon/fscpos.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/hwmon/coretemp.c'. +[master 9ef81cb] Merge branch 'quilt/jdelvare-hwmon' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + Documentation/hwmon/coretemp | 2 +- + Documentation/hwmon/fscher | 169 ------- + drivers/hwmon/Kconfig | 34 +-- + drivers/hwmon/Makefile | 2 - + drivers/hwmon/adm1031.c | 40 ++ + drivers/hwmon/coretemp.c | 29 +- + drivers/hwmon/fscher.c | 680 ---------------------------- + drivers/hwmon/fscpos.c | 654 -------------------------- + 9 files changed, 63 insertions(+), 1555 deletions(-) + delete mode 100644 Documentation/hwmon/fscher + delete mode 100644 drivers/hwmon/fscher.c + delete mode 100644 drivers/hwmon/fscpos.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Merge made by recursive. + drivers/media/common/tuners/tuner-xc2028.c | 20 +- + drivers/media/common/tuners/tuner-xc2028.h | 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 | 1 + + 18 files changed, 5360 insertions(+), 3 deletions(-) + 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 quota/for_next +$ git merge quota/for_next +Already up-to-date. +Merging kbuild/master +$ git merge kbuild/master +Recorded preimage for 'scripts/basic/fixdep.c' +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/avr32/mm/init.c +Auto-merging arch/sparc/kernel/Makefile +Auto-merging init/Kconfig +Auto-merging scripts/basic/fixdep.c +CONFLICT (content): Merge conflict in scripts/basic/fixdep.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'scripts/basic/fixdep.c'. +[master 907d7d7] Merge remote branch 'kbuild/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/kbuild.txt | 16 +++++ + Documentation/kbuild/makefiles.txt | 20 ++++++- + Makefile | 62 ++++++++++++++++--- + arch/arm/Makefile | 6 +- + arch/arm/boot/install.sh | 4 +- + arch/arm/kernel/Makefile | 3 +- + arch/arm/kernel/init_task.c | 5 +- + arch/avr32/kernel/init_task.c | 5 +- + arch/avr32/mm/init.c | 4 +- + arch/blackfin/Makefile | 4 +- + arch/blackfin/boot/install.sh | 6 +- + arch/cris/Makefile | 2 - + arch/cris/kernel/Makefile | 1 + + arch/cris/kernel/process.c | 5 +- + arch/frv/kernel/init_task.c | 5 +- + arch/h8300/kernel/init_task.c | 5 +- + arch/ia64/install.sh | 4 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/init_task.c | 3 +- + arch/m32r/boot/compressed/install.sh | 4 +- + arch/m32r/kernel/init_task.c | 5 +- + arch/m68k/install.sh | 4 +- + arch/m68k/kernel/process.c | 6 +- + arch/m68knommu/kernel/init_task.c | 5 +- + arch/microblaze/kernel/init_task.c | 5 +- + arch/mips/Makefile | 27 +-------- + arch/mips/kernel/init_task.c | 5 +- + arch/mips/kernel/vmlinux.lds.S | 13 ++++- + arch/mn10300/kernel/init_task.c | 5 +- + arch/parisc/Makefile | 4 +- + arch/parisc/install.sh | 4 +- + arch/parisc/kernel/init_task.c | 4 +- + arch/powerpc/Makefile | 6 +- + arch/powerpc/boot/install.sh | 4 +- + arch/powerpc/kernel/init_task.c | 5 +- + arch/powerpc/kernel/machine_kexec_64.c | 5 +- + arch/powerpc/kernel/vdso.c | 3 +- + arch/powerpc/kernel/vdso32/Makefile | 2 +- + arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 3 +- + arch/powerpc/kernel/vdso64/Makefile | 2 +- + arch/powerpc/kernel/vdso64/vdso64_wrapper.S | 3 +- + arch/s390/boot/install.sh | 4 +- + arch/s390/kernel/init_task.c | 5 +- + arch/s390/kernel/vdso.c | 2 +- + arch/s390/kernel/vdso32/Makefile | 2 +- + arch/s390/kernel/vdso32/vdso32_wrapper.S | 3 +- + arch/s390/kernel/vdso64/Makefile | 2 +- + arch/s390/kernel/vdso64/vdso64_wrapper.S | 3 +- + arch/score/kernel/init_task.c | 5 +- + arch/sh/boot/compressed/install.sh | 4 +- + arch/sh/kernel/init_task.c | 5 +- + arch/sh/kernel/irq.c | 6 +- + arch/sh/kernel/vsyscall/Makefile | 2 +- + arch/sparc/Makefile | 4 - + arch/sparc/kernel/Makefile | 6 ++- + arch/sparc/kernel/init_task.c | 5 +- + arch/um/Makefile | 9 +-- + arch/um/kernel/Makefile | 3 + + arch/um/kernel/init_task.c | 5 +- + arch/um/kernel/vmlinux.lds.S | 3 + + arch/x86/Makefile | 4 +- + arch/x86/boot/install.sh | 4 +- + arch/x86/include/asm/cache.h | 4 +- + arch/x86/kernel/head_32.S | 4 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/init_task.c | 5 +- + arch/x86/vdso/Makefile | 2 +- + arch/xtensa/kernel/Makefile | 3 +- + arch/xtensa/kernel/head.S | 2 +- + arch/xtensa/kernel/init_task.c | 5 +- + include/linux/linkage.h | 2 + + init/Kconfig | 8 --- + lib/Kconfig.debug | 8 +++ + scripts/Kbuild.include | 16 ++++-- + scripts/Makefile.build | 6 +- + scripts/basic/docproc.c | 34 ++++++------ + scripts/basic/fixdep.c | 26 ++++---- + scripts/basic/hash.c | 4 +- + scripts/checkincludes.pl | 71 +++++++++++++++++++++-- + scripts/kconfig/conf.c | 24 ++++---- + scripts/kconfig/confdata.c | 2 +- + scripts/kconfig/expr.c | 6 +- + scripts/kconfig/gconf.c | 21 +------ + scripts/kconfig/gconf.glade | 4 +- + scripts/kconfig/kxgettext.c | 4 +- + scripts/kconfig/lkc_proto.h | 2 + + scripts/kconfig/mconf.c | 78 +------------------------ + scripts/kconfig/menu.c | 84 ++++++++++++++++++++++++++- + scripts/kconfig/qconf.cc | 10 +-- + scripts/kconfig/symbol.c | 6 +- + scripts/markup_oops.pl | 5 +- + scripts/tags.sh | 3 +- + usr/.gitignore | 2 + + usr/Makefile | 2 +- + 94 files changed, 473 insertions(+), 354 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Auto-merging include/linux/Kbuild +Merge made by recursive. + Documentation/Makefile | 3 +- + Documentation/ummunotify/Makefile | 7 + + Documentation/ummunotify/ummunotify.txt | 150 ++++++++ + Documentation/ummunotify/umn-test.c | 200 +++++++++++ + drivers/char/Kconfig | 12 + + drivers/char/Makefile | 1 + + drivers/char/ummunotify.c | 566 +++++++++++++++++++++++++++++++ + include/linux/Kbuild | 1 + + include/linux/ummunotify.h | 121 +++++++ + 9 files changed, 1060 insertions(+), 1 deletions(-) + create mode 100644 Documentation/ummunotify/Makefile + create mode 100644 Documentation/ummunotify/ummunotify.txt + create mode 100644 Documentation/ummunotify/umn-test.c + create mode 100644 drivers/char/ummunotify.c + create mode 100644 include/linux/ummunotify.h +Merging acpi/test +$ git merge acpi/test +Auto-merging MAINTAINERS +Auto-merging include/acpi/acpi_bus.h +Auto-merging include/acpi/actypes.h +Merge made by recursive. + Documentation/ABI/stable/sysfs-class-backlight | 36 + + Documentation/ABI/testing/sysfs-class-lcd | 23 + + Documentation/ABI/testing/sysfs-class-led | 28 + + .../ABI/testing/sysfs-platform-asus-laptop | 52 + + .../ABI/testing/sysfs-platform-eeepc-laptop | 50 + + Documentation/hwmon/acpi_power_meter | 51 + + Documentation/laptops/asus-laptop.txt | 258 +++++ + Documentation/laptops/thinkpad-acpi.txt | 8 +- + Documentation/leds-class.txt | 9 +- + MAINTAINERS | 5 + + arch/ia64/hp/common/sba_iommu.c | 7 +- + arch/x86/include/asm/acpi.h | 1 - + arch/x86/pci/mmconfig-shared.c | 2 + + drivers/acpi/Kconfig | 17 +- + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 2 + + drivers/acpi/acpi_memhotplug.c | 51 +- + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/acconfig.h | 10 +- + drivers/acpi/acpica/acdebug.h | 4 - + drivers/acpi/acpica/acglobal.h | 37 +- + drivers/acpi/acpica/achware.h | 8 + + drivers/acpi/acpica/acinterp.h | 4 +- + drivers/acpi/acpica/aclocal.h | 16 + + drivers/acpi/acpica/acmacros.h | 2 + + drivers/acpi/acpica/acnamesp.h | 25 + + drivers/acpi/acpica/acobject.h | 1 + + drivers/acpi/acpica/acparser.h | 2 + + drivers/acpi/acpica/acpredef.h | 584 +++++++----- + drivers/acpi/acpica/acutils.h | 30 +- + drivers/acpi/acpica/amlcode.h | 1 + + drivers/acpi/acpica/dsfield.c | 18 +- + drivers/acpi/acpica/dsmethod.c | 15 +- + drivers/acpi/acpica/dsmthdat.c | 8 +- + drivers/acpi/acpica/dsobject.c | 23 +- + drivers/acpi/acpica/dswload.c | 41 +- + drivers/acpi/acpica/evgpe.c | 8 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evrgnini.c | 45 +- + drivers/acpi/acpica/exconfig.c | 7 + + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfield.c | 82 ++- + drivers/acpi/acpica/exfldio.c | 7 +- + drivers/acpi/acpica/exutils.c | 53 +- + drivers/acpi/acpica/hwgpe.c | 34 +- + drivers/acpi/acpica/hwregs.c | 206 ++++- + drivers/acpi/acpica/hwtimer.c | 2 +- + drivers/acpi/acpica/hwxface.c | 195 +++-- + drivers/acpi/acpica/nsalloc.c | 88 ++- + drivers/acpi/acpica/nsdumpdv.c | 7 +- + drivers/acpi/acpica/nseval.c | 137 +++ + drivers/acpi/acpica/nsinit.c | 15 + + drivers/acpi/acpica/nsload.c | 3 +- + drivers/acpi/acpica/nspredef.c | 718 +++++++------- + drivers/acpi/acpica/nsrepair.c | 203 ++++ + drivers/acpi/acpica/nsutils.c | 5 +- + drivers/acpi/acpica/nsxfeval.c | 23 +- + drivers/acpi/acpica/nsxfname.c | 237 ++++-- + drivers/acpi/acpica/psloop.c | 119 +++- + drivers/acpi/acpica/psxface.c | 4 + + drivers/acpi/acpica/tbutils.c | 82 ++- + drivers/acpi/acpica/utdelete.c | 6 + + drivers/acpi/acpica/uteval.c | 378 +------- + drivers/acpi/acpica/utglobal.c | 12 +- + drivers/acpi/acpica/utids.c | 382 ++++++++ + drivers/acpi/acpica/utinit.c | 22 +- + drivers/acpi/acpica/utmisc.c | 85 ++- + drivers/acpi/acpica/utxface.c | 26 +- + drivers/acpi/battery.c | 22 + + drivers/acpi/blacklist.c | 2 + + drivers/acpi/bus.c | 3 +- + drivers/acpi/button.c | 2 + + drivers/acpi/cm_sbs.c | 2 + + drivers/acpi/container.c | 13 +- + drivers/acpi/debug.c | 82 +- + drivers/acpi/dock.c | 10 +- + drivers/acpi/ec.c | 270 ++---- + drivers/acpi/event.c | 2 + + drivers/acpi/fan.c | 2 + + drivers/acpi/glue.c | 10 +- + drivers/acpi/internal.h | 22 +- + drivers/acpi/numa.c | 2 + + drivers/acpi/osl.c | 126 ++- + drivers/acpi/pci_irq.c | 2 + + drivers/acpi/pci_link.c | 2 + + drivers/acpi/pci_root.c | 2 + + drivers/acpi/pci_slot.c | 5 +- + drivers/acpi/power.c | 3 +- + drivers/acpi/power_meter.c | 1018 ++++++++++++++++++++ + drivers/acpi/processor_core.c | 246 +++--- + drivers/acpi/processor_idle.c | 12 +- + drivers/acpi/processor_perflib.c | 2 + + drivers/acpi/processor_thermal.c | 5 +- + drivers/acpi/processor_throttling.c | 5 +- + drivers/acpi/sbs.c | 2 + + drivers/acpi/sbshc.c | 2 + + drivers/acpi/scan.c | 183 +++-- + drivers/acpi/sleep.c | 8 + + drivers/acpi/system.c | 2 + + drivers/acpi/tables.c | 6 + + drivers/acpi/thermal.c | 2 + + drivers/acpi/utils.c | 2 + + drivers/acpi/video.c | 80 +- + drivers/acpi/video_detect.c | 2 + + drivers/char/agp/hp-agp.c | 9 +- + drivers/ide/ide-acpi.c | 5 +- + drivers/pci/dmar.c | 4 +- + drivers/pci/hotplug/acpiphp_ibm.c | 12 +- + drivers/platform/x86/Kconfig | 10 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acerhdf.c | 121 ++- + drivers/platform/x86/asus-laptop.c | 227 ++++- + drivers/platform/x86/eeepc-laptop.c | 340 ++++--- + drivers/platform/x86/fujitsu-laptop.c | 109 +-- + drivers/platform/x86/hp-wmi.c | 2 +- + drivers/platform/x86/sony-laptop.c | 7 +- + drivers/platform/x86/thinkpad_acpi.c | 382 ++++++-- + drivers/platform/x86/topstar-laptop.c | 265 +++++ + drivers/platform/x86/wmi.c | 1 - + drivers/pnp/pnpacpi/core.c | 6 +- + drivers/thermal/Kconfig | 1 + + include/acpi/acpi_bus.h | 16 +- + include/acpi/acpiosxf.h | 3 + + include/acpi/acpixf.h | 10 +- + include/acpi/actbl.h | 78 +- + include/acpi/actbl1.h | 872 +++++------------- + include/acpi/actbl2.h | 868 +++++++++++++++++ + include/acpi/actypes.h | 92 +- + include/acpi/platform/aclinux.h | 4 +- + include/linux/acpi.h | 15 +- + 130 files changed, 7234 insertions(+), 3022 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-class-backlight + create mode 100644 Documentation/ABI/testing/sysfs-class-lcd + create mode 100644 Documentation/ABI/testing/sysfs-class-led + create mode 100644 Documentation/ABI/testing/sysfs-platform-asus-laptop + create mode 100644 Documentation/ABI/testing/sysfs-platform-eeepc-laptop + create mode 100644 Documentation/hwmon/acpi_power_meter + create mode 100644 Documentation/laptops/asus-laptop.txt + create mode 100644 drivers/acpi/acpica/nsrepair.c + create mode 100644 drivers/acpi/acpica/utids.c + create mode 100644 drivers/acpi/power_meter.c + create mode 100644 drivers/platform/x86/topstar-laptop.c + create mode 100644 include/acpi/actbl2.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Merge made by recursive. + drivers/firewire/core-card.c | 13 +++++-------- + drivers/firewire/core-transaction.c | 2 +- + drivers/firewire/core.h | 14 ++++++++++++++ + drivers/firewire/ohci.c | 4 ++-- + drivers/firewire/sbp2.c | 16 ++++++++-------- + drivers/ieee1394/raw1394.c | 4 +++- + drivers/ieee1394/sbp2.c | 3 +-- + include/linux/firewire.h | 14 -------------- + 8 files changed, 34 insertions(+), 36 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Already up-to-date. +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging include/linux/kvm_host.h +Merge made by recursive. + 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 | 11 +- + arch/powerpc/kvm/powerpc.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/x86/include/asm/kvm.h | 1 + + arch/x86/include/asm/kvm_host.h | 12 +- + 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 | 7 +- + arch/x86/kvm/mmu.c | 2 +- + arch/x86/kvm/svm.c | 105 +++--- + arch/x86/kvm/vmx.c | 153 ++++---- + arch/x86/kvm/x86.c | 64 ++-- + include/linux/kvm_host.h | 50 +++- + 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 | 214 ++++++---- + virt/kvm/kvm_main.c | 804 +------------------------------------- + 25 files changed, 1395 insertions(+), 1145 deletions(-) + 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 drivers/scsi/bnx2i/bnx2i_hwi.c +Merge made by recursive. + Documentation/scsi/hptiop.txt | 21 ++++++++++- + drivers/scsi/bnx2i/bnx2i.h | 2 + + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 2 - + drivers/scsi/hptiop.c | 37 ++++++++++++----- + drivers/scsi/hptiop.h | 3 +- + drivers/scsi/mvsas/mv_defs.h | 4 ++ + drivers/scsi/mvsas/mv_init.c | 4 ++ + drivers/scsi/pmcraid.c | 58 +++++++++++++++------------- + 9 files changed, 90 insertions(+), 43 deletions(-) +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + crypto/async_tx/async_raid6_recov.c | 13 +++++++++++++ + drivers/dma/ioat/dma_v2.c | 5 +++-- + drivers/dma/ioat/dma_v3.c | 15 +++++++++------ + 3 files changed, 25 insertions(+), 8 deletions(-) +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/Kconfig +Auto-merging drivers/mtd/devices/m25p80.c +Auto-merging drivers/mtd/devices/slram.c +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/nand/cafe_nand.c +Merge made by recursive. + Documentation/powerpc/dts-bindings/mtd-physmap.txt | 42 +- + arch/arm/configs/nhk8815_defconfig | 2 +- + arch/arm/mach-nomadik/board-nhk8815.c | 155 ++++++ + arch/arm/mach-nomadik/include/mach/fsmc.h | 29 ++ + arch/arm/mach-nomadik/include/mach/nand.h | 16 + + arch/arm/mach-omap2/board-apollon.c | 4 +- + arch/arm/mach-omap2/gpmc.c | 63 +++- + arch/arm/plat-omap/include/mach/gpmc.h | 4 + + drivers/Makefile | 4 +- + drivers/mtd/Kconfig | 16 +- + drivers/mtd/afs.c | 2 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 11 - + drivers/mtd/chips/cfi_util.c | 4 + + drivers/mtd/chips/jedec_probe.c | 22 +- + drivers/mtd/devices/Kconfig | 10 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/lart.c | 6 +- + drivers/mtd/devices/m25p80.c | 137 +++++- + drivers/mtd/devices/mtd_dataflash.c | 4 +- + drivers/mtd/devices/phram.c | 25 +- + drivers/mtd/devices/slram.c | 2 +- + drivers/mtd/devices/sst25l.c | 512 ++++++++++++++++++++ + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/maps/Kconfig | 12 +- + drivers/mtd/maps/Makefile | 3 +- + drivers/mtd/maps/gpio-addr-flash.c | 311 ++++++++++++ + drivers/mtd/maps/physmap_of.c | 24 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/maps/pmcmsp-flash.c | 76 +++- + drivers/mtd/maps/uclinux.c | 8 + + drivers/mtd/mtdblock.c | 2 +- + drivers/mtd/mtdconcat.c | 6 +- + drivers/mtd/mtdcore.c | 4 +- + drivers/mtd/mtdpart.c | 3 +- + drivers/mtd/nand/Kconfig | 30 ++ + drivers/mtd/nand/Makefile | 2 + + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 2 +- + drivers/mtd/nand/davinci_nand.c | 45 ++- + drivers/mtd/nand/fsl_elbc_nand.c | 3 +- + drivers/mtd/nand/mxc_nand.c | 16 +- + drivers/mtd/nand/nand_base.c | 167 +++++-- + drivers/mtd/nand/nand_ecc.c | 31 +- + drivers/mtd/nand/ndfc.c | 4 +- + drivers/mtd/nand/nomadik_nand.c | 250 ++++++++++ + drivers/mtd/nand/omap2.c | 347 +++++++++++++- + drivers/mtd/nand/orion_nand.c | 3 +- + drivers/mtd/nand/pxa3xx_nand.c | 17 +- + drivers/mtd/nand/sh_flctl.c | 5 +- + drivers/mtd/nand/tmio_nand.c | 17 +- + drivers/mtd/nand/txx9ndfmc.c | 52 ++- + drivers/mtd/nand/w90p910_nand.c | 382 +++++++++++++++ + drivers/mtd/ofpart.c | 21 +- + drivers/mtd/onenand/Kconfig | 3 +- + drivers/mtd/onenand/generic.c | 24 +- + drivers/mtd/onenand/onenand_base.c | 20 +- + drivers/mtd/tests/mtd_oobtest.c | 2 +- + drivers/mtd/tests/mtd_pagetest.c | 12 +- + fs/jffs2/background.c | 20 +- + fs/jffs2/malloc.c | 4 +- + include/linux/mtd/nand.h | 5 +- + include/linux/mtd/nand_ecc.h | 6 + + include/linux/mtd/onenand.h | 8 + + include/linux/mtd/onenand_regs.h | 3 + + 64 files changed, 2776 insertions(+), 251 deletions(-) + create mode 100644 arch/arm/mach-nomadik/include/mach/fsmc.h + create mode 100644 arch/arm/mach-nomadik/include/mach/nand.h + mode change 100644 => 100755 drivers/mtd/chips/cfi_util.c + create mode 100644 drivers/mtd/devices/sst25l.c + mode change 100644 => 100755 drivers/mtd/inftlcore.c + create mode 100644 drivers/mtd/maps/gpio-addr-flash.c + create mode 100644 drivers/mtd/nand/nomadik_nand.c + create mode 100644 drivers/mtd/nand/w90p910_nand.c +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + sound/core/pcm_native.c | 73 ++++++++-------------------- + sound/pci/lx6464es/lx6464es.h | 2 - + sound/pci/lx6464es/lx_core.c | 98 +------------------------------------ + sound/soc/blackfin/bf5xx-ac97.c | 8 +++ + sound/soc/blackfin/bf5xx-ac97.h | 2 +- + sound/soc/blackfin/bf5xx-i2s.c | 22 +++----- + sound/soc/blackfin/bf5xx-i2s.h | 2 +- + sound/soc/blackfin/bf5xx-sport.c | 2 +- + sound/soc/codecs/ad1836.c | 3 +- + sound/soc/codecs/ad1938.c | 2 +- + sound/soc/codecs/wm8753.c | 1 + + sound/soc/davinci/davinci-mcasp.c | 24 ++++++++- + 12 files changed, 66 insertions(+), 173 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging arch/m32r/kernel/smpboot.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging drivers/acpi/osl.c +Auto-merging drivers/acpi/processor_perflib.c +Auto-merging drivers/acpi/processor_throttling.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/lguest/page_tables.c +Auto-merging include/linux/module.h +Auto-merging include/linux/sched.h +Auto-merging init/main.c +Auto-merging kernel/module.c +Auto-merging kernel/trace/trace.c +Auto-merging virt/kvm/kvm_main.c +Merge made by recursive. + Documentation/lguest/lguest.c | 26 +- + arch/alpha/include/asm/smp.h | 2 +- + arch/alpha/include/asm/topology.h | 18 - + arch/alpha/kernel/smp.c | 14 +- + arch/arm/include/asm/cacheflush.h | 8 +- + arch/arm/include/asm/mmu_context.h | 7 +- + arch/arm/include/asm/smp.h | 1 - + arch/arm/include/asm/tlbflush.h | 4 +- + arch/arm/kernel/smp.c | 10 +- + arch/arm/mm/context.c | 2 +- + arch/arm/mm/flush.c | 10 +- + arch/ia64/include/asm/smp.h | 1 - + arch/ia64/include/asm/topology.h | 3 - + arch/ia64/kernel/smp.c | 2 +- + arch/m32r/include/asm/mmu_context.h | 4 +- + arch/m32r/include/asm/smp.h | 2 +- + arch/m32r/kernel/smp.c | 30 +- + arch/m32r/kernel/smpboot.c | 2 +- + arch/mips/alchemy/common/time.c | 2 +- + arch/mips/include/asm/mach-ip27/topology.h | 2 - + arch/mips/include/asm/mmu_context.h | 10 +- + arch/mips/include/asm/smp-ops.h | 2 +- + arch/mips/include/asm/smp.h | 2 +- + arch/mips/kernel/smp-cmp.c | 6 +- + arch/mips/kernel/smp-mt.c | 6 +- + arch/mips/kernel/smp-up.c | 3 +- + arch/mips/kernel/smp.c | 8 +- + arch/mips/kernel/smtc.c | 6 +- + arch/mips/mipssim/sim_smtc.c | 5 +- + arch/mips/mm/c-octeon.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 4 +- + arch/mips/pmc-sierra/yosemite/smp.c | 4 +- + arch/mips/sgi-ip27/ip27-memory.c | 2 +- + arch/mips/sgi-ip27/ip27-smp.c | 4 +- + arch/mips/sibyte/bcm1480/smp.c | 5 +- + arch/mips/sibyte/sb1250/smp.c | 5 +- + arch/mn10300/include/asm/mmu_context.h | 12 +- + arch/parisc/include/asm/smp.h | 1 - + arch/powerpc/include/asm/smp.h | 2 +- + arch/powerpc/include/asm/topology.h | 12 - + arch/powerpc/kernel/setup-common.c | 6 +- + arch/powerpc/kernel/smp.c | 12 +- + arch/powerpc/platforms/powermac/smp.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/topology.h | 1 - + arch/s390/kernel/smp.c | 4 +- + arch/sh/include/asm/smp.h | 1 - + arch/sh/include/asm/topology.h | 1 - + arch/sparc/include/asm/smp_64.h | 1 - + arch/sparc/include/asm/topology_64.h | 16 - + arch/um/include/asm/mmu_context.h | 4 +- + arch/um/kernel/smp.c | 2 +- + arch/x86/include/asm/mmu_context.h | 6 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/apic/io_apic.c | 7 +- + arch/x86/kernel/ldt.c | 4 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/kernel/time.c | 1 - + arch/x86/lguest/boot.c | 10 +- + arch/x86/mm/tlb.c | 15 +- + arch/x86/xen/mmu.c | 4 +- + drivers/acpi/osl.c | 2 +- + drivers/acpi/processor_perflib.c | 3 +- + drivers/acpi/processor_throttling.c | 3 +- + drivers/block/virtio_blk.c | 13 +- + drivers/char/hw_random/virtio-rng.c | 3 +- + drivers/char/virtio_console.c | 5 +- + drivers/lguest/core.c | 5 +- + drivers/lguest/page_tables.c | 45 +- + drivers/net/sfc/efx.c | 3 +- + drivers/net/virtio_net.c | 236 ++++------ + drivers/oprofile/buffer_sync.c | 3 +- + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_pci.c | 125 +++-- + drivers/virtio/virtio_ring.c | 6 +- + include/asm-generic/topology.h | 17 - + include/linux/cpumask.h | 709 +++++++++----------------- + include/linux/interrupt.h | 2 - + include/linux/module.h | 17 +- + include/linux/sched.h | 3 + + include/linux/smp.h | 11 - + include/linux/topology.h | 6 - + include/linux/virtio.h | 2 +- + include/linux/virtio_9p.h | 2 - + include/linux/virtio_balloon.h | 3 - + include/linux/virtio_blk.h | 3 - + include/linux/virtio_console.h | 3 - + include/linux/virtio_ids.h | 17 + + include/linux/virtio_net.h | 3 - + include/linux/virtio_rng.h | 3 - + init/main.c | 5 - + kernel/module.c | 145 +++++- + kernel/params.c | 7 +- + kernel/smp.c | 7 - + kernel/trace/trace.c | 7 +- + mm/quicklist.c | 3 +- + net/9p/trans_virtio.c | 5 +- + virt/kvm/kvm_main.c | 3 +- + 100 files changed, 806 insertions(+), 1008 deletions(-) + create mode 100644 include/linux/virtio_ids.h +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging input/next +$ git merge input/next +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/block/DAC960.c +Auto-merging drivers/block/cciss.c +Auto-merging drivers/block/cpqarray.c +Merge made by recursive. + .../ABI/testing/sysfs-bus-pci-devices-cciss | 28 + + .../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/blk-core.c | 1 + + block/blk-settings.c | 3 +- + drivers/block/DAC960.c | 156 +- + drivers/block/Kconfig | 2 + + drivers/block/Makefile | 1 + + drivers/block/cciss.c | 748 +++- + drivers/block/cciss.h | 12 +- + drivers/block/cpqarray.c | 63 +- + drivers/block/drbd/Kconfig | 82 + + drivers/block/drbd/Makefile | 8 + + drivers/block/drbd/drbd_actlog.c | 1484 +++++++ + drivers/block/drbd/drbd_bitmap.c | 1327 ++++++ + drivers/block/drbd/drbd_int.h | 2258 ++++++++++ + drivers/block/drbd/drbd_main.c | 3735 ++++++++++++++++ + drivers/block/drbd/drbd_nl.c | 2365 +++++++++++ + drivers/block/drbd/drbd_proc.c | 266 ++ + drivers/block/drbd/drbd_receiver.c | 4456 ++++++++++++++++++++ + drivers/block/drbd/drbd_req.c | 1132 +++++ + drivers/block/drbd/drbd_req.h | 327 ++ + drivers/block/drbd/drbd_strings.c | 113 + + drivers/block/drbd/drbd_tracing.c | 753 ++++ + drivers/block/drbd/drbd_tracing.h | 87 + + drivers/block/drbd/drbd_vli.h | 351 ++ + drivers/block/drbd/drbd_worker.c | 1529 +++++++ + drivers/block/drbd/drbd_wrappers.h | 91 + + include/linux/drbd.h | 349 ++ + include/linux/drbd_limits.h | 137 + + include/linux/drbd_nl.h | 137 + + include/linux/drbd_tag_magic.h | 83 + + include/linux/lru_cache.h | 294 ++ + include/trace/events/block.h | 33 + + kernel/trace/blktrace.c | 34 + + lib/Kconfig | 3 + + lib/Makefile | 2 + + lib/lru_cache.c | 560 +++ + 44 files changed, 23891 insertions(+), 328 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 + 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_tracing.c + create mode 100644 drivers/block/drbd/drbd_tracing.h + 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 +$ git revert -m 1 f1abb91a0888a7fe5bde6a1a4f8cd029eb1dba0b +Finished one revert. +[master 0bd997b] Revert "Merge branch 'drbd' of git://git.drbd.org/linux-2.6-drbd into for-linus" + 35 files changed, 0 insertions(+), 23141 deletions(-) + delete mode 100644 Documentation/blockdev/drbd/DRBD-8.3-data-packets.svg + delete mode 100644 Documentation/blockdev/drbd/DRBD-data-packets.svg + delete mode 100644 Documentation/blockdev/drbd/README.txt + delete mode 100644 Documentation/blockdev/drbd/conn-states-8.dot + delete mode 100644 Documentation/blockdev/drbd/disk-states-8.dot + delete mode 100644 Documentation/blockdev/drbd/drbd-connection-state-overview.dot + delete mode 100644 Documentation/blockdev/drbd/node-states-8.dot + delete mode 100644 drivers/block/drbd/Kconfig + delete mode 100644 drivers/block/drbd/Makefile + delete mode 100644 drivers/block/drbd/drbd_actlog.c + delete mode 100644 drivers/block/drbd/drbd_bitmap.c + delete mode 100644 drivers/block/drbd/drbd_int.h + delete mode 100644 drivers/block/drbd/drbd_main.c + delete mode 100644 drivers/block/drbd/drbd_nl.c + delete mode 100644 drivers/block/drbd/drbd_proc.c + delete mode 100644 drivers/block/drbd/drbd_receiver.c + delete mode 100644 drivers/block/drbd/drbd_req.c + delete mode 100644 drivers/block/drbd/drbd_req.h + delete mode 100644 drivers/block/drbd/drbd_strings.c + delete mode 100644 drivers/block/drbd/drbd_tracing.c + delete mode 100644 drivers/block/drbd/drbd_tracing.h + delete mode 100644 drivers/block/drbd/drbd_vli.h + delete mode 100644 drivers/block/drbd/drbd_worker.c + delete mode 100644 drivers/block/drbd/drbd_wrappers.h + delete mode 100644 include/linux/drbd.h + delete mode 100644 include/linux/drbd_limits.h + delete mode 100644 include/linux/drbd_nl.h + delete mode 100644 include/linux/drbd_tag_magic.h + delete mode 100644 include/linux/lru_cache.h + delete mode 100644 lib/lru_cache.c +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Resolved 'drivers/power/wm97xx_battery.c' using previous resolution. +Auto-merging drivers/input/touchscreen/wm97xx-core.c +Auto-merging drivers/power/wm97xx_battery.c +CONFLICT (content): Merge conflict in drivers/power/wm97xx_battery.c +Auto-merging include/linux/wm97xx.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c747639] Merge remote branch 'battery/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/power/power_supply_class.txt | 7 + + drivers/input/touchscreen/wm97xx-core.c | 3 + + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/ds2760_battery.c | 147 +++++- + drivers/power/olpc_battery.c | 50 ++ + drivers/power/power_supply_core.c | 44 ++- + drivers/power/power_supply_sysfs.c | 12 + + drivers/power/wm831x_power.c | 779 ++++++++++++++++++++++++++++ + drivers/power/wm8350_power.c | 22 + + drivers/power/wm97xx_battery.c | 79 +++- + include/linux/mfd/wm831x/pmu.h | 189 +++++++ + include/linux/power_supply.h | 21 + + include/linux/wm97xx.h | 18 + + include/linux/wm97xx_batt.h | 18 +- + 15 files changed, 1331 insertions(+), 66 deletions(-) + create mode 100644 drivers/power/wm831x_power.c + create mode 100644 include/linux/mfd/wm831x/pmu.h +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/leds-clevo-mail.c +Merge made by recursive. + drivers/leds/Kconfig | 13 +- + drivers/leds/Makefile | 1 + + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-cobalt-qube.c | 2 +- + drivers/leds/leds-cobalt-raq.c | 4 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-pca9532.c | 12 +- + drivers/leds/leds-wm831x-status.c | 341 +++++++++++++++++++++++++++++++++++++ + drivers/leds/ledtrig-gpio.c | 28 ++-- + drivers/macintosh/via-pmu-led.c | 2 +- + include/linux/mfd/wm831x/status.h | 34 ++++ + 11 files changed, 412 insertions(+), 29 deletions(-) + create mode 100644 drivers/leds/leds-wm831x-status.c + create mode 100644 include/linux/mfd/wm831x/status.h +Merging backlight/for-mm +$ git merge backlight/for-mm +Auto-merging drivers/video/backlight/Kconfig +Merge made by recursive. + drivers/video/backlight/Kconfig | 22 +++ + drivers/video/backlight/Makefile | 4 +- + drivers/video/backlight/adx_bl.c | 178 ++++++++++++++++++++++ + drivers/video/backlight/hp680_bl.c | 2 +- + drivers/video/backlight/lms283gf05.c | 242 ++++++++++++++++++++++++++++++ + drivers/video/backlight/mbp_nvidia_bl.c | 36 +++++ + drivers/video/backlight/wm831x_bl.c | 250 +++++++++++++++++++++++++++++++ + include/linux/spi/lms283gf05.h | 28 ++++ + 8 files changed, 760 insertions(+), 2 deletions(-) + create mode 100644 drivers/video/backlight/adx_bl.c + create mode 100644 drivers/video/backlight/lms283gf05.c + create mode 100644 drivers/video/backlight/wm831x_bl.c + create mode 100644 include/linux/spi/lms283gf05.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging include/linux/sched.h +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 +Auto-merging mm/Makefile +Merge made by recursive. + 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 | 8 +- + lib/Kconfig.debug | 20 + + mm/Makefile | 1 + + mm/slqb.c | 3775 +++++++++++++++++++++++++++++++++++++++++++ + 9 files changed, 5178 insertions(+), 13 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 +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Merge made by recursive. + Documentation/power/regulator/machine.txt | 4 +- + Documentation/power/regulator/overview.txt | 4 +- + Documentation/power/regulator/regulator.txt | 5 +- + drivers/regulator/Kconfig | 24 +- + drivers/regulator/Makefile | 3 + + drivers/regulator/core.c | 285 ++++++++--- + drivers/regulator/da903x.c | 77 +++- + drivers/regulator/fixed.c | 91 ++++- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/pcf50633-regulator.c | 98 +++-- + drivers/regulator/tps65023-regulator.c | 632 ++++++++++++++++++++++++ + drivers/regulator/tps6507x-regulator.c | 714 +++++++++++++++++++++++++++ + drivers/regulator/userspace-consumer.c | 45 +- + drivers/regulator/virtual.c | 56 ++- + drivers/regulator/wm8350-regulator.c | 2 + + include/linux/mfd/da903x.h | 4 +- + include/linux/regulator/consumer.h | 4 + + include/linux/regulator/driver.h | 5 +- + include/linux/regulator/fixed.h | 24 + + include/linux/regulator/machine.h | 26 +- + include/linux/regulator/max1586.h | 4 +- + 21 files changed, 1933 insertions(+), 176 deletions(-) + create mode 100644 drivers/regulator/tps65023-regulator.c + create mode 100644 drivers/regulator/tps6507x-regulator.c +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Already up-to-date. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Already up-to-date. +Merging watchdog/master +$ git merge watchdog/master +Merge made by recursive. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/x86/kernel/pci-swiotlb.c +Auto-merging drivers/pci/dmar.c +Auto-merging drivers/pci/intel-iommu.c +CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c +Auto-merging drivers/pci/intr_remapping.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/pci/intel-iommu.c'. +[master 0f73eef] Merge remote branch 'dwmw2-iommu/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/Intel-IOMMU.txt | 6 +- + arch/ia64/kernel/pci-swiotlb.c | 2 +- + arch/x86/Kconfig | 2 +- + arch/x86/kernel/pci-swiotlb.c | 5 +- + drivers/pci/dmar.c | 37 ++++- + drivers/pci/intel-iommu.c | 323 ++++++++++++++++++++-------------------- + drivers/pci/intr_remapping.c | 8 + + drivers/pci/iova.c | 16 +-- + drivers/usb/host/pci-quirks.c | 2 +- + include/linux/intel-iommu.h | 2 + + include/linux/iova.h | 1 - + 11 files changed, 210 insertions(+), 194 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Merge made by recursive. + fs/proc/uptime.c | 7 ++++++- + 1 files changed, 6 insertions(+), 1 deletions(-) +Merging osd/linux-next +$ git merge osd/linux-next +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/exofs.txt | 23 ++++++++------- + drivers/scsi/osd/osd_initiator.c | 22 ++++++++++---- + drivers/scsi/osd/osd_uld.c | 53 ++++++++++++++++++++++++++++++++++- + fs/exofs/inode.c | 13 ++++++-- + fs/exofs/super.c | 17 +++++++---- + include/scsi/osd_initiator.h | 53 ++++++++++++++++++++++++++++------ + include/scsi/osd_sense.h | 3 ++ + 8 files changed, 148 insertions(+), 38 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 +Already up-to-date. +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/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 +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/exec.c +Auto-merging fs/nfsd/vfs.c +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 7 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/nfsd/vfs.c | 4 +- + fs/notify/dnotify/dnotify.c | 8 +- + fs/notify/fsnotify.c | 16 ++- + fs/notify/group.c | 50 +----- + fs/notify/inode_mark.c | 24 ++- + fs/notify/inotify/inotify_fsnotify.c | 59 ++++++- + fs/notify/inotify/inotify_user.c | 219 ++++++++++++++------- + fs/notify/notification.c | 161 +++++++++------- + fs/open.c | 2 +- + fs/read_write.c | 8 +- + include/linux/fsnotify.h | 44 +++-- + include/linux/fsnotify_backend.h | 30 ++-- + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 ++- + kernel/audit_tree.c | 223 ++++++++++++--------- + kernel/audit_watch.c | 296 ++++++++++++++++------------ + kernel/auditfilter.c | 39 ++--- + kernel/auditsc.c | 15 +- + 23 files changed, 730 insertions(+), 526 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 +Auto-merging MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Merge made by recursive. + 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/drbd +$ git merge drbd/drbd +Already up-to-date. +Merging kmemleak/kmemleak +$ git merge kmemleak/kmemleak +Already up-to-date. +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/apic/io_apic.c +Auto-merging arch/x86/kernel/head_32.S +Auto-merging arch/x86/kernel/head_64.S +Auto-merging drivers/pci/intr_remapping.c +Auto-merging include/linux/poison.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched.c +Merge made by recursive. +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging kernel/trace/ring_buffer.c +Merge made by recursive. +Merging percpu/for-next +$ git merge percpu/for-next +Already up-to-date. +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/Makefile +Auto-merging init/main.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b2594dc] Merge remote branch 'sfi/sfi-test' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 12 ++ + arch/x86/Kconfig | 4 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/setup.c | 3 + + arch/x86/kernel/sfi.c | 122 ++++++++++++ + arch/x86/pci/mmconfig-shared.c | 6 +- + arch/x86/pci/mmconfig_32.c | 2 +- + drivers/Makefile | 1 + + drivers/sfi/Kconfig | 17 ++ + drivers/sfi/Makefile | 3 + + drivers/sfi/sfi_acpi.c | 175 +++++++++++++++++ + drivers/sfi/sfi_core.c | 407 ++++++++++++++++++++++++++++++++++++++++ + drivers/sfi/sfi_core.h | 70 +++++++ + include/linux/sfi.h | 206 ++++++++++++++++++++ + include/linux/sfi_acpi.h | 93 +++++++++ + init/main.c | 2 + + 16 files changed, 1120 insertions(+), 4 deletions(-) + create mode 100644 arch/x86/kernel/sfi.c + create mode 100644 drivers/sfi/Kconfig + create mode 100644 drivers/sfi/Makefile + create mode 100644 drivers/sfi/sfi_acpi.c + create mode 100644 drivers/sfi/sfi_core.c + create mode 100644 drivers/sfi/sfi_core.h + create mode 100644 include/linux/sfi.h + create mode 100644 include/linux/sfi_acpi.h +Merging asm-generic/next +$ git merge asm-generic/next +Merge made by recursive. + lib/checksum.c | 14 ++++++++------ + 1 files changed, 8 insertions(+), 6 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/sysctl/vm.txt +Auto-merging arch/x86/mm/fault.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/proc/meminfo.c +Auto-merging fs/xfs/linux-2.6/xfs_aops.c +Auto-merging include/asm-generic/mman-common.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/prctl.h +Auto-merging include/linux/rmap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/swap.h +Auto-merging kernel/sys.c +Auto-merging kernel/sysctl.c +Auto-merging mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/madvise.c +Auto-merging mm/memory.c +Auto-merging mm/migrate.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_alloc.c +Auto-merging mm/rmap.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Merge made by recursive. + Documentation/filesystems/vfs.txt | 7 + + Documentation/sysctl/vm.txt | 41 ++- + arch/x86/mm/fault.c | 19 +- + fs/btrfs/inode.c | 1 + + fs/ext2/inode.c | 2 + + fs/ext3/inode.c | 3 + + fs/ext4/inode.c | 4 + + fs/gfs2/aops.c | 3 + + fs/nfs/file.c | 1 + + fs/ntfs/aops.c | 2 + + fs/ocfs2/aops.c | 1 + + fs/proc/meminfo.c | 9 +- + fs/xfs/linux-2.6/xfs_aops.c | 1 + + include/asm-generic/mman-common.h | 1 + + include/asm-generic/siginfo.h | 8 +- + include/linux/fs.h | 1 + + include/linux/mm.h | 15 +- + include/linux/page-flags.h | 17 +- + include/linux/prctl.h | 2 + + include/linux/rmap.h | 21 +- + include/linux/sched.h | 2 + + include/linux/swap.h | 34 ++- + include/linux/swapops.h | 38 ++ + kernel/sys.c | 22 + + kernel/sysctl.c | 25 ++ + mm/Kconfig | 14 + + mm/Makefile | 2 + + mm/filemap.c | 4 + + mm/hwpoison-inject.c | 41 ++ + mm/madvise.c | 30 ++ + mm/memory-failure.c | 832 +++++++++++++++++++++++++++++++++++++ + mm/memory.c | 24 +- + mm/migrate.c | 2 +- + mm/page-writeback.c | 7 + + mm/page_alloc.c | 20 +- + mm/rmap.c | 60 ++- + mm/shmem.c | 5 +- + mm/swapfile.c | 4 +- + mm/truncate.c | 72 +++- + mm/vmscan.c | 2 +- + 40 files changed, 1331 insertions(+), 68 deletions(-) + create mode 100644 mm/hwpoison-inject.c + create mode 100644 mm/memory-failure.c +Merging quilt/driver-core +$ git merge quilt/driver-core +Already up-to-date. +Merging quilt/tty +$ git merge quilt/tty +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging drivers/char/tty_io.c +Auto-merging drivers/serial/ioc4_serial.c +Auto-merging drivers/serial/pxa.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging drivers/usb/serial/io_edgeport.c +Auto-merging drivers/usb/serial/kl5kusb105.c +Auto-merging drivers/usb/serial/spcp8x5.c +Merge made by recursive. +Merging quilt/usb +$ git merge quilt/usb +Recorded preimage for 'arch/x86/kernel/early_printk.c' +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/early_printk.c +CONFLICT (content): Merge conflict in arch/x86/kernel/early_printk.c +Auto-merging drivers/usb/Kconfig +Auto-merging drivers/usb/core/usb.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/host/Kconfig +Auto-merging drivers/usb/host/ehci-pci.c +Auto-merging drivers/usb/host/ehci.h +Auto-merging drivers/usb/host/ohci-pxa27x.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/misc/legousbtower.c +Removing drivers/usb/mon/mon_dma.c +Auto-merging include/linux/usb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/early_printk.c'. +[master 7a2ae8e] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + Documentation/kernel-parameters.txt | 2 +- + Documentation/usb/authorization.txt | 10 +- + Documentation/usb/usbmon.txt | 8 +- + Documentation/x86/earlyprintk.txt | 39 +- + MAINTAINERS | 4 +- + arch/x86/kernel/early_printk.c | 780 +--------- + drivers/net/usb/cdc_eem.c | 17 +- + drivers/usb/Kconfig | 3 + + drivers/usb/Makefile | 2 + + drivers/usb/class/usbtmc.c | 84 +- + drivers/usb/core/devio.c | 247 +++- + drivers/usb/core/driver.c | 75 +- + drivers/usb/core/generic.c | 4 +- + drivers/usb/core/hcd.c | 113 +- + drivers/usb/core/hcd.h | 5 + + drivers/usb/core/hub.c | 126 ++- + drivers/usb/core/message.c | 32 +- + drivers/usb/core/usb.c | 13 +- + drivers/usb/core/usb.h | 7 + + drivers/usb/early/Makefile | 5 + + drivers/usb/early/ehci-dbgp.c | 996 ++++++++++++ + drivers/usb/gadget/Kconfig | 31 +- + drivers/usb/gadget/amd5536udc.c | 56 +- + drivers/usb/gadget/at91_udc.c | 1 - + drivers/usb/gadget/audio.c | 24 +- + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/dummy_hcd.c | 5 - + drivers/usb/gadget/ether.c | 31 +- + drivers/usb/gadget/f_audio.c | 97 +- + drivers/usb/gadget/f_eem.c | 562 +++++++ + drivers/usb/gadget/f_rndis.c | 15 +- + drivers/usb/gadget/fsl_qe_udc.c | 4 + + drivers/usb/gadget/gmidi.c | 8 +- + drivers/usb/gadget/pxa25x_udc.c | 49 +- + drivers/usb/gadget/pxa25x_udc.h | 1 + + drivers/usb/gadget/rndis.c | 13 +- + drivers/usb/gadget/rndis.h | 3 +- + drivers/usb/gadget/s3c-hsotg.c | 6 +- + drivers/usb/gadget/s3c2410_udc.c | 3 +- + drivers/usb/gadget/u_audio.c | 10 +- + drivers/usb/gadget/u_ether.c | 85 +- + drivers/usb/gadget/u_ether.h | 12 +- + drivers/usb/gadget/u_serial.c | 1 - + drivers/usb/host/Kconfig | 18 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-atmel.c | 230 +++ + drivers/usb/host/ehci-au1xxx.c | 29 +- + drivers/usb/host/ehci-dbg.c | 46 +- + drivers/usb/host/ehci-hcd.c | 89 +- + drivers/usb/host/ehci-hub.c | 84 +- + drivers/usb/host/ehci-mem.c | 26 +- + drivers/usb/host/ehci-pci.c | 42 +- + drivers/usb/host/ehci-q.c | 95 +- + drivers/usb/host/ehci-sched.c | 100 +- + drivers/usb/host/ehci-w90x900.c | 181 +++ + drivers/usb/host/ehci.h | 14 +- + drivers/usb/host/isp1362-hcd.c | 2909 +++++++++++++++++++++++++++++++++++ + drivers/usb/host/isp1362.h | 1079 +++++++++++++ + drivers/usb/host/isp1760-hcd.c | 4 + + drivers/usb/host/isp1760-hcd.h | 2 + + drivers/usb/host/isp1760-if.c | 21 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-au1xxx.c | 27 +- + drivers/usb/host/ohci-ep93xx.c | 1 - + drivers/usb/host/ohci-hcd.c | 1 - + drivers/usb/host/ohci-pxa27x.c | 4 + + drivers/usb/host/oxu210hp-hcd.c | 1 - + drivers/usb/host/uhci-q.c | 1 - + drivers/usb/host/whci/asl.c | 12 +- + drivers/usb/host/whci/hcd.c | 8 +- + drivers/usb/host/whci/pzl.c | 12 +- + drivers/usb/host/whci/qset.c | 4 +- + drivers/usb/host/whci/whci-hc.h | 1 + + drivers/usb/host/xhci-hcd.c | 232 +++- + drivers/usb/host/xhci-mem.c | 88 +- + drivers/usb/host/xhci-pci.c | 3 + + drivers/usb/host/xhci-ring.c | 173 ++- + drivers/usb/host/xhci.h | 80 +- + drivers/usb/image/microtek.c | 37 - + drivers/usb/misc/idmouse.c | 21 + + drivers/usb/misc/ldusb.c | 6 + + drivers/usb/misc/legousbtower.c | 6 + + drivers/usb/misc/sisusbvga/sisusb.c | 53 +- + drivers/usb/misc/sisusbvga/sisusb.h | 2 - + drivers/usb/misc/usbsevseg.c | 69 +- + drivers/usb/mon/Kconfig | 4 +- + drivers/usb/mon/Makefile | 2 +- + drivers/usb/mon/mon_bin.c | 12 +- + drivers/usb/mon/mon_dma.c | 95 -- + drivers/usb/mon/mon_main.c | 1 - + drivers/usb/mon/mon_text.c | 14 - + drivers/usb/mon/usb_mon.h | 14 - + drivers/usb/musb/musb_core.c | 8 +- + drivers/usb/otg/isp1301_omap.c | 23 +- + drivers/usb/serial/ark3116.c | 24 +- + drivers/usb/serial/ch341.c | 52 + + drivers/usb/serial/generic.c | 206 ++- + drivers/usb/serial/iuu_phoenix.c | 115 ++- + drivers/usb/serial/moto_modem.c | 2 +- + drivers/usb/serial/option.c | 134 ++- + drivers/usb/serial/pl2303.c | 70 +- + drivers/usb/serial/sierra.c | 157 ++- + drivers/usb/serial/usb-serial.c | 23 +- + drivers/usb/storage/datafab.c | 4 +- + drivers/usb/storage/initializers.c | 2 +- + drivers/usb/storage/jumpshot.c | 2 +- + drivers/usb/storage/unusual_devs.h | 22 +- + drivers/usb/usb-skeleton.c | 252 +++- + include/linux/usb.h | 25 +- + include/linux/usb/audio.h | 287 ++-- + include/linux/usb/ch9.h | 8 + + include/linux/usb/ehci_def.h | 35 + + include/linux/usb/isp1362.h | 46 + + include/linux/usb/isp1760.h | 18 + + include/linux/usb/serial.h | 2 + + include/linux/usbdevice_fs.h | 3 + + 116 files changed, 8985 insertions(+), 2082 deletions(-) + create mode 100644 drivers/usb/early/Makefile + create mode 100644 drivers/usb/early/ehci-dbgp.c + create mode 100644 drivers/usb/gadget/f_eem.c + create mode 100644 drivers/usb/host/ehci-atmel.c + create mode 100644 drivers/usb/host/ehci-w90x900.c + create mode 100644 drivers/usb/host/isp1362-hcd.c + create mode 100644 drivers/usb/host/isp1362.h + delete mode 100644 drivers/usb/mon/mon_dma.c + create mode 100644 include/linux/usb/isp1362.h + create mode 100644 include/linux/usb/isp1760.h +Merging quilt/staging +$ git merge quilt/staging +Already up-to-date. +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Recorded preimage for 'MAINTAINERS' +Resolved 'drivers/scsi/Makefile' using previous resolution. +Resolved 'drivers/scsi/pmcraid.c' using previous resolution. +Resolved 'kernel/sysctl.c' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging drivers/message/fusion/mptbase.h +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/scsi/Makefile +CONFLICT (content): Merge conflict in drivers/scsi/Makefile +Auto-merging drivers/scsi/device_handler/scsi_dh_rdac.c +Auto-merging drivers/scsi/fcoe/libfcoe.c +Auto-merging drivers/scsi/pmcraid.c +CONFLICT (add/add): Merge conflict in drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/qla2xxx/qla_def.h +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging include/linux/interrupt.h +Auto-merging include/linux/libata.h +Auto-merging kernel/sysctl.c +CONFLICT (content): Merge conflict in kernel/sysctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'MAINTAINERS'. +[master 9abc1f5] Merge remote branch 'scsi-post-merge/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 8 + + drivers/ata/ahci.c | 54 +- + drivers/message/fusion/mptbase.c | 99 +- + drivers/message/fusion/mptbase.h | 3 + + drivers/scsi/Kconfig | 1 + + drivers/scsi/Makefile | 1 + + drivers/scsi/be2iscsi/Kconfig | 8 + + drivers/scsi/be2iscsi/Makefile | 8 + + drivers/scsi/be2iscsi/be.h | 183 ++ + drivers/scsi/be2iscsi/be_cmds.c | 523 ++++++ + drivers/scsi/be2iscsi/be_cmds.h | 877 ++++++++++ + drivers/scsi/be2iscsi/be_iscsi.c | 646 ++++++++ + drivers/scsi/be2iscsi/be_iscsi.h | 75 + + drivers/scsi/be2iscsi/be_main.c | 3393 ++++++++++++++++++++++++++++++++++++++ + drivers/scsi/be2iscsi/be_main.h | 833 ++++++++++ + drivers/scsi/be2iscsi/be_mgmt.c | 321 ++++ + drivers/scsi/be2iscsi/be_mgmt.h | 249 +++ + drivers/scsi/qla2xxx/qla_dbg.c | 78 +- + drivers/scsi/qla2xxx/qla_def.h | 5 + + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_os.c | 36 + + include/linux/libata.h | 2 + + include/scsi/Kbuild | 1 + + include/scsi/fc/Kbuild | 4 + + 24 files changed, 7337 insertions(+), 72 deletions(-) + create mode 100644 drivers/scsi/be2iscsi/Kconfig + create mode 100644 drivers/scsi/be2iscsi/Makefile + create mode 100644 drivers/scsi/be2iscsi/be.h + create mode 100644 drivers/scsi/be2iscsi/be_cmds.c + create mode 100644 drivers/scsi/be2iscsi/be_cmds.h + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.c + create mode 100644 drivers/scsi/be2iscsi/be_iscsi.h + create mode 100644 drivers/scsi/be2iscsi/be_main.c + create mode 100644 drivers/scsi/be2iscsi/be_main.h + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.c + create mode 100644 drivers/scsi/be2iscsi/be_mgmt.h + create mode 100644 include/scsi/fc/Kbuild diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..230c0f8f9896 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,391 @@ +Importing driver-core.current based on 2.6.31-git8 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current df58bee21ed218cb7dfb561a590b1bd2a99531cf +Importing tty.current based on quilt/driver-core.current +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard df58bee21ed218cb7dfb561a590b1bd2a99531cf +HEAD is now at df58bee Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty.current +tty-gigaset-really-fix-chars_in_buffer.patch +serial-bfin_5xx-fix-building-as-module-when-early-printk-is-enabled.patch +tty-serial-pcmcia-add-id-for-advantech-card.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty.current +From ../quilt-tmp + + 5cea4a4...87cd454 master -> quilt/tty.current (forced update) +Importing usb.current based on quilt/tty.current +$ cd ../quilt-tmp +$ git reset --hard 87cd45422ae6283c1aeedcd983c9c3acaefdd42e +HEAD is now at 87cd454 tty: serial/pcmcia: add ID for Advantech card +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb.current +usb-storage-fix-a-resume-path-gfp_noio-must-be-used.patch +usb-serial-ftdi_sio-new-hardware-support-hameg-power-supply.patch +usb-serial-pl2303-new-hardware-support-sanwa-multimeter.patch +usb-option.c-add-support-for-zte-ac2726-evdo-modem.patch +usb-option-telit-uc864g-support.patch +usb-cdc-wdm-driver-doesn-t-support-non-blocking-reads.patch +usb-fix-cdc-acm-regression-in-open.patch +usb-add-pids-for-ftdi-based-opendcc-hardware.patch +usb-sl811-hcd-fix-device-disconnect.patch +usb-serial-ftdi-handle-gnice-jtag-adaptors.patch +usb-xhci-work-around-for-chain-bit-in-link-trbs.patch +usb-xhci-fix-slot-and-endpoint-context-debugging.patch +usb-xhci-configure-endpoint-code-refactoring.patch +usb-xhci-set-correct-max-packet-size-for-hs-fs-control-endpoints.patch +usb-xhci-support-full-speed-devices.patch +usb-xhci-handle-stalled-control-endpoints.patch +usb-xhci-add-quirk-for-fresco-logic-xhci-hardware.patch +usb-xhci-make-trb-completion-code-comparison-readable.patch +usb-xhci-handle-babbling-endpoints-correctly.patch +usb-xhci-don-t-touch-xhci_td-after-it-s-freed.patch +usb-xhci-check-urb-s-actual-transfer-buffer-size.patch +usb-xhci-check-urb_short_not_ok-before-setting-short-packet-status.patch +usb-xhci-set-eremoteio-when-xhc-gives-bad-transfer-length.patch +usb-xhci-support-interrupt-transfers.patch +usb-fix-ss-endpoint-companion-descriptor-parsing.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb.current +From ../quilt-tmp + + 9db7ee9...c700413 master -> quilt/usb.current (forced update) +Importing i2c based on 2.6.31-git11 +$ cd ../quilt-tmp +$ git reset --hard 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef +HEAD is now at 43c1266 Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-drop-i2c_driver-id.patch +i2c-taos-evm-switch-echo-off.patch +i2c-tsl2550-simpify-IO.patch +i2c-core-01-client-as-device-type.patch +i2c-core-02-adapters-as-bus-devices.patch +i2c-core-03-i2c-adapter-compatibility-class-2.patch +i2c-scx200_acb-provide-more-information-on-bus-errors.patch +gpio-pcf857x-copy-i2c_device_id-from-old-pcf8574-driver.patch +i2c-chips-remove-deprecated-pcf8575-driver.patch +i2c-chips-remove-deprecated-pca9539-driver.patch +i2c-chips-remove-deprecated-pcf8574-driver.patch +i2c-piix4-add-amd-SB900-smbus-device-id.patch +maintainers-add-maintainer-for-at24-and-pca9564-pca9665.patch +i2c-pnx-correct-use-of-request_mem_region.patch +i2c-add-driver-for-smbus-control-method-interface.patch +i2c-list-acpi-drivers-as-such.patch +i2c-move-legacy-documentation.patch +i2c-voodoo3-delete.patch +misc-eeprom-max6875-no-detect.patch +w1-ds2482-no-detect.patch +hwmon-ltc4215-ltc4245-no-detect.patch +i2c-prevent-priority-inversion-on-top-of-bus-lock.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + ba27803...3d3db2c master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.31-git9 +$ cd ../quilt-tmp +$ git reset --hard 78f28b7c555359c67c2a0d23f7436e915329421e +HEAD is now at 78f28b7 Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-adm1031-add-sysfs-files-for-temperature-offsets.patch +hwmon-remove-deprecated-fsc-drivers.patch +hwmon-coretemp-add-atom-support.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 528e175...af663ff master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on origin/master + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 7fa07729e439a6184bd824746d06a49cca553f15 +Importing rr based on v2.6.31-6618-gebc79c4 +$ cd ../quilt-tmp +$ git reset --hard ebc79c4f8da0f92efa968e0328f32334a2ce80cf +HEAD is now at ebc79c4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder/linux-2.6 +$ git quiltimport --author Rusty Russell <rusty@rustcorp.com.au> --patches ../quilt/rr +virtio:pci-minor-cleanups.patch +virtio:add_buf-return-capacity.patch +virtio:9p_get_rid_of_redundant_id_9p_definition.patch +virtio:add_ids_file.patch +virtio:blk_set_queue_ordered_drain_by_default.patch +virtio:blk_revert_queue_flag_virt_addition.patch +lguest:panic_notifier-cleanup.patch +lguest:avoid-native_set_pmd.patch +lguest:PAE-dont-assume-PAGE_OFFSET.patch +lguest:cleanup_for_map_switcher.patch +lguest:remove-wake-on-empty.patch +cpumask:use_zalloc_cpumask_var_where_possible.patch +cpumask:remove-pcibus_to_cpumask-alpha.patch +cpumask:remove-pcibus_to_cpumask-mips.patch +cpumask:remove-pcibus_to_cpumask-powerpc.patch +cpumask:remove-node_to_cpumask.patch +cpumask:remove-CPU_MASK_ALL_PTR.patch +cpumask:remove-address-of-CPU_MASK_ALL-mips.patch +cpumask:remove-cpu_mask_all.patch +cpumask:remove-last-remaining-irqaction-mask.patch +cpumask:irqaction-remove-mask.patch +cpumask:remove_mask_field_from_comments.patch +cpumask:set_cpus_allowed-acpi-removal.patch +cpumask:remove-set_cpus_allowed.patch +cpumask:ia64-smp_call_function_many.patch +cpumask:remove-smp_call_function_mask.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-core.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-sparc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-s390.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-powerpc.patch +cpumask:remove-topology_core_siblings-and-topology_thread_siblings-ia64.patch +cpumask:arch_send_call_function_ipi_mask-alpha.patch +cpumask:arch_send_call_function_ipi_mask-m32r.patch +cpumask:arch_send_call_function_ipi_mask-mips.patch +cpumask:arch_send_call_function_ipi_mask-powerpc.patch +cpumask:arch_send_call_function_ipi_mask-s390.patch +cpumask:remove-arch_send_call_function_ipi.patch +cpumask:use-cpumap-accessors-m32r.patch +cpumask:use-cpumap-accessors-mips.patch +cpumask:use-cpumap-accessors-powerpc.patch +cpumask:use-cpumap-accessors-um.patch +cpumask:use-mm_cpumask-arm.patch +cpumask:use-mm_cpumask-m32r.patch +cpumask:use-mm_cpumask-mn10300.patch +cpumask:use-mm_cpumask-mips.patch +cpumask:use-mm_cpumask-um.patch +cpumask:use-mm_cpumask-x86.patch +cpumask:mm_quicklist-new-cpumask-ops.patch +cpumask:remove-unused-deprecated-functions.patch +cpumask:move-obsolete-functions-to-end-of-header.patch +virtio:net-skb_orphan-and-nf_reset.patch +virtio:net-return-NETDEV_TX_BUSY.patch +virtio:net-no-xmit-free-timer.patch +virtio:net-struct-skb_vnet_hdr.patch +virtio:net-stop_queue-before-full.patch +virtio:net_check_for_room_in_the_vq_before_adding_buffer.patch +module:reduce_symbol_table_for_loaded_s_v2.patch +module:reduce_string_table_for_loaded_s_v2.patch +param:allow_whitespace_as_kernel_parameter_separator.patch +module:preferred_way_to_use_MODULE_AUTHOR.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/rr +From ../quilt-tmp + + 25306e2...d3eae8d master -> quilt/rr (forced update) +Importing device-mapper based on block/for-next + quilt series is empty +$ git update-ref refs/heads/quilt/device-mapper 38cffa817734b85cbc8701ba874bdb3dbc16dd13 +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core c700413d9b0fcf19675d16e6b261756593c5095a +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard c700413d9b0fcf19675d16e6b261756593c5095a +HEAD is now at c700413 USB: Fix SS endpoint companion descriptor parsing. +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty +tty-ldisc-make-proc-tty-ldiscs-use-ldisc_ops-instead-of-ldiscs.patch +tty-ldisc-get-rid-of-tty_ldisc_try_get-helper-function.patch +tty-includecheck-fix-drivers-char-vt.c.patch +tty-icom-bit-and-or-confusion.patch +tty-cyclades-refcount +tty-cyclades-use-port-block-helper +tty-cyclades-precompute +tty-cyclades-use-port-hangup +tty-cyclades-use-port-close +tty-cyclades-cleanup +tty-cyclades-sleep-not-busy +tty-cyclades-use-dtr-helpers +tty-cyclades-merge-startup-common +tty-cyclades-ioctl-cleanup +tty-cyclades-modem-cleanup +tty-cyclades-add-io-helpers +tty-cyclades-remove-set-line-dups +net-slip-ttyfix +kfifo-const +tty-usb-mos7720-modem +tty-usb-mos7720-lsr +tty-io-typo +tty-usb-mos7840-modem +serial-add-irqflags-support +serial-8250-amstrad-e3 +serial-8250-minbaud +tty-port-close-fn +tty-riscom8-split-close +tty-mxser-split-close +tty-isicom-split-close +tty-riscom8-close-kref +tty-cyclades-port-close +tty-kref-put-async +tty-usb-cdc-fix-speed +tty-usb-vhangup +tty-usb-clean-dtr-rts +tty-usb-shutdown +vt-events +vt-pm-extract +vt-incfix +vt-lockactive +tty-usb-drop-filp-argp +tty-isicom-split-open +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:47: trailing whitespace. + +warning: 1 line adds whitespace errors. +serial-kill-info +serial-fold-closing-port +serial-port-portptr +serial-move-counts +serial-move-flags +serial-kill-uif +serial-move-mutex +serial-msr-move +serial-move-users +serial-kill-USF_CLOSING +serial-port-kref +serial-console-set-resume +tty-usb-serial-termiosbits +n_tty-honor-opost-flag-for-echoes.patch +n_tty-move-echoctl-check-and-clean-up-logic.patch +tty-handle-vt-specific-compat-ioctls-in-vt-driver.patch +tty-vt-use-printk_once.patch +tty-power-fix-suspend-vt-regression.patch +tty-fix-typos.patch +tty-riscom8-fix-shutdown-declaration.patch +tty-riscom8-fix-tty-refcnt.patch +tty-usb-serial-mct_u232-fix-tty-refcnt.patch +uartlite-support-shared-interrupt-lines.patch +tty-char-mxser-add-support-for-cp112ul.patch +tty-char-mxser-use-thre-for-aspp_oqueue-ioctl.patch +usb-serial-change-referencing-of-port-and-serial-structures.patch +usb-serial-put-subroutines-in-logical-order.patch +usb-serial-change-logic-of-serial-lookups.patch +usb-serial-acquire-references-when-a-new-tty-is-installed.patch +usb-serial-fix-termios-initialization-logic.patch +usb-serial-rename-subroutines.patch +usb-serial-add-missing-tests-and-debug-lines.patch +usb-serial-straighten-out-serial_open.patch +usb-serial-update-the-console-driver.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + a991e94...495ba24 master -> quilt/tty (forced update) +Importing usb based on quilt/tty +$ cd ../quilt-tmp +$ git reset --hard 495ba2447ec1580814b64f0ed91d1a35b2a475f8 +HEAD is now at 495ba24 USB serial: update the console driver +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-ehci-dbg.c-no-need-for-checking-it-before-call-vfree.patch +usb-sisusbvga-drop-usb_buffer_alloc.patch +usb-usbmon-drop-kconfig-defaults.patch +usb-usbmon-touch-up-the-documentation.patch +usb-usbmon-end-ugly-tricks-with-dma-peeking.patch +usb-let-usb_sg_init-to-set-transfer_buffer-more-often.patch +usb-move-endpoint-sync-type-definitions-from-usb-audio.h-to-usb-ch9.h.patch +usb-move-vendor-subclass-definition-from-usb-audio.h-to-usb-ch9.h.patch +usb-audio-gadget-prefix-all-macro-definitions-with-uac_-in-linux-usb-audio.h.patch +usb-audio-gadget-un-inline-generic_et_cmd.patch +usb-add-nuvoton-ehci-driver-for-w90p910-platform.patch +usb-whci-hcd-make-endpoint_reset-method-async.patch +usb-add-api-for-userspace-drivers-to-claim-ports.patch +usb-make-intf.pm_usage-an-atomic_t.patch +usb-make-the-usbfs_snoop-log-more-pertinent.patch +usb-gadget-pxa25x-basic-transceiver-support.patch +usb-serial-full-autosuspend-support-for-the-option-driver.patch +usb-usb-serial-remove-unused-variables.patch +usb-usbtmc-can-do-io-to-device-after-disconnect.patch +usb-suspend-resume-support-for-usbtmc.patch +usb-legousbtower-make-poll-notice-disconnect.patch +usb-ldusb-should-signal-an-error-in-poll-if-the-device-is-disconnected.patch +usb-gadget-drop-null-test-on-list_entry-result.patch +usb-gadget-s3c-hsotg-missing-parentheses.patch +usb-full-power-management-support-for-the-idmouse-driver.patch +usb-full-autosuspend-and-power-management-support-for-usbsevseg.patch +usb-ehci-add-need_io_watchdog-flag-to-ehci_hcd.patch +usb-ehci-split-ehci_qh-into-hw-and-sw-parts.patch +usb-ehci-add-intel-moorestown-ehci-controller-hostpcx-extensions-and-support-phy-low-power-mode.patch +usb-isp1760-allow-platform-devices-to-customize-devflags.patch +usb-serial-spelling-correction-in-motorola-usb-phone-driver.patch +usb-storage-drop-an-unneeded-a-null-test.patch +usb-au1xxx-add-dev_pm_ops.patch +usb-fix-wrong-order-of-events-in-usb-serial-suspension.patch +usb-check-for-hub-driver-not-bound-to-root-hub-device.patch +usb-don-t-lose-mode-switch-events-on-suspended-devices.patch +usb-dummy-hcd-accept-mismatch-between-wlength-and-transfer-length.patch +usb-nxp-isp1362-usb-host-driver.patch +usb-usbtmc-sanity-checks-for-dev_dep_msg_in-urbs.patch +usb-usbtmc-fix-printk-format-warnings.patch +usb-uhci-rm-repeatedly-evaluation-for-urbp-qh.patch +usb-at91-add-usb-ehci-driver-for-at91sam9g45-series.patch +usb-at91-add-usb-gadget-driver-selection-for-at91sam9g45-series.patch +usb-at91-modify-ohci-driver-to-allow-shared-interrupts.patch +usb-audio-guard-kernel-only-code-with-__kernel__.patch +usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch +usb-ohci-pxa27x-allow-nocp-and-ocpm-to-be-cleared.patch +usb-ark3116-add-irda-support-for-gembird-uir-22.patch +usb-usb-storage-fails-to-attach-to-huawei-datacard-cdrom-device.patch +usb-gadget-read-buffer-overflow.patch +usb-gadget-audio-driver-seg-fault-fix.patch +usb-isp1362-fix-pulldown-register-defines-and-conf-logic.patch +usb-increase-usbdevfs-max-isoc-buffer-size.patch +usb-work-around-bios-bugs-by-quiescing-usb-controllers-earlier.patch +usb-musb-fix-put_device-call-sequence.patch +usb-otg-twl4030-usb.c-mark-.init-as-subsys_initcall_sync.patch +usb-ehci-ensure-all-watchdog-timer-events-are-deleted-when-suspending-usb.patch +usb-isp1362-correct-use-of-and.patch +usb-gadget-update-freescale-udc-entry-in-maintainers.patch +usb-fix-cdc-eem-host-driver-sentinel-crc-validation.patch +usb-otg-fix-twl4030-usb-build.patch +usb-ohci-ep93xx.c-remove-unused-variable.patch +usb-use-kfifo-to-buffer-usb-generic-serial-writes.patch +usb-remove-unneeded-printks-from-microtek-driver.patch +usb-gadget-add-eem-gadget-driver.patch +usb-s3c2410-unregister-should-call-unbind-not-disconnect.patch +usb-break-support-for-winchiphead-ch341-340-usb-serial-chip.patch +usb-usbtmc-fix-short-reads-in-usbtmc_read.patch +usb-usbtmc-inhibit-corruption.patch +usb-usbtmc-correct-termination-condition-for-reads.patch +usb-iuu_phoenix-don-t-reset-the-device-at-close.patch +usb-iuu_phoenix-clean-up-parameter-s-descriptions.patch +usb-iuu_phoenix-add-support-for-changing-vcc.patch +usb-iuu_phoenix-increment-version-number.patch +usb-iuu_phoenix-add-a-way-to-select-the-default-vcc.patch +usb-serial-pl2303-fix-baud-rate-handling-in-case-of-unsupported-values.patch +usb-serial-pl2303-add-space-mark-parity.patch +usb-serial-pl2303-use-1.5-instead-of-2-stop-bits-with-5-data-bits.patch +usb-fsl_qe_udc-add-fsl-mpc8323-qe-usb-compatible-entry.patch +usb-ehci-rescan-the-queue-after-an-unlink.patch +usb-ehci-change-deschedule-logic-for-interrupt-qhs.patch +usb-make-usb_buffer_map_sg-consistent-with-doc.patch +usb-double-put_tty_driver-in-gserial_setup.patch +usb-clean-up-root-hub-string-descriptors.patch +usb-gadget-double-free_irq-in-at91udc_probe.patch +usb-omap-isp1301-compile-fix.patch +usb-fix-paths-in-usbmon-documentation.patch +usb-unusual_devs.h-drop-some-unneeded-floppy-entries.patch +usb-ehci-dbgp-early_printk-split-ehci-debug-driver-from-early_printk.c.patch +usb-dbgp-insert-cr-prior-to-nl-as-needed.patch +usb-ehci-dbgp-execute-early-bios-hand-off.patch +usb-dbgp-ehci-debug-controller-initialization-delays.patch +early_printk-allow-more-than-one-early-console.patch +usb-ehci-dbgp-stability-improvements-and-external-re-init.patch +usb-ehci-dbgp-ehci-allow-early-or-late-use-of-the-dbgp-device.patch +usb-ehci-dbgp-errata-for-ehci-debug-controller-initialization.patch +usb-ehci-dbgp-errata-for-ehci-debug-host-controller-synchronization.patch +usb-ehci-dbgp-documentation-documentation-updates-for-ehci-dbgp.patch +usb-ehci-dbgp-ehci-allow-dbpg-to-work-with-suspend-resume.patch +usb-support-for-autosuspend-in-sierra-while-online.patch +usb-usbfs-add-usbdevfs_urb_bulk_continuation-flag.patch +usb-fix-missing-error-check-in-probing.patch +usb-fix-usbtmc-get_capabilities-success-handling.patch +usb-gadget-ether-needs-to-select-crc32.patch +usb-xhci-endpoint-representation-refactoring.patch +usb-xhci-refactor-input-device-context-setup.patch +usb-xhci-change-how-xhci-commands-are-handled.patch +usb-xhci-fix-command-wait-list-handling.patch +usb-xhci-set-route-string-for-all-devices.patch +usb-xhci-set-multi-tt-field-for-ls-fs-devices-under-hubs.patch +usb-xhci-support-usb-hubs.patch +usb-add-hub-descriptor-update-hook-for-xhci.patch +usb-skel_read-really-sucks-royally.patch +usb-make-usb-skeleton-honor-o_nonblock-in-write-path.patch +usb-o_nonblock-in-read-path-of-skeleton.patch +usb-skeleton-fix-coding-style-issues.patch +usb-fix-sysfs-paths-in-documentation.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + fe7f73d...3f5a8f6 master -> quilt/usb (forced update) +Importing staging based on quilt/usb + quilt series is empty +$ git update-ref refs/heads/quilt/staging 3f5a8f6527276fa6ee0368e4fd30a47fedf8a5b2 diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3d6f9c561ae6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20090923 |