diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 20:01:51 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-02-18 20:01:51 +1100 |
| commit | b7c26eb6dda7cfe562cb4385cbe91f8449655ff0 (patch) | |
| tree | 1a60a962f07f69377826c5b5875f0f113dcd0c9c | |
| parent | 626ea4d3ac18adaa56e2b0e6539f0be92235adab (diff) | |
Add linux-next specific files for 20100218next-20100218
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 160 | ||||
| -rw-r--r-- | Next/Trees | 162 | ||||
| -rw-r--r-- | Next/merge.log | 9153 | ||||
| -rw-r--r-- | Next/quilt-import.log | 736 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 10212 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ec6d7fc9a02f --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,160 @@ +Name SHA1 +---- ---- +origin b0483e78e5c4c9871fc5541875b3bc006846d46b +fixes 05a625486efc3209ae4d98e253dafa6ce0124385 +arm-current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +m68k-current 49966bae8446f5ba7e8afbd01bde82af4e00628a +powerpc-merge 77058e1adcc439151db41f2b84e4867a88113cd8 +sparc-current 440ab7ac2d6b735fb278a1ff1674f6716314c6bb +scsi-rc-fixes 2178a3b8a2a3bfb6d0e4a2f29f869f28c13b5a25 +net-current b0483e78e5c4c9871fc5541875b3bc006846d46b +sound-current 3e0b33f786e7f950f2430a305169f3db4a1a5521 +pci-current 6339204ecc2aa2067a99595522de0403f0854bb8 +wireless-current 5affcd6ba2036b59a4dee3f0576ae3584e92e4f1 +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +tty.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +usb.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +staging.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +cpufreq-current 1dbf58881f307e21a3df4b990a5bea401360d02e +input-current ecaf122d6e79170872baa63b20a00fd1b02980ec +md-current ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current cd1510cb5f892907fe1a662f90b41fb3a42954e0 +ide-curent 8495fb1b8d016657133c01a2f258c5f192d2a1b7 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm d7d4dd5dabc7835441e49e5c643232015c830c12 +davinci e4352371051ceb0872020cecc1102cf6afeb29a9 +i.MX 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5 +msm d99c6ab416c69b1788ac1ad5288dd86e776225ae +omap 0a4ddc27be89108c2d248d7beb818ee3aad4e95f +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung d35b7a829a13b69c4747b69380b504b6544a2375 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin bc702d9926bf530c9c41de5d2f4c6b3d80da543d +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 640f7b5aa15f0d8343ae40854a714049dd886a4e +m68k 5cde1dedea4fe47a6369f50388a6129c26144e14 +m68knommu 48b9543bc95bde24d49589c68480a4ed5dc76796 +microblaze a91e33a0d4fd7cfaee045bf052a896a1dc17f399 +mips 46b444da9590b3e5b35169951cbf9cdac6bc8445 +parisc 2bf59ba67ddef9c1e9e87aa3fedcf6ceac8248f2 +powerpc efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292 +4xx c7b66698122796623f1838c0ee6a8e12ec832468 +52xx-and-virtex d24720a45ad2928f687c6371482cdfba19b74fc5 +galak c1a676dfa2fa25fb9ec77c92ebe3ff580648b6ac +s390 211abcd5fa499b99ece715f8f7fe74029fd61b21 +sh 838a4a9dcee0cbaeb0943531da00ac44d578f315 +genesis deded43508f065c95af506d18b8309ba842c397e +sparc 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph 0afa6da47af6c607d135e00662f92670623d70fb +cifs 724e6d3fe8003c3f60bf404bf22e4e331327c596 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs ece550f51ba175c14ec3ec047815927d7386ea1f +ext3 6ea657d9158fbba96737b080cf3ea131bfb5f58e +ext4 3f606d8d43b5e3a3a7bcac8c62eeb3cbab0c87f2 +fatfs eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 7948799cfff9d1fde5a4b784358c7792769b0bd5 +jfs d7eecb483cc29e929bbc5515b8def830d7fc6ad2 +logfs 5c564c2a04d4bb6ba79eeb83bd06de584479f362 +nfs 8e7544eef4f7007e4605aa9bff53dee6b610c164 +nfsd 33292d494fcf3347f5c4684d877babcdd04f7d16 +nilfs2 d1c6b72a7224f6cd6924f7079f79580cde696d68 +ocfs2 1d906125864590674c6f9b7e03a691103956cee7 +squashfs 2a55046d9ce9b3bbebd36315481e0a0f7b8cffdb +udf d3c1a16882b250111d9aa4eb483dc8580de5f8d2 +v9fs 3234a6d369eb6926cf31a926fd1a506d874efa75 +ubifs abe94c756c08d50566c09a65b9c7fe72f83071c5 +xfs d67b1b03254c501fef371b0e5916c94a52bfc2c5 +reiserfs-bkl 175359f89df39f4faed663c8cfd6ee0222d2fa1e +vfs 9f009a78fb3b54976cfe8173d05ef483dbda4571 +pci 54df9295fac176dffea05c9085451fa75e2e2a95 +hid 466a8903bce97b6399195551ca81e2d9773cf577 +i2c a47c5c7eee5078e8d681620ad8ba02ef6a91eab6 +bjdooks-i2c dbbf97eace6a0d2c2316e01acb6fd237d16345f9 +jdelvare-hwmon 75a8bfb1a996b5a8fad5d293c8ba10a20fb324cd +kernel-doc 20ffd117c487f112c8b07b8fe7883c753f472d48 +v4l-dvb 91ec04b894e426b921d1aa209fb4eac32a5aba95 +kbuild e8d400a933fa44e2fba3849b084e1ae5814d7fca +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 3dabcfef3e668f6dd32147d810a29ccbd55dc963 +libata 20b6b7013c00bc3e3b8dc8f51eb6cb9a08eb755f +infiniband 16e2275f0bdd9f97146cd3d10e052073557dfaa6 +acpi f02a5f9bf8c4d6e3a42502c6a616a9a6e967fa96 +ieee1394 57fbabe33de685e42936ffc48e48c04e98d910c9 +ubi af7579329a0445021205add6c2413daa728407e1 +kvm 3942d23e30b4ab481f59273d75cdb280f0c387b2 +dlm 573c24c4af6664ffcd9aa7ba617a35fde2b95534 +scsi f98c96b0b6572b5491e954148509b20f08f31491 +async_tx 5756e66b2433faac703d55f44c7cdc41cba7e60d +net 069c474e88bb7753183f1eadbd7786c27888c8e3 +wireless 64b84010f9f85996a219fcc697396e7e11be3459 +mtd 2d6bfc261a02662ec7a3a78df3e05e453e8b168d +crypto 8d0c123f8b710561cfd34f6e1a5bebc27988edbe +sound 03acc4deb8822d6a219bb0553f273ac588b02287 +cpufreq fb4635932a4e19c2f55383f968a0e9b64da37354 +rr 1161b00a7e1f2b5a338b89453bcea2a81385d183 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input 4e45ad5e89128939c671e927f030cb3909fe1d69 +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block ca36d04dc09ccfa983ba0d1fdfba013bbfd158fa +device-mapper 2f057f16fbf8f6c27cd07fca32f03e81bf1b84b7 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 3af840db26edf6fe38f265cc4080b12ca75f8e4f +battery e20908d95e89d04b9537aefecc0734d2e4f7faed +leds af5cf4e3f37429418ba8890ef10e9c44d39ad939 +backlight 001ce79356cf25606be8fda605174b2b33208921 +kgdb 6c12299ad9209a772c2c392890911277d3e936be +slab 849cccb85d688d70b77ac6f0e6b7d7ca68b56aed +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +mfd 84c9a5b92845f1ee6f54129d027f0d6c73b3d017 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm c5053efaab1c7c4bf5f505e6c4c6ed206bcfb6c7 +voltage 3e32392e8c036056bd2058bafd18c5cf1a7d65b9 +security-testing 170800088666963de1111d62fb503889c8c82eda +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb 35fb2a816a06ded2a3ff83d896c34b83c8e1d556 +watchdog 80e9843044347a718b08910884fa045f88427225 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b8973a81876d90f916507ac40d1381068dc986a +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd e9ffa24e2f582f185e31696d17c61aa57c4918d5 +jc_docs 5e9b356216d97439aea1ec656bdb3c17b9c2d4ae +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend ceb4af58ed74b21c9c5163d8e85c54f9527213f9 +bluetooth b7f3f4d6ad4b4da271f163e60d553116c4caac34 +fsnotify 6c3cc43e21c326a5f7a741e5dcc828736d49de25 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 9f1574b54d8a822b42084a36ca41a922b83bccec +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree df0edeb59eb559be0bee53452fda2f5cc0ae133f +spi 5ec20142c64d0d55dc0a031cf61274c3cccc09ae +limits 57158a0fd4c9e29b403d422ac820cf238066cedf +omap_dss2 e296264977f68ddf395b8f93f8e174930f88499a +als 6600f58cfc348ef5862876ab4965d95aad793429 +tip 8f51764f0b3a7ce1c3aec15b8ae18d39073a1942 +edac-amd cab4d27764d5a8654212b3e96eb0ae793aec5b94 +oprofile 7284ce6c9f6153d1777df5f310c959724d1bd446 +percpu a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 +workqueues 5ab0fec5e715dd22e9d30d9f2eb1f0bbb05fb001 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 3d6a19dedd4712777dacce1200ce31c4ac40a42a +tty d99adec3f7941932591f8fbd3cfc7e203151d2b0 +usb 4de5bb97afa943c34cf6aedfc7c1706cf154925c +staging de360f79ed4fac0964b13a116a96d2fa03f86db5 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4f2763b8cab1 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,162 @@ +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://repo.or.cz/linux-kbuild.git#for-linus +driver-core.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-01-driver-core.current/ +tty.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-02-tty.current/ +usb.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-03-usb.current/ +staging.current quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-04-staging.current/ +cpufreq-current git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +md-current git git://neil.brown.name/md#for-linus +audit-current git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6#master +ide-curent git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6.git#master +dwmw2 git git://git.infradead.org/users/dwmw2/random-2.6.git#master +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#devel +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci.git#davinci-next +i.MX git git://git.pengutronix.de/git/imx/linux-2.6.git#for-next +msm git git://codeaurora.org/quic/kernel/dwalker/linux-msm.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6.git#for-next +pxa git git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git#for-next +samsung git git://git.fluff.org/bjdooks/linux.git#next-samsung +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6.git#next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git#next +4xx git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git#next +52xx-and-virtex git git://git.secretlab.ca/git/linux-2.6#next +galak git git://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git#next +s390 git git://git390.marist.edu/pub/scm/linux-2.6.git#features +sh git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#master +genesis git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/genesis-2.6.git#master +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +xtensa git git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-next.git#master +ceph git git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client.git#for-next +cifs git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git#master +configfs git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs.git#linux-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#next +fatfs git git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6.git#master +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw.git#master +jfs git git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git#next +logfs git git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs.git#master +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +nilfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git#for-next +ocfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git#linux-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +reiserfs-bkl git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing.git#reiserfs/kill-bkl +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6#linux-next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/ +bjdooks-i2c git git://git.fluff.org/bjdooks/linux.git#next-i2c +jdelvare-hwmon quilt http://kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-hwmon/ +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://repo.or.cz/linux-kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-kconfig.git#for-next +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-next-2.6.git#master +libata git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git#NEXT +infiniband git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git#for-next +acpi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#test +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6.git#for-next +ubi git git://git.infradead.org/ubi-2.6.git#linux-next +kvm git git://git.kernel.org/pub/scm/linux/kernel/git/avi/kvm.git#linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git#next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +mtd git git://git.infradead.org/mtd-2.6.git#master +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6#master +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git#for-next +cpufreq git git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq.git#next +rr quilt http://ozlabs.org/~rusty/kernel/rr-latest/ +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc.git#next +tmio-mmc git git://git.mnementh.co.uk/linux-2.6-im#linux-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +lsm git git://git.kernel.org/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git#for-next +block git git://git.kernel.dk/linux-2.6-block.git#for-next +device-mapper quilt http://www.kernel.org/pub/linux/kernel/people/agk/patches/2.6/editing/ +embedded git git://git.infradead.org/embedded-2.6.git#master +firmware git git://git.infradead.org/users/dwmw2/firmware-2.6.git#master +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git#master +battery git git://git.infradead.org/battery-2.6.git#master +leds git git://git.o-hand.com/linux-rpurdie-leds#for-mm +backlight git git://git.o-hand.com/linux-rpurdie-backlight#for-mm +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb#kgdb-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6.git#for-next +uclinux git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/uclinux.git#for-next +md git git://neil.brown.name/md#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git#for-next +hdlc git git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6.git#hdlc-next +drm git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git#drm-next +voltage git git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-next +security-testing git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6.git#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet-2.6_next#master +agp git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6.git#agp-next +uwb git git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb.git#for-upstream +watchdog git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog-next.git#master +bdev git git://git.kernel.org/pub/scm/linux/kernel/git/viro/bdev.git#master +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +cputime git git://git390.marist.edu/pub/scm/linux-2.6.git#cputime +osd git git://git.open-osd.org/linux-open-osd.git#linux-next +jc_docs git git://git.lwn.net/linux-2.6.git#docs-next +nommu git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-nommu.git#master +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git#for-next +aoe quilt http://support.coraid.com/support/linux/for-next/patches/ +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6.git#master +fsnotify git git://git.infradead.org/users/eparis/notify.git#for-next +irda git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/irda-2.6.git#for-next +hwlat git git://git.kernel.org/pub/scm/linux/kernel/git/jcm/linux-2.6-hwlat.git#for-linus +drbd git git://git.drbd.org/linux-2.6-drbd.git#for-jens +catalin git git://linux-arm.org/linux-2.6.git#for-next +alacrity git git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins/alacrityvm/linux-2.6.git#linux-next +i7core_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#next-devicetree +spi git git://git.secretlab.ca/git/linux-2.6#next-spi +limits git git://decibel.fi.muni.cz/~xslaby/linux#writable_limits +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-next +als git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/als.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sfi git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git#sfi-test +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#next +hwpoison git git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-mce-2.6.git#hwpoison +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/sysctl-2.6.git#master +driver-core quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-05-driver-core/ +tty quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-06-tty/ +usb quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-07-usb/ +staging quilt http://kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/gregkh-08-staging/ +scsi-post-merge git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6.git#master diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d8811c95c496 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9153 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8862627 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm +Merging origin/master +$ git merge origin/master +Updating 8862627..b0483e7 +Fast-forward + drivers/base/class.c | 2 + + drivers/net/benet/be_cmds.c | 1 + + drivers/net/ixgbe/ixgbe_82598.c | 22 +++++++++++++ + drivers/net/ixgbe/ixgbe_main.c | 4 ++ + drivers/net/sfc/efx.c | 1 + + drivers/net/sfc/qt202x_phy.c | 2 +- + drivers/net/via-velocity.c | 41 +++++++++++------------ + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/b43/b43.h | 1 + + drivers/net/wireless/b43/main.c | 13 ++++++-- + drivers/net/wireless/iwlwifi/iwl-core.c | 1 + + drivers/net/wireless/iwlwifi/iwl-rx.c | 5 ++- + drivers/net/wireless/iwmc3200wifi/rx.c | 2 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 1 + + drivers/serial/8250.c | 7 ++-- + drivers/ssb/main.c | 3 +- + drivers/usb/core/devio.c | 48 +++++++++++++++++---------- + drivers/usb/gadget/f_eem.c | 3 +- + drivers/usb/gadget/multi.c | 2 +- + drivers/usb/gadget/r8a66597-udc.c | 1 + + drivers/usb/gadget/s3c-hsotg.c | 1 + + drivers/usb/host/ehci-hub.c | 13 +++++--- + drivers/usb/host/fhci-tds.c | 6 ++-- + drivers/usb/misc/sisusbvga/sisusb.c | 1 + + drivers/usb/otg/Kconfig | 1 + + drivers/usb/serial/ftdi_sio.c | 25 +++++++++++++-- + drivers/usb/serial/ftdi_sio_ids.h | 18 ++++++++++ + drivers/usb/serial/sierra.c | 1 + + drivers/usb/storage/unusual_devs.h | 2 +- + fs/sysfs/inode.c | 35 ++++++++++---------- + include/linux/kfifo.h | 2 +- + kernel/kfifo.c | 3 +- + net/core/ethtool.c | 1 + + net/ipv4/igmp.c | 2 +- + net/ipv4/ipcomp.c | 6 +--- + net/ipv4/tcp_input.c | 6 +-- + net/ipv6/ipcomp6.c | 6 +--- + net/mac80211/ibss.c | 2 +- + net/mac80211/rate.c | 3 ++ + net/mac80211/scan.c | 18 ++++++----- + net/xfrm/xfrm_state.c | 12 ++----- + 41 files changed, 208 insertions(+), 120 deletions(-) +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Updating b0483e7..2178a3b +Fast-forward + drivers/scsi/fcoe/fcoe.c | 18 ++++++++++++++++-- + drivers/scsi/fcoe/libfcoe.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 2 +- + drivers/scsi/libfc/fc_fcp.c | 3 --- + drivers/scsi/libfc/fc_lport.c | 3 ++- + drivers/scsi/libfc/fc_rport.c | 2 +- + drivers/scsi/libiscsi_tcp.c | 8 +++----- + drivers/scsi/megaraid/megaraid_sas.c | 17 +++++++++++++++-- + 8 files changed, 39 insertions(+), 16 deletions(-) +Merging net-current/master +$ git merge net-current/master +Already up-to-date. +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/for-linus +$ git merge kbuild-current/for-linus +Already up-to-date. +Merging quilt/driver-core.current +$ git merge quilt/driver-core.current +Already up-to-date. +Merging quilt/tty.current +$ git merge quilt/tty.current +Already up-to-date. +Merging quilt/usb.current +$ git merge quilt/usb.current +Already up-to-date. +Merging quilt/staging.current +$ git merge quilt/staging.current +Already up-to-date. +Merging cpufreq-current/fixes +$ git merge cpufreq-current/fixes +Already up-to-date. +Merging input-current/for-linus +$ git merge input-current/for-linus +Merge made by recursive. + drivers/input/serio/i8042.c | 8 ++++++++ + include/linux/input.h | 1 + + 2 files changed, 9 insertions(+), 0 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Merge made by recursive. + Documentation/cdrom/ide-cd | 39 +------------------------- + drivers/ide/cmd640.c | 2 +- + drivers/ide/icside.c | 64 +++++++++++++++++++++++++++++++++++++++++--- + drivers/ide/ide-cs.c | 23 +++++++-------- + drivers/ide/pdc202xx_old.c | 4 +- + drivers/ide/scc_pata.c | 12 +++----- + 6 files changed, 81 insertions(+), 63 deletions(-) +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Removing arch/arm/common/icst307.c +Removing arch/arm/common/icst525.c +Removing arch/arm/include/asm/hardware/icst307.h +Removing arch/arm/include/asm/hardware/icst525.h +Removing arch/arm/mach-integrator/common.h +Removing arch/arm/mach-kirkwood/openrd_base-setup.c +Removing arch/arm/mach-realview/clock.c +Removing arch/arm/mach-realview/clock.h +Removing arch/arm/mach-s3c6400/include/mach/gpio-core.h +Removing arch/arm/mach-s5pc100/include/mach/gpio-core.h +Removing arch/arm/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Removing arch/arm/plat-s3c/dev-usb.c +Merge made by recursive. + Documentation/arm/Samsung/Overview.txt | 86 + + .../arm/Samsung/clksrc-change-registers.awk | 167 ++ + Documentation/arm/memory.txt | 6 +- + arch/arm/Kconfig | 77 +- + arch/arm/Makefile | 4 + + arch/arm/boot/compressed/head.S | 20 +- + arch/arm/common/Kconfig | 5 +- + arch/arm/common/Makefile | 3 +- + arch/arm/common/clkdev.c | 10 + + arch/arm/common/dmabounce.c | 4 +- + arch/arm/common/icst.c | 100 + + arch/arm/common/icst307.c | 161 -- + arch/arm/common/icst525.c | 160 -- + arch/arm/common/vic.c | 265 ++-- + arch/arm/configs/at572d940hfek_defconfig | 1640 ++++++++++++++ + arch/arm/configs/kirkwood_defconfig | 126 +- + arch/arm/configs/mini2440_defconfig | 6 +- + arch/arm/configs/omap_4430sdp_defconfig | 3 + + arch/arm/configs/orion5x_defconfig | 101 +- + arch/arm/configs/raumfeld_defconfig | 1898 ++++++++++++++++ + arch/arm/configs/s3c2410_defconfig | 6 +- + arch/arm/configs/s5p6440_defconfig | 969 +++++++++ + arch/arm/include/asm/atomic.h | 228 ++ + arch/arm/include/asm/cacheflush.h | 56 +- + arch/arm/include/asm/clkdev.h | 3 + + arch/arm/include/asm/dma-mapping.h | 79 +- + arch/arm/include/asm/entry-macro-vic2.S | 57 + + arch/arm/include/asm/hardware/arm_timer.h | 39 +- + arch/arm/include/asm/hardware/icst.h | 59 + + arch/arm/include/asm/hardware/icst307.h | 38 - + arch/arm/include/asm/hardware/icst525.h | 36 - + arch/arm/include/asm/io.h | 11 +- + arch/arm/include/asm/mach/time.h | 8 - + arch/arm/include/asm/memory.h | 23 +- + arch/arm/include/asm/mmu.h | 1 + + arch/arm/include/asm/mmu_context.h | 15 + + arch/arm/include/asm/page.h | 7 +- + arch/arm/include/asm/perf_event.h | 31 + + arch/arm/include/asm/pgtable-nommu.h | 4 +- + arch/arm/include/asm/pmu.h | 75 + + arch/arm/include/asm/setup.h | 12 - + arch/arm/include/asm/smp_plat.h | 5 + + arch/arm/include/asm/spinlock.h | 36 +- + arch/arm/include/asm/system.h | 3 +- + arch/arm/include/asm/thread_info.h | 3 +- + arch/arm/kernel/Makefile | 3 + + arch/arm/kernel/asm-offsets.c | 5 + + arch/arm/kernel/debug.S | 12 +- + arch/arm/kernel/leds.c | 115 + + arch/arm/kernel/perf_event.c | 2276 ++++++++++++++++++++ + arch/arm/kernel/pmu.c | 103 + + arch/arm/kernel/ptrace.c | 53 +- + arch/arm/kernel/setup.c | 79 +- + arch/arm/kernel/time.c | 178 -- + arch/arm/kernel/traps.c | 35 +- + arch/arm/kernel/vmlinux.lds.S | 4 - + arch/arm/mach-aaec2000/include/mach/debug-macro.S | 2 +- + arch/arm/mach-at91/Kconfig | 23 + + arch/arm/mach-at91/Makefile | 4 + + arch/arm/mach-at91/at572d940hf.c | 377 ++++ + arch/arm/mach-at91/at572d940hf_devices.c | 970 +++++++++ + arch/arm/mach-at91/at91rm9200_time.c | 20 +- + arch/arm/mach-at91/at91sam926x_time.c | 11 +- + arch/arm/mach-at91/board-at572d940hf_ek.c | 328 +++ + arch/arm/mach-at91/clock.c | 8 +- + arch/arm/mach-at91/clock.h | 2 +- + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/include/mach/at572d940hf.h | 123 ++ + .../mach-at91/include/mach/at572d940hf_matrix.h | 123 ++ + arch/arm/mach-at91/include/mach/at91_pmc.h | 1 + + arch/arm/mach-at91/include/mach/board.h | 5 +- + arch/arm/mach-at91/include/mach/cpu.h | 8 + + arch/arm/mach-at91/include/mach/debug-macro.S | 2 +- + arch/arm/mach-at91/include/mach/hardware.h | 2 + + arch/arm/mach-at91/include/mach/timex.h | 5 + + arch/arm/mach-bcmring/core.c | 3 +- + arch/arm/mach-clps711x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-davinci/include/mach/debug-macro.S | 2 +- + arch/arm/mach-davinci/include/mach/hardware.h | 2 +- + arch/arm/mach-davinci/io.c | 2 +- + arch/arm/mach-dove/common.c | 8 +- + arch/arm/mach-dove/include/mach/debug-macro.S | 2 +- + arch/arm/mach-dove/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ebsa110/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ep93xx/Kconfig | 14 + + arch/arm/mach-ep93xx/Makefile | 2 + + arch/arm/mach-ep93xx/clock.c | 30 +- + arch/arm/mach-ep93xx/core.c | 9 +- + arch/arm/mach-ep93xx/dma-m2p.c | 6 +- + arch/arm/mach-ep93xx/edb93xx.c | 21 + + arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h | 7 +- + arch/arm/mach-ep93xx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ep93xx/simone.c | 97 + + arch/arm/mach-ep93xx/snappercl15.c | 172 ++ + arch/arm/mach-footbridge/common.c | 7 +- + .../arm/mach-footbridge/include/mach/debug-macro.S | 4 +- + arch/arm/mach-gemini/include/mach/debug-macro.S | 2 +- + arch/arm/mach-gemini/include/mach/vmalloc.h | 2 +- + arch/arm/mach-h720x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-integrator/Kconfig | 1 + + arch/arm/mach-integrator/Makefile | 2 +- + arch/arm/mach-integrator/common.h | 2 - + arch/arm/mach-integrator/core.c | 130 +-- + arch/arm/mach-integrator/cpu.c | 53 +- + arch/arm/mach-integrator/impd1.c | 33 +- + arch/arm/mach-integrator/include/mach/clkdev.h | 7 +- + .../arm/mach-integrator/include/mach/debug-macro.S | 2 +- + .../arm/mach-integrator/include/mach/entry-macro.S | 1 + + arch/arm/mach-integrator/include/mach/hardware.h | 17 +- + arch/arm/mach-integrator/include/mach/platform.h | 54 +- + arch/arm/mach-integrator/integrator_ap.c | 166 ++- + arch/arm/mach-integrator/integrator_cp.c | 84 +- + arch/arm/mach-integrator/leds.c | 1 + + arch/arm/mach-integrator/pci_v3.c | 7 +- + arch/arm/mach-iop13xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-iop13xx/io.c | 7 +- + arch/arm/mach-iop32x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-iop32x/include/mach/vmalloc.h | 2 +- + arch/arm/mach-iop33x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-iop33x/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ixp2000/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ixp2000/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ixp23xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ixp23xx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ixp4xx/common.c | 11 + + arch/arm/mach-ixp4xx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ixp4xx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-kirkwood/Kconfig | 17 + + arch/arm/mach-kirkwood/Makefile | 3 +- + arch/arm/mach-kirkwood/common.c | 8 +- + arch/arm/mach-kirkwood/include/mach/debug-macro.S | 2 +- + arch/arm/mach-kirkwood/include/mach/vmalloc.h | 2 +- + arch/arm/mach-kirkwood/netspace_v2-setup.c | 59 +- + arch/arm/mach-kirkwood/openrd-setup.c | 118 + + arch/arm/mach-kirkwood/openrd_base-setup.c | 96 - + arch/arm/mach-ks8695/include/mach/debug-macro.S | 2 +- + arch/arm/mach-l7200/include/mach/debug-macro.S | 2 +- + arch/arm/mach-lh7a40x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-lh7a40x/include/mach/vmalloc.h | 2 +- + arch/arm/mach-loki/include/mach/debug-macro.S | 2 +- + arch/arm/mach-loki/include/mach/vmalloc.h | 2 +- + arch/arm/mach-mmp/clock.c | 8 - + arch/arm/mach-mmp/clock.h | 2 - + arch/arm/mach-mmp/include/mach/debug-macro.S | 2 +- + arch/arm/mach-mmp/include/mach/vmalloc.h | 2 +- + arch/arm/mach-mmp/pxa168.c | 2 +- + arch/arm/mach-mmp/pxa910.c | 2 +- + arch/arm/mach-msm/include/mach/debug-macro.S | 4 +- + arch/arm/mach-msm/io.c | 3 +- + arch/arm/mach-mv78xx0/include/mach/debug-macro.S | 2 +- + arch/arm/mach-mv78xx0/include/mach/vmalloc.h | 2 +- + arch/arm/mach-mx1/clock.c | 4 +- + arch/arm/mach-mx2/clock_imx21.c | 4 +- + arch/arm/mach-mx2/clock_imx27.c | 4 +- + arch/arm/mach-mx25/clock.c | 5 +- + arch/arm/mach-mx3/clock-imx35.c | 4 +- + arch/arm/mach-mx3/clock.c | 4 +- + arch/arm/mach-mxc91231/clock.c | 4 +- + arch/arm/mach-netx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-nomadik/include/mach/debug-macro.S | 2 +- + arch/arm/mach-nomadik/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ns9xxx/include/mach/debug-macro.S | 2 +- + arch/arm/mach-ns9xxx/include/mach/vmalloc.h | 2 +- + arch/arm/mach-nuc93x/Kconfig | 19 + + arch/arm/mach-nuc93x/Makefile | 14 + + arch/arm/mach-nuc93x/Makefile.boot | 3 + + arch/arm/mach-nuc93x/clock.c | 83 + + arch/arm/mach-nuc93x/clock.h | 36 + + arch/arm/mach-nuc93x/cpu.c | 135 ++ + arch/arm/mach-nuc93x/cpu.h | 48 + + arch/arm/mach-nuc93x/dev.c | 42 + + arch/arm/mach-nuc93x/include/mach/clkdev.h | 7 + + arch/arm/mach-nuc93x/include/mach/entry-macro.S | 32 + + arch/arm/mach-nuc93x/include/mach/hardware.h | 22 + + arch/arm/mach-nuc93x/include/mach/io.h | 28 + + arch/arm/mach-nuc93x/include/mach/irqs.h | 59 + + arch/arm/mach-nuc93x/include/mach/map.h | 139 ++ + arch/arm/mach-nuc93x/include/mach/memory.h | 21 + + arch/arm/mach-nuc93x/include/mach/regs-clock.h | 53 + + arch/arm/mach-nuc93x/include/mach/regs-ebi.h | 33 + + arch/arm/mach-nuc93x/include/mach/regs-irq.h | 42 + + arch/arm/mach-nuc93x/include/mach/regs-serial.h | 52 + + arch/arm/mach-nuc93x/include/mach/regs-timer.h | 28 + + arch/arm/mach-nuc93x/include/mach/system.h | 28 + + arch/arm/mach-nuc93x/include/mach/timex.h | 25 + + arch/arm/mach-nuc93x/include/mach/uncompress.h | 50 + + arch/arm/mach-nuc93x/include/mach/vmalloc.h | 23 + + arch/arm/mach-nuc93x/irq.c | 66 + + arch/arm/mach-nuc93x/mach-nuc932evb.c | 45 + + arch/arm/mach-nuc93x/nuc932.c | 65 + + arch/arm/mach-nuc93x/nuc932.h | 29 + + arch/arm/mach-nuc93x/time.c | 100 + + arch/arm/mach-omap1/include/mach/debug-macro.S | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 54 + + arch/arm/mach-omap2/include/mach/debug-macro.S | 2 +- + arch/arm/mach-orion5x/Kconfig | 7 + + arch/arm/mach-orion5x/Makefile | 1 + + arch/arm/mach-orion5x/common.c | 4 +- + arch/arm/mach-orion5x/d2net-setup.c | 45 +- + arch/arm/mach-orion5x/dns323-setup.c | 36 +- + arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 +- + arch/arm/mach-orion5x/include/mach/vmalloc.h | 2 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 276 +++ + arch/arm/mach-orion5x/lsmini-setup.c | 8 +- + arch/arm/mach-pnx4008/clock.c | 173 +- + arch/arm/mach-pnx4008/clock.h | 6 +- + arch/arm/mach-pnx4008/i2c.c | 108 +- + arch/arm/mach-pnx4008/include/mach/clkdev.h | 7 + + arch/arm/mach-pnx4008/include/mach/debug-macro.S | 2 +- + arch/arm/mach-pnx4008/include/mach/timex.h | 54 - + arch/arm/mach-pnx4008/pm.c | 2 + + arch/arm/mach-pnx4008/time.c | 2 + + arch/arm/mach-pnx4008/time.h | 70 + + arch/arm/mach-pxa/Kconfig | 18 + + arch/arm/mach-pxa/Makefile | 3 + + arch/arm/mach-pxa/clock.c | 8 - + arch/arm/mach-pxa/clock.h | 4 - + arch/arm/mach-pxa/eseries.c | 2 +- + arch/arm/mach-pxa/include/mach/debug-macro.S | 2 +- + arch/arm/mach-pxa/include/mach/vmalloc.h | 2 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa300.c | 4 +- + arch/arm/mach-pxa/pxa320.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 1100 ++++++++++ + arch/arm/mach-pxa/time.c | 10 +- + arch/arm/mach-realview/Makefile | 2 +- + arch/arm/mach-realview/clock.c | 64 - + arch/arm/mach-realview/clock.h | 19 - + arch/arm/mach-realview/core.c | 189 +-- + arch/arm/mach-realview/include/mach/clkdev.h | 9 + + arch/arm/mach-realview/include/mach/debug-macro.S | 2 +- + arch/arm/mach-realview/include/mach/irqs-pb1176.h | 1 + + arch/arm/mach-realview/include/mach/irqs-pba8.h | 8 +- + arch/arm/mach-realview/include/mach/irqs-pbx.h | 14 +- + arch/arm/mach-realview/include/mach/platform.h | 20 - + arch/arm/mach-realview/include/mach/vmalloc.h | 2 +- + arch/arm/mach-realview/realview_eb.c | 2 - + arch/arm/mach-realview/realview_pb1176.c | 2 - + arch/arm/mach-realview/realview_pb11mp.c | 2 - + arch/arm/mach-realview/realview_pba8.c | 2 - + arch/arm/mach-rpc/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s3c2410/include/mach/debug-macro.S | 2 +- + .../include/mach/{gpio-core.h => gpio-track.h} | 1 - + arch/arm/mach-s3c2410/mach-amlm5900.c | 2 +- + arch/arm/mach-s3c2410/mach-bast.c | 2 +- + arch/arm/mach-s3c2410/mach-h1940.c | 7 +- + arch/arm/mach-s3c2410/mach-n30.c | 2 +- + arch/arm/mach-s3c2410/mach-otom.c | 2 +- + arch/arm/mach-s3c2410/mach-qt2410.c | 2 +- + arch/arm/mach-s3c2410/mach-smdk2410.c | 2 +- + arch/arm/mach-s3c2410/mach-tct_hammer.c | 2 +- + arch/arm/mach-s3c2410/mach-vr1000.c | 2 +- + arch/arm/mach-s3c2410/usb-simtec.c | 4 +- + arch/arm/mach-s3c2412/clock.c | 52 +- + arch/arm/mach-s3c2412/mach-jive.c | 2 +- + arch/arm/mach-s3c2412/mach-smdk2413.c | 3 +- + arch/arm/mach-s3c2412/mach-vstms.c | 2 +- + arch/arm/mach-s3c2440/clock.c | 6 +- + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 7 +- + arch/arm/mach-s3c2440/mach-mini2440.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- + arch/arm/mach-s3c2442/clock.c | 6 +- + arch/arm/mach-s3c2442/mach-gta02.c | 7 +- + arch/arm/mach-s3c2443/clock.c | 97 +- + arch/arm/mach-s3c24a0/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s3c24a0/include/mach/vmalloc.h | 2 +- + arch/arm/mach-s3c6400/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s3c6400/include/mach/entry-macro.S | 28 +- + arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 - + arch/arm/mach-s3c6400/include/mach/map.h | 22 +- + arch/arm/mach-s3c6400/include/mach/tick.h | 2 +- + arch/arm/mach-s3c6410/mach-hmt.c | 2 +- + arch/arm/mach-s3c6410/mach-smdk6410.c | 40 +- + arch/arm/mach-s5p6440/Kconfig | 23 + + arch/arm/mach-s5p6440/Makefile | 19 + + arch/arm/mach-s5p6440/Makefile.boot | 2 + + arch/arm/mach-s5p6440/cpu.c | 114 + + arch/arm/mach-s5p6440/include/mach/debug-macro.S | 37 + + arch/arm/mach-s5p6440/include/mach/entry-macro.S | 16 + + arch/arm/mach-s5p6440/include/mach/gpio.h | 80 + + arch/arm/mach-s5p6440/include/mach/hardware.h | 18 + + arch/arm/mach-s5p6440/include/mach/irqs.h | 111 + + arch/arm/mach-s5p6440/include/mach/map.h | 107 + + arch/arm/mach-s5p6440/include/mach/memory.h | 19 + + arch/arm/mach-s5p6440/include/mach/pwm-clock.h | 62 + + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 ++ + arch/arm/mach-s5p6440/include/mach/regs-gpio.h | 54 + + arch/arm/mach-s5p6440/include/mach/regs-irq.h | 19 + + arch/arm/mach-s5p6440/include/mach/system.h | 26 + + arch/arm/mach-s5p6440/include/mach/tick.h | 24 + + arch/arm/mach-s5p6440/include/mach/uncompress.h | 24 + + arch/arm/mach-s5p6440/mach-smdk6440.c | 111 + + arch/arm/mach-s5p6440/s5p6440-gpio.c | 322 +++ + arch/arm/mach-s5pc100/include/mach/debug-macro.S | 2 +- + arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 - + arch/arm/mach-s5pc100/include/mach/tick.h | 2 +- + arch/arm/mach-sa1100/include/mach/debug-macro.S | 2 +- + arch/arm/mach-sa1100/include/mach/vmalloc.h | 2 +- + arch/arm/mach-sa1100/time.c | 8 +- + arch/arm/mach-shark/include/mach/debug-macro.S | 2 +- + arch/arm/mach-u300/clock.c | 5 +- + arch/arm/mach-u300/core.c | 1029 +++++++++- + arch/arm/mach-u300/include/mach/debug-macro.S | 2 +- + arch/arm/mach-u300/include/mach/dma_channels.h | 69 + + arch/arm/mach-u300/include/mach/vmalloc.h | 2 +- + arch/arm/mach-ux500/board-mop500.c | 88 + + arch/arm/mach-ux500/clock.c | 5 +- + arch/arm/mach-ux500/cpu-u8500.c | 1 + + arch/arm/mach-ux500/include/mach/debug-macro.S | 11 +- + arch/arm/mach-ux500/include/mach/vmalloc.h | 2 +- + arch/arm/mach-versatile/Makefile | 2 +- + arch/arm/mach-versatile/clock.c | 65 - + arch/arm/mach-versatile/clock.h | 20 - + arch/arm/mach-versatile/core.c | 189 +-- + arch/arm/mach-versatile/include/mach/clkdev.h | 9 + + arch/arm/mach-versatile/include/mach/debug-macro.S | 2 +- + arch/arm/mach-versatile/include/mach/entry-macro.S | 1 + + arch/arm/mach-versatile/include/mach/hardware.h | 3 +- + arch/arm/mach-versatile/include/mach/platform.h | 26 +- + arch/arm/mach-w90x900/clock.c | 9 - + arch/arm/mach-w90x900/clock.h | 1 - + arch/arm/mach-w90x900/cpu.c | 2 +- + arch/arm/mach-w90x900/include/mach/vmalloc.h | 2 +- + arch/arm/mm/Kconfig | 6 +- + arch/arm/mm/alignment.c | 6 +- + arch/arm/mm/cache-fa.S | 32 +- + arch/arm/mm/cache-l2x0.c | 72 +- + arch/arm/mm/cache-v3.S | 43 +- + arch/arm/mm/cache-v4.S | 43 +- + arch/arm/mm/cache-v4wb.S | 32 +- + arch/arm/mm/cache-v4wt.S | 40 +- + arch/arm/mm/cache-v6.S | 34 +- + arch/arm/mm/cache-v7.S | 34 +- + arch/arm/mm/context.c | 124 +- + arch/arm/mm/copypage-feroceon.c | 3 +- + arch/arm/mm/copypage-v3.c | 2 +- + arch/arm/mm/copypage-v4mc.c | 2 +- + arch/arm/mm/copypage-v4wb.c | 3 +- + arch/arm/mm/copypage-v4wt.c | 2 +- + arch/arm/mm/copypage-v6.c | 4 +- + arch/arm/mm/copypage-xsc3.c | 3 +- + arch/arm/mm/copypage-xscale.c | 2 +- + arch/arm/mm/dma-mapping.c | 162 +- + arch/arm/mm/fault.c | 7 + + arch/arm/mm/flush.c | 51 +- + arch/arm/mm/init.c | 113 +- + arch/arm/mm/ioremap.c | 57 +- + arch/arm/mm/mmu.c | 41 +- + arch/arm/mm/nommu.c | 12 + + arch/arm/mm/proc-arm1020.S | 32 +- + arch/arm/mm/proc-arm1020e.S | 32 +- + arch/arm/mm/proc-arm1022.S | 32 +- + arch/arm/mm/proc-arm1026.S | 32 +- + arch/arm/mm/proc-arm920.S | 32 +- + arch/arm/mm/proc-arm922.S | 32 +- + arch/arm/mm/proc-arm925.S | 32 +- + arch/arm/mm/proc-arm926.S | 32 +- + arch/arm/mm/proc-arm940.S | 32 +- + arch/arm/mm/proc-arm946.S | 32 +- + arch/arm/mm/proc-feroceon.S | 54 +- + arch/arm/mm/proc-mohawk.S | 32 +- + arch/arm/mm/proc-xsc3.S | 32 +- + arch/arm/mm/proc-xscale.S | 49 +- + arch/arm/oprofile/op_model_arm11_core.c | 4 +- + arch/arm/oprofile/op_model_arm11_core.h | 4 +- + arch/arm/oprofile/op_model_mpcore.c | 42 +- + arch/arm/oprofile/op_model_v6.c | 30 +- + arch/arm/oprofile/op_model_v7.c | 30 +- + arch/arm/oprofile/op_model_v7.h | 4 +- + arch/arm/oprofile/op_model_xscale.c | 35 +- + arch/arm/plat-iop/io.c | 3 +- + arch/arm/plat-mxc/include/mach/debug-macro.S | 2 +- + arch/arm/plat-mxc/include/mach/vmalloc.h | 2 +- + arch/arm/plat-nomadik/include/plat/i2c.h | 37 + + arch/arm/plat-nomadik/timer.c | 9 +- + arch/arm/plat-omap/include/plat/omap44xx.h | 1 + + arch/arm/plat-omap/io.c | 2 +- + arch/arm/plat-s3c/Kconfig | 119 - + arch/arm/plat-s3c/Makefile | 24 +- + arch/arm/plat-s3c/dev-usb.c | 50 - + arch/arm/plat-s3c/include/mach/vmalloc.h | 2 +- + arch/arm/plat-s3c/include/plat/cpu.h | 3 + + arch/arm/plat-s3c/include/plat/devs.h | 6 +- + arch/arm/plat-s3c/include/plat/pm.h | 4 +- + arch/arm/plat-s3c/include/plat/regs-serial.h | 30 + + arch/arm/plat-s3c/include/plat/usb-control.h | 2 + + arch/arm/plat-s3c/pm.c | 6 +- + arch/arm/plat-s3c24xx/Kconfig | 7 - + arch/arm/plat-s3c24xx/Makefile | 1 - + arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- + arch/arm/plat-s3c24xx/devs.c | 41 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + arch/arm/plat-s3c24xx/include/plat/mci.h | 9 + + arch/arm/plat-s3c24xx/s3c244x-clock.c | 4 +- + arch/arm/plat-s3c64xx/Kconfig | 4 + + arch/arm/plat-s3c64xx/Makefile | 6 + + arch/arm/plat-s3c64xx/clock.c | 22 +- + arch/arm/plat-s3c64xx/cpu.c | 9 +- + arch/arm/plat-s3c64xx/dev-adc.c | 46 + + arch/arm/plat-s3c64xx/dev-audio.c | 91 +- + arch/arm/plat-s3c64xx/dev-rtc.c | 43 + + arch/arm/plat-s3c64xx/dev-spi.c | 183 ++ + arch/arm/plat-s3c64xx/dev-uart.c | 29 - + arch/arm/plat-s3c64xx/gpiolib.c | 164 +-- + arch/arm/plat-s3c64xx/include/plat/irqs.h | 12 +- + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 71 +- + arch/arm/plat-s3c64xx/include/plat/regs-srom.h | 59 + + arch/arm/plat-s3c64xx/include/plat/spi-clocks.h | 18 + + arch/arm/plat-s3c64xx/irq.c | 209 +-- + arch/arm/plat-s3c64xx/s3c6400-clock.c | 510 ++---- + arch/arm/plat-s5p/Kconfig | 42 + + arch/arm/plat-s5p/Makefile | 24 + + arch/arm/plat-s5p/clock.c | 136 ++ + arch/arm/plat-s5p/cpu.c | 90 + + arch/arm/plat-s5p/dev-uart.c | 137 ++ + arch/arm/plat-s5p/include/plat/irqs.h | 83 + + arch/arm/plat-s5p/include/plat/pll.h | 83 + + arch/arm/plat-s5p/include/plat/s5p-clock.h | 38 + + arch/arm/plat-s5p/include/plat/s5p6440.h | 37 + + arch/arm/plat-s5p/irq.c | 73 + + arch/arm/plat-s5p/s5p6440-clock.c | 698 ++++++ + arch/arm/plat-s5p/s5p6440-init.c | 50 + + arch/arm/plat-s5p/setup-i2c0.c | 25 + + arch/arm/plat-s5pc1xx/Kconfig | 3 + + arch/arm/plat-s5pc1xx/clock.c | 31 +- + arch/arm/plat-s5pc1xx/dev-uart.c | 29 - + arch/arm/plat-s5pc1xx/gpio-config.c | 2 +- + arch/arm/plat-s5pc1xx/gpiolib.c | 2 +- + arch/arm/plat-s5pc1xx/include/plat/irqs.h | 19 +- + arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 119 +- + arch/arm/plat-s5pc1xx/irq.c | 202 +-- + arch/arm/plat-s5pc1xx/s5pc100-clock.c | 770 +++----- + arch/arm/plat-samsung/Kconfig | 163 ++ + arch/arm/plat-samsung/Makefile | 38 + + arch/arm/{plat-s3c24xx => plat-samsung}/adc.c | 31 +- + arch/arm/plat-samsung/clock-clksrc.c | 212 ++ + arch/arm/{plat-s3c => plat-samsung}/clock.c | 55 +- + arch/arm/{plat-s3c => plat-samsung}/dev-fb.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c | 0 + arch/arm/{plat-s3c => plat-samsung}/dev-nand.c | 0 + arch/arm/plat-samsung/dev-uart.c | 44 + + .../arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c | 0 + arch/arm/plat-samsung/dev-usb.c | 69 + + arch/arm/{plat-s3c => plat-samsung}/gpio-config.c | 2 +- + arch/arm/{plat-s3c => plat-samsung}/gpio.c | 2 +- + arch/arm/plat-samsung/gpiolib.c | 199 ++ + .../{plat-s3c => plat-samsung}/include/plat/adc.h | 4 +- + arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 + + .../include/plat/clock.h | 35 +- + .../include/plat/dma-core.h | 0 + .../include/plat/gpio-cfg-helpers.h | 0 + .../include/plat/gpio-cfg.h | 0 + .../include/plat/gpio-core.h | 30 + + .../include/plat/hwmon.h | 0 + .../include/plat/iic-core.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/iic.h | 0 + arch/arm/plat-samsung/include/plat/irq-uart.h | 20 + + arch/arm/plat-samsung/include/plat/irq-vic-timer.h | 13 + + .../{plat-s3c => plat-samsung}/include/plat/nand.h | 0 + .../include/plat/regs-ac97.h | 0 + .../include/plat/regs-adc.h | 3 + + .../include/plat/regs-iic.h | 0 + .../include/plat/regs-irqtype.h | 0 + .../include/plat/regs-nand.h | 0 + .../include/plat/regs-rtc.h | 0 + .../include/plat/regs-s3c2412-iis.h | 0 + .../include/plat/regs-sdhci.h | 0 + .../include/plat/regs-timer.h | 0 + .../include/plat/regs-usb-hsotg-phy.h | 0 + .../include/plat/regs-usb-hsotg.h | 0 + .../include/plat/regs-watchdog.h | 0 + arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 67 + + .../include/plat/sdhci.h | 0 + .../include/plat/udc-hs.h | 4 +- + .../include/plat/watchdog-reset.h | 0 + arch/arm/plat-samsung/irq-uart.c | 143 ++ + arch/arm/plat-samsung/irq-vic-timer.c | 86 + + arch/arm/{plat-s3c => plat-samsung}/pm-check.c | 8 +- + arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c | 2 +- + arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 +- + arch/arm/{plat-s3c => plat-samsung}/pwm.c | 0 + arch/arm/plat-stmp3xxx/clock.c | 3 +- + arch/arm/plat-stmp3xxx/include/mach/debug-macro.S | 2 +- + arch/arm/plat-stmp3xxx/include/mach/vmalloc.h | 2 +- + arch/arm/plat-versatile/Makefile | 4 + + .../{mach-integrator => plat-versatile}/clock.c | 17 +- + arch/arm/plat-versatile/include/plat/timer-sp.h | 2 + + arch/arm/plat-versatile/sched-clock.c | 53 + + arch/arm/plat-versatile/timer-sp.c | 156 ++ + arch/arm/vfp/vfpmodule.c | 55 +- + drivers/i2c/busses/i2c-pnx.c | 285 ++-- + drivers/mmc/host/mmci.c | 11 + + drivers/rtc/rtc-pl031.c | 365 +++- + drivers/serial/Kconfig | 15 +- + drivers/serial/Makefile | 1 + + drivers/serial/s5pv210.c | 154 ++ + drivers/serial/samsung.c | 6 +- + drivers/serial/samsung.h | 19 +- + drivers/spi/amba-pl022.c | 18 +- + drivers/watchdog/pnx4008_wdt.c | 39 +- + include/linux/i2c-pnx.h | 19 +- + 511 files changed, 23270 insertions(+), 5362 deletions(-) + create mode 100644 Documentation/arm/Samsung/Overview.txt + create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk + create mode 100644 arch/arm/common/icst.c + delete mode 100644 arch/arm/common/icst307.c + delete mode 100644 arch/arm/common/icst525.c + create mode 100644 arch/arm/configs/at572d940hfek_defconfig + create mode 100644 arch/arm/configs/raumfeld_defconfig + create mode 100644 arch/arm/configs/s5p6440_defconfig + create mode 100644 arch/arm/include/asm/entry-macro-vic2.S + create mode 100644 arch/arm/include/asm/hardware/icst.h + delete mode 100644 arch/arm/include/asm/hardware/icst307.h + delete mode 100644 arch/arm/include/asm/hardware/icst525.h + create mode 100644 arch/arm/include/asm/perf_event.h + create mode 100644 arch/arm/include/asm/pmu.h + create mode 100644 arch/arm/kernel/leds.c + create mode 100644 arch/arm/kernel/perf_event.c + create mode 100644 arch/arm/kernel/pmu.c + create mode 100644 arch/arm/mach-at91/at572d940hf.c + create mode 100644 arch/arm/mach-at91/at572d940hf_devices.c + create mode 100644 arch/arm/mach-at91/board-at572d940hf_ek.c + create mode 100644 arch/arm/mach-at91/include/mach/at572d940hf.h + create mode 100644 arch/arm/mach-at91/include/mach/at572d940hf_matrix.h + create mode 100644 arch/arm/mach-ep93xx/simone.c + create mode 100644 arch/arm/mach-ep93xx/snappercl15.c + delete mode 100644 arch/arm/mach-integrator/common.h + create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c + delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c + create mode 100644 arch/arm/mach-nuc93x/Kconfig + create mode 100644 arch/arm/mach-nuc93x/Makefile + create mode 100644 arch/arm/mach-nuc93x/Makefile.boot + create mode 100644 arch/arm/mach-nuc93x/clock.c + create mode 100644 arch/arm/mach-nuc93x/clock.h + create mode 100644 arch/arm/mach-nuc93x/cpu.c + create mode 100644 arch/arm/mach-nuc93x/cpu.h + create mode 100644 arch/arm/mach-nuc93x/dev.c + create mode 100644 arch/arm/mach-nuc93x/include/mach/clkdev.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-nuc93x/include/mach/hardware.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/io.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/irqs.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/map.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/memory.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-ebi.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-serial.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/regs-timer.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/system.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/timex.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/uncompress.h + create mode 100644 arch/arm/mach-nuc93x/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-nuc93x/irq.c + create mode 100644 arch/arm/mach-nuc93x/mach-nuc932evb.c + create mode 100644 arch/arm/mach-nuc93x/nuc932.c + create mode 100644 arch/arm/mach-nuc93x/nuc932.h + create mode 100644 arch/arm/mach-nuc93x/time.c + create mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c + create mode 100644 arch/arm/mach-pnx4008/include/mach/clkdev.h + create mode 100644 arch/arm/mach-pnx4008/time.h + create mode 100644 arch/arm/mach-pxa/raumfeld.c + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) + delete mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h + create mode 100644 arch/arm/mach-s5p6440/Kconfig + create mode 100644 arch/arm/mach-s5p6440/Makefile + create mode 100644 arch/arm/mach-s5p6440/Makefile.boot + create mode 100644 arch/arm/mach-s5p6440/cpu.c + create mode 100644 arch/arm/mach-s5p6440/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-s5p6440/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5p6440/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/hardware.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/map.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/memory.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/pwm-clock.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-gpio.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-irq.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/uncompress.h + create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c + create mode 100644 arch/arm/mach-s5p6440/s5p6440-gpio.c + delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h + create mode 100644 arch/arm/mach-u300/include/mach/dma_channels.h + delete mode 100644 arch/arm/mach-versatile/clock.c + delete mode 100644 arch/arm/mach-versatile/clock.h + create mode 100644 arch/arm/plat-nomadik/include/plat/i2c.h + delete mode 100644 arch/arm/plat-s3c/dev-usb.c + create mode 100644 arch/arm/plat-s3c64xx/dev-adc.c + create mode 100644 arch/arm/plat-s3c64xx/dev-rtc.c + create mode 100644 arch/arm/plat-s3c64xx/dev-spi.c + create mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-srom.h + create mode 100644 arch/arm/plat-s3c64xx/include/plat/spi-clocks.h + create mode 100644 arch/arm/plat-s5p/Kconfig + create mode 100644 arch/arm/plat-s5p/Makefile + create mode 100644 arch/arm/plat-s5p/clock.c + create mode 100644 arch/arm/plat-s5p/cpu.c + create mode 100644 arch/arm/plat-s5p/dev-uart.c + create mode 100644 arch/arm/plat-s5p/include/plat/irqs.h + create mode 100644 arch/arm/plat-s5p/include/plat/pll.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5p-clock.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5p6440.h + create mode 100644 arch/arm/plat-s5p/irq.c + create mode 100644 arch/arm/plat-s5p/s5p6440-clock.c + create mode 100644 arch/arm/plat-s5p/s5p6440-init.c + create mode 100644 arch/arm/plat-s5p/setup-i2c0.c + rename arch/arm/{plat-s3c24xx => plat-samsung}/adc.c (94%) + create mode 100644 arch/arm/plat-samsung/clock-clksrc.c + rename arch/arm/{plat-s3c => plat-samsung}/clock.c (84%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-fb.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc1.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-hsmmc2.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c0.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-i2c1.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/dev-nand.c (100%) + create mode 100644 arch/arm/plat-samsung/dev-uart.c + rename arch/arm/{plat-s3c => plat-samsung}/dev-usb-hsotg.c (100%) + create mode 100644 arch/arm/plat-samsung/dev-usb.c + rename arch/arm/{plat-s3c => plat-samsung}/gpio-config.c (99%) + rename arch/arm/{plat-s3c => plat-samsung}/gpio.c (99%) + create mode 100644 arch/arm/plat-samsung/gpiolib.c + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/adc.h (92%) + create mode 100644 arch/arm/plat-samsung/include/plat/clock-clksrc.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/clock.h (72%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma-core.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg-helpers.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-cfg.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/gpio-core.h (76%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/hwmon.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic-core.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic.h (100%) + create mode 100644 arch/arm/plat-samsung/include/plat/irq-uart.h + create mode 100644 arch/arm/plat-samsung/include/plat/irq-vic-timer.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/nand.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-ac97.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-adc.h (92%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-iic.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-irqtype.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-nand.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-rtc.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-s3c2412-iis.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-sdhci.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-timer.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg-phy.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-watchdog.h (100%) + create mode 100644 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/sdhci.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/udc-hs.h (93%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/watchdog-reset.h (100%) + create mode 100644 arch/arm/plat-samsung/irq-uart.c + create mode 100644 arch/arm/plat-samsung/irq-vic-timer.c + rename arch/arm/{plat-s3c => plat-samsung}/pm-check.c (95%) + rename arch/arm/{plat-s3c => plat-samsung}/pm-gpio.c (99%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (82%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm.c (100%) + create mode 100644 arch/arm/plat-versatile/Makefile + rename arch/arm/{mach-integrator => plat-versatile}/clock.c (77%) + create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h + create mode 100644 arch/arm/plat-versatile/sched-clock.c + create mode 100644 arch/arm/plat-versatile/timer-sp.c + create mode 100644 drivers/serial/s5pv210.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Merge made by recursive. + arch/arm/mach-davinci/Kconfig | 4 + + arch/arm/mach-davinci/Makefile | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 4 +- + arch/arm/mach-davinci/board-da850-evm.c | 34 +++- + arch/arm/mach-davinci/board-dm355-evm.c | 2 + + arch/arm/mach-davinci/board-dm365-evm.c | 94 +++++++ + arch/arm/mach-davinci/board-dm644x-evm.c | 2 + + arch/arm/mach-davinci/board-dm646x-evm.c | 143 +++++++--- + arch/arm/mach-davinci/cdce949.c | 293 ++++++++++++++++++++ + arch/arm/mach-davinci/clock.c | 93 +++---- + arch/arm/mach-davinci/clock.h | 45 ++- + arch/arm/mach-davinci/common.c | 2 +- + arch/arm/mach-davinci/cpuidle.c | 38 +--- + arch/arm/mach-davinci/da830.c | 10 +- + arch/arm/mach-davinci/da850.c | 90 +++++- + arch/arm/mach-davinci/devices-da8xx.c | 146 +++++++++- + arch/arm/mach-davinci/dm355.c | 49 ++-- + arch/arm/mach-davinci/dm365.c | 213 ++++++++++++++- + arch/arm/mach-davinci/dm644x.c | 12 +- + arch/arm/mach-davinci/dm646x.c | 14 +- + arch/arm/mach-davinci/dma.c | 67 ++++- + arch/arm/mach-davinci/include/mach/cdce949.h | 19 ++ + arch/arm/mach-davinci/include/mach/common.h | 2 +- + arch/arm/mach-davinci/include/mach/cpuidle.h | 1 + + arch/arm/mach-davinci/include/mach/da8xx.h | 18 +- + arch/arm/mach-davinci/include/mach/dm365.h | 11 +- + arch/arm/mach-davinci/include/mach/dm644x.h | 2 +- + arch/arm/mach-davinci/include/mach/dm646x.h | 4 +- + arch/arm/mach-davinci/include/mach/edma.h | 2 - + arch/arm/mach-davinci/include/mach/i2c.h | 2 + + arch/arm/mach-davinci/include/mach/memory.h | 5 + + arch/arm/mach-davinci/include/mach/mux.h | 3 + + arch/arm/mach-davinci/include/mach/pm.h | 54 ++++ + arch/arm/mach-davinci/include/mach/psc.h | 15 + + arch/arm/mach-davinci/include/mach/spi.h | 44 +++ + arch/arm/mach-davinci/include/mach/timex.h | 7 +- + arch/arm/mach-davinci/pm.c | 158 +++++++++++ + arch/arm/mach-davinci/psc.c | 11 - + arch/arm/mach-davinci/sleep.S | 224 +++++++++++++++ + drivers/net/Kconfig | 2 +- + drivers/net/davinci_emac.c | 55 +++-- + .../mach/emac.h => include/linux/davinci_emac.h | 7 +- + 42 files changed, 1708 insertions(+), 296 deletions(-) + create mode 100644 arch/arm/mach-davinci/cdce949.c + create mode 100644 arch/arm/mach-davinci/include/mach/cdce949.h + create mode 100644 arch/arm/mach-davinci/include/mach/pm.h + create mode 100644 arch/arm/mach-davinci/include/mach/spi.h + create mode 100644 arch/arm/mach-davinci/pm.c + create mode 100644 arch/arm/mach-davinci/sleep.S + rename arch/arm/mach-davinci/include/mach/emac.h => include/linux/davinci_emac.h (83%) +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/Makefile' using previous resolution. +Renaming arch/arm/mach-mx3/clock.c => arch/arm/mach-mx3/clock-imx31.c +Auto-merging arch/arm/mach-mx3/clock-imx31.c +Auto-merging MAINTAINERS +Auto-merging arch/arm/Makefile +CONFLICT (content): Merge conflict in arch/arm/Makefile +Removing arch/arm/configs/mx1ads_defconfig +Auto-merging arch/arm/mach-mx2/clock_imx21.c +Auto-merging arch/arm/mach-mx2/clock_imx27.c +Removing arch/arm/mach-mx2/crm_regs.h +Removing arch/arm/mach-mx2/pca100.c +Auto-merging arch/arm/mach-mx25/clock.c +Auto-merging arch/arm/mach-mx3/clock-imx35.c +Removing arch/arm/mach-mx3/pcm043.c +Auto-merging arch/arm/plat-mxc/include/mach/debug-macro.S +Auto-merging arch/arm/plat-mxc/include/mach/uncompress.h +Auto-merging drivers/serial/imx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 942abe7] Merge remote branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + arch/arm/Makefile | 1 + + arch/arm/configs/mx1ads_defconfig | 742 ----------- + arch/arm/configs/mx27_defconfig | 2 +- + arch/arm/configs/mx51_defconfig | 1286 ++++++++++++++++++++ + arch/arm/mach-mx1/Makefile | 5 +- + arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} | 6 +- + arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 2 +- + arch/arm/mach-mx2/Kconfig | 10 +- + arch/arm/mach-mx2/Makefile | 19 +- + arch/arm/mach-mx2/clock_imx21.c | 236 ++++- + arch/arm/mach-mx2/clock_imx27.c | 33 +- + arch/arm/mach-mx2/cpu_imx27.c | 3 +- + arch/arm/mach-mx2/crm_regs.h | 258 ---- + .../{eukrea_cpuimx27.c => mach-cpuimx27.c} | 14 +- + arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} | 6 +- + arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} | 12 +- + arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} | 6 +- + arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} | 8 +- + arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} | 6 +- + arch/arm/mach-mx2/mach-pca100.c | 395 ++++++ + arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} | 36 +- + arch/arm/mach-mx2/pca100.c | 244 ---- + arch/arm/mach-mx2/pcm970-baseboard.c | 4 +- + arch/arm/mach-mx2/serial.c | 48 +- + arch/arm/mach-mx25/Makefile | 2 +- + arch/arm/mach-mx25/clock.c | 2 + + arch/arm/mach-mx25/devices.c | 39 + + arch/arm/mach-mx25/devices.h | 2 + + arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} | 10 +- + arch/arm/mach-mx3/Kconfig | 2 + + arch/arm/mach-mx3/Makefile | 32 +- + arch/arm/mach-mx3/{clock.c => clock-imx31.c} | 5 +- + arch/arm/mach-mx3/clock-imx35.c | 5 +- + arch/arm/mach-mx3/cpu.c | 2 +- + arch/arm/mach-mx3/crm_regs.h | 2 +- + arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} | 2 +- + .../{armadillo5x0.c => mach-armadillo5x0.c} | 14 +- + .../mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} | 33 +- + arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} | 12 +- + arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} | 30 +- + .../arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} | 10 +- + arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} | 16 +- + .../mach-mx3/{mx31moboard.c => mach-mx31moboard.c} | 49 +- + arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} | 6 +- + arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} | 155 ++- + .../mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} | 0 + arch/arm/mach-mx3/mach-pcm043.c | 413 +++++++ + arch/arm/mach-mx3/{qong.c => mach-qong.c} | 20 +- + arch/arm/mach-mx3/mx31lite-db.c | 30 +- + arch/arm/mach-mx3/mx31moboard-devboard.c | 32 + + arch/arm/mach-mx3/mx31moboard-marxbot.c | 39 +- + arch/arm/mach-mx3/mx31moboard-smartbot.c | 162 +++ + arch/arm/mach-mx3/pcm043.c | 259 ---- + arch/arm/mach-mx5/Kconfig | 18 + + arch/arm/mach-mx5/Makefile | 9 + + arch/arm/mach-mx5/Makefile.boot | 3 + + arch/arm/mach-mx5/board-mx51_babbage.c | 98 ++ + arch/arm/mach-mx5/clock-mx51.c | 825 +++++++++++++ + arch/arm/mach-mx5/cpu.c | 47 + + arch/arm/mach-mx5/crm_regs.h | 583 +++++++++ + arch/arm/mach-mx5/devices.c | 96 ++ + arch/arm/mach-mx5/devices.h | 4 + + arch/arm/mach-mx5/mm.c | 89 ++ + arch/arm/mach-mxc91231/magx-zn5.c | 2 +- + arch/arm/plat-mxc/Kconfig | 16 + + arch/arm/plat-mxc/Makefile | 7 + + arch/arm/plat-mxc/clock.c | 1 + + arch/arm/plat-mxc/ehci.c | 122 ++- + arch/arm/plat-mxc/include/mach/board-kzmarm11.h | 18 +- + arch/arm/plat-mxc/include/mach/board-mx31ads.h | 2 +- + arch/arm/plat-mxc/include/mach/board-mx31moboard.h | 2 + + arch/arm/plat-mxc/include/mach/common.h | 5 + + arch/arm/plat-mxc/include/mach/debug-macro.S | 12 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 34 +- + arch/arm/plat-mxc/include/mach/hardware.h | 9 + + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 326 +++++ + arch/arm/plat-mxc/include/mach/iomux-v3.h | 8 +- + arch/arm/plat-mxc/include/mach/irqs.h | 9 +- + arch/arm/plat-mxc/include/mach/memory.h | 39 +- + arch/arm/plat-mxc/include/mach/mx1.h | 395 ++++-- + arch/arm/plat-mxc/include/mach/mx21.h | 13 +- + arch/arm/plat-mxc/include/mach/mx25.h | 34 +- + arch/arm/plat-mxc/include/mach/mx27.h | 32 +- + arch/arm/plat-mxc/include/mach/mx2x.h | 8 +- + arch/arm/plat-mxc/include/mach/mx31.h | 33 + + arch/arm/plat-mxc/include/mach/mx35.h | 13 + + arch/arm/plat-mxc/include/mach/mx3x.h | 8 +- + arch/arm/plat-mxc/include/mach/mx51.h | 454 +++++++ + arch/arm/plat-mxc/include/mach/mxc.h | 20 +- + arch/arm/plat-mxc/include/mach/mxc91231.h | 58 +- + arch/arm/plat-mxc/include/mach/mxc_ehci.h | 4 + + arch/arm/plat-mxc/include/mach/ssi.h | 18 + + arch/arm/plat-mxc/include/mach/timex.h | 2 + + arch/arm/plat-mxc/include/mach/uncompress.h | 3 - + arch/arm/plat-mxc/iomux-mx1-mx2.c | 6 +- + arch/arm/plat-mxc/time.c | 41 +- + arch/arm/plat-mxc/tzic.c | 172 +++ + drivers/mtd/nand/Kconfig | 2 +- + drivers/serial/imx.c | 2 +- + drivers/usb/gadget/fsl_mx3_udc.c | 31 +- + 101 files changed, 6416 insertions(+), 2090 deletions(-) + delete mode 100644 arch/arm/configs/mx1ads_defconfig + create mode 100644 arch/arm/configs/mx51_defconfig + rename arch/arm/mach-mx1/{mx1ads.c => mach-mx1ads.c} (96%) + rename arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} (98%) + delete mode 100644 arch/arm/mach-mx2/crm_regs.h + rename arch/arm/mach-mx2/{eukrea_cpuimx27.c => mach-cpuimx27.c} (93%) + rename arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} (94%) + rename arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} (96%) + rename arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} (94%) + rename arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} (97%) + rename arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} (98%) + create mode 100644 arch/arm/mach-mx2/mach-pca100.c + rename arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} (90%) + delete mode 100644 arch/arm/mach-mx2/pca100.c + rename arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} (92%) + rename arch/arm/mach-mx3/{clock.c => clock-imx31.c} (99%) + rename arch/arm/mach-mx3/{iomux.c => iomux-imx31.c} (98%) + rename arch/arm/mach-mx3/{armadillo5x0.c => mach-armadillo5x0.c} (97%) + rename arch/arm/mach-mx3/{kzmarm11.c => mach-kzm_arm11_01.c} (89%) + rename arch/arm/mach-mx3/{mx31pdk.c => mach-mx31_3ds.c} (96%) + rename arch/arm/mach-mx3/{mx31ads.c => mach-mx31ads.c} (96%) + rename arch/arm/mach-mx3/{mx31lilly.c => mach-mx31lilly.c} (96%) + rename arch/arm/mach-mx3/{mx31lite.c => mach-mx31lite.c} (95%) + rename arch/arm/mach-mx3/{mx31moboard.c => mach-mx31moboard.c} (93%) + rename arch/arm/mach-mx3/{mx35pdk.c => mach-mx35pdk.c} (95%) + rename arch/arm/mach-mx3/{pcm037.c => mach-pcm037.c} (82%) + rename arch/arm/mach-mx3/{pcm037_eet.c => mach-pcm037_eet.c} (100%) + create mode 100644 arch/arm/mach-mx3/mach-pcm043.c + rename arch/arm/mach-mx3/{qong.c => mach-qong.c} (93%) + create mode 100644 arch/arm/mach-mx3/mx31moboard-smartbot.c + delete mode 100644 arch/arm/mach-mx3/pcm043.c + create mode 100644 arch/arm/mach-mx5/Kconfig + create mode 100644 arch/arm/mach-mx5/Makefile + create mode 100644 arch/arm/mach-mx5/Makefile.boot + create mode 100644 arch/arm/mach-mx5/board-mx51_babbage.c + create mode 100644 arch/arm/mach-mx5/clock-mx51.c + create mode 100644 arch/arm/mach-mx5/cpu.c + create mode 100644 arch/arm/mach-mx5/crm_regs.h + create mode 100644 arch/arm/mach-mx5/devices.c + create mode 100644 arch/arm/mach-mx5/devices.h + create mode 100644 arch/arm/mach-mx5/mm.c + create mode 100644 arch/arm/plat-mxc/include/mach/iomux-mx51.h + create mode 100644 arch/arm/plat-mxc/include/mach/mx51.h + create mode 100644 arch/arm/plat-mxc/include/mach/ssi.h + create mode 100644 arch/arm/plat-mxc/tzic.c +Merging msm/for-next +$ git merge msm/for-next +Auto-merging arch/arm/Kconfig +Removing arch/arm/mach-msm/clock-7x01a.c +Removing arch/arm/mach-msm/idle.S +Auto-merging arch/arm/mach-msm/io.c +Merge made by recursive. + arch/arm/Kconfig | 11 +- + arch/arm/mach-msm/Kconfig | 671 ++++++- + arch/arm/mach-msm/Makefile | 69 +- + arch/arm/mach-msm/Makefile.boot | 18 + + arch/arm/mach-msm/acpuclock-8x50.c | 723 +++++++ + arch/arm/mach-msm/acpuclock.c | 915 ++++++++ + arch/arm/mach-msm/acpuclock.h | 39 + + arch/arm/mach-msm/avs.c | 323 +++ + arch/arm/mach-msm/avs.h | 52 + + arch/arm/mach-msm/avs_hw.S | 158 ++ + arch/arm/mach-msm/board-comet.c | 488 +++++ + arch/arm/mach-msm/board-dream.c | 4 +- + arch/arm/mach-msm/board-halibut-keypad.c | 177 ++ + arch/arm/mach-msm/board-halibut.c | 704 +++++++- + arch/arm/mach-msm/board-msm7x27.c | 1195 +++++++++++ + arch/arm/mach-msm/board-msm7x30.c | 209 ++ + arch/arm/mach-msm/board-qsd8x50.c | 538 +++++ + arch/arm/mach-msm/board-sapphire-gpio.c | 326 +++ + arch/arm/mach-msm/board-sapphire-h2w.c | 545 +++++ + arch/arm/mach-msm/board-sapphire-keypad.c | 122 ++ + arch/arm/mach-msm/board-sapphire-mmc.c | 479 +++++ + arch/arm/mach-msm/board-sapphire-panel.c | 656 ++++++ + arch/arm/mach-msm/board-sapphire-rfkill.c | 99 + + arch/arm/mach-msm/board-sapphire-wifi.c | 74 + + arch/arm/mach-msm/board-sapphire.c | 1175 +++++++++++ + arch/arm/mach-msm/board-sapphire.h | 219 ++ + arch/arm/mach-msm/board-trout-gpio.c | 305 +++ + arch/arm/mach-msm/board-trout-keypad.c | 345 +++ + arch/arm/mach-msm/board-trout-mmc.c | 437 ++++ + arch/arm/mach-msm/board-trout-panel.c | 642 ++++++ + arch/arm/mach-msm/board-trout-rfkill.c | 93 + + arch/arm/mach-msm/board-trout-wifi.c | 74 + + arch/arm/mach-msm/board-trout.c | 841 ++++++++ + arch/arm/mach-msm/board-trout.h | 162 ++ + arch/arm/mach-msm/clock-7x01a.c | 126 -- + arch/arm/mach-msm/clock-7x30.c | 957 +++++++++ + arch/arm/mach-msm/clock-7x30.h | 143 ++ + arch/arm/mach-msm/clock-pcom.c | 130 ++ + arch/arm/mach-msm/clock-pcom.h | 147 ++ + arch/arm/mach-msm/clock.c | 332 +++- + arch/arm/mach-msm/clock.h | 69 +- + arch/arm/mach-msm/cpufreq.c | 126 ++ + arch/arm/mach-msm/dal.c | 1363 ++++++++++++ + arch/arm/mach-msm/dal_remotetest.c | 454 ++++ + arch/arm/mach-msm/dal_remotetest.h | 187 ++ + arch/arm/mach-msm/devices.c | 358 +++- + arch/arm/mach-msm/devices.h | 24 +- + arch/arm/mach-msm/devices_htc.c | 450 ++++ + arch/arm/mach-msm/dma.c | 81 +- + arch/arm/mach-msm/dma_test.c | 404 ++++ + arch/arm/mach-msm/fiq_glue.S | 64 + + arch/arm/mach-msm/generic_gpio.c | 274 +++ + arch/arm/mach-msm/gpio.c | 746 +++++++ + arch/arm/mach-msm/gpio.h | 35 + + arch/arm/mach-msm/gpio_chip.h | 61 + + arch/arm/mach-msm/gpio_hw-7x30.h | 112 + + arch/arm/mach-msm/gpio_hw-7xxx.h | 73 + + arch/arm/mach-msm/gpio_hw-8xxx.h | 112 + + arch/arm/mach-msm/gpio_hw.h | 49 + + arch/arm/mach-msm/htc_acoustic.c | 239 +++ + arch/arm/mach-msm/htc_akm_cal.c | 64 + + arch/arm/mach-msm/htc_battery.c | 769 +++++++ + arch/arm/mach-msm/htc_headset.c | 1246 +++++++++++ + arch/arm/mach-msm/htc_pwrsink.c | 281 +++ + arch/arm/mach-msm/htc_wifi_nvs.c | 56 + + arch/arm/mach-msm/idle-v6.S | 177 ++ + arch/arm/mach-msm/idle-v7.S | 175 ++ + arch/arm/mach-msm/idle.S | 36 - + arch/arm/mach-msm/idle.h | 36 + + arch/arm/mach-msm/include/mach/board.h | 30 +- + arch/arm/mach-msm/include/mach/board_htc.h | 78 + + arch/arm/mach-msm/include/mach/camera.h | 297 +++ + arch/arm/mach-msm/include/mach/clk.h | 53 + + arch/arm/mach-msm/include/mach/dal.h | 155 ++ + arch/arm/mach-msm/include/mach/dma.h | 40 +- + arch/arm/mach-msm/include/mach/dma_test.h | 67 + + arch/arm/mach-msm/include/mach/fiq.h | 33 + + arch/arm/mach-msm/include/mach/gpio.h | 167 ++ + arch/arm/mach-msm/include/mach/htc_headset.h | 173 ++ + arch/arm/mach-msm/include/mach/htc_pwrsink.h | 87 + + .../mach-msm/include/mach/internal_power_rail.h | 46 + + arch/arm/mach-msm/include/mach/io.h | 2 +- + arch/arm/mach-msm/include/mach/irqs-7x30.h | 158 ++ + arch/arm/mach-msm/include/mach/irqs-7xxx.h | 76 + + arch/arm/mach-msm/include/mach/irqs-8xxx.h | 104 + + arch/arm/mach-msm/include/mach/irqs.h | 81 +- + arch/arm/mach-msm/include/mach/memory.h | 29 +- + arch/arm/mach-msm/include/mach/mmc.h | 18 +- + arch/arm/mach-msm/include/mach/mpp.h | 73 + + arch/arm/mach-msm/include/mach/msm_handset.h | 34 + + arch/arm/mach-msm/include/mach/msm_i2ckbd.h | 41 + + arch/arm/mach-msm/include/mach/msm_iomap.h | 102 +- + arch/arm/mach-msm/include/mach/msm_otg.h | 72 + + arch/arm/mach-msm/include/mach/msm_rpcrouter.h | 296 +++ + arch/arm/mach-msm/include/mach/msm_smd.h | 82 + + arch/arm/mach-msm/include/mach/msm_touch.h | 26 + + arch/arm/mach-msm/include/mach/msm_touchpad.h | 37 + + arch/arm/mach-msm/include/mach/oem_rapi_client.h | 91 + + arch/arm/mach-msm/include/mach/pmic.h | 557 +++++ + arch/arm/mach-msm/include/mach/remote_spinlock.h | 165 ++ + arch/arm/mach-msm/include/mach/rpc_hsusb.h | 45 + + arch/arm/mach-msm/include/mach/sirc.h | 103 + + arch/arm/mach-msm/include/mach/smem_log.h | 245 +++ + arch/arm/mach-msm/include/mach/system.h | 5 + + arch/arm/mach-msm/include/mach/uncompress.h | 1 - + arch/arm/mach-msm/include/mach/usbdiag.h | 44 + + arch/arm/mach-msm/include/mach/vmalloc.h | 7 +- + arch/arm/mach-msm/include/mach/vreg.h | 2 +- + arch/arm/mach-msm/internal_power_rail.c | 90 + + arch/arm/mach-msm/io.c | 125 ++- + arch/arm/mach-msm/irq.c | 535 +++++- + arch/arm/mach-msm/irq.h | 43 + + arch/arm/mach-msm/jtag-v7.S | 117 ++ + arch/arm/mach-msm/keypad-surf-ffa.c | 316 +++ + arch/arm/mach-msm/keypad-surf-ffa.h | 29 + + arch/arm/mach-msm/memory.c | 86 + + arch/arm/mach-msm/modem_notifier.c | 237 +++ + arch/arm/mach-msm/modem_notifier.h | 48 + + arch/arm/mach-msm/mpp.c | 176 ++ + arch/arm/mach-msm/msm-keypad-devices.h | 22 + + arch/arm/mach-msm/msm_vibrator.c | 137 ++ + arch/arm/mach-msm/nand_partitions.c | 187 ++ + arch/arm/mach-msm/nohlt.c | 86 + + arch/arm/mach-msm/oem_rapi_client.c | 489 +++++ + arch/arm/mach-msm/ping_mdm_rpc_client.c | 772 +++++++ + arch/arm/mach-msm/pm.c | 954 +++++++++ + arch/arm/mach-msm/pm.h | 42 + + arch/arm/mach-msm/pm2.c | 1666 +++++++++++++++ + arch/arm/mach-msm/pmic.c | 1095 ++++++++++ + arch/arm/mach-msm/pmic8058-gpio.c | 150 ++ + arch/arm/mach-msm/pmic8058-mpp.c | 105 + + arch/arm/mach-msm/pmic_debugfs.c | 1200 +++++++++++ + arch/arm/mach-msm/proc_comm.c | 93 +- + arch/arm/mach-msm/proc_comm.h | 192 +- + arch/arm/mach-msm/proc_comm_test.c | 169 ++ + arch/arm/mach-msm/remote_spinlock.c | 85 + + arch/arm/mach-msm/reset_modem.c | 226 ++ + arch/arm/mach-msm/rpc_hsusb.c | 574 +++++ + arch/arm/mach-msm/rpc_server_dog_keepalive.c | 77 + + arch/arm/mach-msm/rpc_server_handset.c | 380 ++++ + arch/arm/mach-msm/rpc_server_time_remote.c | 90 + + arch/arm/mach-msm/rpc_server_time_remote.h | 21 + + arch/arm/mach-msm/sirc.c | 239 +++ + arch/arm/mach-msm/smd.c | 1960 +++++++++++++++++ + arch/arm/mach-msm/smd_ctl2.c | 677 ++++++ + arch/arm/mach-msm/smd_nmea.c | 249 +++ + arch/arm/mach-msm/smd_private.h | 256 +++ + arch/arm/mach-msm/smd_qmi.c | 843 ++++++++ + arch/arm/mach-msm/smd_rpcrouter.c | 2197 ++++++++++++++++++++ + arch/arm/mach-msm/smd_rpcrouter.h | 210 ++ + arch/arm/mach-msm/smd_rpcrouter_clients.c | 607 ++++++ + arch/arm/mach-msm/smd_rpcrouter_device.c | 380 ++++ + arch/arm/mach-msm/smd_rpcrouter_servers.c | 434 ++++ + arch/arm/mach-msm/smd_tty.c | 285 +++ + arch/arm/mach-msm/smem_log.c | 2024 ++++++++++++++++++ + arch/arm/mach-msm/socinfo.c | 430 ++++ + arch/arm/mach-msm/socinfo.h | 97 + + arch/arm/mach-msm/timer.c | 714 ++++++- + arch/arm/mach-msm/timer.h | 38 + + arch/arm/mach-msm/vreg.c | 170 ++- + drivers/mmc/host/msm_sdcc.c | 4 +- + include/linux/pm_qos_params.h | 3 +- + kernel/pm_qos_params.c | 32 +- + 163 files changed, 48344 insertions(+), 685 deletions(-) + create mode 100644 arch/arm/mach-msm/acpuclock-8x50.c + create mode 100644 arch/arm/mach-msm/acpuclock.c + create mode 100644 arch/arm/mach-msm/acpuclock.h + create mode 100644 arch/arm/mach-msm/avs.c + create mode 100644 arch/arm/mach-msm/avs.h + create mode 100644 arch/arm/mach-msm/avs_hw.S + create mode 100644 arch/arm/mach-msm/board-comet.c + create mode 100644 arch/arm/mach-msm/board-halibut-keypad.c + create mode 100644 arch/arm/mach-msm/board-msm7x27.c + create mode 100644 arch/arm/mach-msm/board-msm7x30.c + create mode 100644 arch/arm/mach-msm/board-qsd8x50.c + create mode 100644 arch/arm/mach-msm/board-sapphire-gpio.c + create mode 100644 arch/arm/mach-msm/board-sapphire-h2w.c + create mode 100644 arch/arm/mach-msm/board-sapphire-keypad.c + create mode 100644 arch/arm/mach-msm/board-sapphire-mmc.c + create mode 100644 arch/arm/mach-msm/board-sapphire-panel.c + create mode 100644 arch/arm/mach-msm/board-sapphire-rfkill.c + create mode 100644 arch/arm/mach-msm/board-sapphire-wifi.c + create mode 100644 arch/arm/mach-msm/board-sapphire.c + create mode 100644 arch/arm/mach-msm/board-sapphire.h + create mode 100644 arch/arm/mach-msm/board-trout-gpio.c + create mode 100644 arch/arm/mach-msm/board-trout-keypad.c + create mode 100644 arch/arm/mach-msm/board-trout-mmc.c + create mode 100644 arch/arm/mach-msm/board-trout-panel.c + create mode 100644 arch/arm/mach-msm/board-trout-rfkill.c + create mode 100644 arch/arm/mach-msm/board-trout-wifi.c + create mode 100644 arch/arm/mach-msm/board-trout.c + create mode 100644 arch/arm/mach-msm/board-trout.h + delete mode 100644 arch/arm/mach-msm/clock-7x01a.c + create mode 100644 arch/arm/mach-msm/clock-7x30.c + create mode 100644 arch/arm/mach-msm/clock-7x30.h + create mode 100644 arch/arm/mach-msm/clock-pcom.c + create mode 100644 arch/arm/mach-msm/clock-pcom.h + create mode 100644 arch/arm/mach-msm/cpufreq.c + create mode 100644 arch/arm/mach-msm/dal.c + create mode 100644 arch/arm/mach-msm/dal_remotetest.c + create mode 100644 arch/arm/mach-msm/dal_remotetest.h + create mode 100644 arch/arm/mach-msm/devices_htc.c + create mode 100644 arch/arm/mach-msm/dma_test.c + create mode 100644 arch/arm/mach-msm/fiq_glue.S + create mode 100644 arch/arm/mach-msm/generic_gpio.c + create mode 100644 arch/arm/mach-msm/gpio.c + create mode 100644 arch/arm/mach-msm/gpio.h + create mode 100644 arch/arm/mach-msm/gpio_chip.h + create mode 100644 arch/arm/mach-msm/gpio_hw-7x30.h + create mode 100644 arch/arm/mach-msm/gpio_hw-7xxx.h + create mode 100644 arch/arm/mach-msm/gpio_hw-8xxx.h + create mode 100644 arch/arm/mach-msm/gpio_hw.h + create mode 100644 arch/arm/mach-msm/htc_acoustic.c + create mode 100644 arch/arm/mach-msm/htc_akm_cal.c + create mode 100644 arch/arm/mach-msm/htc_battery.c + create mode 100644 arch/arm/mach-msm/htc_headset.c + create mode 100644 arch/arm/mach-msm/htc_pwrsink.c + create mode 100644 arch/arm/mach-msm/htc_wifi_nvs.c + create mode 100644 arch/arm/mach-msm/idle-v6.S + create mode 100644 arch/arm/mach-msm/idle-v7.S + delete mode 100644 arch/arm/mach-msm/idle.S + create mode 100644 arch/arm/mach-msm/idle.h + create mode 100644 arch/arm/mach-msm/include/mach/board_htc.h + create mode 100644 arch/arm/mach-msm/include/mach/camera.h + create mode 100644 arch/arm/mach-msm/include/mach/clk.h + create mode 100644 arch/arm/mach-msm/include/mach/dal.h + create mode 100644 arch/arm/mach-msm/include/mach/dma_test.h + create mode 100644 arch/arm/mach-msm/include/mach/fiq.h + create mode 100644 arch/arm/mach-msm/include/mach/gpio.h + create mode 100644 arch/arm/mach-msm/include/mach/htc_headset.h + create mode 100644 arch/arm/mach-msm/include/mach/htc_pwrsink.h + create mode 100644 arch/arm/mach-msm/include/mach/internal_power_rail.h + create mode 100644 arch/arm/mach-msm/include/mach/irqs-7x30.h + create mode 100644 arch/arm/mach-msm/include/mach/irqs-7xxx.h + create mode 100644 arch/arm/mach-msm/include/mach/irqs-8xxx.h + create mode 100644 arch/arm/mach-msm/include/mach/mpp.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_handset.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_i2ckbd.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_otg.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_rpcrouter.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_smd.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_touch.h + create mode 100644 arch/arm/mach-msm/include/mach/msm_touchpad.h + create mode 100644 arch/arm/mach-msm/include/mach/oem_rapi_client.h + create mode 100644 arch/arm/mach-msm/include/mach/pmic.h + create mode 100644 arch/arm/mach-msm/include/mach/remote_spinlock.h + create mode 100644 arch/arm/mach-msm/include/mach/rpc_hsusb.h + create mode 100644 arch/arm/mach-msm/include/mach/sirc.h + create mode 100644 arch/arm/mach-msm/include/mach/smem_log.h + create mode 100644 arch/arm/mach-msm/include/mach/usbdiag.h + create mode 100644 arch/arm/mach-msm/internal_power_rail.c + create mode 100644 arch/arm/mach-msm/irq.h + create mode 100644 arch/arm/mach-msm/jtag-v7.S + create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.c + create mode 100644 arch/arm/mach-msm/keypad-surf-ffa.h + create mode 100644 arch/arm/mach-msm/memory.c + create mode 100644 arch/arm/mach-msm/modem_notifier.c + create mode 100644 arch/arm/mach-msm/modem_notifier.h + create mode 100644 arch/arm/mach-msm/mpp.c + create mode 100644 arch/arm/mach-msm/msm-keypad-devices.h + create mode 100644 arch/arm/mach-msm/msm_vibrator.c + create mode 100644 arch/arm/mach-msm/nand_partitions.c + create mode 100644 arch/arm/mach-msm/nohlt.c + create mode 100644 arch/arm/mach-msm/oem_rapi_client.c + create mode 100644 arch/arm/mach-msm/ping_mdm_rpc_client.c + create mode 100644 arch/arm/mach-msm/pm.c + create mode 100644 arch/arm/mach-msm/pm.h + create mode 100644 arch/arm/mach-msm/pm2.c + create mode 100644 arch/arm/mach-msm/pmic.c + create mode 100644 arch/arm/mach-msm/pmic8058-gpio.c + create mode 100644 arch/arm/mach-msm/pmic8058-mpp.c + create mode 100644 arch/arm/mach-msm/pmic_debugfs.c + create mode 100644 arch/arm/mach-msm/proc_comm_test.c + create mode 100644 arch/arm/mach-msm/remote_spinlock.c + create mode 100644 arch/arm/mach-msm/reset_modem.c + create mode 100644 arch/arm/mach-msm/rpc_hsusb.c + create mode 100644 arch/arm/mach-msm/rpc_server_dog_keepalive.c + create mode 100644 arch/arm/mach-msm/rpc_server_handset.c + create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.c + create mode 100644 arch/arm/mach-msm/rpc_server_time_remote.h + create mode 100644 arch/arm/mach-msm/sirc.c + create mode 100644 arch/arm/mach-msm/smd.c + create mode 100644 arch/arm/mach-msm/smd_ctl2.c + create mode 100644 arch/arm/mach-msm/smd_nmea.c + create mode 100644 arch/arm/mach-msm/smd_private.h + create mode 100644 arch/arm/mach-msm/smd_qmi.c + create mode 100644 arch/arm/mach-msm/smd_rpcrouter.c + create mode 100644 arch/arm/mach-msm/smd_rpcrouter.h + create mode 100644 arch/arm/mach-msm/smd_rpcrouter_clients.c + create mode 100644 arch/arm/mach-msm/smd_rpcrouter_device.c + create mode 100644 arch/arm/mach-msm/smd_rpcrouter_servers.c + create mode 100644 arch/arm/mach-msm/smd_tty.c + create mode 100644 arch/arm/mach-msm/smem_log.c + create mode 100644 arch/arm/mach-msm/socinfo.c + create mode 100644 arch/arm/mach-msm/socinfo.h + create mode 100644 arch/arm/mach-msm/timer.h +Merging omap/for-next +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/board-4430sdp.c +Removing arch/arm/mach-omap2/mmc-twl4030.c +Auto-merging arch/arm/plat-omap/include/plat/omap44xx.h +Merge made by recursive. + arch/arm/configs/devkit8000_defconfig | 1889 ++++++++++++++++++++++++ + arch/arm/configs/igep0020_defconfig | 525 ++++--- + arch/arm/configs/omap3_defconfig | 180 ++- + arch/arm/configs/omap3_pandora_defconfig | 678 +++++++-- + arch/arm/configs/rx51_defconfig | 4 +- + arch/arm/mach-omap1/Makefile | 2 +- + arch/arm/mach-omap1/board-fsample.c | 9 +- + arch/arm/mach-omap1/board-h2.c | 9 +- + arch/arm/mach-omap1/board-h3.c | 9 +- + arch/arm/mach-omap1/board-innovator.c | 9 +- + arch/arm/mach-omap1/board-osk.c | 9 +- + arch/arm/mach-omap1/board-palmte.c | 9 +- + arch/arm/mach-omap1/board-palmtt.c | 9 +- + arch/arm/mach-omap1/board-palmz71.c | 10 +- + arch/arm/mach-omap1/board-perseus2.c | 9 +- + arch/arm/mach-omap1/board-sx1.c | 11 +- + arch/arm/mach-omap1/board-voiceblue.c | 9 +- + arch/arm/mach-omap1/clock.c | 6 - + arch/arm/mach-omap1/clock_data.c | 3 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/flash.c | 33 + + arch/arm/mach-omap1/include/mach/debug-macro.S | 88 +- + arch/arm/mach-omap1/mailbox.c | 9 +- + arch/arm/mach-omap1/mcbsp.c | 16 +- + arch/arm/mach-omap1/serial.c | 6 +- + arch/arm/mach-omap2/Kconfig | 61 +- + arch/arm/mach-omap2/Makefile | 64 +- + arch/arm/mach-omap2/board-2430sdp.c | 23 +- + arch/arm/mach-omap2/board-3430sdp.c | 127 ++- + arch/arm/mach-omap2/board-3630sdp.c | 4 +- + arch/arm/mach-omap2/board-4430sdp.c | 16 +- + arch/arm/mach-omap2/board-am3517evm.c | 159 ++- + arch/arm/mach-omap2/board-apollon.c | 2 +- + arch/arm/mach-omap2/board-cm-t35.c | 255 ++++- + arch/arm/mach-omap2/board-devkit8000.c | 697 +++++++++ + arch/arm/mach-omap2/board-generic.c | 2 +- + arch/arm/mach-omap2/board-h4.c | 9 +- + arch/arm/mach-omap2/board-igep0020.c | 217 +++- + arch/arm/mach-omap2/board-ldp.c | 16 +- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + arch/arm/mach-omap2/board-omap3beagle.c | 16 +- + arch/arm/mach-omap2/board-omap3evm.c | 299 ++++- + arch/arm/mach-omap2/board-omap3pandora.c | 196 +++- + arch/arm/mach-omap2/board-omap3touchbook.c | 16 +- + arch/arm/mach-omap2/board-overo.c | 16 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 63 +- + arch/arm/mach-omap2/board-rx51.c | 10 +- + arch/arm/mach-omap2/board-sdp-flash.c | 272 ++++ + arch/arm/mach-omap2/board-zoom-peripherals.c | 23 +- + arch/arm/mach-omap2/board-zoom2.c | 2 +- + arch/arm/mach-omap2/board-zoom3.c | 18 +- + arch/arm/mach-omap2/clkt2xxx_apll.c | 120 ++ + arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 173 +++ + arch/arm/mach-omap2/clkt2xxx_osc.c | 62 + + arch/arm/mach-omap2/clkt2xxx_sys.c | 50 + + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 254 ++++ + arch/arm/mach-omap2/clkt34xx_dpll3m2.c | 120 ++ + arch/arm/mach-omap2/clkt_clksel.c | 417 ++++++ + arch/arm/mach-omap2/clkt_dpll.c | 386 +++++ + arch/arm/mach-omap2/clock.c | 844 +---------- + arch/arm/mach-omap2/clock.h | 38 +- + arch/arm/mach-omap2/clock2xxx.c | 548 +------- + arch/arm/mach-omap2/clock2xxx.h | 7 +- + arch/arm/mach-omap2/clock2xxx_data.c | 10 +- + arch/arm/mach-omap2/clock34xx.c | 156 +-- + arch/arm/mach-omap2/clock34xx.h | 3 +- + arch/arm/mach-omap2/clock34xx_data.c | 390 +++--- + arch/arm/mach-omap2/clock44xx.c | 16 +- + arch/arm/mach-omap2/clock44xx.h | 4 +- + arch/arm/mach-omap2/clock44xx_data.c | 18 +- + arch/arm/mach-omap2/clockdomain.c | 748 +++++++--- + arch/arm/mach-omap2/clockdomains.h | 672 ++++++++- + arch/arm/mach-omap2/clockdomains44xx.h | 250 ++++ + arch/arm/mach-omap2/cm-regbits-44xx.h | 536 ++++---- + arch/arm/mach-omap2/cm.h | 5 +- + arch/arm/mach-omap2/devices.c | 37 +- + arch/arm/mach-omap2/{dpll.c => dpll3xxx.c} | 113 +- + arch/arm/mach-omap2/emu.c | 3 + + arch/arm/mach-omap2/gpmc-nand.c | 139 ++ + arch/arm/mach-omap2/gpmc.c | 6 +- + arch/arm/mach-omap2/hsmmc.c | 266 ++++ + arch/arm/mach-omap2/{mmc-twl4030.h => hsmmc.h} | 14 +- + arch/arm/mach-omap2/id.c | 1 + + arch/arm/mach-omap2/include/mach/am35xx.h | 26 + + arch/arm/mach-omap2/include/mach/board-sdp.h | 21 + + arch/arm/mach-omap2/include/mach/debug-macro.S | 130 ++- + arch/arm/mach-omap2/include/mach/entry-macro.S | 128 ++- + arch/arm/mach-omap2/io.c | 74 +- + arch/arm/mach-omap2/mailbox.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 22 +- + arch/arm/mach-omap2/mmc-twl4030.c | 542 ------- + arch/arm/mach-omap2/mux.c | 64 +- + arch/arm/mach-omap2/mux.h | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 27 +- + arch/arm/mach-omap2/omap_hwmod_34xx.h | 2 +- + arch/arm/mach-omap2/opp2xxx.h | 5 + + arch/arm/mach-omap2/pm-debug.c | 20 +- + arch/arm/mach-omap2/pm24xx.c | 54 +- + arch/arm/mach-omap2/pm34xx.c | 37 +- + arch/arm/mach-omap2/powerdomain.c | 674 +++------ + arch/arm/mach-omap2/powerdomains.h | 134 +-- + arch/arm/mach-omap2/powerdomains24xx.h | 91 +-- + arch/arm/mach-omap2/powerdomains34xx.h | 157 +-- + arch/arm/mach-omap2/powerdomains44xx.h | 310 ++++ + arch/arm/mach-omap2/prcm-common.h | 9 + + arch/arm/mach-omap2/prcm.c | 80 +- + arch/arm/mach-omap2/prm-regbits-44xx.h | 1010 +++++++------- + arch/arm/mach-omap2/prm.h | 17 +- + arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h | 51 + + arch/arm/mach-omap2/serial.c | 55 +- + arch/arm/mach-omap2/sleep34xx.S | 2 +- + arch/arm/mach-omap2/usb-musb.c | 83 +- + arch/arm/plat-omap/Kconfig | 40 +- + arch/arm/plat-omap/clock.c | 13 +- + arch/arm/plat-omap/common.c | 31 +- + arch/arm/plat-omap/devices.c | 39 +- + arch/arm/plat-omap/dma.c | 3 +- + arch/arm/plat-omap/dmtimer.c | 102 +- + arch/arm/plat-omap/gpio.c | 290 ++-- + arch/arm/plat-omap/i2c.c | 8 +- + arch/arm/plat-omap/include/plat/clkdev_omap.h | 26 +- + arch/arm/plat-omap/include/plat/clock.h | 9 +- + arch/arm/plat-omap/include/plat/clockdomain.h | 98 +- + arch/arm/plat-omap/include/plat/common.h | 6 + + arch/arm/plat-omap/include/plat/control.h | 37 +- + arch/arm/plat-omap/include/plat/cpu.h | 90 +- + arch/arm/plat-omap/include/plat/flash.h | 16 + + arch/arm/plat-omap/include/plat/gpmc.h | 4 +- + arch/arm/plat-omap/include/plat/io.h | 33 +- + arch/arm/plat-omap/include/plat/irqs.h | 12 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 12 +- + arch/arm/plat-omap/include/plat/memory.h | 3 +- + arch/arm/plat-omap/include/plat/menelaus.h | 2 +- + arch/arm/plat-omap/include/plat/mmc.h | 35 +- + arch/arm/plat-omap/include/plat/multi.h | 94 ++ + arch/arm/plat-omap/include/plat/mux.h | 2 +- + arch/arm/plat-omap/include/plat/nand.h | 10 +- + arch/arm/plat-omap/include/plat/omap16xx.h | 74 +- + arch/arm/plat-omap/include/plat/omap24xx.h | 6 +- + arch/arm/plat-omap/include/plat/omap34xx.h | 6 +- + arch/arm/plat-omap/include/plat/omap44xx.h | 3 + + arch/arm/plat-omap/include/plat/omap_device.h | 4 + + arch/arm/plat-omap/include/plat/omap_hwmod.h | 2 + + arch/arm/plat-omap/include/plat/powerdomain.h | 91 +- + arch/arm/plat-omap/include/plat/prcm.h | 8 + + arch/arm/plat-omap/include/plat/serial.h | 70 +- + arch/arm/plat-omap/include/plat/uncompress.h | 181 ++- + arch/arm/plat-omap/include/plat/usb.h | 11 +- + arch/arm/plat-omap/iommu.c | 6 +- + arch/arm/plat-omap/iopgtable.h | 50 +- + arch/arm/plat-omap/mcbsp.c | 372 +++--- + arch/arm/plat-omap/omap_device.c | 41 +- + arch/arm/plat-omap/sram.c | 2 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/mfd/Kconfig | 2 +- + drivers/mmc/host/omap_hsmmc.c | 400 +++++- + drivers/mtd/maps/Kconfig | 9 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/omap_nor.c | 188 --- + drivers/mtd/nand/omap2.c | 35 +- + drivers/net/smc911x.h | 4 +- + drivers/spi/Kconfig | 2 +- + drivers/spi/omap2_mcspi.c | 2 +- + drivers/usb/Kconfig | 2 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/musb/Kconfig | 6 +- + drivers/usb/musb/musb_core.c | 2 +- + drivers/usb/musb/musb_core.h | 2 +- + drivers/w1/masters/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + include/linux/usb/musb.h | 3 + + include/linux/usb/otg.h | 10 + + sound/soc/omap/omap-mcbsp.c | 6 +- + sound/soc/omap/omap-mcbsp.h | 2 +- + 174 files changed, 12911 insertions(+), 6078 deletions(-) + create mode 100644 arch/arm/configs/devkit8000_defconfig + create mode 100644 arch/arm/mach-omap1/flash.c + create mode 100644 arch/arm/mach-omap2/board-devkit8000.c + create mode 100644 arch/arm/mach-omap2/board-sdp-flash.c + create mode 100644 arch/arm/mach-omap2/clkt2xxx_apll.c + create mode 100644 arch/arm/mach-omap2/clkt2xxx_dpllcore.c + create mode 100644 arch/arm/mach-omap2/clkt2xxx_osc.c + create mode 100644 arch/arm/mach-omap2/clkt2xxx_sys.c + create mode 100644 arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c + create mode 100644 arch/arm/mach-omap2/clkt34xx_dpll3m2.c + create mode 100644 arch/arm/mach-omap2/clkt_clksel.c + create mode 100644 arch/arm/mach-omap2/clkt_dpll.c + create mode 100644 arch/arm/mach-omap2/clockdomains44xx.h + rename arch/arm/mach-omap2/{dpll.c => dpll3xxx.c} (98%) + create mode 100644 arch/arm/mach-omap2/gpmc-nand.c + create mode 100644 arch/arm/mach-omap2/hsmmc.c + rename arch/arm/mach-omap2/{mmc-twl4030.h => hsmmc.h} (63%) + create mode 100644 arch/arm/mach-omap2/include/mach/am35xx.h + create mode 100644 arch/arm/mach-omap2/include/mach/board-sdp.h + delete mode 100644 arch/arm/mach-omap2/mmc-twl4030.c + create mode 100644 arch/arm/mach-omap2/powerdomains44xx.h + create mode 100644 arch/arm/mach-omap2/sdram-numonyx-m65kxxxxam.h + create mode 100644 arch/arm/plat-omap/include/plat/flash.h + create mode 100644 arch/arm/plat-omap/include/plat/multi.h +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Removing arch/arm/mach-s3c2442/Kconfig +Removing arch/arm/mach-s3c2442/Makefile +Removing arch/arm/mach-s3c2442/s3c2442.c +Removing arch/arm/plat-s3c24xx/include/plat/s3c2440.h +Removing arch/arm/plat-s3c24xx/include/plat/s3c2442.h +Merge made by recursive. + arch/arm/Kconfig | 1 - + arch/arm/Makefile | 2 +- + arch/arm/configs/s3c6400_defconfig | 360 ++++++++++++++------ + arch/arm/mach-s3c2440/Kconfig | 74 ++++- + arch/arm/mach-s3c2440/Makefile | 11 + + arch/arm/mach-s3c2440/dsc.c | 2 +- + .../include/mach/gta02.h | 0 + .../{mach-s3c2442 => mach-s3c2440}/mach-gta02.c | 0 + arch/arm/mach-s3c2440/mach-nexcoder.c | 2 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 2 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + .../clock.c => mach-s3c2440/s3c2442.c} | 16 +- + .../{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c | 0 + .../{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c | 0 + arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c | 3 +- + arch/arm/mach-s3c2442/Kconfig | 37 -- + arch/arm/mach-s3c2442/Makefile | 18 - + arch/arm/mach-s3c2442/s3c2442.c | 34 -- + arch/arm/mach-s3c2443/mach-smdk2443.c | 2 +- + arch/arm/mach-s5p6440/Kconfig | 2 - + arch/arm/mach-s5p6440/Makefile | 2 +- + .../s5p6440-clock.c => mach-s5p6440/clock.c} | 2 +- + arch/arm/mach-s5p6440/{s5p6440-gpio.c => gpio.c} | 2 +- + arch/arm/mach-s5p6440/include/mach/debug-macro.S | 4 +- + arch/arm/mach-s5p6440/include/mach/map.h | 65 +--- + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 2 +- + arch/arm/mach-s5p6440/include/mach/tick.h | 2 +- + .../s5p6440-init.c => mach-s5p6440/init.c} | 4 +- + arch/arm/mach-s5p6440/mach-smdk6440.c | 4 +- + arch/arm/plat-s3c24xx/Kconfig | 41 --- + arch/arm/plat-s3c24xx/Makefile | 7 - + arch/arm/plat-s3c24xx/cpu.c | 4 +- + arch/arm/plat-s3c24xx/include/plat/s3c2440.h | 17 - + arch/arm/plat-s3c24xx/include/plat/s3c2442.h | 17 - + arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h | 14 +- + arch/arm/plat-s3c64xx/Makefile | 9 +- + arch/arm/plat-s5p/Kconfig | 16 - + arch/arm/plat-s5p/Makefile | 5 - + arch/arm/plat-s5p/cpu.c | 19 +- + arch/arm/plat-s5p/include/plat/irqs.h | 4 +- + arch/arm/plat-s5p/include/plat/map-s5p.h | 32 ++ + arch/arm/plat-s5p/irq.c | 5 +- + arch/arm/plat-samsung/Kconfig | 6 + + arch/arm/plat-samsung/adc.c | 24 +- + arch/arm/plat-samsung/clock.c | 20 +- + arch/arm/plat-samsung/dev-usb-hsotg.c | 7 + + arch/arm/plat-samsung/include/plat/regs-adc.h | 1 + + drivers/serial/Kconfig | 18 +- + drivers/serial/s3c2412.c | 1 + + 49 files changed, 527 insertions(+), 395 deletions(-) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/include/mach/gta02.h (100%) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/mach-gta02.c (100%) + rename arch/arm/{mach-s3c2442/clock.c => mach-s3c2440/s3c2442.c} (92%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c (100%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-irq.c (100%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x.c (98%) + delete mode 100644 arch/arm/mach-s3c2442/Kconfig + delete mode 100644 arch/arm/mach-s3c2442/Makefile + delete mode 100644 arch/arm/mach-s3c2442/s3c2442.c + rename arch/arm/{plat-s5p/s5p6440-clock.c => mach-s5p6440/clock.c} (99%) + rename arch/arm/mach-s5p6440/{s5p6440-gpio.c => gpio.c} (99%) + rename arch/arm/{plat-s5p/s5p6440-init.c => mach-s5p6440/init.c} (94%) + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2440.h + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2442.h + rename arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h (72%) + create mode 100644 arch/arm/plat-s5p/include/plat/map-s5p.h +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Merge made by recursive. + Documentation/trace/ftrace-design.txt | 5 +- + arch/blackfin/Kconfig | 18 +++- + arch/blackfin/Kconfig.debug | 3 - + arch/blackfin/Makefile | 6 +- + arch/blackfin/boot/Makefile | 23 ++++- + arch/blackfin/include/asm/context.S | 10 ++ + arch/blackfin/include/asm/gpio.h | 13 ++- + arch/blackfin/include/asm/ptrace.h | 23 +++++ + arch/blackfin/include/asm/sections.h | 3 + + arch/blackfin/include/asm/syscall.h | 96 ++++++++++++++++++ + arch/blackfin/include/asm/thread_info.h | 23 ++--- + arch/blackfin/kernel/bfin_dma_5xx.c | 10 +- + arch/blackfin/kernel/bfin_gpio.c | 6 + + arch/blackfin/kernel/cplb-mpu/cplbinit.c | 9 ++ + arch/blackfin/kernel/cplb-nompu/cplbinit.c | 9 ++ + arch/blackfin/kernel/entry.S | 8 +- + arch/blackfin/kernel/ptrace.c | 148 +++++----------------------- + arch/blackfin/kernel/setup.c | 16 +++- + arch/blackfin/kernel/signal.c | 4 +- + arch/blackfin/kernel/traps.c | 4 +- + arch/blackfin/kernel/vmlinux.lds.S | 57 +++++++++++ + arch/blackfin/mach-common/entry.S | 19 ++-- + arch/blackfin/mach-common/head.S | 5 + + arch/blackfin/mach-common/interrupt.S | 10 +- + arch/frv/kernel/ptrace.c | 20 ---- + arch/s390/include/asm/syscall.h | 7 ++ + arch/s390/kernel/ftrace.c | 10 -- + arch/sh/include/asm/syscall.h | 2 + + arch/sh/kernel/ftrace.c | 9 -- + arch/sh/kernel/ptrace_32.c | 23 ----- + arch/sparc/include/asm/syscall.h | 7 ++ + arch/sparc/kernel/ftrace.c | 11 -- + arch/x86/include/asm/syscall.h | 2 + + arch/x86/kernel/ftrace.c | 10 -- + include/linux/ftrace.h | 6 + + kernel/ptrace.c | 20 ++++ + kernel/trace/trace_syscalls.c | 5 + + 37 files changed, 396 insertions(+), 264 deletions(-) + create mode 100644 arch/blackfin/include/asm/syscall.h +Merging cris/for-next +$ git merge cris/for-next +Auto-merging arch/cris/kernel/irq.c +Merge made by recursive. + arch/cris/arch-v10/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/pinmux.c | 4 ++-- + arch/cris/arch-v32/mach-a3/pinmux.c | 2 +- + arch/cris/arch-v32/mach-fs/pinmux.c | 4 ++-- + arch/cris/kernel/irq.c | 2 +- + 6 files changed, 8 insertions(+), 8 deletions(-) +Merging ia64/test +$ git merge ia64/test +Removing arch/ia64/ia32/Makefile +Removing arch/ia64/ia32/audit.c +Removing arch/ia64/ia32/binfmt_elf32.c +Removing arch/ia64/ia32/elfcore32.h +Removing arch/ia64/ia32/ia32_entry.S +Removing arch/ia64/ia32/ia32_ldt.c +Removing arch/ia64/ia32/ia32_signal.c +Removing arch/ia64/ia32/ia32_support.c +Removing arch/ia64/ia32/ia32_traps.c +Removing arch/ia64/ia32/ia32priv.h +Removing arch/ia64/ia32/sys_ia32.c +Removing arch/ia64/include/asm/ia32.h +Merge made by recursive. + arch/ia64/Kconfig | 17 - + arch/ia64/Makefile | 1 - + arch/ia64/configs/bigsur_defconfig | 2 - + arch/ia64/configs/generic_defconfig | 2 - + arch/ia64/configs/gensparse_defconfig | 2 - + arch/ia64/configs/sim_defconfig | 2 - + arch/ia64/configs/tiger_defconfig | 1 - + arch/ia64/configs/xen_domu_defconfig | 2 - + arch/ia64/configs/zx1_defconfig | 2 - + arch/ia64/ia32/Makefile | 11 - + arch/ia64/ia32/audit.c | 42 - + arch/ia64/ia32/binfmt_elf32.c | 245 --- + arch/ia64/ia32/elfcore32.h | 148 -- + arch/ia64/ia32/ia32_entry.S | 468 ------ + arch/ia64/ia32/ia32_ldt.c | 146 -- + arch/ia64/ia32/ia32_signal.c | 1010 ------------ + arch/ia64/ia32/ia32_support.c | 253 --- + arch/ia64/ia32/ia32_traps.c | 156 -- + arch/ia64/ia32/ia32priv.h | 532 ------- + arch/ia64/ia32/sys_ia32.c | 2765 --------------------------------- + arch/ia64/include/asm/ia32.h | 40 - + arch/ia64/include/asm/processor.h | 46 - + arch/ia64/include/asm/syscall.h | 81 - + arch/ia64/include/asm/system.h | 11 +- + arch/ia64/include/asm/unistd.h | 14 - + arch/ia64/kernel/audit.c | 21 - + arch/ia64/kernel/entry.S | 39 - + arch/ia64/kernel/ivt.S | 114 -- + arch/ia64/kernel/process.c | 55 +- + arch/ia64/kernel/ptrace.c | 14 +- + arch/ia64/kernel/setup.c | 5 - + arch/ia64/kernel/signal.c | 54 +- + arch/ia64/kernel/smpboot.c | 5 - + arch/ia64/kernel/traps.c | 9 - + arch/ia64/mm/init.c | 5 - + arch/ia64/xen/hypercall.S | 5 - + arch/ia64/xen/xen_pv_ops.c | 16 - + drivers/input/input-compat.h | 2 - + 38 files changed, 20 insertions(+), 6323 deletions(-) + delete mode 100644 arch/ia64/ia32/Makefile + delete mode 100644 arch/ia64/ia32/audit.c + delete mode 100644 arch/ia64/ia32/binfmt_elf32.c + delete mode 100644 arch/ia64/ia32/elfcore32.h + delete mode 100644 arch/ia64/ia32/ia32_entry.S + delete mode 100644 arch/ia64/ia32/ia32_ldt.c + delete mode 100644 arch/ia64/ia32/ia32_signal.c + delete mode 100644 arch/ia64/ia32/ia32_support.c + delete mode 100644 arch/ia64/ia32/ia32_traps.c + delete mode 100644 arch/ia64/ia32/ia32priv.h + delete mode 100644 arch/ia64/ia32/sys_ia32.c + delete mode 100644 arch/ia64/include/asm/ia32.h +Merging m68k/for-next +$ git merge m68k/for-next +Removing arch/m68k/mac/debug.c +Auto-merging drivers/serial/Kconfig +Merge made by recursive. + arch/h8300/mm/memory.c | 4 +- + arch/m68k/Kconfig | 6 +- + arch/m68k/amiga/config.c | 2 +- + arch/m68k/configs/mac_defconfig | 7 +- + arch/m68k/configs/multi_defconfig | 6 +- + arch/m68k/include/asm/machw.h | 25 -- + arch/m68k/include/asm/macints.h | 22 +- + arch/m68k/include/asm/ptrace.h | 2 + + arch/m68k/include/asm/siginfo.h | 91 ---- + arch/m68k/include/asm/swab.h | 2 +- + arch/m68k/include/asm/thread_info_mm.h | 1 + + arch/m68k/include/asm/thread_info_no.h | 1 + + arch/m68k/include/asm/unistd.h | 6 +- + arch/m68k/include/asm/virtconvert.h | 7 +- + arch/m68k/kernel/entry.S | 4 + + arch/m68k/kernel/process.c | 4 + + arch/m68k/kernel/ptrace.c | 5 + + arch/m68k/kernel/sys_m68k.c | 81 ++++ + arch/m68k/mac/Makefile | 2 +- + arch/m68k/mac/config.c | 344 ++++++++++------ + arch/m68k/mac/debug.c | 365 ---------------- + arch/m68k/mac/macints.c | 101 +---- + arch/m68k/mac/oss.c | 20 +- + arch/m68k/mac/via.c | 7 - + arch/m68k/mm/kmap.c | 5 +- + arch/m68knommu/kernel/process.c | 4 + + arch/m68knommu/kernel/ptrace.c | 5 + + arch/m68knommu/kernel/sys_m68k.c | 36 ++ + arch/m68knommu/kernel/syscalltable.S | 4 + + arch/m68knommu/mm/memory.c | 1 - + drivers/block/ataflop.c | 2 - + drivers/block/swim.c | 4 +- + drivers/char/vme_scc.c | 12 +- + drivers/macintosh/adb.c | 6 +- + drivers/macintosh/via-cuda.c | 74 ++-- + drivers/net/macmace.c | 33 +-- + drivers/net/macsonic.c | 33 +-- + drivers/scsi/mac_esp.c | 57 +--- + drivers/serial/Kconfig | 12 +- + drivers/serial/pmac_zilog.c | 240 ++++++++--- + drivers/serial/pmac_zilog.h | 34 +- + drivers/video/macfb.c | 736 +++++++++++++++----------------- + drivers/video/macmodes.c | 80 +++-- + drivers/video/valkyriefb.c | 6 +- + drivers/video/valkyriefb.h | 31 +- + 45 files changed, 1094 insertions(+), 1436 deletions(-) + delete mode 100644 arch/m68k/mac/debug.c +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Merge made by recursive. + arch/m68k/include/asm/m520xsim.h | 4 + + arch/m68k/include/asm/m523xsim.h | 8 + + arch/m68k/include/asm/m5249sim.h | 6 +- + arch/m68k/include/asm/m527xsim.h | 10 ++ + arch/m68k/include/asm/m528xsim.h | 67 +--------- + arch/m68k/include/asm/m532xsim.h | 1 + + arch/m68k/include/asm/mcfqspi.h | 64 +++++++++ + arch/m68knommu/Kconfig | 4 + + arch/m68knommu/Makefile | 2 +- + arch/m68knommu/kernel/entry.S | 2 +- + arch/m68knommu/platform/520x/config.c | 149 +++++++++++++++++++++ + arch/m68knommu/platform/523x/config.c | 170 ++++++++++++++++++++++++ + arch/m68knommu/platform/5249/config.c | 167 +++++++++++++++++++++++ + arch/m68knommu/platform/5272/intc.c | 39 +++++- + arch/m68knommu/platform/527x/config.c | 182 ++++++++++++++++++++++++++ + arch/m68knommu/platform/528x/config.c | 137 +++++++++++++++++++ + arch/m68knommu/platform/532x/config.c | 124 +++++++++++++++++ + arch/m68knommu/platform/68328/ints.c | 8 +- + arch/m68knommu/platform/68360/ints.c | 8 +- + arch/m68knommu/platform/coldfire/intc-2.c | 76 ++++++++++- + arch/m68knommu/platform/coldfire/intc-simr.c | 68 +++++++++- + arch/m68knommu/platform/coldfire/intc.c | 59 ++++++++- + fs/binfmt_flat.c | 2 +- + 23 files changed, 1252 insertions(+), 105 deletions(-) + create mode 100644 arch/m68k/include/asm/mcfqspi.h +Merging microblaze/next +$ git merge microblaze/next +Merge made by recursive. + arch/microblaze/Kconfig | 24 +- + arch/microblaze/Makefile | 1 + + arch/microblaze/include/asm/device.h | 4 + + arch/microblaze/include/asm/dma-mapping.h | 154 +++- + arch/microblaze/include/asm/io.h | 31 +- + arch/microblaze/include/asm/irq.h | 37 +- + arch/microblaze/include/asm/page.h | 12 +- + arch/microblaze/include/asm/pci-bridge.h | 195 ++++ + arch/microblaze/include/asm/pci.h | 178 ++++- + arch/microblaze/include/asm/pgtable.h | 15 + + arch/microblaze/include/asm/prom.h | 15 + + arch/microblaze/include/asm/system.h | 3 + + arch/microblaze/include/asm/tlbflush.h | 2 +- + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/asm-offsets.c | 1 + + arch/microblaze/kernel/cpu/cache.c | 7 +- + arch/microblaze/kernel/dma.c | 147 +++ + arch/microblaze/kernel/entry.S | 24 +- + arch/microblaze/kernel/head.S | 13 +- + arch/microblaze/kernel/irq.c | 15 + + arch/microblaze/kernel/setup.c | 45 +- + arch/microblaze/mm/init.c | 29 +- + arch/microblaze/pci/Makefile | 6 + + arch/microblaze/pci/indirect_pci.c | 163 +++ + arch/microblaze/pci/iomap.c | 39 + + arch/microblaze/pci/pci-common.c | 1640 +++++++++++++++++++++++++++++ + arch/microblaze/pci/pci_32.c | 430 ++++++++ + arch/microblaze/pci/xilinx_pci.c | 168 +++ + arch/powerpc/sysdev/xilinx_pci.c | 4 +- + drivers/pci/Makefile | 1 + + include/asm-generic/dma-mapping-common.h | 10 + + 31 files changed, 3365 insertions(+), 50 deletions(-) + create mode 100644 arch/microblaze/kernel/dma.c + create mode 100644 arch/microblaze/pci/Makefile + create mode 100644 arch/microblaze/pci/indirect_pci.c + create mode 100644 arch/microblaze/pci/iomap.c + create mode 100644 arch/microblaze/pci/pci-common.c + create mode 100644 arch/microblaze/pci/pci_32.c + create mode 100644 arch/microblaze/pci/xilinx_pci.c +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Removing arch/mips/alchemy/common/puts.c +Removing arch/mips/alchemy/common/reset.c +Removing arch/mips/alchemy/devboards/db1x00/irqmap.c +Removing arch/mips/alchemy/devboards/pb1200/irqmap.c +Removing arch/mips/alchemy/mtx-1/irqmap.c +Removing arch/mips/alchemy/xxs1500/irqmap.c +Removing arch/mips/include/asm/mach-pb1x00/pb1100.h +Removing arch/mips/include/asm/mach-pb1x00/pb1500.h +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/Makefile +Removing drivers/mtd/maps/alchemy-flash.c +Removing drivers/pcmcia/au1000_db1x00.c +Removing drivers/pcmcia/au1000_xxs1500.c +Auto-merging drivers/serial/8250.c +Removing drivers/staging/octeon/ethernet-proc.c +Removing drivers/staging/octeon/ethernet-proc.h +Removing sound/soc/au1x/sample-ac97.c +Merge made by recursive. + arch/mips/Kconfig | 8 +- + arch/mips/Kconfig.debug | 19 + + arch/mips/Makefile | 6 +- + arch/mips/alchemy/Kconfig | 28 +- + arch/mips/alchemy/common/Makefile | 7 +- + arch/mips/alchemy/common/dbdma.c | 76 +- + arch/mips/alchemy/common/dma.c | 36 +- + arch/mips/alchemy/common/gpiolib-au1000.c | 10 +- + arch/mips/alchemy/common/irq.c | 436 +++--- + arch/mips/alchemy/common/platform.c | 152 ++- + arch/mips/alchemy/common/prom.c | 28 +- + arch/mips/alchemy/common/puts.c | 68 - + arch/mips/alchemy/common/reset.c | 188 --- + arch/mips/alchemy/common/setup.c | 12 +- + arch/mips/alchemy/common/time.c | 35 +- + arch/mips/alchemy/devboards/Makefile | 6 +- + arch/mips/alchemy/devboards/bcsr.c | 148 ++ + arch/mips/alchemy/devboards/db1200/Makefile | 1 + + arch/mips/alchemy/devboards/db1200/platform.c | 561 ++++++++ + arch/mips/alchemy/devboards/db1200/setup.c | 118 ++ + arch/mips/alchemy/devboards/db1x00/Makefile | 2 +- + arch/mips/alchemy/devboards/db1x00/board_setup.c | 200 ++- + arch/mips/alchemy/devboards/db1x00/irqmap.c | 90 -- + arch/mips/alchemy/devboards/db1x00/platform.c | 118 ++ + arch/mips/alchemy/devboards/pb1000/board_setup.c | 34 +- + arch/mips/alchemy/devboards/pb1100/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1100/board_setup.c | 55 +- + arch/mips/alchemy/devboards/pb1100/platform.c | 50 + + arch/mips/alchemy/devboards/pb1200/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1200/board_setup.c | 96 +- + arch/mips/alchemy/devboards/pb1200/irqmap.c | 134 -- + arch/mips/alchemy/devboards/pb1200/platform.c | 63 +- + arch/mips/alchemy/devboards/pb1500/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1500/board_setup.c | 54 +- + arch/mips/alchemy/devboards/pb1500/platform.c | 49 + + arch/mips/alchemy/devboards/pb1550/Makefile | 2 +- + arch/mips/alchemy/devboards/pb1550/board_setup.c | 49 +- + arch/mips/alchemy/devboards/pb1550/platform.c | 69 + + arch/mips/alchemy/devboards/platform.c | 222 +++ + arch/mips/alchemy/devboards/platform.h | 21 + + arch/mips/alchemy/devboards/prom.c | 5 + + arch/mips/alchemy/mtx-1/Makefile | 2 +- + arch/mips/alchemy/mtx-1/board_setup.c | 49 +- + arch/mips/alchemy/mtx-1/init.c | 6 + + arch/mips/alchemy/mtx-1/irqmap.c | 56 - + arch/mips/alchemy/xxs1500/Makefile | 4 +- + arch/mips/alchemy/xxs1500/board_setup.c | 60 +- + arch/mips/alchemy/xxs1500/init.c | 6 + + arch/mips/alchemy/xxs1500/irqmap.c | 52 - + arch/mips/alchemy/xxs1500/platform.c | 63 + + arch/mips/ar7/clock.c | 109 ++- + arch/mips/ar7/gpio.c | 113 ++- + arch/mips/ar7/memory.c | 3 +- + arch/mips/ar7/platform.c | 713 +++++----- + arch/mips/ar7/prom.c | 78 +- + arch/mips/ar7/setup.c | 15 +- + arch/mips/ar7/time.c | 12 +- + arch/mips/bcm47xx/gpio.c | 1 - + arch/mips/bcm47xx/prom.c | 1 - + arch/mips/bcm47xx/setup.c | 1 - + arch/mips/bcm47xx/wgt634u.c | 1 - + arch/mips/bcm63xx/boards/board_bcm963xx.c | 1 - + arch/mips/boot/compressed/Makefile | 11 +- + arch/mips/boot/compressed/dbg.c | 4 +- + arch/mips/boot/compressed/decompress.c | 4 +- + arch/mips/boot/compressed/uart-alchemy.c | 7 + + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 1 - + arch/mips/cavium-octeon/octeon-irq.c | 107 ++- + arch/mips/cavium-octeon/octeon-platform.c | 85 ++ + arch/mips/cavium-octeon/smp.c | 2 +- + arch/mips/configs/db1200_defconfig | 1481 +++++++++++--------- + arch/mips/configs/lemote2f_defconfig | 964 +++++++++---- + arch/mips/dec/prom/locore.S | 1 - + arch/mips/include/asm/atomic.h | 16 +- + arch/mips/include/asm/barrier.h | 54 +- + arch/mips/include/asm/bitops.h | 8 +- + arch/mips/include/asm/cmpxchg.h | 10 +- + arch/mips/include/asm/cpu-features.h | 3 + + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/current.h | 24 +- + arch/mips/include/asm/device.h | 1 - + arch/mips/include/asm/elf.h | 14 +- + arch/mips/include/asm/ftrace.h | 2 +- + arch/mips/include/asm/io.h | 18 + + arch/mips/include/asm/mach-ar7/ar7.h | 23 +- + arch/mips/include/asm/mach-ar7/gpio.h | 86 +- + arch/mips/include/asm/mach-au1x00/au1000.h | 888 ++++++------- + arch/mips/include/asm/mach-au1x00/au1100_mmc.h | 2 +- + arch/mips/include/asm/mach-au1x00/au1xxx_dbdma.h | 23 +- + arch/mips/include/asm/mach-au1x00/au1xxx_eth.h | 17 + + arch/mips/include/asm/mach-au1x00/gpio-au1000.h | 164 ++-- + arch/mips/include/asm/mach-au1x00/gpio.h | 2 +- + arch/mips/include/asm/mach-au1x00/prom.h | 1 - + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 1 - + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 3 + + arch/mips/include/asm/mach-db1x00/bcsr.h | 238 ++++ + arch/mips/include/asm/mach-db1x00/db1200.h | 156 +-- + arch/mips/include/asm/mach-db1x00/db1x00.h | 100 -- + .../asm/mach-loongson/cpu-feature-overrides.h | 2 +- + .../include/asm/mach-loongson/cs5536/cs5536_vsm.h | 2 +- + arch/mips/include/asm/mach-loongson/loongson.h | 5 +- + arch/mips/include/asm/mach-loongson/machine.h | 4 +- + arch/mips/include/asm/mach-loongson/mem.h | 2 +- + arch/mips/include/asm/mach-loongson/pci.h | 13 +- + arch/mips/include/asm/mach-pb1x00/pb1100.h | 85 -- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 122 +-- + arch/mips/include/asm/mach-pb1x00/pb1500.h | 49 - + arch/mips/include/asm/mach-pb1x00/pb1550.h | 96 -- + arch/mips/include/asm/mach-pnx833x/irq-mapping.h | 1 - + arch/mips/include/asm/mach-powertv/interrupts.h | 1 - + arch/mips/include/asm/mipsregs.h | 15 + + arch/mips/include/asm/msc01_ic.h | 1 - + arch/mips/include/asm/nile4.h | 1 - + arch/mips/include/asm/octeon/octeon-feature.h | 8 +- + arch/mips/include/asm/octeon/octeon.h | 5 + + arch/mips/include/asm/page.h | 12 - + arch/mips/include/asm/param.h | 17 +- + arch/mips/include/asm/parport.h | 16 +- + arch/mips/include/asm/pgalloc.h | 4 +- + arch/mips/include/asm/pgtable-32.h | 4 +- + arch/mips/include/asm/pgtable-64.h | 40 +- + arch/mips/include/asm/pgtable-bits.h | 120 ++- + arch/mips/include/asm/pgtable.h | 28 +- + .../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h | 1 - + arch/mips/include/asm/serial.h | 23 +- + arch/mips/include/asm/sibyte/bigsur.h | 1 - + arch/mips/include/asm/sibyte/sb1250_ldt.h | 1 - + arch/mips/include/asm/sn/klkernvars.h | 1 - + arch/mips/include/asm/sparsemem.h | 1 - + arch/mips/include/asm/spinlock.h | 4 +- + arch/mips/include/asm/system.h | 4 + + arch/mips/include/asm/txx9/generic.h | 1 - + arch/mips/{mm => include/asm}/uasm.h | 4 + + arch/mips/include/asm/ucontext.h | 22 +- + arch/mips/kernel/asm-offsets.c | 4 + + arch/mips/kernel/cpu-probe.c | 27 +- + arch/mips/kernel/ftrace.c | 2 +- + arch/mips/kernel/linux32.c | 1 - + arch/mips/kernel/mcount.S | 2 +- + arch/mips/kernel/octeon_switch.S | 1 - + arch/mips/kernel/rtlx.c | 1 - + arch/mips/kernel/traps.c | 23 +- + arch/mips/kernel/vpe.c | 1 - + arch/mips/lasat/picvue.h | 1 - + arch/mips/loongson/common/cmdline.c | 9 +- + arch/mips/loongson/common/cs5536/cs5536_acc.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_ehci.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_ide.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_isa.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_ohci.c | 2 +- + arch/mips/loongson/common/cs5536/cs5536_pci.c | 2 +- + arch/mips/loongson/common/early_printk.c | 2 +- + arch/mips/loongson/common/env.c | 29 +- + arch/mips/loongson/common/init.c | 2 +- + arch/mips/loongson/common/machtype.c | 12 +- + arch/mips/loongson/common/mem.c | 7 +- + arch/mips/loongson/common/platform.c | 2 +- + arch/mips/loongson/common/pm.c | 2 +- + arch/mips/loongson/common/reset.c | 20 +- + arch/mips/loongson/common/serial.c | 2 +- + arch/mips/loongson/common/time.c | 4 +- + arch/mips/loongson/common/uart_base.c | 2 +- + arch/mips/loongson/fuloong-2e/reset.c | 4 +- + arch/mips/loongson/lemote-2f/Makefile | 2 +- + arch/mips/loongson/lemote-2f/machtype.c | 45 + + arch/mips/loongson/lemote-2f/pm.c | 2 +- + arch/mips/loongson/lemote-2f/reset.c | 2 +- + arch/mips/math-emu/ieee754d.c | 1 - + arch/mips/math-emu/ieee754dp.c | 1 - + arch/mips/math-emu/ieee754sp.c | 1 - + arch/mips/math-emu/ieee754xcpt.c | 1 - + arch/mips/mm/c-octeon.c | 8 +- + arch/mips/mm/cache.c | 53 +- + arch/mips/mm/fault.c | 27 +- + arch/mips/mm/hugetlbpage.c | 1 - + arch/mips/mm/init.c | 4 +- + arch/mips/mm/page.c | 2 +- + arch/mips/mm/pgtable-64.c | 44 +- + arch/mips/mm/tlb-r4k.c | 84 +- + arch/mips/mm/tlbex.c | 188 ++- + arch/mips/mm/uasm.c | 12 +- + arch/mips/nxp/pnx833x/common/interrupts.c | 1 - + arch/mips/nxp/pnx833x/common/prom.c | 6 - + arch/mips/nxp/pnx8550/common/prom.c | 1 - + arch/mips/oprofile/common.c | 7 +- + arch/mips/oprofile/op_model_loongson2.c | 2 +- + arch/mips/pci/fixup-lemote2f.c | 2 +- + arch/mips/pci/ops-loongson2.c | 4 +- + arch/mips/pci/pci-bcm47xx.c | 1 - + arch/mips/pci/pci-octeon.c | 6 +- + arch/mips/pmc-sierra/msp71xx/msp_irq_cic.c | 1 - + arch/mips/pmc-sierra/msp71xx/msp_prom.c | 6 - + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.c | 2 +- + arch/mips/pmc-sierra/yosemite/atmel_read_eeprom.h | 1 - + arch/mips/power/cpu.c | 4 +- + arch/mips/power/hibernate.S | 4 +- + arch/mips/powertv/asic/asic_devices.c | 4 - + arch/mips/sgi-ip27/ip27-klnuma.c | 1 - + arch/mips/sgi-ip32/ip32-irq.c | 9 +- + arch/mips/sibyte/common/sb_tbprof.c | 1 - + arch/mips/txx9/generic/setup.c | 5 - + arch/mips/txx9/jmr3927/setup.c | 7 - + arch/mips/txx9/rbtx4927/setup.c | 7 - + arch/mips/txx9/rbtx4938/setup.c | 6 - + drivers/i2c/busses/Kconfig | 10 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-octeon.c | 651 +++++++++ + drivers/ide/au1xxx-ide.c | 21 +- + drivers/mmc/host/au1xmmc.c | 12 +- + drivers/mtd/maps/Kconfig | 6 - + drivers/mtd/maps/Makefile | 1 - + drivers/mtd/maps/alchemy-flash.c | 166 --- + drivers/mtd/nand/au1550nd.c | 4 +- + drivers/net/au1000_eth.c | 441 +++--- + drivers/net/au1000_eth.h | 9 + + drivers/net/cpmac.c | 10 +- + drivers/net/irda/au1k_ir.c | 14 +- + drivers/pcmcia/Kconfig | 21 + + drivers/pcmcia/Makefile | 12 +- + drivers/pcmcia/au1000_db1x00.c | 305 ---- + drivers/pcmcia/au1000_generic.h | 12 +- + drivers/pcmcia/au1000_pb1x00.c | 119 +-- + drivers/pcmcia/au1000_xxs1500.c | 188 --- + drivers/pcmcia/db1xxx_ss.c | 630 +++++++++ + drivers/pcmcia/xxs1500_ss.c | 357 +++++ + drivers/serial/8250.c | 15 +- + drivers/spi/au1550_spi.c | 6 +- + drivers/staging/octeon/Makefile | 1 - + drivers/staging/octeon/ethernet-defines.h | 34 +- + drivers/staging/octeon/ethernet-mdio.c | 6 +- + drivers/staging/octeon/ethernet-mdio.h | 1 - + drivers/staging/octeon/ethernet-mem.c | 124 +- + drivers/staging/octeon/ethernet-proc.c | 144 -- + drivers/staging/octeon/ethernet-proc.h | 29 - + drivers/staging/octeon/ethernet-rgmii.c | 56 +- + drivers/staging/octeon/ethernet-rx.c | 384 +++--- + drivers/staging/octeon/ethernet-rx.h | 25 +- + drivers/staging/octeon/ethernet-sgmii.c | 1 - + drivers/staging/octeon/ethernet-spi.c | 1 - + drivers/staging/octeon/ethernet-tx.c | 441 ++++--- + drivers/staging/octeon/ethernet-tx.h | 29 +- + drivers/staging/octeon/ethernet-util.h | 13 +- + drivers/staging/octeon/ethernet-xaui.c | 1 - + drivers/staging/octeon/ethernet.c | 254 ++-- + drivers/staging/octeon/octeon-ethernet.h | 58 +- + drivers/staging/sm7xx/smtc2d.c | 2 +- + drivers/staging/sm7xx/smtc2d.h | 2 +- + drivers/staging/sm7xx/smtcfb.c | 2 +- + drivers/staging/sm7xx/smtcfb.h | 2 +- + drivers/video/tdfxfb.c | 4 +- + drivers/watchdog/ar7_wdt.c | 18 +- + sound/oss/au1550_ac97.c | 16 +- + sound/soc/au1x/Kconfig | 10 +- + sound/soc/au1x/Makefile | 4 +- + sound/soc/au1x/db1200.c | 141 ++ + sound/soc/au1x/dbdma2.c | 14 +- + sound/soc/au1x/sample-ac97.c | 144 -- + 258 files changed, 9043 insertions(+), 6516 deletions(-) + delete mode 100644 arch/mips/alchemy/common/puts.c + delete mode 100644 arch/mips/alchemy/common/reset.c + create mode 100644 arch/mips/alchemy/devboards/bcsr.c + create mode 100644 arch/mips/alchemy/devboards/db1200/Makefile + create mode 100644 arch/mips/alchemy/devboards/db1200/platform.c + create mode 100644 arch/mips/alchemy/devboards/db1200/setup.c + delete mode 100644 arch/mips/alchemy/devboards/db1x00/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/db1x00/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1100/platform.c + delete mode 100644 arch/mips/alchemy/devboards/pb1200/irqmap.c + create mode 100644 arch/mips/alchemy/devboards/pb1500/platform.c + create mode 100644 arch/mips/alchemy/devboards/pb1550/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.c + create mode 100644 arch/mips/alchemy/devboards/platform.h + delete mode 100644 arch/mips/alchemy/mtx-1/irqmap.c + delete mode 100644 arch/mips/alchemy/xxs1500/irqmap.c + create mode 100644 arch/mips/alchemy/xxs1500/platform.c + create mode 100644 arch/mips/boot/compressed/uart-alchemy.c + create mode 100644 arch/mips/include/asm/mach-au1x00/au1xxx_eth.h + create mode 100644 arch/mips/include/asm/mach-db1x00/bcsr.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1100.h + delete mode 100644 arch/mips/include/asm/mach-pb1x00/pb1500.h + rename arch/mips/{mm => include/asm}/uasm.h (97%) + create mode 100644 arch/mips/loongson/lemote-2f/machtype.c + create mode 100644 drivers/i2c/busses/i2c-octeon.c + delete mode 100644 drivers/mtd/maps/alchemy-flash.c + delete mode 100644 drivers/pcmcia/au1000_db1x00.c + delete mode 100644 drivers/pcmcia/au1000_xxs1500.c + create mode 100644 drivers/pcmcia/db1xxx_ss.c + create mode 100644 drivers/pcmcia/xxs1500_ss.c + delete mode 100644 drivers/staging/octeon/ethernet-proc.c + delete mode 100644 drivers/staging/octeon/ethernet-proc.h + create mode 100644 sound/soc/au1x/db1200.c + delete mode 100644 sound/soc/au1x/sample-ac97.c +Merging parisc/next +$ git merge parisc/next +Auto-merging arch/arm/include/asm/cacheflush.h +Merge made by recursive. + Documentation/cachetlb.txt | 24 ++++++++++++++++++++++++ + arch/arm/include/asm/cacheflush.h | 10 ++++++++++ + arch/parisc/Kconfig.debug | 14 ++++++++++++++ + arch/parisc/include/asm/cacheflush.h | 12 ++++++++++++ + arch/parisc/include/asm/param.h | 23 +---------------------- + arch/parisc/include/asm/system.h | 2 +- + arch/parisc/include/asm/uaccess.h | 27 +++++++++++++++++++++++++-- + arch/parisc/include/asm/unistd.h | 4 +++- + arch/parisc/kernel/cache.c | 4 ++-- + arch/parisc/kernel/syscall_table.S | 2 ++ + arch/parisc/kernel/time.c | 29 +++++++++++++---------------- + arch/parisc/lib/memcpy.c | 3 ++- + arch/sh/include/asm/cacheflush.h | 8 ++++++++ + drivers/parisc/eisa_enumerator.c | 2 +- + drivers/parisc/superio.c | 2 +- + fs/xfs/linux-2.6/xfs_buf.c | 30 +++++++++++++++++++++++++++++- + include/linux/highmem.h | 6 ++++++ + 17 files changed, 154 insertions(+), 48 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Merge made by recursive. + Documentation/powerpc/ptrace.txt | 134 ++++++ + arch/powerpc/Kconfig | 29 ++- + arch/powerpc/boot/dts/arches.dts | 12 + + arch/powerpc/boot/dts/glacier.dts | 76 +++- + arch/powerpc/boot/dts/katmai.dts | 71 +++- + arch/powerpc/configs/44x/katmai_defconfig | 94 ++++- + arch/powerpc/configs/ppc64_defconfig | 75 ++-- + arch/powerpc/configs/pseries_defconfig | 63 ++-- + arch/powerpc/include/asm/asm-compat.h | 5 +- + arch/powerpc/include/asm/atomic.h | 48 +- + arch/powerpc/include/asm/bitops.h | 56 ++-- + arch/powerpc/include/asm/cputable.h | 4 +- + arch/powerpc/include/asm/cputime.h | 7 +- + arch/powerpc/include/asm/futex.h | 6 +- + arch/powerpc/include/asm/hardirq.h | 30 ++- + arch/powerpc/include/asm/local.h | 12 +- + arch/powerpc/include/asm/mutex.h | 6 +- + arch/powerpc/include/asm/param.h | 23 +- + arch/powerpc/include/asm/ppc-opcode.h | 18 + + arch/powerpc/include/asm/ppc-pci.h | 5 + + arch/powerpc/include/asm/processor.h | 36 ++- + arch/powerpc/include/asm/ptrace.h | 77 ++++ + arch/powerpc/include/asm/reg_booke.h | 96 +++++- + arch/powerpc/include/asm/spinlock.h | 32 +- + arch/powerpc/include/asm/synch.h | 12 +- + arch/powerpc/include/asm/system.h | 21 +- + arch/powerpc/include/asm/topology.h | 48 ++- + arch/powerpc/kernel/entry_64.S | 3 +- + arch/powerpc/kernel/firmware.c | 2 +- + arch/powerpc/kernel/irq.c | 118 ++++-- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/kprobes.c | 4 +- + arch/powerpc/kernel/lparcfg.c | 10 +- + arch/powerpc/kernel/nvram_64.c | 6 +- + arch/powerpc/kernel/pci_of_scan.c | 2 +- + arch/powerpc/kernel/process.c | 116 +++++- + arch/powerpc/kernel/prom_init.c | 81 ++++- + arch/powerpc/kernel/ptrace.c | 516 +++++++++++++++++++++-- + arch/powerpc/kernel/signal.c | 6 +- + arch/powerpc/kernel/signal_32.c | 16 +- + arch/powerpc/kernel/time.c | 10 +- + arch/powerpc/kernel/traps.c | 120 ++++-- + arch/powerpc/lib/copypage_64.S | 28 +- + arch/powerpc/lib/copyuser_64.S | 80 +++- + arch/powerpc/lib/feature-fixups.c | 2 +- + arch/powerpc/mm/40x_mmu.c | 4 +- + arch/powerpc/mm/hash_native_64.c | 5 +- + arch/powerpc/mm/mmu_context_hash64.c | 10 +- + arch/powerpc/mm/tlb_low_64e.S | 2 +- + arch/powerpc/platforms/512x/mpc5121_ads_cpld.c | 2 +- + arch/powerpc/platforms/85xx/smp.c | 21 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 2 +- + arch/powerpc/platforms/85xx/stx_gp3.c | 2 +- + arch/powerpc/platforms/cell/beat_interrupt.c | 2 +- + arch/powerpc/platforms/cell/interrupt.c | 4 +- + arch/powerpc/platforms/cell/spider-pic.c | 2 +- + arch/powerpc/platforms/iseries/irq.c | 2 +- + arch/powerpc/platforms/iseries/proc.c | 2 +- + arch/powerpc/platforms/iseries/setup.c | 2 +- + arch/powerpc/platforms/powermac/bootx_init.c | 4 +- + arch/powerpc/platforms/powermac/pic.c | 2 +- + arch/powerpc/platforms/pseries/eeh.c | 4 +- + arch/powerpc/platforms/pseries/eeh_driver.c | 10 +- + arch/powerpc/platforms/pseries/eeh_event.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 22 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 4 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/platforms/pseries/phyp_dump.c | 6 +- + arch/powerpc/platforms/pseries/smp.c | 4 +- + arch/powerpc/platforms/pseries/xics.c | 32 +- + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/cpm2_pic.c | 2 +- + arch/powerpc/sysdev/fsl_msi.c | 2 +- + arch/powerpc/sysdev/i8259.c | 2 +- + arch/powerpc/sysdev/ipic.c | 4 +- + arch/powerpc/sysdev/mpc8xx_pic.c | 2 +- + arch/powerpc/sysdev/mpic.c | 2 +- + arch/powerpc/sysdev/mpic_pasemi_msi.c | 2 +- + arch/powerpc/sysdev/mv64x60_dev.c | 3 + + arch/powerpc/sysdev/ppc4xx_soc.c | 3 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 4 +- + arch/powerpc/sysdev/qe_lib/qe_io.c | 8 +- + arch/powerpc/sysdev/uic.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + drivers/block/viodasd.c | 86 ++--- + drivers/char/hvc_beat.c | 2 +- + drivers/char/hvc_console.c | 9 +- + drivers/char/hvc_console.h | 9 +- + drivers/char/hvc_iseries.c | 2 +- + drivers/char/hvc_iucv.c | 2 +- + drivers/char/hvc_rtas.c | 2 +- + drivers/char/hvc_udbg.c | 2 +- + drivers/char/hvc_vio.c | 2 +- + drivers/char/hvc_xen.c | 2 +- + drivers/hwmon/ams/ams-core.c | 11 +- + drivers/hwmon/ams/ams-i2c.c | 2 + + drivers/hwmon/ams/ams-pmu.c | 2 + + drivers/hwmon/ams/ams.h | 1 + + drivers/macintosh/therm_adt746x.c | 36 ++- + drivers/ps3/ps3av.c | 2 +- + include/linux/lmb.h | 1 + + lib/lmb.c | 13 +- + 102 files changed, 2001 insertions(+), 597 deletions(-) + create mode 100644 Documentation/powerpc/ptrace.txt +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Merge made by recursive. + .../powerpc/dts-bindings/fsl/mpc5121-psc.txt | 70 + + Documentation/powerpc/dts-bindings/fsl/spi.txt | 7 + + arch/powerpc/boot/dts/mpc5121ads.dts | 55 +- + arch/powerpc/configs/mpc512x_defconfig | 1694 ++++++++++++++++++++ + arch/powerpc/include/asm/mpc5121.h | 24 + + arch/powerpc/include/asm/mpc52xx_psc.h | 4 + + arch/powerpc/platforms/512x/clock.c | 6 +- + arch/powerpc/platforms/512x/mpc5121_ads.c | 3 +- + arch/powerpc/platforms/512x/mpc5121_generic.c | 3 +- + arch/powerpc/platforms/512x/mpc512x.h | 3 + + arch/powerpc/platforms/512x/mpc512x_shared.c | 43 + + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-mpc5121.c | 387 +++++ + drivers/serial/mpc52xx_uart.c | 251 +++- + drivers/video/fsl-diu-fb.c | 5 + + 16 files changed, 2522 insertions(+), 44 deletions(-) + create mode 100644 Documentation/powerpc/dts-bindings/fsl/mpc5121-psc.txt + create mode 100644 arch/powerpc/configs/mpc512x_defconfig + create mode 100644 arch/powerpc/include/asm/mpc5121.h + create mode 100644 drivers/rtc/rtc-mpc5121.c +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Auto-merging arch/s390/kernel/ftrace.c +Merge made by recursive. + Documentation/s390/CommonIO | 6 + + Documentation/s390/driver-model.txt | 4 +- + arch/s390/Kconfig | 6 + + arch/s390/Kconfig.debug | 13 + + arch/s390/Makefile | 13 +- + arch/s390/boot/Makefile | 8 + + arch/s390/boot/compressed/Makefile | 60 +++++ + arch/s390/boot/compressed/head31.S | 51 +++++ + arch/s390/boot/compressed/head64.S | 48 ++++ + arch/s390/boot/compressed/misc.c | 158 +++++++++++++ + arch/s390/boot/compressed/vmlinux.lds.S | 55 +++++ + arch/s390/boot/compressed/vmlinux.scr | 10 + + arch/s390/defconfig | 7 + + arch/s390/hypfs/hypfs_diag.c | 4 +- + arch/s390/include/asm/atomic.h | 86 +------- + arch/s390/include/asm/bitops.h | 83 ++------ + arch/s390/include/asm/bug.h | 10 +- + arch/s390/include/asm/crw.h | 1 + + arch/s390/include/asm/etr.h | 12 +- + arch/s390/include/asm/irqflags.h | 36 --- + arch/s390/include/asm/lowcore.h | 250 +++++---------------- + arch/s390/include/asm/processor.h | 18 +- + arch/s390/include/asm/qdio.h | 3 +- + arch/s390/include/asm/rwsem.h | 147 ++++++------ + arch/s390/include/asm/setup.h | 9 +- + arch/s390/include/asm/sigp.h | 118 +++++----- + arch/s390/include/asm/smp.h | 38 +++- + arch/s390/include/asm/spinlock.h | 18 -- + arch/s390/include/asm/swab.h | 16 +- + arch/s390/include/asm/sysinfo.h | 3 +- + arch/s390/include/asm/system.h | 168 +++++++------- + arch/s390/include/asm/thread_info.h | 2 +- + arch/s390/include/asm/timex.h | 22 +-- + arch/s390/include/asm/uaccess.h | 12 + + arch/s390/kernel/Makefile | 3 + + arch/s390/kernel/asm-offsets.c | 99 ++++++++- + arch/s390/kernel/base.S | 2 +- + arch/s390/kernel/dis.c | 369 ++++++++++++++++++++++++------- + arch/s390/kernel/early.c | 22 ++- + arch/s390/kernel/entry.S | 1 - + arch/s390/kernel/entry64.S | 2 - + arch/s390/kernel/ftrace.c | 2 +- + arch/s390/kernel/head.S | 60 ++---- + arch/s390/kernel/head31.S | 16 +- + arch/s390/kernel/head64.S | 92 +------- + arch/s390/kernel/ipl.c | 41 +++-- + arch/s390/kernel/machine_kexec.c | 10 +- + arch/s390/kernel/reipl.S | 2 +- + arch/s390/kernel/reipl64.S | 2 +- + arch/s390/kernel/sclp.S | 36 +++- + arch/s390/kernel/setup.c | 11 +- + arch/s390/kernel/smp.c | 108 +++++---- + arch/s390/kernel/switch_cpu.S | 58 +++++ + arch/s390/kernel/switch_cpu64.S | 51 +++++ + arch/s390/kernel/swsusp_asm64.S | 2 +- + arch/s390/kernel/vdso.c | 1 + + arch/s390/kvm/diag.c | 4 +- + arch/s390/kvm/intercept.c | 18 +- + arch/s390/kvm/interrupt.c | 12 +- + arch/s390/kvm/kvm-s390.c | 23 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/kvm/sigp.c | 4 +- + arch/s390/lib/Makefile | 2 +- + arch/s390/lib/spinlock.c | 53 +++-- + arch/s390/lib/usercopy.c | 8 + + arch/s390/mm/extmem.c | 12 +- + arch/s390/mm/fault.c | 5 +- + arch/s390/mm/init.c | 33 ++-- + drivers/s390/block/dasd.c | 22 ++- + drivers/s390/block/dasd_genhd.c | 1 + + drivers/s390/block/dasd_int.h | 1 + + drivers/s390/block/dasd_proc.c | 109 ++++----- + drivers/s390/char/zcore.c | 141 ++++-------- + drivers/s390/cio/ccwreq.c | 2 +- + drivers/s390/cio/chsc_sch.c | 2 +- + drivers/s390/cio/cio.c | 14 +- + drivers/s390/cio/crw.c | 29 ++-- + drivers/s390/cio/css.c | 79 ++++++- + drivers/s390/cio/css.h | 4 +- + drivers/s390/cio/device.c | 49 ++--- + drivers/s390/cio/device.h | 3 +- + drivers/s390/cio/device_fsm.c | 43 +++- + drivers/s390/cio/qdio.h | 92 +++++--- + drivers/s390/cio/qdio_debug.c | 23 ++- + drivers/s390/cio/qdio_main.c | 28 +++- + drivers/s390/cio/qdio_setup.c | 10 +- + drivers/s390/crypto/zcrypt_api.c | 158 ++++++------- + drivers/s390/kvm/kvm_virtio.c | 4 +- + include/linux/elf.h | 5 + + 89 files changed, 2082 insertions(+), 1398 deletions(-) + create mode 100644 arch/s390/boot/compressed/Makefile + create mode 100644 arch/s390/boot/compressed/head31.S + create mode 100644 arch/s390/boot/compressed/head64.S + create mode 100644 arch/s390/boot/compressed/misc.c + create mode 100644 arch/s390/boot/compressed/vmlinux.lds.S + create mode 100644 arch/s390/boot/compressed/vmlinux.scr + create mode 100644 arch/s390/kernel/switch_cpu.S + create mode 100644 arch/s390/kernel/switch_cpu64.S + create mode 100644 arch/s390/lib/usercopy.c +Merging sh/master +$ git merge sh/master +Removing arch/sh/boards/mach-titan/Makefile +Removing arch/sh/boards/mach-titan/io.c +Removing arch/sh/boards/mach-titan/setup.c +Removing arch/sh/include/asm/ubc.h +Removing arch/sh/include/cpu-sh2/cpu/ubc.h +Removing arch/sh/include/cpu-sh3/cpu/ubc.h +Removing arch/sh/include/cpu-sh4/cpu/ubc.h +Removing arch/sh/kernel/early_printk.c +Auto-merging arch/sh/kernel/ptrace_32.c +Removing arch/sh/mm/ioremap_64.c +Auto-merging drivers/mtd/nand/Kconfig +Merge made by recursive. + arch/sh/Kconfig | 32 +- + arch/sh/Makefile | 10 +- + arch/sh/boards/Kconfig | 8 + + arch/sh/boards/Makefile | 1 + + arch/sh/boards/board-magicpanelr2.c | 74 +- + arch/sh/boards/board-polaris.c | 37 +- + arch/sh/boards/board-sh7785lcr.c | 32 +- + arch/sh/boards/board-shmin.c | 4 +- + arch/sh/boards/board-titan.c | 24 + + arch/sh/boards/board-urquell.c | 46 +- + arch/sh/boards/mach-ap325rxa/setup.c | 20 +- + arch/sh/boards/mach-cayman/irq.c | 16 +- + arch/sh/boards/mach-dreamcast/irq.c | 27 + + arch/sh/boards/mach-dreamcast/rtc.c | 20 +- + arch/sh/boards/mach-dreamcast/setup.c | 18 +- + arch/sh/boards/mach-ecovec24/setup.c | 40 +- + arch/sh/boards/mach-highlander/irq-r7780mp.c | 2 +- + arch/sh/boards/mach-highlander/irq-r7780rp.c | 2 +- + arch/sh/boards/mach-highlander/irq-r7785rp.c | 16 +- + arch/sh/boards/mach-highlander/psw.c | 4 +- + arch/sh/boards/mach-highlander/setup.c | 14 +- + arch/sh/boards/mach-hp6xx/hp6xx_apm.c | 2 +- + arch/sh/boards/mach-hp6xx/pm.c | 38 +- + arch/sh/boards/mach-hp6xx/setup.c | 12 +- + arch/sh/boards/mach-kfr2r09/setup.c | 16 +- + arch/sh/boards/mach-landisk/gio.c | 12 +- + arch/sh/boards/mach-landisk/irq.c | 6 +- + arch/sh/boards/mach-landisk/psw.c | 4 +- + arch/sh/boards/mach-landisk/setup.c | 6 +- + arch/sh/boards/mach-lboxre2/setup.c | 4 +- + arch/sh/boards/mach-microdev/io.c | 4 +- + arch/sh/boards/mach-microdev/irq.c | 10 +- + arch/sh/boards/mach-migor/setup.c | 10 +- + arch/sh/boards/mach-r2d/irq.c | 4 +- + arch/sh/boards/mach-r2d/setup.c | 8 +- + arch/sh/boards/mach-rsk/devices-rsk7203.c | 2 +- + arch/sh/boards/mach-sdk7780/irq.c | 4 +- + arch/sh/boards/mach-sdk7780/setup.c | 29 +- + arch/sh/boards/mach-sdk7786/Makefile | 1 + + arch/sh/boards/mach-sdk7786/fpga.c | 72 + + arch/sh/boards/mach-sdk7786/irq.c | 48 + + arch/sh/boards/mach-sdk7786/setup.c | 189 +++ + arch/sh/boards/mach-se/7206/io.c | 2 +- + arch/sh/boards/mach-se/7206/irq.c | 43 +- + arch/sh/boards/mach-se/7206/setup.c | 15 +- + arch/sh/boards/mach-se/7343/irq.c | 45 +- + arch/sh/boards/mach-se/7343/setup.c | 43 +- + arch/sh/boards/mach-se/770x/irq.c | 14 +- + arch/sh/boards/mach-se/770x/setup.c | 15 +- + arch/sh/boards/mach-se/7721/irq.c | 2 +- + arch/sh/boards/mach-se/7721/setup.c | 23 +- + arch/sh/boards/mach-se/7722/irq.c | 10 +- + arch/sh/boards/mach-se/7722/setup.c | 55 +- + arch/sh/boards/mach-se/7724/irq.c | 62 +- + arch/sh/boards/mach-se/7724/setup.c | 51 +- + arch/sh/boards/mach-se/7780/irq.c | 18 +- + arch/sh/boards/mach-se/7780/setup.c | 47 +- + arch/sh/boards/mach-sh03/rtc.c | 50 +- + arch/sh/boards/mach-sh03/setup.c | 2 +- + arch/sh/boards/mach-sh7763rdp/irq.c | 10 +- + arch/sh/boards/mach-sh7763rdp/setup.c | 40 +- + arch/sh/boards/mach-snapgear/setup.c | 2 +- + arch/sh/boards/mach-systemh/irq.c | 12 +- + arch/sh/boards/mach-titan/Makefile | 5 - + arch/sh/boards/mach-titan/io.c | 108 -- + arch/sh/boards/mach-titan/setup.c | 44 - + arch/sh/boards/mach-x3proto/ilsel.c | 8 +- + arch/sh/boards/mach-x3proto/setup.c | 2 +- + arch/sh/boot/Makefile | 30 +- + arch/sh/boot/compressed/Makefile | 7 +- + arch/sh/boot/compressed/misc.c | 23 +- + arch/sh/cchips/hd6446x/hd64461.c | 36 +- + arch/sh/configs/sdk7786_defconfig | 1754 +++++++++++++++++++++++ + arch/sh/drivers/dma/dma-pvr2.c | 10 +- + arch/sh/drivers/dma/dma-sh.c | 31 +- + arch/sh/drivers/dma/dmabrg.c | 22 +- + arch/sh/drivers/heartbeat.c | 22 +- + arch/sh/drivers/pci/Makefile | 5 +- + arch/sh/drivers/pci/common.c | 162 +++ + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- + arch/sh/drivers/pci/fixups-r7780rp.c | 12 - + arch/sh/drivers/pci/fixups-rts7751r2d.c | 4 +- + arch/sh/drivers/pci/fixups-sdk7780.c | 19 - + arch/sh/drivers/pci/fixups-se7751.c | 6 +- + arch/sh/drivers/pci/ops-sh4.c | 30 +- + arch/sh/drivers/pci/pci-dreamcast.c | 32 +- + arch/sh/drivers/pci/pci-sh4.h | 18 +- + arch/sh/drivers/pci/pci-sh5.c | 19 +- + arch/sh/drivers/pci/pci-sh5.h | 12 +- + arch/sh/drivers/pci/pci-sh7751.c | 52 +- + arch/sh/drivers/pci/pci-sh7780.c | 408 +++++- + arch/sh/drivers/pci/pci-sh7780.h | 64 +- + arch/sh/drivers/pci/pci.c | 167 ++- + arch/sh/drivers/pci/pcie-sh7786.c | 205 ++- + arch/sh/drivers/pci/pcie-sh7786.h | 74 +- + arch/sh/drivers/superhyway/ops-sh4-202.c | 8 +- + arch/sh/include/asm/Kbuild | 4 +- + arch/sh/include/asm/addrspace.h | 18 +- + arch/sh/include/asm/alignment.h | 21 + + arch/sh/include/asm/atomic-grb.h | 46 - + arch/sh/include/asm/atomic-llsc.h | 27 - + arch/sh/include/asm/atomic.h | 73 +- + arch/sh/include/asm/clock.h | 4 + + arch/sh/include/asm/cmpxchg-grb.h | 7 +- + arch/sh/include/asm/dma-mapping.h | 2 - + arch/sh/include/asm/dma-sh.h | 55 +- + arch/sh/include/asm/dwarf.h | 19 +- + arch/sh/include/asm/fixmap.h | 15 +- + arch/sh/include/asm/fpu.h | 35 +- + arch/sh/include/asm/hw_breakpoint.h | 67 + + arch/sh/include/asm/io.h | 147 ++- + arch/sh/include/asm/kdebug.h | 2 + + arch/sh/include/asm/mmu.h | 27 + + arch/sh/include/asm/mmu_context.h | 6 +- + arch/sh/include/asm/mmu_context_32.h | 4 +- + arch/sh/include/asm/module.h | 17 +- + arch/sh/include/asm/page.h | 4 +- + arch/sh/include/asm/pci.h | 59 +- + arch/sh/include/asm/pgalloc.h | 32 +- + arch/sh/include/asm/pgtable-2level.h | 23 + + arch/sh/include/asm/pgtable-3level.h | 56 + + arch/sh/include/asm/pgtable.h | 26 +- + arch/sh/include/asm/pgtable_32.h | 4 + + arch/sh/include/asm/pgtable_64.h | 26 +- + arch/sh/include/asm/processor.h | 9 + + arch/sh/include/asm/processor_32.h | 33 +- + arch/sh/include/asm/processor_64.h | 18 +- + arch/sh/include/asm/ptrace.h | 25 +- + arch/sh/include/asm/reboot.h | 21 + + arch/sh/include/asm/setup.h | 1 - + arch/sh/include/asm/sh_bios.h | 15 +- + arch/sh/include/asm/system.h | 9 +- + arch/sh/include/asm/system_32.h | 15 +- + arch/sh/include/asm/system_64.h | 10 +- + arch/sh/include/asm/thread_info.h | 10 +- + arch/sh/include/asm/tlb.h | 17 + + arch/sh/include/asm/ubc.h | 64 - + arch/sh/include/asm/vmlinux.lds.h | 8 + + arch/sh/include/asm/watchdog.h | 18 +- + arch/sh/include/cpu-sh2/cpu/ubc.h | 32 - + arch/sh/include/cpu-sh2/cpu/watchdog.h | 4 +- + arch/sh/include/cpu-sh3/cpu/dac.h | 12 +- + arch/sh/include/cpu-sh3/cpu/dma.h | 20 +- + arch/sh/include/cpu-sh3/cpu/ubc.h | 42 - + arch/sh/include/cpu-sh4/cpu/addrspace.h | 9 + + arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 108 +- + arch/sh/include/cpu-sh4/cpu/dma.h | 35 +- + arch/sh/include/cpu-sh4/cpu/mmu_context.h | 4 + + arch/sh/include/cpu-sh4/cpu/ubc.h | 64 - + arch/sh/include/mach-common/mach/magicpanelr2.h | 12 +- + arch/sh/include/mach-dreamcast/mach/sysasic.h | 5 + + arch/sh/include/mach-sdk7786/mach/fpga.h | 114 ++ + arch/sh/include/mach-sdk7786/mach/irq.h | 7 + + arch/sh/include/mach-se/mach/se7343.h | 52 +- + arch/sh/kernel/Makefile | 8 +- + arch/sh/kernel/cpu/Makefile | 2 + + arch/sh/kernel/cpu/adc.c | 12 +- + arch/sh/kernel/cpu/clock-cpg.c | 94 ++- + arch/sh/kernel/cpu/fpu.c | 84 ++ + arch/sh/kernel/cpu/init.c | 112 +- + arch/sh/kernel/cpu/irq/intc-sh5.c | 14 +- + arch/sh/kernel/cpu/sh2/clock-sh7619.c | 6 +- + arch/sh/kernel/cpu/sh2a/clock-sh7201.c | 8 +- + arch/sh/kernel/cpu/sh2a/clock-sh7203.c | 6 +- + arch/sh/kernel/cpu/sh2a/clock-sh7206.c | 8 +- + arch/sh/kernel/cpu/sh2a/fpu.c | 111 +-- + arch/sh/kernel/cpu/sh3/clock-sh3.c | 8 +- + arch/sh/kernel/cpu/sh3/clock-sh7705.c | 8 +- + arch/sh/kernel/cpu/sh3/clock-sh7706.c | 8 +- + arch/sh/kernel/cpu/sh3/clock-sh7709.c | 8 +- + arch/sh/kernel/cpu/sh3/clock-sh7710.c | 8 +- + arch/sh/kernel/cpu/sh3/clock-sh7712.c | 6 +- + arch/sh/kernel/cpu/sh3/ex.S | 2 +- + arch/sh/kernel/cpu/sh3/probe.c | 28 +- + arch/sh/kernel/cpu/sh3/setup-sh3.c | 2 +- + arch/sh/kernel/cpu/sh4/clock-sh4-202.c | 10 +- + arch/sh/kernel/cpu/sh4/clock-sh4.c | 8 +- + arch/sh/kernel/cpu/sh4/fpu.c | 159 +-- + arch/sh/kernel/cpu/sh4/probe.c | 14 +- + arch/sh/kernel/cpu/sh4/setup-sh4-202.c | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh7750.c | 2 +- + arch/sh/kernel/cpu/sh4/setup-sh7760.c | 2 +- + arch/sh/kernel/cpu/sh4/sq.c | 10 +- + arch/sh/kernel/cpu/sh4a/Makefile | 9 +- + arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 25 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 24 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 8 +- + arch/sh/kernel/cpu/sh4a/clock-sh7763.c | 8 +- + arch/sh/kernel/cpu/sh4a/clock-sh7770.c | 8 +- + arch/sh/kernel/cpu/sh4a/clock-sh7780.c | 10 +- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 184 ++-- + arch/sh/kernel/cpu/sh4a/clock-shx3.c | 10 +- + arch/sh/kernel/cpu/sh4a/pinmux-sh7722.c | 21 +- + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 20 +- + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 39 +- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 39 +- + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 26 +- + arch/sh/kernel/cpu/sh4a/setup-sh7763.c | 20 +- + arch/sh/kernel/cpu/sh4a/setup-sh7770.c | 24 +- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 24 +- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 26 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 24 +- + arch/sh/kernel/cpu/sh4a/smp-shx3.c | 5 +- + arch/sh/kernel/cpu/sh4a/ubc.c | 133 ++ + arch/sh/kernel/cpu/sh5/clock-sh5.c | 8 +- + arch/sh/kernel/cpu/sh5/entry.S | 6 +- + arch/sh/kernel/cpu/sh5/fpu.c | 65 +- + arch/sh/kernel/debugtraps.S | 1 - + arch/sh/kernel/dwarf.c | 174 ++- + arch/sh/kernel/early_printk.c | 85 -- + arch/sh/kernel/head_32.S | 181 +++- + arch/sh/kernel/head_64.S | 2 - + arch/sh/kernel/hw_breakpoint.c | 463 ++++++ + arch/sh/kernel/idle.c | 14 +- + arch/sh/kernel/io_trapped.c | 18 +- + arch/sh/kernel/kgdb.c | 46 +- + arch/sh/kernel/machine_kexec.c | 16 +- + arch/sh/kernel/process.c | 100 ++ + arch/sh/kernel/process_32.c | 164 +-- + arch/sh/kernel/process_64.c | 27 +- + arch/sh/kernel/ptrace_32.c | 82 +- + arch/sh/kernel/ptrace_64.c | 16 +- + arch/sh/kernel/reboot.c | 98 ++ + arch/sh/kernel/setup.c | 10 +- + arch/sh/kernel/sh_bios.c | 129 ++- + arch/sh/kernel/signal_32.c | 10 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sh/kernel/smp.c | 9 - + arch/sh/kernel/traps.c | 4 +- + arch/sh/kernel/traps_32.c | 182 +-- + arch/sh/kernel/traps_64.c | 28 +- + arch/sh/kernel/vmlinux.lds.S | 43 +- + arch/sh/math-emu/math.c | 12 +- + arch/sh/mm/Kconfig | 44 +- + arch/sh/mm/Makefile | 11 +- + arch/sh/mm/alignment.c | 159 ++ + arch/sh/mm/cache-debugfs.c | 7 +- + arch/sh/mm/cache-sh2.c | 12 +- + arch/sh/mm/cache-sh2a.c | 20 +- + arch/sh/mm/cache-sh3.c | 6 +- + arch/sh/mm/cache-sh4.c | 27 +- + arch/sh/mm/cache-sh7705.c | 12 +- + arch/sh/mm/cache.c | 13 +- + arch/sh/mm/fault_32.c | 3 + + arch/sh/mm/init.c | 174 ++- + arch/sh/mm/{ioremap_32.c => ioremap.c} | 63 +- + arch/sh/mm/ioremap_64.c | 326 ----- + arch/sh/mm/ioremap_fixed.c | 128 ++ + arch/sh/mm/nommu.c | 4 + + arch/sh/mm/pgtable.c | 56 + + arch/sh/mm/pmb.c | 163 ++- + arch/sh/mm/tlb-pteaex.c | 3 +- + arch/sh/mm/tlb-sh3.c | 6 +- + arch/sh/mm/tlb-sh4.c | 13 +- + arch/sh/mm/tlb-sh5.c | 39 + + arch/sh/mm/tlb-urb.c | 81 ++ + arch/sh/mm/tlbflush_32.c | 4 +- + arch/sh/mm/tlbflush_64.c | 2 +- + arch/sh/tools/mach-types | 1 + + drivers/dma/shdma.c | 411 ++++-- + drivers/dma/shdma.h | 7 +- + drivers/mtd/nand/Kconfig | 4 +- + drivers/mtd/nand/sh_flctl.c | 69 +- + drivers/serial/sh-sci.h | 220 +--- + drivers/sh/intc.c | 266 +++- + drivers/sh/pfc.c | 37 +- + drivers/video/sh_mobile_lcdcfb.c | 88 +- + include/linux/mtd/sh_flctl.h | 3 + + include/linux/sh_intc.h | 33 +- + include/video/sh_mobile_lcdc.h | 2 + + lib/Kconfig.debug | 2 +- + mm/Kconfig | 2 +- + 272 files changed, 8233 insertions(+), 4231 deletions(-) + create mode 100644 arch/sh/boards/board-titan.c + create mode 100644 arch/sh/boards/mach-sdk7786/Makefile + create mode 100644 arch/sh/boards/mach-sdk7786/fpga.c + create mode 100644 arch/sh/boards/mach-sdk7786/irq.c + create mode 100644 arch/sh/boards/mach-sdk7786/setup.c + delete mode 100644 arch/sh/boards/mach-titan/Makefile + delete mode 100644 arch/sh/boards/mach-titan/io.c + delete mode 100644 arch/sh/boards/mach-titan/setup.c + create mode 100644 arch/sh/configs/sdk7786_defconfig + create mode 100644 arch/sh/drivers/pci/common.c + create mode 100644 arch/sh/include/asm/alignment.h + create mode 100644 arch/sh/include/asm/hw_breakpoint.h + create mode 100644 arch/sh/include/asm/pgtable-2level.h + create mode 100644 arch/sh/include/asm/pgtable-3level.h + create mode 100644 arch/sh/include/asm/reboot.h + delete mode 100644 arch/sh/include/asm/ubc.h + delete mode 100644 arch/sh/include/cpu-sh2/cpu/ubc.h + delete mode 100644 arch/sh/include/cpu-sh3/cpu/ubc.h + delete mode 100644 arch/sh/include/cpu-sh4/cpu/ubc.h + create mode 100644 arch/sh/include/mach-sdk7786/mach/fpga.h + create mode 100644 arch/sh/include/mach-sdk7786/mach/irq.h + create mode 100644 arch/sh/kernel/cpu/fpu.c + create mode 100644 arch/sh/kernel/cpu/sh4a/ubc.c + delete mode 100644 arch/sh/kernel/early_printk.c + create mode 100644 arch/sh/kernel/hw_breakpoint.c + create mode 100644 arch/sh/kernel/process.c + create mode 100644 arch/sh/kernel/reboot.c + create mode 100644 arch/sh/mm/alignment.c + rename arch/sh/mm/{ioremap_32.c => ioremap.c} (78%) + delete mode 100644 arch/sh/mm/ioremap_64.c + create mode 100644 arch/sh/mm/ioremap_fixed.c + create mode 100644 arch/sh/mm/pgtable.c + create mode 100644 arch/sh/mm/tlb-urb.c +Merging genesis/master +$ git merge genesis/master +Resolved 'arch/arm/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging drivers/serial/Kconfig +Auto-merging drivers/sh/intc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7b7fdc9] Merge remote branch 'genesis/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 + + arch/arm/Kconfig | 7 + + arch/arm/Makefile | 1 + + arch/arm/configs/ap4evb_defconfig | 779 +++++++++ + arch/arm/configs/g3evm_defconfig | 774 +++++++++ + arch/arm/configs/g4evm_defconfig | 779 +++++++++ + arch/arm/mach-shmobile/Kconfig | 83 + + arch/arm/mach-shmobile/Makefile | 21 + + arch/arm/mach-shmobile/Makefile.boot | 9 + + arch/arm/mach-shmobile/board-ap4evb.c | 128 ++ + arch/arm/mach-shmobile/board-g3evm.c | 211 +++ + arch/arm/mach-shmobile/board-g4evm.c | 211 +++ + arch/arm/mach-shmobile/clock-sh7367.c | 96 ++ + arch/arm/mach-shmobile/console.c | 31 + + arch/arm/mach-shmobile/include/mach/clkdev.h | 7 + + arch/arm/mach-shmobile/include/mach/common.h | 22 + + arch/arm/mach-shmobile/include/mach/dma.h | 1 + + arch/arm/mach-shmobile/include/mach/entry-macro.S | 39 + + arch/arm/mach-shmobile/include/mach/gpio.h | 48 + + arch/arm/mach-shmobile/include/mach/hardware.h | 7 + + arch/arm/mach-shmobile/include/mach/io.h | 9 + + arch/arm/mach-shmobile/include/mach/irqs.h | 10 + + arch/arm/mach-shmobile/include/mach/memory.h | 7 + + arch/arm/mach-shmobile/include/mach/sh7367.h | 332 ++++ + arch/arm/mach-shmobile/include/mach/sh7377.h | 360 ++++ + arch/arm/mach-shmobile/include/mach/system.h | 14 + + arch/arm/mach-shmobile/include/mach/timex.h | 6 + + arch/arm/mach-shmobile/include/mach/uncompress.h | 21 + + arch/arm/mach-shmobile/include/mach/vmalloc.h | 6 + + arch/arm/mach-shmobile/intc-sh7367.c | 270 +++ + arch/arm/mach-shmobile/intc-sh7372.c | 369 +++++ + arch/arm/mach-shmobile/intc-sh7377.c | 350 ++++ + arch/arm/mach-shmobile/pfc-sh7367.c | 1801 +++++++++++++++++++++ + arch/arm/mach-shmobile/pfc-sh7377.c | 1766 ++++++++++++++++++++ + arch/arm/mach-shmobile/setup-sh7367.c | 198 +++ + arch/arm/mach-shmobile/setup-sh7372.c | 199 +++ + arch/arm/mach-shmobile/setup-sh7377.c | 215 +++ + arch/arm/mach-shmobile/timer.c | 46 + + drivers/Makefile | 1 + + drivers/serial/Kconfig | 2 +- + drivers/serial/sh-sci.h | 22 +- + drivers/sh/intc.c | 10 +- + 42 files changed, 9268 insertions(+), 10 deletions(-) + create mode 100644 arch/arm/configs/ap4evb_defconfig + create mode 100644 arch/arm/configs/g3evm_defconfig + create mode 100644 arch/arm/configs/g4evm_defconfig + create mode 100644 arch/arm/mach-shmobile/Kconfig + create mode 100644 arch/arm/mach-shmobile/Makefile + create mode 100644 arch/arm/mach-shmobile/Makefile.boot + create mode 100644 arch/arm/mach-shmobile/board-ap4evb.c + create mode 100644 arch/arm/mach-shmobile/board-g3evm.c + create mode 100644 arch/arm/mach-shmobile/board-g4evm.c + create mode 100644 arch/arm/mach-shmobile/clock-sh7367.c + create mode 100644 arch/arm/mach-shmobile/console.c + create mode 100644 arch/arm/mach-shmobile/include/mach/clkdev.h + create mode 100644 arch/arm/mach-shmobile/include/mach/common.h + create mode 100644 arch/arm/mach-shmobile/include/mach/dma.h + create mode 100644 arch/arm/mach-shmobile/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-shmobile/include/mach/gpio.h + create mode 100644 arch/arm/mach-shmobile/include/mach/hardware.h + create mode 100644 arch/arm/mach-shmobile/include/mach/io.h + create mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h + create mode 100644 arch/arm/mach-shmobile/include/mach/memory.h + create mode 100644 arch/arm/mach-shmobile/include/mach/sh7367.h + create mode 100644 arch/arm/mach-shmobile/include/mach/sh7377.h + create mode 100644 arch/arm/mach-shmobile/include/mach/system.h + create mode 100644 arch/arm/mach-shmobile/include/mach/timex.h + create mode 100644 arch/arm/mach-shmobile/include/mach/uncompress.h + create mode 100644 arch/arm/mach-shmobile/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-shmobile/intc-sh7367.c + create mode 100644 arch/arm/mach-shmobile/intc-sh7372.c + create mode 100644 arch/arm/mach-shmobile/intc-sh7377.c + create mode 100644 arch/arm/mach-shmobile/pfc-sh7367.c + create mode 100644 arch/arm/mach-shmobile/pfc-sh7377.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7367.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7372.c + create mode 100644 arch/arm/mach-shmobile/setup-sh7377.c + create mode 100644 arch/arm/mach-shmobile/timer.c +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. +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'fs/gfs2/super.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging fs/affs/affs.h +Auto-merging fs/bfs/inode.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 73da6b0] Merge remote branch 'ceph/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ceph.txt | 139 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + MAINTAINERS | 9 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/adfs/adfs.h | 2 +- + fs/adfs/inode.c | 5 +- + fs/affs/affs.h | 3 +- + fs/affs/inode.c | 2 +- + fs/afs/internal.h | 1 - + fs/afs/super.c | 1 - + fs/afs/write.c | 21 - + fs/bfs/inode.c | 5 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/inode.c | 4 +- + fs/ceph/Kconfig | 27 + + fs/ceph/Makefile | 39 + + fs/ceph/README | 20 + + fs/ceph/addr.c | 1175 ++++++++++++++ + fs/ceph/armor.c | 99 ++ + fs/ceph/auth.c | 257 +++ + fs/ceph/auth.h | 84 + + fs/ceph/auth_none.c | 121 ++ + fs/ceph/auth_none.h | 28 + + fs/ceph/auth_x.c | 656 ++++++++ + fs/ceph/auth_x.h | 49 + + fs/ceph/auth_x_protocol.h | 90 + + fs/ceph/buffer.c | 78 + + fs/ceph/buffer.h | 39 + + fs/ceph/caps.c | 2869 ++++++++++++++++++++++++++++++++ + fs/ceph/ceph_debug.h | 37 + + fs/ceph/ceph_frag.c | 21 + + fs/ceph/ceph_frag.h | 109 ++ + fs/ceph/ceph_fs.c | 74 + + fs/ceph/ceph_fs.h | 650 ++++++++ + fs/ceph/ceph_hash.c | 118 ++ + fs/ceph/ceph_hash.h | 13 + + fs/ceph/ceph_strings.c | 176 ++ + fs/ceph/crush/crush.c | 151 ++ + fs/ceph/crush/crush.h | 180 ++ + fs/ceph/crush/hash.c | 149 ++ + fs/ceph/crush/hash.h | 17 + + fs/ceph/crush/mapper.c | 596 +++++++ + fs/ceph/crush/mapper.h | 20 + + fs/ceph/crypto.c | 408 +++++ + fs/ceph/crypto.h | 48 + + fs/ceph/debugfs.c | 492 ++++++ + fs/ceph/decode.h | 194 +++ + fs/ceph/dir.c | 1220 ++++++++++++++ + fs/ceph/export.c | 223 +++ + fs/ceph/file.c | 931 +++++++++++ + fs/ceph/inode.c | 1706 +++++++++++++++++++ + fs/ceph/ioctl.c | 160 ++ + fs/ceph/ioctl.h | 40 + + fs/ceph/mds_client.c | 2974 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 334 ++++ + fs/ceph/mdsmap.c | 174 ++ + fs/ceph/mdsmap.h | 54 + + fs/ceph/messenger.c | 2235 +++++++++++++++++++++++++ + fs/ceph/messenger.h | 255 +++ + fs/ceph/mon_client.c | 806 +++++++++ + fs/ceph/mon_client.h | 118 ++ + fs/ceph/msgpool.c | 182 +++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1530 +++++++++++++++++ + fs/ceph/osd_client.h | 165 ++ + fs/ceph/osdmap.c | 950 +++++++++++ + fs/ceph/osdmap.h | 124 ++ + fs/ceph/pagelist.c | 54 + + fs/ceph/pagelist.h | 54 + + fs/ceph/rados.h | 374 +++++ + fs/ceph/snap.c | 888 ++++++++++ + fs/ceph/super.c | 1019 ++++++++++++ + fs/ceph/super.h | 891 ++++++++++ + fs/ceph/types.h | 29 + + fs/ceph/xattr.c | 844 ++++++++++ + fs/exofs/exofs.h | 2 +- + fs/exofs/inode.c | 4 +- + fs/ext2/ext2.h | 2 +- + fs/ext2/inode.c | 11 +- + fs/ext3/inode.c | 4 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/inode.c | 6 +- + fs/fat/inode.c | 9 +- + fs/fs-writeback.c | 22 +- + fs/gfs2/super.c | 5 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/super.c | 3 +- + fs/jfs/inode.c | 5 +- + fs/jfs/jfs_inode.h | 2 +- + fs/minix/inode.c | 8 +- + fs/nfs/inode.c | 10 +- + fs/nfs/internal.h | 2 +- + fs/ntfs/dir.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/ntfs/inode.c | 2 +- + fs/ntfs/inode.h | 4 +- + fs/ntfs/super.c | 8 + + fs/omfs/inode.c | 10 +- + fs/reiserfs/inode.c | 4 +- + fs/sysv/inode.c | 10 +- + fs/sysv/sysv.h | 2 +- + fs/ubifs/dir.c | 2 +- + fs/ubifs/file.c | 8 +- + fs/ubifs/super.c | 2 +- + fs/udf/inode.c | 4 +- + fs/udf/udfdecl.h | 2 +- + fs/ufs/inode.c | 5 +- + fs/ufs/ufs.h | 2 +- + fs/xfs/linux-2.6/xfs_super.c | 10 +- + include/linux/ext3_fs.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/reiserfs_fs.h | 2 +- + 115 files changed, 27877 insertions(+), 109 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/armor.c + create mode 100644 fs/ceph/auth.c + create mode 100644 fs/ceph/auth.h + create mode 100644 fs/ceph/auth_none.c + create mode 100644 fs/ceph/auth_none.h + create mode 100644 fs/ceph/auth_x.c + create mode 100644 fs/ceph/auth_x.h + create mode 100644 fs/ceph/auth_x_protocol.h + create mode 100644 fs/ceph/buffer.c + create mode 100644 fs/ceph/buffer.h + create mode 100644 fs/ceph/caps.c + create mode 100644 fs/ceph/ceph_debug.h + create mode 100644 fs/ceph/ceph_frag.c + create mode 100644 fs/ceph/ceph_frag.h + create mode 100644 fs/ceph/ceph_fs.c + create mode 100644 fs/ceph/ceph_fs.h + create mode 100644 fs/ceph/ceph_hash.c + create mode 100644 fs/ceph/ceph_hash.h + create mode 100644 fs/ceph/ceph_strings.c + create mode 100644 fs/ceph/crush/crush.c + create mode 100644 fs/ceph/crush/crush.h + create mode 100644 fs/ceph/crush/hash.c + create mode 100644 fs/ceph/crush/hash.h + create mode 100644 fs/ceph/crush/mapper.c + create mode 100644 fs/ceph/crush/mapper.h + create mode 100644 fs/ceph/crypto.c + create mode 100644 fs/ceph/crypto.h + create mode 100644 fs/ceph/debugfs.c + create mode 100644 fs/ceph/decode.h + create mode 100644 fs/ceph/dir.c + create mode 100644 fs/ceph/export.c + create mode 100644 fs/ceph/file.c + create mode 100644 fs/ceph/inode.c + create mode 100644 fs/ceph/ioctl.c + create mode 100644 fs/ceph/ioctl.h + create mode 100644 fs/ceph/mds_client.c + create mode 100644 fs/ceph/mds_client.h + create mode 100644 fs/ceph/mdsmap.c + create mode 100644 fs/ceph/mdsmap.h + create mode 100644 fs/ceph/messenger.c + create mode 100644 fs/ceph/messenger.h + create mode 100644 fs/ceph/mon_client.c + create mode 100644 fs/ceph/mon_client.h + create mode 100644 fs/ceph/msgpool.c + create mode 100644 fs/ceph/msgpool.h + create mode 100644 fs/ceph/msgr.h + create mode 100644 fs/ceph/osd_client.c + create mode 100644 fs/ceph/osd_client.h + create mode 100644 fs/ceph/osdmap.c + create mode 100644 fs/ceph/osdmap.h + create mode 100644 fs/ceph/pagelist.c + create mode 100644 fs/ceph/pagelist.h + create mode 100644 fs/ceph/rados.h + create mode 100644 fs/ceph/snap.c + create mode 100644 fs/ceph/super.c + create mode 100644 fs/ceph/super.h + create mode 100644 fs/ceph/types.h + create mode 100644 fs/ceph/xattr.c +Merging cifs/master +$ git merge cifs/master +Already up-to-date. +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/inode.c +Auto-merging include/linux/ext3_fs.h +Merge made by recursive. + fs/ext3/file.c | 4 +- + fs/ext3/inode.c | 18 +- + fs/ext3/super.c | 233 +++++++------ + fs/ext3/xattr.c | 14 +- + fs/jbd/commit.c | 10 +- + fs/jbd/transaction.c | 43 ++- + fs/quota/Kconfig | 5 + + fs/quota/Makefile | 2 + + fs/quota/compat.c | 118 +++++++ + fs/quota/dquot.c | 156 ++++++--- + fs/quota/netlink.c | 95 +++++ + fs/quota/quota.c | 735 ++++++++++++--------------------------- + fs/sync.c | 14 +- + fs/xfs/linux-2.6/xfs_quotaops.c | 19 - + include/linux/ext3_fs.h | 33 ++- + include/linux/ext3_fs_i.h | 2 +- + include/linux/jbd.h | 11 - + include/linux/jbd2.h | 11 - + include/linux/quota.h | 19 +- + include/linux/quotaops.h | 59 ++-- + 20 files changed, 788 insertions(+), 813 deletions(-) + create mode 100644 fs/quota/compat.c + create mode 100644 fs/quota/netlink.c +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inode.c +Auto-merging include/linux/jbd2.h +Merge made by recursive. + fs/ext4/ext4.h | 73 +++++++--- + fs/ext4/ext4_jbd2.h | 24 ++++ + fs/ext4/extents.c | 44 +++--- + fs/ext4/file.c | 4 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 3 +- + fs/ext4/inode.c | 319 +++++++++++++++++++++++++++++-------------- + fs/ext4/mballoc.c | 7 +- + fs/ext4/migrate.c | 6 +- + fs/ext4/super.c | 33 ++++- + fs/ext4/xattr.c | 22 ++-- + fs/jbd2/checkpoint.c | 1 + + fs/jbd2/journal.c | 132 ++++++++++++++++++ + include/linux/jbd2.h | 11 +-- + include/trace/events/ext4.h | 101 ++++++++++++++ + include/trace/events/jbd2.h | 28 ++++ + 16 files changed, 632 insertions(+), 178 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Auto-merging fs/fat/inode.c +Merge made by recursive. + fs/fat/inode.c | 2 +- + fs/fat/namei_vfat.c | 27 +++++++++++++++++++-------- + include/linux/msdos_fs.h | 3 ++- + 3 files changed, 22 insertions(+), 10 deletions(-) +Merging fuse/for-next +$ git merge fuse/for-next +Merge made by recursive. + fs/fuse/dev.c | 30 +++++++++++++++--------------- + 1 files changed, 15 insertions(+), 15 deletions(-) +Merging gfs2/master +$ git merge gfs2/master +Auto-merging fs/gfs2/super.c +Merge made by recursive. + fs/gfs2/aops.c | 4 +- + fs/gfs2/glock.c | 73 +++++++++++++----------------------------- + fs/gfs2/glock.h | 7 ++++ + fs/gfs2/glops.c | 16 +++++---- + fs/gfs2/incore.h | 5 +-- + fs/gfs2/inode.c | 6 +-- + fs/gfs2/lock_dlm.c | 5 ++- + fs/gfs2/lops.c | 4 +- + fs/gfs2/main.c | 28 ++++++++++++++++ + fs/gfs2/meta_io.c | 46 +++----------------------- + fs/gfs2/meta_io.h | 12 ++++++- + fs/gfs2/ops_fstype.c | 4 +-- + fs/gfs2/super.c | 27 +++++---------- + fs/gfs2/sys.c | 2 - + fs/gfs2/util.c | 1 + + fs/gfs2/util.h | 1 + + include/linux/gfs2_ondisk.h | 30 +----------------- + 17 files changed, 108 insertions(+), 163 deletions(-) +Merging jfs/next +$ git merge jfs/next +Merge made by recursive. + fs/jfs/jfs_dmap.c | 16 ++++++++-------- + fs/jfs/jfs_dmap.h | 6 +++--- + 2 files changed, 11 insertions(+), 11 deletions(-) +Merging logfs/master +$ git merge logfs/master +Auto-merging Documentation/filesystems/00-INDEX +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Auto-merging fs/Makefile +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + Documentation/filesystems/00-INDEX | 2 + + Documentation/filesystems/logfs.txt | 241 ++++ + MAINTAINERS | 7 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/logfs/Kconfig | 17 + + fs/logfs/Makefile | 13 + + fs/logfs/compr.c | 95 ++ + fs/logfs/dev_bdev.c | 263 ++++ + fs/logfs/dev_mtd.c | 253 ++++ + fs/logfs/dir.c | 827 +++++++++++++ + fs/logfs/file.c | 263 ++++ + fs/logfs/gc.c | 730 ++++++++++++ + fs/logfs/inode.c | 417 +++++++ + fs/logfs/journal.c | 879 ++++++++++++++ + fs/logfs/logfs.h | 722 +++++++++++ + fs/logfs/logfs_abi.h | 627 ++++++++++ + fs/logfs/readwrite.c | 2246 +++++++++++++++++++++++++++++++++++ + fs/logfs/segment.c | 924 ++++++++++++++ + fs/logfs/super.c | 634 ++++++++++ + include/linux/btree-128.h | 109 ++ + include/linux/btree-type.h | 147 +++ + include/linux/btree.h | 243 ++++ + lib/Kconfig | 3 + + lib/Makefile | 1 + + lib/btree.c | 797 +++++++++++++ + 26 files changed, 10462 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/logfs.txt + create mode 100644 fs/logfs/Kconfig + create mode 100644 fs/logfs/Makefile + create mode 100644 fs/logfs/compr.c + create mode 100644 fs/logfs/dev_bdev.c + create mode 100644 fs/logfs/dev_mtd.c + create mode 100644 fs/logfs/dir.c + create mode 100644 fs/logfs/file.c + create mode 100644 fs/logfs/gc.c + create mode 100644 fs/logfs/inode.c + create mode 100644 fs/logfs/journal.c + create mode 100644 fs/logfs/logfs.h + create mode 100644 fs/logfs/logfs_abi.h + create mode 100644 fs/logfs/readwrite.c + create mode 100644 fs/logfs/segment.c + create mode 100644 fs/logfs/super.c + create mode 100644 include/linux/btree-128.h + create mode 100644 include/linux/btree-type.h + create mode 100644 include/linux/btree.h + create mode 100644 lib/btree.c +Merging nfs/linux-next +$ git merge nfs/linux-next +Resolved 'fs/gfs2/super.c' using previous resolution. +Auto-merging fs/gfs2/super.c +CONFLICT (content): Merge conflict in fs/gfs2/super.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 31491ff] Merge remote branch 'nfs/linux-next' +$ git diff -M --stat --summary HEAD^.. + fs/nfs/callback.h | 8 ++ + fs/nfs/callback_proc.c | 165 +++++++++++++++++++++++----- + fs/nfs/callback_xdr.c | 105 ++++++++++++------ + fs/nfs/client.c | 1 + + fs/nfs/dir.c | 2 +- + fs/nfs/file.c | 37 +++++-- + fs/nfs/inode.c | 89 ++------------- + fs/nfs/nfs3proc.c | 9 +- + fs/nfs/nfs4_fs.h | 2 + + fs/nfs/nfs4proc.c | 57 ++++++---- + fs/nfs/nfs4state.c | 61 +++++++++-- + fs/nfs/nfs4xdr.c | 10 ++- + fs/nfs/proc.c | 41 +++++++ + fs/nfs/symlink.c | 2 +- + fs/nfs/write.c | 238 +++++++++++----------------------------- + include/linux/backing-dev.h | 9 ++- + include/linux/nfs_fs.h | 13 -- + include/linux/nfs_fs_sb.h | 2 + + include/linux/sunrpc/bc_xprt.h | 15 +++ + include/linux/writeback.h | 5 + + mm/backing-dev.c | 6 +- + mm/filemap.c | 2 +- + mm/page-writeback.c | 30 ++++- + mm/truncate.c | 2 +- + net/sunrpc/addr.c | 8 +- + net/sunrpc/auth_gss/auth_gss.c | 11 ++- + net/sunrpc/svc.c | 4 + + net/sunrpc/xprtsock.c | 4 +- + 28 files changed, 549 insertions(+), 389 deletions(-) +$ git am -3 ../patches/0001-ceph-update-for-BDI_RECLAIMABLE-change.patch +Applying: ceph: update for BDI_RECLAIMABLE change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ceph/addr.c +$ git add . +$ git commit -v -a --amend +[master c7eb2bd] Merge remote branch 'nfs/linux-next' +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/vfs.c +Merge made by recursive. + Documentation/filesystems/nfs/nfs41-server.txt | 5 +- + fs/lockd/host.c | 2 +- + fs/lockd/mon.c | 12 +--- + fs/lockd/svc.c | 2 - + fs/nfs/callback.c | 2 - + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 24 ++++++-- + fs/nfsd/vfs.c | 77 +++++++++++------------- + net/sunrpc/svc_xprt.c | 9 +++- + net/sunrpc/svcauth_unix.c | 47 ++++++++------- + net/sunrpc/svcsock.c | 2 +- + 12 files changed, 99 insertions(+), 89 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + Documentation/filesystems/nilfs2.txt | 3 + + fs/nilfs2/dat.c | 3 +- + fs/nilfs2/ioctl.c | 60 ++++++++++++----- + fs/nilfs2/segbuf.c | 18 +++++ + fs/nilfs2/segbuf.h | 5 +- + fs/nilfs2/segment.c | 120 ++++++++++++++++++---------------- + fs/nilfs2/segment.h | 2 + + fs/nilfs2/super.c | 15 +++-- + fs/nilfs2/the_nilfs.c | 38 +++++++++++ + fs/nilfs2/the_nilfs.h | 3 + + include/linux/nilfs2_fs.h | 1 + + 11 files changed, 183 insertions(+), 85 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/ocfs2.h +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/ocfs2/super.c +Merge made by recursive. + fs/ocfs2/alloc.c | 5 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/file.c | 6 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/ocfs2.h | 29 +-------- + fs/ocfs2/refcounttree.c | 6 +- + fs/ocfs2/suballoc.c | 171 ++++++++++++++++++++++++++++++++++++----------- + fs/ocfs2/suballoc.h | 1 + + fs/ocfs2/super.c | 10 ++- + fs/ocfs2/xattr.c | 2 +- + 10 files changed, 152 insertions(+), 82 deletions(-) +Merging squashfs/master +$ git merge squashfs/master +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + fs/squashfs/Kconfig | 6 ++ + fs/squashfs/Makefile | 3 +- + fs/squashfs/block.c | 76 +--------------- + fs/squashfs/cache.c | 1 - + fs/squashfs/decompressor.c | 72 ++++++++++++++++ + fs/squashfs/decompressor.h | 55 ++++++++++++ + fs/squashfs/dir.c | 1 - + fs/squashfs/export.c | 1 - + fs/squashfs/file.c | 1 - + fs/squashfs/fragment.c | 1 - + fs/squashfs/id.c | 1 - + fs/squashfs/inode.c | 1 - + fs/squashfs/lzma_wrapper.c | 151 +++++++++++++++++++++++++++++++++ + fs/squashfs/namei.c | 1 - + fs/squashfs/squashfs.h | 11 ++- + fs/squashfs/squashfs_fs.h | 4 +- + fs/squashfs/squashfs_fs_sb.h | 41 +++++----- + fs/squashfs/super.c | 49 ++++++----- + fs/squashfs/symlink.c | 1 - + fs/squashfs/zlib_wrapper.c | 150 ++++++++++++++++++++++++++++++++ + include/linux/decompress/bunzip2_mm.h | 13 +++ + include/linux/decompress/inflate_mm.h | 13 +++ + include/linux/decompress/mm.h | 4 - + include/linux/decompress/unlzma_mm.h | 20 +++++ + include/linux/decompress/unlzo_mm.h | 13 +++ + lib/Kconfig | 3 + + lib/Makefile | 2 +- + lib/decompress_bunzip2.c | 1 + + lib/decompress_inflate.c | 1 + + lib/decompress_unlzma.c | 88 ++++++++++--------- + lib/decompress_unlzo.c | 1 + + 31 files changed, 614 insertions(+), 172 deletions(-) + create mode 100644 fs/squashfs/decompressor.c + create mode 100644 fs/squashfs/decompressor.h + create mode 100644 fs/squashfs/lzma_wrapper.c + create mode 100644 fs/squashfs/zlib_wrapper.c + create mode 100644 include/linux/decompress/bunzip2_mm.h + create mode 100644 include/linux/decompress/inflate_mm.h + create mode 100644 include/linux/decompress/unlzma_mm.h + create mode 100644 include/linux/decompress/unlzo_mm.h +Merging udf/for_next +$ git merge udf/for_next +Auto-merging fs/udf/inode.c +Merge made by recursive. + fs/udf/inode.c | 34 +++++++++++++++++----------------- + 1 files changed, 17 insertions(+), 17 deletions(-) +Merging v9fs/for-next +$ git merge v9fs/for-next +Merge made by recursive. + include/linux/virtio_9p.h | 3 -- + net/9p/trans_virtio.c | 80 +++++++++++++++++++-------------------------- + 2 files changed, 34 insertions(+), 49 deletions(-) +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Auto-merging fs/xfs/linux-2.6/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ef07af2] Merge remote branch 'xfs/master' +$ git diff -M --stat --summary HEAD^.. + fs/xfs/Makefile | 2 +- + fs/xfs/linux-2.6/kmem.c | 56 ++---- + fs/xfs/linux-2.6/kmem.h | 21 ++- + fs/xfs/linux-2.6/xfs_acl.c | 11 +- + fs/xfs/linux-2.6/xfs_buf.c | 290 +++++++++++++++++++++++++----- + fs/xfs/linux-2.6/xfs_buf.h | 52 ++---- + fs/xfs/linux-2.6/xfs_fs_subr.c | 2 +- + fs/xfs/linux-2.6/xfs_ioctl.c | 21 ++- + fs/xfs/linux-2.6/xfs_ioctl.h | 12 +- + fs/xfs/linux-2.6/xfs_ioctl32.c | 4 +- + fs/xfs/linux-2.6/xfs_iops.c | 4 +- + fs/xfs/linux-2.6/xfs_lrw.c | 62 +------ + fs/xfs/linux-2.6/xfs_lrw.h | 3 - + fs/xfs/linux-2.6/xfs_super.c | 167 ++++++++++++++---- + fs/xfs/linux-2.6/xfs_sync.c | 186 ++++++++++++++------ + fs/xfs/linux-2.6/xfs_sync.h | 1 - + fs/xfs/linux-2.6/xfs_trace.h | 81 +++++++++ + fs/xfs/linux-2.6/xfs_xattr.c | 27 ++- + fs/xfs/quota/xfs_dquot.c | 47 ++--- + fs/xfs/quota/xfs_dquot_item.c | 99 ++--------- + fs/xfs/quota/xfs_dquot_item.h | 4 - + fs/xfs/quota/xfs_qm.c | 40 +++-- + fs/xfs/quota/xfs_qm_bhv.c | 2 +- + fs/xfs/quota/xfs_qm_syscalls.c | 4 +- + fs/xfs/quota/xfs_trans_dquot.c | 49 ++++-- + fs/xfs/xfs_acl.h | 4 +- + fs/xfs/xfs_ag.h | 16 +- + fs/xfs/xfs_alloc.c | 96 +++++----- + fs/xfs/xfs_alloc_btree.c | 9 +- + fs/xfs/xfs_attr.c | 52 +++--- + fs/xfs/xfs_attr.h | 3 +- + fs/xfs/xfs_attr_leaf.c | 30 ++-- + fs/xfs/xfs_attr_sf.h | 2 +- + fs/xfs/xfs_bmap.c | 17 +- + fs/xfs/xfs_bmap_btree.c | 2 +- + fs/xfs/xfs_bmap_btree.h | 1 - + fs/xfs/xfs_btree.c | 4 +- + fs/xfs/xfs_buf_item.c | 72 ++++---- + fs/xfs/xfs_da_btree.c | 4 +- + fs/xfs/xfs_da_btree.h | 5 +- + fs/xfs/xfs_dfrag.c | 43 +++-- + fs/xfs/xfs_dfrag.h | 3 - + fs/xfs/xfs_dir2.c | 8 +- + fs/xfs/xfs_dir2.h | 4 +- + fs/xfs/xfs_dir2_block.c | 9 +- + fs/xfs/xfs_dir2_leaf.c | 2 +- + fs/xfs/xfs_dir2_node.c | 2 +- + fs/xfs/xfs_dir2_node.h | 2 - + fs/xfs/xfs_dir2_sf.c | 2 +- + fs/xfs/xfs_extfree_item.c | 4 +- + fs/xfs/xfs_filestream.c | 42 ++--- + fs/xfs/xfs_filestream.h | 28 +++- + fs/xfs/xfs_fsops.c | 42 +++--- + fs/xfs/xfs_ialloc.c | 62 +++---- + fs/xfs/xfs_iget.c | 10 +- + fs/xfs/xfs_inode.c | 126 +++---------- + fs/xfs/xfs_inode.h | 11 +- + fs/xfs/xfs_inode_item.c | 129 ++++---------- + fs/xfs/xfs_inode_item.h | 6 - + fs/xfs/xfs_itable.c | 12 +- + fs/xfs/xfs_log.c | 383 ++++++++++++++++++++-------------------- + fs/xfs/xfs_log.h | 19 +-- + fs/xfs/xfs_log_priv.h | 5 - + fs/xfs/xfs_log_recover.c | 222 ++++++++--------------- + fs/xfs/xfs_log_recover.h | 23 ++-- + fs/xfs/xfs_mount.c | 183 +++++++++++++++---- + fs/xfs/xfs_mount.h | 27 ++-- + fs/xfs/xfs_mru_cache.c | 2 +- + fs/xfs/xfs_mru_cache.h | 1 - + fs/xfs/xfs_quota.h | 9 +- + fs/xfs/xfs_rw.c | 155 ---------------- + fs/xfs/xfs_rw.h | 4 - + fs/xfs/xfs_trans.c | 7 +- + fs/xfs/xfs_trans.h | 3 +- + fs/xfs/xfs_trans_ail.c | 34 ++-- + fs/xfs/xfs_trans_buf.c | 27 ++-- + fs/xfs/xfs_types.h | 4 +- + fs/xfs/xfs_vnodeops.c | 33 ++-- + fs/xfs/xfs_vnodeops.h | 10 +- + 79 files changed, 1667 insertions(+), 1595 deletions(-) +Merging reiserfs-bkl/reiserfs/kill-bkl +$ git merge reiserfs-bkl/reiserfs/kill-bkl +Already up-to-date. +Merging vfs/for-next +$ git merge vfs/for-next +Auto-merging fs/ext4/file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/udf/inode.c +Auto-merging mm/filemap.c +Merge made by recursive. + Documentation/filesystems/sharedsubtree.txt | 16 ++++- + arch/s390/hypfs/inode.c | 42 +++------- + arch/um/drivers/mconsole_kern.c | 2 +- + drivers/infiniband/core/uverbs.h | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 25 +++++- + drivers/infiniband/core/uverbs_main.c | 82 ++------------------ + drivers/usb/gadget/f_mass_storage.c | 2 +- + drivers/usb/gadget/file_storage.c | 2 +- + fs/autofs4/dev-ioctl.c | 11 +-- + fs/autofs4/inode.c | 62 +-------------- + fs/cifs/file.c | 4 +- + fs/dcache.c | 69 +++++++++++------ + fs/debugfs/inode.c | 2 +- + fs/ext4/file.c | 6 +- + fs/gfs2/ops_inode.c | 113 +++++++-------------------- + fs/hpfs/anode.c | 2 +- + fs/hpfs/dentry.c | 14 ++-- + fs/hpfs/dir.c | 14 ++-- + fs/hpfs/dnode.c | 21 +++-- + fs/hpfs/ea.c | 7 +- + fs/hpfs/hpfs_fn.h | 30 ++++--- + fs/hpfs/inode.c | 4 +- + fs/hpfs/map.c | 6 +- + fs/hpfs/name.c | 21 +++--- + fs/hpfs/namei.c | 75 +++++++++--------- + fs/hppfs/hppfs.c | 2 +- + fs/internal.h | 2 + + fs/libfs.c | 77 +++++++++--------- + fs/locks.c | 5 +- + fs/namei.c | 100 ++++++++++-------------- + fs/namespace.c | 44 ++++++++-- + fs/nfs/inode.c | 8 +- + fs/nfs/nfs4proc.c | 8 +- + fs/nfsctl.c | 5 +- + fs/nfsd/nfs4xdr.c | 10 ++- + fs/nfsd/vfs.c | 4 +- + fs/nilfs2/dir.c | 14 ++-- + fs/nilfs2/namei.c | 13 +-- + fs/nilfs2/nilfs.h | 4 +- + fs/notify/inotify/inotify_user.c | 59 ++------------- + fs/open.c | 2 +- + fs/pnode.c | 28 ++++--- + fs/pnode.h | 5 +- + fs/proc/base.c | 34 +++++--- + fs/proc/generic.c | 5 + + fs/proc/root.c | 6 -- + fs/super.c | 21 ++++- + fs/udf/balloc.c | 2 +- + fs/udf/dir.c | 4 +- + fs/udf/inode.c | 2 +- + fs/udf/namei.c | 20 +++--- + fs/udf/symlink.c | 10 +- + fs/ufs/dir.c | 10 +- + fs/ufs/ufs.h | 4 +- + include/linux/audit.h | 11 +-- + include/linux/fs.h | 24 ++---- + include/linux/fsnotify.h | 11 ++- + include/linux/magic.h | 1 - + include/linux/mnt_namespace.h | 1 + + include/linux/mount.h | 14 +++- + kernel/audit_tree.c | 100 +++++++----------------- + kernel/auditsc.c | 7 +- + kernel/sysctl_binary.c | 7 +- + mm/filemap.c | 2 +- + net/sunrpc/rpc_pipe.c | 9 +-- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/realpath.c | 23 +----- + 67 files changed, 573 insertions(+), 781 deletions(-) +$ git am -3 ../patches/0001-logfs-fixup-for-write_inode-API-change.patch +Applying: logfs: fixup for write_inode API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/logfs/inode.c +$ git add . +$ git commit -v -a --amend +[master 36a2f67] Merge remote branch 'vfs/for-next' +Merging pci/linux-next +$ git merge pci/linux-next +Auto-merging arch/sh/drivers/pci/pci.c +Auto-merging drivers/pci/Makefile +Removing drivers/pci/legacy.c +Merge made by recursive. + Documentation/kernel-parameters.txt | 8 + + arch/alpha/kernel/pci.c | 6 +- + arch/arm/kernel/bios32.c | 8 +- + arch/cris/arch-v32/drivers/pci/bios.c | 16 +- + arch/frv/mb93090-mb00/pci-frv.c | 16 +- + arch/ia64/pci/pci.c | 5 +- + arch/mips/pci/pci.c | 6 +- + arch/mips/pmc-sierra/yosemite/ht.c | 10 +- + arch/mn10300/unit-asb2305/pci-asb2305.c | 16 +- + arch/parisc/kernel/pci.c | 10 +- + arch/powerpc/kernel/pci-common.c | 13 +- + arch/sh/drivers/pci/pci.c | 6 +- + arch/sparc/kernel/pci.c | 5 +- + arch/sparc/kernel/pcic.c | 5 +- + arch/x86/pci/i386.c | 14 +- + arch/x86/pci/irq.c | 2 + + arch/xtensa/kernel/pci.c | 15 +- + drivers/acpi/acpica/acevents.h | 6 +- + drivers/acpi/acpica/aclocal.h | 2 + + drivers/acpi/acpica/evgpe.c | 147 +-------- + drivers/acpi/acpica/evgpeblk.c | 67 ++--- + drivers/acpi/acpica/evxface.c | 14 - + drivers/acpi/acpica/evxfevnt.c | 139 ++++++++- + drivers/acpi/button.c | 19 +- + drivers/acpi/ec.c | 6 +- + drivers/acpi/internal.h | 2 - + drivers/acpi/pci_bind.c | 14 +- + drivers/acpi/pci_root.c | 8 + + drivers/acpi/scan.c | 37 ++- + drivers/acpi/wakeup.c | 60 +--- + drivers/isdn/hisax/Kconfig | 18 +- + drivers/isdn/hisax/avm_pci.c | 6 +- + drivers/isdn/hisax/bkm_a4t.c | 2 +- + drivers/isdn/hisax/bkm_a8.c | 2 +- + drivers/isdn/hisax/diva.c | 14 +- + drivers/isdn/hisax/elsa.c | 8 +- + drivers/isdn/hisax/enternow_pci.c | 2 +- + drivers/isdn/hisax/gazel.c | 8 +- + drivers/isdn/hisax/hfc_pci.c | 2 +- + drivers/isdn/hisax/hisax.h | 23 ++ + drivers/isdn/hisax/niccy.c | 6 +- + drivers/isdn/hisax/nj_s.c | 2 +- + drivers/isdn/hisax/nj_u.c | 2 +- + drivers/isdn/hisax/sedlbauer.c | 6 +- + drivers/isdn/hisax/telespci.c | 2 +- + drivers/isdn/hisax/w6692.c | 2 +- + drivers/pci/Kconfig | 11 - + drivers/pci/Makefile | 5 +- + drivers/pci/bus.c | 6 +- + drivers/pci/hotplug/acpiphp_core.c | 2 - + drivers/pci/hotplug/acpiphp_glue.c | 23 +- + drivers/pci/hotplug/cpcihp_generic.c | 1 + + drivers/pci/hotplug/cpqphp.h | 2 - + drivers/pci/hotplug/cpqphp_core.c | 57 +--- + drivers/pci/hotplug/cpqphp_ctrl.c | 27 +- + drivers/pci/hotplug/ibmphp_core.c | 106 ++----- + drivers/pci/hotplug/ibmphp_ebda.c | 13 +- + drivers/pci/hotplug/ibmphp_hpc.c | 1 + + drivers/pci/hotplug/pci_hotplug_core.c | 132 -------- + drivers/pci/hotplug/pciehp_core.c | 25 -- + drivers/pci/hotplug/pciehp_ctrl.c | 1 + + drivers/pci/hotplug/pciehp_hpc.c | 72 +---- + drivers/pci/hotplug/pciehp_pci.c | 23 +- + drivers/pci/hotplug/rpaphp_core.c | 24 +- + drivers/pci/hotplug/shpchp.h | 2 - + drivers/pci/hotplug/shpchp_core.c | 35 --- + drivers/pci/hotplug/shpchp_ctrl.c | 14 +- + drivers/pci/hotplug/shpchp_hpc.c | 149 +++++----- + drivers/pci/legacy.c | 34 -- + drivers/pci/pci-acpi.c | 341 +++++++++++++++++++++ + drivers/pci/pci-driver.c | 160 ++++++++-- + drivers/pci/pci.c | 152 +++++++++- + drivers/pci/pci.h | 16 + + drivers/pci/pcie/Kconfig | 4 + + drivers/pci/pcie/Makefile | 2 + + drivers/pci/pcie/pme/Makefile | 8 + + drivers/pci/pcie/pme/pcie_pme.c | 505 +++++++++++++++++++++++++++++++ + drivers/pci/pcie/pme/pcie_pme.h | 28 ++ + drivers/pci/pcie/pme/pcie_pme_acpi.c | 54 ++++ + drivers/pci/pcie/portdrv.h | 17 + + drivers/pci/pcie/portdrv_core.c | 12 +- + drivers/pci/pcie/portdrv_pci.c | 27 ++ + drivers/pci/probe.c | 224 +++++++++++++- + drivers/pci/quirks.c | 14 +- + drivers/pci/setup-bus.c | 498 +++++++++++++++++++++++++++--- + drivers/pci/slot.c | 55 ++++ + drivers/pcmcia/rsrc_mgr.c | 13 +- + drivers/pcmcia/rsrc_nonstatic.c | 22 +- + include/acpi/acpi_bus.h | 6 + + include/acpi/acpixf.h | 8 + + include/acpi/actypes.h | 32 +-- + include/linux/ioport.h | 7 +- + include/linux/pci-acpi.h | 10 + + include/linux/pci.h | 73 ++++-- + include/linux/pci_hotplug.h | 41 +--- + include/linux/pci_ids.h | 3 + + kernel/power/Kconfig | 5 + + kernel/resource.c | 44 +++- + 98 files changed, 2771 insertions(+), 1162 deletions(-) + delete mode 100644 drivers/pci/legacy.c + create mode 100644 drivers/pci/pcie/pme/Makefile + create mode 100644 drivers/pci/pcie/pme/pcie_pme.c + create mode 100644 drivers/pci/pcie/pme/pcie_pme.h + create mode 100644 drivers/pci/pcie/pme/pcie_pme_acpi.c +Merging hid/for-next +$ git merge hid/for-next +Auto-merging include/linux/input.h +Auto-merging net/bluetooth/hidp/core.c +Merge made by recursive. + drivers/hid/Kconfig | 54 +++++- + drivers/hid/Makefile | 9 + + drivers/hid/hid-3m-pct.c | 290 +++++++++++++++++++++++++ + drivers/hid/hid-apple.c | 17 +- + drivers/hid/hid-core.c | 23 ++- + drivers/hid/hid-debug.c | 6 +- + drivers/hid/hid-ids.h | 37 +++- + drivers/hid/hid-input.c | 12 +- + drivers/hid/hid-lg.c | 7 +- + drivers/hid/hid-lg.h | 6 + + drivers/hid/hid-lg3ff.c | 176 +++++++++++++++ + drivers/hid/hid-lgff.c | 1 + + drivers/hid/hid-magicmouse.c | 449 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-mosart.c | 273 ++++++++++++++++++++++++ + drivers/hid/hid-ntrig.c | 212 +++++++++++++------ + drivers/hid/hid-ortek.c | 56 +++++ + drivers/hid/hid-quanta.c | 260 ++++++++++++++++++++++ + drivers/hid/hid-sony.c | 23 ++- + drivers/hid/hid-stantum.c | 283 ++++++++++++++++++++++++ + drivers/hid/hid-wacom.c | 28 +++ + drivers/hid/hidraw.c | 2 +- + drivers/hid/usbhid/hid-core.c | 42 +++- + drivers/hid/usbhid/hid-quirks.c | 3 + + drivers/hid/usbhid/usbhid.h | 2 + + include/linux/hid.h | 5 +- + include/linux/input.h | 42 ++++ + net/bluetooth/hidp/core.c | 17 ++- + 27 files changed, 2222 insertions(+), 113 deletions(-) + create mode 100644 drivers/hid/hid-3m-pct.c + create mode 100644 drivers/hid/hid-lg3ff.c + create mode 100644 drivers/hid/hid-magicmouse.c + create mode 100644 drivers/hid/hid-mosart.c + create mode 100644 drivers/hid/hid-ortek.c + create mode 100644 drivers/hid/hid-quanta.c + create mode 100644 drivers/hid/hid-stantum.c +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/i2c/busses/Kconfig +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 3 +- + Documentation/i2c/busses/i2c-parport | 3 + + Documentation/i2c/busses/i2c-parport-light | 11 ++ + Documentation/i2c/smbus-protocol | 16 ++ + drivers/i2c/Kconfig | 10 + + drivers/i2c/Makefile | 1 + + drivers/i2c/algos/i2c-algo-pca.c | 2 - + drivers/i2c/busses/Kconfig | 7 +- + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali1563.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-amd756.c | 2 +- + drivers/i2c/busses/i2c-amd8111.c | 2 +- + drivers/i2c/busses/i2c-hydra.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 9 +- + drivers/i2c/busses/i2c-isch.c | 2 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-parport-light.c | 48 +++++- + drivers/i2c/busses/i2c-parport.c | 43 +++++- + drivers/i2c/busses/i2c-parport.h | 4 +- + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-scmi.c | 34 +++- + drivers/i2c/busses/i2c-sis5595.c | 2 +- + drivers/i2c/busses/i2c-sis630.c | 2 +- + drivers/i2c/busses/i2c-sis96x.c | 2 +- + drivers/i2c/busses/i2c-tiny-usb.c | 10 +- + drivers/i2c/busses/i2c-via.c | 2 +- + drivers/i2c/busses/i2c-viapro.c | 2 +- + drivers/i2c/i2c-core.c | 50 ++++++ + drivers/i2c/i2c-smbus.c | 263 ++++++++++++++++++++++++++++ + include/linux/i2c-smbus.h | 50 ++++++ + include/linux/i2c.h | 7 + + 33 files changed, 559 insertions(+), 42 deletions(-) + create mode 100644 drivers/i2c/i2c-smbus.c + create mode 100644 include/linux/i2c-smbus.h +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Resolved 'drivers/i2c/busses/Kconfig' using previous resolution. +Resolved 'drivers/i2c/busses/Makefile' using previous resolution. +Auto-merging drivers/i2c/busses/Kconfig +CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6df413a] Merge remote branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/dts-bindings/fsl/i2c.txt | 30 +- + drivers/i2c/busses/Kconfig | 24 +- + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-designware.c | 116 ++- + drivers/i2c/busses/i2c-imx.c | 1 - + drivers/i2c/busses/i2c-mpc.c | 198 +++-- + drivers/i2c/busses/i2c-nomadik.c | 959 ++++++++++++++++++++++++ + drivers/i2c/busses/i2c-xiic.c | 823 ++++++++++++++++++++ + include/linux/i2c-xiic.h | 43 ++ + 9 files changed, 2068 insertions(+), 128 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-nomadik.c + create mode 100644 drivers/i2c/busses/i2c-xiic.c + create mode 100644 include/linux/i2c-xiic.h +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging MAINTAINERS +Merge made by recursive. + Documentation/hwmon/adt7411 | 42 +++ + Documentation/hwmon/it87 | 22 +- + Documentation/hwmon/lm90 | 22 ++ + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 18 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/adt7411.c | 359 +++++++++++++++++++++ + drivers/hwmon/it87.c | 732 ++++++++++++++++++++++++++++--------------- + drivers/hwmon/lm90.c | 95 ++++++- + drivers/hwmon/w83793.c | 482 ++++++++++++++++++++++++++++- + 10 files changed, 1502 insertions(+), 278 deletions(-) + create mode 100644 Documentation/hwmon/adt7411 + create mode 100644 drivers/hwmon/adt7411.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Merge made by recursive. + scripts/kernel-doc | 16 +++------------- + 1 files changed, 3 insertions(+), 13 deletions(-) +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-davinci/dm355.c +Auto-merging arch/arm/mach-davinci/dm644x.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/staging/Kconfig +Merge made by recursive. + Documentation/dvb/get_dvb_firmware | 23 +- + Documentation/video4linux/CARDLIST.cx23885 | 1 + + Documentation/video4linux/CARDLIST.saa7134 | 1 + + Documentation/video4linux/README.tlg2300 | 47 + + Documentation/video4linux/gspca.txt | 23 +- + MAINTAINERS | 8 + + arch/arm/mach-davinci/dm355.c | 43 +- + arch/arm/mach-davinci/dm644x.c | 21 +- + drivers/media/IR/Makefile | 2 +- + drivers/media/IR/ir-functions.c | 2 +- + drivers/media/IR/ir-keymaps.c | 99 ++ + drivers/media/IR/ir-keytable.c | 61 +- + drivers/media/IR/ir-sysfs.c | 211 +++ + drivers/media/common/tuners/tuner-xc2028.c | 25 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/media/dvb/Kconfig | 4 + + drivers/media/dvb/Makefile | 3 +- + drivers/media/dvb/bt8xx/bt878.c | 21 +- + drivers/media/dvb/bt8xx/dst.c | 12 +- + drivers/media/dvb/dm1105/Kconfig | 1 + + drivers/media/dvb/dm1105/dm1105.c | 505 +++--- + drivers/media/dvb/dvb-core/dvb_frontend.c | 12 +- + drivers/media/dvb/dvb-core/dvb_ringbuffer.c | 1 + + drivers/media/dvb/dvb-usb/Kconfig | 4 +- + drivers/media/dvb/dvb-usb/af9015.c | 351 ++-- + drivers/media/dvb/dvb-usb/af9015.h | 1 + + drivers/media/dvb/dvb-usb/cxusb.c | 3 + + drivers/media/dvb/dvb-usb/dib0700.h | 1 - + drivers/media/dvb/dvb-usb/dib0700_core.c | 196 +++- + drivers/media/dvb/dvb-usb/dib0700_devices.c | 160 +-- + drivers/media/dvb/dvb-usb/dvb-usb-ids.h | 3 + + drivers/media/dvb/dvb-usb/dvb-usb-init.c | 2 +- + drivers/media/dvb/dvb-usb/dw2102.c | 95 +- + drivers/media/dvb/dvb-usb/friio-fe.c | 2 +- + drivers/media/dvb/dvb-usb/m920x.c | 141 ++ + drivers/media/dvb/dvb-usb/m920x.h | 2 +- + drivers/media/dvb/firewire/firedtv-1394.c | 19 +- + drivers/media/dvb/firewire/firedtv-avc.c | 514 ++++--- + drivers/media/dvb/firewire/firedtv-dvb.c | 1 - + drivers/media/dvb/firewire/firedtv-fw.c | 2 +- + drivers/media/dvb/firewire/firedtv.h | 6 +- + drivers/media/dvb/frontends/af9013.h | 1 + + drivers/media/dvb/frontends/atbm8830.c | 16 + + drivers/media/dvb/frontends/dib0090.c | 2 +- + drivers/media/dvb/frontends/dib8000.c | 2 + + drivers/media/dvb/frontends/l64781.c | 4 +- + drivers/media/dvb/frontends/lnbp21.c | 3 +- + drivers/media/dvb/frontends/si21xx.c | 38 +- + drivers/media/dvb/frontends/stv0900.h | 2 + + drivers/media/dvb/frontends/stv0900_core.c | 109 ++- + drivers/media/dvb/frontends/stv0900_priv.h | 11 + + drivers/media/dvb/frontends/stv0900_reg.h | 6 + + drivers/media/dvb/frontends/stv0900_sw.c | 54 +- + drivers/media/dvb/frontends/stv090x.c | 486 ++++-- + drivers/media/dvb/frontends/stv090x.h | 13 +- + drivers/media/dvb/frontends/stv090x_priv.h | 17 +- + drivers/media/dvb/frontends/stv6110x.c | 188 ++- + drivers/media/dvb/frontends/stv6110x.h | 1 + + drivers/media/dvb/frontends/stv6110x_priv.h | 1 + + drivers/media/dvb/frontends/tda8261.c | 2 +- + drivers/media/dvb/frontends/zl10036.c | 2 +- + drivers/media/dvb/frontends/zl10039.c | 1 - + drivers/media/dvb/mantis/mantis_hif.c | 2 - + drivers/media/dvb/mantis/mantis_input.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 - + drivers/media/dvb/ngene/Kconfig | 9 + + drivers/media/dvb/ngene/Makefile | 11 + + drivers/media/dvb/ngene/ngene-core.c | 2024 +++++++++++++++++++++++ + drivers/media/dvb/ngene/ngene.h | 859 ++++++++++ + drivers/media/dvb/siano/sms-cards.c | 1 + + drivers/media/dvb/siano/smscoreapi.c | 7 +- + drivers/media/dvb/siano/smscoreapi.h | 77 +- + drivers/media/dvb/siano/smsdvb.c | 318 ++++- + drivers/media/dvb/siano/smsir.c | 6 +- + drivers/media/dvb/ttpci/av7110_ir.c | 14 +- + drivers/media/dvb/ttpci/budget-ci.c | 2 +- + drivers/media/dvb/ttpci/budget.c | 4 +- + drivers/media/radio/Kconfig | 22 + + drivers/media/radio/Makefile | 2 + + drivers/media/radio/radio-timb.c | 244 +++ + drivers/media/radio/saa7706h.c | 451 +++++ + drivers/media/radio/si470x/radio-si470x-usb.c | 8 +- + drivers/media/video/Kconfig | 13 +- + drivers/media/video/Makefile | 1 + + drivers/media/video/bt819.c | 10 +- + drivers/media/video/bt8xx/bttv-input.c | 4 +- + drivers/media/video/cafe_ccic.c | 6 +- + drivers/media/video/cpia.c | 3 - + drivers/media/video/cx18/Kconfig | 11 + + drivers/media/video/cx18/Makefile | 2 + + drivers/media/video/cx18/cx18-alsa-main.c | 293 ++++ + drivers/media/video/cx18/cx18-alsa-mixer.c | 175 ++ + drivers/media/video/cx18/cx18-alsa-mixer.h | 23 + + drivers/media/video/cx18/cx18-alsa-pcm.c | 354 ++++ + drivers/media/video/cx18/cx18-alsa-pcm.h | 27 + + drivers/media/video/cx18/cx18-alsa.h | 75 + + drivers/media/video/cx18/cx18-cards.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 70 +- + drivers/media/video/cx18/cx18-driver.h | 50 +- + drivers/media/video/cx18/cx18-dvb.c | 22 +- + drivers/media/video/cx18/cx18-fileops.c | 205 ++- + drivers/media/video/cx18/cx18-fileops.h | 3 + + drivers/media/video/cx18/cx18-ioctl.c | 135 ++- + drivers/media/video/cx18/cx18-mailbox.c | 45 +- + drivers/media/video/cx18/cx18-queue.c | 3 + + drivers/media/video/cx18/cx18-streams.c | 72 +- + drivers/media/video/cx18/cx18-streams.h | 10 + + drivers/media/video/cx18/cx18-version.h | 2 +- + drivers/media/video/cx18/cx23418.h | 3 +- + drivers/media/video/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/video/cx231xx/cx231xx-input.c | 2 +- + drivers/media/video/cx23885/cx23885-417.c | 4 +- + drivers/media/video/cx23885/cx23885-cards.c | 32 + + drivers/media/video/cx23885/cx23885-dvb.c | 17 +- + drivers/media/video/cx23885/cx23885-input.c | 2 +- + drivers/media/video/cx23885/cx23885-video.c | 13 + + drivers/media/video/cx23885/cx23885.h | 1 + + drivers/media/video/cx25840/cx25840-core.c | 54 +- + drivers/media/video/cx88/cx88-input.c | 4 +- + drivers/media/video/dabusb.c | 2 + + drivers/media/video/davinci/dm355_ccdc.c | 410 +++-- + drivers/media/video/davinci/dm644x_ccdc.c | 361 +++-- + drivers/media/video/davinci/vpfe_capture.c | 131 +-- + drivers/media/video/em28xx/em28xx-cards.c | 76 +- + drivers/media/video/em28xx/em28xx-core.c | 19 +- + drivers/media/video/em28xx/em28xx-dvb.c | 2 + + drivers/media/video/em28xx/em28xx-input.c | 113 +- + drivers/media/video/em28xx/em28xx-reg.h | 4 +- + drivers/media/video/em28xx/em28xx-vbi.c | 17 +- + drivers/media/video/em28xx/em28xx-video.c | 58 +- + drivers/media/video/em28xx/em28xx.h | 6 +- + drivers/media/video/et61x251/Kconfig | 6 +- + drivers/media/video/gspca/Kconfig | 46 +- + drivers/media/video/gspca/Makefile | 8 + + drivers/media/video/gspca/benq.c | 322 ++++ + drivers/media/video/gspca/conex.c | 4 +- + drivers/media/video/gspca/cpia1.c | 2022 ++++++++++++++++++++++ + drivers/media/video/gspca/etoms.c | 4 +- + drivers/media/video/gspca/gl860/gl860.c | 10 +- + drivers/media/video/gspca/gspca.c | 248 +++- + drivers/media/video/gspca/gspca.h | 27 +- + drivers/media/video/gspca/m5602/m5602_mt9m111.c | 4 +- + drivers/media/video/gspca/m5602/m5602_ov7660.c | 2 +- + drivers/media/video/gspca/m5602/m5602_ov7660.h | 2 +- + drivers/media/video/gspca/m5602/m5602_ov9650.c | 2 +- + drivers/media/video/gspca/m5602/m5602_po1030.c | 2 +- + drivers/media/video/gspca/m5602/m5602_s5k4aa.c | 2 +- + drivers/media/video/gspca/m5602/m5602_s5k83a.c | 2 +- + drivers/media/video/gspca/mars.c | 2 +- + drivers/media/video/gspca/mr97310a.c | 8 +- + drivers/media/video/gspca/ov519.c | 73 +- + drivers/media/video/gspca/ov534.c | 1253 ++------------- + drivers/media/video/gspca/ov534_9.c | 1477 +++++++++++++++++ + drivers/media/video/gspca/pac207.c | 2 +- + drivers/media/video/gspca/pac7302.c | 308 ++-- + drivers/media/video/gspca/pac7311.c | 216 +-- + drivers/media/video/gspca/sn9c2028.c | 757 +++++++++ + drivers/media/video/gspca/sn9c2028.h | 51 + + drivers/media/video/gspca/sn9c20x.c | 33 +- + drivers/media/video/gspca/sonixb.c | 33 +- + drivers/media/video/gspca/sonixj.c | 280 +++- + drivers/media/video/gspca/spca500.c | 4 +- + drivers/media/video/gspca/spca501.c | 2 +- + drivers/media/video/gspca/spca505.c | 2 +- + drivers/media/video/gspca/spca506.c | 4 +- + drivers/media/video/gspca/spca508.c | 2 +- + drivers/media/video/gspca/spca561.c | 4 +- + drivers/media/video/gspca/sq905c.c | 44 +- + drivers/media/video/gspca/stk014.c | 2 +- + drivers/media/video/gspca/stv0680.c | 16 +- + drivers/media/video/gspca/stv06xx/stv06xx.c | 3 +- + drivers/media/video/gspca/sunplus.c | 186 +-- + drivers/media/video/gspca/t613.c | 51 +- + drivers/media/video/gspca/tv8532.c | 2 +- + drivers/media/video/gspca/vc032x.c | 694 +++++++- + drivers/media/video/gspca/zc3xx.c | 659 ++++---- + drivers/media/video/hdpvr/hdpvr-core.c | 5 +- + drivers/media/video/hdpvr/hdpvr-video.c | 3 +- + drivers/media/video/hdpvr/hdpvr.h | 1 + + drivers/media/video/ir-kbd-i2c.c | 5 +- + drivers/media/video/ivtv/ivtv-irq.c | 5 +- + drivers/media/video/ivtv/ivtv-streams.c | 6 +- + drivers/media/video/ivtv/ivtv-udma.c | 1 + + drivers/media/video/pvrusb2/pvrusb2-hdw.c | 1 + + drivers/media/video/rj54n1cb0c.c | 12 +- + drivers/media/video/saa7127.c | 47 +- + drivers/media/video/saa7134/saa7134-cards.c | 52 +- + drivers/media/video/saa7134/saa7134-input.c | 7 +- + drivers/media/video/saa7134/saa7134-video.c | 2 +- + drivers/media/video/saa7134/saa7134.h | 3 +- + drivers/media/video/saa7164/saa7164-api.c | 2 +- + drivers/media/video/sn9c102/Kconfig | 5 +- + drivers/media/video/sn9c102/sn9c102_devtable.h | 2 +- + drivers/media/video/tlg2300/Kconfig | 16 + + drivers/media/video/tlg2300/Makefile | 9 + + drivers/media/video/tlg2300/pd-alsa.c | 332 ++++ + drivers/media/video/tlg2300/pd-common.h | 278 ++++ + drivers/media/video/tlg2300/pd-dvb.c | 593 +++++++ + drivers/media/video/tlg2300/pd-main.c | 530 ++++++ + drivers/media/video/tlg2300/pd-radio.c | 420 +++++ + drivers/media/video/tlg2300/pd-video.c | 1667 +++++++++++++++++++ + drivers/media/video/tlg2300/vendorcmds.h | 243 +++ + drivers/media/video/tuner-core.c | 1 + + drivers/media/video/tveeprom.c | 5 +- + drivers/media/video/usbvision/usbvision-video.c | 2 +- + drivers/media/video/uvc/uvc_driver.c | 65 +- + drivers/media/video/uvc/uvc_queue.c | 1 - + drivers/media/video/uvc/uvc_video.c | 10 + + drivers/media/video/uvc/uvcvideo.h | 4 + + drivers/media/video/v4l2-compat-ioctl32.c | 5 +- + drivers/media/video/vivi.c | 2 +- + drivers/media/video/zc0301/Kconfig | 6 +- + drivers/media/video/zoran/zoran_device.c | 6 +- + drivers/media/video/zoran/zoran_driver.c | 4 +- + drivers/media/video/zr364xx.c | 37 +- + drivers/mfd/Kconfig | 10 + + drivers/mfd/Makefile | 3 +- + drivers/mfd/timberdale.c | 663 ++++++++ + drivers/mfd/timberdale.h | 130 ++ + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/go7007/s2250-board.c | 2 +- + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 18 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/hack.c | 406 +++++ + drivers/staging/tm6000/hack.h | 45 + + drivers/staging/tm6000/tm6000-alsa.c | 413 +++++ + drivers/staging/tm6000/tm6000-cards.c | 756 +++++++++ + drivers/staging/tm6000/tm6000-core.c | 487 ++++++ + drivers/staging/tm6000/tm6000-dvb.c | 349 ++++ + drivers/staging/tm6000/tm6000-i2c.c | 255 +++ + 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 | 1550 +++++++++++++++++ + drivers/staging/tm6000/tm6000.h | 283 ++++ + include/linux/videodev2.h | 3 + + include/media/ir-common.h | 5 +- + include/media/ir-core.h | 42 +- + include/media/ir-kbd-i2c.h | 2 +- + include/media/timb_radio.h | 36 + + include/media/v4l2-chip-ident.h | 3 + + include/media/v4l2-subdev.h | 1 + + 244 files changed, 26290 insertions(+), 4119 deletions(-) + create mode 100644 Documentation/video4linux/README.tlg2300 + create mode 100644 drivers/media/IR/ir-sysfs.c + create mode 100644 drivers/media/dvb/ngene/Kconfig + create mode 100644 drivers/media/dvb/ngene/Makefile + create mode 100644 drivers/media/dvb/ngene/ngene-core.c + create mode 100644 drivers/media/dvb/ngene/ngene.h + create mode 100644 drivers/media/radio/radio-timb.c + create mode 100644 drivers/media/radio/saa7706h.c + create mode 100644 drivers/media/video/cx18/cx18-alsa-main.c + create mode 100644 drivers/media/video/cx18/cx18-alsa-mixer.c + create mode 100644 drivers/media/video/cx18/cx18-alsa-mixer.h + create mode 100644 drivers/media/video/cx18/cx18-alsa-pcm.c + create mode 100644 drivers/media/video/cx18/cx18-alsa-pcm.h + create mode 100644 drivers/media/video/cx18/cx18-alsa.h + create mode 100644 drivers/media/video/gspca/benq.c + create mode 100644 drivers/media/video/gspca/cpia1.c + create mode 100644 drivers/media/video/gspca/ov534_9.c + create mode 100644 drivers/media/video/gspca/sn9c2028.c + create mode 100644 drivers/media/video/gspca/sn9c2028.h + create mode 100644 drivers/media/video/tlg2300/Kconfig + create mode 100644 drivers/media/video/tlg2300/Makefile + create mode 100644 drivers/media/video/tlg2300/pd-alsa.c + create mode 100644 drivers/media/video/tlg2300/pd-common.h + create mode 100644 drivers/media/video/tlg2300/pd-dvb.c + create mode 100644 drivers/media/video/tlg2300/pd-main.c + create mode 100644 drivers/media/video/tlg2300/pd-radio.c + create mode 100644 drivers/media/video/tlg2300/pd-video.c + create mode 100644 drivers/media/video/tlg2300/vendorcmds.h + create mode 100644 drivers/mfd/timberdale.c + create mode 100644 drivers/mfd/timberdale.h + 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 + create mode 100644 include/media/timb_radio.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging scripts/markup_oops.pl +Merge made by recursive. + Documentation/kbuild/kbuild.txt | 2 +- + Documentation/kbuild/makefiles.txt | 2 +- + MAINTAINERS | 5 +- + Makefile | 53 +- + arch/ia64/scripts/unwcheck.py | 2 +- + arch/powerpc/Makefile | 5 + + init/Kconfig | 8 + + scripts/Makefile.build | 2 +- + scripts/decodecode | 48 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/kallsyms.c | 6 +- + scripts/kconfig/Makefile | 16 +- + scripts/kconfig/expr.c | 27 +- + scripts/kconfig/expr.h | 5 +- + scripts/kconfig/lkc.h | 7 +- + scripts/kconfig/lkc_proto.h | 3 +- + scripts/kconfig/mconf.c | 14 +- + scripts/kconfig/menu.c | 16 +- + scripts/kconfig/nconf.c | 1568 +++++++++++++++++++++++++++++++++++ + scripts/kconfig/nconf.gui.c | 617 ++++++++++++++ + scripts/kconfig/nconf.h | 95 +++ + scripts/kconfig/symbol.c | 29 +- + scripts/kconfig/util.c | 2 + + scripts/kconfig/zconf.tab.c_shipped | 4 +- + scripts/kconfig/zconf.y | 4 +- + scripts/markup_oops.pl | 54 +- + scripts/mkcompile_h | 5 +- + scripts/mod/modpost.c | 152 ++-- + scripts/package/mkspec | 2 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 20 +- + 32 files changed, 2610 insertions(+), 171 deletions(-) + create mode 100644 scripts/kconfig/nconf.c + create mode 100644 scripts/kconfig/nconf.gui.c + create mode 100644 scripts/kconfig/nconf.h +Merging kconfig/for-next +$ git merge kconfig/for-next +Removing scripts/binoffset.c +Auto-merging scripts/kconfig/Makefile +Merge made by recursive. + Documentation/dontdiff | 1 - + scripts/.gitignore | 1 - + scripts/binoffset.c | 163 ---------------------------------- + scripts/extract-ikconfig | 127 +++++++++----------------- + scripts/kconfig/Makefile | 14 +++- + scripts/kconfig/streamline_config.pl | 59 ++++++++++++- + 6 files changed, 113 insertions(+), 252 deletions(-) + delete mode 100644 scripts/binoffset.c +Merging ide/master +$ git merge ide/master +Auto-merging drivers/ide/au1xxx-ide.c +Auto-merging drivers/ide/cmd640.c +Auto-merging drivers/ide/icside.c +Auto-merging drivers/ide/pdc202xx_old.c +Auto-merging drivers/ide/scc_pata.c +Merge made by recursive. + drivers/ide/aec62xx.c | 13 ++-- + drivers/ide/ali14xx.c | 3 +- + drivers/ide/alim15x3.c | 171 +++++++++++++++++++++++-------------------- + drivers/ide/amd74xx.c | 18 +++-- + drivers/ide/at91_ide.c | 5 +- + drivers/ide/atiixp.c | 14 ++-- + drivers/ide/au1xxx-ide.c | 9 +- + drivers/ide/cmd640.c | 3 +- + drivers/ide/cmd64x.c | 114 +++++++++++------------------ + drivers/ide/cs5520.c | 9 +- + drivers/ide/cs5530.c | 13 ++-- + drivers/ide/cs5535.c | 14 ++-- + drivers/ide/cs5536.c | 16 ++-- + drivers/ide/cy82c693.c | 146 ++++++------------------------------- + drivers/ide/dtc2278.c | 4 +- + drivers/ide/hpt366.c | 9 +- + drivers/ide/ht6560b.c | 3 +- + drivers/ide/icside.c | 3 +- + drivers/ide/ide-devsets.c | 6 +- + drivers/ide/ide-iops.c | 2 +- + drivers/ide/ide-probe.c | 2 + + drivers/ide/ide-tape.c | 14 +++- + drivers/ide/ide-timings.c | 18 ++-- + drivers/ide/ide-xfer-mode.c | 18 +++-- + drivers/ide/it8172.c | 14 ++-- + drivers/ide/it8213.c | 20 +++--- + drivers/ide/it821x.c | 14 ++-- + drivers/ide/jmicron.c | 6 +- + drivers/ide/opti621.c | 77 +------------------- + drivers/ide/palm_bk3710.c | 12 ++- + drivers/ide/pdc202xx_new.c | 8 +- + drivers/ide/pdc202xx_old.c | 27 +++---- + drivers/ide/piix.c | 20 +++--- + drivers/ide/pmac.c | 9 +- + drivers/ide/qd65xx.c | 10 +-- + drivers/ide/sc1200.c | 8 +- + drivers/ide/scc_pata.c | 12 ++-- + drivers/ide/serverworks.c | 50 ++++-------- + drivers/ide/sgiioc4.c | 2 +- + drivers/ide/siimage.c | 14 ++-- + drivers/ide/sis5513.c | 8 +- + drivers/ide/sl82c105.c | 8 +- + drivers/ide/slc90e66.c | 17 ++-- + drivers/ide/tc86c001.c | 9 +- + drivers/ide/triflex.c | 10 +- + drivers/ide/tx4938ide.c | 7 +- + drivers/ide/tx4939ide.c | 10 +- + drivers/ide/umc8672.c | 5 +- + drivers/ide/via82cxxx.c | 132 +++++++++++++++++++++++++++------ + include/linux/ide.h | 7 +- + 50 files changed, 532 insertions(+), 611 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/Kconfig | 4 +- + drivers/ata/ahci.c | 235 +++++++++++++++++++++++++++++++++++---- + drivers/ata/ata_piix.c | 28 ++++- + drivers/ata/libata-core.c | 17 ++- + drivers/ata/libata-sff.c | 44 ++++++-- + drivers/ata/pata_ali.c | 8 +- + drivers/ata/pata_at91.c | 4 +- + drivers/ata/pata_cmd64x.c | 25 ++-- + drivers/ata/pata_cs5535.c | 2 +- + drivers/ata/pata_cypress.c | 10 +- + drivers/ata/pata_efar.c | 4 +- + drivers/ata/pata_hpt366.c | 21 +--- + drivers/ata/pata_hpt37x.c | 187 ++++++++++++++----------------- + drivers/ata/pata_hpt3x2n.c | 118 +++++++++----------- + drivers/ata/pata_marvell.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/ata/pata_pdc202xx_old.c | 15 +++- + drivers/ata/pata_serverworks.c | 5 +- + drivers/ata/pata_via.c | 208 ++++++++++++++++------------------- + drivers/ata/sata_via.c | 8 +- + include/linux/libata.h | 1 + + 21 files changed, 575 insertions(+), 373 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 1 - + drivers/infiniband/hw/ipath/ipath_user_pages.c | 3 +-- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 10 ++-------- + include/rdma/rdma_cm.h | 1 - + 5 files changed, 4 insertions(+), 13 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging drivers/acpi/acpica/acevents.h +Auto-merging drivers/acpi/acpica/aclocal.h +Auto-merging drivers/acpi/acpica/evgpe.c +Auto-merging drivers/acpi/acpica/evgpeblk.c +Auto-merging drivers/acpi/acpica/evxface.c +Auto-merging drivers/acpi/acpica/evxfevnt.c +Auto-merging drivers/acpi/ec.c +Auto-merging drivers/acpi/scan.c +Auto-merging drivers/pci/hotplug/acpiphp_glue.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging include/acpi/acpi_bus.h +Auto-merging include/acpi/acpixf.h +Auto-merging include/acpi/actypes.h +Merge made by recursive. + Documentation/acpi/apei/einj.txt | 49 +++ + Documentation/kernel-parameters.txt | 9 + + arch/ia64/hp/common/aml_nfw.c | 6 +- + arch/x86/include/asm/emergency-restart.h | 1 + + arch/x86/kernel/acpi/boot.c | 8 - + arch/x86/kernel/cpu/cpufreq/powernow-k8.c | 6 +- + arch/x86/kernel/reboot.c | 71 +++- + drivers/acpi/Kconfig | 2 + + drivers/acpi/Makefile | 3 + + drivers/acpi/acpica/accommon.h | 2 +- + drivers/acpi/acpica/acconfig.h | 2 +- + drivers/acpi/acpica/acdebug.h | 2 +- + drivers/acpi/acpica/acdispat.h | 2 +- + drivers/acpi/acpica/acevents.h | 5 +- + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/achware.h | 2 +- + drivers/acpi/acpica/acinterp.h | 44 +-- + drivers/acpi/acpica/aclocal.h | 6 +- + drivers/acpi/acpica/acmacros.h | 14 +- + drivers/acpi/acpica/acnamesp.h | 18 +- + drivers/acpi/acpica/acobject.h | 4 +- + drivers/acpi/acpica/acopcode.h | 2 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 2 +- + drivers/acpi/acpica/acresrc.h | 2 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 +- + drivers/acpi/acpica/acutils.h | 22 +- + drivers/acpi/acpica/amlcode.h | 2 +- + drivers/acpi/acpica/amlresrc.h | 2 +- + drivers/acpi/acpica/dsfield.c | 12 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsmthdat.c | 2 +- + drivers/acpi/acpica/dsobject.c | 4 +- + drivers/acpi/acpica/dsopcode.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswexec.c | 2 +- + drivers/acpi/acpica/dswload.c | 2 +- + drivers/acpi/acpica/dswscope.c | 2 +- + drivers/acpi/acpica/dswstate.c | 2 +- + drivers/acpi/acpica/evevent.c | 2 +- + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 2 +- + drivers/acpi/acpica/evmisc.c | 2 +- + drivers/acpi/acpica/evregion.c | 7 +- + drivers/acpi/acpica/evrgnini.c | 4 +- + drivers/acpi/acpica/evsci.c | 2 +- + drivers/acpi/acpica/evxface.c | 2 +- + drivers/acpi/acpica/evxfevnt.c | 2 +- + drivers/acpi/acpica/evxfregn.c | 2 +- + drivers/acpi/acpica/exconfig.c | 17 +- + drivers/acpi/acpica/exconvrt.c | 21 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdump.c | 2 +- + drivers/acpi/acpica/exfield.c | 9 +- + drivers/acpi/acpica/exfldio.c | 59 ++-- + drivers/acpi/acpica/exmisc.c | 12 +- + drivers/acpi/acpica/exmutex.c | 5 +- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg1.c | 16 +- + drivers/acpi/acpica/exoparg2.c | 6 +- + drivers/acpi/acpica/exoparg3.c | 4 +- + drivers/acpi/acpica/exoparg6.c | 10 +- + drivers/acpi/acpica/exprep.c | 2 +- + drivers/acpi/acpica/exregion.c | 35 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 2 +- + drivers/acpi/acpica/exstore.c | 2 +- + drivers/acpi/acpica/exstoren.c | 2 +- + drivers/acpi/acpica/exstorob.c | 2 +- + drivers/acpi/acpica/exsystem.c | 4 +- + drivers/acpi/acpica/exutils.c | 24 +- + drivers/acpi/acpica/hwacpi.c | 2 +- + drivers/acpi/acpica/hwgpe.c | 8 +- + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwsleep.c | 2 +- + drivers/acpi/acpica/hwtimer.c | 4 +- + drivers/acpi/acpica/hwvalid.c | 2 +- + drivers/acpi/acpica/hwxface.c | 2 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 2 +- + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsdumpdv.c | 2 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 2 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 2 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nspredef.c | 53 ++- + drivers/acpi/acpica/nsrepair.c | 175 +++++++++- + drivers/acpi/acpica/nsrepair2.c | 110 +----- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 2 +- + drivers/acpi/acpica/nswalk.c | 2 +- + drivers/acpi/acpica/nsxfeval.c | 54 ++- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/acpica/nsxfobj.c | 2 +- + drivers/acpi/acpica/psargs.c | 4 +- + drivers/acpi/acpica/psloop.c | 2 +- + drivers/acpi/acpica/psopcode.c | 2 +- + drivers/acpi/acpica/psparse.c | 2 +- + drivers/acpi/acpica/psscope.c | 2 +- + drivers/acpi/acpica/pstree.c | 2 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/pswalk.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rsaddr.c | 2 +- + drivers/acpi/acpica/rscalc.c | 2 +- + drivers/acpi/acpica/rscreate.c | 4 +- + drivers/acpi/acpica/rsdump.c | 2 +- + drivers/acpi/acpica/rsinfo.c | 2 +- + drivers/acpi/acpica/rsio.c | 2 +- + drivers/acpi/acpica/rsirq.c | 2 +- + drivers/acpi/acpica/rslist.c | 2 +- + drivers/acpi/acpica/rsmemory.c | 2 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsutils.c | 2 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbfadt.c | 2 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbutils.c | 2 +- + drivers/acpi/acpica/tbxface.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 2 +- + drivers/acpi/acpica/utalloc.c | 2 +- + drivers/acpi/acpica/utcopy.c | 2 +- + drivers/acpi/acpica/utdebug.c | 5 +- + drivers/acpi/acpica/utdelete.c | 2 +- + drivers/acpi/acpica/uteval.c | 4 +- + drivers/acpi/acpica/utglobal.c | 4 +- + drivers/acpi/acpica/utids.c | 2 +- + drivers/acpi/acpica/utinit.c | 2 +- + drivers/acpi/acpica/utlock.c | 2 +- + drivers/acpi/acpica/utmath.c | 27 +- + drivers/acpi/acpica/utmisc.c | 16 +- + drivers/acpi/acpica/utmutex.c | 18 +- + drivers/acpi/acpica/utobject.c | 2 +- + drivers/acpi/acpica/utresrc.c | 2 +- + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utxface.c | 2 +- + drivers/acpi/apei/Kconfig | 16 + + drivers/acpi/apei/Makefile | 4 + + drivers/acpi/apei/apei-base.c | 589 +++++++++++++++++++++++++++++ + drivers/acpi/apei/apei-internal.h | 97 +++++ + drivers/acpi/apei/einj.c | 471 +++++++++++++++++++++++ + drivers/acpi/apei/hest.c | 147 +++++++ + drivers/acpi/atomicio.c | 360 ++++++++++++++++++ + drivers/acpi/battery.c | 90 ++++- + drivers/acpi/bus.c | 10 +- + drivers/acpi/dock.c | 1 + + drivers/acpi/ec.c | 4 +- + drivers/acpi/glue.c | 4 +- + drivers/acpi/osl.c | 4 +- + drivers/acpi/power_meter.c | 30 +- + drivers/acpi/processor_idle.c | 10 +- + drivers/acpi/processor_pdc.c | 14 + + drivers/acpi/processor_throttling.c | 27 +- + drivers/acpi/sbs.c | 5 + + drivers/acpi/scan.c | 27 ++- + drivers/acpi/tables.c | 4 +- + drivers/acpi/utils.c | 61 +--- + drivers/acpi/video.c | 2 +- + drivers/ata/libata-acpi.c | 4 +- + drivers/gpu/drm/i915/intel_lvds.c | 7 + + drivers/ide/ide-acpi.c | 8 +- + drivers/input/misc/atlas_btns.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 6 - + drivers/pci/pci-acpi.c | 2 +- + drivers/platform/x86/asus_acpi.c | 3 +- + drivers/platform/x86/sony-laptop.c | 91 +++--- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/platform/x86/toshiba_bluetooth.c | 4 +- + drivers/platform/x86/wmi.c | 4 +- + drivers/power/power_supply_sysfs.c | 1 + + include/acpi/acexcep.h | 2 +- + include/acpi/acnames.h | 2 +- + include/acpi/acoutput.h | 2 +- + include/acpi/acpi.h | 2 +- + include/acpi/acpi_bus.h | 6 +- + include/acpi/acpiosxf.h | 6 +- + include/acpi/acpixf.h | 4 +- + include/acpi/acrestyp.h | 4 +- + include/acpi/actbl.h | 2 +- + include/acpi/actbl1.h | 2 +- + include/acpi/actbl2.h | 43 +++ + include/acpi/actypes.h | 34 +- + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + include/acpi/platform/acenv.h | 6 +- + include/acpi/platform/acgcc.h | 2 +- + include/acpi/platform/aclinux.h | 2 +- + include/acpi/processor.h | 42 +- + include/linux/power_supply.h | 1 + + 196 files changed, 2734 insertions(+), 757 deletions(-) + create mode 100644 Documentation/acpi/apei/einj.txt + create mode 100644 drivers/acpi/apei/Kconfig + create mode 100644 drivers/acpi/apei/Makefile + create mode 100644 drivers/acpi/apei/apei-base.c + create mode 100644 drivers/acpi/apei/apei-internal.h + create mode 100644 drivers/acpi/apei/einj.c + create mode 100644 drivers/acpi/apei/hest.c + create mode 100644 drivers/acpi/atomicio.c + create mode 100644 include/acpi/apei.h + create mode 100644 include/acpi/atomicio.h +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Auto-merging drivers/media/dvb/firewire/firedtv-fw.c +Merge made by recursive. + drivers/firewire/core-device.c | 127 +++++++++++++++++++++--------- + drivers/firewire/ohci.c | 2 +- + drivers/firewire/sbp2.c | 5 +- + drivers/media/dvb/firewire/firedtv-fw.c | 39 +-------- + include/linux/firewire.h | 11 ++- + 5 files changed, 104 insertions(+), 80 deletions(-) +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. + drivers/mtd/ubi/build.c | 133 ++++++++++++++++++++++++++++++---------------- + drivers/mtd/ubi/debug.h | 4 ++ + drivers/mtd/ubi/io.c | 120 +++++++++++++++++++++++++++++++++--------- + drivers/mtd/ubi/scan.c | 11 ++--- + drivers/mtd/ubi/wl.c | 17 +++--- + 5 files changed, 198 insertions(+), 87 deletions(-) +Merging kvm/linux-next +$ git merge kvm/linux-next +Auto-merging MAINTAINERS +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 30 + + Documentation/kvm/api.txt | 12 +- + MAINTAINERS | 2 +- + arch/ia64/kvm/Kconfig | 1 + + arch/ia64/kvm/kvm-ia64.c | 50 +- + arch/ia64/kvm/kvm_fw.c | 28 +- + arch/ia64/kvm/mmio.c | 4 +- + arch/ia64/kvm/vcpu.c | 4 +- + arch/powerpc/include/asm/kvm_asm.h | 6 + + arch/powerpc/include/asm/kvm_book3s.h | 11 +- + arch/powerpc/include/asm/kvm_book3s_64_asm.h | 18 + + arch/powerpc/include/asm/kvm_e500.h | 3 + + arch/powerpc/include/asm/kvm_host.h | 23 +- + arch/powerpc/include/asm/kvm_ppc.h | 83 +++- + arch/powerpc/include/asm/paca.h | 5 + + arch/powerpc/include/asm/reg.h | 4 + + arch/powerpc/kernel/asm-offsets.c | 33 +- + arch/powerpc/kernel/ppc_ksyms.c | 1 + + arch/powerpc/kvm/44x_emulate.c | 25 +- + arch/powerpc/kvm/44x_tlb.c | 20 +- + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s.c | 309 ++++++++-- + arch/powerpc/kvm/book3s_64_emulate.c | 77 ++- + arch/powerpc/kvm/book3s_64_exports.c | 8 + + arch/powerpc/kvm/book3s_64_interrupts.S | 336 ++++------ + arch/powerpc/kvm/book3s_64_mmu.c | 10 +- + arch/powerpc/kvm/book3s_64_rmhandlers.S | 119 +++- + arch/powerpc/kvm/book3s_64_slb.S | 160 +++-- + arch/powerpc/kvm/booke.c | 87 ++- + arch/powerpc/kvm/booke_emulate.c | 107 ++-- + arch/powerpc/kvm/e500.c | 6 + + arch/powerpc/kvm/e500_emulate.c | 93 ++-- + arch/powerpc/kvm/e500_tlb.c | 10 +- + arch/powerpc/kvm/emulate.c | 118 ++-- + arch/powerpc/kvm/powerpc.c | 40 +- + arch/s390/kvm/kvm-s390.c | 26 +- + arch/s390/kvm/kvm-s390.h | 10 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/hyperv.h | 186 +++++ + arch/x86/include/asm/kvm_emulate.h | 17 +- + arch/x86/include/asm/kvm_host.h | 57 +- + arch/x86/include/asm/kvm_para.h | 1 + + arch/x86/include/asm/svm.h | 2 +- + arch/x86/include/asm/vmx.h | 5 +- + arch/x86/kernel/vsyscall_64.c | 3 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/emulate.c | 369 ++++++++--- + arch/x86/kvm/i8254.c | 13 +- + arch/x86/kvm/i8259.c | 15 +- + arch/x86/kvm/irq.h | 1 + + arch/x86/kvm/kvm_cache_regs.h | 31 + + arch/x86/kvm/lapic.c | 31 + + arch/x86/kvm/lapic.h | 8 + + arch/x86/kvm/mmu.c | 137 ++-- + arch/x86/kvm/mmu.h | 35 +- + arch/x86/kvm/paging_tmpl.h | 13 +- + arch/x86/kvm/svm.c | 237 ++++--- + arch/x86/kvm/trace.h | 59 ++- + arch/x86/kvm/vmx.c | 383 +++++++---- + arch/x86/kvm/x86.c | 931 +++++++++++++++++++------- + arch/x86/kvm/x86.h | 30 + + include/linux/kvm.h | 9 +- + include/linux/kvm_host.h | 69 ++- + include/trace/events/kvm.h | 41 ++ + virt/kvm/Kconfig | 3 + + virt/kvm/assigned-dev.c | 12 +- + virt/kvm/coalesced_mmio.c | 43 +- + virt/kvm/coalesced_mmio.h | 15 + + virt/kvm/eventfd.c | 21 +- + virt/kvm/ioapic.c | 38 +- + virt/kvm/ioapic.h | 2 + + virt/kvm/iommu.c | 36 +- + virt/kvm/kvm_main.c | 386 +++++++---- + 73 files changed, 3552 insertions(+), 1569 deletions(-) + create mode 100644 arch/x86/include/asm/hyperv.h +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Auto-merging drivers/message/fusion/mptscsih.c +Auto-merging drivers/scsi/mac_esp.c +Auto-merging drivers/scsi/megaraid/megaraid_sas.c +Auto-merging drivers/scsi/qla2xxx/qla_gbl.h +Auto-merging drivers/scsi/qla2xxx/qla_isr.c +Merge made by recursive. + Documentation/scsi/ChangeLog.megaraid_sas | 16 + + drivers/message/fusion/mptbase.c | 5 +- + drivers/message/fusion/mptbase.h | 4 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptfc.c | 17 +- + drivers/message/fusion/mptsas.c | 211 +++- + drivers/message/fusion/mptscsih.c | 9 +- + drivers/scsi/FlashPoint.c | 2 +- + drivers/scsi/be2iscsi/be.h | 21 +- + drivers/scsi/be2iscsi/be_cmds.c | 88 +- + drivers/scsi/be2iscsi/be_cmds.h | 14 +- + drivers/scsi/be2iscsi/be_iscsi.c | 136 ++- + drivers/scsi/be2iscsi/be_iscsi.h | 2 +- + drivers/scsi/be2iscsi/be_main.c | 488 +++--- + drivers/scsi/be2iscsi/be_main.h | 27 +- + drivers/scsi/be2iscsi/be_mgmt.c | 139 +- + drivers/scsi/be2iscsi/be_mgmt.h | 6 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 5 +- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 17 +- + drivers/scsi/cxgb3i/cxgb3i_offload.c | 7 +- + drivers/scsi/cxgb3i/cxgb3i_pdu.c | 6 +- + drivers/scsi/eata.c | 2 +- + drivers/scsi/esp_scsi.c | 14 +- + drivers/scsi/gdth.c | 430 +++--- + drivers/scsi/gdth.h | 952 ++++++------ + drivers/scsi/gdth_ioctl.h | 366 +++--- + drivers/scsi/gdth_proc.c | 42 +- + drivers/scsi/gdth_proc.h | 4 +- + drivers/scsi/hpsa.c | 793 +++++++--- + drivers/scsi/hpsa.h | 136 ++- + drivers/scsi/hpsa_cmd.h | 204 ++- + drivers/scsi/ibmmca.c | 2 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/iscsi_tcp.c | 8 +- + drivers/scsi/libiscsi.c | 53 +- + drivers/scsi/libsrp.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 9 +- + drivers/scsi/lpfc/lpfc_attr.c | 8 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2472 +++++++++++++++++++++++++---- + drivers/scsi/lpfc/lpfc_bsg.h | 98 ++ + drivers/scsi/lpfc/lpfc_crtn.h | 11 +- + drivers/scsi/lpfc/lpfc_ct.c | 15 +- + drivers/scsi/lpfc/lpfc_els.c | 131 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +- + drivers/scsi/lpfc/lpfc_hw.h | 23 +- + drivers/scsi/lpfc/lpfc_hw4.h | 3 + + drivers/scsi/lpfc/lpfc_init.c | 50 +- + drivers/scsi/lpfc/lpfc_nl.h | 22 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 85 +- + drivers/scsi/lpfc/lpfc_scsi.c | 36 +- + drivers/scsi/lpfc/lpfc_scsi.h | 1 + + drivers/scsi/lpfc/lpfc_sli.c | 174 ++- + drivers/scsi/lpfc/lpfc_sli.h | 10 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/lpfc/lpfc_vport.c | 2 +- + drivers/scsi/mac_esp.c | 95 +- + drivers/scsi/megaraid/megaraid_sas.c | 246 +++- + drivers/scsi/megaraid/megaraid_sas.h | 36 +- + drivers/scsi/mpt2sas/Kconfig | 1 + + drivers/scsi/mpt2sas/mpi/mpi2.h | 16 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 25 +- + drivers/scsi/mpt2sas/mpi/mpi2_history.txt | 93 +- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 24 +- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 77 +- + drivers/scsi/mpt2sas/mpi/mpi2_sas.h | 6 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 18 +- + drivers/scsi/mpt2sas/mpt2sas_base.h | 14 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 51 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 13 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 262 +++- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 196 +++- + drivers/scsi/pm8001/pm8001_init.c | 2 +- + drivers/scsi/qla1280.c | 4 + + drivers/scsi/qla2xxx/qla_attr.c | 746 +++++++++- + drivers/scsi/qla2xxx/qla_def.h | 155 ++ + drivers/scsi/qla2xxx/qla_fw.h | 33 + + drivers/scsi/qla2xxx/qla_gbl.h | 5 + + drivers/scsi/qla2xxx/qla_init.c | 14 +- + drivers/scsi/qla2xxx/qla_iocb.c | 120 ++ + drivers/scsi/qla2xxx/qla_isr.c | 110 ++- + drivers/scsi/qla2xxx/qla_mbx.c | 151 ++ + drivers/scsi/qla2xxx/qla_os.c | 44 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla4xxx/ql4_init.c | 14 +- + drivers/scsi/scsi.c | 40 +- + drivers/scsi/scsi_lib.c | 10 +- + drivers/scsi/scsi_sas_internal.h | 2 +- + drivers/scsi/scsi_transport_fc.c | 26 +- + drivers/scsi/scsi_transport_sas.c | 103 ++- + drivers/scsi/sd.c | 41 +- + drivers/scsi/ses.c | 10 +- + drivers/scsi/u14-34f.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 3 +- + include/linux/raid_class.h | 1 + + include/scsi/scsi_device.h | 3 +- + include/scsi/scsi_transport_sas.h | 7 + + 97 files changed, 7898 insertions(+), 2352 deletions(-) + create mode 100644 drivers/scsi/lpfc/lpfc_bsg.h +$ git am -3 ../patches/lpfc_bsg_mdelay.patch +Applying: scsi: include delay.h when using mdelay +Merging async_tx/next +$ git merge async_tx/next +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/dma.txt | 8 + + drivers/dma/fsldma.c | 1174 +++++++++++++----------- + drivers/dma/fsldma.h | 35 +- + drivers/dma/ipu/ipu_idmac.c | 15 +- + drivers/dma/ppc4xx/adma.c | 2 +- + 5 files changed, 677 insertions(+), 557 deletions(-) +Merging net/master +$ git merge net/master +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/ia64/kvm/Kconfig +Auto-merging arch/powerpc/configs/ppc64_defconfig +Auto-merging arch/powerpc/kvm/Kconfig +Auto-merging arch/x86/kvm/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/au1000_eth.c +Auto-merging drivers/net/cpmac.c +Auto-merging drivers/net/davinci_emac.c +Auto-merging drivers/net/macmace.c +Removing drivers/net/wireless/iwlwifi/iwl-spectrum.c +Removing firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex +Removing firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw.ihex +Removing firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw.ihex +Auto-merging include/linux/pci.h +Auto-merging net/sunrpc/rpc_pipe.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master 586abec] Merge remote branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mac80211.tmpl | 3 +- + Documentation/feature-removal-schedule.txt | 31 +- + Documentation/isdn/INTERFACE.CAPI | 9 +- + Documentation/kernel-parameters.txt | 10 + + Documentation/networking/dccp.txt | 6 +- + Documentation/networking/ip-sysctl.txt | 34 +- + Documentation/networking/ixgbevf.txt | 90 + + Documentation/networking/packet_mmap.txt | 8 +- + Documentation/networking/regulatory.txt | 24 + + Documentation/powerpc/dts-bindings/fsl/can.txt | 53 + + Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 9 +- + MAINTAINERS | 16 + + arch/ia64/kvm/Kconfig | 1 + + arch/powerpc/boot/dts/mpc8569mds.dts | 47 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/configs/ps3_defconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 24 + + arch/s390/kvm/Kconfig | 1 + + arch/sparc/kernel/sys_sparc32.c | 1 - + arch/x86/kvm/Kconfig | 1 + + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/Makefile | 1 + + drivers/atm/fore200e.c | 11 +- + drivers/atm/idt77252.c | 5 +- + drivers/atm/lanai.c | 14 +- + drivers/atm/nicstar.c | 4 +- + drivers/firmware/iscsi_ibft.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 11 +- + drivers/infiniband/hw/nes/nes_nic.c | 2 +- + drivers/isdn/capi/Kconfig | 16 +- + drivers/isdn/capi/capi.c | 1203 +- + drivers/isdn/capi/capidrv.c | 103 +- + drivers/isdn/capi/capifs.c | 126 +- + drivers/isdn/capi/capifs.h | 21 +- + drivers/isdn/capi/kcapi.c | 817 +- + drivers/isdn/capi/kcapi.h | 13 +- + drivers/isdn/capi/kcapi_proc.c | 41 +- + drivers/isdn/gigaset/capi.c | 75 +- + drivers/isdn/hardware/avm/avmcard.h | 6 +- + drivers/isdn/hardware/avm/b1.c | 54 +- + drivers/isdn/hardware/avm/b1dma.c | 71 +- + drivers/isdn/hardware/avm/b1isa.c | 2 +- + drivers/isdn/hardware/avm/b1pci.c | 4 +- + drivers/isdn/hardware/avm/b1pcmcia.c | 2 +- + drivers/isdn/hardware/avm/c4.c | 53 +- + drivers/isdn/hardware/avm/t1isa.c | 2 +- + drivers/isdn/hardware/avm/t1pci.c | 2 +- + drivers/isdn/hardware/eicon/capimain.c | 40 +- + drivers/isdn/hardware/eicon/diva_didd.c | 45 +- + drivers/isdn/hardware/eicon/divasi.c | 48 +- + drivers/isdn/hardware/eicon/divasproc.c | 198 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 + + drivers/isdn/hardware/mISDN/w6692.c | 2 + + drivers/isdn/hisax/isar.c | 2 +- + drivers/isdn/hysdn/hycapi.c | 56 +- + drivers/media/dvb/dvb-core/dvb_net.c | 14 +- + drivers/message/i2o/i2o_proc.c | 11 +- + drivers/misc/iwmc3200top/fw-download.c | 50 +- + drivers/misc/iwmc3200top/iwmc3200top.h | 4 +- + drivers/misc/iwmc3200top/log.h | 31 +- + drivers/misc/iwmc3200top/main.c | 59 +- + drivers/net/3c505.c | 6 +- + drivers/net/3c509.c | 10 +- + drivers/net/3c523.c | 4 +- + drivers/net/3c527.c | 11 +- + drivers/net/3c59x.c | 2 +- + drivers/net/7990.c | 2 +- + drivers/net/8139cp.c | 9 +- + drivers/net/8139too.c | 9 +- + drivers/net/82596.c | 8 +- + drivers/net/Kconfig | 74 +- + drivers/net/Makefile | 4 + + drivers/net/a2065.c | 2 +- + drivers/net/acenic.c | 4 +- + drivers/net/amd8111e.c | 12 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/ariadne.c | 4 +- + drivers/net/arm/am79c961a.c | 2 +- + drivers/net/arm/at91_ether.c | 4 +- + drivers/net/arm/ep93xx_eth.c | 140 +- + drivers/net/arm/ether3.c | 2 +- + drivers/net/arm/ixp4xx_eth.c | 2 +- + drivers/net/arm/ks8695net.c | 4 +- + drivers/net/at1700.c | 6 +- + drivers/net/atarilance.c | 2 +- + drivers/net/atl1c/atl1c.h | 11 +- + drivers/net/atl1c/atl1c_ethtool.c | 2 +- + drivers/net/atl1c/atl1c_hw.c | 83 +- + drivers/net/atl1c/atl1c_hw.h | 5 + + drivers/net/atl1c/atl1c_main.c | 124 +- + drivers/net/atl1e/atl1e_hw.c | 23 +- + drivers/net/atl1e/atl1e_main.c | 158 +- + drivers/net/atl1e/atl1e_param.c | 35 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/atlx/atl2.c | 2 +- + drivers/net/atp.c | 7 +- + drivers/net/au1000_eth.c | 4 +- + drivers/net/b44.c | 18 +- + drivers/net/bcm63xx_enet.c | 4 +- + drivers/net/benet/Kconfig | 4 +- + drivers/net/benet/be.h | 13 +- + drivers/net/benet/be_cmds.c | 82 +- + drivers/net/benet/be_cmds.h | 22 +- + drivers/net/benet/be_ethtool.c | 63 +- + drivers/net/benet/be_hw.h | 119 +- + drivers/net/benet/be_main.c | 459 +- + drivers/net/bfin_mac.c | 4 +- + drivers/net/bmac.c | 8 +- + drivers/net/bnx2.c | 193 +- + drivers/net/bnx2.h | 3 +- + drivers/net/bnx2x.h | 4 +- + drivers/net/bnx2x_fw_defs.h | 7 +- + drivers/net/bnx2x_hsi.h | 10 +- + drivers/net/bnx2x_init_ops.h | 13 +- + drivers/net/bnx2x_main.c | 64 +- + drivers/net/bonding/bond_main.c | 25 +- + drivers/net/bonding/bonding.h | 1 - + drivers/net/can/at91_can.c | 4 + + drivers/net/can/bfin_can.c | 4 + + drivers/net/can/dev.c | 2 + + drivers/net/can/mcp251x.c | 426 +- + drivers/net/can/mscan/Kconfig | 7 +- + drivers/net/can/mscan/mpc5xxx_can.c | 248 +- + drivers/net/can/mscan/mscan.c | 58 +- + drivers/net/can/mscan/mscan.h | 86 +- + drivers/net/can/sja1000/Kconfig | 12 + + drivers/net/can/sja1000/Makefile | 1 + + drivers/net/can/sja1000/ems_pci.c | 2 +- + drivers/net/can/sja1000/kvaser_pci.c | 2 +- + drivers/net/can/sja1000/plx_pci.c | 472 + + drivers/net/can/sja1000/sja1000.c | 4 + + drivers/net/can/ti_hecc.c | 5 +- + drivers/net/can/usb/Kconfig | 2 +- + drivers/net/can/usb/ems_usb.c | 6 +- + drivers/net/can/vcan.c | 12 +- + drivers/net/cassini.c | 76 +- + drivers/net/chelsio/common.h | 6 +- + drivers/net/chelsio/sge.c | 2 +- + drivers/net/chelsio/subr.c | 2 +- + drivers/net/cpmac.c | 4 +- + drivers/net/cris/eth_v10.c | 8 +- + drivers/net/cs89x0.c | 2 +- + drivers/net/cxgb3/cxgb3_main.c | 2 +- + drivers/net/cxgb3/cxgb3_offload.c | 2 +- + drivers/net/cxgb3/sge.c | 16 +- + drivers/net/cxgb3/t3_hw.c | 3 +- + drivers/net/cxgb3/xgmac.c | 3 + + drivers/net/davinci_emac.c | 7 +- + drivers/net/de620.c | 2 +- + drivers/net/declance.c | 6 +- + drivers/net/defxx.c | 24 +- + drivers/net/depca.c | 3 +- + drivers/net/dl2k.c | 9 +- + drivers/net/dl2k.h | 2 +- + drivers/net/dm9000.c | 5 +- + drivers/net/e100.c | 8 +- + drivers/net/e1000/e1000.h | 1 + + drivers/net/e1000/e1000_ethtool.c | 19 +- + drivers/net/e1000/e1000_main.c | 12 +- + drivers/net/e1000e/82571.c | 68 +- + drivers/net/e1000e/defines.h | 2 + + drivers/net/e1000e/e1000.h | 19 +- + drivers/net/e1000e/es2lan.c | 32 +- + drivers/net/e1000e/ethtool.c | 2 +- + drivers/net/e1000e/hw.h | 12 +- + drivers/net/e1000e/ich8lan.c | 1 + + drivers/net/e1000e/lib.c | 230 +- + drivers/net/e1000e/netdev.c | 45 +- + drivers/net/eepro.c | 15 +- + drivers/net/eexpress.c | 6 +- + drivers/net/ehea/ehea_main.c | 6 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/enic/enic.h | 5 +- + drivers/net/enic/enic_main.c | 198 +- + drivers/net/enic/enic_res.c | 16 +- + drivers/net/enic/vnic_dev.c | 1 - + drivers/net/enic/vnic_enet.h | 5 + + drivers/net/enic/vnic_intr.c | 8 +- + drivers/net/enic/vnic_intr.h | 3 + + drivers/net/enic/vnic_nic.h | 12 +- + drivers/net/epic100.c | 8 +- + drivers/net/eth16i.c | 2 +- + drivers/net/ethoc.c | 8 +- + drivers/net/ewrk3.c | 2 +- + drivers/net/fealnx.c | 6 +- + drivers/net/fec.c | 80 +- + drivers/net/fec_mpc52xx.c | 2 +- + drivers/net/forcedeth.c | 2 +- + drivers/net/fs_enet/mac-fcc.c | 2 +- + drivers/net/fs_enet/mac-fec.c | 2 +- + drivers/net/fs_enet/mac-scc.c | 2 +- + drivers/net/gianfar.c | 2 +- + drivers/net/hamachi.c | 8 +- + drivers/net/hp100.c | 9 +- + drivers/net/ibm_newemac/core.c | 6 +- + drivers/net/ibmveth.c | 5 +- + drivers/net/igb/e1000_82575.c | 65 +- + drivers/net/igb/e1000_82575.h | 5 + + drivers/net/igb/e1000_defines.h | 7 +- + drivers/net/igb/e1000_hw.h | 7 - + drivers/net/igb/e1000_mac.c | 70 - + drivers/net/igb/e1000_mac.h | 2 - + drivers/net/igb/e1000_phy.c | 35 + + drivers/net/igb/e1000_phy.h | 2 + + drivers/net/igb/e1000_regs.h | 1 + + drivers/net/igb/igb.h | 16 +- + drivers/net/igb/igb_ethtool.c | 93 +- + drivers/net/igb/igb_main.c | 404 +- + drivers/net/igbvf/netdev.c | 21 +- + drivers/net/ioc3-eth.c | 7 +- + drivers/net/ipg.c | 6 +- + drivers/net/irda/Kconfig | 10 + + drivers/net/irda/Makefile | 1 + + drivers/net/irda/donauboe.c | 2 +- + drivers/net/irda/sh_sir.c | 823 ++ + drivers/net/irda/via-ircc.c | 2 +- + drivers/net/irda/vlsi_ir.c | 2 +- + drivers/net/isa-skeleton.c | 5 +- + drivers/net/iseries_veth.c | 4 +- + drivers/net/ixgb/ixgb.h | 11 +- + drivers/net/ixgb/ixgb_main.c | 97 +- + drivers/net/ixgbe/Makefile | 3 +- + drivers/net/ixgbe/ixgbe.h | 54 +- + drivers/net/ixgbe/ixgbe_82599.c | 233 +- + drivers/net/ixgbe/ixgbe_common.c | 19 +- + drivers/net/ixgbe/ixgbe_common.h | 2 +- + drivers/net/ixgbe/ixgbe_ethtool.c | 193 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 4 +- + drivers/net/ixgbe/ixgbe_main.c | 608 +- + drivers/net/ixgbe/ixgbe_mbx.c | 479 + + drivers/net/ixgbe/ixgbe_mbx.h | 96 + + drivers/net/ixgbe/ixgbe_sriov.c | 362 + + drivers/net/ixgbe/ixgbe_sriov.h | 47 + + drivers/net/ixgbe/ixgbe_type.h | 66 +- + drivers/net/ixgbevf/Makefile | 38 + + drivers/net/ixgbevf/defines.h | 292 + + drivers/net/ixgbevf/ethtool.c | 716 ++ + drivers/net/ixgbevf/ixgbevf.h | 318 + + drivers/net/ixgbevf/ixgbevf_main.c | 3578 ++++++ + drivers/net/ixgbevf/mbx.c | 341 + + drivers/net/ixgbevf/mbx.h | 100 + + drivers/net/ixgbevf/regs.h | 85 + + drivers/net/ixgbevf/vf.c | 387 + + drivers/net/ixgbevf/vf.h | 168 + + drivers/net/jme.c | 58 +- + drivers/net/jme.h | 41 +- + drivers/net/korina.c | 6 +- + drivers/net/ks8851.c | 4 +- + drivers/net/ks8851_mll.c | 4 +- + drivers/net/ksz884x.c | 7335 +++++++++++ + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 14 +- + drivers/net/ll_temac_main.c | 20 +- + drivers/net/loopback.c | 16 +- + drivers/net/lp486e.c | 12 +- + drivers/net/mac8390.c | 632 +- + drivers/net/macb.c | 33 +- + drivers/net/mace.c | 2 +- + drivers/net/macmace.c | 2 +- + drivers/net/macvlan.c | 117 +- + drivers/net/macvtap.c | 590 + + drivers/net/meth.c | 3 - + drivers/net/mlx4/main.c | 2 +- + drivers/net/mv643xx_eth.c | 3 +- + drivers/net/myri10ge/myri10ge.c | 2 +- + drivers/net/myri_sbus.c | 6 +- + drivers/net/natsemi.c | 6 +- + drivers/net/ne2k-pci.c | 2 +- + drivers/net/netxen/Makefile | 2 +- + drivers/net/netxen/netxen_nic.h | 8 +- + drivers/net/netxen/netxen_nic_ctx.c | 2 +- + drivers/net/netxen/netxen_nic_ethtool.c | 2 +- + drivers/net/netxen/netxen_nic_hdr.h | 5 +- + drivers/net/netxen/netxen_nic_hw.c | 29 +- + drivers/net/netxen/netxen_nic_hw.h | 2 +- + drivers/net/netxen/netxen_nic_init.c | 5 +- + drivers/net/netxen/netxen_nic_main.c | 213 +- + drivers/net/ni52.c | 2 +- + drivers/net/ni65.c | 2 +- + drivers/net/niu.c | 697 +- + drivers/net/ns83820.c | 4 +- + drivers/net/octeon/octeon_mgmt.c | 13 +- + drivers/net/pasemi_mac.c | 2 +- + drivers/net/pci-skeleton.c | 6 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 3 - + drivers/net/pcmcia/fmvj18x_cs.c | 6 +- + drivers/net/pcmcia/nmclan_cs.c | 14 +- + drivers/net/pcmcia/smc91c92_cs.c | 4 +- + drivers/net/pcmcia/xirc2ps_cs.c | 8 +- + drivers/net/pcnet32.c | 504 +- + drivers/net/phy/marvell.c | 38 + + drivers/net/phy/phy_device.c | 16 + + drivers/net/phy/smsc.c | 21 +- + drivers/net/ppp_generic.c | 122 +- + drivers/net/ps3_gelic_net.c | 2 +- + drivers/net/ps3_gelic_wireless.c | 149 +- + drivers/net/qla3xxx.c | 3 +- + drivers/net/qlcnic/Makefile | 8 + + drivers/net/qlcnic/qlcnic.h | 1126 ++ + drivers/net/qlcnic/qlcnic_ctx.c | 534 + + drivers/net/qlcnic/qlcnic_ethtool.c | 1015 ++ + drivers/net/qlcnic/qlcnic_hdr.h | 937 ++ + drivers/net/qlcnic/qlcnic_hw.c | 1275 ++ + drivers/net/qlcnic/qlcnic_init.c | 1541 +++ + drivers/net/qlcnic/qlcnic_main.c | 2720 +++++ + drivers/net/qlge/qlge.h | 446 +- + drivers/net/qlge/qlge_dbg.c | 1183 ++- + drivers/net/qlge/qlge_ethtool.c | 56 +- + drivers/net/qlge/qlge_main.c | 1183 ++- + drivers/net/qlge/qlge_mpi.c | 340 +- + drivers/net/r6040.c | 13 +- + drivers/net/r8169.c | 147 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 10 +- + drivers/net/sc92031.c | 4 +- + drivers/net/sfc/efx.c | 4 +- + drivers/net/sfc/efx.h | 2 - + drivers/net/sfc/ethtool.c | 10 +- + drivers/net/sfc/falcon.c | 6 +- + drivers/net/sfc/mcdi.c | 109 +- + drivers/net/sfc/mcdi.h | 1 + + drivers/net/sfc/mcdi_pcol.h | 202 +- + drivers/net/sfc/mcdi_phy.c | 36 +- + drivers/net/sfc/mdio_10g.c | 24 + + drivers/net/sfc/mdio_10g.h | 3 + + drivers/net/sfc/net_driver.h | 17 +- + drivers/net/sfc/nic.c | 13 +- + drivers/net/sfc/qt202x_phy.c | 1 + + drivers/net/sfc/selftest.c | 42 +- + drivers/net/sfc/selftest.h | 4 +- + drivers/net/sfc/siena.c | 16 +- + drivers/net/sfc/tenxpress.c | 2 + + drivers/net/sgiseeq.c | 2 +- + drivers/net/sh_eth.c | 10 +- + drivers/net/sis190.c | 17 +- + drivers/net/sis900.c | 6 +- + drivers/net/skfp/skfddi.c | 27 +- + drivers/net/skge.c | 81 +- + drivers/net/sky2.c | 662 +- + drivers/net/sky2.h | 10 +- + drivers/net/smc911x.c | 12 +- + drivers/net/smc9194.c | 4 +- + drivers/net/smc91x.c | 6 +- + drivers/net/smsc911x.c | 4 +- + drivers/net/smsc9420.c | 4 +- + drivers/net/sonic.c | 8 +- + drivers/net/spider_net.c | 2 +- + drivers/net/starfire.c | 10 +- + drivers/net/stmmac/Kconfig | 8 +- + drivers/net/stmmac/Makefile | 5 +- + drivers/net/stmmac/common.h | 279 +- + drivers/net/stmmac/descs.h | 4 +- + drivers/net/stmmac/{mac100.c => dwmac100.c} | 210 +- + drivers/net/stmmac/{mac100.h => dwmac100.h} | 0 + drivers/net/stmmac/{gmac.h => dwmac1000.h} | 18 +- + drivers/net/stmmac/dwmac1000_core.c | 245 + + drivers/net/stmmac/{gmac.c => dwmac1000_dma.c} | 351 +- + drivers/net/stmmac/dwmac_dma.h | 107 + + drivers/net/stmmac/dwmac_lib.c | 263 + + drivers/net/stmmac/stmmac.h | 28 +- + drivers/net/stmmac/stmmac_ethtool.c | 11 +- + drivers/net/stmmac/stmmac_main.c | 436 +- + drivers/net/stmmac/stmmac_mdio.c | 11 +- + drivers/net/sun3_82586.c | 2 +- + drivers/net/sun3lance.c | 2 +- + drivers/net/sunbmac.c | 4 +- + drivers/net/sundance.c | 8 +- + drivers/net/sungem.c | 6 +- + drivers/net/sunhme.c | 10 +- + drivers/net/sunlance.c | 2 +- + drivers/net/sunqe.c | 4 +- + drivers/net/sunvnet.c | 5 +- + drivers/net/tc35815.c | 8 +- + drivers/net/tehuti.c | 153 +- + drivers/net/tehuti.h | 30 +- + drivers/net/tg3.c | 240 +- + drivers/net/tg3.h | 33 +- + drivers/net/tlan.c | 32 +- + drivers/net/tlan.h | 3 - + drivers/net/tokenring/3c359.c | 4 +- + drivers/net/tokenring/abyss.c | 2 +- + drivers/net/tokenring/ibmtr.c | 2 +- + drivers/net/tokenring/lanstreamer.c | 4 +- + drivers/net/tokenring/olympic.c | 4 +- + drivers/net/tokenring/tms380tr.c | 2 +- + drivers/net/tokenring/tmspci.c | 2 +- + drivers/net/tsi108_eth.c | 2 +- + drivers/net/tulip/21142.c | 76 +- + drivers/net/tulip/de2104x.c | 148 +- + drivers/net/tulip/de4x5.c | 6 +- + drivers/net/tulip/dmfe.c | 84 +- + drivers/net/tulip/eeprom.c | 47 +- + drivers/net/tulip/interrupt.c | 100 +- + drivers/net/tulip/media.c | 74 +- + drivers/net/tulip/pnic.c | 33 +- + drivers/net/tulip/pnic2.c | 59 +- + drivers/net/tulip/timer.c | 52 +- + drivers/net/tulip/tulip_core.c | 182 +- + drivers/net/tulip/uli526x.c | 60 +- + drivers/net/tulip/winbond-840.c | 186 +- + drivers/net/tulip/xircom_cb.c | 46 +- + drivers/net/tun.c | 101 +- + drivers/net/typhoon.c | 11 +- + drivers/net/ucc_geth.c | 26 +- + drivers/net/usb/asix.c | 109 +- + drivers/net/usb/catc.c | 10 +- + drivers/net/usb/cdc_eem.c | 10 +- + drivers/net/usb/cdc_ether.c | 22 +- + drivers/net/usb/dm9601.c | 59 +- + drivers/net/usb/int51x1.c | 17 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/mcs7830.c | 252 +- + drivers/net/usb/net1080.c | 109 +- + drivers/net/usb/pegasus.c | 172 +- + drivers/net/usb/rndis_host.c | 24 +- + drivers/net/usb/rtl8150.c | 9 +- + drivers/net/usb/smsc95xx.c | 225 +- + drivers/net/usb/usbnet.c | 238 +- + drivers/net/veth.c | 4 +- + drivers/net/via-rhine.c | 7 +- + drivers/net/via-velocity.c | 14 +- + drivers/net/virtio_net.c | 470 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 10 +- + drivers/net/vxge/vxge-main.c | 14 +- + drivers/net/wan/dscc4.c | 2 +- + drivers/net/wan/farsync.c | 2 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/pc300_drv.c | 2 +- + drivers/net/wan/pc300too.c | 2 +- + drivers/net/wan/pci200syn.c | 2 +- + drivers/net/wan/wanxl.c | 2 +- + drivers/net/wimax/i2400m/driver.c | 17 +- + drivers/net/wimax/i2400m/fw.c | 11 +- + drivers/net/wireless/adm8211.c | 27 +- + drivers/net/wireless/airo.c | 38 +- + drivers/net/wireless/at76c50x-usb.c | 6 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 17 +- + drivers/net/wireless/ath/ar9170/hw.h | 1 + + drivers/net/wireless/ath/ar9170/mac.c | 2 +- + drivers/net/wireless/ath/ar9170/main.c | 123 +- + drivers/net/wireless/ath/ar9170/usb.c | 2 + + drivers/net/wireless/ath/ath.h | 1 - + drivers/net/wireless/ath/ath5k/ath5k.h | 27 +- + drivers/net/wireless/ath/ath5k/base.c | 108 +- + drivers/net/wireless/ath/ath5k/base.h | 1 - + drivers/net/wireless/ath/ath5k/led.c | 2 + + drivers/net/wireless/ath/ath5k/pcu.c | 121 +- + drivers/net/wireless/ath/ath5k/qcu.c | 25 +- + drivers/net/wireless/ath/ath5k/reset.c | 14 +- + drivers/net/wireless/ath/ath9k/Makefile | 2 + + drivers/net/wireless/ath/ath9k/ahb.c | 31 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 80 +- + drivers/net/wireless/ath/ath9k/beacon.c | 11 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 2 + + drivers/net/wireless/ath/ath9k/debug.c | 199 +- + drivers/net/wireless/ath/ath9k/debug.h | 32 + + drivers/net/wireless/ath/ath9k/gpio.c | 442 + + drivers/net/wireless/ath/ath9k/hw.c | 168 +- + drivers/net/wireless/ath/ath9k/hw.h | 10 +- + drivers/net/wireless/ath/ath9k/init.c | 863 ++ + drivers/net/wireless/ath/ath9k/mac.h | 34 + + drivers/net/wireless/ath/ath9k/main.c | 1416 +-- + drivers/net/wireless/ath/ath9k/pci.c | 75 +- + drivers/net/wireless/ath/ath9k/rc.c | 12 +- + drivers/net/wireless/ath/ath9k/rc.h | 4 + + drivers/net/wireless/ath/ath9k/recv.c | 40 +- + drivers/net/wireless/ath/ath9k/reg.h | 6 +- + drivers/net/wireless/ath/ath9k/virtual.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 62 +- + drivers/net/wireless/ath/debug.h | 8 +- + drivers/net/wireless/ath/regd.c | 5 +- + drivers/net/wireless/atmel_pci.c | 2 +- + drivers/net/wireless/b43/Kconfig | 17 +- + drivers/net/wireless/b43/Makefile | 2 +- + drivers/net/wireless/b43/b43.h | 21 +- + drivers/net/wireless/b43/dma.c | 19 - + drivers/net/wireless/b43/dma.h | 5 - + drivers/net/wireless/b43/main.c | 96 +- + drivers/net/wireless/b43/phy_common.c | 45 + + drivers/net/wireless/b43/phy_common.h | 10 + + drivers/net/wireless/b43/phy_lp.c | 76 +- + drivers/net/wireless/b43/phy_n.c | 3033 +++++- + drivers/net/wireless/b43/phy_n.h | 98 +- + drivers/net/wireless/b43/pio.c | 17 - + drivers/net/wireless/b43/pio.h | 45 - + drivers/net/wireless/b43/tables_nphy.c | 744 ++- + drivers/net/wireless/b43/tables_nphy.h | 100 +- + drivers/net/wireless/b43legacy/dma.c | 20 - + drivers/net/wireless/b43legacy/dma.h | 10 - + drivers/net/wireless/b43legacy/main.c | 61 +- + drivers/net/wireless/b43legacy/pio.c | 13 - + drivers/net/wireless/b43legacy/pio.h | 11 - + drivers/net/wireless/hostap/hostap_hw.c | 9 + + drivers/net/wireless/hostap/hostap_pci.c | 2 +- + drivers/net/wireless/hostap/hostap_plx.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/iwlwifi/Kconfig | 14 +- + drivers/net/wireless/iwlwifi/Makefile | 3 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 84 +- + drivers/net/wireless/iwlwifi/iwl-3945-fh.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 15 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 7 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 118 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 59 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 339 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 63 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 333 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 46 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 60 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1401 ++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 76 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 + + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 44 + + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 23 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 3 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-io.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 104 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 241 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.c | 198 - + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 150 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 3 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 2 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 155 +- + drivers/net/wireless/iwmc3200wifi/iwm.h | 2 +- + drivers/net/wireless/iwmc3200wifi/rx.c | 71 +- + drivers/net/wireless/libertas/Kconfig | 6 + + drivers/net/wireless/libertas/Makefile | 2 +- + drivers/net/wireless/libertas/assoc.c | 95 +- + drivers/net/wireless/libertas/cmd.c | 22 +- + drivers/net/wireless/libertas/cmd.h | 12 - + drivers/net/wireless/libertas/cmdresp.c | 21 +- + drivers/net/wireless/libertas/defs.h | 7 - + drivers/net/wireless/libertas/dev.h | 8 +- + drivers/net/wireless/libertas/ethtool.c | 2 + + drivers/net/wireless/libertas/if_spi.c | 1 + + drivers/net/wireless/libertas/main.c | 73 +- + drivers/net/wireless/libertas/mesh.c | 29 +- + drivers/net/wireless/libertas/mesh.h | 32 + + drivers/net/wireless/libertas/scan.c | 2 +- + drivers/net/wireless/libertas/tx.c | 2 +- + drivers/net/wireless/libertas/wext.c | 26 +- + drivers/net/wireless/libertas_tf/main.c | 13 +- + drivers/net/wireless/mac80211_hwsim.c | 166 +- + drivers/net/wireless/mwl8k.c | 2146 +++-- + drivers/net/wireless/orinoco/main.c | 4 +- + drivers/net/wireless/orinoco/orinoco_nortel.c | 2 +- + drivers/net/wireless/orinoco/orinoco_pci.c | 2 +- + drivers/net/wireless/orinoco/orinoco_plx.c | 2 +- + drivers/net/wireless/orinoco/orinoco_tmd.c | 2 +- + drivers/net/wireless/p54/main.c | 23 +- + drivers/net/wireless/p54/p54.h | 8 +- + drivers/net/wireless/p54/p54pci.c | 76 +- + drivers/net/wireless/p54/p54pci.h | 6 +- + drivers/net/wireless/p54/txrx.c | 2 +- + drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- + drivers/net/wireless/ray_cs.c | 2 +- + drivers/net/wireless/rndis_wlan.c | 373 +- + drivers/net/wireless/rt2x00/Kconfig | 4 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 8 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 42 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 39 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 118 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 57 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 71 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 90 +- + drivers/net/wireless/rt2x00/rt2x00.h | 36 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 42 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 3 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 79 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +- + drivers/net/wireless/rt2x00/rt61pci.c | 32 +- + drivers/net/wireless/rt2x00/rt73usb.c | 38 +- + drivers/net/wireless/rtl818x/rtl8180.h | 1 - + drivers/net/wireless/rtl818x/rtl8180_dev.c | 37 +- + drivers/net/wireless/rtl818x/rtl8187.h | 2 +- + drivers/net/wireless/rtl818x/rtl8187_dev.c | 26 +- + drivers/net/wireless/rtl818x/rtl8187_leds.c | 4 +- + drivers/net/wireless/wl12xx/wl1251.h | 4 +- + drivers/net/wireless/wl12xx/wl1251_acx.c | 69 + + drivers/net/wireless/wl12xx/wl1251_acx.h | 87 + + drivers/net/wireless/wl12xx/wl1251_cmd.c | 83 + + drivers/net/wireless/wl12xx/wl1251_cmd.h | 22 +- + drivers/net/wireless/wl12xx/wl1251_debugfs.c | 23 + + drivers/net/wireless/wl12xx/wl1251_init.c | 5 + + drivers/net/wireless/wl12xx/wl1251_init.h | 47 + + drivers/net/wireless/wl12xx/wl1251_main.c | 375 +- + drivers/net/wireless/wl12xx/wl1251_ps.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_rx.c | 2 +- + drivers/net/wireless/wl12xx/wl1251_tx.c | 9 +- + drivers/net/wireless/wl12xx/wl1251_tx.h | 17 + + drivers/net/wireless/wl12xx/wl1271.h | 35 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 134 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 37 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 8 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 67 +- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 33 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 100 +- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 62 + + drivers/net/wireless/wl12xx/wl1271_event.c | 20 +- + drivers/net/wireless/wl12xx/wl1271_event.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 12 +- + drivers/net/wireless/wl12xx/wl1271_main.c | 492 +- + drivers/net/wireless/wl12xx/wl1271_ps.c | 15 +- + drivers/net/wireless/wl12xx/wl1271_reg.h | 99 - + drivers/net/wireless/wl12xx/wl1271_spi.c | 3 +- + drivers/net/wireless/wl12xx/wl1271_tx.c | 43 +- + drivers/net/wireless/zd1201.c | 7 +- + drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 14 +- + drivers/net/xilinx_emaclite.c | 384 +- + drivers/net/yellowfin.c | 9 +- + drivers/pci/iov.c | 15 + + drivers/s390/net/qeth_core.h | 5 +- + drivers/s390/net/qeth_core_main.c | 169 +- + drivers/s390/net/qeth_core_mpc.h | 44 +- + drivers/s390/net/qeth_core_sys.c | 14 +- + drivers/s390/net/qeth_l2_main.c | 30 +- + drivers/s390/net/qeth_l3.h | 2 + + drivers/s390/net/qeth_l3_main.c | 176 +- + drivers/s390/net/qeth_l3_sys.c | 56 + + drivers/ssb/driver_mipscore.c | 5 +- + drivers/staging/et131x/et131x_netdev.c | 10 +- + drivers/staging/netwave/netwave_cs.c | 8 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 9 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 24 +- + drivers/staging/rtl8187se/r8180_core.c | 4 +- + drivers/staging/slicoss/slicoss.c | 2 +- + drivers/staging/vt6655/device_main.c | 4 +- + drivers/staging/vt6656/main_usb.c | 5 +- + drivers/staging/wavelan/wavelan.c | 8 +- + drivers/staging/wavelan/wavelan_cs.c | 11 +- + drivers/staging/wlags49_h2/wl_netdev.c | 18 +- + drivers/vhost/Kconfig | 11 + + drivers/vhost/Makefile | 2 + + drivers/vhost/net.c | 661 + + drivers/vhost/vhost.c | 1098 ++ + drivers/vhost/vhost.h | 161 + + drivers/virtio/virtio_ring.c | 25 + + firmware/Makefile | 10 +- + firmware/WHENCE | 6 +- + firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex | 5841 --------- + firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw.ihex | 5908 +++++++++ + ....0.j3.fw.ihex => bnx2-mips-09-5.0.0.j9.fw.ihex} | 4519 ++++---- + firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw.ihex | 462 + + firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw.ihex | 462 - + firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw.ihex | 499 + + firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw.ihex | 498 - + firmware/bnx2x-e1-5.2.13.0.fw.ihex |10191 ++++++++++++++++ + firmware/bnx2x-e1h-5.2.13.0.fw.ihex |12849 ++++++++++++++++++++ + fs/seq_file.c | 59 +- + include/linux/Kbuild | 1 + + include/linux/can/dev.h | 16 + + include/linux/can/netlink.h | 1 + + include/linux/ethtool.h | 51 + + include/linux/ieee80211.h | 108 +- + include/linux/if_link.h | 30 + + include/linux/if_macvlan.h | 71 + + include/linux/if_packet.h | 1 + + include/linux/if_tun.h | 14 + + include/linux/igmp.h | 2 + + include/linux/in.h | 2 + + include/linux/inetdevice.h | 43 +- + include/linux/isdn/capilli.h | 8 +- + include/linux/kernelcapi.h | 17 +- + include/linux/llc.h | 7 + + include/linux/miscdevice.h | 1 + + include/linux/net.h | 4 + + include/linux/netdevice.h | 175 +- + include/linux/netfilter.h | 64 +- + include/linux/netfilter/Kbuild | 1 + + include/linux/netfilter/nf_conntrack_common.h | 22 + + include/linux/netfilter/nf_conntrack_sip.h | 19 +- + include/linux/netfilter/nfnetlink.h | 8 +- + include/linux/netfilter/nfnetlink_conntrack.h | 2 + + include/linux/netfilter/x_tables.h | 53 +- + include/linux/netfilter/xt_CT.h | 17 + + include/linux/netfilter_arp/arp_tables.h | 1 + + include/linux/netfilter_bridge/ebtables.h | 2 +- + include/linux/netfilter_ipv4/ip_tables.h | 3 +- + include/linux/netfilter_ipv6/ip6_tables.h | 3 +- + include/linux/netpoll.h | 11 +- + include/linux/nl80211.h | 94 +- + include/linux/pci.h | 11 + + include/linux/phy.h | 1 + + include/linux/rtnetlink.h | 2 + + include/linux/seq_file.h | 11 + + include/linux/skbuff.h | 4 +- + include/linux/stmmac.h | 53 + + include/linux/sysctl.h | 4 - + include/linux/usb/usbnet.h | 21 - + include/linux/vhost.h | 130 + + include/linux/virtio.h | 4 + + include/net/cfg80211.h | 233 +- + include/net/dst.h | 2 - + include/net/icmp.h | 2 +- + include/net/ieee80211_radiotap.h | 4 + + include/net/inet_sock.h | 4 +- + include/net/ip.h | 9 +- + include/net/ip6_fib.h | 2 + + include/net/ip_vs.h | 16 +- + include/net/ipcomp.h | 2 +- + include/net/ipv6.h | 7 +- + include/net/llc.h | 39 +- + include/net/llc_conn.h | 2 + + include/net/mac80211.h | 380 +- + include/net/neighbour.h | 3 +- + include/net/net_namespace.h | 2 + + include/net/netfilter/nf_conntrack.h | 12 +- + include/net/netfilter/nf_conntrack_core.h | 3 +- + include/net/netfilter/nf_conntrack_ecache.h | 58 +- + include/net/netfilter/nf_conntrack_expect.h | 16 +- + include/net/netfilter/nf_conntrack_extend.h | 2 + + include/net/netfilter/nf_conntrack_helper.h | 8 +- + include/net/netfilter/nf_conntrack_l4proto.h | 4 +- + include/net/netfilter/nf_conntrack_zones.h | 23 + + include/net/netfilter/nf_nat_helper.h | 32 +- + include/net/netns/conntrack.h | 2 +- + include/net/netns/core.h | 2 +- + include/net/netns/ipv4.h | 2 + + include/net/netns/ipv6.h | 2 + + include/net/phonet/pep.h | 3 + + include/net/pkt_sched.h | 1 + + include/net/regulatory.h | 1 + + include/net/request_sock.h | 2 + + include/net/route.h | 2 +- + include/net/sch_generic.h | 19 + + include/net/snmp.h | 14 +- + include/net/sock.h | 7 +- + include/net/tcp.h | 23 +- + include/net/xfrm.h | 32 +- + lib/vsprintf.c | 48 +- + mm/mmu_context.c | 3 + + net/8021q/vlan.c | 4 +- + net/8021q/vlan.h | 2 +- + net/8021q/vlan_core.c | 2 + + net/8021q/vlan_dev.c | 9 +- + net/8021q/vlanproc.c | 2 +- + net/appletalk/atalk_proc.c | 30 +- + net/atm/addr.c | 2 +- + net/atm/atm_misc.c | 40 +- + net/atm/atm_sysfs.c | 27 +- + net/atm/br2684.c | 90 +- + net/atm/clip.c | 86 +- + net/atm/common.c | 386 +- + net/atm/ioctl.c | 196 +- + net/atm/lec.c | 599 +- + net/atm/mpc.c | 540 +- + net/atm/mpoa_caches.c | 190 +- + net/atm/mpoa_proc.c | 89 +- + net/atm/pppoatm.c | 28 +- + net/atm/proc.c | 83 +- + net/atm/pvc.c | 43 +- + net/atm/raw.c | 26 +- + net/atm/resources.c | 418 +- + net/atm/signaling.c | 219 +- + net/atm/svc.c | 258 +- + net/ax25/af_ax25.c | 18 +- + net/ax25/ax25_uid.c | 25 +- + net/bluetooth/bnep/netdev.c | 6 +- + net/bluetooth/cmtp/capi.c | 37 +- + net/bridge/br_if.c | 4 +- + net/bridge/br_private.h | 1 - + net/bridge/netfilter/ebt_802_3.c | 2 +- + net/bridge/netfilter/ebt_arp.c | 2 +- + net/bridge/netfilter/ebt_arpreply.c | 2 +- + net/bridge/netfilter/ebt_dnat.c | 2 +- + net/bridge/netfilter/ebt_ip.c | 2 +- + net/bridge/netfilter/ebt_ip6.c | 2 +- + net/bridge/netfilter/ebt_limit.c | 2 +- + net/bridge/netfilter/ebt_log.c | 2 +- + net/bridge/netfilter/ebt_mark.c | 2 +- + net/bridge/netfilter/ebt_mark_m.c | 2 +- + net/bridge/netfilter/ebt_nflog.c | 2 +- + net/bridge/netfilter/ebt_pkttype.c | 2 +- + net/bridge/netfilter/ebt_redirect.c | 2 +- + net/bridge/netfilter/ebt_snat.c | 2 +- + net/bridge/netfilter/ebt_stp.c | 2 +- + net/bridge/netfilter/ebt_ulog.c | 2 +- + net/bridge/netfilter/ebt_vlan.c | 2 +- + net/bridge/netfilter/ebtable_broute.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/bridge/netfilter/ebtables.c | 94 +- + net/can/af_can.c | 124 +- + net/can/af_can.h | 4 +- + net/can/proc.c | 93 +- + net/core/dev.c | 107 +- + net/core/drop_monitor.c | 1 - + net/core/ethtool.c | 380 +- + net/core/fib_rules.c | 2 +- + net/core/neighbour.c | 18 +- + net/core/netpoll.c | 169 +- + net/core/rtnetlink.c | 71 +- + net/core/sock.c | 16 +- + net/dccp/ccid.c | 9 +- + net/dccp/ipv4.c | 4 +- + net/dccp/ipv6.c | 4 +- + net/dccp/proto.c | 7 +- + net/ethernet/eth.c | 6 +- + net/ipv4/af_inet.c | 46 +- + net/ipv4/arp.c | 58 +- + net/ipv4/devinet.c | 30 +- + net/ipv4/fib_frontend.c | 4 +- + net/ipv4/fib_semantics.c | 80 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/igmp.c | 87 +- + net/ipv4/inet_connection_sock.c | 2 + + net/ipv4/ip_fragment.c | 39 +- + net/ipv4/ip_gre.c | 23 +- + net/ipv4/ip_sockglue.c | 14 +- + net/ipv4/ipcomp.c | 9 +- + net/ipv4/ipip.c | 20 +- + net/ipv4/ipmr.c | 3 - + net/ipv4/netfilter/arp_tables.c | 80 +- + net/ipv4/netfilter/arptable_filter.c | 95 +- + net/ipv4/netfilter/ip_tables.c | 156 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 14 +- + net/ipv4/netfilter/ipt_ULOG.c | 4 +- + net/ipv4/netfilter/iptable_filter.c | 124 +- + net/ipv4/netfilter/iptable_mangle.c | 166 +- + net/ipv4/netfilter/iptable_raw.c | 96 +- + net/ipv4/netfilter/iptable_security.c | 117 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 3 +- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 11 +- + net/ipv4/netfilter/nf_defrag_ipv4.c | 15 +- + net/ipv4/netfilter/nf_nat_core.c | 24 +- + net/ipv4/netfilter/nf_nat_ftp.c | 105 +- + net/ipv4/netfilter/nf_nat_helper.c | 39 +- + net/ipv4/netfilter/nf_nat_pptp.c | 3 +- + net/ipv4/netfilter/nf_nat_rule.c | 41 +- + net/ipv4/netfilter/nf_nat_sip.c | 154 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 31 +- + net/ipv4/proc.c | 32 +- + net/ipv4/route.c | 9 +- + net/ipv4/syncookies.c | 3 +- + net/ipv4/tcp.c | 51 +- + net/ipv4/tcp_ipv4.c | 25 +- + net/ipv4/tcp_output.c | 22 +- + net/ipv4/tcp_timer.c | 6 + + net/ipv4/udp.c | 19 +- + net/ipv4/udplite.c | 4 +- + net/ipv6/addrconf.c | 91 +- + net/ipv6/af_inet6.c | 32 +- + net/ipv6/anycast.c | 2 +- + net/ipv6/fib6_rules.c | 4 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_fib.c | 35 +- + net/ipv6/ip6_flowlabel.c | 9 +- + net/ipv6/ip6_tunnel.c | 37 +- + net/ipv6/ipcomp6.c | 13 +- + net/ipv6/mcast.c | 13 +- + net/ipv6/ndisc.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 158 +- + net/ipv6/netfilter/ip6table_filter.c | 113 +- + net/ipv6/netfilter/ip6table_mangle.c | 141 +- + net/ipv6/netfilter/ip6table_raw.c | 86 +- + net/ipv6/netfilter/ip6table_security.c | 109 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 14 +- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 11 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 7 +- + net/ipv6/proc.c | 39 +- + net/ipv6/raw.c | 4 +- + net/ipv6/reassembly.c | 25 +- + net/ipv6/route.c | 6 +- + net/ipv6/sit.c | 23 +- + net/ipv6/syncookies.c | 3 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 22 +- + net/ipv6/udp.c | 17 +- + net/ipv6/udplite.c | 4 +- + net/ipv6/xfrm6_tunnel.c | 194 +- + net/ipx/ipx_proc.c | 90 +- + net/irda/ircomm/ircomm_tty.c | 6 - + net/irda/irlan/irlan_common.c | 28 +- + net/irda/irlan/irlan_eth.c | 5 +- + net/key/af_key.c | 35 +- + net/llc/af_llc.c | 64 +- + net/llc/llc_conn.c | 143 +- + net/llc/llc_core.c | 53 +- + net/llc/llc_output.c | 45 +- + net/llc/llc_proc.c | 69 +- + net/llc/llc_sap.c | 111 +- + net/mac80211/Kconfig | 12 - + net/mac80211/Makefile | 4 +- + net/mac80211/agg-rx.c | 15 +- + net/mac80211/agg-tx.c | 38 +- + net/mac80211/cfg.c | 186 +- + net/mac80211/debugfs.c | 127 + + net/mac80211/debugfs_key.c | 2 +- + net/mac80211/debugfs_netdev.c | 212 +- + net/mac80211/debugfs_netdev.h | 9 +- + net/mac80211/debugfs_sta.c | 88 +- + net/mac80211/driver-ops.h | 169 +- + net/mac80211/driver-trace.h | 174 +- + net/mac80211/ht.c | 53 +- + net/mac80211/ibss.c | 125 +- + net/mac80211/ieee80211_i.h | 209 +- + net/mac80211/iface.c | 108 +- + net/mac80211/key.c | 10 +- + net/mac80211/key.h | 8 +- + net/mac80211/main.c | 68 +- + net/mac80211/mesh.c | 6 +- + net/mac80211/mesh_hwmp.c | 20 +- + net/mac80211/mesh_pathtbl.c | 6 +- + net/mac80211/mesh_plink.c | 23 +- + net/mac80211/mlme.c | 1282 +-- + net/mac80211/offchannel.c | 170 + + net/mac80211/pm.c | 18 +- + net/mac80211/rate.c | 90 +- + net/mac80211/rate.h | 14 +- + net/mac80211/rc80211_pid_algo.c | 8 +- + net/mac80211/rx.c | 333 +- + net/mac80211/scan.c | 249 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 777 +- + net/mac80211/sta_info.h | 68 +- + net/mac80211/status.c | 100 +- + net/mac80211/tkip.c | 47 +- + net/mac80211/tx.c | 376 +- + net/mac80211/util.c | 319 +- + net/mac80211/wep.c | 17 +- + net/mac80211/wme.c | 2 +- + net/mac80211/work.c | 1099 ++ + net/mac80211/wpa.c | 57 +- + net/netfilter/Kconfig | 25 + + net/netfilter/Makefile | 1 + + net/netfilter/ipvs/Kconfig | 4 + + net/netfilter/ipvs/ip_vs_conn.c | 42 +- + net/netfilter/ipvs/ip_vs_ctl.c | 8 +- + net/netfilter/ipvs/ip_vs_ftp.c | 2 +- + net/netfilter/nf_conntrack_core.c | 164 +- + net/netfilter/nf_conntrack_expect.c | 31 +- + net/netfilter/nf_conntrack_extend.c | 1 - + net/netfilter/nf_conntrack_h323_main.c | 3 +- + net/netfilter/nf_conntrack_helper.c | 44 +- + net/netfilter/nf_conntrack_netlink.c | 210 +- + net/netfilter/nf_conntrack_pptp.c | 14 +- + net/netfilter/nf_conntrack_proto_dccp.c | 5 +- + net/netfilter/nf_conntrack_proto_gre.c | 2 +- + net/netfilter/nf_conntrack_proto_sctp.c | 2 +- + net/netfilter/nf_conntrack_proto_tcp.c | 4 +- + net/netfilter/nf_conntrack_proto_udp.c | 6 +- + net/netfilter/nf_conntrack_proto_udplite.c | 4 +- + net/netfilter/nf_conntrack_sip.c | 330 +- + net/netfilter/nf_conntrack_standalone.c | 6 + + net/netfilter/nfnetlink.c | 65 +- + net/netfilter/nfnetlink_log.c | 3 +- + net/netfilter/nfnetlink_queue.c | 7 +- + net/netfilter/x_tables.c | 80 +- + net/netfilter/xt_CT.c | 164 + + net/netfilter/xt_NFQUEUE.c | 6 +- + net/netfilter/xt_RATEEST.c | 7 +- + net/netfilter/xt_TCPMSS.c | 18 +- + net/netfilter/xt_connlimit.c | 27 +- + net/netfilter/xt_hashlimit.c | 215 +- + net/netfilter/xt_limit.c | 4 +- + net/netfilter/xt_osf.c | 4 +- + net/netfilter/xt_recent.c | 164 +- + net/netfilter/xt_repldata.h | 35 + + net/netlabel/netlabel_domainhash.c | 1 - + net/netlabel/netlabel_unlabeled.c | 3 - + net/netlink/genetlink.c | 4 +- + net/netrom/af_netrom.c | 21 +- + net/netrom/nr_route.c | 53 +- + net/packet/Kconfig | 10 - + net/packet/af_packet.c | 240 +- + net/phonet/datagram.c | 6 +- + net/phonet/pep-gprs.c | 4 +- + net/phonet/pep.c | 29 +- + net/phonet/pn_dev.c | 4 +- + net/rds/tcp_connect.c | 7 +- + net/rds/tcp_listen.c | 6 +- + net/rds/tcp_send.c | 4 +- + net/rose/af_rose.c | 22 +- + net/sched/sch_api.c | 1 + + net/sched/sch_fifo.c | 34 + + net/sctp/bind_addr.c | 1 - + net/sctp/ipv6.c | 1 - + net/sctp/proc.c | 4 +- + net/sctp/protocol.c | 6 +- + net/sctp/socket.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + net/sysctl_net.c | 4 +- + net/tipc/Kconfig | 75 +- + net/tipc/core.c | 10 +- + net/unix/af_unix.c | 4 +- + net/unix/sysctl_net_unix.c | 2 +- + net/wireless/.gitignore | 1 + + net/wireless/Kconfig | 13 +- + net/wireless/Makefile | 6 + + net/wireless/chan.c | 41 +- + net/wireless/core.c | 39 +- + net/wireless/core.h | 11 +- + net/wireless/db.txt | 17 + + net/wireless/genregdb.awk | 118 + + net/wireless/lib80211_crypt_ccmp.c | 2 +- + net/wireless/lib80211_crypt_tkip.c | 23 +- + net/wireless/mlme.c | 48 +- + net/wireless/nl80211.c | 416 +- + net/wireless/nl80211.h | 15 + + net/wireless/radiotap.c | 305 +- + net/wireless/reg.c | 687 +- + net/wireless/reg.h | 29 + + net/wireless/regdb.h | 7 + + net/wireless/scan.c | 158 +- + net/wireless/sme.c | 41 + + net/wireless/sysfs.c | 20 + + net/wireless/util.c | 137 +- + net/wireless/wext-compat.c | 39 +- + net/wireless/wext-proc.c | 4 +- + net/x25/af_x25.c | 24 +- + net/x25/x25_proc.c | 114 +- + net/xfrm/xfrm_ipcomp.c | 16 +- + net/xfrm/xfrm_policy.c | 6 +- + net/xfrm/xfrm_proc.c | 5 +- + net/xfrm/xfrm_state.c | 10 +- + net/xfrm/xfrm_sysctl.c | 4 +- + net/xfrm/xfrm_user.c | 4 + + 1049 files changed, 99849 insertions(+), 32420 deletions(-) + create mode 100755 Documentation/networking/ixgbevf.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/can.txt + create mode 100644 drivers/net/can/sja1000/plx_pci.c + create mode 100644 drivers/net/irda/sh_sir.c + create mode 100644 drivers/net/ixgbe/ixgbe_mbx.c + create mode 100644 drivers/net/ixgbe/ixgbe_mbx.h + create mode 100644 drivers/net/ixgbe/ixgbe_sriov.c + create mode 100644 drivers/net/ixgbe/ixgbe_sriov.h + create mode 100644 drivers/net/ixgbevf/Makefile + create mode 100644 drivers/net/ixgbevf/defines.h + create mode 100644 drivers/net/ixgbevf/ethtool.c + create mode 100644 drivers/net/ixgbevf/ixgbevf.h + create mode 100644 drivers/net/ixgbevf/ixgbevf_main.c + create mode 100644 drivers/net/ixgbevf/mbx.c + create mode 100644 drivers/net/ixgbevf/mbx.h + create mode 100644 drivers/net/ixgbevf/regs.h + create mode 100644 drivers/net/ixgbevf/vf.c + create mode 100644 drivers/net/ixgbevf/vf.h + create mode 100644 drivers/net/ksz884x.c + create mode 100644 drivers/net/macvtap.c + create mode 100644 drivers/net/qlcnic/Makefile + create mode 100644 drivers/net/qlcnic/qlcnic.h + create mode 100644 drivers/net/qlcnic/qlcnic_ctx.c + create mode 100644 drivers/net/qlcnic/qlcnic_ethtool.c + create mode 100644 drivers/net/qlcnic/qlcnic_hdr.h + create mode 100644 drivers/net/qlcnic/qlcnic_hw.c + create mode 100644 drivers/net/qlcnic/qlcnic_init.c + create mode 100644 drivers/net/qlcnic/qlcnic_main.c + rename drivers/net/stmmac/{mac100.c => dwmac100.c} (68%) + rename drivers/net/stmmac/{mac100.h => dwmac100.h} (100%) + rename drivers/net/stmmac/{gmac.h => dwmac1000.h} (95%) + create mode 100644 drivers/net/stmmac/dwmac1000_core.c + rename drivers/net/stmmac/{gmac.c => dwmac1000_dma.c} (53%) + create mode 100644 drivers/net/stmmac/dwmac_dma.h + create mode 100644 drivers/net/stmmac/dwmac_lib.c + create mode 100644 drivers/net/wireless/ath/ath9k/gpio.c + create mode 100644 drivers/net/wireless/ath/ath9k/init.c + delete mode 100644 drivers/net/wireless/iwlwifi/iwl-spectrum.c + create mode 100644 drivers/vhost/Kconfig + create mode 100644 drivers/vhost/Makefile + create mode 100644 drivers/vhost/net.c + create mode 100644 drivers/vhost/vhost.c + create mode 100644 drivers/vhost/vhost.h + delete mode 100644 firmware/bnx2/bnx2-mips-06-5.0.0.j3.fw.ihex + create mode 100644 firmware/bnx2/bnx2-mips-06-5.0.0.j6.fw.ihex + rename firmware/bnx2/{bnx2-mips-09-5.0.0.j3.fw.ihex => bnx2-mips-09-5.0.0.j9.fw.ihex} (63%) + create mode 100644 firmware/bnx2/bnx2-rv2p-09-5.0.0.j10.fw.ihex + delete mode 100644 firmware/bnx2/bnx2-rv2p-09-5.0.0.j3.fw.ihex + create mode 100644 firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw.ihex + delete mode 100644 firmware/bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw.ihex + create mode 100644 firmware/bnx2x-e1-5.2.13.0.fw.ihex + create mode 100644 firmware/bnx2x-e1h-5.2.13.0.fw.ihex + create mode 100644 include/linux/netfilter/xt_CT.h + create mode 100644 include/linux/stmmac.h + create mode 100644 include/linux/vhost.h + create mode 100644 include/net/netfilter/nf_conntrack_zones.h + create mode 100644 net/mac80211/offchannel.c + create mode 100644 net/mac80211/work.c + create mode 100644 net/netfilter/xt_CT.c + create mode 100644 net/netfilter/xt_repldata.h + create mode 100644 net/wireless/.gitignore + create mode 100644 net/wireless/db.txt + create mode 100644 net/wireless/genregdb.awk + create mode 100644 net/wireless/regdb.h +Merging wireless/master +$ git merge wireless/master +Resolved 'drivers/net/wireless/rt2x00/rt2800pci.c' using previous resolution. +Auto-merging drivers/net/wireless/airo.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-3945.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-rx.c +Auto-merging drivers/net/wireless/rt2x00/rt2400pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2400pci.h +Auto-merging drivers/net/wireless/rt2x00/rt2500pci.c +Auto-merging drivers/net/wireless/rt2x00/rt2500pci.h +Auto-merging drivers/net/wireless/rt2x00/rt2800pci.c +CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt2800pci.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.h +Auto-merging drivers/net/wireless/rt2x00/rt73usb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c59623] Merge remote branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/airo.c | 1 + + drivers/net/wireless/ath/ath9k/beacon.c | 10 +- + drivers/net/wireless/b43legacy/leds.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-3945.c | 8 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 7 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 7 + + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 15 ++- + drivers/net/wireless/iwlwifi/iwl-agn.c | 22 ++- + drivers/net/wireless/iwlwifi/iwl-commands.h | 4 - + drivers/net/wireless/iwlwifi/iwl-core.c | 56 ++++- + drivers/net/wireless/iwlwifi/iwl-core.h | 8 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 28 +++ + drivers/net/wireless/iwlwifi/iwl-dev.h | 13 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 7 +- + drivers/net/wireless/iwlwifi/iwl-rx.c | 80 ++++++-- + drivers/net/wireless/iwlwifi/iwl-scan.c | 37 +--- + drivers/net/wireless/iwlwifi/iwl-tx.c | 62 +++--- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 39 ++-- + drivers/net/wireless/mwl8k.c | 4 +- + drivers/net/wireless/p54/p54usb.c | 1 + + drivers/net/wireless/rt2x00/Kconfig | 67 ++++++- + drivers/net/wireless/rt2x00/rt2400pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 1 + + drivers/net/wireless/rt2x00/rt2500pci.c | 4 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 1 + + drivers/net/wireless/rt2x00/rt2500usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2800.h | 14 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 115 ++++++---- + drivers/net/wireless/rt2x00/rt2800pci.c | 49 ++--- + drivers/net/wireless/rt2x00/rt2800usb.c | 306 ++++++++++++++++---------- + drivers/net/wireless/rt2x00/rt2x00.h | 66 +++---- + drivers/net/wireless/rt2x00/rt2x00debug.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 7 - + drivers/net/wireless/rt2x00/rt2x00pci.h | 1 + + drivers/net/wireless/rt2x00/rt2x00soc.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00soc.h | 10 +- + drivers/net/wireless/rt2x00/rt61pci.c | 14 +- + drivers/net/wireless/rt2x00/rt61pci.h | 9 + + drivers/net/wireless/rt2x00/rt73usb.c | 7 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 + + drivers/net/wireless/rtl818x/rtl8187_leds.c | 2 +- + drivers/net/wireless/rtl818x/rtl8187_leds.h | 2 +- + drivers/ssb/ssb_private.h | 4 +- + include/linux/nl80211.h | 41 ++++- + include/net/cfg80211.h | 47 ++++- + include/net/mac80211.h | 6 +- + net/mac80211/cfg.c | 12 +- + net/mac80211/ieee80211_i.h | 6 +- + net/mac80211/iface.c | 2 +- + net/mac80211/mlme.c | 35 +++ + net/mac80211/rx.c | 140 +++++++++---- + net/mac80211/status.c | 7 +- + net/wireless/core.c | 4 + + net/wireless/core.h | 9 + + net/wireless/mlme.c | 166 ++++++++++++++ + net/wireless/nl80211.c | 309 +++++++++++++++++++++++---- + net/wireless/nl80211.h | 8 + + 59 files changed, 1409 insertions(+), 503 deletions(-) +Merging mtd/master +$ git merge mtd/master +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/Makefile +Auto-merging drivers/mtd/nand/au1550nd.c +Auto-merging drivers/mtd/nand/sh_flctl.c +Removing drivers/mtd/nand/ts7250.c +Merge made by recursive. + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 -- + arch/arm/mach-ep93xx/ts72xx.c | 188 ++++++++++++------ + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/nand/Kconfig | 12 +- + drivers/mtd/nand/Makefile | 3 +- + drivers/mtd/nand/au1550nd.c | 12 +- + drivers/mtd/nand/davinci_nand.c | 4 +- + drivers/mtd/nand/fsl_elbc_nand.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/nomadik_nand.c | 6 +- + drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 +++++++------- + drivers/mtd/nand/orion_nand.c | 10 +- + drivers/mtd/nand/s3c2410.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 14 +- + drivers/mtd/nand/ts7250.c | 207 -------------------- + 16 files changed, 241 insertions(+), 398 deletions(-) + rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) + delete mode 100644 drivers/mtd/nand/ts7250.c +Merging crypto/master +$ git merge crypto/master +Auto-merging arch/s390/crypto/aes_s390.c +Auto-merging drivers/char/hw_random/Kconfig +Auto-merging init/Kconfig +Merge made by recursive. + arch/arm/mach-nomadik/cpu-8815.c | 8 + + arch/s390/crypto/aes_s390.c | 6 +- + crypto/Kconfig | 10 + + crypto/Makefile | 1 + + crypto/ablkcipher.c | 4 +- + crypto/aead.c | 4 +- + crypto/aes_generic.c | 4 +- + crypto/algapi.c | 4 +- + crypto/anubis.c | 22 +- + crypto/api.c | 13 +- + crypto/authenc.c | 10 +- + crypto/blowfish.c | 18 +- + crypto/camellia.c | 616 +++++++++++++++--------------- + crypto/cast5.c | 14 +- + crypto/cast6.c | 122 +++--- + crypto/cipher.c | 2 +- + crypto/compress.c | 4 +- + crypto/crc32c.c | 6 +- + crypto/crypto_null.c | 8 +- + crypto/deflate.c | 20 +- + crypto/des_generic.c | 3 +- + crypto/ecb.c | 2 +- + crypto/fcrypt.c | 6 +- + crypto/gcm.c | 287 ++++++++++++++ + crypto/md5.c | 40 ++- + crypto/pcrypt.c | 445 ++++++++++++++++++++++ + crypto/testmgr.c | 84 ++++ + drivers/char/hw_random/Kconfig | 12 + + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/nomadik-rng.c | 103 +++++ + drivers/crypto/amcc/crypto4xx_core.c | 2 +- + drivers/crypto/geode-aes.c | 8 +- + drivers/crypto/talitos.c | 2 +- + include/crypto/md5.h | 17 + + include/crypto/pcrypt.h | 51 +++ + include/linux/padata.h | 88 +++++ + include/linux/pfkeyv2.h | 1 + + init/Kconfig | 4 + + kernel/Makefile | 1 + + kernel/padata.c | 690 ++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_algo.c | 16 + + 41 files changed, 2293 insertions(+), 466 deletions(-) + create mode 100644 crypto/pcrypt.c + create mode 100644 drivers/char/hw_random/nomadik-rng.c + create mode 100644 include/crypto/md5.h + create mode 100644 include/crypto/pcrypt.h + create mode 100644 include/linux/padata.h + create mode 100644 kernel/padata.c +Merging sound/for-next +$ git merge sound/for-next +Resolved 'arch/arm/plat-mxc/Makefile' using previous resolution. +Auto-merging arch/arm/plat-mxc/Makefile +CONFLICT (content): Merge conflict in arch/arm/plat-mxc/Makefile +Removing sound/isa/dt019x.c +Removing sound/soc/imx/mx1_mx2-pcm.c +Removing sound/soc/imx/mx1_mx2-pcm.h +Removing sound/soc/imx/mx27vis_wm8974.c +Removing sound/soc/imx/mxc-ssi.c +Removing sound/soc/imx/mxc-ssi.h +Removing sound/soc/s3c24xx/s3c2443-ac97.c +Removing sound/soc/s3c24xx/s3c24xx-ac97.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 683aa8a] Merge remote branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/ALSA-Configuration.txt | 27 +- + Documentation/sound/alsa/HD-Audio-Models.txt | 3 + + Documentation/sound/alsa/HD-Audio.txt | 27 + + arch/arm/plat-mxc/Makefile | 4 + + arch/arm/plat-mxc/ssi-fiq-ksym.c | 20 + + arch/arm/plat-mxc/ssi-fiq.S | 134 + + arch/sh/include/asm/siu.h | 26 + + include/sound/core.h | 3 + + include/sound/cs46xx_dsp_spos.h | 6 +- + include/sound/pcm.h | 54 +- + include/sound/pcm_oss.h | 2 +- + include/sound/sb.h | 1 + + include/sound/soc-dai.h | 2 + + include/sound/soc-dapm.h | 32 + + include/sound/soc.h | 26 + + include/sound/tlv320dac33-plat.h | 1 + + include/sound/tpa6130a2-plat.h | 6 + + include/sound/version.h | 2 +- + include/sound/wm2000.h | 26 + + include/sound/wm8904.h | 57 + + include/sound/wm8955.h | 26 + + sound/core/control.c | 7 +- + sound/core/misc.c | 32 +- + sound/core/oss/pcm_oss.c | 31 +- + sound/core/pcm.c | 5 + + sound/core/pcm_lib.c | 445 ++-- + sound/core/pcm_memory.c | 55 + + sound/core/pcm_native.c | 67 +- + sound/core/seq/seq_clientmgr.c | 2 +- + sound/core/seq/seq_timer.c | 27 +- + sound/drivers/dummy.c | 290 ++- + sound/drivers/vx/vx_pcm.c | 61 +- + sound/isa/Kconfig | 37 +- + sound/isa/Makefile | 2 - + sound/isa/als100.c | 121 +- + sound/isa/dt019x.c | 321 -- + sound/isa/opti9xx/opti92x-ad1848.c | 93 + + sound/isa/sb/Makefile | 2 + + sound/isa/sb/jazz16.c | 404 +++ + sound/isa/sb/sb8_main.c | 118 +- + sound/isa/sb/sb_common.c | 3 + + sound/isa/sb/sb_mixer.c | 333 +-- + sound/isa/wss/wss_lib.c | 80 +- + sound/mips/sgio2audio.c | 34 +- + sound/oss/kahlua.c | 2 +- + sound/oss/soundcard.c | 35 +- + sound/pci/Kconfig | 1 + + sound/pci/ac97/ac97_patch.c | 17 +- + sound/pci/ad1889.c | 2 +- + sound/pci/ali5451/ali5451.c | 2 +- + sound/pci/als300.c | 2 +- + sound/pci/als4000.c | 2 +- + sound/pci/atiixp.c | 2 +- + sound/pci/atiixp_modem.c | 2 +- + sound/pci/au88x0/au8810.c | 2 +- + sound/pci/au88x0/au8820.c | 2 +- + sound/pci/au88x0/au8830.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/bt87x.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/cmipci.c | 4 +- + sound/pci/cs4281.c | 2 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 12 +- + sound/pci/cs46xx/dsp_spos.c | 42 +- + sound/pci/cs46xx/dsp_spos.h | 4 + + sound/pci/cs46xx/dsp_spos_scb_lib.c | 33 +- + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio.c | 2 +- + sound/pci/ctxfi/ctatc.c | 23 +- + sound/pci/ctxfi/ctatc.h | 2 +- + sound/pci/ctxfi/xfi.c | 7 +- + sound/pci/echoaudio/darla20.c | 2 +- + sound/pci/echoaudio/darla20_dsp.c | 12 +- + sound/pci/echoaudio/darla24.c | 2 +- + sound/pci/echoaudio/darla24_dsp.c | 12 +- + sound/pci/echoaudio/echo3g.c | 2 +- + sound/pci/echoaudio/echo3g_dsp.c | 28 +- + sound/pci/echoaudio/echoaudio.c | 205 ++- + sound/pci/echoaudio/echoaudio.h | 11 +- + sound/pci/echoaudio/echoaudio_3g.c | 5 +- + sound/pci/echoaudio/echoaudio_dsp.c | 157 +- + sound/pci/echoaudio/gina20.c | 2 +- + sound/pci/echoaudio/gina20_dsp.c | 15 +- + sound/pci/echoaudio/gina24.c | 2 +- + sound/pci/echoaudio/gina24_dsp.c | 38 +- + sound/pci/echoaudio/indigo.c | 2 +- + sound/pci/echoaudio/indigo_dsp.c | 12 +- + sound/pci/echoaudio/indigo_express_dsp.c | 1 + + sound/pci/echoaudio/indigodj.c | 2 +- + sound/pci/echoaudio/indigodj_dsp.c | 12 +- + sound/pci/echoaudio/indigodjx.c | 2 +- + sound/pci/echoaudio/indigodjx_dsp.c | 13 +- + sound/pci/echoaudio/indigoio.c | 2 +- + sound/pci/echoaudio/indigoio_dsp.c | 12 +- + sound/pci/echoaudio/indigoiox.c | 2 +- + sound/pci/echoaudio/indigoiox_dsp.c | 13 +- + sound/pci/echoaudio/layla20.c | 2 +- + sound/pci/echoaudio/layla20_dsp.c | 20 +- + sound/pci/echoaudio/layla24.c | 2 +- + sound/pci/echoaudio/layla24_dsp.c | 37 +- + sound/pci/echoaudio/mia.c | 2 +- + sound/pci/echoaudio/mia_dsp.c | 12 +- + sound/pci/echoaudio/mona.c | 2 +- + sound/pci/echoaudio/mona_dsp.c | 61 +- + sound/pci/emu10k1/emu10k1.c | 2 +- + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/ens1370.c | 2 +- + sound/pci/es1938.c | 2 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + sound/pci/hda/hda_codec.c | 77 +- + sound/pci/hda/hda_codec.h | 5 + + sound/pci/hda/hda_generic.c | 3 +- + sound/pci/hda/hda_hwdep.c | 60 +- + sound/pci/hda/hda_intel.c | 53 +- + sound/pci/hda/hda_local.h | 14 +- + sound/pci/hda/hda_proc.c | 31 +- + sound/pci/hda/patch_analog.c | 115 +- + sound/pci/hda/patch_cirrus.c | 14 +- + sound/pci/hda/patch_cmedia.c | 11 +- + sound/pci/hda/patch_conexant.c | 592 +++- + sound/pci/hda/patch_realtek.c | 755 +++-- + sound/pci/hda/patch_si3054.c | 1 + + sound/pci/hda/patch_sigmatel.c | 271 +- + sound/pci/hda/patch_via.c | 274 +- + sound/pci/ice1712/ice1712.c | 11 +- + sound/pci/ice1712/ice1724.c | 2 +- + sound/pci/intel8x0.c | 2 +- + sound/pci/intel8x0m.c | 2 +- + sound/pci/korg1212/korg1212.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/maestro3.c | 2 +- + sound/pci/mixart/mixart.c | 2 +- + sound/pci/nm256/nm256.c | 2 +- + sound/pci/oxygen/Makefile | 2 +- + sound/pci/oxygen/hifier.c | 2 +- + sound/pci/oxygen/oxygen.c | 2 +- + sound/pci/oxygen/virtuoso.c | 5 +- + sound/pci/oxygen/wm8766.h | 73 + + sound/pci/oxygen/wm8776.h | 177 ++ + sound/pci/oxygen/xonar.h | 2 + + sound/pci/oxygen/xonar_wm87x6.c | 1021 ++++++ + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/pci/riptide/riptide.c | 4 +- + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdsp.c | 2 +- + sound/pci/rme9652/hdspm.c | 2 +- + sound/pci/rme9652/rme9652.c | 2 +- + sound/pci/sis7019.c | 2 +- + sound/pci/sonicvibes.c | 2 +- + sound/pci/trident/trident.c | 2 +- + sound/pci/via82xx.c | 2 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/vx222/vx222.c | 2 +- + sound/pci/ymfpci/ymfpci.c | 2 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 52 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 8 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 3 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 3 +- + sound/soc/codecs/Kconfig | 24 + + sound/soc/codecs/Makefile | 16 +- + sound/soc/codecs/ad1836.c | 96 +- + sound/soc/codecs/ad1836.h | 1 + + sound/soc/codecs/ad1938.c | 228 +-- + sound/soc/codecs/ak4104.c | 4 +- + sound/soc/codecs/cs4270.c | 91 +- + sound/soc/codecs/da7210.c | 589 ++++ + sound/soc/codecs/da7210.h | 24 + + sound/soc/codecs/tlv320aic3x.c | 75 +- + sound/soc/codecs/tlv320dac33.c | 311 ++- + sound/soc/codecs/tpa6130a2.c | 115 +- + sound/soc/codecs/twl4030.c | 33 +- + sound/soc/codecs/twl4030.h | 2 +- + sound/soc/codecs/wm2000.c | 888 ++++++ + sound/soc/codecs/wm2000.h | 79 + + sound/soc/codecs/wm8727.c | 66 +- + sound/soc/codecs/wm8731.c | 3 + + sound/soc/codecs/wm8753.c | 8 - + sound/soc/codecs/wm8776.c | 2 + + sound/soc/codecs/wm8904.c | 2656 ++++++++++++++++ + sound/soc/codecs/wm8904.h | 1681 ++++++++++ + sound/soc/codecs/wm8955.c | 1151 +++++++ + sound/soc/codecs/wm8955.h | 489 +++ + sound/soc/codecs/wm8961.c | 3 + + sound/soc/codecs/wm8974.c | 12 +- + sound/soc/codecs/wm8974.h | 12 +- + sound/soc/codecs/wm8978.c | 1149 +++++++ + sound/soc/codecs/wm8978.h | 86 + + sound/soc/codecs/wm8990.c | 8 - + sound/soc/codecs/wm8993.c | 307 ++- + sound/soc/codecs/wm8994.c | 3867 +++++++++++++++++++++++ + sound/soc/codecs/wm8994.h | 26 + + sound/soc/codecs/wm9713.c | 64 +- + sound/soc/codecs/wm_hubs.c | 148 +- + sound/soc/codecs/wm_hubs.h | 6 + + sound/soc/davinci/davinci-mcasp.c | 17 +- + sound/soc/davinci/davinci-mcasp.h | 1 + + sound/soc/davinci/davinci-pcm.c | 2 +- + sound/soc/imx/Kconfig | 20 +- + sound/soc/imx/Makefile | 14 +- + sound/soc/imx/imx-pcm-dma-mx2.c | 313 ++ + sound/soc/imx/imx-pcm-fiq.c | 277 ++ + sound/soc/imx/imx-ssi.c | 758 +++++ + sound/soc/imx/imx-ssi.h | 237 ++ + sound/soc/imx/mx1_mx2-pcm.c | 488 --- + sound/soc/imx/mx1_mx2-pcm.h | 26 - + sound/soc/imx/mx27vis_wm8974.c | 318 -- + sound/soc/imx/mxc-ssi.c | 860 ----- + sound/soc/imx/mxc-ssi.h | 238 -- + sound/soc/imx/phycore-ac97.c | 90 + + sound/soc/omap/Kconfig | 8 +- + sound/soc/omap/omap3beagle.c | 6 +- + sound/soc/omap/omap3pandora.c | 42 +- + sound/soc/pxa/pxa-ssp.c | 12 +- + sound/soc/pxa/raumfeld.c | 61 +- + sound/soc/s3c24xx/Kconfig | 22 +- + sound/soc/s3c24xx/Makefile | 7 +- + sound/soc/s3c24xx/ln2440sbc_alc650.c | 4 +- + sound/soc/s3c24xx/s3c-ac97.c | 518 +++ + sound/soc/s3c24xx/s3c-ac97.h | 23 + + sound/soc/s3c24xx/s3c-pcm.c | 3 +- + sound/soc/s3c24xx/s3c2443-ac97.c | 432 --- + sound/soc/s3c24xx/s3c24xx-ac97.h | 25 - + sound/soc/s3c24xx/s3c64xx-i2s.c | 120 +- + sound/soc/s3c24xx/smdk2443_wm9710.c | 4 +- + sound/soc/s3c24xx/smdk_wm9713.c | 94 + + sound/soc/sh/Kconfig | 23 + + sound/soc/sh/Makefile | 6 + + sound/soc/sh/fsi-da7210.c | 83 + + sound/soc/sh/fsi.c | 213 +- + sound/soc/sh/migor.c | 218 ++ + sound/soc/sh/siu.h | 193 ++ + sound/soc/sh/siu_dai.c | 847 +++++ + sound/soc/sh/siu_pcm.c | 616 ++++ + sound/soc/soc-cache.c | 213 ++- + sound/soc/soc-core.c | 43 +- + sound/soc/soc-dapm.c | 142 +- + sound/usb/Kconfig | 12 + + sound/usb/Makefile | 2 + + sound/usb/ua101.c | 1421 +++++++++ + sound/usb/usbaudio.c | 288 +- + sound/usb/usbaudio.h | 16 +- + sound/usb/usbmidi.c | 24 +- + sound/usb/usbmixer.c | 259 ++- + sound/usb/usbmixer_maps.c | 23 +- + sound/usb/usbquirks.h | 172 +- + 249 files changed, 26105 insertions(+), 5741 deletions(-) + create mode 100644 arch/arm/plat-mxc/ssi-fiq-ksym.c + create mode 100644 arch/arm/plat-mxc/ssi-fiq.S + create mode 100644 arch/sh/include/asm/siu.h + create mode 100644 include/sound/wm2000.h + create mode 100644 include/sound/wm8904.h + create mode 100644 include/sound/wm8955.h + delete mode 100644 sound/isa/dt019x.c + create mode 100644 sound/isa/sb/jazz16.c + create mode 100644 sound/pci/oxygen/wm8766.h + create mode 100644 sound/pci/oxygen/wm8776.h + create mode 100644 sound/pci/oxygen/xonar_wm87x6.c + create mode 100644 sound/soc/codecs/da7210.c + create mode 100644 sound/soc/codecs/da7210.h + create mode 100644 sound/soc/codecs/wm2000.c + create mode 100644 sound/soc/codecs/wm2000.h + create mode 100644 sound/soc/codecs/wm8904.c + create mode 100644 sound/soc/codecs/wm8904.h + create mode 100644 sound/soc/codecs/wm8955.c + create mode 100644 sound/soc/codecs/wm8955.h + create mode 100644 sound/soc/codecs/wm8978.c + create mode 100644 sound/soc/codecs/wm8978.h + create mode 100644 sound/soc/codecs/wm8994.c + create mode 100644 sound/soc/codecs/wm8994.h + create mode 100644 sound/soc/imx/imx-pcm-dma-mx2.c + create mode 100644 sound/soc/imx/imx-pcm-fiq.c + create mode 100644 sound/soc/imx/imx-ssi.c + create mode 100644 sound/soc/imx/imx-ssi.h + delete mode 100644 sound/soc/imx/mx1_mx2-pcm.c + delete mode 100644 sound/soc/imx/mx1_mx2-pcm.h + delete mode 100644 sound/soc/imx/mx27vis_wm8974.c + delete mode 100644 sound/soc/imx/mxc-ssi.c + delete mode 100644 sound/soc/imx/mxc-ssi.h + create mode 100644 sound/soc/imx/phycore-ac97.c + create mode 100644 sound/soc/s3c24xx/s3c-ac97.c + create mode 100644 sound/soc/s3c24xx/s3c-ac97.h + delete mode 100644 sound/soc/s3c24xx/s3c2443-ac97.c + delete mode 100644 sound/soc/s3c24xx/s3c24xx-ac97.h + create mode 100644 sound/soc/s3c24xx/smdk_wm9713.c + create mode 100644 sound/soc/sh/fsi-da7210.c + create mode 100644 sound/soc/sh/migor.c + create mode 100644 sound/soc/sh/siu.h + create mode 100644 sound/soc/sh/siu_dai.c + create mode 100644 sound/soc/sh/siu_pcm.c + create mode 100644 sound/usb/ua101.c +Merging cpufreq/next +$ git merge cpufreq/next +Auto-merging drivers/acpi/processor_core.c +Merge made by recursive. + Documentation/cpu-freq/pcc-cpufreq.txt | 207 ++++++++++ + arch/x86/kernel/cpu/cpufreq/Kconfig | 14 + + arch/x86/kernel/cpu/cpufreq/Makefile | 1 + + arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c | 620 +++++++++++++++++++++++++++++ + drivers/acpi/processor_core.c | 2 + + 5 files changed, 844 insertions(+), 0 deletions(-) + create mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt + create mode 100644 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +Merging quilt/rr +$ git merge quilt/rr +Resolved 'drivers/char/hvc_console.c' using previous resolution. +Resolved 'drivers/char/hvc_console.h' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/char/hvc_console.c +CONFLICT (content): Merge conflict in drivers/char/hvc_console.c +Auto-merging drivers/char/hvc_console.h +CONFLICT (content): Merge conflict in drivers/char/hvc_console.h +Auto-merging drivers/virtio/virtio_ring.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 60a4eb7] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + Documentation/lguest/lguest.c | 1 - + MAINTAINERS | 6 + + drivers/block/virtio_blk.c | 61 ++- + drivers/char/Kconfig | 8 + + drivers/char/virtio_console.c | 1578 +++++++++++++++++++++++++++++++++++---- + drivers/virtio/virtio_balloon.c | 109 +++- + drivers/virtio/virtio_pci.c | 2 +- + drivers/virtio/virtio_ring.c | 34 +- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 82 ++- + include/linux/kmemcheck.h | 2 +- + include/linux/virtio_balloon.h | 15 + + include/linux/virtio_blk.h | 13 + + include/linux/virtio_config.h | 5 +- + include/linux/virtio_console.h | 30 +- + 16 files changed, 1734 insertions(+), 216 deletions(-) +Merging mmc/next +$ git merge mmc/next +Already up-to-date. +Merging tmio-mmc/linux-next +$ git merge tmio-mmc/linux-next +Resolved 'drivers/mfd/asic3.c' using previous resolution. +Resolved 'drivers/mfd/t7l66xb.c' using previous resolution. +Resolved 'drivers/mfd/tc6387xb.c' using previous resolution. +Resolved 'drivers/mfd/tc6393xb.c' using previous resolution. +Resolved 'drivers/mfd/tmio_core.c' using previous resolution. +Resolved 'drivers/mmc/host/tmio_mmc.c' using previous resolution. +Resolved 'drivers/mmc/host/tmio_mmc.h' using previous resolution. +Resolved 'include/linux/mfd/tmio.h' using previous resolution. +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/mfd/asic3.c +CONFLICT (content): Merge conflict in drivers/mfd/asic3.c +Auto-merging drivers/mfd/t7l66xb.c +CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c +Auto-merging drivers/mfd/tc6387xb.c +CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c +Auto-merging drivers/mfd/tc6393xb.c +CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c +Auto-merging drivers/mfd/tmio_core.c +CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/core.h +Auto-merging drivers/mmc/host/tmio_mmc.c +CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c +Auto-merging drivers/mmc/host/tmio_mmc.h +CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h +Auto-merging include/linux/mfd/tmio.h +CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d33756] Merge remote branch 'tmio-mmc/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/mfd/asic3.c | 4 ++++ + drivers/mmc/core/core.c | 4 ++-- + drivers/mmc/core/core.h | 10 ++++++++++ + drivers/mmc/host/tmio_mmc.c | 19 ++++++++++++++----- + 4 files changed, 30 insertions(+), 7 deletions(-) +Merging input/next +$ git merge input/next +Recorded preimage for 'Documentation/feature-removal-schedule.txt' +Auto-merging Documentation/feature-removal-schedule.txt +CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt +Auto-merging drivers/input/input.c +Auto-merging include/linux/input.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master 2bbc502] Merge remote branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 23 + + Documentation/input/sentelic.txt | 124 ++++- + arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h | 14 +- + drivers/char/keyboard.c | 29 +- + drivers/input/evdev.c | 2 + + drivers/input/gameport/emu10k1-gp.c | 2 +- + drivers/input/gameport/fm801-gp.c | 2 +- + drivers/input/gameport/gameport.c | 98 ++-- + drivers/input/gameport/ns558.c | 2 +- + drivers/input/input.c | 90 +++- + drivers/input/joydev.c | 34 +- + drivers/input/joystick/xpad.c | 253 ++++++---- + drivers/input/keyboard/Kconfig | 33 +- + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/adp5588-keys.c | 6 +- + drivers/input/keyboard/atkbd.c | 283 +++++----- + drivers/input/keyboard/ep93xx_keypad.c | 40 +- + drivers/input/keyboard/gpio_keys.c | 318 +++++++++++- + drivers/input/keyboard/imx_keypad.c | 594 +++++++++++++++++++++ + drivers/input/keyboard/qt2160.c | 2 +- + drivers/input/keyboard/sh_keysc.c | 145 ++++-- + drivers/input/misc/apanel.c | 2 +- + drivers/input/misc/rotary_encoder.c | 14 + + drivers/input/misc/uinput.c | 4 +- + drivers/input/mouse/hgpk.c | 4 - + drivers/input/serio/pcips2.c | 2 +- + drivers/input/serio/serio.c | 131 ++--- + drivers/input/serio/xilinx_ps2.c | 6 +- + drivers/input/tablet/gtco.c | 2 +- + drivers/input/tablet/wacom.h | 5 +- + drivers/input/tablet/wacom_sys.c | 10 +- + drivers/input/tablet/wacom_wac.c | 342 +++++++----- + drivers/input/touchscreen/Kconfig | 6 +- + drivers/input/touchscreen/elo.c | 225 +++++---- + drivers/input/touchscreen/mainstone-wm97xx.c | 3 + + drivers/input/touchscreen/tsc2007.c | 2 +- + drivers/input/touchscreen/usbtouchscreen.c | 317 +++++++++++- + drivers/input/touchscreen/zylonite-wm97xx.c | 3 + + drivers/input/xen-kbdfront.c | 2 +- + drivers/macintosh/Kconfig | 7 +- + drivers/macintosh/mac_hid.c | 266 +++++++--- + include/linux/gameport.h | 1 - + include/linux/gpio_keys.h | 1 + + include/linux/input.h | 14 +- + include/linux/input/sh_keysc.h | 7 +- + include/linux/kbd_kern.h | 3 - + include/linux/serio.h | 1 - + 47 files changed, 2562 insertions(+), 913 deletions(-) + create mode 100644 drivers/input/keyboard/imx_keypad.c +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Auto-merging drivers/block/virtio_blk.c +Merge made by recursive. + block/blk-settings.c | 26 +++++++++----------------- + drivers/block/DAC960.c | 2 +- + drivers/block/sx8.c | 2 +- + drivers/block/ub.c | 2 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/block/xsysace.c | 2 +- + fs/partitions/check.c | 7 ++++--- + include/linux/blkdev.h | 17 +++++------------ + 9 files changed, 24 insertions(+), 38 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/snapshot.txt | 44 ++++++++++++ + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-delay.c | 8 +- + drivers/md/dm-ioctl.c | 9 ++- + drivers/md/dm-linear.c | 3 +- + drivers/md/dm-log.c | 3 +- + drivers/md/dm-mpath.c | 111 +++++++++++++++++++----------- + drivers/md/dm-raid1.c | 12 ++-- + drivers/md/dm-snap.c | 8 +-- + drivers/md/dm-stripe.c | 3 +- + drivers/md/dm-table.c | 12 +-- + drivers/md/dm-uevent.c | 7 +-- + drivers/md/dm.c | 14 +--- + include/linux/device-mapper.h | 5 +- + 14 files changed, 149 insertions(+), 93 deletions(-) +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Auto-merging drivers/net/pcmcia/smc91c92_cs.c +Auto-merging drivers/pcmcia/Kconfig +Auto-merging drivers/pcmcia/Makefile +Auto-merging drivers/pcmcia/rsrc_mgr.c +Auto-merging drivers/pcmcia/rsrc_nonstatic.c +Auto-merging drivers/serial/serial_cs.c +Merge made by recursive. + Documentation/pcmcia/locking.txt | 118 ++++++++ + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/net/pcmcia/smc91c92_cs.c | 6 +- + drivers/pcmcia/Kconfig | 11 +- + drivers/pcmcia/Makefile | 4 +- + drivers/pcmcia/at91_cf.c | 2 - + drivers/pcmcia/bfin_cf_pcmcia.c | 2 +- + drivers/pcmcia/cardbus.c | 175 +---------- + drivers/pcmcia/cistpl.c | 606 +++++++++++++++++++++----------------- + drivers/pcmcia/cs.c | 312 +++++++++----------- + drivers/pcmcia/cs_internal.h | 89 ++---- + drivers/pcmcia/ds.c | 333 ++++++++++++--------- + drivers/pcmcia/electra_cf.c | 2 +- + drivers/pcmcia/i82365.h | 4 +- + drivers/pcmcia/m32r_cfc.c | 2 +- + drivers/pcmcia/m8xx_pcmcia.c | 4 +- + drivers/pcmcia/o2micro.h | 45 ++- + drivers/pcmcia/omap_cf.c | 2 - + drivers/pcmcia/pcmcia_ioctl.c | 42 ++-- + drivers/pcmcia/pcmcia_resource.c | 169 +++++++++--- + drivers/pcmcia/rsrc_mgr.c | 48 --- + drivers/pcmcia/rsrc_nonstatic.c | 283 +++++++++++------- + drivers/pcmcia/socket_sysfs.c | 196 ++----------- + drivers/pcmcia/yenta_socket.c | 5 + + drivers/serial/serial_cs.c | 7 +- + include/pcmcia/ds.h | 2 +- + include/pcmcia/ss.h | 40 ++- + 27 files changed, 1256 insertions(+), 1255 deletions(-) + create mode 100644 Documentation/pcmcia/locking.txt +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/Kconfig | 4 +- + drivers/power/bq27x00_battery.c | 94 ++++++++++++++++++++++----------------- + drivers/power/da9030_battery.c | 2 +- + drivers/power/wm97xx_battery.c | 4 +- + 4 files changed, 58 insertions(+), 46 deletions(-) +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 75 +++++++++++++++++++++++--------------------- + drivers/leds/led-class.c | 2 +- + drivers/leds/leds-ss4200.c | 2 +- + 3 files changed, 41 insertions(+), 38 deletions(-) +Merging backlight/for-mm +$ git merge backlight/for-mm +Merge made by recursive. + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/l4f00242t03.c | 257 +++++++++++++++++++++++++++++++++ + drivers/video/backlight/progear_bl.c | 16 ++- + include/linux/backlight.h | 8 +- + include/linux/spi/l4f00242t03.h | 31 ++++ + 6 files changed, 312 insertions(+), 8 deletions(-) + create mode 100644 drivers/video/backlight/l4f00242t03.c + create mode 100644 include/linux/spi/l4f00242t03.h +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/mips/kernel/traps.c +Auto-merging arch/powerpc/kernel/kgdb.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/sh/kernel/kgdb.c +Auto-merging drivers/char/keyboard.c +Auto-merging drivers/input/input.c +Auto-merging drivers/serial/8250.c +Auto-merging include/linux/input.h +Auto-merging kernel/Makefile +Removing kernel/kgdb.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 773 +++++++--- + Documentation/kernel-parameters.txt | 34 +- + MAINTAINERS | 6 +- + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 5 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/traps.c | 13 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/kernel/kgdb.c | 11 +- + arch/powerpc/kernel/traps.c | 7 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/include/asm/processor.h | 2 + + arch/x86/kernel/cpu/common.c | 29 +- + arch/x86/kernel/early_printk.c | 8 + + arch/x86/kernel/kgdb.c | 103 +- + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/traps.c | 20 +- + drivers/char/Makefile | 1 + + drivers/char/kdb_keyboard.c | 204 +++ + drivers/char/kdb_keyboard.h | 143 ++ + drivers/char/keyboard.c | 29 +- + drivers/gpu/drm/drm_fb_helper.c | 93 +- + drivers/gpu/drm/i915/intel_display.c | 114 ++- + drivers/input/input.c | 15 + + drivers/misc/kgdbts.c | 6 + + drivers/serial/8250.c | 4 +- + drivers/serial/amba-pl011.c | 6 +- + drivers/serial/kgdboc.c | 134 ++- + drivers/serial/sh-sci.c | 6 +- + drivers/serial/sunzilog.c | 50 + + drivers/usb/early/ehci-dbgp.c | 184 ++- + drivers/video/console/fbcon.c | 7 + + fs/proc/internal.h | 4 +- + fs/proc/meminfo.c | 15 +- + fs/proc/mmu.c | 8 +- + include/asm-generic/kmap_types.h | 3 +- + include/drm/drm_crtc_helper.h | 2 + + include/drm/drm_fb_helper.h | 4 + + include/linux/input.h | 10 + + include/linux/kdb.h | 117 ++ + include/linux/kgdb.h | 91 +- + include/linux/serial_core.h | 1 + + include/linux/swap.h | 2 + + init/main.c | 2 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 8 + + kernel/debug/debug_core.c | 1005 ++++++++++++ + kernel/debug/debug_core.h | 81 + + kernel/debug/gdbstub.c | 1022 ++++++++++++ + kernel/debug/kdb/.gitignore | 1 + + kernel/debug/kdb/Makefile | 24 + + kernel/debug/kdb/kdb_bp.c | 564 +++++++ + kernel/debug/kdb/kdb_bt.c | 210 +++ + kernel/debug/kdb/kdb_cmds | 35 + + kernel/debug/kdb/kdb_debugger.c | 169 ++ + kernel/debug/kdb/kdb_io.c | 826 ++++++++++ + kernel/debug/kdb/kdb_main.c | 2855 +++++++++++++++++++++++++++++++++ + kernel/debug/kdb/kdb_private.h | 312 ++++ + kernel/debug/kdb/kdb_support.c | 991 ++++++++++++ + kernel/debug/kms_hooks.c | 62 + + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1763 -------------------- + kernel/module.c | 4 + + kernel/panic.c | 7 +- + kernel/printk.c | 25 + + kernel/sched.c | 7 +- + kernel/signal.c | 40 + + lib/Kconfig.kgdb | 24 +- + mm/swapfile.c | 10 +- + 74 files changed, 10280 insertions(+), 2120 deletions(-) + create mode 100644 drivers/char/kdb_keyboard.c + create mode 100644 drivers/char/kdb_keyboard.h + create mode 100644 include/linux/kdb.h + create mode 100644 kernel/debug/Makefile + create mode 100644 kernel/debug/debug_core.c + create mode 100644 kernel/debug/debug_core.h + create mode 100644 kernel/debug/gdbstub.c + create mode 100644 kernel/debug/kdb/.gitignore + create mode 100644 kernel/debug/kdb/Makefile + create mode 100644 kernel/debug/kdb/kdb_bp.c + create mode 100644 kernel/debug/kdb/kdb_bt.c + create mode 100644 kernel/debug/kdb/kdb_cmds + create mode 100644 kernel/debug/kdb/kdb_debugger.c + create mode 100644 kernel/debug/kdb/kdb_io.c + create mode 100644 kernel/debug/kdb/kdb_main.c + create mode 100644 kernel/debug/kdb/kdb_private.h + create mode 100644 kernel/debug/kdb/kdb_support.c + create mode 100644 kernel/debug/kms_hooks.c + delete mode 100644 kernel/kgdb.c +Merging slab/for-next +$ git merge slab/for-next +Merge made by recursive. + arch/x86/mm/kmemcheck/kmemcheck.c | 2 +- + arch/x86/mm/kmemcheck/shadow.c | 16 ++- + arch/x86/mm/kmemcheck/shadow.h | 2 + + include/linux/slub_def.h | 27 ++-- + mm/slab.c | 90 +++++++++--- + mm/slub.c | 308 +++++++++--------------------------- + 6 files changed, 176 insertions(+), 269 deletions(-) +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Resolved 'drivers/mfd/Makefile' using previous resolution. +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/leds/Kconfig +Removing drivers/mfd/88pm8607.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/power/Kconfig +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/video/backlight/Makefile +Removing include/linux/mfd/88pm8607.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 277bc19] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/Kconfig | 14 + + drivers/gpio/Makefile | 2 + + drivers/gpio/wm8350-gpiolib.c | 181 ++ + drivers/gpio/wm8994-gpio.c | 204 ++ + drivers/input/misc/88pm860x_onkey.c | 155 ++ + drivers/input/misc/Kconfig | 10 + + drivers/input/misc/Makefile | 1 + + drivers/input/touchscreen/88pm860x-ts.c | 236 ++ + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 1 + + drivers/leds/Kconfig | 7 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-88pm860x.c | 325 +++ + drivers/mfd/88pm8607.c | 302 --- + drivers/mfd/88pm860x-core.c | 740 ++++++ + drivers/mfd/88pm860x-i2c.c | 236 ++ + drivers/mfd/Kconfig | 61 +- + drivers/mfd/Makefile | 7 +- + drivers/mfd/ab3100-core.c | 54 +- + drivers/mfd/ab3100-otp.c | 13 +- + drivers/mfd/htc-i2cpld.c | 710 +++++ + drivers/mfd/max8925-core.c | 656 +++++ + drivers/mfd/max8925-i2c.c | 211 ++ + drivers/mfd/sm501.c | 7 +- + drivers/mfd/t7l66xb.c | 4 +- + drivers/mfd/tc6393xb.c | 2 +- + drivers/mfd/twl-core.c | 21 +- + drivers/mfd/twl4030-power.c | 2 +- + drivers/mfd/wm8350-irq.c | 155 +- + drivers/mfd/wm8994-core.c | 537 ++++ + drivers/power/Kconfig | 7 + + drivers/power/Makefile | 1 + + drivers/power/max8925_power.c | 534 ++++ + drivers/power/wm8350_power.c | 26 +- + drivers/regulator/88pm8607.c | 318 +-- + drivers/regulator/Kconfig | 8 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/max8925-regulator.c | 306 +++ + drivers/regulator/wm8350-regulator.c | 2 +- + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-max8925.c | 314 +++ + drivers/rtc/rtc-wm8350.c | 11 +- + drivers/video/backlight/88pm860x_bl.c | 304 +++ + drivers/video/backlight/Kconfig | 13 + + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/max8925_bl.c | 200 ++ + include/linux/htcpld.h | 24 + + include/linux/i2c/twl.h | 7 +- + include/linux/mfd/88pm8607.h | 217 -- + include/linux/mfd/88pm860x.h | 375 +++ + include/linux/mfd/ab3100.h | 3 - + include/linux/mfd/max8925.h | 253 ++ + include/linux/mfd/wm8350/core.h | 47 +- + include/linux/mfd/wm8350/gpio.h | 1 + + include/linux/mfd/wm8350/rtc.h | 1 + + include/linux/mfd/wm8994/core.h | 54 + + include/linux/mfd/wm8994/gpio.h | 72 + + include/linux/mfd/wm8994/pdata.h | 97 + + include/linux/mfd/wm8994/registers.h | 4292 +++++++++++++++++++++++++++++++ + sound/soc/codecs/wm8350.c | 8 +- + 61 files changed, 11433 insertions(+), 943 deletions(-) + create mode 100644 drivers/gpio/wm8350-gpiolib.c + create mode 100644 drivers/gpio/wm8994-gpio.c + create mode 100644 drivers/input/misc/88pm860x_onkey.c + create mode 100644 drivers/input/touchscreen/88pm860x-ts.c + create mode 100644 drivers/leds/leds-88pm860x.c + delete mode 100644 drivers/mfd/88pm8607.c + create mode 100644 drivers/mfd/88pm860x-core.c + create mode 100644 drivers/mfd/88pm860x-i2c.c + create mode 100644 drivers/mfd/htc-i2cpld.c + create mode 100644 drivers/mfd/max8925-core.c + create mode 100644 drivers/mfd/max8925-i2c.c + create mode 100644 drivers/mfd/wm8994-core.c + create mode 100644 drivers/power/max8925_power.c + create mode 100644 drivers/regulator/max8925-regulator.c + create mode 100644 drivers/rtc/rtc-max8925.c + create mode 100644 drivers/video/backlight/88pm860x_bl.c + create mode 100644 drivers/video/backlight/max8925_bl.c + create mode 100644 include/linux/htcpld.h + delete mode 100644 include/linux/mfd/88pm8607.h + create mode 100644 include/linux/mfd/88pm860x.h + create mode 100644 include/linux/mfd/max8925.h + create mode 100644 include/linux/mfd/wm8994/core.h + create mode 100644 include/linux/mfd/wm8994/gpio.h + create mode 100644 include/linux/mfd/wm8994/pdata.h + create mode 100644 include/linux/mfd/wm8994/registers.h +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/drm_fb_helper.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_irq.c' using previous resolution. +Auto-merging drivers/gpu/drm/drm_fb_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 892dcdf] Merge remote branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/lp3971.c +Auto-merging drivers/regulator/wm8350-regulator.c +Merge made by recursive. + drivers/regulator/Kconfig | 29 ++- + drivers/regulator/Makefile | 3 + + drivers/regulator/core.c | 79 +++++- + drivers/regulator/dummy.c | 66 +++++ + drivers/regulator/dummy.h | 31 +++ + drivers/regulator/fixed.c | 11 + + drivers/regulator/lp3971.c | 10 +- + drivers/regulator/max8649.c | 408 +++++++++++++++++++++++++++++ + drivers/regulator/mc13783-regulator.c | 465 ++++++++++++++++++++++++++++++--- + drivers/regulator/wm8350-regulator.c | 46 ++++ + drivers/regulator/wm8994-regulator.c | 304 +++++++++++++++++++++ + include/linux/mfd/mc13783.h | 2 + + include/linux/regulator/consumer.h | 4 +- + include/linux/regulator/driver.h | 6 + + include/linux/regulator/fixed.h | 2 + + include/linux/regulator/max8649.h | 44 +++ + 16 files changed, 1461 insertions(+), 49 deletions(-) + create mode 100644 drivers/regulator/dummy.c + create mode 100644 drivers/regulator/dummy.h + create mode 100644 drivers/regulator/max8649.c + create mode 100644 drivers/regulator/wm8994-regulator.c + create mode 100644 include/linux/regulator/max8649.h +Merging security-testing/next +$ git merge security-testing/next +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging kernel/printk.c +Auto-merging security/security.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Removing security/tomoyo/realpath.h +Auto-merging security/tomoyo/tomoyo.c +Removing security/tomoyo/tomoyo.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 02c1e9f] Merge remote branch 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + fs/proc/kmsg.c | 14 +- + include/linux/security.h | 12 +- + include/linux/syslog.h | 52 +++ + kernel/capability.c | 4 +- + kernel/printk.c | 52 ++-- + security/commoncap.c | 9 +- + security/security.c | 38 +- + security/selinux/avc.c | 22 +- + security/selinux/hooks.c | 26 +- + security/selinux/include/security.h | 13 +- + security/selinux/selinuxfs.c | 12 +- + security/selinux/ss/context.h | 12 - + security/selinux/ss/mls.c | 48 ++-- + security/selinux/ss/mls.h | 2 + + security/selinux/ss/mls_types.h | 7 +- + security/selinux/ss/policydb.c | 127 ++++--- + security/selinux/ss/policydb.h | 10 +- + security/selinux/ss/services.c | 316 ++++++++-------- + security/smack/smack_lsm.c | 4 +- + security/tomoyo/Makefile | 2 +- + security/tomoyo/common.c | 370 +++++++----------- + security/tomoyo/common.h | 530 ++++++++++++++++++++------ + security/tomoyo/domain.c | 391 +++++++------------ + security/tomoyo/file.c | 731 +++++++++++++++++------------------ + security/tomoyo/gc.c | 370 ++++++++++++++++++ + security/tomoyo/realpath.c | 269 ++++---------- + security/tomoyo/realpath.h | 66 ---- + security/tomoyo/tomoyo.c | 142 +++++--- + security/tomoyo/tomoyo.h | 94 ----- + 29 files changed, 2017 insertions(+), 1728 deletions(-) + create mode 100644 include/linux/syslog.h + create mode 100644 security/tomoyo/gc.c + delete mode 100644 security/tomoyo/realpath.h + delete mode 100644 security/tomoyo/tomoyo.h +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +Merge made by recursive. +Merging uwb/for-upstream +$ git merge uwb/for-upstream +Merge made by recursive. + drivers/uwb/hwa-rc.c | 2 +- + drivers/uwb/i1480/dfu/usb.c | 6 ++- + drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ + 3 files changed, 67 insertions(+), 47 deletions(-) +Merging watchdog/master +$ git merge watchdog/master +Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging drivers/watchdog/Kconfig +Merge made by recursive. + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 + + arch/arm/mach-ep93xx/ts72xx.c | 21 ++ + drivers/watchdog/Kconfig | 16 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/bfin_wdt.c | 13 +- + drivers/watchdog/iTCO_wdt.c | 19 +- + drivers/watchdog/max63xx_wdt.c | 397 +++++++++++++++++++++ + drivers/watchdog/ts72xx_wdt.c | 520 ++++++++++++++++++++++++++++ + 8 files changed, 974 insertions(+), 16 deletions(-) + create mode 100644 drivers/watchdog/max63xx_wdt.c + create mode 100644 drivers/watchdog/ts72xx_wdt.c +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Merge made by recursive. + drivers/pci/dmar.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging cputime/cputime +$ git merge cputime/cputime +Already up-to-date. +Merging osd/linux-next +$ git merge osd/linux-next +Auto-merging fs/exofs/exofs.h +Auto-merging fs/exofs/inode.c +Merge made by recursive. + drivers/scsi/osd/osd_initiator.c | 4 + + fs/exofs/common.h | 39 +++ + fs/exofs/exofs.h | 54 +++- + fs/exofs/inode.c | 194 ++++++++----- + fs/exofs/ios.c | 575 ++++++++++++++++++++++++++++++++------ + fs/exofs/super.c | 121 ++++++-- + 6 files changed, 784 insertions(+), 203 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Merge made by recursive. + Documentation/video4linux/videobuf | 341 ++++++++++++++++++++++++++++++++++++ + 1 files changed, 341 insertions(+), 0 deletions(-) + create mode 100644 Documentation/video4linux/videobuf +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Resolved 'arch/arm/mach-u300/include/mach/debug-macro.S' using previous resolution. +Resolved 'drivers/net/qlge/qlge_ethtool.c' using previous resolution. +Resolved 'drivers/net/qlge/qlge_main.c' using previous resolution. +Auto-merging arch/arm/common/clkdev.c +Auto-merging arch/arm/mach-davinci/include/mach/i2c.h +Auto-merging arch/arm/mach-omap2/board-3630sdp.c +Auto-merging arch/arm/mach-omap2/board-zoom-peripherals.c +Auto-merging arch/arm/mach-u300/core.c +Auto-merging arch/arm/mach-u300/include/mach/debug-macro.S +CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S +Auto-merging arch/s390/kernel/sclp.S +Auto-merging crypto/Kconfig +Auto-merging drivers/acpi/dock.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-sff.c +Auto-merging drivers/ata/pata_pcmcia.c +Auto-merging drivers/char/hvc_iseries.c +Auto-merging drivers/char/tty_io.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bios.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h +Auto-merging drivers/input/serio/i8042.c +Auto-merging drivers/media/dvb/bt8xx/bt878.c +Auto-merging drivers/media/video/gspca/ov519.c +Auto-merging drivers/mfd/sm501.c +Auto-merging drivers/net/chelsio/sge.c +Auto-merging drivers/net/cs89x0.c +Auto-merging drivers/net/cxgb3/sge.c +Auto-merging drivers/net/davinci_emac.c +Auto-merging drivers/net/e1000e/82571.c +Auto-merging drivers/net/e1000e/lib.c +Auto-merging drivers/net/igb/igb_main.c +Auto-merging drivers/net/ks8851.c +Auto-merging drivers/net/qlge/qlge_ethtool.c +CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c +Auto-merging drivers/net/qlge/qlge_main.c +CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c +Auto-merging drivers/net/smsc9420.c +Auto-merging drivers/net/spider_net.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/tehuti.c +Auto-merging drivers/net/tokenring/tms380tr.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/typhoon.c +Auto-merging drivers/net/ucc_geth.c +Auto-merging drivers/net/wimax/i2400m/fw.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Auto-merging drivers/net/wireless/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2800usb.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00debug.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00dev.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c +Auto-merging drivers/net/wireless/rt2x00/rt61pci.c +Auto-merging drivers/net/wireless/rt2x00/rt73usb.c +Auto-merging drivers/net/wireless/zd1211rw/zd_mac.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/scsi/libfc/fc_fcp.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/serial/samsung.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/jbd/transaction.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/extent_map.c +Auto-merging fs/udf/inode.c +Auto-merging include/linux/sched.h +Auto-merging mm/slub.c +Auto-merging net/ipv4/tcp_timer.c +Auto-merging net/mac80211/mesh_plink.c +Auto-merging net/netfilter/nf_conntrack_sip.c +Auto-merging net/netfilter/xt_hashlimit.c +Auto-merging security/selinux/avc.c +Auto-merging sound/pci/rme9652/hdspm.c +Auto-merging sound/soc/codecs/wm8990.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0c72d06] Merge remote branch 'trivial/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/mtdnand.tmpl | 6 +++--- + Documentation/DocBook/v4l/common.xml | 2 +- + Documentation/DocBook/v4l/vidioc-g-parm.xml | 2 +- + Documentation/arm/Samsung-S3C24XX/CPUfreq.txt | 4 ++-- + Documentation/driver-model/platform.txt | 2 +- + Documentation/eisa.txt | 2 +- + Documentation/filesystems/proc.txt | 2 +- + Documentation/hwmon/abituguru | 2 +- + Documentation/input/rotary-encoder.txt | 2 +- + Documentation/laptops/00-INDEX | 4 ++++ + Documentation/networking/skfp.txt | 2 +- + .../networking/timestamping/timestamping.c | 2 +- + Documentation/pnp.txt | 13 ++++++------- + Documentation/power/runtime_pm.txt | 2 +- + Documentation/s390/kvm.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 10 +++++----- + Documentation/trace/ftrace.txt | 2 +- + arch/arm/boot/bootp/init.S | 2 +- + arch/arm/common/clkdev.c | 2 +- + arch/arm/mach-at91/include/mach/at91_mci.h | 2 +- + arch/arm/mach-davinci/include/mach/i2c.h | 2 +- + arch/arm/mach-ep93xx/micro9.c | 2 +- + arch/arm/mach-nomadik/board-nhk8815.c | 2 +- + arch/arm/mach-s3c2410/include/mach/spi-gpio.h | 2 +- + arch/arm/mach-s5pc100/setup-sdhci.c | 4 ++-- + arch/arm/mach-u300/core.c | 4 ++-- + arch/arm/mach-u300/include/mach/debug-macro.S | 2 +- + arch/arm/plat-s3c24xx/include/plat/cpu-freq-core.h | 2 +- + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/nand.h | 2 +- + .../plat-samsung/include/plat/regs-usb-hsotg-phy.h | 2 +- + arch/blackfin/include/asm/nand.h | 4 ++-- + arch/cris/arch-v10/lib/old_checksum.c | 2 +- + arch/cris/arch-v32/mm/tlb.c | 2 +- + arch/h8300/include/asm/io.h | 2 +- + arch/ia64/sn/kernel/setup.c | 2 +- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/include/asm/fbio.h | 2 +- + arch/m68k/include/asm/io_no.h | 2 +- + arch/powerpc/boot/dts/kmeter1.dts | 2 +- + arch/powerpc/kernel/legacy_serial.c | 2 +- + arch/powerpc/mm/init_32.c | 2 +- + arch/s390/crypto/sha_common.c | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/kernel/sclp.S | 2 +- + arch/sh/kernel/cpu/clock.c | 2 +- + arch/sparc/include/asm/fbio.h | 2 +- + arch/sparc/kernel/leon_kernel.c | 2 +- + arch/sparc/kernel/perf_event.c | 2 +- + arch/x86/crypto/twofish-i586-asm_32.S | 10 +++++----- + arch/x86/crypto/twofish-x86_64-asm_64.S | 20 ++++++++++---------- + arch/x86/kernel/apic/apic_flat_64.c | 2 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/pci-calgary_64.c | 2 +- + arch/x86/kernel/pci-dma.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 2 +- + arch/x86/xen/smp.c | 2 +- + arch/xtensa/kernel/entry.S | 4 ++-- + block/bsg.c | 2 +- + crypto/Kconfig | 4 ++-- + drivers/acpi/dock.c | 2 +- + drivers/acpi/proc.c | 2 +- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-sff.c | 2 +- + drivers/ata/pata_acpi.c | 2 +- + drivers/ata/pata_hpt3x3.c | 2 +- + drivers/ata/pata_pcmcia.c | 2 +- + drivers/block/drbd/drbd_int.h | 4 ++-- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/char/agp/intel-agp.c | 2 +- + drivers/char/applicom.c | 2 +- + drivers/char/hvc_iseries.c | 2 +- + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/char/ip2/i2hw.h | 2 +- + drivers/char/pty.c | 2 +- + drivers/char/random.c | 2 +- + drivers/char/serial167.c | 2 +- + drivers/char/tty_io.c | 2 +- + drivers/char/vt.c | 6 +----- + drivers/crypto/hifn_795x.c | 2 +- + drivers/dma/coh901318_lli.h | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/via/via_irq.c | 4 ++-- + drivers/i2c/algos/i2c-algo-pcf.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/ieee1394/pcilynx.c | 2 +- + drivers/infiniband/hw/ehca/ehca_qes.h | 4 ++-- + drivers/infiniband/hw/ehca/ehca_reqs.c | 2 +- + drivers/input/misc/yealink.h | 2 +- + drivers/input/serio/i8042.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 4 ++-- + drivers/isdn/i4l/isdn_common.c | 2 +- + drivers/isdn/mISDN/dsp_core.c | 4 ++-- + drivers/isdn/mISDN/l1oip_core.c | 4 ++-- + drivers/isdn/sc/hardware.h | 2 +- + drivers/media/dvb/dvb-core/dvb_frontend.h | 8 ++++---- + drivers/media/video/bt8xx/bttv-cards.c | 4 ++-- + drivers/media/video/gspca/ov519.c | 2 +- + drivers/media/video/pwc/philips.txt | 2 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/tea6420.c | 2 +- + drivers/message/i2o/iop.c | 2 +- + drivers/mfd/sm501.c | 8 ++++---- + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/mmc/host/mxcmmc.c | 2 +- + drivers/mtd/chips/jedec_probe.c | 2 +- + drivers/mtd/maps/plat-ram.c | 2 +- + drivers/mtd/nand/bcm_umi_nand.c | 4 ++-- + drivers/mtd/nand/mxc_nand.c | 2 +- + drivers/net/atlx/atl2.h | 2 +- + drivers/net/chelsio/sge.c | 2 +- + drivers/net/cs89x0.c | 2 +- + drivers/net/cxgb3/sge.c | 4 ++-- + drivers/net/davinci_emac.c | 2 +- + drivers/net/e1000e/82571.c | 2 +- + drivers/net/e1000e/lib.c | 2 +- + drivers/net/igb/igb_main.c | 2 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/ks8851.c | 2 +- + drivers/net/qlge/qlge_ethtool.c | 2 +- + drivers/net/qlge/qlge_main.c | 2 +- + drivers/net/sfc/regs.h | 2 +- + drivers/net/skfp/ess.c | 2 +- + drivers/net/smsc9420.c | 2 +- + drivers/net/spider_net.c | 4 ++-- + drivers/net/sungem.c | 2 +- + drivers/net/tehuti.c | 2 +- + drivers/net/tokenring/tms380tr.c | 4 ++-- + drivers/net/tun.c | 2 +- + drivers/net/typhoon.c | 6 +++--- + drivers/net/ucc_geth.c | 2 +- + drivers/net/wan/cosa.c | 10 +++++----- + drivers/net/wan/hdlc_cisco.c | 8 ++++---- + drivers/net/wan/hdlc_x25.c | 4 ++-- + drivers/net/wimax/i2400m/fw.c | 2 +- + drivers/net/wimax/i2400m/i2400m.h | 2 +- + drivers/net/wimax/i2400m/sdio.c | 4 ++-- + drivers/net/wimax/i2400m/usb.c | 4 ++-- + drivers/net/wireless/ath/ar9170/main.c | 2 +- + drivers/net/wireless/iwmc3200wifi/lmac.h | 2 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 4 ++-- + drivers/net/wireless/rt2x00/rt2800usb.c | 4 ++-- + drivers/net/wireless/rt2x00/rt2x00debug.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 2 +- + drivers/net/wireless/rt2x00/rt61pci.c | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 6 +++--- + drivers/net/wireless/zd1211rw/zd_mac.c | 2 +- + drivers/platform/x86/thinkpad_acpi.c | 4 ++-- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/sclp.c | 2 +- + drivers/scsi/a100u2w.c | 2 +- + drivers/scsi/initio.c | 2 +- + drivers/scsi/libfc/fc_fcp.c | 4 ++-- + drivers/scsi/lpfc/lpfc_els.c | 4 ++-- + drivers/scsi/lpfc/lpfc_scsi.c | 4 ++-- + drivers/scsi/pcmcia/nsp_cs.h | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_sas.c | 2 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/sd.c | 2 +- + drivers/serial/samsung.c | 2 +- + drivers/spi/spi_s3c24xx.c | 2 +- + drivers/usb/musb/davinci.c | 2 +- + drivers/usb/musb/musb_regs.h | 2 +- + drivers/usb/serial/cypress_m8.c | 2 +- + drivers/usb/serial/opticon.c | 2 +- + drivers/usb/serial/symbolserial.c | 2 +- + drivers/usb/wusbcore/wusbhc.h | 2 +- + drivers/uwb/i1480/i1480-est.c | 4 ++-- + drivers/uwb/uwbd.c | 2 +- + drivers/video/68328fb.c | 2 +- + drivers/video/mbx/mbxfb.c | 2 +- + drivers/video/omap/lcdc.c | 2 +- + drivers/video/pm2fb.c | 2 +- + drivers/video/s1d13xxxfb.c | 4 ++-- + drivers/video/sm501fb.c | 2 +- + drivers/video/sstfb.c | 2 +- + drivers/w1/w1.c | 4 ++-- + drivers/zorro/zorro.ids | 2 +- + fs/affs/bitmap.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/bio.c | 7 +++---- + fs/buffer.c | 2 +- + fs/cifs/asn1.c | 2 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/dlm/member.c | 2 +- + fs/ext3/super.c | 2 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fuse/inode.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/jbd/transaction.c | 2 +- + fs/locks.c | 2 +- + fs/mpage.c | 2 +- + fs/namei.c | 2 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/extent_map.c | 2 +- + fs/qnx4/inode.c | 3 ++- + fs/reiserfs/bitmap.c | 2 +- + fs/udf/inode.c | 2 +- + include/linux/dm9000.h | 2 +- + include/linux/hil.h | 16 ++++++++-------- + include/linux/lru_cache.h | 2 +- + include/linux/mmzone.h | 2 +- + include/linux/sched.h | 2 +- + include/math-emu/op-common.h | 2 +- + include/media/davinci/vpfe_capture.h | 2 +- + include/net/irda/irttp.h | 2 +- + kernel/audit.c | 2 +- + kernel/irq/chip.c | 2 +- + kernel/irq/devres.c | 4 ++-- + kernel/ksysfs.c | 2 +- + kernel/kthread.c | 2 +- + kernel/params.c | 6 +++--- + kernel/sched_cpupri.c | 2 +- + kernel/trace/ring_buffer.c | 4 ++-- + kernel/trace/trace.h | 2 +- + mm/highmem.c | 2 +- + mm/slub.c | 2 +- + net/ipv4/tcp_timer.c | 2 +- + net/mac80211/mesh_plink.c | 2 +- + net/netfilter/nf_conntrack_sip.c | 4 ++-- + net/netfilter/xt_hashlimit.c | 2 +- + net/sctp/sm_sideeffect.c | 2 +- + scripts/gfp-translate | 2 +- + security/selinux/avc.c | 6 +++--- + sound/pci/rme9652/hdspm.c | 2 +- + sound/soc/codecs/wm8990.c | 2 +- + tools/perf/perf.c | 2 +- + tools/perf/util/hist.c | 2 +- + 240 files changed, 330 insertions(+), 331 deletions(-) + mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c + mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c + mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c + mode change 100755 => 100644 drivers/mtd/inftlcore.c +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pcie/portdrv_core.c +Auto-merging drivers/pci/probe.c +Auto-merging kernel/power/Kconfig +Merge made by recursive. + Documentation/ABI/testing/sysfs-devices-power | 79 ++++++++++++++ + Documentation/ABI/testing/sysfs-power | 13 +++ + Documentation/feature-removal-schedule.txt | 11 ++ + drivers/base/power/main.c | 143 +++++++++++++++++++++++-- + drivers/base/power/power.h | 6 +- + drivers/base/power/runtime.c | 45 ++++++++ + drivers/base/power/sysfs.c | 100 +++++++++++++++++ + drivers/pci/pci.c | 1 + + drivers/pci/pcie/portdrv_core.c | 1 + + drivers/pci/probe.c | 1 + + drivers/scsi/hosts.c | 4 + + drivers/scsi/scsi_sysfs.c | 4 + + drivers/usb/core/driver.c | 8 ++ + drivers/usb/core/endpoint.c | 1 + + drivers/usb/core/hcd-pci.c | 127 ++++++++++++++++++++++- + drivers/usb/core/hub.c | 1 + + drivers/usb/core/message.c | 1 + + include/linux/device.h | 17 +++ + include/linux/pm.h | 6 + + include/linux/pm_runtime.h | 4 + + include/linux/resume-trace.h | 7 ++ + include/linux/usb.h | 1 + + kernel/power/Kconfig | 14 +++ + kernel/power/main.c | 31 +++++- + kernel/power/snapshot.c | 2 +- + kernel/power/swap.c | 4 - + kernel/power/user.c | 23 ++++- + 27 files changed, 630 insertions(+), 25 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-devices-power +Merging bluetooth/master +$ git merge bluetooth/master +Auto-merging drivers/bluetooth/btmrvl_sdio.c +Merge made by recursive. + drivers/bluetooth/ath3k.c | 2 ++ + drivers/bluetooth/bcm203x.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 4 ++-- + 3 files changed, 5 insertions(+), 3 deletions(-) +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Resolved 'fs/notify/inotify/inotify_user.c' using previous resolution. +Resolved 'kernel/audit_tree.c' using previous resolution. +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging fs/exec.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfsd/vfs.c +Removing fs/notify/inotify/inotify.c +Auto-merging fs/notify/inotify/inotify_user.c +CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c +Auto-merging fs/open.c +Auto-merging include/linux/Kbuild +Auto-merging include/linux/fs.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c2483a] Merge remote branch 'fsnotify/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 8 - + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/ia32/sys_ia32.c | 9 + + arch/x86/include/asm/sys_ia32.h | 3 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/compat.c | 5 +- + fs/exec.c | 4 +- + fs/inode.c | 8 +- + fs/namei.c | 2 +- + fs/namespace.c | 5 + + fs/nfsd/vfs.c | 4 +- + fs/notify/Kconfig | 1 + + fs/notify/Makefile | 4 +- + fs/notify/dnotify/dnotify.c | 198 +++---- + fs/notify/fanotify/Kconfig | 26 + + fs/notify/fanotify/Makefile | 1 + + fs/notify/fanotify/fanotify.c | 255 ++++++++ + fs/notify/fanotify/fanotify_user.c | 776 +++++++++++++++++++++++ + fs/notify/fsnotify.c | 141 ++++- + fs/notify/fsnotify.h | 33 +- + fs/notify/group.c | 178 +++--- + fs/notify/inode_mark.c | 309 +++------- + fs/notify/inotify/Kconfig | 15 - + fs/notify/inotify/Makefile | 1 - + fs/notify/inotify/inotify.c | 933 ---------------------------- + fs/notify/inotify/inotify.h | 7 +- + fs/notify/inotify/inotify_fsnotify.c | 114 +++- + fs/notify/inotify/inotify_user.c | 305 ++++++---- + fs/notify/mark.c | 325 ++++++++++ + fs/notify/notification.c | 180 +++--- + fs/notify/vfsmount_mark.c | 176 ++++++ + fs/open.c | 3 +- + fs/read_write.c | 8 +- + include/asm-generic/fcntl.h | 8 + + include/linux/Kbuild | 1 + + include/linux/dnotify.h | 1 + + include/linux/fanotify.h | 105 ++++ + include/linux/fs.h | 16 +- + include/linux/fsnotify.h | 166 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 174 ------ + include/linux/mount.h | 6 +- + include/linux/security.h | 1 + + include/linux/syscalls.h | 5 + + init/Kconfig | 10 +- + kernel/Makefile | 5 +- + kernel/audit.c | 1 - + kernel/audit.h | 26 +- + kernel/audit_tree.c | 232 ++++--- + kernel/audit_watch.c | 295 +++++---- + kernel/auditfilter.c | 39 +- + kernel/auditsc.c | 10 +- + kernel/sys_ni.c | 4 + + kernel/sysctl.c | 1 + + security/security.c | 16 +- + 57 files changed, 3092 insertions(+), 2248 deletions(-) + create mode 100644 fs/notify/fanotify/Kconfig + create mode 100644 fs/notify/fanotify/Makefile + create mode 100644 fs/notify/fanotify/fanotify.c + create mode 100644 fs/notify/fanotify/fanotify_user.c + delete mode 100644 fs/notify/inotify/inotify.c + create mode 100644 fs/notify/mark.c + create mode 100644 fs/notify/vfsmount_mark.c + create mode 100644 include/linux/fanotify.h +Merging irda/for-next +$ git merge irda/for-next +Resolved 'drivers/net/irda/irda-usb.c' using previous resolution. +Auto-merging drivers/net/irda/irda-usb.c +CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b8f6250] Merge remote branch 'irda/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/net/irda/irda-usb.c | 9 +++++---- + 1 files changed, 5 insertions(+), 4 deletions(-) +Merging hwlat/for-linus +$ git merge hwlat/for-linus +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2a2f00d] Merge remote branch 'hwlat/for-linus' +$ git diff -M --stat --summary HEAD^.. + Documentation/hwlat_detector.txt | 64 ++ + MAINTAINERS | 9 + + drivers/misc/Kconfig | 29 + + drivers/misc/Makefile | 1 + + drivers/misc/hwlat_detector.c | 1208 ++++++++++++++++++++++++++++++++++++++ + 5 files changed, 1311 insertions(+), 0 deletions(-) + create mode 100644 Documentation/hwlat_detector.txt + create mode 100644 drivers/misc/hwlat_detector.c +Merging drbd/for-jens +$ git merge drbd/for-jens +Merge made by recursive. + drivers/block/drbd/drbd_bitmap.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) +Merging catalin/for-next +$ git merge catalin/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'include/linux/Kbuild' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/net/Kconfig +Auto-merging drivers/net/Makefile +Auto-merging include/linux/Kbuild +CONFLICT (content): Merge conflict in include/linux/Kbuild +Auto-merging lib/Kconfig +CONFLICT (content): Merge conflict in lib/Kconfig +Auto-merging lib/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 20e2745] Merge remote branch 'alacrity/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 25 + + arch/x86/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/vbus-enet.c | 1560 +++++++++++++++++++++++++++++++++++++++++++ + drivers/vbus/Kconfig | 25 + + drivers/vbus/Makefile | 6 + + drivers/vbus/bus-proxy.c | 247 +++++++ + drivers/vbus/pci-bridge.c | 1015 ++++++++++++++++++++++++++++ + include/linux/Kbuild | 4 + + include/linux/ioq.h | 414 ++++++++++++ + include/linux/shm_signal.h | 189 ++++++ + include/linux/vbus_driver.h | 83 +++ + include/linux/vbus_pci.h | 145 ++++ + include/linux/venet.h | 133 ++++ + lib/Kconfig | 21 + + lib/Makefile | 2 + + lib/ioq.c | 304 +++++++++ + lib/shm_signal.c | 196 ++++++ + 20 files changed, 4387 insertions(+), 0 deletions(-) + create mode 100644 drivers/net/vbus-enet.c + create mode 100644 drivers/vbus/Kconfig + create mode 100644 drivers/vbus/Makefile + create mode 100644 drivers/vbus/bus-proxy.c + create mode 100644 drivers/vbus/pci-bridge.c + create mode 100644 include/linux/ioq.h + create mode 100644 include/linux/shm_signal.h + create mode 100644 include/linux/vbus_driver.h + create mode 100644 include/linux/vbus_pci.h + create mode 100644 include/linux/venet.h + create mode 100644 lib/ioq.c + create mode 100644 lib/shm_signal.c +Merging i7core_edac/linux_next +$ git merge i7core_edac/linux_next +Auto-merging Documentation/edac.txt +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging drivers/edac/edac_core.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 42 +- + drivers/edac/Kconfig | 13 + + drivers/edac/Makefile | 2 + + drivers/edac/edac_core.h | 23 +- + drivers/edac/edac_mc_sysfs.c | 175 +++- + drivers/edac/edac_mce.c | 61 ++ + drivers/edac/i7core_edac.c | 1977 ++++++++++++++++++++++++++++++++++++++ + include/linux/edac_mce.h | 31 + + include/linux/pci.h | 1 + + include/linux/pci_ids.h | 19 + + 13 files changed, 2465 insertions(+), 44 deletions(-) + create mode 100644 drivers/edac/edac_mce.c + create mode 100644 drivers/edac/i7core_edac.c + create mode 100644 include/linux/edac_mce.h +Merging devicetree/next-devicetree +$ git merge devicetree/next-devicetree +Resolved 'arch/microblaze/include/asm/prom.h' using previous resolution. +Resolved 'drivers/serial/pmac_zilog.c' using previous resolution. +Auto-merging arch/microblaze/Kconfig +Auto-merging arch/microblaze/include/asm/prom.h +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h +Auto-merging arch/powerpc/Kconfig +Auto-merging drivers/char/hvc_beat.c +Auto-merging drivers/gpu/drm/radeon/radeon_combios.c +Auto-merging drivers/macintosh/adb.c +Auto-merging drivers/net/mace.c +Auto-merging drivers/serial/pmac_zilog.c +CONFLICT (content): Merge conflict in drivers/serial/pmac_zilog.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 68e2a07] Merge remote branch 'devicetree/next-devicetree' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/prom.h | 20 - + arch/microblaze/kernel/of_platform.c | 2 +- + arch/microblaze/kernel/prom.c | 990 +------------------------ + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/prom.h | 18 - + arch/powerpc/kernel/of_platform.c | 2 +- + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/prom.c | 887 ++--------------------- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- + arch/powerpc/platforms/cell/cbe_powerbutton.c | 2 +- + arch/powerpc/platforms/cell/ras.c | 2 +- + arch/powerpc/platforms/cell/spu_manage.c | 6 +- + arch/powerpc/platforms/pasemi/cpufreq.c | 4 +- + arch/powerpc/platforms/powermac/cpufreq_32.c | 14 +- + arch/powerpc/platforms/powermac/cpufreq_64.c | 14 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/platforms/powermac/pfunc_core.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 12 +- + arch/powerpc/platforms/powermac/time.c | 8 +- + arch/powerpc/platforms/powermac/udbg_scc.c | 6 +- + arch/powerpc/sysdev/grackle.c | 4 +- + arch/sparc/kernel/devices.c | 2 +- + arch/sparc/kernel/of_device_32.c | 2 +- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/prom.h | 3 - + arch/sparc/kernel/prom_common.c | 18 +- + arch/sparc/kernel/smp_64.c | 2 +- + drivers/char/hvc_beat.c | 2 +- + drivers/gpu/drm/radeon/radeon_combios.c | 44 +- + drivers/macintosh/adb.c | 4 +- + drivers/macintosh/therm_pm72.c | 8 +- + drivers/macintosh/therm_windtunnel.c | 2 +- + drivers/macintosh/via-pmu-backlight.c | 8 +- + drivers/macintosh/via-pmu.c | 8 +- + drivers/macintosh/windfarm_core.c | 6 +- + drivers/macintosh/windfarm_cpufreq_clamp.c | 6 +- + drivers/macintosh/windfarm_lm75_sensor.c | 6 +- + drivers/macintosh/windfarm_max6690_sensor.c | 6 +- + drivers/macintosh/windfarm_pm112.c | 2 +- + drivers/macintosh/windfarm_pm121.c | 2 +- + drivers/macintosh/windfarm_pm81.c | 4 +- + drivers/macintosh/windfarm_pm91.c | 2 +- + drivers/macintosh/windfarm_smu_sensors.c | 6 +- + drivers/net/mace.c | 2 +- + drivers/of/Kconfig | 8 + + drivers/of/Makefile | 1 + + drivers/of/base.c | 318 ++++++++- + drivers/of/fdt.c | 590 +++++++++++++++ + drivers/of/gpio.c | 13 +- + drivers/of/of_i2c.c | 4 +- + drivers/of/of_mdio.c | 8 +- + drivers/of/of_spi.c | 6 +- + drivers/sbus/char/openprom.c | 10 +- + drivers/serial/pmac_zilog.c | 8 +- + drivers/video/aty/aty128fb.c | 14 +- + drivers/video/aty/atyfb_base.c | 10 +- + drivers/video/aty/radeon_backlight.c | 6 +- + fs/proc/proc_devtree.c | 7 +- + include/linux/of.h | 62 ++- + include/linux/of_fdt.h | 75 ++- + sound/aoa/fabrics/layout.c | 2 +- + sound/ppc/awacs.c | 24 +- + sound/ppc/burgundy.c | 4 +- + sound/ppc/pmac.c | 18 +- + sound/soc/fsl/efika-audio-fabric.c | 2 +- + sound/soc/fsl/pcm030-audio-fabric.c | 2 +- + 67 files changed, 1245 insertions(+), 2097 deletions(-) + create mode 100644 drivers/of/fdt.c +Merging spi/next-spi +$ git merge spi/next-spi +Auto-merging arch/arm/mach-omap2/devices.c +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/spi/spi_sh_msiof.c +Merge made by recursive. + arch/arm/mach-omap2/devices.c | 5 + + arch/arm/plat-omap/include/plat/mcspi.h | 29 +- + drivers/spi/Kconfig | 23 +- + drivers/spi/Makefile | 3 + + drivers/spi/coldfire_qspi.c | 640 ++++++++++++++++ + drivers/spi/davinci_spi.c | 1255 +++++++++++++++++++++++++++++++ + drivers/spi/dw_spi.c | 111 ++- + drivers/spi/dw_spi_mmio.c | 147 ++++ + drivers/spi/dw_spi_pci.c | 2 + + drivers/spi/mpc52xx_psc_spi.c | 2 +- + drivers/spi/mpc52xx_spi.c | 2 +- + drivers/spi/spi_imx.c | 2 +- + drivers/spi/spi_mpc8xxx.c | 8 +- + drivers/spi/spi_ppc4xx.c | 2 +- + drivers/spi/spi_s3c64xx.c | 89 +-- + drivers/spi/spi_sh_msiof.c | 2 +- + drivers/spi/spi_stmp.c | 2 +- + drivers/spi/xilinx_spi.c | 28 +- + drivers/spi/xilinx_spi_of.c | 2 +- + include/linux/spi/dw_spi.h | 5 + + 20 files changed, 2258 insertions(+), 101 deletions(-) + create mode 100644 drivers/spi/coldfire_qspi.c + create mode 100644 drivers/spi/davinci_spi.c + create mode 100644 drivers/spi/dw_spi_mmio.c +Merging limits/writable_limits +$ git merge limits/writable_limits +Resolved 'arch/x86/ia32/ia32entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_32.h' using previous resolution. +Resolved 'arch/x86/include/asm/unistd_64.h' using previous resolution. +Resolved 'arch/x86/kernel/syscall_table_32.S' using previous resolution. +Auto-merging Documentation/filesystems/proc.txt +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/proc/base.c +Auto-merging include/linux/security.h +Auto-merging include/linux/syscalls.h +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 946c0cc] Merge remote branch 'limits/writable_limits' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/proc.txt | 11 +++ + arch/x86/ia32/ia32entry.S | 2 + + arch/x86/include/asm/unistd_32.h | 4 +- + arch/x86/include/asm/unistd_64.h | 4 + + arch/x86/kernel/syscall_table_32.S | 2 + + fs/proc/base.c | 101 ++++++++++++++++++++++-- + include/asm-generic/unistd.h | 6 +- + include/linux/posix-timers.h | 2 +- + include/linux/resource.h | 2 + + include/linux/security.h | 9 ++- + include/linux/syscalls.h | 4 + + kernel/compat.c | 98 +++++++++++++++++------- + kernel/posix-cpu-timers.c | 10 +- + kernel/sys.c | 151 ++++++++++++++++++++++++++++++------ + security/capability.c | 3 +- + security/security.c | 5 +- + security/selinux/hooks.c | 10 ++- + 17 files changed, 346 insertions(+), 78 deletions(-) +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Auto-merging arch/arm/mach-omap2/board-3430sdp.c +Merge made by recursive. + arch/arm/mach-omap2/board-3430sdp.c | 4 - + arch/arm/plat-omap/include/plat/display.h | 5 + + drivers/video/omap/lcd_ams_delta.c | 93 ++++- + drivers/video/omap/omapfb_main.c | 7 +- + drivers/video/omap2/displays/Kconfig | 18 + + drivers/video/omap2/displays/Makefile | 3 + + .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 120 +++++ + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 35 -- + drivers/video/omap2/displays/panel-taal.c | 4 +- + .../video/omap2/displays/panel-toppoly-tdo35s.c | 112 +++++ + .../video/omap2/displays/panel-tpo-td043mtea1.c | 489 ++++++++++++++++++++ + drivers/video/omap2/dss/Kconfig | 26 +- + drivers/video/omap2/dss/core.c | 74 +++- + drivers/video/omap2/dss/dispc.c | 2 - + drivers/video/omap2/dss/dpi.c | 59 ++- + drivers/video/omap2/dss/dsi.c | 129 +++--- + drivers/video/omap2/dss/dss.c | 42 ++- + drivers/video/omap2/dss/dss.h | 19 +- + drivers/video/omap2/dss/venc.c | 4 +- + drivers/video/omap2/omapfb/Kconfig | 2 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 24 + + drivers/video/omap2/omapfb/omapfb.h | 3 + + include/linux/omapfb.h | 9 + + 23 files changed, 1139 insertions(+), 144 deletions(-) + create mode 100644 drivers/video/omap2/displays/panel-sharp-lq043t1dg01.c + create mode 100644 drivers/video/omap2/displays/panel-toppoly-tdo35s.c + create mode 100644 drivers/video/omap2/displays/panel-tpo-td043mtea1.c +Merging als/for-next +$ git merge als/for-next +Recorded preimage for 'drivers/misc/Kconfig' +Auto-merging MAINTAINERS +Auto-merging drivers/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/i2c/Kconfig +Auto-merging drivers/i2c/Makefile +Removing drivers/i2c/chips/Kconfig +Removing drivers/i2c/chips/Makefile +Auto-merging drivers/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/misc/Kconfig'. +[master 34f3393] Merge remote branch 'als/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-als | 18 +++++ + MAINTAINERS | 8 ++ + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/als/Kconfig | 34 +++++++++ + drivers/als/Makefile | 9 ++ + drivers/als/als_sys.c | 116 +++++++++++++++++++++++++++++ + drivers/{misc => als}/isl29003.c | 46 ++++++++---- + drivers/{i2c/chips => als}/tsl2550.c | 96 +++++++++++++++--------- + drivers/i2c/Kconfig | 1 - + drivers/i2c/Makefile | 2 +- + drivers/i2c/chips/Kconfig | 19 ----- + drivers/i2c/chips/Makefile | 18 ----- + drivers/misc/Kconfig | 10 --- + drivers/misc/Makefile | 1 - + include/linux/als_sys.h | 35 +++++++++ + 16 files changed, 314 insertions(+), 102 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-als + create mode 100644 drivers/als/Kconfig + create mode 100644 drivers/als/Makefile + create mode 100644 drivers/als/als_sys.c + rename drivers/{misc => als}/isl29003.c (90%) + rename drivers/{i2c/chips => als}/tsl2550.c (82%) + delete mode 100644 drivers/i2c/chips/Kconfig + delete mode 100644 drivers/i2c/chips/Makefile + create mode 100644 include/linux/als_sys.h +Merging tip/auto-latest +$ git merge tip/auto-latest +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/mips/mm/init.c +Removing arch/x86/include/asm/atomic_32.h +Removing arch/x86/include/asm/atomic_64.h +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/vmiclock_32.c +Auto-merging drivers/char/agp/intel-agp.c +Auto-merging include/linux/elf.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/ksysfs.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/resource.c +Auto-merging kernel/sched.c +Auto-merging kernel/sched_cpupri.c +Auto-merging kernel/sys.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_syscalls.c +Auto-merging lib/Kconfig.debug +Auto-merging tools/perf/builtin-top.c +Auto-merging tools/perf/perf.c +Removing tools/perf/util/data_map.c +Auto-merging tools/perf/util/event.c +Merge made by recursive. + Documentation/RCU/00-INDEX | 8 +- + Documentation/RCU/RTFP.txt | 58 +- + Documentation/RCU/checklist.txt | 200 ++- + Documentation/RCU/rcu.txt | 48 +- + Documentation/RCU/stallwarn.txt | 58 + + Documentation/RCU/torture.txt | 12 + + Documentation/RCU/whatisRCU.txt | 3 +- + Documentation/feature-removal-schedule.txt | 15 - + Documentation/filesystems/dentry-locking.txt | 3 +- + Documentation/kernel-parameters.txt | 3 + + Documentation/trace/kprobetrace.txt | 57 +- + MAINTAINERS | 13 +- + arch/mips/mm/init.c | 2 +- + arch/powerpc/kernel/perf_callchain.c | 3 - + arch/score/mm/init.c | 2 +- + arch/sh/kernel/perf_callchain.c | 3 - + arch/um/sys-x86_64/Makefile | 3 +- + arch/x86/Kconfig.cpu | 2 +- + arch/x86/ia32/ia32_aout.c | 2 +- + arch/x86/include/asm/alternative.h | 7 +- + arch/x86/include/asm/atomic.h | 299 ++++- + arch/x86/include/asm/atomic64_32.h | 160 ++ + arch/x86/include/asm/atomic64_64.h | 224 +++ + arch/x86/include/asm/atomic_32.h | 415 ----- + arch/x86/include/asm/atomic_64.h | 485 ------ + arch/x86/include/asm/debugreg.h | 3 + + arch/x86/include/asm/fixmap.h | 16 +- + arch/x86/include/asm/i387.h | 8 +- + arch/x86/include/asm/irq.h | 1 + + arch/x86/include/asm/irq_vectors.h | 48 +- + arch/x86/include/asm/nmi.h | 1 - + arch/x86/include/asm/page_types.h | 1 - + arch/x86/include/asm/perf_event.h | 16 +- + arch/x86/include/asm/ptrace-abi.h | 38 + + arch/x86/include/asm/ptrace.h | 4 - + arch/x86/include/asm/rwsem.h | 92 +- + arch/x86/include/asm/smp.h | 9 + + arch/x86/include/asm/stacktrace.h | 2 - + arch/x86/include/asm/uaccess_64.h | 21 +- + arch/x86/include/asm/uv/bios.h | 7 +- + arch/x86/include/asm/uv/uv_hub.h | 3 +- + arch/x86/include/asm/xsave.h | 2 + + arch/x86/kernel/alternative.c | 4 +- + arch/x86/kernel/apic/io_apic.c | 56 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 15 +- + arch/x86/kernel/bios_uv.c | 20 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 186 ++- + arch/x86/kernel/cpu/mtrr/amd.c | 2 +- + arch/x86/kernel/cpu/mtrr/centaur.c | 2 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 2 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/main.c | 6 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 6 +- + arch/x86/kernel/cpu/perf_event.c | 989 ++++++++--- + arch/x86/kernel/cpu/perfctr-watchdog.c | 11 - + arch/x86/kernel/dumpstack_32.c | 5 - + arch/x86/kernel/dumpstack_64.c | 5 - + arch/x86/kernel/e820.c | 8 + + arch/x86/kernel/hw_breakpoint.c | 10 +- + arch/x86/kernel/i387.c | 79 + + arch/x86/kernel/irqinit.c | 35 +- + arch/x86/kernel/process.c | 7 + + arch/x86/kernel/process_32.c | 6 - + arch/x86/kernel/process_64.c | 6 - + arch/x86/kernel/ptrace.c | 77 +- + arch/x86/kernel/setup.c | 19 +- + arch/x86/kernel/smpboot.c | 6 +- + arch/x86/kernel/traps.c | 3 + + arch/x86/kernel/tsc.c | 2 +- + arch/x86/kernel/vmiclock_32.c | 6 +- + arch/x86/kernel/x8664_ksyms_64.c | 3 +- + arch/x86/kernel/xsave.c | 1 + + arch/x86/lib/Makefile | 3 +- + arch/x86/lib/cache-smp.c | 19 + + arch/x86/lib/copy_user_64.S | 6 - + arch/x86/lib/memcpy_64.S | 23 +- + arch/x86/lib/memset_64.S | 18 +- + arch/x86/lib/rwsem_64.S | 81 + + arch/x86/mm/ioremap.c | 41 +- + arch/x86/mm/mmap.c | 4 +- + drivers/char/agp/intel-agp.c | 15 +- + drivers/char/nvram.c | 3 - + include/linux/bitops.h | 18 +- + include/linux/elf.h | 1 + + include/linux/ftrace_event.h | 23 +- + include/linux/irq.h | 2 +- + include/linux/kernel.h | 5 +- + include/linux/list.h | 14 + + include/linux/mm.h | 2 + + include/linux/perf_event.h | 49 +- + include/linux/plist.h | 4 +- + include/linux/rcutiny.h | 12 + + include/linux/rcutree.h | 3 + + include/linux/sched.h | 25 +- + include/linux/syscalls.h | 10 +- + include/linux/timex.h | 3 - + include/trace/events/lock.h | 29 +- + include/trace/ftrace.h | 221 +-- + include/trace/syscall.h | 8 +- + init/Kconfig | 94 +- + kernel/futex_compat.c | 6 +- + kernel/ksysfs.c | 8 - + kernel/perf_event.c | 571 ++++--- + kernel/rcutorture.c | 80 +- + kernel/rcutree.c | 108 +- + kernel/rcutree.h | 20 +- + kernel/rcutree_plugin.h | 22 + + kernel/resource.c | 13 + + kernel/sched.c | 2098 ++--------------------- + kernel/sched_cpupri.c | 4 +- + kernel/sched_fair.c | 1678 ++++++++++++++++++- + kernel/sched_idletask.c | 23 +- + kernel/sched_rt.c | 44 +- + kernel/smp.c | 8 +- + kernel/srcu.c | 2 +- + kernel/sys.c | 5 - + kernel/time/ntp.c | 10 +- + kernel/trace/Makefile | 4 +- + kernel/trace/trace.c | 144 ++- + kernel/trace/trace.h | 2 +- + kernel/trace/trace_event_profile.c | 52 +- + kernel/trace/trace_events.c | 77 +- + kernel/trace/trace_events_filter.c | 4 +- + kernel/trace/trace_export.c | 87 +- + kernel/trace/trace_functions_graph.c | 27 +- + kernel/trace/trace_kprobe.c | 300 ++-- + kernel/trace/trace_syscalls.c | 182 +-- + kernel/user.c | 305 ---- + lib/Kconfig.debug | 4 +- + lib/hweight.c | 7 + + scripts/recordmcount.pl | 39 +- + tools/perf/.gitignore | 1 + + tools/perf/Documentation/perf-archive.txt | 22 + + tools/perf/Documentation/perf-buildid-cache.txt | 33 + + tools/perf/Documentation/perf-probe.txt | 20 + + tools/perf/Documentation/perf.txt | 2 +- + tools/perf/Makefile | 16 +- + tools/perf/builtin-annotate.c | 12 +- + tools/perf/builtin-buildid-cache.c | 133 ++ + tools/perf/builtin-buildid-list.c | 40 +- + tools/perf/builtin-diff.c | 74 +- + tools/perf/builtin-help.c | 5 +- + tools/perf/builtin-kmem.c | 46 +- + tools/perf/builtin-lock.c | 678 ++++++++ + tools/perf/builtin-probe.c | 79 +- + tools/perf/builtin-record.c | 26 +- + tools/perf/builtin-report.c | 58 +- + tools/perf/builtin-sched.c | 32 +- + tools/perf/builtin-stat.c | 106 +- + tools/perf/builtin-timechart.c | 25 +- + tools/perf/builtin-top.c | 36 +- + tools/perf/builtin-trace.c | 29 +- + tools/perf/builtin.h | 2 + + tools/perf/command-list.txt | 2 + + tools/perf/design.txt | 8 +- + tools/perf/perf-archive.sh | 32 + + tools/perf/perf.c | 25 +- + tools/perf/util/data_map.c | 252 --- + tools/perf/util/debug.c | 1 + + tools/perf/util/debugfs.c | 17 +- + tools/perf/util/debugfs.h | 2 +- + tools/perf/util/event.c | 214 ++- + tools/perf/util/event.h | 79 +- + tools/perf/util/header.c | 300 +++- + tools/perf/util/header.h | 9 +- + tools/perf/util/include/linux/hash.h | 5 + + tools/perf/util/map.h | 73 + + tools/perf/util/parse-events.c | 48 +- + tools/perf/util/probe-event.c | 105 ++- + tools/perf/util/probe-event.h | 2 + + tools/perf/util/probe-finder.c | 203 +++- + tools/perf/util/probe-finder.h | 33 + + tools/perf/util/session.c | 409 +++++- + tools/perf/util/session.h | 42 +- + tools/perf/util/string.c | 65 +- + tools/perf/util/symbol.c | 398 +++-- + tools/perf/util/symbol.h | 33 +- + tools/perf/util/thread.h | 9 + + tools/perf/util/trace-event-info.c | 64 +- + tools/perf/util/trace-event-parse.c | 9 + + tools/perf/util/trace-event-read.c | 4 +- + tools/perf/util/util.c | 94 + + tools/perf/util/util.h | 3 + + tools/perf/util/values.c | 1 + + 184 files changed, 8458 insertions(+), 6164 deletions(-) + create mode 100644 Documentation/RCU/stallwarn.txt + create mode 100644 arch/x86/include/asm/atomic64_32.h + create mode 100644 arch/x86/include/asm/atomic64_64.h + delete mode 100644 arch/x86/include/asm/atomic_32.h + delete mode 100644 arch/x86/include/asm/atomic_64.h + create mode 100644 arch/x86/lib/cache-smp.c + create mode 100644 arch/x86/lib/rwsem_64.S + create mode 100644 tools/perf/Documentation/perf-archive.txt + create mode 100644 tools/perf/Documentation/perf-buildid-cache.txt + create mode 100644 tools/perf/builtin-buildid-cache.c + create mode 100644 tools/perf/builtin-lock.c + create mode 100644 tools/perf/perf-archive.sh + delete mode 100644 tools/perf/util/data_map.c + create mode 100644 tools/perf/util/include/linux/hash.h + create mode 100644 tools/perf/util/map.h + create mode 100644 tools/perf/util/util.c +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging oprofile/for-next +$ git merge oprofile/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/blackfin/mach-common/entry.S +Auto-merging arch/powerpc/include/asm/local.h +Auto-merging arch/x86/include/asm/system.h +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/edac/amd64_edac.c +Auto-merging drivers/md/raid5.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/xfs/xfs_mount.h +Auto-merging include/acpi/processor.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/nfs_fs_sb.h +Auto-merging kernel/module.c +Auto-merging kernel/rcutorture.c +Auto-merging kernel/sched.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace_functions_graph.c +Merge made by recursive. + arch/alpha/include/asm/local.h | 17 --- + arch/blackfin/mach-common/entry.S | 4 +- + arch/cris/arch-v10/kernel/entry.S | 2 +- + arch/cris/arch-v32/mm/mmu.S | 2 +- + arch/ia64/include/asm/percpu.h | 4 +- + arch/ia64/kernel/ia64_ksyms.c | 4 +- + arch/ia64/mm/discontig.c | 2 +- + arch/m32r/include/asm/local.h | 25 ---- + arch/microblaze/include/asm/entry.h | 2 +- + arch/mips/include/asm/local.h | 25 ---- + arch/parisc/lib/fixup.S | 8 +- + arch/powerpc/include/asm/local.h | 25 ---- + arch/sparc/kernel/nmi.c | 7 +- + arch/sparc/kernel/rtrap_64.S | 8 +- + arch/x86/include/asm/local.h | 37 ------ + arch/x86/include/asm/percpu.h | 119 +++++++++++++++------ + arch/x86/include/asm/system.h | 8 +- + arch/x86/kernel/apic/nmi.c | 6 +- + arch/x86/kernel/head_32.S | 6 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/xen/xen-asm_32.S | 4 +- + crypto/cryptd.c | 2 +- + drivers/acpi/processor_perflib.c | 2 +- + drivers/dma/dmaengine.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/md/raid5.c | 2 +- + drivers/md/raid5.h | 2 +- + fs/ext4/ext4.h | 2 +- + fs/nfs/iostat.h | 4 +- + fs/xfs/xfs_mount.h | 2 +- + include/acpi/processor.h | 2 +- + include/asm-generic/local.h | 19 --- + include/asm-generic/percpu.h | 18 ++- + include/linux/blktrace_api.h | 4 +- + include/linux/compiler.h | 2 +- + include/linux/dmaengine.h | 2 +- + include/linux/genhd.h | 2 +- + include/linux/kexec.h | 2 +- + include/linux/mm.h | 4 - + include/linux/mmzone.h | 12 +-- + include/linux/module.h | 37 +++---- + include/linux/mount.h | 2 +- + include/linux/nfs_fs_sb.h | 2 +- + include/linux/percpu-defs.h | 40 ++++--- + include/linux/percpu.h | 44 +++++--- + include/linux/percpu_counter.h | 2 +- + include/linux/srcu.h | 2 +- + include/linux/vmstat.h | 8 +- + kernel/kexec.c | 2 +- + kernel/module.c | 29 +++--- + kernel/rcutorture.c | 8 +- + kernel/sched.c | 4 +- + kernel/stop_machine.c | 2 +- + kernel/trace/ring_buffer.c | 1 + + kernel/trace/ring_buffer_benchmark.c | 1 + + kernel/trace/trace.c | 6 +- + kernel/trace/trace_functions_graph.c | 4 +- + mm/page_alloc.c | 202 ++++++++++++---------------------- + mm/percpu.c | 36 +++--- + mm/vmstat.c | 15 ++- + 60 files changed, 354 insertions(+), 499 deletions(-) +$ git am -3 ../patches/0001-slab-update-for-percpu-API-change.patch +Applying: slab: update for percpu API change +$ git reset HEAD^ +Unstaged changes after reset: +M mm/slub.c +$ git add . +$ git commit -v -a --amend +[master 012dacc] Merge remote branch 'percpu/for-next' +$ git am -3 ../patches/0001-percpu-macvlan-merge-fix.patch +Applying: percpu: macvlan merge fix +Using index info to reconstruct a base tree... +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 insertions(+), 1 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Recorded preimage for 'drivers/base/power/main.c' +Recorded preimage for 'drivers/pcmcia/ds.c' +Recorded preimage for 'include/linux/device.h' +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/sh/kernel/cpu/sh4/sq.c +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merging drivers/base/class.c +Auto-merging drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging drivers/firewire/core-device.c +Auto-merging drivers/firmware/iscsi_ibft.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/md/dm-sysfs.c +Auto-merging drivers/mtd/ubi/build.c +Auto-merging drivers/net/ibmveth.c +Auto-merging drivers/net/iseries_veth.c +Auto-merging drivers/pci/bus.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/slot.c +Auto-merging drivers/pcmcia/ds.c +CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c +Auto-merging drivers/usb/core/driver.c +Auto-merging drivers/video/sh_mobile_lcdcfb.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/sys.c +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging include/linux/usb.h +Auto-merging kernel/params.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/sched.c +Auto-merging mm/slub.c +Auto-merging net/bridge/br_private.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/base/power/main.c'. +Recorded resolution for 'drivers/pcmcia/ds.c'. +Recorded resolution for 'include/linux/device.h'. +[master 0899b8c] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + Documentation/HOWTO | 113 +++----- + Documentation/kobject.txt | 2 +- + arch/arm/mach-pxa/corgi_ssp.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 2 +- + arch/arm/mach-s3c2410/h1940-bluetooth.c | 2 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 2 +- + arch/ia64/kernel/topology.c | 2 +- + arch/mips/txx9/generic/7segled.c | 5 +- + arch/powerpc/kernel/cacheinfo.c | 2 +- + arch/s390/kernel/smp.c | 8 +- + arch/s390/kernel/time.c | 49 +++- + arch/sh/kernel/cpu/sh4/sq.c | 2 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + block/blk-integrity.c | 2 +- + block/blk-sysfs.c | 2 +- + block/elevator.c | 2 +- + drivers/auxdisplay/cfag12864bfb.c | 2 +- + drivers/base/Kconfig | 55 +++- + drivers/base/bus.c | 26 +- + drivers/base/class.c | 16 +- + drivers/base/core.c | 18 +- + drivers/base/cpu.c | 105 +++---- + drivers/base/dd.c | 38 ++-- + drivers/base/devtmpfs.c | 13 + + drivers/base/firmware_class.c | 9 +- + drivers/base/memory.c | 20 +- + drivers/base/node.c | 81 ++--- + drivers/base/platform.c | 60 ++++- + drivers/base/power/main.c | 20 +- + drivers/base/sys.c | 17 +- + drivers/block/osdblk.c | 12 +- + drivers/block/pktcdvd.c | 14 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/cpuidle/sysfs.c | 8 +- + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/ioat/dma.h | 2 +- + drivers/edac/edac_device_sysfs.c | 6 +- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/edac/edac_pci_sysfs.c | 4 +- + drivers/firewire/core-device.c | 4 +- + drivers/firmware/edd.c | 2 +- + drivers/firmware/efivars.c | 2 +- + drivers/firmware/iscsi_ibft.c | 2 +- + drivers/firmware/memmap.c | 2 +- + drivers/gpio/gpiolib.c | 8 +- + drivers/gpu/drm/drm_sysfs.c | 18 +- + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_memory.c | 2 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/ieee1394/nodemgr.c | 4 +- + drivers/infiniband/core/cm.c | 2 +- + drivers/infiniband/core/sysfs.c | 2 +- + drivers/infiniband/core/ucm.c | 13 +- + drivers/infiniband/core/user_mad.c | 9 +- + drivers/infiniband/core/uverbs_main.c | 9 +- + drivers/md/dm-sysfs.c | 2 +- + drivers/md/md.c | 4 +- + drivers/media/video/omap24xxcam.c | 2 +- + drivers/misc/phantom.c | 13 +- + drivers/mtd/ubi/build.c | 3 +- + drivers/net/bonding/bond_sysfs.c | 5 +- + drivers/net/ibmveth.c | 2 +- + drivers/net/iseries_veth.c | 4 +- + drivers/net/mlx4/mlx4.h | 1 + + drivers/parisc/pdc_stable.c | 2 +- + drivers/pci/bus.c | 4 +- + drivers/pci/hotplug/fakephp.c | 2 +- + drivers/pci/pci.c | 4 +- + drivers/pci/slot.c | 2 +- + drivers/pcmcia/ds.c | 8 +- + drivers/platform/x86/Kconfig | 1 + + drivers/platform/x86/hp-wmi.c | 4 +- + drivers/platform/x86/msi-laptop.c | 360 +++++++++++++++++++++- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/staging/asus_oled/asus_oled.c | 13 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + drivers/uio/uio.c | 4 +- + drivers/usb/core/driver.c | 4 +- + drivers/usb/core/usb.c | 2 +- + drivers/uwb/driver.c | 5 +- + drivers/uwb/umc-bus.c | 4 +- + drivers/uwb/uwb-internal.h | 4 +- + drivers/uwb/wlp/sysfs.c | 3 +- + drivers/video/acornfb.c | 2 +- + drivers/video/arcfb.c | 2 +- + drivers/video/cobalt_lcdfb.c | 2 +- + drivers/video/efifb.c | 2 +- + drivers/video/epson1355fb.c | 2 +- + drivers/video/gbefb.c | 2 +- + drivers/video/hgafb.c | 2 +- + drivers/video/hitfb.c | 2 +- + drivers/video/omap2/dss/manager.c | 2 +- + drivers/video/omap2/dss/overlay.c | 2 +- + drivers/video/q40fb.c | 2 +- + drivers/video/s3c2410fb.c | 4 +- + drivers/video/sa1100fb.c | 2 +- + drivers/video/sgivwfb.c | 2 +- + drivers/video/sh_mobile_lcdcfb.c | 2 +- + drivers/video/vesafb.c | 2 +- + drivers/video/vfb.c | 2 +- + drivers/video/vga16fb.c | 2 +- + drivers/video/w100fb.c | 2 +- + drivers/w1/masters/omap_hdq.c | 4 +- + drivers/xen/sys-hypervisor.c | 2 +- + fs/btrfs/sysfs.c | 4 +- + fs/dlm/lockspace.c | 2 +- + fs/ext4/super.c | 2 +- + fs/gfs2/sys.c | 4 +- + fs/ocfs2/cluster/masklog.c | 2 +- + fs/sysfs/dir.c | 87 ++++-- + fs/sysfs/file.c | 28 ++- + fs/sysfs/sysfs.h | 6 +- + include/linux/device.h | 43 +++- + include/linux/kobject.h | 14 +- + include/linux/platform_device.h | 9 +- + include/linux/sysdev.h | 21 ++- + include/linux/sysfs.h | 14 + + include/linux/usb.h | 6 +- + kernel/params.c | 4 +- + kernel/perf_event.c | 13 +- + kernel/sched.c | 4 + + lib/kobject.c | 6 +- + lib/kobject_uevent.c | 2 +- + mm/slub.c | 4 +- + net/bluetooth/l2cap.c | 4 +- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/rfcomm/sock.c | 4 +- + net/bluetooth/sco.c | 4 +- + net/bridge/br_private.h | 2 +- + net/bridge/br_sysfs_if.c | 2 +- + samples/kobject/kobject-example.c | 4 +- + samples/kobject/kset-example.c | 6 +- + 134 files changed, 1106 insertions(+), 530 deletions(-) +$ git am -3 ../patches/0001-i2c-update-for-semaphore-to-mutex-conversion-of-devi.patch +Applying: i2c: update for semaphore to mutex conversion of devices +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/i2c/i2c-smbus.c +$ git add . +$ git commit -v -a --amend +[master 23b1332] Merge branch 'quilt/driver-core' +Merging quilt/tty +$ git merge quilt/tty +Auto-merging drivers/char/hvc_console.c +Auto-merging drivers/mmc/card/sdio_uart.c +Auto-merging drivers/serial/8250.c +Auto-merging drivers/serial/Kconfig +Auto-merging drivers/serial/imx.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/char/cyclades.c | 16 +- + drivers/char/hvc_console.c | 2 +- + drivers/char/ip2/ip2main.c | 26 ++- + drivers/char/isicom.c | 54 ++-- + drivers/char/moxa.c | 20 +- + drivers/char/mxser.c | 3 +- + drivers/char/nozomi.c | 155 +++++---- + drivers/char/synclink.c | 4 +- + drivers/char/synclink_gt.c | 186 ++++++----- + drivers/char/tty_ldisc.c | 50 ++-- + drivers/mmc/card/sdio_uart.c | 93 ++---- + drivers/parport/parport_pc.c | 6 + + drivers/serial/68328serial.c | 8 +- + drivers/serial/8250.c | 21 +- + drivers/serial/8250_pci.c | 31 ++- + drivers/serial/Kconfig | 53 ++-- + drivers/serial/atmel_serial.c | 22 ++ + drivers/serial/bcm63xx_uart.c | 7 +- + drivers/serial/bfin_5xx.c | 22 +- + drivers/serial/bfin_sport_uart.c | 701 +++++++++++++++++++++++++------------- + drivers/serial/bfin_sport_uart.h | 38 +-- + drivers/serial/icom.c | 4 +- + drivers/serial/imx.c | 6 +- + drivers/serial/msm_serial.c | 6 +- + drivers/serial/timbuart.c | 7 +- + drivers/usb/serial/keyspan_pda.c | 7 + + include/linux/pci_ids.h | 3 + + 27 files changed, 933 insertions(+), 618 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Recorded preimage for 'drivers/usb/early/ehci-dbgp.c' +Auto-merging arch/arm/configs/rx51_defconfig +Auto-merging drivers/media/video/dabusb.c +Auto-merging drivers/usb/Kconfig +Auto-merging drivers/usb/core/devio.c +Auto-merging drivers/usb/core/driver.c +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/message.c +Auto-merging drivers/usb/early/ehci-dbgp.c +CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c +Auto-merging drivers/usb/gadget/f_mass_storage.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging drivers/usb/gadget/s3c-hsotg.c +Removing drivers/usb/misc/berry_charge.c +Auto-merging drivers/usb/misc/sisusbvga/sisusb.c +Auto-merging drivers/usb/musb/musb_core.c +Auto-merging drivers/usb/musb/musb_core.h +Auto-merging drivers/usb/musb/musb_regs.h +Auto-merging drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/ftdi_sio.c +Auto-merging drivers/usb/serial/ftdi_sio_ids.h +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/sierra.c +Auto-merging drivers/usb/serial/symbolserial.c +Auto-merging drivers/usb/storage/unusual_devs.h +Auto-merging include/linux/usb.h +Auto-merging include/linux/usb/musb.h +Auto-merging include/linux/usb/otg.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/usb/early/ehci-dbgp.c'. +[master 75bbbf4] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + Documentation/networking/00-INDEX | 2 + + Documentation/networking/cxacru-cf.py | 48 + + Documentation/networking/cxacru.txt | 16 + + Documentation/usb/error-codes.txt | 6 +- + Documentation/usb/power-management.txt | 235 ++-- + arch/arm/configs/rx51_defconfig | 11 +- + arch/arm/mach-mx2/devices.c | 80 +- + arch/arm/mach-mx2/devices.h | 1 + + arch/arm/plat-mxc/include/mach/mx21-usbhost.h | 38 + + arch/avr32/mach-at32ap/at32ap700x.c | 7 +- + drivers/hid/usbhid/hiddev.c | 7 +- + drivers/media/video/dabusb.c | 8 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/usb/Kconfig | 1 + + drivers/usb/Makefile | 1 + + drivers/usb/atm/cxacru.c | 192 ++- + drivers/usb/atm/usbatm.c | 3 +- + drivers/usb/atm/usbatm.h | 15 + + drivers/usb/c67x00/c67x00-drv.c | 8 +- + drivers/usb/class/cdc-acm.c | 81 +- + drivers/usb/class/cdc-acm.h | 2 +- + drivers/usb/class/cdc-wdm.c | 2 +- + drivers/usb/class/usblp.c | 22 +- + drivers/usb/class/usbtmc.c | 2 +- + drivers/usb/core/Kconfig | 4 +- + drivers/usb/core/devices.c | 32 +- + drivers/usb/core/devio.c | 127 ++- + drivers/usb/core/driver.c | 914 ++++++------- + drivers/usb/core/file.c | 2 - + drivers/usb/core/hcd.c | 25 +- + drivers/usb/core/hcd.h | 13 +- + drivers/usb/core/hub.c | 120 +- + drivers/usb/core/message.c | 3 +- + drivers/usb/core/quirks.c | 18 +- + drivers/usb/core/sysfs.c | 85 +- + drivers/usb/core/urb.c | 13 +- + drivers/usb/core/usb.c | 38 +- + drivers/usb/core/usb.h | 43 +- + drivers/usb/gadget/Kconfig | 10 + + drivers/usb/gadget/Makefile | 2 + + drivers/usb/gadget/at91_udc.c | 10 +- + drivers/usb/gadget/atmel_usba_udc.c | 9 +- + drivers/usb/gadget/atmel_usba_udc.h | 1 + + drivers/usb/gadget/epautoconf.c | 24 +- + drivers/usb/gadget/ether.c | 2 +- + drivers/usb/gadget/f_acm.c | 8 - + drivers/usb/gadget/f_ecm.c | 7 +- + drivers/usb/gadget/f_mass_storage.c | 50 +- + drivers/usb/gadget/f_rndis.c | 4 - + drivers/usb/gadget/file_storage.c | 8 +- + drivers/usb/gadget/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/gadget_chips.h | 59 - + drivers/usb/gadget/gmidi.c | 5 - + drivers/usb/gadget/goku_udc.c | 2 +- + drivers/usb/gadget/inode.c | 39 +- + drivers/usb/gadget/mass_storage.c | 8 +- + drivers/usb/gadget/nokia.c | 259 ++++ + drivers/usb/gadget/printer.c | 18 - + drivers/usb/gadget/pxa27x_udc.c | 135 ++- + drivers/usb/gadget/pxa27x_udc.h | 6 + + drivers/usb/gadget/s3c-hsotg.c | 11 +- + drivers/usb/gadget/u_ether.c | 5 + + drivers/usb/gadget/u_ether.h | 7 - + drivers/usb/gadget/zero.c | 6 +- + drivers/usb/host/Kconfig | 11 + + drivers/usb/host/Makefile | 2 + + drivers/usb/host/ehci-atmel.c | 2 +- + drivers/usb/host/ehci-au1xxx.c | 6 +- + drivers/usb/host/ehci-fsl.c | 97 ++- + drivers/usb/host/ehci-mxc.c | 23 +- + drivers/usb/host/ehci-omap.c | 37 + + drivers/usb/host/ehci-orion.c | 8 +- + drivers/usb/host/ehci-ppc-of.c | 14 +- + drivers/usb/host/ehci-sched.c | 12 +- + drivers/usb/host/ehci-xilinx-of.c | 8 +- + drivers/usb/host/fhci-hcd.c | 4 +- + drivers/usb/host/imx21-dbg.c | 527 ++++++++ + drivers/usb/host/imx21-hcd.c | 1789 +++++++++++++++++++++++++ + drivers/usb/host/imx21-hcd.h | 436 ++++++ + drivers/usb/host/isp1362-hcd.c | 15 +- + drivers/usb/host/isp1760-hcd.c | 10 + + drivers/usb/host/isp1760-if.c | 2 +- + drivers/usb/host/ohci-dbg.c | 4 +- + drivers/usb/host/ohci-lh7a404.c | 11 +- + drivers/usb/host/ohci-ppc-of.c | 10 +- + drivers/usb/host/ohci-ppc-soc.c | 8 +- + drivers/usb/host/ohci-sa1111.c | 8 +- + drivers/usb/host/sl811-hcd.c | 5 +- + drivers/usb/host/uhci-hcd.c | 1 + + drivers/usb/host/xhci-dbg.c | 19 + + drivers/usb/host/xhci-hcd.c | 150 ++- + drivers/usb/host/xhci-hub.c | 65 +- + drivers/usb/host/xhci-mem.c | 47 +- + drivers/usb/host/xhci-pci.c | 1 + + drivers/usb/host/xhci-ring.c | 41 +- + drivers/usb/host/xhci.h | 11 +- + drivers/usb/image/mdc800.c | 2 +- + drivers/usb/image/microtek.c | 4 +- + drivers/usb/misc/Kconfig | 11 - + drivers/usb/misc/Makefile | 1 - + drivers/usb/misc/adutux.c | 8 +- + drivers/usb/misc/appledisplay.c | 2 +- + drivers/usb/misc/berry_charge.c | 183 --- + drivers/usb/misc/cypress_cy7c63.c | 2 +- + drivers/usb/misc/cytherm.c | 2 +- + drivers/usb/misc/emi26.c | 2 +- + drivers/usb/misc/emi62.c | 2 +- + drivers/usb/misc/ftdi-elan.c | 11 +- + drivers/usb/misc/idmouse.c | 2 +- + drivers/usb/misc/iowarrior.c | 6 +- + drivers/usb/misc/isight_firmware.c | 4 +- + drivers/usb/misc/ldusb.c | 4 +- + drivers/usb/misc/legousbtower.c | 13 +- + drivers/usb/misc/rio500.c | 11 +- + drivers/usb/misc/sisusbvga/sisusb.c | 16 +- + drivers/usb/misc/trancevibrator.c | 2 +- + drivers/usb/misc/usblcd.c | 7 +- + drivers/usb/misc/usbled.c | 2 +- + drivers/usb/misc/usbsevseg.c | 2 +- + drivers/usb/misc/usbtest.c | 6 +- + drivers/usb/misc/uss720.c | 2 +- + drivers/usb/misc/vstusb.c | 2 +- + drivers/usb/mon/mon_bin.c | 7 +- + drivers/usb/mon/mon_text.c | 4 +- + drivers/usb/musb/blackfin.c | 28 +- + drivers/usb/musb/cppi_dma.c | 33 +- + drivers/usb/musb/musb_core.c | 562 +++++--- + drivers/usb/musb/musb_core.h | 72 +- + drivers/usb/musb/musb_gadget.c | 20 +- + drivers/usb/musb/musb_host.c | 34 +- + drivers/usb/musb/musb_regs.h | 101 ++- + drivers/usb/musb/musbhsdma.c | 25 +- + drivers/usb/musb/musbhsdma.h | 17 + + drivers/usb/musb/omap2430.c | 48 +- + drivers/usb/musb/omap2430.h | 32 +- + drivers/usb/musb/tusb6010.c | 2 +- + drivers/usb/musb/tusb6010_omap.c | 2 +- + drivers/usb/otg/twl4030-usb.c | 45 +- + drivers/usb/serial/Kconfig | 8 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/aircable.c | 2 +- + drivers/usb/serial/ark3116.c | 2 +- + drivers/usb/serial/belkin_sa.c | 2 +- + drivers/usb/serial/ch341.c | 27 +- + drivers/usb/serial/cp210x.c | 7 +- + drivers/usb/serial/cyberjack.c | 4 +- + drivers/usb/serial/cypress_m8.c | 66 +- + drivers/usb/serial/digi_acceleport.c | 6 +- + drivers/usb/serial/empeg.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 185 ++-- + drivers/usb/serial/ftdi_sio_ids.h | 8 + + drivers/usb/serial/funsoft.c | 2 +- + drivers/usb/serial/garmin_gps.c | 2 +- + drivers/usb/serial/generic.c | 4 +- + drivers/usb/serial/hp4x.c | 2 +- + drivers/usb/serial/io_edgeport.c | 50 +- + drivers/usb/serial/io_tables.h | 10 +- + drivers/usb/serial/io_ti.c | 74 +- + drivers/usb/serial/ipw.c | 2 +- + drivers/usb/serial/ir-usb.c | 2 +- + drivers/usb/serial/iuu_phoenix.c | 2 +- + drivers/usb/serial/keyspan.h | 10 +- + drivers/usb/serial/keyspan_pda.c | 53 +- + drivers/usb/serial/kl5kusb105.c | 65 +- + drivers/usb/serial/kobil_sct.c | 24 +- + drivers/usb/serial/mct_u232.c | 57 +- + drivers/usb/serial/mct_u232.h | 2 + + drivers/usb/serial/mos7720.c | 184 +++- + drivers/usb/serial/mos7840.c | 26 +- + drivers/usb/serial/moto_modem.c | 2 +- + drivers/usb/serial/navman.c | 2 +- + drivers/usb/serial/omninet.c | 8 +- + drivers/usb/serial/opticon.c | 6 +- + drivers/usb/serial/option.c | 59 +- + drivers/usb/serial/oti6858.c | 15 +- + drivers/usb/serial/pl2303.c | 2 +- + drivers/usb/serial/qcserial.c | 2 +- + drivers/usb/serial/siemens_mpi.c | 2 +- + drivers/usb/serial/sierra.c | 4 +- + drivers/usb/serial/spcp8x5.c | 4 +- + drivers/usb/serial/symbolserial.c | 2 +- + drivers/usb/serial/usb-serial.c | 15 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/serial/visor.c | 30 +- + drivers/usb/serial/vivopay-serial.c | 76 ++ + drivers/usb/serial/whiteheat.c | 6 +- + drivers/usb/storage/transport.c | 6 + + drivers/usb/storage/unusual_devs.h | 88 ++- + drivers/usb/usb-skeleton.c | 2 +- + drivers/usb/wusbcore/cbaf.c | 2 +- + drivers/usb/wusbcore/devconnect.c | 2 +- + drivers/usb/wusbcore/mmc.c | 2 +- + include/linux/usb.h | 53 +- + include/linux/usb/atmel_usba_udc.h | 1 + + include/linux/usb/ch9.h | 2 +- + include/linux/usb/musb.h | 23 +- + include/linux/usb/otg.h | 25 + + include/linux/usb/quirks.h | 3 + + include/linux/usb/serial.h | 13 +- + 200 files changed, 6589 insertions(+), 2421 deletions(-) + create mode 100644 Documentation/networking/cxacru-cf.py + create mode 100644 arch/arm/plat-mxc/include/mach/mx21-usbhost.h + create mode 100644 drivers/usb/gadget/nokia.c + create mode 100644 drivers/usb/host/imx21-dbg.c + create mode 100644 drivers/usb/host/imx21-hcd.c + create mode 100644 drivers/usb/host/imx21-hcd.h + delete mode 100644 drivers/usb/misc/berry_charge.c + create mode 100644 drivers/usb/serial/vivopay-serial.c +Merging quilt/staging +$ git merge quilt/staging +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Removing drivers/staging/altpciechdma/Kconfig +Removing drivers/staging/altpciechdma/Makefile +Removing drivers/staging/altpciechdma/TODO +Removing drivers/staging/altpciechdma/altpciechdma.c +Removing drivers/staging/b3dfg/Kconfig +Removing drivers/staging/b3dfg/Makefile +Removing drivers/staging/b3dfg/TODO +Removing drivers/staging/b3dfg/b3dfg.c +Removing drivers/staging/batman-adv/compat.h +Removing drivers/staging/batman-adv/log.c +Removing drivers/staging/et131x/et1310_eeprom.h +Removing drivers/staging/et131x/et1310_jagcore.h +Removing drivers/staging/et131x/et1310_mac.h +Removing drivers/staging/et131x/et1310_pm.h +Removing drivers/staging/et131x/et131x_config.h +Removing drivers/staging/et131x/et131x_initpci.h +Removing drivers/staging/et131x/et131x_isr.h +Auto-merging drivers/staging/et131x/et131x_netdev.c +Removing drivers/staging/et131x/et131x_netdev.h +Auto-merging drivers/staging/go7007/s2250-board.c +Removing drivers/staging/mimio/Kconfig +Removing drivers/staging/mimio/Makefile +Removing drivers/staging/mimio/mimio.c +Removing drivers/staging/p9auth/Kconfig +Removing drivers/staging/p9auth/Makefile +Removing drivers/staging/p9auth/p9auth.c +Removing drivers/staging/rar/Kconfig +Removing drivers/staging/rar/Makefile +Removing drivers/staging/rar/rar_driver.c +Removing drivers/staging/rar/rar_driver.h +Removing drivers/staging/rt2860/common/firmware.h +Removing drivers/staging/rt2860/common/firmware_3070.h +Removing drivers/staging/rt3070/firmware.h +Removing drivers/staging/rt3090/firmware.h +Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211.h +Auto-merging drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +Auto-merging drivers/staging/rtl8187se/r8180_core.c +Auto-merging drivers/staging/slicoss/slicoss.c +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree. +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree. +Auto-merging drivers/staging/sm7xx/smtcfb.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging drivers/staging/wlags49_h2/wl_netdev.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h +drivers/staging/sm7xx/smtc2d.c: needs merge +drivers/staging/sm7xx/smtc2d.h: needs merge +rm 'drivers/staging/sm7xx/smtc2d.c' +rm 'drivers/staging/sm7xx/smtc2d.h' +$ git commit -v -a +[master 626ea4d] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 14 +- + drivers/staging/Makefile | 8 +- + drivers/staging/altpciechdma/Kconfig | 10 - + drivers/staging/altpciechdma/Makefile | 2 - + drivers/staging/altpciechdma/TODO | 15 - + drivers/staging/altpciechdma/altpciechdma.c | 1182 ---------- + drivers/staging/asus_oled/asus_oled.c | 21 +- + drivers/staging/b3dfg/Kconfig | 10 - + drivers/staging/b3dfg/Makefile | 1 - + drivers/staging/b3dfg/TODO | 4 - + drivers/staging/b3dfg/b3dfg.c | 1100 --------- + drivers/staging/batman-adv/Kconfig | 4 +- + drivers/staging/batman-adv/Makefile | 2 +- + drivers/staging/batman-adv/README | 84 +- + drivers/staging/batman-adv/TODO | 24 - + drivers/staging/batman-adv/aggregation.c | 13 +- + drivers/staging/batman-adv/bitarray.c | 15 +- + drivers/staging/batman-adv/compat.h | 75 - + drivers/staging/batman-adv/device.c | 40 +- + drivers/staging/batman-adv/hard-interface.c | 200 ++- + drivers/staging/batman-adv/hard-interface.h | 4 + + drivers/staging/batman-adv/hash.c | 23 +- + drivers/staging/batman-adv/hash.h | 5 + + drivers/staging/batman-adv/log.c | 179 -- + drivers/staging/batman-adv/main.c | 53 +- + drivers/staging/batman-adv/main.h | 45 +- + drivers/staging/batman-adv/originator.c | 252 ++ + drivers/staging/batman-adv/{log.h => originator.h} | 19 +- + drivers/staging/batman-adv/packet.h | 2 +- + drivers/staging/batman-adv/proc.c | 484 +---- + drivers/staging/batman-adv/proc.h | 13 +- + drivers/staging/batman-adv/routing.c | 1319 ++++++------ + drivers/staging/batman-adv/routing.h | 20 +- + drivers/staging/batman-adv/send.c | 169 +- + drivers/staging/batman-adv/send.h | 5 +- + drivers/staging/batman-adv/soft-interface.c | 96 +- + drivers/staging/batman-adv/soft-interface.h | 3 +- + drivers/staging/batman-adv/translation-table.c | 94 +- + drivers/staging/batman-adv/translation-table.h | 1 + + drivers/staging/batman-adv/types.h | 14 +- + drivers/staging/batman-adv/vis.c | 167 +- + drivers/staging/batman-adv/vis.h | 11 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Pwm.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Ssi.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Tor.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Ttl.c | 2 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_eeprom.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci035.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1516.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci1564.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3501.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 6 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- + drivers/staging/comedi/drivers/adq12b.c | 66 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 21 +- + drivers/staging/comedi/drivers/c6xdigio.c | 57 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/fl512.c | 72 +- + drivers/staging/comedi/drivers/jr3_pci.c | 2 + + drivers/staging/comedi/drivers/mpc624.c | 2 +- + drivers/staging/comedi/drivers/ni_65xx.c | 49 +- + drivers/staging/comedi/drivers/ni_660x.c | 77 +- + drivers/staging/comedi/drivers/ni_670x.c | 32 +- + drivers/staging/comedi/drivers/ni_labpc.c | 2 +- + drivers/staging/comedi/drivers/pcl711.c | 29 +- + drivers/staging/comedi/drivers/pcl724.c | 26 +- + drivers/staging/comedi/drivers/pcl725.c | 6 +- + drivers/staging/comedi/drivers/pcl730.c | 6 +- + drivers/staging/comedi/drivers/pcl812.c | 16 +- + drivers/staging/comedi/drivers/pcl816.c | 66 +- + drivers/staging/comedi/drivers/pcl818.c | 39 +- + drivers/staging/comedi/drivers/pcm3724.c | 85 +- + drivers/staging/comedi/drivers/pcm3730.c | 6 +- + drivers/staging/comedi/drivers/pcmad.c | 21 +- + drivers/staging/comedi/drivers/pcmmio.c | 2 +- + drivers/staging/comedi/drivers/poc.c | 14 +- + drivers/staging/comedi/drivers/rti800.c | 41 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 4 +- + drivers/staging/comedi/drivers/usbduxfast.c | 4 +- + drivers/staging/comedi/drivers/vmk80xx.c | 2 +- + drivers/staging/crystalhd/Kconfig | 6 + + drivers/staging/crystalhd/Makefile | 6 + + drivers/staging/crystalhd/TODO | 16 + + drivers/staging/crystalhd/bc_dts_defs.h | 498 ++++ + drivers/staging/crystalhd/bc_dts_glob_lnx.h | 299 +++ + drivers/staging/crystalhd/bc_dts_types.h | 121 + + drivers/staging/crystalhd/bcm_70012_regs.h | 757 +++++++ + drivers/staging/crystalhd/crystalhd_cmds.c | 1058 +++++++++ + drivers/staging/crystalhd/crystalhd_cmds.h | 88 + + drivers/staging/crystalhd/crystalhd_fw_if.h | 369 +++ + drivers/staging/crystalhd/crystalhd_hw.c | 2395 ++++++++++++++++++++ + drivers/staging/crystalhd/crystalhd_hw.h | 398 ++++ + drivers/staging/crystalhd/crystalhd_lnx.c | 780 +++++++ + drivers/staging/crystalhd/crystalhd_lnx.h | 96 + + drivers/staging/crystalhd/crystalhd_misc.c | 1029 +++++++++ + drivers/staging/crystalhd/crystalhd_misc.h | 229 ++ + drivers/staging/cx25821/cx25821-audups11.c | 3 +- + drivers/staging/cx25821/cx25821-medusa-video.c | 4 +- + drivers/staging/cx25821/cx25821-video.c | 5 +- + drivers/staging/dream/camera/Kconfig | 2 +- + drivers/staging/dream/camera/Makefile | 1 + + drivers/staging/dream/camera/msm_camera.c | 4 +- + drivers/staging/dream/camera/msm_vfe7x.c | 3 +- + drivers/staging/dream/camera/s5k3e2fx.c | 10 +- + drivers/staging/dream/include/linux/android_pmem.h | 80 + + drivers/staging/dream/include/linux/gpio_event.h | 154 ++ + drivers/staging/dream/include/linux/msm_adsp.h | 84 + + drivers/staging/dream/include/linux/msm_audio.h | 115 + + .../staging/dream/include/linux/msm_rpcrouter.h | 47 + + drivers/staging/dream/include/linux/wakelock.h | 91 + + drivers/staging/dream/include/mach/camera.h | 279 +++ + drivers/staging/dream/include/mach/msm_adsp.h | 112 + + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 ++ + drivers/staging/dream/include/mach/msm_smd.h | 107 + + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 + + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 + + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 ++++++++ + .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 +++ + .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 +++ + .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 + + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 ++ + .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 ++ + .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 +++ + .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 ++ + .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 + + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 + + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 ++ + .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 + + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 ++ + .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 ++++++++ + .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 +++ + drivers/staging/dream/include/media/msm_camera.h | 388 ++++ + drivers/staging/dream/qdsp5/Makefile | 1 + + drivers/staging/dream/qdsp5/audio_mp3.c | 3 +- + drivers/staging/dream/smd/Makefile | 1 + + drivers/staging/dream/smd/smd_rpcrouter.c | 2 - + drivers/staging/dt3155/Kconfig | 4 + + drivers/staging/dt3155/Makefile | 6 + + drivers/staging/dt3155/TODO | 10 + + drivers/staging/dt3155/allocator.README | 98 + + drivers/staging/dt3155/allocator.c | 295 +++ + drivers/staging/dt3155/allocator.h | 28 + + drivers/staging/dt3155/dt3155.h | 171 ++ + drivers/staging/dt3155/dt3155.sysvinit | 60 + + drivers/staging/dt3155/dt3155_drv.c | 1095 +++++++++ + drivers/staging/dt3155/dt3155_drv.h | 45 + + drivers/staging/dt3155/dt3155_io.c | 175 ++ + drivers/staging/dt3155/dt3155_io.h | 358 +++ + drivers/staging/dt3155/dt3155_isr.c | 516 +++++ + drivers/staging/dt3155/dt3155_isr.h | 77 + + drivers/staging/et131x/et1310_address_map.h | 617 ++---- + drivers/staging/et131x/et1310_eeprom.c | 39 +- + drivers/staging/et131x/et1310_eeprom.h | 103 - + drivers/staging/et131x/et1310_jagcore.h | 94 - + drivers/staging/et131x/et1310_mac.c | 104 +- + drivers/staging/et131x/et1310_mac.h | 93 - + drivers/staging/et131x/et1310_phy.c | 7 +- + drivers/staging/et131x/et1310_phy.h | 34 - + drivers/staging/et131x/et1310_pm.c | 6 +- + drivers/staging/et131x/et1310_pm.h | 85 - + drivers/staging/et131x/et1310_rx.c | 301 ++-- + drivers/staging/et131x/et1310_rx.h | 253 +-- + drivers/staging/et131x/et1310_tx.c | 10 +- + drivers/staging/et131x/et1310_tx.h | 14 - + drivers/staging/et131x/et131x.h | 153 ++ + drivers/staging/et131x/et131x_adapter.h | 43 +- + drivers/staging/et131x/et131x_config.h | 67 - + drivers/staging/et131x/et131x_initpci.c | 12 +- + drivers/staging/et131x/et131x_initpci.h | 73 - + drivers/staging/et131x/et131x_isr.c | 34 +- + drivers/staging/et131x/et131x_isr.h | 65 - + drivers/staging/et131x/et131x_netdev.c | 63 +- + drivers/staging/et131x/et131x_netdev.h | 64 - + drivers/staging/et131x/et131x_version.h | 9 +- + drivers/staging/frontier/alphatrack.c | 2 +- + drivers/staging/frontier/tranzport.c | 2 +- + drivers/staging/go7007/go7007-driver.c | 2 + + drivers/staging/go7007/go7007-usb.c | 4 +- + drivers/staging/go7007/s2250-board.c | 2 +- + drivers/staging/go7007/s2250-loader.c | 4 +- + drivers/staging/go7007/saa7134-go7007.c | 1 + + drivers/staging/go7007/wis-ov7640.c | 2 +- + drivers/staging/go7007/wis-saa7113.c | 2 +- + drivers/staging/go7007/wis-saa7115.c | 2 +- + drivers/staging/go7007/wis-sony-tuner.c | 2 +- + drivers/staging/go7007/wis-tw2804.c | 2 +- + drivers/staging/go7007/wis-tw9903.c | 2 +- + drivers/staging/go7007/wis-uda1342.c | 2 +- + drivers/staging/hv/Hv.c | 205 +- + drivers/staging/hv/Hv.h | 10 +- + drivers/staging/hv/NetVscApi.h | 4 +- + drivers/staging/hv/RingBuffer.c | 153 +- + drivers/staging/hv/RndisFilter.c | 10 +- + drivers/staging/hv/StorVsc.c | 3 +- + drivers/staging/hv/StorVscApi.h | 5 +- + drivers/staging/hv/netvsc_drv.c | 14 +- + drivers/staging/hv/storvsc_drv.c | 215 +-- + drivers/staging/iio/industrialio-core.c | 21 +- + drivers/staging/iio/ring_sw.c | 1 - + drivers/staging/line6/driver.c | 2 +- + drivers/staging/mimio/Kconfig | 10 - + drivers/staging/mimio/Makefile | 1 - + drivers/staging/mimio/mimio.c | 914 -------- + drivers/staging/otus/80211core/cagg.c | 18 +- + drivers/staging/otus/80211core/ccmd.c | 2 +- + drivers/staging/otus/80211core/cfunc.c | 2 - + drivers/staging/otus/80211core/cmm.c | 4 - + drivers/staging/otus/80211core/cmmsta.c | 7 +- + drivers/staging/otus/80211core/cpsmgr.c | 2 - + drivers/staging/otus/80211core/cscanmgr.c | 2 - + drivers/staging/otus/80211core/ctkip.c | 5 +- + drivers/staging/otus/80211core/ctxrx.c | 8 +- + drivers/staging/otus/80211core/ledmgr.c | 1 - + drivers/staging/otus/80211core/pub_zfi.h | 1 - + drivers/staging/otus/Kconfig | 2 + + drivers/staging/otus/apdbg.c | 53 +- + drivers/staging/otus/hal/hpmain.c | 4 - + drivers/staging/otus/hal/hpreg.c | 133 -- + drivers/staging/otus/hal/hprw.c | 1 - + drivers/staging/otus/ioctl.c | 16 +- + drivers/staging/otus/usbdrv.c | 4 +- + drivers/staging/otus/wrap_pkt.c | 10 +- + drivers/staging/otus/zdusb.c | 2 +- + drivers/staging/p9auth/Kconfig | 9 - + drivers/staging/p9auth/Makefile | 1 - + drivers/staging/p9auth/p9auth.c | 408 ---- + drivers/staging/phison/phison.c | 2 +- + drivers/staging/pohmelfs/inode.c | 25 +- + drivers/staging/pohmelfs/netfs.h | 3 + + drivers/staging/quatech_usb2/quatech_usb2.c | 2 +- + drivers/staging/ramzswap/Kconfig | 2 +- + drivers/staging/ramzswap/ramzswap.txt | 6 +- + drivers/staging/ramzswap/ramzswap_drv.c | 144 +- + drivers/staging/ramzswap/ramzswap_drv.h | 67 +- + drivers/staging/ramzswap/ramzswap_ioctl.h | 7 +- + drivers/staging/ramzswap/xvmalloc.c | 4 +- + drivers/staging/ramzswap/xvmalloc.h | 2 +- + drivers/staging/ramzswap/xvmalloc_int.h | 4 +- + drivers/staging/rar/Kconfig | 17 - + drivers/staging/rar/Makefile | 2 - + drivers/staging/rar/rar_driver.c | 444 ---- + drivers/staging/rar/rar_driver.h | 99 - + drivers/staging/rar_register/Kconfig | 30 + + drivers/staging/rar_register/Makefile | 2 + + drivers/staging/rar_register/rar_register.c | 615 +++++ + drivers/staging/rar_register/rar_register.h | 84 + + drivers/staging/rt2860/Kconfig | 2 + + drivers/staging/rt2860/common/firmware.h | 558 ----- + drivers/staging/rt2860/common/firmware_3070.h | 517 ----- + drivers/staging/rt2860/common/rtmp_mcu.c | 167 +- + drivers/staging/rt2860/rt_linux.c | 13 +- + drivers/staging/rt2860/rt_linux.h | 4 +- + drivers/staging/rt2860/rtmp.h | 7 +- + drivers/staging/rt2860/sta/connect.c | 4 +- + drivers/staging/rt2860/sta_ioctl.c | 5 +- + drivers/staging/rt2860/usb_main_dev.c | 6 +- + drivers/staging/rt2870/Kconfig | 2 + + drivers/staging/rt2870/common/rtusb_io.c | 10 +- + drivers/staging/rt3070/firmware.h | 558 ----- + drivers/staging/rt3090/firmware.h | 517 ----- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 4 - + .../rtl8187se/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8187se/ieee80211/ieee80211_crypt_tkip.c | 20 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_rx.c | 48 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- + .../rtl8187se/ieee80211/ieee80211_softmac_wx.c | 3 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_tx.c | 6 +- + drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | 6 +- + drivers/staging/rtl8187se/r8180_core.c | 310 +-- + drivers/staging/rtl8192e/Makefile | 9 +- + drivers/staging/rtl8192e/dot11d.h | 138 +- + drivers/staging/rtl8192e/ieee80211.h | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 159 ++- + .../staging/rtl8192e/ieee80211/ieee80211_crypt.c | 2 +- + .../rtl8192e/ieee80211/ieee80211_crypt_ccmp.c | 37 +- + .../rtl8192e/ieee80211/ieee80211_crypt_tkip.c | 29 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 148 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 246 ++- + .../rtl8192e/ieee80211/ieee80211_softmac_wx.c | 26 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_tx.c | 80 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | 6 +- + .../staging/rtl8192e/ieee80211/rtl819x_BAProc.c | 6 +- + drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 4 +- + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 65 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192e/r8180_93cx6.h | 33 +- + drivers/staging/rtl8192e/r8190_rtl8256.c | 360 ++-- + drivers/staging/rtl8192e/r8190_rtl8256.h | 49 +- + drivers/staging/rtl8192e/r8192E.h | 23 +- + drivers/staging/rtl8192e/r8192E_core.c | 773 ++++++- + drivers/staging/rtl8192e/r8192E_dm.c | 40 +- + drivers/staging/rtl8192e/r8192E_hw.h | 8 + + drivers/staging/rtl8192e/r8192E_wx.c | 212 ++- + drivers/staging/rtl8192e/r8192E_wx.h | 1 - + drivers/staging/rtl8192e/r819xE_cmdpkt.c | 2 +- + drivers/staging/rtl8192e/r819xE_firmware.c | 85 +- + drivers/staging/rtl8192e/r819xE_phy.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.h | 194 +- + drivers/staging/rtl8192e/r819xE_phyreg.h | 1117 +++++----- + drivers/staging/rtl8192su/Kconfig | 3 +- + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 4 - + .../rtl8192su/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8192su/ieee80211/ieee80211_crypt_tkip.c | 20 +- + .../staging/rtl8192su/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 48 +- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | 6 +- + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 21 +- + .../staging/rtl8192su/ieee80211/rtl819x_HTProc.c | 2 +- + .../staging/rtl8192su/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192su/r8192S_firmware.c | 1 + + drivers/staging/rtl8192su/r8192U_core.c | 147 +- + drivers/staging/rtl8192su/r8192U_dm.c | 2 +- + drivers/staging/rtl8192u/Kconfig | 3 +- + drivers/staging/rtl8192u/Makefile | 2 +- + drivers/staging/rtl8192u/ieee80211.h | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 3 - + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 21 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 20 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 48 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 6 +- + drivers/staging/rtl8192u/r8192U_core.c | 8 +- + drivers/staging/sep/sep_driver.c | 23 +- + drivers/staging/serqt_usb2/serqt_usb2.c | 4 +- + drivers/staging/slicoss/slic.h | 9 - + drivers/staging/slicoss/slicoss.c | 110 +- + drivers/staging/sm7xx/Kconfig | 7 - + drivers/staging/sm7xx/TODO | 1 + + drivers/staging/sm7xx/smtc2d.c | 979 -------- + drivers/staging/sm7xx/smtc2d.h | 530 ----- + drivers/staging/sm7xx/smtcfb.c | 131 +- + drivers/staging/udlfb/udlfb.c | 652 ++++-- + drivers/staging/udlfb/udlfb.h | 156 +-- + drivers/staging/usbip/Kconfig | 7 + + drivers/staging/usbip/Makefile | 2 +- + drivers/staging/usbip/usbip_common.c | 90 +- + drivers/staging/usbip/usbip_common.h | 8 +- + drivers/staging/vme/bridges/Kconfig | 1 + + drivers/staging/vme/bridges/vme_ca91cx42.c | 48 +- + drivers/staging/vme/bridges/vme_tsi148.c | 47 +- + drivers/staging/vme/devices/vme_user.c | 4 +- + drivers/staging/vme/vme.c | 222 +- + drivers/staging/vme/vme.h | 23 +- + drivers/staging/vme/vme_bridge.h | 40 +- + drivers/staging/vt6655/device_main.c | 5 +- + drivers/staging/vt6655/iwctl.c | 2 +- + drivers/staging/winbond/core.h | 2 +- + drivers/staging/winbond/localpara.h | 34 +- + drivers/staging/winbond/mds_f.h | 3 - + drivers/staging/winbond/mds_s.h | 28 - + drivers/staging/winbond/mlme_s.h | 8 - + drivers/staging/winbond/mto.h | 5 - + drivers/staging/winbond/reg.c | 10 +- + drivers/staging/winbond/scan_s.h | 1 - + drivers/staging/winbond/sme_api.h | 4 +- + drivers/staging/winbond/wb35reg_f.h | 2 +- + drivers/staging/winbond/wbusb.c | 10 +- + drivers/staging/wlags49_h2/wl_main.c | 2 +- + drivers/staging/wlags49_h2/wl_netdev.c | 2 +- + drivers/staging/wlags49_h2/wl_pci.c | 1 - + drivers/staging/wlags49_h2/wl_profile.c | 76 +- + drivers/staging/wlags49_h2/wl_util.c | 49 - + drivers/staging/wlags49_h2/wl_util.h | 2 - + drivers/staging/wlan-ng/Kconfig | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 2 +- + drivers/staging/wlan-ng/p80211wext.c | 15 + + drivers/staging/wlan-ng/prism2fw.c | 1 + + 391 files changed, 25155 insertions(+), 15367 deletions(-) + delete mode 100644 drivers/staging/altpciechdma/Kconfig + delete mode 100644 drivers/staging/altpciechdma/Makefile + delete mode 100644 drivers/staging/altpciechdma/TODO + delete mode 100644 drivers/staging/altpciechdma/altpciechdma.c + delete mode 100644 drivers/staging/b3dfg/Kconfig + delete mode 100644 drivers/staging/b3dfg/Makefile + delete mode 100644 drivers/staging/b3dfg/TODO + delete mode 100644 drivers/staging/b3dfg/b3dfg.c + delete mode 100644 drivers/staging/batman-adv/compat.h + delete mode 100644 drivers/staging/batman-adv/log.c + create mode 100644 drivers/staging/batman-adv/originator.c + rename drivers/staging/batman-adv/{log.h => originator.h} (61%) + create mode 100644 drivers/staging/crystalhd/Kconfig + create mode 100644 drivers/staging/crystalhd/Makefile + create mode 100644 drivers/staging/crystalhd/TODO + create mode 100644 drivers/staging/crystalhd/bc_dts_defs.h + create mode 100644 drivers/staging/crystalhd/bc_dts_glob_lnx.h + create mode 100644 drivers/staging/crystalhd/bc_dts_types.h + create mode 100644 drivers/staging/crystalhd/bcm_70012_regs.h + create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.c + create mode 100644 drivers/staging/crystalhd/crystalhd_cmds.h + create mode 100644 drivers/staging/crystalhd/crystalhd_fw_if.h + create mode 100644 drivers/staging/crystalhd/crystalhd_hw.c + create mode 100644 drivers/staging/crystalhd/crystalhd_hw.h + create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.c + create mode 100644 drivers/staging/crystalhd/crystalhd_lnx.h + create mode 100644 drivers/staging/crystalhd/crystalhd_misc.c + create mode 100644 drivers/staging/crystalhd/crystalhd_misc.h + create mode 100644 drivers/staging/dream/include/linux/android_pmem.h + create mode 100644 drivers/staging/dream/include/linux/gpio_event.h + create mode 100644 drivers/staging/dream/include/linux/msm_adsp.h + create mode 100644 drivers/staging/dream/include/linux/msm_audio.h + create mode 100644 drivers/staging/dream/include/linux/msm_rpcrouter.h + create mode 100644 drivers/staging/dream/include/linux/wakelock.h + create mode 100644 drivers/staging/dream/include/mach/camera.h + create mode 100644 drivers/staging/dream/include/mach/msm_adsp.h + create mode 100644 drivers/staging/dream/include/mach/msm_rpcrouter.h + create mode 100644 drivers/staging/dream/include/mach/msm_smd.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaycmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audplaymsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audppmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreproccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audpreprocmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audreccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5audrecmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5jpegmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmcmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdeccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vdecmsg.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5venccmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfecmdi.h + create mode 100644 drivers/staging/dream/include/mach/qdsp5/qdsp5vfemsg.h + create mode 100644 drivers/staging/dream/include/media/msm_camera.h + create mode 100644 drivers/staging/dt3155/Kconfig + create mode 100644 drivers/staging/dt3155/Makefile + create mode 100644 drivers/staging/dt3155/TODO + create mode 100644 drivers/staging/dt3155/allocator.README + create mode 100644 drivers/staging/dt3155/allocator.c + create mode 100644 drivers/staging/dt3155/allocator.h + create mode 100644 drivers/staging/dt3155/dt3155.h + create mode 100644 drivers/staging/dt3155/dt3155.sysvinit + create mode 100644 drivers/staging/dt3155/dt3155_drv.c + create mode 100644 drivers/staging/dt3155/dt3155_drv.h + create mode 100644 drivers/staging/dt3155/dt3155_io.c + create mode 100644 drivers/staging/dt3155/dt3155_io.h + create mode 100644 drivers/staging/dt3155/dt3155_isr.c + create mode 100644 drivers/staging/dt3155/dt3155_isr.h + delete mode 100644 drivers/staging/et131x/et1310_eeprom.h + delete mode 100644 drivers/staging/et131x/et1310_jagcore.h + delete mode 100644 drivers/staging/et131x/et1310_mac.h + delete mode 100644 drivers/staging/et131x/et1310_pm.h + create mode 100644 drivers/staging/et131x/et131x.h + delete mode 100644 drivers/staging/et131x/et131x_config.h + delete mode 100644 drivers/staging/et131x/et131x_initpci.h + delete mode 100644 drivers/staging/et131x/et131x_isr.h + delete mode 100644 drivers/staging/et131x/et131x_netdev.h + delete mode 100644 drivers/staging/mimio/Kconfig + delete mode 100644 drivers/staging/mimio/Makefile + delete mode 100644 drivers/staging/mimio/mimio.c + delete mode 100644 drivers/staging/p9auth/Kconfig + delete mode 100644 drivers/staging/p9auth/Makefile + delete mode 100644 drivers/staging/p9auth/p9auth.c + delete mode 100644 drivers/staging/rar/Kconfig + delete mode 100644 drivers/staging/rar/Makefile + delete mode 100644 drivers/staging/rar/rar_driver.c + delete mode 100644 drivers/staging/rar/rar_driver.h + create mode 100644 drivers/staging/rar_register/Kconfig + create mode 100644 drivers/staging/rar_register/Makefile + create mode 100644 drivers/staging/rar_register/rar_register.c + create mode 100644 drivers/staging/rar_register/rar_register.h + delete mode 100644 drivers/staging/rt2860/common/firmware.h + delete mode 100644 drivers/staging/rt2860/common/firmware_3070.h + delete mode 100644 drivers/staging/rt3070/firmware.h + delete mode 100644 drivers/staging/rt3090/firmware.h + delete mode 100644 drivers/staging/sm7xx/smtc2d.c + delete mode 100644 drivers/staging/sm7xx/smtc2d.h +Merging scsi-post-merge/master +$ git merge scsi-post-merge/master +Already up-to-date. diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..4c97775bf275 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,736 @@ + +Importing driver-core.current based on 2.6.33-rc8 + quilt series is empty +$ git update-ref refs/heads/quilt/driver-core.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +Importing tty.current based on quilt/driver-core.current + quilt series is empty +$ git update-ref refs/heads/quilt/tty.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +Importing usb.current based on quilt/tty.current + quilt series is empty +$ git update-ref refs/heads/quilt/usb.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +Importing staging.current based on quilt/usb.current + quilt series is empty +$ git update-ref refs/heads/quilt/staging.current 724e6d3fe8003c3f60bf404bf22e4e331327c596 +Importing i2c based on 2.6.33-rc8-git3 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard b0483e78e5c4c9871fc5541875b3bc006846d46b +HEAD is now at b0483e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-scmi-support-ibm-smbus-cmi-devices.patch +i2c-scmi-provide-module-aliases-for-automatic-loading.patch +i2c-make-pci-device-ids-constant.patch +i2c-i801-smbus-patch-for-intel-cougar-point-deviceids.patch +i2c-tiny-usb-fix-comment.patch +i2c-parport-give-powered-devices-some-time-to-settle.patch +i2c-add-smbus-alert-support.patch +i2c-smbus-separate-option.patch +i2c-parport-add-smbus-alert-support.patch +i2c-parport-light-add-smbus-alert-support.patch +i2c-hook-up-runtime-pm-support.patch +i2c-algo-pca-drop-duplicate-variable.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 5366f40...a47c5c7 master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.33-rc8-git3 +$ cd ../quilt-tmp +$ git reset --hard b0483e78e5c4c9871fc5541875b3bc006846d46b +HEAD is now at b0483e7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-lm90-01-add-w83l771-support.patch +hwmon-lm90-02-restore-config-on-exit.patch +hwmon-lm90-03-add-smbus-alert-support.patch +hwmon-it87-01-expose-auto-mode.patch +hwmon-it87-02-expose-pwm-temp-mappings.patch +hwmon-it87-03-fan-attributes-in-arrays.patch +hwmon-it87-04-create-vid-attr-by-group.patch +hwmon-it87-05-add-beep-support.patch +hwmon-it87-06-checkpatch-cleanup.patch +hwmon-it87-07-use-strict_strtol.patch +hwmon-it87-08-new-maintainer.patch +hwmon-it87-09-drop-datasheet-links.patch +hwmon-w83793-add-watchdog-support.patch +hwmon-add-driver-for-adt7411-voltage-temperature-sensor.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 761a39a...75a8bfb master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.33-rc3-git5 +Unchanged quilt series kernel-doc +Importing rr based on v2.6.33-rc7-10-g6339204 +Unchanged quilt series rr +Importing device-mapper based on v2.6.33-rc8-38-g8862627 +$ cd ../quilt-tmp +$ git reset --hard 88626272549b94310975932a9970d11a9b362a16 +HEAD is now at 8862627 Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm +$ git quiltimport --author Alasdair G Kergon <agk@redhat.com> --patches ../quilt/device-mapper +dm-mpath-pass-struct-pgpath-to-pg-init-done.patch +dm-mpath-skip-activate_path-for-failed-paths.patch +dm-table-remove-dm_get-from-dm_table_get_md.patch +dm-document-when-snapshot-has-finished-merging.patch +dm-mpath-avoid-storing-private-suspended-state.patch +dm-mpath-hold-io-until-all-pg_inits-completed.patch +dm-mpath-wait-for-pg_init-completion-when-suspending.patch +dm-mpath-refactor-pg_init.patch +dm-raid1-always-return-error-if-all-legs-fail.patch +dm-ioctl-only-issue-uevent-on-resume-if-state-changed.patch +dm-table-remove-unused-dm_get_device-range-parameters.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/device-mapper +From ../quilt-tmp + + abd4e28...2f057f1 master -> quilt/device-mapper (forced update) +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +$ cd ../quilt-tmp +$ git reset --hard 724e6d3fe8003c3f60bf404bf22e4e331327c596 +HEAD is now at 724e6d3 Linux 2.6.33-rc8 +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/driver-core +kobject-example-spelling-fixes.patch +kset-example-spelling-fixes.patch +driver-core-add-platform_create_bundle-helper.patch +driver-core-make-platform_device_id-table-const.patch +sysdev-pass-attribute-in-sysdev_class-attributes-show-store.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:76: space before tab in indent. + struct sysdev_class_attribute *attr, +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:205: space before tab in indent. + struct sysdev_class_attribute *attr, char *buf) \ +warning: 2 lines add whitespace errors. +sysdev-convert-node-driver-class-attributes-to-be-data-driven.patch +sysdev-convert-cpu-driver-sysdev-class-attributes.patch +sysfs-add-sysfs_add-remove_files-utility-functions.patch +sysfs-add-attribute-array-to-sysdev-classes.patch +sysdev-convert-node-driver.patch +sysdev-use-sysdev_class-attribute-arrays-in-node-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:53: space before tab in indent. + BUILD_BUG_ON(ARRAY_SIZE(node_state_attr) != NR_NODE_STATES); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:54: space before tab in indent. + BUILD_BUG_ON(ARRAY_SIZE(node_state_attrs)-1 != NR_NODE_STATES); +warning: 2 lines add whitespace errors. +sysdev-add-sysdev_create-remove_files.patch +sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch +sysdev-add-attribute-argument-to-class_attribute-show-store.patch +driver-core-add-class_attr_string-for-simple-read-only-string.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:13: space before tab in indent. + char *buf) +warning: 1 line adds whitespace errors. +driver-core-convert-some-drivers-to-class_attr_string.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:215: space before tab in indent. + ASUS_OLED_UNDERSCORE_NAME " " ASUS_OLED_VERSION); +warning: 1 line adds whitespace errors. +driver-core-devtmpfs-reset-inode-permissions-before-unlinking.patch +driver-core-devtmpfs-remove-experimental-and-enable-it-by-default.patch +driver-core-disable-sbin-hotplug-by-default.patch +driver-core-require-valid-action-string-in-uevent-trigger.patch +sysfs-cache-the-last-sysfs_dirent-to-improve-readdir-scalability-v2.patch +driver-core-firmware_class-remove-base.h-header-inclusion.patch +kobject-constify-struct-kset_uevent_ops.patch +howto-updates-on-subsystem-trees-patchwork-next-vs.-mm.patch +sysdev-fix-up-the-probe-release-attributes.patch +driver-core-constify-struct-sysfs_ops-in-struct-kobj_type.patch +Context reduced to (2/2) to apply fragment at 62 +driver-core-make-struct-platform_driver.id_table-const.patch +platform-drivers-move-probe-to-.devinit.text-in-arch-arm.patch +platform-drivers-move-probe-to-.devinit.text-in-drivers-scsi.patch +platform-drivers-move-probe-to-.devinit.text-in-drivers-video.patch +x86-move-hp-wmi-s-probe-function-to-.devinit.text.patch +i2c-move-i2c_omap-s-probe-function-to-.devinit.text.patch +w1-move-omap_hdq-s-probe-function-to-.devinit.text.patch +media-move-omap24xxcam-s-probe-function-to-.devinit.text.patch +auxdisplay-move-cfag12864bfb-s-probe-function-to-.devinit.text.patch +net-move-am79c961-s-probe-function-to-.devinit.text.patch +sysfs-differentiate-between-locking-links-and-non-links.patch +driver-core-create-lock-unlock-functions-for-struct-device.patch +drivers-base-convert-sema.patch +msi-laptop-support-standard-ec-66-62-command-on-msi-notebook-and-nebook.patch +msi-laptop-add-threeg-sysfs-file-for-support-query-3g-state-by-standard-66-62-ec-command.patch +msi-laptop-support-some-msi-3g-netbook-that-is-need-load-scm.patch +msi-laptop-add-resume-method-for-set-the-scm-load-again.patch +msi-laptop-detect-3g-device-exists-by-standard-ec-command.patch +msi-laptop-depends-on-rfkill.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/driver-core +From ../quilt-tmp + + cba33fa...3d6a19d master -> quilt/driver-core (forced update) +Importing tty based on quilt/driver-core +$ cd ../quilt-tmp +$ git reset --hard 3d6a19dedd4712777dacce1200ce31c4ac40a42a +HEAD is now at 3d6a19d msi-laptop: depends on RFKILL +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/tty +serial-fit-blackfin-uart-over-sport-driver-into-common-uart-infrastructure.patch +serial-copy-uart-properties-of-upf_fixed_type-ports-provisioned-using-early_serial_setup.patch +serial-68328serial.c-remove-baud_table_size-macro.patch +serial-atmel_serial-add-poll_get_char-and-poll_put_char-uart_ops.patch +serial-synclink_gt-dropped-transmit-data-bugfix.patch +serial-8250_pci-add-support-for-mcs9865-syba-6x-serial-port-card.patch +serial-imx-fix-null-dereference-oops-when-pdata-null.patch +serial-add-support-for-korenix-jetcard.patch +serial-fix-test-of-unsigned.patch +serial-char-cyclades-fix-compiler-warning.patch +serial-cyclades-allow-overriding-isa-defaults-also-when-the-driver-is-built-in.patch +tty-char-mxser-remove-unnecessary-tty-test.patch +serial-isicom.c-use-pr_fmt-and-pr_-level.patch +hvc_console-fix-test-on-unsigned-in-hvc_console_print.patch +tty-moxa-remove-ifdef-module-completely.patch +ip2-remove-ifdef-module-from-ip2main.c.patch +ip2-add-module-parameter.patch +tty-declare-module_firmware-in-various-drivers.patch +char-synclink-remove-unnecessary-checks.patch +serial-bfin_5xx-remove-useless-gpio-handling-with-hard-flow-control.patch +serial-bfin_5xx-need-to-disable-dma-tx-interrupt-too.patch +serial-bfin_5xx-kgdboc-should-accept-gdb-break-only-when-it-is-active.patch +serial-bfin_5xx-pull-in-linux-io.h-for-ioremap-prototypes.patch +serial-bcm63xx_uart-don-t-use-kfree-on-non-kmalloced-area.patch +serial-bcm63xx_uart-allow-more-than-one-uart-to-be-registered.patch +sdio_uart-use-kfifo-instead-of-the-messy-circ-stuff.patch +nozomi-add-tty_port-usage.patch +nozomi-fix-mutex-handling.patch +nozomi-tidy-up-the-pci-table.patch +serial-timberdale-remove-dependancies.patch +tty-fix-the-ldisc-hangup-race.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/tty +From ../quilt-tmp + + f077f16...d99adec master -> quilt/tty (forced update) +Importing usb based on quilt/tty +$ cd ../quilt-tmp +$ git reset --hard d99adec3f7941932591f8fbd3cfc7e203151d2b0 +HEAD is now at d99adec tty: Fix the ldisc hangup race +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/usb +usb-mxc-add-i.mx21-specific-usb-host-controller-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:54: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2815: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2832: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +usb-mxc-use-dma_bit_mask-macro-rather-than-hardcoded-constants.patch +usb-mxc-add-platform-resources-for-i.mx21-usb-host-controller.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:8: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +usb-cxacru-return-an-empty-value-for-modulation-if-there-is-no-connection.patch +usb-cxacru-check-data-length-is-not-negative.patch +usb-cxacru-check-device-isn-t-being-removed-during-sysfs-calls.patch +usb-cxacru-document-how-to-interact-with-the-flash-memory.patch +usb-cxacru-firmware-writes-on-ohci-are-slow-log-progress.patch +usb-cxacru-add-write-only-sysfs-attribute-for-modem-configuration.patch +usb-cxacru-remove-cxacru-cf.bin-loader.patch +usb-cxacru-increment-driver-version.patch +usb-ftdi_sio-fix-error-message-on-close.patch +usb-ftdi_sio-remove-obsolete-comment.patch +usb-serial-fix-typo-in-debug-message.patch +usb-ftdi_sio-fix-initialisation-of-latency-timeout.patch +usb-ftdi_sio-remove-support-for-5-and-6-data-bits.patch +usb-fix-occasional-ulpi-timeouts-with-ehci-mxc.patch +usb-pxa27x_udc-avoid-compiler-warnings-and-misbehavior-on-buggy-hardware.patch +usb-serial-mct_usb232-move-dma-buffers-to-heap.patch +cdc_acm-add-reset_resume-method.patch +usb-check-the-endpoint-type-against-the-pipe-type.patch +usb-xhci-fix-error-path-when-configuring-endpoints.patch +usb-xhci-refactor-code-to-free-or-cache-endpoint-rings.patch +usb-xhci-allow-allocation-of-commands-without-input-contexts.patch +usb-xhci-refactor-test-for-vendor-specific-completion-codes.patch +usb-xhci-refactor-code-to-clear-port-change-bits.patch +usb-xhci-allow-roothub-ports-to-be-disabled.patch +usb-xhci-notify-the-xhc-when-a-device-is-reset.patch +usb-add-call-to-notify-xhc-of-a-device-reset.patch +usb-ehci-add-call-of-free_cached_itd_list-function-in-disable_periodic.patch +usb-ehci-fix-audio-record-functionality-for-some-full-speed-sound-blaster-devices.patch +usb-ehci-fsl-fix-sparse-warnings.patch +usb-ehci-fsl-add-power-management-support.patch +usb-pxa27x_udc.c-use-resource_size.patch +usb-atmel_usba_udc.c-use-resource_size.patch +usb-at91_udc.c-use-resource_size.patch +usb-ehci-orion.c-use-resource_size.patch +usb-ehci-atmel.c-use-resource_size.patch +usb-ehci-au1xxx.c-use-platform_get_resource-and-resource_size.patch +usb-cdc-acm-update-to-new-autopm-api.patch +usb-xhci-no-gfp_kernel-in-block-error-handling.patch +usb-wusb-check-chid-is-all-zeros-before-stopping-the-host.patch +usb-otg-add-notifier-support.patch +usb-otg-twl4030-add-support-for-notifier.patch +usb-storage-never-reset-devices-that-will-morph-to-an-old-mode.patch +usb-export-quirk_reset_morphs-through-sysfs.patch +usb-cypress_m8-stop-using-usb-debug-driver-config.patch +usb-cypress_m8-unify-confusing-new-baudrate-check.patch +usb-cypress_m8-allow-unstable-baud-rates.patch +usb-isp1362-use-kzalloc-for-allocating-only-one-thing.patch +usb-host-sl811-fix-unaligned-accesses.patch +usb-host-sl811-allow-the-hcd-on-blackfin-systems.patch +usb-gadget-use-ep5-for-bulk-in-and-ep6-for-bulk-out-for-blackfin-musb.patch +usb-gadget-add-int-support-for-blackfin-musb.patch +usb-musb-use-resource_size.patch +usb-musb-move-two-printk-to-dev_err.patch +usb-musb-move-to-sysfs_groups.patch +usb-musb-remove-some-of-the-never-defined-defines.patch +usbmon-add-bus-number-to-text-api.patch +usb-cdc_acm-add-support-for-pblua-console-port.patch +usb-cdc_acm-silence-it-is-not-a-modem.-error-for-pblua-devices.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:24: space before tab in indent. + }, +warning: 1 line adds whitespace errors. +usb-retain-usb-device-power-wakeup-setting-across-reconfiguration.patch +usb-rename-usb_speed_variable-to-usb_speed_wireless.patch +usb-ftdi_sio-use-error-code-from-usb-stack-in-read_latency_timer.patch +usb-ftdi_sio-fix-latency-timeout-endianess-bug.patch +usb-ftdi_sio-fix-dma-buffers-on-stack.patch +usb-ftdi_sio-clean-up-modem-status-handling.patch +usb-ftdi_sio-remove-unnecessary-initialisations.patch +usb-usblp-remove-checks-no-longer-needed-with-the-new-runtime-pm-system.patch +usb-correct-config-variable-typo.patch +usb-otg-twl4030-move-to-request_threaded_irq.patch +usb-musb-add-new-fifo-table-for-a-omap3-errata.patch +usb-musb-hsdma-add-wrapper-for-reading-dma-count.patch +usb-musb-workaround-musb-dma_intr-sometimes-reads-zero.patch +usb-musb-workaround-toggle-bug-when-doing-bulk-transfer-after-isoc.patch +usb-musb-fix-cppi_channel_abort-function-to-handle-tx-abort-correctly.patch +usb-musb-clean-up-commit-workaround-blackfin-fifo-anomalies.patch +usb-musb-handle-irqs-in-the-order-dictated-by-programming-guide.patch +usb-musb-save-dynfifo-in-musb-struct.patch +musb-add-extvbus-in-musb_hdrc_platform_data.patch +usb-host-ehci-fix-missing-kfree-in-remove-path-also.patch +usb-host-ehci-adding-regulator-framework-in-ehci-omap.c-driver.patch +usb-ch341-replace-printk-warnings-with-dev_err.patch +usb-ch341-fix-dma-buffer-on-stack.patch +usb-ch341-use-le16_to_cpup-to-be-explicit-about-endianess.patch +usb-cypress_m8-fix-dma-buffer-on-stack.patch +usb-cypress_m8-fix-endianess-bug.patch +usb-io_ti-fix-dma-buffers-on-stack.patch +usb-keyspan_pda-fix-dma-buffers-on-stack.patch +usb-kl5kusb105-fix-dma-buffers-on-stack.patch +usb-mos7720-fix-dma-buffers-on-stack-and-clean-up-send_mos_cmd.patch +usb-mos7840-fix-dma-buffers-on-stack-and-endianess-bugs.patch +usb-oti6858-fix-dma-buffer-on-stack.patch +usb-visor-fix-dma-buffers-on-stack.patch +usb-kobil_sct-clean-up-kobil_set_termios.patch +usb-serial-fix-dma-buffers-on-stack-for-io_edgeport.c.patch +usb-ch341-use-get_unaligned_le16-in-break_ctl.patch +usb-cypress_m8-use-put_unaligned_le32-where-necessary.patch +usb-fhci-correct-the-size-argument-to-kzalloc.patch +usb-c67x00-use-resource_size.patch +usb-xhci-fix-compile-issues-with-xhci_get_slot_state.patch +usb-gadget-introduce-g_nokia-gadget-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:44: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +arm-defconfig-rx51-enable-phonet-and-g_nokia.patch +usb-unusual_devs-add-support-for-multiple-option-3g-sticks.patch +usb-use-binterfacenumber-in-bandwidth-allocations.patch +usb-rearrange-code-in-usb_probe_interface.patch +usb-change-locking-for-device-level-autosuspend.patch +usb-consolidate-remote-wakeup-routines.patch +usb-use-the-device-lock-for-persist_enabled.patch +usb-implement-usb_enable_autosuspend.patch +usb-change-handling-of-negative-autosuspend-delays.patch +usb-rearrange-functions-in-driver.c.patch +usb-convert-to-the-runtime-pm-framework.patch +usb-fix-crash-in-uhci_scan_schedule.patch +usb-move-hcd-free_dev-call-into-usb_disconnect-to-fix-oops.patch +usb-musb-don-t-dereference-null-tusb_dma-in-dma_controller_destroy.patch +usb-skeleton-make-usb-device-id-constant.patch +usb-class-make-usb-device-id-constant.patch +usb-serial-make-usb-device-id-constant.patch +usb-image-make-usb-device-id-constant.patch +usb-misc-make-usb-device-id-constant.patch +usb-hub-make-usb-device-id-constant.patch +usb-host-make-open-firmware-device-id-constant.patch +usb-gadget-make-open-firmware-device-id-constant.patch +usb-goku_udc-make-pci-device-id-constant.patch +usb-serial-option.c-add-chipset-information-for-4g-w14.patch +usb-serial-option.c-add-blacklisting-infrastructure-for-special-device-handling.patch +usb-serial-option.c-add-4g-w14-stick-to-blacklist-for-option_send_setup.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:26: space before tab in indent. + { USB_DEVICE(FOUR_G_SYSTEMS_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:27: space before tab in indent. + .driver_info = (kernel_ulong_t)&four_g_w14_blacklist +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:28: space before tab in indent. + }, +warning: 3 lines add whitespace errors. +usb-atm-use-field_sizeof-trivial-cleanup.patch +usb-remove-bkl-from-poll.patch +usb-remove-bkl-from-usbdev_open.patch +usb-remove-bkl-from-lseek-implementations.patch +usb-push-bkl-on-open-down-into-the-drivers.patch +usb-reduce-scope-of-bkl-in-usb-ioctl-handling.patch +usb-isight-firmware-declare-module_firmware.patch +usb-bkl-removal-usblp.patch +usb-bkl-removal-usb-skeleton.patch +usb-bkl-removal-usbtmc.patch +usb-bkl-removal-cdc-wdm.patch +usb-bkl-removal-mdc800.patch +usb-bkl-removal-rio500.patch +usb-bkl-removal-idmouse.patch +usb-bkl-removal-adutux.patch +usb-bkl-removal-ftdi-elan.patch +usb-bkl-removal-ldusb.patch +usb-bkl-removal-legousbtower.patch +usb-bkl-removal-vstusb.patch +usb-bkl-removal-frontier.patch +usb-bkl-removal-from-ioctl-path-of-usbfs.patch +usb-remove-the-berry_charge-driver.patch +usb-gadget-add-devtype-support-for-ethernet-functions.patch +usb-serial-eliminate-useless-code.patch +usb-ftdi_sio-correct-spelling-in-implementation-file.patch +usb-trivial-missing-newline-in-usb-core-warning-message.patch +usb-s3c-hsotg-staticise-non-exported-functions.patch +usb-usbfs_snoop-add-data-logging-back-in.patch +usb-remove-obsolete-config-in-kernel-source-usb_hcd_dma.patch +usb-musb-add-context-save-and-restore-support.patch +usb-musb-get-rid-of-omap_readl-writel.patch +usb-musb-we-already-tested-for-dyn_fifo.patch +usb-musb-deprecate-what-we-don-t-use.patch +usb-musb-tusb6010-use-resource_size.patch +usb-musb-unmap-base-if-we-can-t-probe.patch +usb-musb-only-print-info-message-if-probe-is-successful.patch +usb-s3c-hsotg-replace-deprecated-dma_sync_single.patch +usb-io_edgeport-eliminate-get_string.patch +usb-serial-add-support-for-serial-port-on-the-moschip-7715.patch +usb-pxa27x_udc-fix-deadlocks-on-request-queueing.patch +usb-musb-set-version-of-blackfin-version.patch +usb-musb-disable-double-buffering-for-older-rtl-versions.patch +usb-mass_storage-eject-luns-on-thread-exit.patch +usb-g_mass_storage-superfluous-and-missing-packets-fixed.patch +usb-gadgetfs-convert-semaphore-to-mutex.patch +usb-ftdi_sio-replace-bkl-with-a-mutex.patch +usb-add-new-ftdi_sio-device-ids.patch +usb-isp1760-flush-the-d-cache-for-the-pipe-in-transfer-buffers.patch +usb-musb-test-always-evaluates-to-false.patch +usb-g_mass_storage-min-...-warning-fixed.patch +usb-cdc-acm-fix-possible-deadlock-with-multiple-openers.patch +usb-f_mass_storage-fix-crash-on-bind-error.patch +usb-remove-unsupported-usb-gadget-drivers.patch +usb-atmel-uaba-adding-invert-vbus_pin.patch +usb-serial-add-support-for-vivotech-vivopay-devices.patch +usb-ehci-dbgp-split-pid-register-updates-for-in-and-out-pipes.patch +usb-serial-remove-unnecessary-n-s-from-dbg-uses.patch +usb-convert-concatenated-__file__-to-s-__file__.patch +usb-extend-and-neaten-dbg-macros.patch +usb-cp210x-add-81e8-zephyr-bioharness.patch +tty-fix-various-bogus-warn-checks-in-the-usb-serial-layer.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/usb +From ../quilt-tmp + + 130a30c...4de5bb9 master -> quilt/usb (forced update) +Importing staging based on quilt/usb +$ cd ../quilt-tmp +$ git reset --hard 4de5bb97afa943c34cf6aedfc7c1706cf154925c +HEAD is now at 4de5bb9 tty: Fix various bogus WARN checks in the usb serial layer +$ git quiltimport --author Greg KH <greg@kroah.com> --patches ../quilt/staging +staging-comedi-pcmad-cleanup-code-indent-warning-messages.patch +staging-comedi-pcmad-cleanup-remove-unneeded-braces.patch +staging-comedi-pcmad-cleanup-printk-warnings.patch +staging-dream-add-missing-include-files.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:56: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:551: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1504: new blank line at EOF. ++ +warning: 3 lines add whitespace errors. +staging-dream-fix-memory-leak-in-camera-error-path.patch +staging-dream-remove-duplicated-include.patch +staging-otus-fix-some-sparse-warnings.patch +staging-otus-fix-branch-in-zfprotrspsim.patch +staging-vme-correct-vme_user-error-message-typo.patch +staging-vme-allow-override-of-geographical-address-on-tsi148.patch +staging-vme-allow-override-of-geographical-address-on-ca91c142.patch +staging-vme-fix-checkpatch-errors-on-vme-core.patch +staging-vme-remove-old-structures-for-implemented-features.patch +staging-vme-allow-drivers-to-co-exist.patch +staging-slicoss-convert-to-netdev_tx_t.patch +staging-slicoss-check-for-valid-hw-address.patch +staging-slicoss-no-need-type-casting-when-using-netdev_priv.patch +staging-slicoss-no-need-to-check-pointer-in-debugfs_remove.patch +staging-slicoss-use-dev-stats-rather-than-adapter-stats.patch +staging-slicoss-use-pci_device_table.patch +staging-slicoss-use-compare_ether_addr.patch +staging-slicoss-use-pci_set_consistent_dma_mask.patch +staging-rtl8187x-use-pm-for-mac-address-output.patch +staging-mimio-fix-checkpatch.pl-spacing-errors.patch +staging-mimio-remove-dead-code.patch +staging-mimio-checkpatch.pl-line-80-chars-fixes.patch +staging-asus_oled-add-defines-for-asus-vendor_id-and-device_id-to-be-consistent-with-hid-ids.h.patch +staging-batman-adv-replace-internal-logging-mechanism.patch +staging-batman-adv-refactor-routing.c.patch +staging-batman-adv-stop-persistent-warnings-if-a-device-is-deactivated.patch +staging-batman-adv-always-receive-when-discarding.patch +staging-batman-adv-split-originator-handling-parts-out-of-routing.c.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:30: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:276: new blank line at EOF. ++ +warning: 2 lines add whitespace errors. +staging-batman-adv-fix-the-naming-of-the-debug-option.patch +staging-iio-checkinclude.pl-fix.patch +staging-wlags49_h2-remove-duplicated-include.patch +staging-remove-unused-include-linux-version.h.patch +staging-rtl8192e-fix-some-codingstyle-issues.patch +staging-rtl9192e-fix-power-usage-issues.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:564: space before tab in indent. + ieee->ieee80211_ips_leave(ieee->dev); +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1238: space before tab in indent. + (memcmp(net->bssid, BELKINF5D82334V3_RALINK, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1247: space before tab in indent. + //(memcmp(net->bssid, NETGEAR834Bv2_BROADCOM, 3)==0) || +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1698: space before tab in indent. + // IPS should go to this. +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:2147: space before tab in indent. + else +warning: squelched 5 whitespace errors +warning: 10 lines add whitespace errors. +staging-rtl8192e-fix-more-coding-style-issues.patch +staging-rtl8192e-code-style-fix-for-r819xe_phyreg.h.patch +staging-rtl8192e-code-style-fixes-for-r819xe_phy.h.patch +staging-rtl8192e-small-code-fixes-for-r819xe_firmware.c.patch +staging-add-dt3155-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:20: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:350: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:451: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:3158: new blank line at EOF. ++ +warning: 4 lines add whitespace errors. +staging-dt3155-add-needed-include.patch +staging-dt3155-add-todo-file.patch +staging-dt3155-add-it-to-the-build.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:10: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-udlfb-add-dynamic-modeset-support.patch +staging-fix-misspelling-of-successful-and-variants.patch +staging-fix-misspelling-of-should-and-shouldn-t-in-comments.patch +staging-fix-misspelling-of-invocation-in-comment.patch +staging-w35und-convert-typedef-local_para-to-struct-wb_local_para.patch +staging-w35und-convert-typedef-radiooff-to-struct-radio_off.patch +staging-w35und-remove-unused-typedef-_eventlog.patch +staging-w35und-convert-typedef-chaninfo-to-struct-chan_info.patch +staging-w35und-remove-unused-typedef-chan_list.patch +staging-w35und-remove-unused-typedef-txretry_rec.patch +staging-w35und-remove-unused-typedef-rxlayer1.patch +staging-w35und-remove-unused-typedefs-mlme_deauthreq_para-and-mlme_disassocreq_para.patch +staging-s5k3e2fx.c-simplify-complexity-by-factoring.patch +staging-rtl8192su-build-should-select-wireless_ext.patch +staging-rtl8192su-use-z-format-qualifier-for-output-of-sizeof.patch +staging-prism2-usb-build-should-select-wireless_ext.patch +staging-wlan-ng-initialise-mibitem.patch +staging-dt3155-coding-style-cleanups-for-allocator-code.patch +staging-dt3155-coding-style-cleanups-for-the-.h-files.patch +staging-remove-the-b3dfg-driver.patch +staging-p9auth-remove-driver-from-tree.patch +staging-altpciechdma-remove-driver.patch +staging-add-broadcom-crystal-hd-driver.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:836: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:954: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:17579: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:18362: new blank line at EOF. ++ +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:19742: new blank line at EOF. ++ +warning: 5 lines add whitespace errors. +staging-rtl8192u-ieee80211-add-missing-parentheses.patch +staging-rt2860-test-off-by-one-in-rtmpasicsendcommandtomcu.patch +staging-batman-adv-remove-null-pointer-check.patch +staging-batman-adv-update-readme-for-latest-kernel.patch +staging-batman-adv-replace-kern_debug-with-bat_dbg.patch +staging-batman-adv-initialize-static-hash-iterators.patch +staging-batman-adv-consistent-spelling-of-neighbors.patch +staging-batman-adv-use-forw_bcast_list_lock-always-with-disabled-interrupts.patch +staging-batman-adv-fixes-rounding-issues-in-vis.c.patch +staging-batman-adv-fix-minor-orig-table-layout-bug.patch +staging-batman-adv-moving-vis-output-formats-out-of-the-kernel.patch +staging-batman-adv-remove-obsoleted-vis_format-proc-file.patch +staging-batman-adv-splitting-proc-vis-file-into-vis_server-and-vis_data.patch +staging-batman-adv-check-all-kmalloc-s.patch +staging-batman-adv-receive-packets-directly-using-skbs.patch +staging-batman-adv-allow-the-mac-address-to-be-set.patch +staging-batman-adv-use-printk-pm-for-mac-addresses.patch +staging-batman-adv-remove-compat.h.patch +staging-batman-adv-dont-deactivate-aggregation-on-wrong-input.patch +staging-hv-remove-unneeded-onhostrescan-callback.patch +staging-hv-storvsc_drv-move-unused-functions.patch +staging-hv-remove-unneeded-onhostreset-callback.patch +staging-hv-remove-unneeded-onopen-callback.patch +staging-hv-remove-unneeded-onclose-callback.patch +staging-hv-remove-xen-legacy-code-and-check-for-hyper-v.patch +staging-hv-fix-various-coding-style-issues-in-ringbuffer.c.patch +staging-dt3155-use-pci_get_device.patch +staging-rt2870-rtusb_probe-should-be-in-section-__devinit.patch +staging-rt2870-remove-unnecessary-forward-declarations.patch +staging-rtl8192e-print-the-elements-of-tx_pn-and-rx_pn-not-the-arrays-themselves.patch +staging-rtl8192e-remove-some-functions-from-the-__exit-section.patch +staging-rtl8192su-rtl8192u-use-min_t-in-store_debug_level.patch +staging-dt3155-remove-compat-code.patch +staging-ramzswap-minor-spelling-fixes.patch +staging-comedi-off-by-one-in-dodevconfig.patch +staging-comedi-reorder-check-in-pcmmio_attach.patch +staging-cx25821-fix-double-unlock-in-medusa_video_init.patch +staging-cx25821-off-by-one-in-cx25821_enum_input.patch +staging-otus-off-by-one-in-usbdrvwext_siwessid.patch +staging-et131x_netdev.c-use-pm-to-shown-mac-address.patch +staging-r8192e_core.c-use-pm-to-shown-mac-address.patch +r8192u_core.c-use-pm-to-shown-mac-address.patch +staging-vt6655-device_main.c-use-pm-to-shown-mac-address.patch +staging-rtl8192su-buffer-overflow-in-r8192u_core.c.patch +staging-rar-fix-all-coding-style-issues.patch +staging-otus-80211core-fix-confusion.patch +staging-sep-fix-build-problems-from-header-changes.patch +staging-sep-fix-use-of-legacy-ioctl-fop.patch +staging-pohmelfs-remove-uses-of-nipquad-use-pi4.patch +staging-pohmelfs-avoid-null-dereference.patch +staging-fixed-pohmelfs-regression-because-of-per-bdi-writeback.patch +staging-batman-adv-update-the-readme-for-mainline-usage.patch +staging-v56655-add-missing-parentheses-in-comment.patch +staging-cx25821-avoid-null-pointer-dereference.patch +staging-asus_oled-add-null-test-for-kmalloc.patch +staging-otus-add-select-wext_priv-to-kconfig-to-prevent-build-failure.patch +staging-rtl8192u-add-select-wext_priv-to-kconfig-to-prevent-build-failure.patch +staging-wlan-ng-add-select-wext_priv-to-kconfig-to-prevent-build-failure.patch +staging-crystalhd-add-missing-fixes-for-userspace-lib-build.patch +staging-crystalhd-trim-register-defines.patch +staging-otus-dont-mix-declarations-and-code.patch +staging-otus-remove-unused-variables.patch +staging-otus-remove-unused-constants.patch +staging-otus-fix-zm_seq_debug-macro-for-no-debug-case.patch +staging-otus-zftkipinit-increment-another-pointer.patch +staging-iio-ensure-mutex-is-correctly-unlocked-in-__iio_push_event.patch +staging-iio-fix-incorrect-existence-check-for-a-shared-event-pointer.patch +staging-make-pci-device-id-constant.patch +staging-make-usb-device-id-constant.patch +staging-make-i2c-device-id-constant.patch +staging-ramzswap-free-memory-when-create_device-is-failed.patch +staging-rt2860-use-skb_tail_pointer.patch +staging-rtl8192e-use-skb_tail_pointer.patch +staging-rtl8192u-dont-use-mhard-float.patch +staging-otus-fix-assignment-makes-integer-from-pointer-without-a-cast-warnings.patch +staging-vme-tsi148-depend-on-virt_to_bus.patch +staging-dream-htc-dream-camera-not-need-sizeof.patch +staging-declare-module_firmware-in-various-drivers.patch +staging-sep-include-driver-name-in-firmware-filenames.patch +staging-sep-declare-module_firmware.patch +staging-wlags49-don-t-use-custom-implementation-of-atoi.patch +staging-fix-typos-enalbe-enable.patch +staging-fix-typos-selct-select.patch +staging-fix-typos-aquire-acquire.patch +staging-fix-typos-couter-counter.patch +staging-sm7xx-remove-the-buggy-2d-acceleration-support.patch +staging-rtl8192u-ieee80211-currentmpdudensity-assigned-to-itself-in-htusedefaultsetting.patch +staging-comedi-adq12b-checkpatch-cleanups.patch +staging-comedi-c6xdigio-checkpatch-cleanups.patch +staging-comedi-rti800-checkpatch-cleanups.patch +staging-go7007-eliminate-useless-code.patch +staging-comedi-pcl711-checkpatch-cleanups.patch +staging-comedi-pcl724-checkpatch-cleanups.patch +staging-comedi-pcl725-checkpatch-cleanups.patch +staging-comedi-pcl730-checkpatch-cleanups.patch +staging-comedi-g1-3-status-registers-not-read-in-ni_gpct_to_660x_register.patch +staging-comedi-pcl812-correct-ai-scan-counting.patch +staging-comedi-pcl816-correct-ai-scan-counting.patch +staging-comedi-pcl818-correct-ai-scan-counting-and-channel-checks.patch +staging-comedi-adv_pci1710-correct-ai-scan-count-and-channel-checks.patch +staging-comedi-adv_pci1710-remove-unneeded-chanlist_len-check.patch +staging-comedi-pcl812-update-mux-for-multi-channel-ai-command.patch +staging-comedi-pcl816-check-channel-list-in-ai-command-test.patch +staging-comedi-pcl818-remove-unneeded-chanlist_len-check.patch +staging-rt2860-sta_ioctl.c-two-branches-the-same-in-rt_ioctl_giwscan.patch +staging-serqt_usb2-two-branches-the-same-in-qt_set_termios.patch +staging-rt2870sta-constify-rtusbmultiwrite-rtusbfirmwarewrite.patch +staging-rt-2860-2870-sta-use-request_firmware-to-load-firmware.patch +staging-rtl8187se-fix-if-statement.patch +staging-crystalhd-fix-build-on-powerpc.patch +staging-et131x-kill-off-the-fbr_num_des-type.patch +staging-et131x-kill-of-fbr_word2.patch +staging-et131x-fbr_desc-is-now-only-sane-types.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:90: space before tab in indent. + INDEX10(rx_local->local_Fbr1_full); +warning: 1 line adds whitespace errors. +staging-et131x-clean-up-rxdma_csr.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:151: space before tab in indent. + if ((csr & 0x00020000) != 0) { +warning: 1 line adds whitespace errors. +staging-et131x-kill-off-the-rxdma-type.patch +staging-et131x-kill-exp_rom.patch +staging-et131x-global_t-is-now-sane-so-kill-the-global_t-itself.patch +staging-et131x-kill-off-txdma_t.patch +staging-et131x-kill-off-mmc_t.patch +staging-et131x-kill-mac_stat_t.patch +staging-et131x-clean-up-the-rx-status-word-types.patch +staging-et131x-kill-off-the-rx-interrupt-state-enum.patch +staging-et131x-rx_status_block_t-is-now-clean.patch +staging-et131x-fix-rx_status-typing.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:42: space before tab in indent. + rx_ring->rx_status_block = NULL; +warning: 1 line adds whitespace errors. +staging-et131x-clean-up-the-fbr-lookup-table.patch +staging-et131x-clean-up-the-pkt_desc_stat_t-types.patch +staging-et131x-kill-off-rx_ring_t.patch +staging-et131x-kill-mp_err_counters-which-is-unused.patch +staging-et131x-kill-unused-error-defines.patch +staging-et131x-collapse-all-the-function-definitions-into-one-place.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:767: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-et131x-kil-the-txmac-type.patch +staging-et131x-kill-txmac-err-count-typedef.patch +staging-et131x-kill-off-the-txmac_err_t-type.patch +staging-et13x-kill-off-txmac_err_int_t.patch +staging-et131x-kill-rxmac-crc-fields.patch +staging-et131x-kill-off-rxmac_pf_ctrl_t.patch +staging-et131x-kill-of-the-mcif-types.patch +staging-et131x-kill-off-the-rxq_diag-types.patch +staging-et131x-kill-the-space_avail-type.patch +staging-et131x-kill-mif_ctl_t.patch +staging-et131x-kill-the-rxmac-error_reg_t.patch +staging-et131x-kill-off-the-rxmac-ctrl-type.patch +staging-et131x_kill-mac_stat_t.patch +staging-usbip-minor-code-cleanup.patch +staging-usbip-use-print_hex_dump-instead-of-open-coding-it.patch +staging-usbip-cleanup-removing-dead-code.patch +staging-usbip-seperate-usbip-config-debug-from-config_usb_debug.patch +staging-otus-fix-memory-leak.patch +staging-r8187se-fix-a-faulty-if-and-do-additional-cleanups.patch +staging-ramzswap-use-lock-for-64-bit-stats.patch +staging-ramzswap-flush-block-device-before-reset.patch +staging-ramzswap-set-block-size-to-page_size.patch +staging-ramzswap-return-proper-error-code-on-device-create-failure.patch +staging-ramzswap-remove-redundant-check-for-zero-page.patch +staging-ramzswap-handle-case-for-invalid-backing-swap.patch +staging-ramzswap-update-copyright-notice.patch +staging-comedi-pcm3724-checkpatch-cleanups.patch +staging-comedi-pcm3730-checkpatch-cleanups.patch +staging-comedi-poc-checkpatch-cleanups.patch +staging-comedi-ni_660x-checkpatch-cleanups.patch +staging-comedi-ni_670x-checkpatch-cleanups.patch +staging-comedi-ni_65xx-checkpatch-cleanups.patch +staging-comedi-fl512-checkpatch-cleanups.patch +staging-comedi-adq12b-checkpatch-cleanups-2.patch +staging-fix-continuation-line-formats.patch +staging-dt3155-fix-build-warnings.patch +staging-dt3155-coding-cleanups-for-dt3155_io.h.patch +staging-dt3155-replace-u_char-usage.patch +staging-dt3155-replace-u_int-and-u_long-usage.patch +staging-dt3155-fix-coding-style-issues-in-dt3155_io.c.patch +staging-mimio-remove-the-mimio-driver.patch +staging-rar_register-renaming-driver-to-rar_register.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:995: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-rar_register-renaming-directory-to-rar_register.patch +/home/sfr/kernels/next/quilt-tmp/.git/rebase-apply/patch:1066: new blank line at EOF. ++ +warning: 1 line adds whitespace errors. +staging-rar_register-provide-better-explanation-in-kconfig.patch +staging-rar_register-fix-checkpatch-errors-and-debug-header-file.patch +staging-rar_register-fix-checkpatch-errors-and-debug-program-file.patch +staging-rar_register-add-suspend-and-resume-functions.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/staging +From ../quilt-tmp + + 30348ca...de360f7 master -> quilt/staging (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d28054fc23ad --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100218 |