diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-03 17:37:49 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-03 17:37:49 +1100 |
| commit | 7160977d4985fd7994c4055de1fe3b3a4a0ddd86 (patch) | |
| tree | aa07207796b4c028ce8cf9fd09aef8c6cef6a512 | |
| parent | 21cdfc623b3067282a458e338db4a38cff2bd879 (diff) | |
Add linux-next specific files for 20100303next-20100303
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 | 7725 | ||||
| -rw-r--r-- | Next/quilt-import.log | 77 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8125 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..0bca8b9a8ca0 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,160 @@ +Name SHA1 +---- ---- +origin 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +fixes a1a933e8bd4dbb53f4d474c6f55b9f635568bcc4 +arm-current 98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d +m68k-current 00ebfe58b002f0ff387f60c7cd23bc2b274fce1a +powerpc-merge d1d47ec6e62ab08d2ebb925fd9203abfad3adfbf +sparc-current 2531be413b3f2f64c0282073de89fe52bbcbbab5 +scsi-rc-fixes b3dc1a212e5167984616445990c76056034f8eeb +net-current c4d49794ff2838038fd9756eae39c39a5a685833 +sound-current 6679ee1870f7ccdd48e2e5c57919240b8f19a6dc +pci-current f7dd21434a754faaa64f6aab0109742adf16fb10 +wireless-current a120e912eb51e347f36c71b60a1d13af74d30e83 +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current 60b341b778cc2929df16c0a504c91621b3c6a4ad +tty.current 60b341b778cc2929df16c0a504c91621b3c6a4ad +usb.current 60b341b778cc2929df16c0a504c91621b3c6a4ad +staging.current 60b341b778cc2929df16c0a504c91621b3c6a4ad +cpufreq-current 1dbf58881f307e21a3df4b990a5bea401360d02e +input-current 57e413d95b0f92b9a5569408ddc3441e0f20e856 +md-current ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 483b84aa69382d581f272e882158b91387fa2b7a +ide-curent 8495fb1b8d016657133c01a2f258c5f192d2a1b7 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm c41d0358f4b39d3c8e61ec7abc79ab36950eb0c1 +davinci e4352371051ceb0872020cecc1102cf6afeb29a9 +i.MX 9b1489e989695c4d502865f8bec616c0f17e99ab +msm d99c6ab416c69b1788ac1ad5288dd86e776225ae +omap 3b4bd630eb7dda6cfd1691e4fd4b7c5e60d49ecb +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung d608c738bb8fb37e5fbfcdef9c566764f2fea086 +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 88a4dac4436138cfb3f46e43698855ad06464b53 +m68k 00ebfe58b002f0ff387f60c7cd23bc2b274fce1a +m68knommu 59c7835794c222023567fec13bb2a427190e34e6 +microblaze c1cc0284926fa251e9af0358c2c59e8bee4b394f +mips 1b889921932a71f4fbbb4c45ab71a8102ab34e04 +parisc 2bf59ba67ddef9c1e9e87aa3fedcf6ceac8248f2 +powerpc 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +4xx 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +52xx-and-virtex d24720a45ad2928f687c6371482cdfba19b74fc5 +galak e98efaf303ccbff11522a054d155593d7f2bb41f +s390 228b7510bfbff2c561f5c57af334700d0c549272 +sh 94316cdadb0067ba6d1f08b9a6f84fe755bdaa38 +genesis 17ccb834d517c66c09123c24ba8553c5b14e0f78 +sparc 4b17764737bb4ee3364b8bfa2059f51ebc19ccd6 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph aa262d2a6155b67eecf13e4964549d1465923a0f +cifs d7b619cf56218704ffce9d510aa497f0a0bcda0b +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs ece550f51ba175c14ec3ec047815927d7386ea1f +ext3 fd134c41952559b7392f9f92e6cb319c3469e973 +ext4 e3d8d10493a1a9af8687bd7f88c94f72dee88944 +fatfs eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 4818972efb105730f007e5efc05e203a065fc318 +jfs d7eecb483cc29e929bbc5515b8def830d7fc6ad2 +logfs 5c564c2a04d4bb6ba79eeb83bd06de584479f362 +nfs 28daefe2513f9e630a7a8d89b0c16f34f7e61fbb +nfsd 7cf498470ae470ee55b3080692604e0dbf63312c +nilfs2 0d561f12b490dd2b993d73112d3297007688e6df +ocfs2 9df5778ecee8b301b447fc05706792d5f447ace5 +squashfs f49cce0ee3714f1979ad24a4b2ccd00151630632 +udf 774d4c131222c9740aa4391f2fde756ac5aabc6f +v9fs 4f4a05f574b28e79d05f01741dfbf2aada875082 +ubifs abe94c756c08d50566c09a65b9c7fe72f83071c5 +xfs 398007f863a4af2b4a5a07219c5a617f1a098115 +reiserfs-bkl 175359f89df39f4faed663c8cfd6ee0222d2fa1e +vfs 9f009a78fb3b54976cfe8173d05ef483dbda4571 +pci 30ff056c42c665b9ea535d8515890857ae382540 +hid a85821fce2c100a6680511f9693b76f9717fbdee +i2c 79f482cb991b98e7141205999da611cbdceca10d +bjdooks-i2c dbbf97eace6a0d2c2316e01acb6fd237d16345f9 +jdelvare-hwmon b977f3a46892eb1f4a19569d7413b4e78cfa00e2 +kernel-doc 066000dd856709b6980123eb39b957fe26993f7b +v4l-dvb 8c69c6ed6c74c94fa7ad6fa24eda452e4b212d81 +kbuild a8bac511c8c18878908eb49f33f7257610b15180 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide b1681c56f5b6bf551bed2617a395855055836571 +libata a55ab496ea9c820b7192c15ef1fbf3291edfe638 +infiniband fe8875e5a41a36ef26072cf05731df5493ade0e1 +acpi bdb82f44a2ff4f920567c552ae412f6b1cf2e072 +ieee1394 6fdb2ee243404c7cbf530387bf904ad1841ebf5b +ubi af7579329a0445021205add6c2413daa728407e1 +kvm d2be1651b736002e0c76d7095d6c0ba77b4a897c +dlm b6fa8796b2da0390e9f4115e8789a01004fc1c9b +ibft c4d1409bbed8cf2a11b48ce3a075e142f686a588 +scsi 77c9cfc51b0d732b2524799810fb30018074fd60 +async_tx 0fb6f739bb612bc989d295056877374b749e721b +net 2507c05ff55fbf38326b08ed27eaed233bc75042 +wireless b08dfd0435333818a03b38867c556ebcbb3abc02 +mtd d4080cb32ee3d2ed18aa69ffde6010524bd686cd +crypto 8d0c123f8b710561cfd34f6e1a5bebc27988edbe +sound e2659eb5efa4b025fc303f83ca5053aad65a5898 +cpufreq fb4635932a4e19c2f55383f968a0e9b64da37354 +rr 1161b00a7e1f2b5a338b89453bcea2a81385d183 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +tmio-mmc 4b52cd752af330463abf2527a8b0df9a10916613 +input 4b70858ba8d4537daf782defebe5f2ff80ccef2b +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 4671a1322052425afa38fcb7980d2fd2bb0fc99b +device-mapper 2f057f16fbf8f6c27cd07fca32f03e81bf1b84b7 +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia fdc1778617b5b88ce5c2ac9d84a40d7490b4dcae +battery afbc74fdc5b96552c384e57119b3cc13c840bf06 +leds 318c20c410a2078d1ada1020b5b252db11c52fc9 +backlight f2770627c1aab16302474af733591b4de787c1d1 +kgdb 2b389b0171d3d483d910d101d9fe72e4c62ec5bb +slab ca69e392ebe662761f0356dd9de557ba20390dba +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +mfd 4faabcde03a89836169f1437127226f4b0714070 +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32 +voltage 8fa7d5a882b3fcc5bbb3b5c3ba3656e16bde77a8 +security-testing ef57471a73b67a7b65fd8708fd55c77cb7c619af +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 +watchdog 4582dbffee554760fa1e7d46632b9c617c80b2b9 +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b8973a81876d90f916507ac40d1381068dc986a +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 50a76fd3c352ed2740eba01512efcfceee0703be +jc_docs 724e6d3fe8003c3f60bf404bf22e4e331327c596 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 3e58974027b04e84f68b964ef368a6cd758e2f84 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend a9c9b4429df437982d2fbfab1f4b46b01329e9ed +bluetooth 47871889c601d8199c51a4086f77eebd77c29b0b +fsnotify 6c3cc43e21c326a5f7a741e5dcc828736d49de25 +irda 1d71d682e1e4c6639f6c28042a1a2bc73c5e0554 +hwlat a2c8b6b9bc412196e4a0bfa1c6b33840f7f0a039 +drbd 9f1574b54d8a822b42084a36ca41a922b83bccec +catalin 55639353a0035052d9ea6cfe4dde0ac7fcbb2c9f +alacrity e1077ef3b2751766c4437e2f974e3d7372742d0d +i7core_edac d0ae29a6eed06533e30dc7cd00d6f7983e3a7287 +devicetree df0edeb59eb559be0bee53452fda2f5cc0ae133f +spi 4f4517c45f325ba511458465430a52864a5d0d30 +limits 57158a0fd4c9e29b403d422ac820cf238066cedf +omap_dss2 21df20fcfb4e88f4cd4991e9e67de549e6480adf +als b7a9faba2d4f6d8cf95ac02ec5461c95241a0a01 +tip e083b32300fff215d910f6faff86a0f10a5cbf42 +edac-amd cab4d27764d5a8654212b3e96eb0ae793aec5b94 +oprofile bb1165d6882f423f90fc7007a88c6c993b7c2ac4 +percpu a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 +workqueues 5ab0fec5e715dd22e9d30d9f2eb1f0bbb05fb001 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 26576add2492e80eb1a24f3e7e3ebc066627edec +tty ac6752797b51b863bf6f75b2ad67a6fc4c200874 +usb c59bbfab8a3883d27cf00db50df1bd39c38efd23 +staging 9a355bdb40404cb6536e72f8383996e66989bd69 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..88cbe7536146 --- /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 +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 +ibft git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft-2.6.git#master +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git#master +async_tx git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx.git#next +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git#master +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..f71541f90e6c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7725 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 13dda80 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci +Merging origin/master +$ git merge origin/master +Updating 13dda80..3a5b27b +Fast-forward + Documentation/DocBook/mac80211.tmpl | 3 +- + Documentation/feature-removal-schedule.txt | 31 +- + Documentation/isdn/INTERFACE.CAPI | 9 +- + Documentation/isdn/README.gigaset | 10 +- + Documentation/kernel-parameters.txt | 10 + + Documentation/networking/dccp.txt | 6 +- + Documentation/networking/ip-sysctl.txt | 58 +- + Documentation/networking/ixgbevf.txt | 90 + + Documentation/networking/packet_mmap.txt | 8 +- + Documentation/networking/regulatory.txt | 24 + + Documentation/networking/tcp-thin.txt | 47 + + Documentation/powerpc/dts-bindings/fsl/can.txt | 53 + + Documentation/powerpc/dts-bindings/fsl/mpc5200.txt | 9 +- + MAINTAINERS | 30 +- + arch/arm/configs/am3517_evm_defconfig | 43 +- + arch/arm/configs/devkit8000_defconfig | 1889 +++ + arch/arm/configs/igep0020_defconfig | 525 +- + arch/arm/configs/omap3_defconfig | 180 +- + arch/arm/configs/omap3_evm_defconfig | 6 +- + arch/arm/configs/omap3_pandora_defconfig | 678 +- + arch/arm/configs/omap_4430sdp_defconfig | 7 +- + arch/arm/configs/omap_zoom3_defconfig | 6 +- + 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 | 25 +- + arch/arm/mach-omap1/clock_data.c | 44 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/flash.c | 33 + + arch/arm/mach-omap1/i2c.c | 6 +- + 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 | 87 +- + arch/arm/mach-omap2/board-2430sdp.c | 23 +- + arch/arm/mach-omap2/board-3430sdp.c | 151 +- + arch/arm/mach-omap2/board-3630sdp.c | 4 +- + arch/arm/mach-omap2/board-4430sdp.c | 18 +- + arch/arm/mach-omap2/board-am3517evm.c | 237 +- + 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 | 285 +- + arch/arm/mach-omap2/board-ldp.c | 16 +- + arch/arm/mach-omap2/board-n8x0.c | 447 +- + 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 | 54 +- + 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 | 122 + + 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 | 121 + + arch/arm/mach-omap2/clkt_clksel.c | 409 + + arch/arm/mach-omap2/clkt_dpll.c | 386 + + arch/arm/mach-omap2/clock.c | 1029 +-- + arch/arm/mach-omap2/clock.h | 50 +- + .../{clock2xxx_data.c => clock2420_data.c} | 705 +- + arch/arm/mach-omap2/clock2430.c | 59 + + .../{clock2xxx_data.c => clock2430_data.c} | 643 +- + arch/arm/mach-omap2/clock2xxx.c | 599 +- + arch/arm/mach-omap2/clock2xxx.h | 31 +- + arch/arm/mach-omap2/clock34xx.c | 261 +- + arch/arm/mach-omap2/clock34xx.h | 19 +- + arch/arm/mach-omap2/clock3517.c | 124 + + arch/arm/mach-omap2/clock3517.h | 14 + + arch/arm/mach-omap2/clock36xx.c | 72 + + arch/arm/mach-omap2/clock36xx.h | 13 + + arch/arm/mach-omap2/clock3xxx.c | 104 + + arch/arm/mach-omap2/clock3xxx.h | 21 + + .../{clock34xx_data.c => clock3xxx_data.c} | 888 +- + arch/arm/mach-omap2/clock44xx.c | 33 - + arch/arm/mach-omap2/clock44xx.h | 13 +- + arch/arm/mach-omap2/clock44xx_data.c | 734 +- + arch/arm/mach-omap2/clockdomain.c | 788 +- + arch/arm/mach-omap2/clockdomains.h | 672 +- + arch/arm/mach-omap2/clockdomains44xx.h | 250 + + arch/arm/mach-omap2/cm-regbits-34xx.h | 28 +- + arch/arm/mach-omap2/cm-regbits-44xx.h | 536 +- + arch/arm/mach-omap2/cm.h | 8 +- + arch/arm/mach-omap2/control.c | 6 +- + arch/arm/mach-omap2/cpuidle34xx.c | 226 +- + arch/arm/mach-omap2/devices.c | 45 +- + arch/arm/mach-omap2/{dpll.c => dpll3xxx.c} | 191 +- + 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/i2c.c | 6 +- + arch/arm/mach-omap2/id.c | 6 + + 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 | 107 +- + arch/arm/mach-omap2/mailbox.c | 47 +- + arch/arm/mach-omap2/mcbsp.c | 24 +- + arch/arm/mach-omap2/mmc-twl4030.c | 542 - + arch/arm/mach-omap2/mux.c | 52 +- + arch/arm/mach-omap2/mux.h | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 315 +- + .../{omap_hwmod_2420.h => omap_hwmod_2420_data.c} | 38 +- + .../{omap_hwmod_2430.h => omap_hwmod_2430_data.c} | 38 +- + arch/arm/mach-omap2/omap_hwmod_34xx.h | 168 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 181 + + arch/arm/mach-omap2/omap_hwmod_common_data.c | 68 + + arch/arm/mach-omap2/omap_hwmod_common_data.h | 24 + + arch/arm/mach-omap2/opp2xxx.h | 5 + + arch/arm/mach-omap2/pm-debug.c | 25 +- + arch/arm/mach-omap2/pm.h | 20 + + arch/arm/mach-omap2/pm24xx.c | 54 +- + arch/arm/mach-omap2/pm34xx.c | 43 +- + arch/arm/mach-omap2/powerdomain.c | 776 +- + arch/arm/mach-omap2/powerdomains.h | 134 +- + arch/arm/mach-omap2/powerdomains24xx.h | 91 +- + arch/arm/mach-omap2/powerdomains34xx.h | 159 +- + arch/arm/mach-omap2/powerdomains44xx.h | 310 + + arch/arm/mach-omap2/prcm-common.h | 9 + + arch/arm/mach-omap2/prcm.c | 114 +- + 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/sdrc.c | 11 +- + arch/arm/mach-omap2/serial.c | 80 +- + arch/arm/mach-omap2/sleep34xx.S | 61 +- + arch/arm/mach-omap2/timer-gp.c | 5 - + arch/arm/mach-omap2/timer-mpu.c | 2 +- + arch/arm/mach-omap2/usb-musb.c | 82 +- + arch/arm/plat-omap/Kconfig | 57 +- + arch/arm/plat-omap/clock.c | 52 +- + arch/arm/plat-omap/common.c | 69 +- + arch/arm/plat-omap/devices.c | 39 +- + arch/arm/plat-omap/dma.c | 10 +- + arch/arm/plat-omap/dmtimer.c | 126 +- + arch/arm/plat-omap/gpio.c | 302 +- + arch/arm/plat-omap/i2c.c | 18 +- + arch/arm/plat-omap/include/plat/clkdev_omap.h | 26 +- + arch/arm/plat-omap/include/plat/clock.h | 100 +- + arch/arm/plat-omap/include/plat/clockdomain.h | 98 +- + arch/arm/plat-omap/include/plat/common.h | 24 +- + arch/arm/plat-omap/include/plat/control.h | 40 +- + arch/arm/plat-omap/include/plat/cpu.h | 92 +- + arch/arm/plat-omap/include/plat/display.h | 117 +- + arch/arm/plat-omap/include/plat/dma-44xx.h | 147 + + arch/arm/plat-omap/include/plat/dma.h | 86 +- + arch/arm/plat-omap/include/plat/flash.h | 16 + + arch/arm/plat-omap/include/plat/gpmc.h | 4 +- + arch/arm/plat-omap/include/plat/i2c.h | 5 +- + arch/arm/plat-omap/include/plat/io.h | 42 +- + arch/arm/plat-omap/include/plat/irqs-44xx.h | 144 + + arch/arm/plat-omap/include/plat/irqs.h | 102 +- + arch/arm/plat-omap/include/plat/mcbsp.h | 72 +- + 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 | 11 +- + arch/arm/plat-omap/include/plat/omap_hwmod.h | 138 +- + arch/arm/plat-omap/include/plat/powerdomain.h | 95 +- + arch/arm/plat-omap/include/plat/prcm.h | 11 +- + 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/io.c | 4 - + arch/arm/plat-omap/iommu.c | 6 +- + arch/arm/plat-omap/iopgtable.h | 50 +- + arch/arm/plat-omap/mailbox.c | 8 +- + arch/arm/plat-omap/mcbsp.c | 774 +- + arch/arm/plat-omap/omap_device.c | 102 +- + arch/arm/plat-omap/sram.c | 2 +- + 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/include/asm/scatterlist.h | 21 +- + arch/sparc/kernel/devices.c | 2 - + arch/sparc/kernel/leon_kernel.c | 2 +- + arch/sparc/kernel/leon_smp.c | 4 +- + arch/sparc/kernel/pci.c | 75 + + arch/sparc/kernel/pcic.c | 2 - + arch/sparc/kernel/setup_32.c | 2 - + arch/sparc/kernel/sun4d_smp.c | 2 +- + arch/sparc/kernel/sys_sparc32.c | 1 - + arch/sparc/kernel/unaligned_64.c | 11 +- + arch/sparc/mm/fault_32.c | 106 +- + arch/sparc/mm/fault_64.c | 34 +- + arch/sparc/prom/console_32.c | 1 - + arch/sparc/prom/console_64.c | 1 - + arch/sparc/prom/devmap.c | 1 - + arch/sparc/prom/devops_32.c | 2 - + arch/sparc/prom/init_32.c | 1 - + arch/sparc/prom/palloc.c | 1 - + arch/sparc/prom/ranges.c | 2 - + arch/sparc/prom/segment.c | 1 - + arch/sparc/prom/tree_32.c | 1 - + arch/sparc/prom/tree_64.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/bluetooth/ath3k.c | 2 + + drivers/bluetooth/bcm203x.c | 2 +- + drivers/bluetooth/bfusb.c | 2 +- + drivers/bluetooth/bluecard_cs.c | 2 +- + drivers/bluetooth/bpa10x.c | 2 +- + drivers/bluetooth/bt3c_cs.c | 2 +- + drivers/bluetooth/btmrvl_debugfs.c | 14 +- + drivers/bluetooth/btmrvl_main.c | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/bluetooth/btsdio.c | 2 +- + drivers/bluetooth/btuart_cs.c | 2 +- + drivers/bluetooth/btusb.c | 2 +- + drivers/bluetooth/dtl1_cs.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/char/hw_random/Kconfig | 2 +- + drivers/firmware/iscsi_ibft.c | 6 +- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 11 +- + drivers/infiniband/hw/nes/nes_nic.c | 85 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 2 +- + drivers/isdn/Kconfig | 43 +- + 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/asyncdata.c | 6 +- + drivers/isdn/gigaset/bas-gigaset.c | 18 +- + drivers/isdn/gigaset/capi.c | 106 +- + drivers/isdn/gigaset/common.c | 49 +- + drivers/isdn/gigaset/ev-layer.c | 63 +- + drivers/isdn/gigaset/gigaset.h | 11 +- + drivers/isdn/gigaset/i4l.c | 52 +- + drivers/isdn/gigaset/interface.c | 12 +- + drivers/isdn/gigaset/isocdata.c | 44 +- + drivers/isdn/gigaset/proc.c | 2 - + drivers/isdn/gigaset/usb-gigaset.c | 2 +- + 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/isdn/i4l/Kconfig | 7 - + drivers/media/dvb/dvb-core/dvb_net.c | 14 +- + drivers/message/i2o/i2o_proc.c | 11 +- + drivers/mfd/Kconfig | 2 +- + 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/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/3c501.c | 2 +- + drivers/net/3c505.c | 13 +- + drivers/net/3c509.c | 10 +- + drivers/net/3c515.c | 2 +- + drivers/net/3c523.c | 13 +- + drivers/net/3c527.c | 17 +- + drivers/net/3c59x.c | 4 +- + drivers/net/7990.c | 6 +- + drivers/net/8139cp.c | 81 +- + drivers/net/8139too.c | 196 +- + drivers/net/82596.c | 15 +- + drivers/net/Kconfig | 82 +- + drivers/net/Makefile | 5 + + drivers/net/a2065.c | 6 +- + drivers/net/acenic.c | 4 +- + drivers/net/amd8111e.c | 21 +- + drivers/net/amd8111e.h | 1 - + drivers/net/appletalk/ltpc.c | 1 - + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/ariadne.c | 4 +- + drivers/net/arm/am79c961a.c | 12 +- + drivers/net/arm/at91_ether.c | 9 +- + drivers/net/arm/ep93xx_eth.c | 140 +- + drivers/net/arm/ether3.c | 2 +- + drivers/net/arm/ixp4xx_eth.c | 13 +- + drivers/net/arm/ks8695net.c | 23 +- + drivers/net/arm/w90p910_ether.c | 8 +- + drivers/net/at1700.c | 8 +- + 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 | 126 +- + drivers/net/atl1e/atl1e_hw.c | 23 +- + drivers/net/atl1e/atl1e_main.c | 160 +- + drivers/net/atl1e/atl1e_param.c | 35 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/atlx/atl2.c | 4 +- + drivers/net/atlx/atlx.c | 2 +- + drivers/net/atp.c | 9 +- + drivers/net/au1000_eth.c | 7 +- + drivers/net/b44.c | 94 +- + drivers/net/bcm63xx_enet.c | 15 +- + drivers/net/benet/Kconfig | 4 +- + drivers/net/benet/be.h | 19 +- + drivers/net/benet/be_cmds.c | 118 +- + drivers/net/benet/be_cmds.h | 29 +- + drivers/net/benet/be_ethtool.c | 65 +- + drivers/net/benet/be_hw.h | 121 +- + drivers/net/benet/be_main.c | 540 +- + drivers/net/bfin_mac.c | 8 +- + drivers/net/bmac.c | 13 +- + drivers/net/bnx2.c | 410 +- + drivers/net/bnx2.h | 3 +- + drivers/net/bnx2x.h | 53 +- + drivers/net/bnx2x_fw_defs.h | 7 +- + drivers/net/bnx2x_hsi.h | 10 +- + drivers/net/bnx2x_init_ops.h | 13 +- + drivers/net/bnx2x_link.c | 21 +- + drivers/net/bnx2x_main.c | 284 +- + drivers/net/bonding/bond_main.c | 27 +- + 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 | 8 + + 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 | 27 +- + drivers/net/can/ti_hecc.c | 73 +- + drivers/net/can/usb/Kconfig | 2 +- + drivers/net/can/usb/ems_usb.c | 6 +- + drivers/net/can/vcan.c | 12 +- + drivers/net/cassini.c | 437 +- + drivers/net/chelsio/common.h | 44 +- + drivers/net/chelsio/cxgb2.c | 20 +- + drivers/net/chelsio/espi.c | 4 +- + drivers/net/chelsio/pm3393.c | 22 +- + drivers/net/chelsio/sge.c | 12 +- + drivers/net/chelsio/subr.c | 34 +- + drivers/net/chelsio/vsc7326.c | 24 +- + drivers/net/cnic.c | 206 +- + drivers/net/cnic.h | 13 +- + drivers/net/cnic_defs.h | 2 +- + drivers/net/cnic_if.h | 6 +- + drivers/net/cpmac.c | 4 +- + drivers/net/cris/eth_v10.c | 8 +- + drivers/net/cs89x0.c | 2 +- + drivers/net/cxgb3/common.h | 28 +- + drivers/net/cxgb3/cxgb3_main.c | 10 +- + 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 | 18 +- + drivers/net/davinci_emac.c | 12 +- + drivers/net/de620.c | 2 +- + drivers/net/declance.c | 6 +- + drivers/net/defxx.c | 24 +- + drivers/net/depca.c | 5 +- + drivers/net/dl2k.c | 9 +- + drivers/net/dl2k.h | 2 +- + drivers/net/dm9000.c | 5 +- + drivers/net/e100.c | 18 +- + drivers/net/e1000/e1000.h | 1 + + drivers/net/e1000/e1000_ethtool.c | 19 +- + drivers/net/e1000/e1000_main.c | 46 +- + 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 | 21 +- + drivers/net/eexpress.c | 22 +- + drivers/net/ehea/ehea_main.c | 9 +- + drivers/net/enc28j60.c | 2 +- + drivers/net/enic/enic.h | 5 +- + drivers/net/enic/enic_main.c | 208 +- + 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 | 9 +- + drivers/net/eth16i.c | 2 +- + drivers/net/ethoc.c | 14 +- + drivers/net/ewrk3.c | 5 +- + drivers/net/fealnx.c | 8 +- + drivers/net/fec.c | 84 +- + drivers/net/fec_mpc52xx.c | 5 +- + drivers/net/forcedeth.c | 8 +- + drivers/net/fs_enet/Kconfig | 10 +- + drivers/net/fs_enet/fs_enet-main.c | 93 +- + drivers/net/fs_enet/fs_enet.h | 49 +- + drivers/net/fs_enet/mac-fcc.c | 9 +- + drivers/net/fs_enet/mac-fec.c | 62 +- + drivers/net/fs_enet/mac-scc.c | 13 +- + drivers/net/fs_enet/mii-fec.c | 4 +- + drivers/net/gianfar.c | 4 +- + drivers/net/greth.c | 1634 +++ + drivers/net/greth.h | 143 + + drivers/net/hamachi.c | 13 +- + drivers/net/hp100.c | 13 +- + drivers/net/ibm_newemac/core.c | 8 +- + drivers/net/ibmlana.c | 2 +- + drivers/net/ibmveth.c | 8 +- + 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 | 414 +- + drivers/net/igbvf/netdev.c | 31 +- + drivers/net/ioc3-eth.c | 11 +- + drivers/net/ipg.c | 13 +- + 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 | 718 -- + drivers/net/iseries_veth.c | 8 +- + drivers/net/ixgb/ixgb.h | 11 +- + drivers/net/ixgb/ixgb_main.c | 104 +- + 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 | 195 +- + drivers/net/ixgbe/ixgbe_fcoe.c | 4 +- + drivers/net/ixgbe/ixgbe_main.c | 676 +- + 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 | 62 +- + drivers/net/jme.h | 41 +- + drivers/net/korina.c | 10 +- + drivers/net/ks8851.c | 7 +- + drivers/net/ks8851_mll.c | 7 +- + drivers/net/ksz884x.c | 7335 +++++++++++ + drivers/net/lance.c | 2 +- + drivers/net/lib82596.c | 21 +- + drivers/net/lib8390.c | 15 +- + drivers/net/ll_temac_main.c | 25 +- + drivers/net/loopback.c | 16 +- + drivers/net/lp486e.c | 16 +- + drivers/net/mac8390.c | 632 +- + drivers/net/mac89x0.c | 4 +- + drivers/net/macb.c | 38 +- + drivers/net/mace.c | 11 +- + drivers/net/macmace.c | 12 +- + drivers/net/macvlan.c | 117 +- + drivers/net/macvtap.c | 803 ++ + drivers/net/meth.c | 3 - + drivers/net/mlx4/en_rx.c | 8 +- + drivers/net/mlx4/main.c | 2 +- + drivers/net/mv643xx_eth.c | 6 +- + drivers/net/myri10ge/myri10ge.c | 198 +- + drivers/net/myri_sbus.c | 6 +- + drivers/net/natsemi.c | 8 +- + 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 | 46 +- + 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/ni5010.c | 3 +- + drivers/net/ni52.c | 10 +- + drivers/net/ni65.c | 2 +- + drivers/net/niu.c | 699 +- + drivers/net/ns83820.c | 4 +- + drivers/net/octeon/octeon_mgmt.c | 18 +- + drivers/net/pasemi_mac.c | 2 +- + drivers/net/pci-skeleton.c | 1029 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/3c589_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 11 +- + drivers/net/pcmcia/fmvj18x_cs.c | 10 +- + drivers/net/pcmcia/nmclan_cs.c | 18 +- + drivers/net/pcmcia/smc91c92_cs.c | 35 +- + drivers/net/pcmcia/xirc2ps_cs.c | 88 +- + drivers/net/pcnet32.c | 507 +- + drivers/net/phy/broadcom.c | 5 +- + 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 | 4 +- + 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 | 1274 ++ + 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 | 1189 ++- + drivers/net/qlge/qlge_mpi.c | 340 +- + drivers/net/r6040.c | 37 +- + drivers/net/r8169.c | 166 +- + drivers/net/rrunner.c | 2 +- + drivers/net/s2io.c | 13 +- + drivers/net/sb1250-mac.c | 6 +- + drivers/net/sc92031.c | 6 +- + drivers/net/sfc/efx.c | 8 +- + 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 | 221 +- + drivers/net/sis900.c | 9 +- + drivers/net/skfp/skfddi.c | 35 +- + drivers/net/skge.c | 218 +- + drivers/net/sky2.c | 726 +- + drivers/net/sky2.h | 10 +- + drivers/net/smc911x.c | 14 +- + drivers/net/smc911x.h | 4 +- + drivers/net/smc9194.c | 12 +- + drivers/net/smc91x.c | 11 +- + drivers/net/smsc911x.c | 53 +- + drivers/net/smsc9420.c | 9 +- + drivers/net/sonic.c | 13 +- + drivers/net/spider_net.c | 4 +- + drivers/net/starfire.c | 13 +- + 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} | 212 +- + drivers/net/stmmac/{mac100.h => dwmac100.h} | 0 + drivers/net/stmmac/{gmac.h => dwmac1000.h} | 18 +- + drivers/net/stmmac/dwmac1000_core.c | 243 + + 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 | 10 +- + drivers/net/sun3lance.c | 2 +- + drivers/net/sunbmac.c | 7 +- + drivers/net/sundance.c | 9 +- + drivers/net/sungem.c | 14 +- + drivers/net/sunhme.c | 26 +- + drivers/net/sunlance.c | 6 +- + drivers/net/sunqe.c | 11 +- + drivers/net/sunvnet.c | 7 +- + drivers/net/tc35815.c | 27 +- + drivers/net/tehuti.c | 159 +- + drivers/net/tehuti.h | 30 +- + drivers/net/tg3.c | 965 +- + drivers/net/tg3.h | 162 +- + drivers/net/tlan.c | 37 +- + drivers/net/tlan.h | 3 - + drivers/net/tokenring/3c359.c | 7 +- + drivers/net/tokenring/abyss.c | 2 +- + drivers/net/tokenring/ibmtr.c | 4 +- + drivers/net/tokenring/lanstreamer.c | 6 +- + drivers/net/tokenring/olympic.c | 7 +- + drivers/net/tokenring/tms380tr.c | 8 +- + drivers/net/tokenring/tmspci.c | 2 +- + drivers/net/tsi108_eth.c | 22 +- + drivers/net/tulip/21142.c | 76 +- + drivers/net/tulip/de2104x.c | 163 +- + drivers/net/tulip/de4x5.c | 16 +- + drivers/net/tulip/dmfe.c | 103 +- + 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 | 187 +- + drivers/net/tulip/uli526x.c | 64 +- + drivers/net/tulip/winbond-840.c | 186 +- + drivers/net/tulip/xircom_cb.c | 46 +- + drivers/net/tun.c | 127 +- + drivers/net/typhoon.c | 253 +- + drivers/net/ucc_geth.c | 29 +- + drivers/net/usb/asix.c | 117 +- + drivers/net/usb/catc.c | 9 +- + 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 | 256 +- + 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 | 245 +- + drivers/net/usb/usbnet.c | 238 +- + drivers/net/veth.c | 19 +- + drivers/net/via-rhine.c | 9 +- + drivers/net/via-velocity.c | 16 +- + drivers/net/virtio_net.c | 474 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 19 +- + drivers/net/vxge/vxge-main.c | 16 +- + 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/Kconfig | 1 + + drivers/net/wireless/adm8211.c | 27 +- + drivers/net/wireless/airo.c | 39 +- + 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 | 193 +- + 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 | 30 +- + 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 | 178 +- + 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 | 1451 +-- + drivers/net/wireless/ath/ath9k/pci.c | 75 +- + drivers/net/wireless/ath/ath9k/phy.h | 3 + + drivers/net/wireless/ath/ath9k/rc.c | 27 +- + 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 | 6 +- + drivers/net/wireless/b43/Makefile | 2 +- + drivers/net/wireless/b43/b43.h | 20 +- + drivers/net/wireless/b43/dma.c | 19 - + drivers/net/wireless/b43/dma.h | 5 - + drivers/net/wireless/b43/main.c | 98 +- + 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/leds.h | 2 +- + 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_cs.c | 17 +- + 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 | 25 +- + drivers/net/wireless/iwlwifi/iwl-3945.h | 25 +- + drivers/net/wireless/iwlwifi/iwl-4965-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-4965.c | 14 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 125 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 116 +- + 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 | 17 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 354 +- + drivers/net/wireless/iwlwifi/iwl-calib.c | 11 +- + drivers/net/wireless/iwlwifi/iwl-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 68 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 388 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 55 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 6 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 60 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 1461 ++- + drivers/net/wireless/iwlwifi/iwl-dev.h | 97 +- + 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 | 17 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 9 +- + 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 | 136 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 258 +- + 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 | 77 +- + drivers/net/wireless/iwlwifi/iwl3945-base.c | 197 +- + 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 | 81 +- + 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 | 198 +- + drivers/net/wireless/mwl8k.c | 2084 ++-- + drivers/net/wireless/orinoco/hw.c | 22 +- + drivers/net/wireless/orinoco/hw.h | 2 +- + drivers/net/wireless/orinoco/main.c | 7 +- + drivers/net/wireless/orinoco/orinoco_cs.c | 9 +- + 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 | 51 +- + 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/p54usb.c | 2 + + drivers/net/wireless/p54/txrx.c | 4 +- + drivers/net/wireless/prism54/islpci_hotplug.c | 2 +- + drivers/net/wireless/ray_cs.c | 10 +- + drivers/net/wireless/rndis_wlan.c | 388 +- + drivers/net/wireless/rt2x00/Kconfig | 71 +- + drivers/net/wireless/rt2x00/rt2400pci.c | 12 +- + drivers/net/wireless/rt2x00/rt2400pci.h | 1 + + drivers/net/wireless/rt2x00/rt2500pci.c | 48 +- + drivers/net/wireless/rt2x00/rt2500pci.h | 1 + + drivers/net/wireless/rt2x00/rt2500usb.c | 39 +- + drivers/net/wireless/rt2x00/rt2800.h | 14 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 203 +- + drivers/net/wireless/rt2x00/rt2800lib.h | 3 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 104 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 373 +- + drivers/net/wireless/rt2x00/rt2800usb.h | 90 +- + drivers/net/wireless/rt2x00/rt2x00.h | 96 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 42 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 10 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 1 + + drivers/net/wireless/rt2x00/rt2x00queue.c | 79 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 5 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 11 +- + drivers/net/wireless/rt2x00/rt2x00soc.h | 10 +- + drivers/net/wireless/rt2x00/rt61pci.c | 46 +- + drivers/net/wireless/rt2x00/rt61pci.h | 9 + + drivers/net/wireless/rt2x00/rt73usb.c | 41 +- + drivers/net/wireless/rt2x00/rt73usb.h | 2 + + 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 | 6 +- + drivers/net/wireless/rtl818x/rtl8187_leds.h | 2 +- + drivers/net/wireless/wl12xx/Makefile | 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 | 67 +- + drivers/net/wireless/wl12xx/wl1271_acx.c | 196 +- + drivers/net/wireless/wl12xx/wl1271_acx.h | 50 +- + drivers/net/wireless/wl12xx/wl1271_boot.c | 102 +- + drivers/net/wireless/wl12xx/wl1271_cmd.c | 137 +- + drivers/net/wireless/wl12xx/wl1271_cmd.h | 67 +- + drivers/net/wireless/wl12xx/wl1271_conf.h | 174 +- + drivers/net/wireless/wl12xx/wl1271_debugfs.c | 62 + + drivers/net/wireless/wl12xx/wl1271_event.c | 68 +- + drivers/net/wireless/wl12xx/wl1271_event.h | 2 +- + drivers/net/wireless/wl12xx/wl1271_init.c | 50 +- + drivers/net/wireless/wl12xx/wl1271_init.h | 4 + + drivers/net/wireless/wl12xx/wl1271_io.c | 213 + + drivers/net/wireless/wl12xx/wl1271_io.h | 68 + + drivers/net/wireless/wl12xx/wl1271_main.c | 823 +- + drivers/net/wireless/wl12xx/wl1271_ps.c | 37 +- + drivers/net/wireless/wl12xx/wl1271_ps.h | 3 +- + drivers/net/wireless/wl12xx/wl1271_reg.h | 99 - + drivers/net/wireless/wl12xx/wl1271_rx.c | 11 +- + drivers/net/wireless/wl12xx/wl1271_spi.c | 158 - + drivers/net/wireless/wl12xx/wl1271_spi.h | 30 - + drivers/net/wireless/wl12xx/wl1271_testmode.c | 283 + + drivers/net/wireless/wl12xx/wl1271_testmode.h | 31 + + drivers/net/wireless/wl12xx/wl1271_tx.c | 71 +- + drivers/net/wireless/wl12xx/wl1271_tx.h | 36 + + drivers/net/wireless/zd1201.c | 14 +- + 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 | 173 +- + drivers/net/znet.c | 3 +- + drivers/pci/Makefile | 2 +- + drivers/pci/iov.c | 15 + + drivers/pci/quirks.c | 1 + + drivers/pci/vpd.c | 61 + + 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/spi/Kconfig | 2 +- + drivers/spi/omap2_mcspi.c | 2 +- + drivers/ssb/driver_chipcommon_pmu.c | 7 + + drivers/ssb/driver_mipscore.c | 5 +- + drivers/ssb/ssb_private.h | 4 +- + drivers/staging/arlan/arlan-main.c | 25 +- + drivers/staging/et131x/et131x_netdev.c | 19 +- + drivers/staging/netwave/netwave_cs.c | 8 +- + drivers/staging/octeon/ethernet.c | 2 +- + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 9 - + .../rtl8187se/ieee80211/ieee80211_softmac.c | 24 +- + drivers/staging/rtl8187se/r8180_core.c | 4 +- + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 12 +- + .../staging/rtl8192su/ieee80211/ieee80211_r8192s.h | 2 +- + drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c | 18 +- + .../rtl8192su/ieee80211/ieee80211_softmac.c | 38 +- + .../staging/rtl8192su/ieee80211/rtl819x_BAProc.c | 4 +- + drivers/staging/rtl8192su/r8192U_core.c | 4 +- + drivers/staging/slicoss/slicoss.c | 16 +- + drivers/staging/vt6655/device_main.c | 8 +- + drivers/staging/vt6656/main_usb.c | 8 +- + drivers/staging/wavelan/wavelan.c | 14 +- + drivers/staging/wavelan/wavelan_cs.c | 20 +- + drivers/staging/wlags49_h2/wl_netdev.c | 30 +- + 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/vhost/Kconfig | 11 + + drivers/vhost/Makefile | 2 + + drivers/vhost/net.c | 669 + + drivers/vhost/vhost.c | 1104 ++ + drivers/vhost/vhost.h | 161 + + 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 + + drivers/video/omap2/displays/panel-generic.c | 56 +- + .../video/omap2/displays/panel-sharp-lq043t1dg01.c | 159 + + .../video/omap2/displays/panel-sharp-ls037v7dw01.c | 77 +- + drivers/video/omap2/displays/panel-taal.c | 253 +- + .../video/omap2/displays/panel-toppoly-tdo35s.c | 154 + + .../video/omap2/displays/panel-tpo-td043mtea1.c | 528 + + drivers/video/omap2/dss/Kconfig | 26 +- + drivers/video/omap2/dss/core.c | 117 +- + drivers/video/omap2/dss/dispc.c | 42 +- + drivers/video/omap2/dss/display.c | 119 +- + drivers/video/omap2/dss/dpi.c | 144 +- + drivers/video/omap2/dss/dsi.c | 1031 +-- + drivers/video/omap2/dss/dss.c | 42 +- + drivers/video/omap2/dss/dss.h | 23 +- + drivers/video/omap2/dss/manager.c | 48 +- + drivers/video/omap2/dss/overlay.c | 2 +- + drivers/video/omap2/dss/rfbi.c | 321 +- + drivers/video/omap2/dss/sdi.c | 115 +- + drivers/video/omap2/dss/venc.c | 296 +- + drivers/video/omap2/omapfb/Kconfig | 11 +- + drivers/video/omap2/omapfb/omapfb-ioctl.c | 68 +- + drivers/video/omap2/omapfb/omapfb-main.c | 133 +- + drivers/video/omap2/omapfb/omapfb.h | 9 + + drivers/video/sunxvr500.c | 1 + + drivers/w1/masters/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + 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/bio.c | 4 +- + fs/seq_file.c | 130 +- + include/linux/Kbuild | 2 + + include/linux/brcmphy.h | 11 + + include/linux/can/dev.h | 18 + + include/linux/can/netlink.h | 17 +- + include/linux/can/platform/ti_hecc.h | 8 +- + include/linux/ethtool.h | 51 + + include/linux/icmpv6.h | 3 +- + include/linux/ieee80211.h | 108 +- + include/linux/if_link.h | 30 + + include/linux/if_macvlan.h | 84 + + include/linux/if_packet.h | 1 + + include/linux/if_tun.h | 17 + + 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 | 186 +- + include/linux/netfilter.h | 63 +- + 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 | 70 +- + include/linux/netfilter/xt_CT.h | 17 + + include/linux/netfilter_arp/arp_tables.h | 11 +- + include/linux/netfilter_bridge/ebtables.h | 2 +- + include/linux/netfilter_ipv4/ip_tables.h | 18 +- + include/linux/netfilter_ipv6/ip6_tables.h | 17 +- + include/linux/netpoll.h | 11 +- + include/linux/nl80211.h | 145 +- + include/linux/omapfb.h | 9 + + include/linux/pci.h | 99 + + include/linux/phy.h | 1 + + include/linux/rculist.h | 5 + + include/linux/rtnetlink.h | 2 + + include/linux/seq_file.h | 18 + + include/linux/skbuff.h | 19 +- + include/linux/snmp.h | 1 + + include/linux/stmmac.h | 53 + + include/linux/sysctl.h | 4 - + include/linux/tcp.h | 7 +- + include/linux/usb/musb.h | 3 + + include/linux/usb/otg.h | 10 + + include/linux/usb/usbnet.h | 21 - + include/linux/vhost.h | 130 + + include/linux/xfrm.h | 12 +- + include/net/bluetooth/hci.h | 6 +- + include/net/bluetooth/hci_core.h | 5 +- + include/net/cfg80211.h | 287 +- + include/net/dst.h | 2 - + include/net/icmp.h | 2 +- + include/net/ieee80211_radiotap.h | 4 + + include/net/if_inet6.h | 2 +- + include/net/inet_sock.h | 4 +- + include/net/ip.h | 9 +- + include/net/ip6_fib.h | 4 +- + include/net/ip_vs.h | 38 +- + include/net/ipcomp.h | 2 +- + include/net/ipv6.h | 8 +- + include/net/llc.h | 39 +- + include/net/llc_conn.h | 2 + + include/net/mac80211.h | 386 +- + 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 | 25 + + include/net/netfilter/nf_nat_helper.h | 32 +- + include/net/netlink.h | 2 +- + 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/netns/packet.h | 4 +- + 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/rtnetlink.h | 2 + + include/net/sch_generic.h | 19 + + include/net/snmp.h | 14 +- + include/net/sock.h | 17 +- + include/net/tcp.h | 36 +- + include/net/xfrm.h | 82 +- + include/pcmcia/device_id.h | 5 + + kernel/sysctl.c | 2 +- + kernel/taskstats.c | 6 +- + 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/bluetooth/hci_core.c | 12 +- + net/bluetooth/hci_event.c | 1 + + net/bluetooth/hci_sock.c | 4 +- + net/bluetooth/hci_sysfs.c | 122 +- + net/bridge/Kconfig | 13 + + net/bridge/Makefile | 2 + + net/bridge/br_device.c | 23 +- + net/bridge/br_forward.c | 150 +- + net/bridge/br_if.c | 8 +- + net/bridge/br_input.c | 39 +- + net/bridge/br_multicast.c | 1304 ++ + net/bridge/br_private.h | 173 +- + net/bridge/br_stp.c | 2 + + net/bridge/br_stp_if.c | 1 + + net/bridge/br_sysfs_br.c | 281 + + net/bridge/br_sysfs_if.c | 18 + + 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 | 18 +- + net/bridge/netfilter/ebt_log.c | 2 +- + net/bridge/netfilter/ebt_mark.c | 33 +- + net/bridge/netfilter/ebt_mark_m.c | 39 +- + 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 | 1241 ++- + net/can/af_can.c | 124 +- + net/can/af_can.h | 4 +- + net/can/proc.c | 93 +- + net/core/dev.c | 284 +- + net/core/dev_mcast.c | 2 + + net/core/drop_monitor.c | 1 - + net/core/ethtool.c | 386 +- + net/core/fib_rules.c | 2 +- + net/core/filter.c | 2 + + net/core/neighbour.c | 18 +- + net/core/netpoll.c | 169 +- + net/core/pktgen.c | 3 +- + net/core/rtnetlink.c | 127 +- + net/core/scm.c | 2 + + net/core/sock.c | 16 +- + net/dcb/dcbnl.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/ah4.c | 2 +- + net/ipv4/arp.c | 58 +- + net/ipv4/devinet.c | 30 +- + net/ipv4/esp4.c | 2 +- + 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 | 25 +- + net/ipv4/ip_sockglue.c | 14 +- + net/ipv4/ipcomp.c | 11 +- + net/ipv4/ipip.c | 20 +- + net/ipv4/ipmr.c | 3 - + net/ipv4/netfilter/arp_tables.c | 386 +- + net/ipv4/netfilter/arptable_filter.c | 95 +- + net/ipv4/netfilter/ip_tables.c | 557 +- + 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 | 19 +- + 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/sysctl_net_ipv4.c | 14 + + net/ipv4/tcp.c | 65 +- + net/ipv4/tcp_input.c | 12 + + net/ipv4/tcp_ipv4.c | 25 +- + net/ipv4/tcp_output.c | 22 +- + net/ipv4/tcp_timer.c | 27 +- + net/ipv4/udp.c | 19 +- + net/ipv4/udplite.c | 4 +- + net/ipv6/addrconf.c | 94 +- + net/ipv6/addrconf_core.c | 2 +- + net/ipv6/af_inet6.c | 32 +- + net/ipv6/ah6.c | 2 +- + net/ipv6/anycast.c | 2 +- + net/ipv6/esp6.c | 2 +- + net/ipv6/exthdrs.c | 2 +- + net/ipv6/fib6_rules.c | 4 +- + net/ipv6/icmp.c | 12 +- + net/ipv6/ip6_fib.c | 52 +- + net/ipv6/ip6_flowlabel.c | 9 +- + net/ipv6/ip6_input.c | 3 +- + net/ipv6/ip6_output.c | 21 +- + net/ipv6/ip6_tunnel.c | 43 +- + net/ipv6/ipcomp6.c | 15 +- + net/ipv6/mcast.c | 32 +- + net/ipv6/mip6.c | 2 +- + net/ipv6/ndisc.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 559 +- + net/ipv6/netfilter/ip6t_REJECT.c | 2 +- + 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 | 15 +- + net/ipv6/proc.c | 39 +- + net/ipv6/raw.c | 4 +- + net/ipv6/reassembly.c | 27 +- + net/ipv6/route.c | 12 +- + net/ipv6/sit.c | 25 +- + net/ipv6/syncookies.c | 3 +- + net/ipv6/sysctl_net_ipv6.c | 4 +- + net/ipv6/tcp_ipv6.c | 22 +- + net/ipv6/tunnel6.c | 4 +- + net/ipv6/udp.c | 22 +- + net/ipv6/udplite.c | 4 +- + net/ipv6/xfrm6_input.c | 2 +- + net/ipv6/xfrm6_output.c | 2 +- + 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/irda/irnetlink.c | 2 +- + net/key/af_key.c | 160 +- + 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 | 198 +- + 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 | 215 +- + net/mac80211/iface.c | 108 +- + net/mac80211/key.c | 10 +- + net/mac80211/key.h | 8 +- + net/mac80211/main.c | 74 +- + 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 | 1317 +-- + 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 | 473 +- + 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 | 107 +- + 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 | 1100 ++ + net/mac80211/wpa.c | 57 +- + net/netfilter/Kconfig | 25 + + net/netfilter/Makefile | 1 + + net/netfilter/ipvs/Kconfig | 11 + + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 42 +- + net/netfilter/ipvs/ip_vs_core.c | 67 +- + net/netfilter/ipvs/ip_vs_ctl.c | 13 +- + net/netfilter/ipvs/ip_vs_ftp.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 44 +- + net/netfilter/ipvs/ip_vs_proto.c | 3 + + net/netfilter/ipvs/ip_vs_proto_sctp.c | 1183 ++ + net/netfilter/ipvs/ip_vs_sync.c | 14 + + net/netfilter/ipvs/ip_vs_xmit.c | 10 +- + 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 | 230 +- + 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/nf_queue.c | 2 +- + net/netfilter/nfnetlink.c | 65 +- + net/netfilter/nfnetlink_log.c | 5 +- + 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 | 30 +- + 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 | 168 +- + net/netfilter/xt_repldata.h | 35 + + net/netlabel/netlabel_domainhash.c | 1 - + net/netlabel/netlabel_unlabeled.c | 3 - + net/netlink/af_netlink.c | 7 +- + 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 | 300 +- + 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 | 6 +- + net/unix/sysctl_net_unix.c | 2 +- + net/wimax/op-msg.c | 3 +- + net/wimax/op-reset.c | 3 +- + net/wimax/op-rfkill.c | 3 +- + net/wimax/op-state-get.c | 3 +- + net/wimax/stack.c | 3 +- + net/wireless/.gitignore | 1 + + net/wireless/Kconfig | 13 +- + net/wireless/Makefile | 6 + + net/wireless/chan.c | 41 +- + net/wireless/core.c | 59 +- + net/wireless/core.h | 20 +- + 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 | 214 +- + net/wireless/nl80211.c | 866 ++- + net/wireless/nl80211.h | 23 + + 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 | 49 +- + net/wireless/wext-proc.c | 4 +- + net/x25/af_x25.c | 24 +- + net/x25/x25_proc.c | 114 +- + net/xfrm/xfrm_input.c | 2 +- + net/xfrm/xfrm_ipcomp.c | 16 +- + net/xfrm/xfrm_policy.c | 43 +- + net/xfrm/xfrm_proc.c | 6 +- + net/xfrm/xfrm_state.c | 88 +- + net/xfrm/xfrm_sysctl.c | 4 +- + net/xfrm/xfrm_user.c | 111 +- + sound/soc/omap/omap-mcbsp.c | 144 +- + sound/soc/omap/omap-mcbsp.h | 4 +- + 1473 files changed, 133982 insertions(+), 49654 deletions(-) + create mode 100755 Documentation/networking/ixgbevf.txt + create mode 100644 Documentation/networking/tcp-thin.txt + create mode 100644 Documentation/powerpc/dts-bindings/fsl/can.txt + 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 + copy arch/arm/mach-omap2/{clock2xxx_data.c => clock2420_data.c} (72%) + create mode 100644 arch/arm/mach-omap2/clock2430.c + rename arch/arm/mach-omap2/{clock2xxx_data.c => clock2430_data.c} (75%) + create mode 100644 arch/arm/mach-omap2/clock3517.c + create mode 100644 arch/arm/mach-omap2/clock3517.h + create mode 100644 arch/arm/mach-omap2/clock36xx.c + create mode 100644 arch/arm/mach-omap2/clock36xx.h + create mode 100644 arch/arm/mach-omap2/clock3xxx.c + create mode 100644 arch/arm/mach-omap2/clock3xxx.h + rename arch/arm/mach-omap2/{clock34xx_data.c => clock3xxx_data.c} (80%) + delete mode 100644 arch/arm/mach-omap2/clock44xx.c + create mode 100644 arch/arm/mach-omap2/clockdomains44xx.h + rename arch/arm/mach-omap2/{dpll.c => dpll3xxx.c} (85%) + 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 + rename arch/arm/mach-omap2/{omap_hwmod_2420.h => omap_hwmod_2420_data.c} (82%) + rename arch/arm/mach-omap2/{omap_hwmod_2430.h => omap_hwmod_2430_data.c} (83%) + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_34xx.h + create mode 100644 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_common_data.c + create mode 100644 arch/arm/mach-omap2/omap_hwmod_common_data.h + 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/dma-44xx.h + create mode 100644 arch/arm/plat-omap/include/plat/flash.h + create mode 100644 arch/arm/plat-omap/include/plat/irqs-44xx.h + create mode 100644 arch/arm/plat-omap/include/plat/multi.h + create mode 100644 drivers/net/can/sja1000/plx_pci.c + create mode 100644 drivers/net/greth.c + create mode 100644 drivers/net/greth.h + create mode 100644 drivers/net/irda/sh_sir.c + delete mode 100644 drivers/net/isa-skeleton.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/net/wireless/wl12xx/wl1271_io.c + create mode 100644 drivers/net/wireless/wl12xx/wl1271_io.h + create mode 100644 drivers/net/wireless/wl12xx/wl1271_testmode.c + create mode 100644 drivers/net/wireless/wl12xx/wl1271_testmode.h + create mode 100644 drivers/pci/vpd.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 + 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 + 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/bridge/br_multicast.c + create mode 100644 net/mac80211/offchannel.c + create mode 100644 net/mac80211/work.c + create mode 100644 net/netfilter/ipvs/ip_vs_proto_sctp.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 fixes/fixes +$ git merge fixes/fixes +Merge made by recursive. + drivers/block/pktcdvd.c | 17 ++++++++++++++--- + drivers/platform/x86/dell-laptop.c | 4 ++-- + drivers/scsi/Kconfig | 14 +++++++------- + fs/compat_ioctl.c | 3 --- + 4 files changed, 23 insertions(+), 15 deletions(-) +Merging arm-current/master +$ git merge arm-current/master +Auto-merging arch/arm/boot/compressed/head.S +Auto-merging arch/arm/boot/compressed/vmlinux.lds.in +Merge made by recursive. + arch/arm/boot/compressed/head.S | 50 ++++++++++++++---------------- + arch/arm/boot/compressed/vmlinux.lds.in | 3 ++ + 2 files changed, 26 insertions(+), 27 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Already up-to-date. +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging sparc-current/master +$ git merge sparc-current/master +Already up-to-date. +Merging scsi-rc-fixes/master +$ git merge scsi-rc-fixes/master +Already up-to-date. +Merging net-current/master +$ git merge net-current/master +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 +Merge made by recursive. + drivers/pci/pci.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) +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/tablet/wacom_sys.c | 4 ++-- + drivers/input/tablet/wacom_wac.c | 2 +- + drivers/input/tablet/wacom_wac.h | 1 - + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Merge made by recursive. + crypto/ahash.c | 2 +- + crypto/authenc.c | 2 +- + crypto/md5.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +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-realview/clock.c +Removing arch/arm/mach-realview/clock.h +Removing arch/arm/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Auto-merging drivers/i2c/busses/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 40 +++- + arch/arm/Makefile | 2 + + arch/arm/common/Kconfig | 5 +- + arch/arm/common/Makefile | 3 +- + arch/arm/common/icst.c | 100 ++++++ + arch/arm/common/icst307.c | 161 ---------- + arch/arm/common/icst525.c | 160 ---------- + 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/kernel/smp.c | 4 +- + 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 | 127 +-------- + 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/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 | 80 +++--- + arch/arm/mach-integrator/leds.c | 1 + + arch/arm/mach-integrator/pci_v3.c | 7 +- + 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 | 186 ++---------- + arch/arm/mach-realview/include/mach/clkdev.h | 9 + + 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/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-versatile/Makefile | 2 +- + arch/arm/mach-versatile/clock.c | 65 ---- + arch/arm/mach-versatile/clock.h | 20 -- + arch/arm/mach-versatile/core.c | 186 ++---------- + arch/arm/mach-versatile/include/mach/clkdev.h | 9 + + 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-vexpress/Kconfig | 9 + + arch/arm/mach-vexpress/Makefile | 8 + + arch/arm/mach-vexpress/Makefile.boot | 3 + + arch/arm/mach-vexpress/core.h | 26 ++ + arch/arm/mach-vexpress/ct-ca9x4.c | 201 ++++++++++++ + arch/arm/mach-vexpress/headsmp.S | 39 +++ + arch/arm/mach-vexpress/include/mach/clkdev.h | 16 + + arch/arm/mach-vexpress/include/mach/ct-ca9x4.h | 43 +++ + arch/arm/mach-vexpress/include/mach/debug-macro.S | 23 ++ + arch/arm/mach-vexpress/include/mach/entry-macro.S | 67 ++++ + arch/arm/mach-vexpress/include/mach/hardware.h | 1 + + arch/arm/mach-vexpress/include/mach/io.h | 28 ++ + arch/arm/mach-vexpress/include/mach/irqs.h | 4 + + arch/arm/mach-vexpress/include/mach/memory.h | 25 ++ + arch/arm/mach-vexpress/include/mach/motherboard.h | 121 ++++++++ + arch/arm/mach-vexpress/include/mach/smp.h | 21 ++ + arch/arm/mach-vexpress/include/mach/system.h | 37 +++ + arch/arm/mach-vexpress/include/mach/timex.h | 23 ++ + arch/arm/mach-vexpress/include/mach/uncompress.h | 52 ++++ + arch/arm/mach-vexpress/include/mach/vmalloc.h | 21 ++ + arch/arm/mach-vexpress/localtimer.c | 26 ++ + arch/arm/mach-vexpress/platsmp.c | 190 ++++++++++++ + arch/arm/mach-vexpress/v2m.c | 319 ++++++++++++++++++++ + arch/arm/mm/Kconfig | 4 +- + 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 ++++++++++ + drivers/i2c/busses/Kconfig | 2 +- + drivers/video/amba-clcd.c | 31 ++- + include/linux/amba/clcd.h | 33 +- + 79 files changed, 2150 insertions(+), 1296 deletions(-) + 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/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 + delete mode 100644 arch/arm/mach-integrator/common.h + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + delete mode 100644 arch/arm/mach-versatile/clock.c + delete mode 100644 arch/arm/mach-versatile/clock.h + create mode 100644 arch/arm/mach-vexpress/Kconfig + create mode 100644 arch/arm/mach-vexpress/Makefile + create mode 100644 arch/arm/mach-vexpress/Makefile.boot + create mode 100644 arch/arm/mach-vexpress/core.h + create mode 100644 arch/arm/mach-vexpress/ct-ca9x4.c + create mode 100644 arch/arm/mach-vexpress/headsmp.S + create mode 100644 arch/arm/mach-vexpress/include/mach/clkdev.h + create mode 100644 arch/arm/mach-vexpress/include/mach/ct-ca9x4.h + create mode 100644 arch/arm/mach-vexpress/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-vexpress/include/mach/hardware.h + create mode 100644 arch/arm/mach-vexpress/include/mach/io.h + create mode 100644 arch/arm/mach-vexpress/include/mach/irqs.h + create mode 100644 arch/arm/mach-vexpress/include/mach/memory.h + create mode 100644 arch/arm/mach-vexpress/include/mach/motherboard.h + create mode 100644 arch/arm/mach-vexpress/include/mach/smp.h + create mode 100644 arch/arm/mach-vexpress/include/mach/system.h + create mode 100644 arch/arm/mach-vexpress/include/mach/timex.h + create mode 100644 arch/arm/mach-vexpress/include/mach/uncompress.h + create mode 100644 arch/arm/mach-vexpress/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-vexpress/localtimer.c + create mode 100644 arch/arm/mach-vexpress/platsmp.c + create mode 100644 arch/arm/mach-vexpress/v2m.c + 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 +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/dm355.c +Merge made by recursive. +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/Kconfig +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/Makefile +Auto-merging arch/arm/plat-mxc/include/mach/debug-macro.S +Removing arch/arm/plat-mxc/include/mach/mtd-xip.h +Auto-merging arch/arm/plat-mxc/include/mach/uncompress.h +Removing arch/arm/plat-mxc/iomux-mx1-mx2.c +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/serial/imx.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e038195] Merge remote branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + arch/arm/Kconfig | 3 +- + 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} | 8 +- + arch/arm/mach-mx1/{scb9328.c => mach-scb9328.c} | 4 +- + arch/arm/mach-mx2/Kconfig | 10 +- + arch/arm/mach-mx2/Makefile | 23 +- + 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 ---- + arch/arm/mach-mx2/devices.c | 643 ++++------ + arch/arm/mach-mx2/devices.h | 13 +- + arch/arm/mach-mx2/eukrea_mbimx27-baseboard.c | 2 +- + .../{eukrea_cpuimx27.c => mach-cpuimx27.c} | 19 +- + arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} | 8 +- + arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} | 16 +- + arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} | 8 +- + arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} | 12 +- + arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} | 10 +- + arch/arm/mach-mx2/mach-pca100.c | 395 ++++++ + arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} | 40 +- + arch/arm/mach-mx2/{generic.c => mm-imx21.c} | 46 +- + arch/arm/mach-mx2/{generic.c => mm-imx27.c} | 44 +- + arch/arm/mach-mx2/pca100.c | 244 ---- + arch/arm/mach-mx2/pcm970-baseboard.c | 6 +- + arch/arm/mach-mx2/serial.c | 48 +- + arch/arm/mach-mx25/Kconfig | 1 - + arch/arm/mach-mx25/Makefile | 2 +- + arch/arm/mach-mx25/clock.c | 14 + + arch/arm/mach-mx25/devices.c | 62 + + arch/arm/mach-mx25/devices.h | 3 + + arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} | 67 +- + 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} | 44 +- + .../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 | 30 +- + arch/arm/plat-mxc/Makefile | 8 +- + arch/arm/plat-mxc/audmux-v1.c | 14 +- + arch/arm/plat-mxc/audmux-v2.c | 9 +- + arch/arm/plat-mxc/clock.c | 1 + + arch/arm/plat-mxc/dma-mx1-mx2.c | 207 ++-- + arch/arm/plat-mxc/ehci.c | 122 ++- + arch/arm/plat-mxc/gpio.c | 30 +- + 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/clock.h | 7 - + 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-mx1.h | 313 +++--- + arch/arm/plat-mxc/include/mach/iomux-mx21.h | 210 ++-- + arch/arm/plat-mxc/include/mach/iomux-mx25.h | 24 +- + arch/arm/plat-mxc/include/mach/iomux-mx27.h | 372 +++--- + arch/arm/plat-mxc/include/mach/iomux-mx2x.h | 425 ++++---- + arch/arm/plat-mxc/include/mach/iomux-mx3.h | 76 +- + arch/arm/plat-mxc/include/mach/iomux-mx35.h | 2 +- + arch/arm/plat-mxc/include/mach/iomux-mx51.h | 326 +++++ + arch/arm/plat-mxc/include/mach/iomux-v1.h | 103 ++ + arch/arm/plat-mxc/include/mach/iomux-v3.h | 8 +- + arch/arm/plat-mxc/include/mach/iomux.h | 128 +-- + arch/arm/plat-mxc/include/mach/irqs.h | 20 +- + arch/arm/plat-mxc/include/mach/memory.h | 54 +- + arch/arm/plat-mxc/include/mach/mtd-xip.h | 34 - + 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 | 36 +- + 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 | 157 --- + arch/arm/plat-mxc/iomux-v1.c | 238 ++++ + 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 +- + drivers/video/Kconfig | 5 +- + 125 files changed, 8031 insertions(+), 3760 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} (95%) + 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} (91%) + rename arch/arm/mach-mx2/{mx27lite.c => mach-imx27lite.c} (93%) + rename arch/arm/mach-mx2/{mx21ads.c => mach-mx21ads.c} (94%) + rename arch/arm/mach-mx2/{mx27pdk.c => mach-mx27_3ds.c} (93%) + rename arch/arm/mach-mx2/{mx27ads.c => mach-mx27ads.c} (96%) + rename arch/arm/mach-mx2/{mxt_td60.c => mach-mxt_td60.c} (96%) + create mode 100644 arch/arm/mach-mx2/mach-pca100.c + rename arch/arm/mach-mx2/{pcm038.c => mach-pcm038.c} (89%) + copy arch/arm/mach-mx2/{generic.c => mm-imx21.c} (66%) + rename arch/arm/mach-mx2/{generic.c => mm-imx27.c} (67%) + delete mode 100644 arch/arm/mach-mx2/pca100.c + rename arch/arm/mach-mx25/{mx25pdk.c => mach-mx25pdk.c} (68%) + 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} (94%) + 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/iomux-v1.h + delete mode 100644 arch/arm/plat-mxc/include/mach/mtd-xip.h + create mode 100644 arch/arm/plat-mxc/include/mach/mx51.h + create mode 100644 arch/arm/plat-mxc/include/mach/ssi.h + delete mode 100644 arch/arm/plat-mxc/iomux-mx1-mx2.c + create mode 100644 arch/arm/plat-mxc/iomux-v1.c + 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/Kconfig +Auto-merging arch/arm/mm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 2 +- + arch/arm/mach-omap2/board-4430sdp.c | 2 +- + arch/arm/mach-omap2/board-omap3touchbook.c | 12 ++++++------ + arch/arm/mm/Kconfig | 2 +- + drivers/usb/musb/tusb6010_omap.c | 8 ++++---- + drivers/video/omap2/vram.c | 14 +++++++++----- + 6 files changed, 22 insertions(+), 18 deletions(-) +Merging pxa/for-next +$ git merge pxa/for-next +Already up-to-date. +Merging samsung/next-samsung +$ git merge samsung/next-samsung +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/arm/Makefile' using previous resolution. +Renaming arch/arm/mach-s3c6400/include/mach/debug-macro.S => arch/arm/mach-s5pv210/include/mach/debug-macro.S +Auto-merging arch/arm/mach-s5pv210/include/mach/debug-macro.S +Renaming arch/arm/mach-s3c6410/mach-hmt.c => arch/arm/mach-s3c64xx/mach-hmt.c +Auto-merging arch/arm/mach-s3c64xx/mach-hmt.c +Renaming arch/arm/plat-s3c/include/mach/vmalloc.h => arch/arm/mach-s5pc100/include/mach/vmalloc.h +Auto-merging arch/arm/mach-s5pc100/include/mach/vmalloc.h +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging arch/arm/Makefile +CONFLICT (content): Merge conflict in 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/mach-s3c6400/Kconfig +Removing arch/arm/mach-s3c6400/Makefile +Removing arch/arm/mach-s3c6400/include/mach/dma.h +Removing arch/arm/mach-s3c6400/include/mach/gpio-core.h +Removing arch/arm/mach-s3c6400/include/mach/irqs.h +Removing arch/arm/mach-s3c6400/include/mach/regs-clock.h +Removing arch/arm/mach-s3c6410/Kconfig +Removing arch/arm/mach-s3c6410/Makefile +Removing arch/arm/mach-s3c6410/setup-sdhci.c +Removing arch/arm/mach-s5pc100/include/mach/gpio-core.h +Removing arch/arm/plat-s3c/Kconfig +Removing arch/arm/plat-s3c/Makefile +Removing arch/arm/plat-s3c/dev-usb.c +Removing arch/arm/plat-s3c24xx/include/plat/s3c2440.h +Removing arch/arm/plat-s3c64xx/Kconfig +Removing arch/arm/plat-s3c64xx/clock.c +Removing arch/arm/plat-s3c64xx/dev-audio.c +Removing arch/arm/plat-s3c64xx/gpiolib.c +Removing arch/arm/plat-s3c64xx/include/plat/regs-clock.h +Removing arch/arm/plat-s3c64xx/irq.c +Removing arch/arm/plat-s3c64xx/s3c6400-clock.c +Removing arch/arm/plat-s3c64xx/s3c6400-init.c +Auto-merging drivers/serial/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b53b85c] Merge remote branch 'samsung/next-samsung' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/Samsung/Overview.txt | 86 ++ + .../arm/Samsung/clksrc-change-registers.awk | 167 ++++ + arch/arm/Kconfig | 57 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/Makefile | 14 +- + arch/arm/configs/mini2440_defconfig | 6 +- + arch/arm/configs/s3c2410_defconfig | 6 +- + arch/arm/configs/s3c6400_defconfig | 360 ++++++-- + arch/arm/configs/s5p6440_defconfig | 969 ++++++++++++++++++++ + arch/arm/configs/s5p6442_defconfig | 883 ++++++++++++++++++ + arch/arm/configs/s5pc110_defconfig | 894 ++++++++++++++++++ + arch/arm/configs/s5pv210_defconfig | 894 ++++++++++++++++++ + .../asm/entry-macro-vic2.S} | 29 +- + arch/arm/mach-s3c2410/dma.c | 2 +- + .../include/mach/{gpio-core.h => gpio-track.h} | 1 - + .../plat => mach-s3c2410/include/mach}/pm-core.h | 2 +- + arch/arm/mach-s3c2410/include/mach/regs-gpio.h | 10 +- + .../include/mach/timex.h | 2 - + .../include/mach/vmalloc.h | 4 +- + 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/dma.c | 2 +- + 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/Kconfig | 74 ++- + arch/arm/mach-s3c2440/Makefile | 11 + + arch/arm/mach-s3c2440/clock.c | 6 +- + arch/arm/mach-s3c2440/dma.c | 2 +- + arch/arm/mach-s3c2440/dsc.c | 2 +- + .../include/mach/gta02.h | 0 + arch/arm/mach-s3c2440/mach-anubis.c | 2 +- + arch/arm/mach-s3c2440/mach-at2440evb.c | 7 +- + .../{mach-s3c2442 => mach-s3c2440}/mach-gta02.c | 7 +- + arch/arm/mach-s3c2440/mach-mini2440.c | 8 +- + arch/arm/mach-s3c2440/mach-nexcoder.c | 4 +- + arch/arm/mach-s3c2440/mach-rx3715.c | 2 +- + arch/arm/mach-s3c2440/mach-smdk2440.c | 4 +- + arch/arm/mach-s3c2440/s3c2440.c | 2 +- + .../clock.c => mach-s3c2440/s3c2442.c} | 22 +- + .../{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c | 4 +- + .../{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/clock.c | 97 ++- + arch/arm/mach-s3c2443/dma.c | 2 +- + arch/arm/mach-s3c2443/mach-smdk2443.c | 10 +- + .../{plat-s3c => mach-s3c24a0}/include/mach/io.h | 4 +- + arch/arm/mach-s3c6400/Kconfig | 30 - + arch/arm/mach-s3c6400/Makefile | 23 - + arch/arm/mach-s3c6400/include/mach/dma.h | 70 -- + arch/arm/mach-s3c6400/include/mach/gpio-core.h | 21 - + arch/arm/mach-s3c6400/include/mach/irqs.h | 16 - + arch/arm/mach-s3c6400/include/mach/regs-clock.h | 16 - + arch/arm/mach-s3c6410/Kconfig | 109 --- + arch/arm/mach-s3c6410/Makefile | 26 - + arch/arm/mach-s3c6410/setup-sdhci.c | 68 -- + arch/arm/mach-s3c64xx/Kconfig | 180 ++++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile | 48 +- + .../{mach-s3c6400 => mach-s3c64xx}/Makefile.boot | 0 + arch/arm/mach-s3c64xx/clock.c | 809 ++++++++++++++++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c | 19 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c | 0 + arch/arm/mach-s3c64xx/dev-adc.c | 46 + + arch/arm/mach-s3c64xx/dev-audio.c | 335 +++++++ + arch/arm/mach-s3c64xx/dev-rtc.c | 43 + + arch/arm/mach-s3c64xx/dev-spi.c | 182 ++++ + arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c | 29 - + arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c | 3 +- + arch/arm/mach-s3c64xx/gpiolib.c | 288 ++++++ + .../include/mach/debug-macro.S | 2 +- + .../dma-plat.h => mach-s3c64xx/include/mach/dma.h} | 79 ++- + arch/arm/mach-s3c64xx/include/mach/entry-macro.S | 18 + + .../include/mach}/gpio-bank-a.h | 2 +- + .../include/mach}/gpio-bank-b.h | 2 +- + .../include/mach}/gpio-bank-c.h | 2 +- + .../include/mach}/gpio-bank-d.h | 2 +- + .../include/mach}/gpio-bank-e.h | 2 +- + .../include/mach}/gpio-bank-f.h | 2 +- + .../include/mach}/gpio-bank-g.h | 2 +- + .../include/mach}/gpio-bank-h.h | 2 +- + .../include/mach}/gpio-bank-i.h | 2 +- + .../include/mach}/gpio-bank-j.h | 2 +- + .../include/mach}/gpio-bank-n.h | 2 +- + .../include/mach}/gpio-bank-o.h | 2 +- + .../include/mach}/gpio-bank-p.h | 2 +- + .../include/mach}/gpio-bank-q.h | 2 +- + .../include/mach/gpio.h | 6 +- + .../include/mach/hardware.h | 0 + .../{plat-s3c => mach-s3c64xx}/include/mach/io.h | 4 +- + .../plat => mach-s3c64xx/include/mach}/irqs.h | 24 +- + .../include/mach/map.h | 22 +- + .../include/mach/memory.h | 0 + .../plat => mach-s3c64xx/include/mach}/pll.h | 0 + .../plat => mach-s3c64xx/include/mach}/pm-core.h | 4 +- + .../include/mach/pwm-clock.h | 0 + arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 156 ++++ + .../include/mach/regs-fb.h | 0 + .../include/mach}/regs-gpio-memport.h | 0 + .../plat => mach-s3c64xx/include/mach}/regs-gpio.h | 0 + .../include/mach/regs-irq.h | 0 + .../include/mach}/regs-modem.h | 0 + arch/arm/mach-s3c64xx/include/mach/regs-srom.h | 59 ++ + .../plat => mach-s3c64xx/include/mach}/regs-sys.h | 0 + .../include/mach}/regs-syscon-power.h | 0 + .../plat => mach-s3c64xx/include/mach}/s3c6400.h | 6 +- + .../plat => mach-s3c64xx/include/mach}/s3c6410.h | 2 +- + arch/arm/mach-s3c64xx/include/mach/spi-clocks.h | 18 + + .../include/mach/system.h | 0 + .../include/mach/tick.h | 2 +- + .../include/mach/timex.h | 6 +- + .../include/mach/uncompress.h | 0 + .../include/mach/vmalloc.h | 6 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c | 2 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/irq.c | 69 ++ + .../{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c | 8 +- + arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c | 4 +- + arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c | 4 +- + .../{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c | 4 +- + .../{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c | 337 ++++++-- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c | 12 +- + arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c | 11 +- + .../{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} | 24 +- + .../setup-fb-24bpp.c | 0 + .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c | 2 +- + .../{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c | 2 +- + .../setup-sdhci-gpio.c | 0 + .../{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c | 15 +- + arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S | 6 +- + arch/arm/mach-s5p6440/Kconfig | 21 + + arch/arm/mach-s5p6440/Makefile | 19 + + arch/arm/mach-s5p6440/Makefile.boot | 2 + + arch/arm/mach-s5p6440/clock.c | 698 ++++++++++++++ + arch/arm/mach-s5p6440/cpu.c | 114 +++ + arch/arm/mach-s5p6440/gpio.c | 322 +++++++ + .../include/mach/debug-macro.S | 12 +- + 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 + + .../{plat-s3c => mach-s5p6440}/include/mach/io.h | 4 +- + arch/arm/mach-s5p6440/include/mach/irqs.h | 111 +++ + arch/arm/mach-s5p6440/include/mach/map.h | 68 ++ + arch/arm/mach-s5p6440/include/mach/memory.h | 19 + + .../include/mach/pwm-clock.h | 26 +- + arch/arm/mach-s5p6440/include/mach/regs-clock.h | 130 +++ + arch/arm/mach-s5p6440/include/mach/regs-gpio.h | 54 ++ + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5p6440/include/mach/system.h | 26 + + arch/arm/mach-s5p6440/include/mach/tick.h | 24 + + .../include/mach/timex.h | 6 +- + .../include/mach/uncompress.h | 12 +- + .../include/mach/vmalloc.h | 11 +- + arch/arm/mach-s5p6440/init.c | 52 ++ + arch/arm/mach-s5p6440/mach-smdk6440.c | 111 +++ + arch/arm/mach-s5p6442/Kconfig | 24 + + arch/arm/mach-s5p6442/Makefile | 19 + + arch/arm/mach-s5p6442/Makefile.boot | 2 + + arch/arm/mach-s5p6442/clock.c | 396 ++++++++ + arch/arm/mach-s5p6442/cpu.c | 121 +++ + .../include/mach/debug-macro.S | 23 +- + arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 + + arch/arm/mach-s5p6442/include/mach/gpio.h | 123 +++ + arch/arm/mach-s5p6442/include/mach/hardware.h | 18 + + .../{plat-s3c => mach-s5p6442}/include/mach/io.h | 7 +- + arch/arm/mach-s5p6442/include/mach/irqs.h | 86 ++ + arch/arm/mach-s5p6442/include/mach/map.h | 58 ++ + arch/arm/mach-s5p6442/include/mach/memory.h | 19 + + .../include/mach/pwm-clock.h | 33 +- + arch/arm/mach-s5p6442/include/mach/regs-clock.h | 103 +++ + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5p6442/include/mach/system.h | 26 + + arch/arm/mach-s5p6442/include/mach/tick.h | 26 + + .../include/mach/timex.h | 8 +- + .../include/mach/uncompress.h | 12 +- + .../include/mach/vmalloc.h | 11 +- + arch/arm/mach-s5p6442/init.c | 44 + + arch/arm/mach-s5p6442/mach-smdk6442.c | 91 ++ + arch/arm/mach-s5pc100/include/mach/gpio-core.h | 21 - + .../{plat-s3c => mach-s5pc100}/include/mach/io.h | 4 +- + arch/arm/mach-s5pc100/include/mach/tick.h | 2 +- + .../include/mach/timex.h | 6 +- + .../include/mach/vmalloc.h | 9 +- + arch/arm/mach-s5pv210/Kconfig | 40 + + arch/arm/mach-s5pv210/Makefile | 20 + + arch/arm/mach-s5pv210/Makefile.boot | 2 + + arch/arm/mach-s5pv210/clock.c | 454 +++++++++ + arch/arm/mach-s5pv210/cpu.c | 126 +++ + .../include/mach/debug-macro.S | 15 +- + arch/arm/mach-s5pv210/include/mach/entry-macro.S | 54 ++ + arch/arm/mach-s5pv210/include/mach/gpio.h | 129 +++ + arch/arm/mach-s5pv210/include/mach/hardware.h | 18 + + arch/arm/mach-s5pv210/include/mach/io.h | 26 + + arch/arm/mach-s5pv210/include/mach/irqs.h | 146 +++ + arch/arm/mach-s5pv210/include/mach/map.h | 65 ++ + arch/arm/mach-s5pv210/include/mach/memory.h | 23 + + .../include/mach/pwm-clock.h | 33 +- + arch/arm/mach-s5pv210/include/mach/regs-clock.h | 169 ++++ + .../include/mach/regs-irq.h | 13 +- + arch/arm/mach-s5pv210/include/mach/system.h | 26 + + arch/arm/mach-s5pv210/include/mach/tick.h | 26 + + .../include/mach/timex.h | 15 +- + .../include/mach/uncompress.h | 12 +- + arch/arm/mach-s5pv210/include/mach/vmalloc.h | 22 + + arch/arm/mach-s5pv210/init.c | 44 + + arch/arm/mach-s5pv210/mach-smdkc110.c | 98 ++ + arch/arm/mach-s5pv210/mach-smdkv210.c | 98 ++ + arch/arm/plat-s3c/Kconfig | 215 ----- + arch/arm/plat-s3c/Makefile | 45 - + arch/arm/plat-s3c/dev-usb.c | 50 - + arch/arm/plat-s3c24xx/Kconfig | 60 +- + arch/arm/plat-s3c24xx/Makefile | 8 - + arch/arm/plat-s3c24xx/clock-dclk.c | 22 +- + arch/arm/plat-s3c24xx/cpu.c | 4 +- + arch/arm/plat-s3c24xx/devs.c | 59 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + arch/arm/plat-s3c24xx/gpiolib.c | 2 +- + .../include/plat/audio-simtec.h | 2 +- + arch/arm/plat-s3c24xx/include/plat/mci.h | 9 + + arch/arm/plat-s3c24xx/include/plat/s3c2440.h | 17 - + arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h | 14 +- + arch/arm/plat-s3c64xx/Kconfig | 71 -- + arch/arm/plat-s3c64xx/clock.c | 300 ------ + arch/arm/plat-s3c64xx/dev-audio.c | 167 ---- + arch/arm/plat-s3c64xx/gpiolib.c | 446 --------- + arch/arm/plat-s3c64xx/include/plat/regs-clock.h | 225 ----- + arch/arm/plat-s3c64xx/irq.c | 256 ------ + arch/arm/plat-s3c64xx/s3c6400-clock.c | 758 --------------- + arch/arm/plat-s3c64xx/s3c6400-init.c | 29 - + arch/arm/plat-s5p/Kconfig | 25 + + arch/arm/plat-s5p/Makefile | 19 + + arch/arm/plat-s5p/clock.c | 149 +++ + arch/arm/plat-s5p/cpu.c | 113 +++ + arch/arm/plat-s5p/dev-uart.c | 139 +++ + arch/arm/plat-s5p/include/plat/irqs.h | 90 ++ + arch/arm/plat-s5p/include/plat/map-s5p.h | 34 + + arch/arm/plat-s5p/include/plat/pll.h | 83 ++ + arch/arm/plat-s5p/include/plat/s5p-clock.h | 40 + + arch/arm/plat-s5p/include/plat/s5p6440.h | 37 + + arch/arm/plat-s5p/include/plat/s5p6442.h | 33 + + arch/arm/plat-s5p/include/plat/s5pv210.h | 33 + + arch/arm/plat-s5p/irq.c | 72 ++ + 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 | 229 +++++ + arch/arm/plat-samsung/Makefile | 45 + + arch/arm/{plat-s3c24xx => plat-samsung}/adc.c | 55 +- + arch/arm/plat-samsung/clock-clksrc.c | 212 +++++ + arch/arm/{plat-s3c => plat-samsung}/clock.c | 75 ++- + 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 | 7 + + arch/arm/plat-samsung/dev-usb.c | 69 ++ + arch/arm/{plat-s3c => plat-samsung}/dma.c | 4 +- + 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 +- + .../include/plat/audio.h | 10 +- + arch/arm/plat-samsung/include/plat/clock-clksrc.h | 83 ++ + .../include/plat/clock.h | 36 +- + .../include/plat/cpu-freq.h | 2 +- + .../{plat-s3c => plat-samsung}/include/plat/cpu.h | 5 +- + .../include/plat/debug-macro.S | 14 +- + .../{plat-s3c => plat-samsung}/include/plat/devs.h | 11 +- + .../include/plat/dma-core.h | 0 + .../include/plat/dma-s3c24xx.h} | 4 +- + .../{plat-s3c => plat-samsung}/include/plat/dma.h | 2 +- + .../{plat-s3c => plat-samsung}/include/plat/fb.h | 2 +- + .../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 + + .../include/plat/irq-vic-timer.h} | 12 +- + .../include/plat/map-base.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/nand.h | 0 + .../{plat-s3c => plat-samsung}/include/plat/pm.h | 6 +- + .../include/plat/regs-ac97.h | 0 + .../include/plat/regs-adc.h | 4 + + .../include/plat/regs-fb-v4.h | 2 +- + .../include/plat/regs-fb.h | 2 +- + .../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-serial.h | 32 +- + .../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 | 43 +- + .../include/plat/udc-hs.h | 4 +- + .../include/plat/uncompress.h | 2 +- + .../include/plat/usb-control.h | 4 +- + .../include/plat/watchdog-reset.h | 0 + arch/arm/{plat-s3c => plat-samsung}/init.c | 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}/pm.c | 8 +- + arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c | 112 ++-- + arch/arm/{plat-s3c => plat-samsung}/pwm.c | 0 + arch/arm/{plat-s3c => plat-samsung}/time.c | 2 +- + drivers/serial/Kconfig | 29 +- + drivers/serial/Makefile | 1 + + drivers/serial/s3c2412.c | 1 + + drivers/serial/s5pv210.c | 154 ++++ + drivers/serial/samsung.c | 6 +- + drivers/serial/samsung.h | 19 +- + 341 files changed, 15045 insertions(+), 4839 deletions(-) + create mode 100644 Documentation/arm/Samsung/Overview.txt + create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk + create mode 100644 arch/arm/configs/s5p6440_defconfig + create mode 100644 arch/arm/configs/s5p6442_defconfig + create mode 100644 arch/arm/configs/s5pc110_defconfig + create mode 100644 arch/arm/configs/s5pv210_defconfig + rename arch/arm/{mach-s3c6400/include/mach/entry-macro.S => include/asm/entry-macro-vic2.S} (50%) + rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) + rename arch/arm/{plat-s3c24xx/include/plat => mach-s3c2410/include/mach}/pm-core.h (97%) + copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/timex.h (99%) + copy arch/arm/{plat-s3c => mach-s3c2410}/include/mach/vmalloc.h (85%) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/include/mach/gta02.h (100%) + rename arch/arm/{mach-s3c2442 => mach-s3c2440}/mach-gta02.c (99%) + rename arch/arm/{mach-s3c2442/clock.c => mach-s3c2440/s3c2442.c} (90%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c244x-clock.c (97%) + 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 + copy arch/arm/{plat-s3c => mach-s3c24a0}/include/mach/io.h (72%) + delete mode 100644 arch/arm/mach-s3c6400/Kconfig + delete mode 100644 arch/arm/mach-s3c6400/Makefile + delete mode 100644 arch/arm/mach-s3c6400/include/mach/dma.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/gpio-core.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/irqs.h + delete mode 100644 arch/arm/mach-s3c6400/include/mach/regs-clock.h + delete mode 100644 arch/arm/mach-s3c6410/Kconfig + delete mode 100644 arch/arm/mach-s3c6410/Makefile + delete mode 100644 arch/arm/mach-s3c6410/setup-sdhci.c + create mode 100644 arch/arm/mach-s3c64xx/Kconfig + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/Makefile (51%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/Makefile.boot (100%) + create mode 100644 arch/arm/mach-s3c64xx/clock.c + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpu.c (89%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/cpufreq.c (100%) + create mode 100644 arch/arm/mach-s3c64xx/dev-adc.c + create mode 100644 arch/arm/mach-s3c64xx/dev-audio.c + create mode 100644 arch/arm/mach-s3c64xx/dev-rtc.c + create mode 100644 arch/arm/mach-s3c64xx/dev-spi.c + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dev-uart.c (85%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/dma.c (99%) + create mode 100644 arch/arm/mach-s3c64xx/gpiolib.c + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/debug-macro.S (97%) + rename arch/arm/{plat-s3c64xx/include/plat/dma-plat.h => mach-s3c64xx/include/mach/dma.h} (53%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/entry-macro.S + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-a.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-b.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-c.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-d.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-e.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-f.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-g.h (95%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-h.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-i.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-j.h (95%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-n.h (96%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-o.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-p.h (97%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/gpio-bank-q.h (96%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/gpio.h (96%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/hardware.h (100%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/io.h (72%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/irqs.h (93%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/map.h (81%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/memory.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pll.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/pm-core.h (97%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/pwm-clock.h (100%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-clock.h + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-fb.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio-memport.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-gpio.h (100%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/regs-irq.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-modem.h (100%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/regs-srom.h + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-sys.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/regs-syscon-power.h (100%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6400.h (87%) + rename arch/arm/{plat-s3c64xx/include/plat => mach-s3c64xx/include/mach}/s3c6410.h (93%) + create mode 100644 arch/arm/mach-s3c64xx/include/mach/spi-clocks.h + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/system.h (100%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/tick.h (93%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/timex.h (89%) + copy arch/arm/{mach-s3c6400 => mach-s3c64xx}/include/mach/uncompress.h (100%) + copy arch/arm/{plat-s3c => mach-s3c64xx}/include/mach/vmalloc.h (80%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-eint.c (99%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/irq-pm.c (99%) + create mode 100644 arch/arm/mach-s3c64xx/irq.c + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-anw6410.c (97%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-hmt.c (99%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-ncp.c (97%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/mach-smdk6400.c (97%) + rename arch/arm/{mach-s3c6410 => mach-s3c64xx}/mach-smdk6410.c (62%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/pm.c (95%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/s3c6400.c (87%) + rename arch/arm/{mach-s3c6410/cpu.c => mach-s3c64xx/s3c6410.c} (81%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-fb-24bpp.c (100%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c0.c (96%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-i2c1.c (96%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/setup-sdhci-gpio.c (100%) + rename arch/arm/{mach-s3c6400 => mach-s3c64xx}/setup-sdhci.c (78%) + rename arch/arm/{plat-s3c64xx => mach-s3c64xx}/sleep.S (97%) + 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/clock.c + create mode 100644 arch/arm/mach-s5p6440/cpu.c + create mode 100644 arch/arm/mach-s5p6440/gpio.c + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/debug-macro.S (77%) + 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 + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/io.h (72%) + 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 + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/pwm-clock.h (65%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-clock.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/regs-gpio.h + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5p6440/include/mach/system.h + create mode 100644 arch/arm/mach-s5p6440/include/mach/tick.h + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/timex.h (89%) + copy arch/arm/{mach-s3c6400 => mach-s5p6440}/include/mach/uncompress.h (61%) + copy arch/arm/{plat-s3c => mach-s5p6440}/include/mach/vmalloc.h (51%) + create mode 100644 arch/arm/mach-s5p6440/init.c + create mode 100644 arch/arm/mach-s5p6440/mach-smdk6440.c + create mode 100644 arch/arm/mach-s5p6442/Kconfig + create mode 100644 arch/arm/mach-s5p6442/Makefile + create mode 100644 arch/arm/mach-s5p6442/Makefile.boot + create mode 100644 arch/arm/mach-s5p6442/clock.c + create mode 100644 arch/arm/mach-s5p6442/cpu.c + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/debug-macro.S (55%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5p6442/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/hardware.h + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/io.h (54%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/map.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/memory.h + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/pwm-clock.h (60%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/regs-clock.h + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5p6442/include/mach/system.h + create mode 100644 arch/arm/mach-s5p6442/include/mach/tick.h + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/timex.h (83%) + copy arch/arm/{mach-s3c6400 => mach-s5p6442}/include/mach/uncompress.h (61%) + copy arch/arm/{plat-s3c => mach-s5p6442}/include/mach/vmalloc.h (51%) + create mode 100644 arch/arm/mach-s5p6442/init.c + create mode 100644 arch/arm/mach-s5p6442/mach-smdk6442.c + delete mode 100644 arch/arm/mach-s5pc100/include/mach/gpio-core.h + rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/io.h (72%) + copy arch/arm/{plat-s3c => mach-s5pc100}/include/mach/timex.h (89%) + rename arch/arm/{plat-s3c => mach-s5pc100}/include/mach/vmalloc.h (57%) + create mode 100644 arch/arm/mach-s5pv210/Kconfig + create mode 100644 arch/arm/mach-s5pv210/Makefile + create mode 100644 arch/arm/mach-s5pv210/Makefile.boot + create mode 100644 arch/arm/mach-s5pv210/clock.c + create mode 100644 arch/arm/mach-s5pv210/cpu.c + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/debug-macro.S (75%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-s5pv210/include/mach/gpio.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/hardware.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/io.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/irqs.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/map.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/memory.h + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/pwm-clock.h (59%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/regs-clock.h + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/regs-irq.h (52%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/system.h + create mode 100644 arch/arm/mach-s5pv210/include/mach/tick.h + rename arch/arm/{plat-s3c => mach-s5pv210}/include/mach/timex.h (66%) + rename arch/arm/{mach-s3c6400 => mach-s5pv210}/include/mach/uncompress.h (61%) + create mode 100644 arch/arm/mach-s5pv210/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-s5pv210/init.c + create mode 100644 arch/arm/mach-s5pv210/mach-smdkc110.c + create mode 100644 arch/arm/mach-s5pv210/mach-smdkv210.c + delete mode 100644 arch/arm/plat-s3c/Kconfig + delete mode 100644 arch/arm/plat-s3c/Makefile + delete mode 100644 arch/arm/plat-s3c/dev-usb.c + rename arch/arm/{plat-s3c => plat-s3c24xx}/include/plat/audio-simtec.h (95%) + delete mode 100644 arch/arm/plat-s3c24xx/include/plat/s3c2440.h + rename arch/arm/plat-s3c24xx/{ => include/plat}/s3c244x.h (72%) + delete mode 100644 arch/arm/plat-s3c64xx/Kconfig + delete mode 100644 arch/arm/plat-s3c64xx/clock.c + delete mode 100644 arch/arm/plat-s3c64xx/dev-audio.c + delete mode 100644 arch/arm/plat-s3c64xx/gpiolib.c + delete mode 100644 arch/arm/plat-s3c64xx/include/plat/regs-clock.h + delete mode 100644 arch/arm/plat-s3c64xx/irq.c + delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-clock.c + delete mode 100644 arch/arm/plat-s3c64xx/s3c6400-init.c + 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/map-s5p.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/include/plat/s5p6442.h + create mode 100644 arch/arm/plat-s5p/include/plat/s5pv210.h + create mode 100644 arch/arm/plat-s5p/irq.c + create mode 100644 arch/arm/plat-s5p/setup-i2c0.c + rename arch/arm/{plat-s3c24xx => plat-samsung}/adc.c (89%) + create mode 100644 arch/arm/plat-samsung/clock-clksrc.c + rename arch/arm/{plat-s3c => plat-samsung}/clock.c (78%) + 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 (85%) + create mode 100644 arch/arm/plat-samsung/dev-usb.c + rename arch/arm/{plat-s3c => plat-samsung}/dma.c (96%) + 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%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/audio.h (64%) + 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/cpu-freq.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/cpu.h (91%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/debug-macro.S (81%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/devs.h (87%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma-core.h (100%) + rename arch/arm/{plat-s3c24xx/include/plat/dma-plat.h => plat-samsung/include/plat/dma-s3c24xx.h} (95%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/dma.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/fb.h (98%) + 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 + rename arch/arm/{plat-s3c24xx/include/plat/s3c2442.h => plat-samsung/include/plat/irq-vic-timer.h} (50%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/map-base.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/nand.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/pm.h (97%) + 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 (90%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb-v4.h (99%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-fb.h (99%) + 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-serial.h (88%) + 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 (87%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/udc-hs.h (93%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/uncompress.h (98%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/usb-control.h (89%) + rename arch/arm/{plat-s3c => plat-samsung}/include/plat/watchdog-reset.h (100%) + rename arch/arm/{plat-s3c => plat-samsung}/init.c (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}/pm.c (98%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm-clock.c (82%) + rename arch/arm/{plat-s3c => plat-samsung}/pwm.c (100%) + rename arch/arm/{plat-s3c => plat-samsung}/time.c (99%) + create mode 100644 drivers/serial/s5pv210.c +$ git am -3 ../patches/0001-arm-fix-bad-merge-of-arch-arm-Kconfig.patch +Applying: arm: fix bad merge of arch/arm/Kconfig +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm/Kconfig +$ git add . +$ git commit -v -a --amend +[master 562c5cb] Merge remote branch 'samsung/next-samsung' +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Already up-to-date. +Merging ia64/test +$ git merge ia64/test +Already uptodate! +Merge made by recursive. +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +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 +Resolved 'arch/microblaze/include/asm/prom.h' 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/microblaze/include/asm/tlbflush.h +Auto-merging drivers/pci/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec1528e] Merge remote branch 'microblaze/next' +$ git diff -M --stat --summary HEAD^.. + arch/microblaze/Kconfig | 64 +- + 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/pgalloc.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 40 +- + 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 | 111 ++- + arch/microblaze/kernel/dma.c | 156 +++ + arch/microblaze/kernel/entry.S | 111 +- + arch/microblaze/kernel/head.S | 13 +- + arch/microblaze/kernel/irq.c | 15 + + arch/microblaze/kernel/setup.c | 45 +- + arch/microblaze/kernel/traps.c | 10 +- + arch/microblaze/mm/Makefile | 2 +- + arch/microblaze/mm/consistent.c | 246 +++++ + arch/microblaze/mm/init.c | 39 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/microblaze/pci/Makefile | 6 + + arch/microblaze/pci/indirect_pci.c | 163 +++ + arch/microblaze/pci/iomap.c | 39 + + arch/microblaze/pci/pci-common.c | 1642 +++++++++++++++++++++++++++++ + 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 + + 36 files changed, 3783 insertions(+), 171 deletions(-) + create mode 100644 arch/microblaze/kernel/dma.c + create mode 100644 arch/microblaze/mm/consistent.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 +Resolved 'arch/mips/alchemy/common/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/common/setup.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/db1200/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/db1x00/board_setup.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/pb1100/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/pb1200/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/platform.c' using previous resolution. +Resolved 'arch/mips/alchemy/devboards/platform.h' using previous resolution. +Resolved 'arch/mips/alchemy/xxs1500/platform.c' using previous resolution. +Resolved 'arch/mips/cavium-octeon/octeon-irq.c' using previous resolution. +Resolved 'arch/mips/configs/db1200_defconfig' using previous resolution. +Resolved 'arch/mips/include/asm/mach-au1x00/au1000.h' using previous resolution. +Resolved 'drivers/pcmcia/au1000_generic.h' using previous resolution. +Resolved 'drivers/pcmcia/db1xxx_ss.c' using previous resolution. +Resolved 'drivers/pcmcia/xxs1500_ss.c' using previous resolution. +Renaming arch/mips/mm/uasm.h->arch/mips/include/asm/uasm.h +Auto-merging arch/mips/include/asm/uasm.h +Auto-merging arch/mips/Makefile +Auto-merging arch/mips/alchemy/common/platform.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c +Auto-merging arch/mips/alchemy/common/setup.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c +Auto-merging arch/mips/alchemy/devboards/db1200/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c +Auto-merging arch/mips/alchemy/devboards/db1x00/board_setup.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c +Auto-merging arch/mips/alchemy/devboards/db1x00/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1100/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1200/platform.c +CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1500/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c +Auto-merging arch/mips/alchemy/devboards/pb1550/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c +Auto-merging arch/mips/alchemy/devboards/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c +Auto-merging arch/mips/alchemy/devboards/platform.h +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h +Auto-merging arch/mips/alchemy/xxs1500/platform.c +CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c +Auto-merging arch/mips/cavium-octeon/octeon-irq.c +CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c +Auto-merging arch/mips/configs/db1200_defconfig +CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig +Auto-merging arch/mips/include/asm/mach-au1x00/au1000.h +CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/mm/init.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/mtd/maps/Kconfig +Auto-merging drivers/mtd/maps/Makefile +Auto-merging drivers/net/au1000_eth.c +Auto-merging drivers/net/cpmac.c +Auto-merging drivers/pcmcia/Kconfig +Auto-merging drivers/pcmcia/Makefile +Auto-merging drivers/pcmcia/au1000_generic.h +CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h +Auto-merging drivers/pcmcia/db1xxx_ss.c +CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c +Auto-merging drivers/pcmcia/xxs1500_ss.c +CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c +Auto-merging drivers/staging/octeon/ethernet.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/mips/alchemy/devboards/db1x00/platform.c'. +Recorded resolution for 'arch/mips/alchemy/devboards/pb1500/platform.c'. +Recorded resolution for 'arch/mips/alchemy/devboards/pb1550/platform.c'. +[master bd69769] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging parisc/next +$ git merge parisc/next +Auto-merging Documentation/cachetlb.txt +Auto-merging arch/arm/include/asm/cacheflush.h +Auto-merging arch/parisc/kernel/cache.c +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Merge made by recursive. + arch/parisc/Kconfig.debug | 14 ++++++++++++++ + 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 ++- + drivers/parisc/eisa_enumerator.c | 2 +- + drivers/parisc/superio.c | 2 +- + 11 files changed, 65 insertions(+), 47 deletions(-) +Merging powerpc/next +$ git merge powerpc/next +Already up-to-date. +Merging 4xx/next +$ git merge 4xx/next +Already up-to-date. +Merging 52xx-and-virtex/next +$ git merge 52xx-and-virtex/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Merge made by recursive. + arch/s390/lib/Makefile | 3 ++- + drivers/char/hvc_iucv.c | 6 ++++-- + drivers/s390/block/dasd.c | 36 ++++++++++++++++++++++++++++++++++++ + drivers/s390/block/dasd_3990_erp.c | 4 ++++ + drivers/s390/block/dasd_devmap.c | 13 ++++++++----- + drivers/s390/block/dasd_diag.c | 6 ++---- + drivers/s390/block/dasd_eckd.c | 27 ++++++++++++++++++--------- + drivers/s390/block/dasd_fba.c | 10 ++++++++-- + drivers/s390/block/dasd_genhd.c | 3 ++- + drivers/s390/block/dasd_int.h | 7 +++++++ + drivers/s390/block/dasd_ioctl.c | 6 ++++-- + 11 files changed, 95 insertions(+), 26 deletions(-) +Merging sh/master +$ git merge sh/master +Auto-merging drivers/serial/Kconfig +Merge made by recursive. + arch/sh/boards/mach-migor/setup.c | 16 + + arch/sh/boot/compressed/cache.c | 2 +- + arch/sh/include/asm/dma-register.h | 51 +++ + arch/sh/include/asm/dma-sh.h | 88 +---- + arch/sh/include/asm/dmaengine.h | 93 +++++ + arch/sh/include/asm/siu.h | 2 +- + arch/sh/include/asm/topology.h | 2 +- + arch/sh/include/cpu-sh3/cpu/dma-register.h | 41 ++ + arch/sh/include/cpu-sh3/cpu/dma.h | 27 -- + arch/sh/include/cpu-sh4/cpu/dma-register.h | 112 +++++ + arch/sh/include/cpu-sh4/cpu/dma-sh4a.h | 62 --- + arch/sh/include/cpu-sh4/cpu/dma.h | 36 +-- + arch/sh/include/mach-migor/mach/migor.h | 1 + + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 190 ++++++++- + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 186 ++++++++- + arch/sh/kernel/cpu/sh4a/setup-sh7780.c | 134 ++++++- + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 134 ++++++- + arch/sh/kernel/hw_breakpoint.c | 30 +-- + arch/sh/lib/libgcc.h | 3 +- + arch/sh/mm/pmb.c | 1 - + drivers/dma/shdma.c | 500 ++++++++++++++--------- + drivers/dma/shdma.h | 26 +- + drivers/serial/Kconfig | 4 + + drivers/serial/sh-sci.c | 616 +++++++++++++++++++++++++-- + include/linux/serial_sci.h | 6 + + sound/soc/sh/siu.h | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + 27 files changed, 1844 insertions(+), 523 deletions(-) + create mode 100644 arch/sh/include/asm/dma-register.h + create mode 100644 arch/sh/include/asm/dmaengine.h + create mode 100644 arch/sh/include/cpu-sh3/cpu/dma-register.h + create mode 100644 arch/sh/include/cpu-sh4/cpu/dma-register.h +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/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 6514300] 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 | 84 + + arch/arm/mach-shmobile/Makefile | 22 + + arch/arm/mach-shmobile/Makefile.boot | 9 + + arch/arm/mach-shmobile/board-ap4evb.c | 301 ++++ + 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 | 23 + + 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/sh7372.h | 434 +++++ + 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-sh7372.c | 1637 +++++++++++++++++++ + arch/arm/mach-shmobile/pfc-sh7377.c | 1767 ++++++++++++++++++++ + 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 +- + 44 files changed, 11516 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/sh7372.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-sh7372.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. +Resolved 'fs/xfs/linux-2.6/xfs_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 +CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 061a0d4] 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 | 2881 ++++++++++++++++++++++++++++++++ + 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 | 483 ++++++ + 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 | 3032 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 335 ++++ + fs/ceph/mdsmap.c | 174 ++ + fs/ceph/mdsmap.h | 54 + + fs/ceph/messenger.c | 2238 +++++++++++++++++++++++++ + fs/ceph/messenger.h | 255 +++ + fs/ceph/mon_client.c | 830 ++++++++++ + fs/ceph/mon_client.h | 119 ++ + fs/ceph/msgpool.c | 182 ++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1531 +++++++++++++++++ + fs/ceph/osd_client.h | 165 ++ + fs/ceph/osdmap.c | 1019 ++++++++++++ + fs/ceph/osdmap.h | 125 ++ + fs/ceph/pagelist.c | 54 + + fs/ceph/pagelist.h | 54 + + fs/ceph/rados.h | 374 +++++ + fs/ceph/snap.c | 917 ++++++++++ + fs/ceph/super.c | 1024 ++++++++++++ + fs/ceph/super.h | 896 ++++++++++ + 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 | 8 +- + include/linux/ext3_fs.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/reiserfs_fs.h | 2 +- + 115 files changed, 28077 insertions(+), 107 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 +Merge made by recursive. + fs/cifs/CHANGES | 3 +- + fs/cifs/cifsglob.h | 2 +- + fs/cifs/cifspdu.h | 6 +- + fs/cifs/cifsproto.h | 7 +- + fs/cifs/cifssmb.c | 360 ++++++++++++++++++--------------------------------- + fs/cifs/connect.c | 8 +- + fs/cifs/inode.c | 3 +- + fs/cifs/misc.c | 2 +- + fs/cifs/xattr.c | 8 +- + 9 files changed, 145 insertions(+), 254 deletions(-) +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/ext2/inode.c +Auto-merging fs/ext3/inode.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/jfs/jfs_inode.h +Auto-merging fs/reiserfs/inode.c +Auto-merging include/linux/ext3_fs.h +Merge made by recursive. + Documentation/filesystems/Locking | 16 - + drivers/staging/pohmelfs/inode.c | 2 +- + fs/attr.c | 11 +- + fs/ext2/balloc.c | 12 +- + fs/ext2/ialloc.c | 14 +- + fs/ext2/inode.c | 2 +- + fs/ext2/super.c | 2 + + fs/ext2/xattr.c | 10 +- + fs/ext3/balloc.c | 11 +- + fs/ext3/file.c | 4 +- + fs/ext3/ialloc.c | 14 +- + fs/ext3/inode.c | 27 +- + fs/ext3/super.c | 241 ++++++------ + fs/ext3/xattr.c | 22 +- + fs/ext4/ialloc.c | 14 +- + fs/ext4/inode.c | 18 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/super.c | 10 +- + fs/ext4/xattr.c | 8 +- + fs/gfs2/quota.c | 9 +- + fs/gfs2/quota.h | 2 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/sys.c | 2 +- + fs/inode.c | 1 - + fs/jbd/commit.c | 10 +- + fs/jbd/transaction.c | 43 ++- + fs/jfs/acl.c | 26 +-- + fs/jfs/file.c | 27 ++- + fs/jfs/inode.c | 4 +- + fs/jfs/jfs_acl.h | 7 +- + fs/jfs/jfs_dtree.c | 28 +- + fs/jfs/jfs_extent.c | 16 +- + fs/jfs/jfs_inode.c | 8 +- + fs/jfs/jfs_inode.h | 1 + + fs/jfs/jfs_xtree.c | 22 +- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 6 + + fs/jfs/xattr.c | 17 +- + fs/ocfs2/alloc.c | 13 +- + fs/ocfs2/aops.c | 11 +- + fs/ocfs2/dir.c | 37 +- + fs/ocfs2/file.c | 15 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/namei.c | 39 +-- + fs/ocfs2/quota_global.c | 6 - + fs/quota/Kconfig | 5 + + fs/quota/Makefile | 2 + + fs/quota/compat.c | 118 ++++++ + fs/quota/dquot.c | 324 +++++++++-------- + fs/quota/netlink.c | 95 +++++ + fs/quota/quota.c | 735 ++++++++++++------------------------- + fs/reiserfs/bitmap.c | 10 +- + fs/reiserfs/inode.c | 15 +- + fs/reiserfs/namei.c | 2 +- + fs/reiserfs/stree.c | 20 +- + fs/reiserfs/super.c | 12 +- + fs/sync.c | 14 +- + fs/udf/balloc.c | 24 +- + fs/udf/ialloc.c | 14 +- + fs/ufs/balloc.c | 24 +- + fs/ufs/ialloc.c | 11 +- + fs/ufs/super.c | 6 + + fs/ufs/truncate.c | 7 + + 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 | 29 +- + include/linux/quotaops.h | 287 +++++---------- + 70 files changed, 1225 insertions(+), 1407 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/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/xattr.c +Auto-merging include/linux/jbd2.h +Merge made by recursive. + fs/ext4/balloc.c | 29 +-- + fs/ext4/dir.c | 12 +- + fs/ext4/ext4.h | 103 ++++++++--- + fs/ext4/ext4_jbd2.c | 4 +- + fs/ext4/ext4_jbd2.h | 24 +++ + fs/ext4/extents.c | 250 ++++++++++++++++++++------- + fs/ext4/file.c | 4 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/ialloc.c | 32 ++-- + fs/ext4/inode.c | 407 +++++++++++++++++++++++++++++-------------- + fs/ext4/ioctl.c | 9 + + fs/ext4/mballoc.c | 34 ++-- + fs/ext4/migrate.c | 35 ++-- + fs/ext4/move_extent.c | 12 +- + fs/ext4/namei.c | 63 ++++---- + fs/ext4/resize.c | 102 ++++------- + fs/ext4/super.c | 336 ++++++++++++++++++++++------------- + fs/ext4/xattr.c | 56 +++--- + fs/jbd2/checkpoint.c | 1 + + fs/jbd2/commit.c | 13 +- + fs/jbd2/journal.c | 132 ++++++++++++++ + fs/jbd2/transaction.c | 43 ++++-- + include/linux/jbd2.h | 11 +- + include/trace/events/ext4.h | 101 +++++++++++ + include/trace/events/jbd2.h | 28 +++ + 25 files changed, 1253 insertions(+), 590 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 +Auto-merging fs/gfs2/sys.c +Merge made by recursive. + fs/gfs2/aops.c | 4 +- + fs/gfs2/glock.c | 75 ++++++++++++++----------------------------- + 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, 109 insertions(+), 164 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 54966f4] 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 | 48 ++++---- + fs/nfs/dir.c | 2 +- + fs/nfs/dns_resolve.c | 18 +++- + fs/nfs/file.c | 30 ++++-- + fs/nfs/inode.c | 90 ++------------- + fs/nfs/nfs3proc.c | 9 +- + fs/nfs/nfs4_fs.h | 2 + + fs/nfs/nfs4proc.c | 103 +++++++++++------ + fs/nfs/nfs4renewd.c | 24 +--- + fs/nfs/nfs4state.c | 118 ++++++++++++++++---- + fs/nfs/nfs4xdr.c | 10 ++- + fs/nfs/proc.c | 41 +++++++ + fs/nfs/symlink.c | 2 +- + fs/nfs/write.c | 247 ++++++++++++--------------------------- + include/linux/nfs_fs.h | 14 +-- + include/linux/nfs_fs_sb.h | 2 + + include/linux/sunrpc/bc_xprt.h | 15 +++ + net/sunrpc/addr.c | 8 +- + net/sunrpc/auth_gss/auth_gss.c | 11 ++- + net/sunrpc/svc.c | 4 + + net/sunrpc/xprtsock.c | 9 +- + 24 files changed, 642 insertions(+), 443 deletions(-) +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/nfs4recover.c | 4 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfs4xdr.c | 2 +- + fs/nfsd/nfsctl.c | 24 +++- + fs/nfsd/vfs.c | 153 +++++++++++------------ + fs/xfs/linux-2.6/xfs_export.c | 20 +++ + include/linux/exportfs.h | 5 + + net/sunrpc/svc_xprt.c | 9 ++- + net/sunrpc/svcauth_unix.c | 47 ++++---- + net/sunrpc/svcsock.c | 2 +- + 15 files changed, 162 insertions(+), 131 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 | 66 ++++++++++++++----- + fs/nilfs2/recovery.c | 41 +++--------- + 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 + + 12 files changed, 199 insertions(+), 116 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/dir.c +Auto-merging fs/ocfs2/file.c +Merge made by recursive. + fs/ocfs2/Makefile | 1 + + fs/ocfs2/alloc.c | 5 +- + fs/ocfs2/aops.c | 5 +- + fs/ocfs2/cluster/masklog.c | 1 + + fs/ocfs2/cluster/masklog.h | 7 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/Makefile | 3 +- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/dlmfs/Makefile | 5 + + fs/ocfs2/{dlm => dlmfs}/dlmfs.c | 127 ++- + fs/ocfs2/{dlm => dlmfs}/dlmfsver.c | 0 + fs/ocfs2/{dlm => dlmfs}/dlmfsver.h | 0 + fs/ocfs2/{dlm => dlmfs}/userdlm.c | 308 +++--- + fs/ocfs2/{dlm => dlmfs}/userdlm.h | 16 +- + fs/ocfs2/dlmglue.c | 284 +++-- + fs/ocfs2/file.c | 13 +- + fs/ocfs2/ioctl.h | 6 +- + fs/ocfs2/localalloc.c | 2 +- + fs/ocfs2/ocfs2.h | 32 +- + fs/ocfs2/ocfs2_fs.h | 57 - + fs/ocfs2/ocfs2_ioctl.h | 79 ++ + fs/ocfs2/ocfs2_lockingver.h | 2 + + fs/ocfs2/refcounttree.c | 6 +- + fs/ocfs2/stack_o2cb.c | 37 +- + fs/ocfs2/stack_user.c | 49 +- + fs/ocfs2/stackglue.c | 98 +- + fs/ocfs2/stackglue.h | 95 +- + fs/ocfs2/suballoc.c | 171 +++- + fs/ocfs2/suballoc.h | 1 + + fs/ocfs2/super.c | 10 +- + fs/ocfs2/xattr.c | 2180 +++++++++++++++++++----------------- + 31 files changed, 2013 insertions(+), 1591 deletions(-) + create mode 100644 fs/ocfs2/dlmfs/Makefile + rename fs/ocfs2/{dlm => dlmfs}/dlmfs.c (82%) + rename fs/ocfs2/{dlm => dlmfs}/dlmfsver.c (100%) + rename fs/ocfs2/{dlm => dlmfs}/dlmfsver.h (100%) + rename fs/ocfs2/{dlm => dlmfs}/userdlm.c (67%) + rename fs/ocfs2/{dlm => dlmfs}/userdlm.h (89%) + create mode 100644 fs/ocfs2/ocfs2_ioctl.h +Merging squashfs/master +$ git merge squashfs/master +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by recursive. + fs/squashfs/Kconfig | 23 +++-- + 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 | 6 +- + fs/squashfs/squashfs_fs_sb.h | 40 +++++----- + 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, 621 insertions(+), 183 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/balloc.c +Auto-merging fs/udf/inode.c +Merge made by recursive. + fs/udf/balloc.c | 49 +------------------------------------------------ + fs/udf/inode.c | 34 +++++++++++++++++----------------- + 2 files changed, 18 insertions(+), 65 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 +Already up-to-date. +$ git am -3 ../patches/0001-nfsd-fixup-for-_xfs_log_force-API-change.patch +Applying: nfsd: fixup for _xfs_log_force API change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/xfs/linux-2.6/xfs_export.c +$ git add . +$ git commit -v -a --amend +[master 1a086b5] Merge remote branch 'v9fs/for-next' +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/namei.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/proc/base.c +Auto-merging fs/udf/balloc.c +Auto-merging fs/udf/inode.c +Auto-merging include/linux/fs.h +Auto-merging net/sunrpc/rpc_pipe.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 | 10 +-- + 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, 554 insertions(+), 776 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 007986b] Merge remote branch 'vfs/for-next' +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/i2c/busses/Kconfig +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 11 +- + Documentation/i2c/busses/i2c-parport | 3 + + Documentation/i2c/busses/i2c-parport-light | 11 ++ + Documentation/i2c/smbus-protocol | 16 ++ + Documentation/i2c/writing-clients | 5 +- + 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 | 28 +++- + 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-powermac.c | 25 ++- + 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 | 54 ++++++- + drivers/i2c/i2c-smbus.c | 263 ++++++++++++++++++++++++++++ + include/linux/i2c-smbus.h | 50 ++++++ + include/linux/i2c.h | 8 + + 35 files changed, 608 insertions(+), 55 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 3136772] 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/asc7621 | 296 ++++++++++ + Documentation/hwmon/it87 | 53 ++- + Documentation/hwmon/lm90 | 22 + + MAINTAINERS | 14 + + drivers/hwmon/Kconfig | 31 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adt7411.c | 366 +++++++++++++ + drivers/hwmon/asc7621.c | 1255 +++++++++++++++++++++++++++++++++++++++++++ + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/it87.c | 939 +++++++++++++++++++++++--------- + drivers/hwmon/lm90.c | 95 +++- + drivers/hwmon/w83793.c | 482 +++++++++++++++++- + 13 files changed, 3319 insertions(+), 280 deletions(-) + create mode 100644 Documentation/hwmon/adt7411 + create mode 100644 Documentation/hwmon/asc7621 + create mode 100644 drivers/hwmon/adt7411.c + create mode 100644 drivers/hwmon/asc7621.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'drivers/media/video/tvp7002.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-davinci/board-dm365-evm.c +Auto-merging arch/arm/mach-davinci/dm355.c +Auto-merging arch/arm/mach-davinci/dm365.c +Auto-merging arch/arm/mach-davinci/dm644x.c +Auto-merging arch/arm/mach-davinci/include/mach/dm365.h +Auto-merging arch/sh/boards/mach-ap325rxa/setup.c +Auto-merging arch/sh/boards/mach-migor/setup.c +Auto-merging drivers/media/common/tuners/tuner-xc2028.c +Auto-merging drivers/media/video/soc_mediabus.c +Auto-merging drivers/media/video/tvp7002.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tvp7002.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging include/linux/videodev2.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 44e9230] Merge remote branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + drivers/media/common/tuners/tuner-xc2028.c | 25 +- + drivers/media/common/tuners/tuner-xc2028.h | 2 + + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/tm6000/Kconfig | 32 + + drivers/staging/tm6000/Makefile | 17 + + drivers/staging/tm6000/README | 11 + + drivers/staging/tm6000/tm6000-alsa.c | 414 ++++++++ + drivers/staging/tm6000/tm6000-cards.c | 799 ++++++++++++++ + drivers/staging/tm6000/tm6000-core.c | 494 +++++++++ + drivers/staging/tm6000/tm6000-dvb.c | 346 +++++++ + drivers/staging/tm6000/tm6000-i2c.c | 297 ++++++ + 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 | 1 + + 18 files changed, 5282 insertions(+), 4 deletions(-) + create mode 100644 drivers/staging/tm6000/Kconfig + create mode 100644 drivers/staging/tm6000/Makefile + create mode 100644 drivers/staging/tm6000/README + create mode 100644 drivers/staging/tm6000/tm6000-alsa.c + create mode 100644 drivers/staging/tm6000/tm6000-cards.c + create mode 100644 drivers/staging/tm6000/tm6000-core.c + create mode 100644 drivers/staging/tm6000/tm6000-dvb.c + create mode 100644 drivers/staging/tm6000/tm6000-i2c.c + create mode 100644 drivers/staging/tm6000/tm6000-regs.h + create mode 100644 drivers/staging/tm6000/tm6000-stds.c + create mode 100644 drivers/staging/tm6000/tm6000-usb-isoc.h + create mode 100644 drivers/staging/tm6000/tm6000-video.c + create mode 100644 drivers/staging/tm6000/tm6000.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging init/Kconfig +Auto-merging scripts/kconfig/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 | 22 +- + 32 files changed, 2611 insertions(+), 172 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 +Already uptodate! +Merge made by recursive. +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/ide-probe.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 | 13 ++-- + 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 | 13 ++-- + 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, 536 insertions(+), 615 deletions(-) +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Resolved 'drivers/infiniband/core/uverbs_main.c' using previous resolution. +Auto-merging drivers/infiniband/core/uverbs.h +Auto-merging drivers/infiniband/core/uverbs_main.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/infiniband/hw/nes/nes_nic.c +Auto-merging drivers/net/cxgb3/cxgb3_main.c +Auto-merging drivers/net/cxgb3/sge.c +Auto-merging drivers/net/cxgb3/t3_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b09f60c] Merge remote branch 'infiniband/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/ucm.c | 63 +++- + drivers/infiniband/core/ud_header.c | 14 +- + drivers/infiniband/core/umem.c | 2 +- + drivers/infiniband/core/user_mad.c | 173 +++++---- + drivers/infiniband/core/uverbs.h | 11 +- + drivers/infiniband/core/uverbs_main.c | 174 +++++---- + drivers/infiniband/hw/cxgb3/cxio_hal.c | 15 +- + drivers/infiniband/hw/cxgb3/cxio_hal.h | 4 +- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 17 +- + drivers/infiniband/hw/cxgb3/iwch.c | 80 ++++- + drivers/infiniband/hw/cxgb3/iwch.h | 2 + + drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_qp.c | 9 +- + drivers/infiniband/hw/ehca/ehca_irq.c | 5 +- + drivers/infiniband/hw/ehca/ehca_qp.c | 4 +- + drivers/infiniband/hw/ehca/ehca_sqp.c | 2 +- + drivers/infiniband/hw/ipath/ipath_user_pages.c | 3 +- + drivers/infiniband/hw/mlx4/qp.c | 4 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- + drivers/infiniband/hw/nes/nes.c | 1 + + drivers/infiniband/hw/nes/nes.h | 9 +- + drivers/infiniband/hw/nes/nes_cm.c | 11 +- + drivers/infiniband/hw/nes/nes_hw.c | 488 ++++++++++++----------- + drivers/infiniband/hw/nes/nes_hw.h | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 61 +--- + drivers/infiniband/hw/nes/nes_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 10 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 47 ++- + drivers/infiniband/ulp/iser/iscsi_iser.h | 97 +++--- + drivers/infiniband/ulp/iser/iser_initiator.c | 506 ++++++++---------------- + drivers/infiniband/ulp/iser/iser_memory.c | 64 +--- + drivers/infiniband/ulp/iser/iser_verbs.c | 281 +++++++------- + drivers/infiniband/ulp/srp/ib_srp.c | 91 +++-- + drivers/infiniband/ulp/srp/ib_srp.h | 6 +- + drivers/net/cxgb3/adapter.h | 5 + + drivers/net/cxgb3/cxgb3_main.c | 57 +++- + drivers/net/cxgb3/cxgb3_offload.h | 5 +- + drivers/net/cxgb3/regs.h | 16 + + drivers/net/cxgb3/sge.c | 10 +- + drivers/net/cxgb3/t3_hw.c | 5 +- + include/rdma/ib_pack.h | 1 + + include/rdma/ib_verbs.h | 4 +- + include/rdma/rdma_cm.h | 1 - + 44 files changed, 1217 insertions(+), 1154 deletions(-) +Merging acpi/test +$ git merge acpi/test +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/include/asm/acpi.h +Auto-merging arch/ia64/kernel/acpi.c +Removing drivers/acpi/processor_pdc.c +Merge made by recursive. + .../ABI/testing/sysfs-platform-asus-laptop | 12 +- + Documentation/acpi/apei/einj.txt | 49 + + Documentation/kernel-parameters.txt | 12 +- + arch/ia64/include/asm/acpi.h | 1 - + arch/ia64/kernel/acpi.c | 3 + + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/emergency-restart.h | 1 + + arch/x86/kernel/acpi/boot.c | 113 +-- + arch/x86/kernel/reboot.c | 71 +- + arch/x86/lguest/boot.c | 1 - + drivers/acpi/Kconfig | 2 + + drivers/acpi/Makefile | 7 +- + drivers/acpi/acpica/exmutex.c | 3 +- + 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 | 86 +- + drivers/acpi/bus.c | 10 +- + drivers/acpi/processor_core.c | 1116 ++----------- + drivers/acpi/processor_driver.c | 976 +++++++++++ + drivers/acpi/processor_pdc.c | 209 --- + drivers/acpi/processor_throttling.c | 3 - + drivers/acpi/sbs.c | 5 + + drivers/acpi/tables.c | 4 +- + drivers/acpi/thermal.c | 36 +- + drivers/acpi/utils.c | 45 - + drivers/acpi/video.c | 28 +- + drivers/platform/x86/Kconfig | 2 + + drivers/platform/x86/asus-laptop.c | 1741 ++++++++++---------- + drivers/platform/x86/asus_acpi.c | 3 +- + drivers/platform/x86/sony-laptop.c | 91 +- + drivers/power/power_supply_sysfs.c | 1 + + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + include/acpi/processor.h | 10 +- + include/linux/power_supply.h | 1 + + 40 files changed, 4076 insertions(+), 2275 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 drivers/acpi/processor_driver.c + delete mode 100644 drivers/acpi/processor_pdc.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/firewire/sbp2.c +Auto-merging drivers/media/dvb/firewire/firedtv-fw.c +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + drivers/firewire/core-cdev.c | 368 +++++++++++++++---------------- + drivers/firewire/core-device.c | 198 +++++++++++------ + drivers/firewire/core-transaction.c | 17 +- + drivers/firewire/core.h | 2 +- + drivers/firewire/ohci.c | 364 ++++++++++-------------------- + drivers/firewire/sbp2.c | 5 +- + drivers/media/dvb/firewire/firedtv-fw.c | 39 +--- + include/linux/firewire-cdev.h | 40 +++- + include/linux/firewire.h | 11 +- + include/linux/pci_ids.h | 1 - + 10 files changed, 493 insertions(+), 552 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 +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 MAINTAINERS +Auto-merging arch/ia64/kvm/Kconfig +Auto-merging arch/powerpc/kvm/Kconfig +Auto-merging arch/x86/kvm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/feature-removal-schedule.txt'. +[master 8447506] Merge remote branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + 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 | 60 +- + 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 | 440 +++++++---- + arch/x86/kvm/i8254.c | 23 +- + arch/x86/kvm/i8254.h | 2 +- + arch/x86/kvm/i8259.c | 46 +- + arch/x86/kvm/irq.h | 3 +- + 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 | 396 +++++++--- + arch/x86/kvm/x86.c | 1098 +++++++++++++++++++------- + arch/x86/kvm/x86.h | 30 + + include/linux/kvm.h | 10 +- + include/linux/kvm_host.h | 71 +- + 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 | 392 ++++++---- + 74 files changed, 3768 insertions(+), 1661 deletions(-) + create mode 100644 arch/x86/include/asm/hyperv.h +Merging dlm/next +$ git merge dlm/next +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Auto-merging drivers/dma/dmatest.c +Auto-merging drivers/dma/ipu/ipu_idmac.c +Merge made by recursive. + Documentation/powerpc/dts-bindings/fsl/dma.txt | 8 + + arch/arm/include/asm/hardware/iop3xx-adma.h | 12 +- + drivers/dma/Kconfig | 23 + + drivers/dma/Makefile | 8 + + drivers/dma/dmatest.c | 8 +- + drivers/dma/fsldma.c | 1177 +++++++++++++----------- + drivers/dma/fsldma.h | 35 +- + drivers/dma/ipu/ipu_idmac.c | 15 +- + drivers/dma/mpc512x_dma.c | 800 ++++++++++++++++ + drivers/dma/ppc4xx/adma.c | 2 +- + include/linux/dmaengine.h | 2 + + 11 files changed, 1521 insertions(+), 569 deletions(-) + create mode 100644 drivers/dma/mpc512x_dma.c +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Merge made by recursive. + drivers/net/wireless/airo.c | 3 +- + drivers/net/wireless/ath/ar9170/ar9170.h | 1 + + drivers/net/wireless/ath/ar9170/main.c | 10 ++- + drivers/net/wireless/ath/ar9170/usb.c | 170 ++++++++++++++++++------------ + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 157 ++++++++++++++-------------- + drivers/net/wireless/iwlwifi/iwl-dev.h | 2 + + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- + include/linux/rfkill.h | 2 +- + net/mac80211/mlme.c | 16 +++- + net/rfkill/input.c | 8 ++ + 13 files changed, 226 insertions(+), 161 deletions(-) +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/nand/sh_flctl.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/nand/Kconfig +Auto-merging drivers/mtd/nand/au1550nd.c +Auto-merging drivers/mtd/nand/omap2.c +Auto-merging drivers/mtd/nand/sh_flctl.c +CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c +Removing drivers/mtd/nand/ts7250.c +Auto-merging lib/idr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 754265b] Merge remote branch 'mtd/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 19 - + arch/arm/mach-ep93xx/ts72xx.c | 188 ++- + drivers/mtd/Kconfig | 21 + + drivers/mtd/Makefile | 1 + + drivers/mtd/chips/cfi_cmdset_0001.c | 6 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 20 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/ftl.c | 1 - + drivers/mtd/inftlcore.c | 1 - + drivers/mtd/inftlmount.c | 7 +- + drivers/mtd/maps/bfin-async-flash.c | 16 +- + drivers/mtd/maps/ceiva.c | 2 +- + drivers/mtd/maps/ixp4xx.c | 4 +- + drivers/mtd/maps/physmap_of.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 335 ++++-- + drivers/mtd/mtdblock.c | 72 +- + drivers/mtd/mtdblock_ro.c | 4 +- + drivers/mtd/mtdchar.c | 12 +- + drivers/mtd/mtdcore.c | 284 +++-- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdoops.c | 5 - + drivers/mtd/mtdsuper.c | 18 +- + drivers/mtd/nand/Kconfig | 34 +- + drivers/mtd/nand/Makefile | 6 +- + drivers/mtd/nand/alauda.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 2 +- + drivers/mtd/nand/au1550nd.c | 12 +- + drivers/mtd/nand/bcm_umi_nand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 4 +- + drivers/mtd/nand/davinci_nand.c | 6 +- + drivers/mtd/nand/fsl_elbc_nand.c | 4 +- + drivers/mtd/nand/fsl_upm.c | 4 +- + drivers/mtd/nand/gpio.c | 12 +- + drivers/mtd/nand/mpc5121_nfc.c | 916 ++++++++++++++ + drivers/mtd/nand/mxc_nand.c | 22 +- + drivers/mtd/nand/nand_base.c | 312 ++++- + drivers/mtd/nand/nand_bbt.c | 26 +- + drivers/mtd/nand/nand_bcm_umi.h | 71 +- + drivers/mtd/nand/nandsim.c | 11 +- + drivers/mtd/nand/nomadik_nand.c | 6 +- + drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} | 144 ++-- + drivers/mtd/nand/omap2.c | 16 +- + drivers/mtd/nand/orion_nand.c | 10 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/r852.c | 1119 +++++++++++++++++ + drivers/mtd/nand/r852.h | 163 +++ + drivers/mtd/nand/s3c2410.c | 5 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 143 +++ + drivers/mtd/nand/sm_common.h | 61 + + drivers/mtd/nand/socrates_nand.c | 4 +- + drivers/mtd/nand/tmio_nand.c | 14 +- + drivers/mtd/nand/ts7250.c | 207 ---- + drivers/mtd/nand/txx9ndfmc.c | 2 +- + drivers/mtd/nftlcore.c | 1 - + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/rfd_ftl.c | 1 - + drivers/mtd/sm_ftl.c | 1287 ++++++++++++++++++++ + drivers/mtd/sm_ftl.h | 94 ++ + drivers/mtd/ssfdc.c | 1 - + fs/jffs2/fs.c | 10 +- + fs/jffs2/nodelist.h | 8 +- + include/linux/jffs2.h | 4 +- + include/linux/mtd/blktrans.h | 15 +- + include/linux/mtd/cfi.h | 14 +- + include/linux/mtd/mtd.h | 8 +- + include/linux/mtd/nand.h | 21 +- + lib/idr.c | 2 +- + 69 files changed, 4921 insertions(+), 928 deletions(-) + create mode 100644 drivers/mtd/nand/mpc5121_nfc.c + rename drivers/mtd/nand/{w90p910_nand.c => nuc900_nand.c} (63%) + create mode 100644 drivers/mtd/nand/r852.c + create mode 100644 drivers/mtd/nand/r852.h + create mode 100644 drivers/mtd/nand/sm_common.c + create mode 100644 drivers/mtd/nand/sm_common.h + delete mode 100644 drivers/mtd/nand/ts7250.c + create mode 100644 drivers/mtd/sm_ftl.c + create mode 100644 drivers/mtd/sm_ftl.h +$ git am -3 ../patches/0001-mtd-nand-fix-name-space-clash.patch +Applying: mtd: nand: fix name space clash +$ git am -3 ../patches/0001-mtd-declare-inline-functions-static.patch +Applying: mtd: declare inline functions static +Merging crypto/master +$ git merge crypto/master +Already up-to-date. +Merging sound/for-next +$ git merge sound/for-next +Merge made by recursive. + Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- + sound/oss/coproc.h | 2 +- + sound/oss/v_midi.h | 5 +- + sound/pci/hda/hda_codec.c | 69 +++++++++------- + sound/pci/hda/patch_realtek.c | 8 ++ + sound/usb/Kconfig | 6 +- + sound/usb/caiaq/midi.h | 2 +- + sound/usb/ua101.c | 100 ++++++++--------------- + sound/usb/usbaudio.c | 56 +------------ + sound/usb/usbaudio.h | 3 +- + sound/usb/usbquirks.h | 30 ------- + 11 files changed, 91 insertions(+), 192 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Resolved 'drivers/acpi/processor_core.c' using previous resolution. +Auto-merging drivers/acpi/processor_core.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b2edcce] Merge remote branch 'cpufreq/next' +$ git diff -M --stat --summary HEAD^.. + 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 +++++++++++++++++++++++++++++ + 4 files changed, 842 insertions(+), 0 deletions(-) + create mode 100644 Documentation/cpu-freq/pcc-cpufreq.txt + create mode 100644 arch/x86/kernel/cpu/cpufreq/pcc-cpufreq.c +$ git am -3 ../patches/0001-cpufreq-merge-fixup-for-processor_core.c-rename.patch +Applying: cpufreq: merge fixup for processor_core.c rename +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/acpi/processor_driver.c +$ git add . +$ git commit -v -a --amend +[master 439c19e] Merge remote branch 'cpufreq/next' +Merging quilt/rr +$ git merge quilt/rr +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/char/hvc_console.c' using previous resolution. +Resolved 'drivers/char/hvc_console.h' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/char/hvc_beat.c +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/char/hvc_iucv.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging include/linux/kernel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 41548d8] Merge branch 'quilt/rr' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-hotplug.txt | 2 +- + include/linux/gfp.h | 2 +- + include/linux/kernel.h | 82 +++++++++++++++++++++++++---------------- + include/linux/kmemcheck.h | 2 +- + include/linux/virtio_config.h | 5 ++- + 5 files changed, 57 insertions(+), 36 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 f951106] 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 +Already up-to-date. +Merging lsm/for-next +$ git merge lsm/for-next +Already up-to-date. +Merging block/for-next +$ git merge block/for-next +Already up-to-date. +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 Documentation/feature-removal-schedule.txt +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 12 +- + drivers/pcmcia/Kconfig | 14 +- + drivers/pcmcia/cardbus.c | 2 +- + drivers/pcmcia/cistpl.c | 1907 ++++++++++++++-------------- + drivers/pcmcia/db1xxx_ss.c | 19 +- + drivers/pcmcia/pd6729.c | 18 +- + drivers/pcmcia/rsrc_mgr.c | 3 +- + drivers/pcmcia/xxs1500_ss.c | 16 +- + drivers/pcmcia/yenta_socket.c | 8 +- + 9 files changed, 972 insertions(+), 1027 deletions(-) +Merging battery/master +$ git merge battery/master +Merge made by recursive. + drivers/power/Kconfig | 4 +- + drivers/power/bq27x00_battery.c | 177 +++++++++++++++++++++++++++++---------- + drivers/power/da9030_battery.c | 2 +- + drivers/power/wm97xx_battery.c | 4 +- + 4 files changed, 138 insertions(+), 49 deletions(-) +Merging leds/for-mm +$ git merge leds/for-mm +Merge made by recursive. + drivers/leds/Kconfig | 80 ++++++++++-------- + drivers/leds/Makefile | 1 + + drivers/leds/dell-led.c | 200 ++++++++++++++++++++++++++++++++++++++++++++ + drivers/leds/led-class.c | 2 +- + drivers/leds/leds-ss4200.c | 2 +- + 5 files changed, 248 insertions(+), 37 deletions(-) + create mode 100644 drivers/leds/dell-led.c +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 drivers/char/keyboard.c +Auto-merging drivers/input/input.c +Auto-merging drivers/serial/amba-pl011.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging include/linux/input.h +Removing kernel/kgdb.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 773 +++++++--- + Documentation/kernel-parameters.txt | 34 +- + MAINTAINERS | 7 +- + 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/keyboard.c | 10 +- + drivers/gpu/drm/drm_fb_helper.c | 79 + + drivers/gpu/drm/i915/intel_display.c | 97 ++ + drivers/input/input.c | 79 +- + 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 + + 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 | 7 + + include/linux/kdb.h | 117 ++ + include/linux/kgdb.h | 83 +- + include/linux/serial_core.h | 1 + + init/main.c | 2 + + kernel/Makefile | 2 +- + kernel/debug/Makefile | 8 + + kernel/debug/debug_core.c | 1006 ++++++++++++ + kernel/debug/debug_core.h | 81 + + kernel/debug/gdbstub.c | 1022 ++++++++++++ + kernel/debug/kdb/.gitignore | 1 + + kernel/debug/kdb/Makefile | 25 + + 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_keyboard.c | 212 +++ + kernel/debug/kdb/kdb_main.c | 2852 +++++++++++++++++++++++++++++++++ + kernel/debug/kdb/kdb_private.h | 300 ++++ + kernel/debug/kdb/kdb_support.c | 926 +++++++++++ + kernel/debug/kms_hooks.c | 62 + + kernel/kallsyms.c | 21 + + kernel/kgdb.c | 1763 -------------------- + kernel/module.c | 4 + + kernel/printk.c | 25 + + kernel/sched.c | 7 +- + kernel/signal.c | 40 + + lib/Kconfig.kgdb | 24 +- + 66 files changed, 10035 insertions(+), 2109 deletions(-) + 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_keyboard.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. + Documentation/vm/slub.txt | 1 + + include/linux/fault-inject.h | 5 +- + include/linux/slab.h | 5 + + include/linux/slub_def.h | 27 ++-- + mm/failslab.c | 18 ++- + mm/slab.c | 13 +- + mm/slub.c | 337 +++++++++++++----------------------------- + 7 files changed, 146 insertions(+), 260 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 +Recorded preimage for 'drivers/i2c/busses/i2c-isch.c' +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/i2c-isch.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-isch.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Removing drivers/mfd/88pm8607.c +Auto-merging drivers/mfd/Kconfig +Auto-merging drivers/mmc/host/tmio_mmc.c +Auto-merging drivers/power/Kconfig +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 +Recorded resolution for 'drivers/i2c/busses/i2c-isch.c'. +[master 458a09e] Merge remote branch 'mfd/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpio/Kconfig | 30 + + drivers/gpio/Makefile | 3 + + drivers/gpio/sch_gpio.c | 282 ++ + drivers/gpio/wm831x-gpio.c | 45 +- + drivers/gpio/wm8350-gpiolib.c | 181 ++ + drivers/gpio/wm8994-gpio.c | 204 ++ + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-isch.c | 68 +- + 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 | 72 +- + drivers/mfd/Makefile | 8 +- + drivers/mfd/ab3100-core.c | 54 +- + drivers/mfd/ab3100-otp.c | 13 +- + drivers/mfd/htc-i2cpld.c | 710 +++++ + drivers/mfd/lpc_sch.c | 133 + + drivers/mfd/max8925-core.c | 656 +++++ + drivers/mfd/max8925-i2c.c | 211 ++ + drivers/mfd/mfd-core.c | 5 + + drivers/mfd/sh_mobile_sdhi.c | 6 +- + drivers/mfd/sm501.c | 7 +- + drivers/mfd/t7l66xb.c | 4 +- + drivers/mfd/tc6393xb.c | 2 +- + drivers/mfd/twl-core.c | 41 +- + drivers/mfd/twl4030-power.c | 52 +- + drivers/mfd/wm831x-core.c | 51 +- + drivers/mfd/wm8350-core.c | 35 +- + drivers/mfd/wm8350-irq.c | 155 +- + drivers/mfd/wm8994-core.c | 537 ++++ + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/tmio_mmc.c | 13 +- + drivers/mmc/host/tmio_mmc.h | 6 +- + 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 | 28 +- + 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/tmio.h | 3 +- + include/linux/mfd/wm831x/core.h | 6 + + include/linux/mfd/wm831x/gpio.h | 4 + + include/linux/mfd/wm8350/core.h | 49 +- + 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 +- + 76 files changed, 12134 insertions(+), 1025 deletions(-) + create mode 100644 drivers/gpio/sch_gpio.c + 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/lpc_sch.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/vga/Kconfig' using previous resolution. +Auto-merging drivers/char/agp/intel-agp.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/radeon/radeon_combios.c +Auto-merging drivers/gpu/vga/Kconfig +CONFLICT (content): Merge conflict in drivers/gpu/vga/Kconfig +Auto-merging drivers/video/console/fbcon.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e3b816d] Merge remote branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/char/agp/intel-agp.c | 123 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/drm_buffer.c | 184 + + drivers/gpu/drm/drm_crtc_helper.c | 6 +- + drivers/gpu/drm/drm_drv.c | 44 +- + drivers/gpu/drm/drm_edid.c | 30 +- + drivers/gpu/drm/drm_fb_helper.c | 26 +- + drivers/gpu/drm/drm_gem.c | 70 +- + drivers/gpu/drm/i915/i915_debugfs.c | 253 +- + drivers/gpu/drm/i915/i915_dma.c | 326 +- + drivers/gpu/drm/i915/i915_drv.c | 27 +- + drivers/gpu/drm/i915/i915_drv.h | 69 +- + drivers/gpu/drm/i915/i915_gem.c | 430 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 169 +- + drivers/gpu/drm/i915/i915_irq.c | 313 +- + drivers/gpu/drm/i915/i915_reg.h | 170 +- + drivers/gpu/drm/i915/i915_suspend.c | 10 + + drivers/gpu/drm/i915/intel_bios.c | 3 +- + drivers/gpu/drm/i915/intel_crt.c | 14 +- + drivers/gpu/drm/i915/intel_display.c | 216 +- + drivers/gpu/drm/i915/intel_dp.c | 6 +- + drivers/gpu/drm/i915/intel_drv.h | 2 + + drivers/gpu/drm/i915/intel_fb.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 4 +- + drivers/gpu/drm/i915/intel_i2c.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 41 +- + drivers/gpu/drm/i915/intel_overlay.c | 29 +- + drivers/gpu/drm/i915/intel_sdvo.c | 23 +- + drivers/gpu/drm/nouveau/Makefile | 2 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 160 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 339 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 126 +- + drivers/gpu/drm/nouveau/nouveau_calc.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_channel.c | 39 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 167 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 24 + + drivers/gpu/drm/nouveau/nouveau_display.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 108 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 21 +- + drivers/gpu/drm/nouveau/nouveau_drv.c | 13 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 53 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 508 +- + drivers/gpu/drm/nouveau/nouveau_hw.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_i2c.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_irq.c | 5 + + drivers/gpu/drm/nouveau/nouveau_notifier.c | 9 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 40 +- + drivers/gpu/drm/nouveau/nv04_crtc.c | 4 +- + drivers/gpu/drm/nouveau/nv04_dac.c | 8 +- + drivers/gpu/drm/nouveau/nv04_dfp.c | 4 +- + drivers/gpu/drm/nouveau/nv04_display.c | 49 +- + drivers/gpu/drm/nouveau/nv04_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nv04_fifo.c | 5 + + drivers/gpu/drm/nouveau/nv04_tv.c | 2 +- + drivers/gpu/drm/nouveau/nv17_tv.c | 6 +- + drivers/gpu/drm/nouveau/nv40_fifo.c | 5 + + drivers/gpu/drm/nouveau/nv50_crtc.c | 4 +- + drivers/gpu/drm/nouveau/nv50_dac.c | 4 +- + drivers/gpu/drm/nouveau/nv50_display.c | 54 +- + drivers/gpu/drm/nouveau/nv50_fbcon.c | 2 +- + drivers/gpu/drm/nouveau/nv50_fifo.c | 13 +- + drivers/gpu/drm/nouveau/nv50_graph.c | 74 +- + drivers/gpu/drm/nouveau/nv50_grctx.c | 2367 ++++++++ + drivers/gpu/drm/nouveau/nv50_instmem.c | 2 +- + drivers/gpu/drm/radeon/Makefile | 9 +- + drivers/gpu/drm/radeon/atom.c | 4 - + drivers/gpu/drm/radeon/atombios.h | 7300 +++++++++++++---------- + drivers/gpu/drm/radeon/atombios_crtc.c | 456 ++- + drivers/gpu/drm/radeon/atombios_dp.c | 64 +- + drivers/gpu/drm/radeon/avivod.h | 2 + + drivers/gpu/drm/radeon/evergreen.c | 767 +++ + drivers/gpu/drm/radeon/evergreen_reg.h | 176 + + drivers/gpu/drm/radeon/r100.c | 176 +- + drivers/gpu/drm/radeon/r200.c | 46 + + drivers/gpu/drm/radeon/r300.c | 157 +- + drivers/gpu/drm/radeon/r300_cmdbuf.c | 280 +- + drivers/gpu/drm/radeon/r300_reg.h | 2 + + drivers/gpu/drm/radeon/r420.c | 49 +- + drivers/gpu/drm/radeon/r500_reg.h | 100 +- + drivers/gpu/drm/radeon/r520.c | 21 +- + drivers/gpu/drm/radeon/r600.c | 190 +- + drivers/gpu/drm/radeon/r600_audio.c | 21 +- + drivers/gpu/drm/radeon/r600_blit.c | 2 +- + drivers/gpu/drm/radeon/r600_blit_kms.c | 17 +- + drivers/gpu/drm/radeon/r600_blit_shaders.c | 10 - + drivers/gpu/drm/radeon/r600_cp.c | 262 +- + drivers/gpu/drm/radeon/r600_cs.c | 831 +++- + drivers/gpu/drm/radeon/r600d.h | 467 ++- + drivers/gpu/drm/radeon/radeon.h | 167 +- + drivers/gpu/drm/radeon/radeon_agp.c | 4 + + drivers/gpu/drm/radeon/radeon_asic.h | 172 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 435 ++- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 257 + + drivers/gpu/drm/radeon/radeon_bios.c | 50 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 18 +- + drivers/gpu/drm/radeon/radeon_combios.c | 290 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 20 +- + drivers/gpu/drm/radeon/radeon_cp.c | 1 + + drivers/gpu/drm/radeon/radeon_cs.c | 7 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 50 +- + drivers/gpu/drm/radeon/radeon_device.c | 235 +- + drivers/gpu/drm/radeon/radeon_display.c | 332 +- + drivers/gpu/drm/radeon/radeon_drv.c | 14 +- + drivers/gpu/drm/radeon/radeon_drv.h | 46 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 354 +- + drivers/gpu/drm/radeon/radeon_family.h | 5 + + drivers/gpu/drm/radeon/radeon_fb.c | 12 +- + drivers/gpu/drm/radeon/radeon_gart.c | 32 +- + drivers/gpu/drm/radeon/radeon_gem.c | 36 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 768 +++- + drivers/gpu/drm/radeon/radeon_kms.c | 27 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 29 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 20 + + drivers/gpu/drm/radeon/radeon_mode.h | 55 +- + drivers/gpu/drm/radeon/radeon_object.c | 3 +- + drivers/gpu/drm/radeon/radeon_pm.c | 399 ++- + drivers/gpu/drm/radeon/radeon_reg.h | 50 +- + drivers/gpu/drm/radeon/radeon_ring.c | 67 + + drivers/gpu/drm/radeon/radeon_state.c | 203 +- + drivers/gpu/drm/radeon/radeon_test.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 12 +- + drivers/gpu/drm/radeon/reg_srcs/r600 | 837 +++ + drivers/gpu/drm/radeon/rs400.c | 39 +- + drivers/gpu/drm/radeon/rs600.c | 56 +- + drivers/gpu/drm/radeon/rs690.c | 41 +- + drivers/gpu/drm/radeon/rv515.c | 21 +- + drivers/gpu/drm/radeon/rv770.c | 259 +- + drivers/gpu/drm/radeon/rv770d.h | 2 + + drivers/gpu/drm/ttm/ttm_tt.c | 18 +- + drivers/gpu/vga/Kconfig | 13 + + drivers/gpu/vga/Makefile | 1 + + drivers/gpu/vga/vga_switcheroo.c | 450 ++ + drivers/video/console/fbcon.c | 18 + + drivers/video/fbmem.c | 1 - + include/drm/drmP.h | 28 +- + include/drm/drm_buffer.h | 148 + + include/drm/drm_crtc.h | 2 + + include/drm/drm_edid.h | 3 + + include/drm/drm_pciids.h | 36 + + include/drm/nouveau_drm.h | 86 +- + include/drm/radeon_drm.h | 1 + + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/linux/fb.h | 2 + + include/linux/vga_switcheroo.h | 57 + + 146 files changed, 18177 insertions(+), 6374 deletions(-) + create mode 100644 drivers/gpu/drm/drm_buffer.c + create mode 100644 drivers/gpu/drm/nouveau/nv50_grctx.c + create mode 100644 drivers/gpu/drm/radeon/evergreen.c + create mode 100644 drivers/gpu/drm/radeon/evergreen_reg.h + create mode 100644 drivers/gpu/drm/radeon/radeon_atpx_handler.c + create mode 100644 drivers/gpu/drm/radeon/reg_srcs/r600 + create mode 100644 drivers/gpu/vga/vga_switcheroo.c + create mode 100644 include/drm/drm_buffer.h + create mode 100644 include/linux/vga_switcheroo.h +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/wm8350-regulator.c +Merge made by recursive. + drivers/regulator/Kconfig | 29 ++- + drivers/regulator/Makefile | 3 + + drivers/regulator/ab3100.c | 6 +- + drivers/regulator/core.c | 79 +++++- + drivers/regulator/dummy.c | 66 +++++ + drivers/regulator/dummy.h | 31 +++ + drivers/regulator/fixed.c | 30 ++- + drivers/regulator/lp3971.c | 68 +++--- + drivers/regulator/max1586.c | 9 +- + drivers/regulator/max8649.c | 408 ++++++++++++++++++++++++++++ + drivers/regulator/max8660.c | 11 +- + drivers/regulator/mc13783-regulator.c | 465 +++++++++++++++++++++++++++++-- + drivers/regulator/pcap-regulator.c | 8 +- + drivers/regulator/tps65023-regulator.c | 35 ++-- + drivers/regulator/tps6507x-regulator.c | 34 +-- + drivers/regulator/twl-regulator.c | 22 +- + drivers/regulator/virtual.c | 64 +++--- + drivers/regulator/wm831x-dcdc.c | 12 + + drivers/regulator/wm831x-isink.c | 3 + + drivers/regulator/wm831x-ldo.c | 5 + + drivers/regulator/wm8350-regulator.c | 46 ++++ + drivers/regulator/wm8400-regulator.c | 7 +- + drivers/regulator/wm8994-regulator.c | 307 +++++++++++++++++++++ + 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 +++ + 28 files changed, 1622 insertions(+), 184 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 2558ac5] Merge remote branch 'security-testing/next' +$ git diff -M --stat --summary HEAD^.. + fs/proc/kmsg.c | 14 +- + include/linux/security.h | 14 +- + include/linux/syslog.h | 52 +++ + kernel/capability.c | 4 +- + kernel/printk.c | 52 ++-- + security/capability.c | 4 - + security/commoncap.c | 9 +- + security/security.c | 49 ++- + security/selinux/avc.c | 22 +- + security/selinux/hooks.c | 41 +-- + 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 | 273 ++++++++------ + security/smack/smack_lsm.c | 4 +- + security/tomoyo/Makefile | 2 +- + security/tomoyo/common.c | 374 +++++++----------- + 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 ----- + 30 files changed, 2030 insertions(+), 1708 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 | 12 +++-- + drivers/uwb/wlp/messages.c | 106 +++++++++++++++++++++++++------------------ + 3 files changed, 69 insertions(+), 51 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 +Auto-merging drivers/watchdog/ar7_wdt.c +Auto-merging drivers/watchdog/bfin_wdt.c +Merge made by recursive. + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 + + arch/arm/mach-ep93xx/ts72xx.c | 21 ++ + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + drivers/watchdog/Kconfig | 20 +- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/acquirewdt.c | 2 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/adx_wdt.c | 2 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/ar7_wdt.c | 2 +- + drivers/watchdog/at32ap700x_wdt.c | 2 +- + drivers/watchdog/at91rm9200_wdt.c | 2 +- + drivers/watchdog/bcm47xx_wdt.c | 2 +- + drivers/watchdog/bfin_wdt.c | 56 +-- + drivers/watchdog/booke_wdt.c | 2 +- + drivers/watchdog/coh901327_wdt.c | 2 +- + drivers/watchdog/cpu5wdt.c | 2 +- + drivers/watchdog/cpwd.c | 2 +- + drivers/watchdog/davinci_wdt.c | 2 +- + drivers/watchdog/ep93xx_wdt.c | 2 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/gef_wdt.c | 16 +- + drivers/watchdog/geodewdt.c | 2 +- + drivers/watchdog/hpwdt.c | 2 +- + drivers/watchdog/i6300esb.c | 2 +- + drivers/watchdog/iTCO_wdt.c | 21 +- + drivers/watchdog/ib700wdt.c | 2 +- + drivers/watchdog/indydog.c | 2 +- + drivers/watchdog/it8712f_wdt.c | 2 +- + drivers/watchdog/it87_wdt.c | 2 +- + drivers/watchdog/ixp2000_wdt.c | 2 +- + drivers/watchdog/ixp4xx_wdt.c | 2 +- + drivers/watchdog/ks8695_wdt.c | 2 +- + drivers/watchdog/machzwd.c | 2 +- + drivers/watchdog/max63xx_wdt.c | 397 +++++++++++++++++++++ + drivers/watchdog/mixcomwd.c | 2 +- + drivers/watchdog/mpc8xxx_wdt.c | 2 +- + drivers/watchdog/mpcore_wdt.c | 2 +- + drivers/watchdog/mv64x60_wdt.c | 2 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/pcwd.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 2 +- + drivers/watchdog/pika_wdt.c | 2 +- + drivers/watchdog/pnx833x_wdt.c | 2 +- + drivers/watchdog/rc32434_wdt.c | 2 +- + drivers/watchdog/rdc321x_wdt.c | 2 +- + drivers/watchdog/riowd.c | 2 +- + drivers/watchdog/sbc_fitpc2_wdt.c | 2 +- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/stmp3xxx_wdt.c | 2 +- + drivers/watchdog/ts72xx_wdt.c | 520 ++++++++++++++++++++++++++++ + drivers/watchdog/txx9wdt.c | 25 +- + drivers/watchdog/w83627hf_wdt.c | 2 +- + drivers/watchdog/w83977f_wdt.c | 2 +- + drivers/watchdog/wdrtas.c | 2 +- + drivers/watchdog/wm831x_wdt.c | 2 +- + drivers/watchdog/wm8350_wdt.c | 2 +- + 59 files changed, 1050 insertions(+), 128 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. + fs/exofs/common.h | 39 ++++ + fs/exofs/exofs.h | 53 ++++- + fs/exofs/inode.c | 194 +++++++++++------- + fs/exofs/ios.c | 575 +++++++++++++++++++++++++++++++++++++++++++++-------- + fs/exofs/super.c | 121 +++++++++--- + 5 files changed, 779 insertions(+), 203 deletions(-) +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +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. +Resolved 'drivers/net/typhoon.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/ia64/sn/kernel/setup.c +Auto-merging arch/s390/kernel/sclp.S +Auto-merging arch/sparc/kernel/perf_event.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/tsc.c +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_acpi.c +Auto-merging drivers/ata/pata_pcmcia.c +Removing drivers/char/ChangeLog +Auto-merging drivers/char/agp/intel-agp.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/gpu/drm/radeon/radeon_state.c +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/mtd/inftlcore.c +Auto-merging drivers/mtd/nand/bcm_umi_nand.c +Auto-merging drivers/mtd/nand/mxc_nand.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 +CONFLICT (content): Merge conflict in 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 +Removing drivers/parport/ChangeLog +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/bio.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/move_extent.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 +Removing fs/ntfs/ChangeLog +Auto-merging fs/ocfs2/dlmglue.c +Auto-merging fs/ocfs2/extent_map.c +Auto-merging fs/reiserfs/bitmap.c +Auto-merging fs/udf/inode.c +Auto-merging include/linux/sched.h +Auto-merging kernel/ksysfs.c +Auto-merging kernel/sched_cpupri.c +Auto-merging kernel/trace/trace.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 +Auto-merging tools/perf/perf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 46396f7] 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/cgroups/cpusets.txt | 127 +- + Documentation/console/console.txt | 2 +- + 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/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/ChangeLog | 775 --------- + 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/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/parport/ChangeLog | 583 ------- + 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/ntfs/ChangeLog | 1702 -------------------- + 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/rbtree.h | 8 +- + 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/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 +- + 243 files changed, 397 insertions(+), 3455 deletions(-) + mode change 100755 => 100644 arch/arm/mach-omap2/board-3630sdp.c + mode change 100755 => 100644 arch/arm/mach-omap2/board-zoom-peripherals.c + delete mode 100644 drivers/char/ChangeLog + mode change 100755 => 100644 drivers/mtd/chips/cfi_util.c + mode change 100755 => 100644 drivers/mtd/inftlcore.c + delete mode 100644 drivers/parport/ChangeLog + delete mode 100644 fs/ntfs/ChangeLog +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging quilt/aoe +$ git merge quilt/aoe +Auto-merging drivers/block/aoe/aoecmd.c +Merge made by recursive. + drivers/block/aoe/aoecmd.c | 8 ++++++-- + 1 files changed, 6 insertions(+), 2 deletions(-) +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging bluetooth/master +$ git merge bluetooth/master +Already up-to-date. +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/inode.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 include/linux/syscalls.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 kernel/sysctl.c +Auto-merging security/security.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 332e350] 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 f39b2ce] 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 5f5e287] 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 d093d94] 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 +Already up-to-date. +Merging spi/next-spi +$ git merge spi/next-spi +Already up-to-date. +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 kernel/sys.c +Auto-merging security/capability.c +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 ffa7a76] 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 +Already up-to-date. +Merging als/for-next +$ git merge als/for-next +Auto-merging MAINTAINERS +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 +Auto-merging drivers/misc/Makefile +Merge made by recursive. + 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/kernel-parameters.txt +Auto-merging arch/ia64/kernel/acpi.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/pci_x86.h +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/pci-dma.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kernel/vmiclock_32.c +Auto-merging arch/x86/pci/legacy.c +Auto-merging drivers/pci/pci.c +Auto-merging include/linux/kernel.h +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/rbtree.h +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/Makefile +Auto-merging kernel/irq/chip.c +Auto-merging kernel/sysctl.c +Merge made by recursive. + Documentation/DocBook/device-drivers.tmpl | 2 +- + Documentation/DocBook/deviceiobook.tmpl | 2 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/kprobes.txt | 207 ++++++- + Documentation/rbtree.txt | 58 ++ + arch/Kconfig | 13 + + arch/ia64/include/asm/xen/events.h | 4 - + arch/ia64/kernel/acpi.c | 4 +- + arch/mips/include/asm/i8253.h | 2 +- + arch/mips/kernel/i8253.c | 14 +- + arch/x86/Kconfig | 17 + + arch/x86/ia32/ia32_aout.c | 1 - + arch/x86/include/asm/alternative.h | 4 +- + arch/x86/include/asm/e820.h | 5 +- + arch/x86/include/asm/highmem.h | 4 - + arch/x86/include/asm/hw_breakpoint.h | 1 - + arch/x86/include/asm/hw_irq.h | 7 - + arch/x86/include/asm/i8253.h | 2 +- + arch/x86/include/asm/i8259.h | 21 +- + arch/x86/include/asm/io_apic.h | 3 +- + arch/x86/include/asm/irq.h | 1 + + arch/x86/include/asm/irq_vectors.h | 48 +- + arch/x86/include/asm/kprobes.h | 31 +- + arch/x86/include/asm/nmi.h | 2 + + arch/x86/include/asm/numaq.h | 1 + + arch/x86/include/asm/paravirt.h | 9 - + arch/x86/include/asm/paravirt_types.h | 4 - + arch/x86/include/asm/pci.h | 11 +- + arch/x86/include/asm/pci_64.h | 2 - + arch/x86/include/asm/pci_x86.h | 21 +- + arch/x86/include/asm/perf_event.h | 14 +- + arch/x86/include/asm/pgtable_32.h | 4 +- + arch/x86/include/asm/proto.h | 10 - + arch/x86/include/asm/setup.h | 2 - + arch/x86/include/asm/visws/cobalt.h | 2 + + arch/x86/include/asm/x86_init.h | 13 + + arch/x86/kernel/acpi/boot.c | 13 +- + arch/x86/kernel/alternative.c | 60 ++ + arch/x86/kernel/aperture_64.c | 1 - + arch/x86/kernel/apic/Makefile | 7 +- + arch/x86/kernel/apic/apic.c | 8 +- + arch/x86/kernel/apic/hw_nmi.c | 127 ++++ + arch/x86/kernel/apic/io_apic.c | 321 +++++---- + arch/x86/kernel/apic/nmi.c | 15 +- + arch/x86/kernel/apic/numaq_32.c | 1 + + arch/x86/kernel/apm_32.c | 4 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 208 +----- + arch/x86/kernel/cpu/perf_event.c | 8 +- + arch/x86/kernel/cpu/perf_event_p6.c | 8 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- + arch/x86/kernel/e820.c | 349 +--------- + arch/x86/kernel/head32.c | 10 + + arch/x86/kernel/hw_breakpoint.c | 12 - + arch/x86/kernel/i8253.c | 14 +- + arch/x86/kernel/i8259.c | 94 ++- + arch/x86/kernel/irqinit.c | 37 +- + arch/x86/kernel/kprobes.c | 609 +++++++++++++++--- + arch/x86/kernel/mmconf-fam10h_64.c | 7 +- + arch/x86/kernel/paravirt.c | 4 - + arch/x86/kernel/pci-dma.c | 13 +- + arch/x86/kernel/reboot.c | 8 + + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/setup_percpu.c | 6 + + arch/x86/kernel/smpboot.c | 22 +- + arch/x86/kernel/time.c | 4 +- + arch/x86/kernel/traps.c | 7 + + arch/x86/kernel/visws_quirks.c | 27 +- + arch/x86/kernel/vmi_32.c | 35 +- + arch/x86/kernel/vmiclock_32.c | 6 +- + arch/x86/kernel/x86_init.c | 8 + + arch/x86/mm/Makefile | 1 + + arch/x86/mm/init_32.c | 7 +- + arch/x86/mm/init_64.c | 9 +- + arch/x86/mm/numa_32.c | 3 + + arch/x86/mm/numa_64.c | 97 ++-- + arch/x86/mm/pageattr.c | 25 +- + arch/x86/mm/pat.c | 231 +------ + arch/x86/mm/pat_internal.h | 46 ++ + arch/x86/mm/pat_rbtree.c | 273 ++++++++ + arch/x86/oprofile/op_model_amd.c | 23 +- + arch/x86/oprofile/op_model_ppro.c | 6 +- + arch/x86/pci/Makefile | 3 +- + arch/x86/pci/acpi.c | 7 +- + arch/x86/pci/amd_bus.c | 127 +--- + arch/x86/pci/bus_numa.c | 25 +- + arch/x86/pci/bus_numa.h | 9 +- + arch/x86/pci/common.c | 6 - + arch/x86/pci/i386.c | 4 - + arch/x86/pci/irq.c | 16 +- + arch/x86/pci/legacy.c | 24 +- + arch/x86/pci/numaq_32.c | 6 - + arch/x86/pci/visws.c | 6 +- + arch/x86/xen/enlighten.c | 7 + + arch/x86/xen/mmu.c | 21 - + drivers/acpi/numa.c | 4 +- + drivers/block/hd.c | 4 +- + drivers/input/gameport/gameport.c | 4 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/misc/pcspkr.c | 6 +- + drivers/pci/hotplug/ibmphp_res.c | 14 +- + drivers/pci/pci.c | 43 ++ + drivers/xen/events.c | 8 +- + include/linux/bootmem.h | 7 + + include/linux/cgroup.h | 1 + + include/linux/early_res.h | 23 + + include/linux/hw_breakpoint.h | 8 +- + include/linux/irq.h | 2 + + include/linux/kernel.h | 10 + + include/linux/kprobes.h | 44 ++ + include/linux/mm.h | 12 + + include/linux/mmzone.h | 2 + + include/linux/nmi.h | 13 + + include/linux/pci.h | 2 + + include/linux/perf_event.h | 5 +- + include/linux/range.h | 30 + + include/linux/rbtree.h | 5 +- + init/Kconfig | 5 + + init/main.c | 16 +- + kernel/Makefile | 4 +- + kernel/early_res.c | 578 +++++++++++++++++ + kernel/hw_breakpoint.c | 11 +- + kernel/irq/chip.c | 52 ++- + kernel/irq/handle.c | 58 +- + kernel/irq/internals.h | 6 +- + kernel/irq/numa_migrate.c | 4 +- + kernel/kprobes.c | 647 ++++++++++++++++--- + kernel/nmi_watchdog.c | 257 ++++++++ + kernel/range.c | 163 +++++ + kernel/rcutree_plugin.h | 8 +- + kernel/resource.c | 9 +- + kernel/sched_fair.c | 2 +- + kernel/sysctl.c | 27 +- + kernel/time/clocksource.c | 4 + + kernel/trace/trace_clock.c | 1 + + lib/Kconfig.debug | 20 + + lib/rbtree.c | 48 ++- + mm/Kconfig | 4 + + mm/bootmem.c | 195 ++++++- + mm/page_alloc.c | 61 ++- + mm/sparse-vmemmap.c | 76 +++- + mm/sparse.c | 196 +++++- + samples/hw_breakpoint/data_breakpoint.c | 6 +- + sound/drivers/pcsp/pcsp.h | 2 +- + sound/drivers/pcsp/pcsp_input.c | 4 +- + sound/drivers/pcsp/pcsp_lib.c | 12 +- + tools/perf/Documentation/perf-lock.txt | 29 + + tools/perf/Documentation/perf-probe.txt | 58 ++- + tools/perf/Makefile | 10 +- + tools/perf/builtin-lock.c | 148 +++++- + tools/perf/builtin-probe.c | 36 +- + tools/perf/command-list.txt | 1 + + tools/perf/util/probe-event.c | 57 ++- + tools/perf/util/probe-finder.c | 1002 +++++++++++++---------------- + tools/perf/util/probe-finder.h | 53 +- + tools/perf/util/string.c | 55 ++- + tools/perf/util/string.h | 1 + + 157 files changed, 5435 insertions(+), 2344 deletions(-) + create mode 100644 arch/x86/kernel/apic/hw_nmi.c + create mode 100644 arch/x86/mm/pat_internal.h + create mode 100644 arch/x86/mm/pat_rbtree.c + create mode 100644 include/linux/early_res.h + create mode 100644 include/linux/range.h + create mode 100644 kernel/early_res.c + create mode 100644 kernel/nmi_watchdog.c + create mode 100644 kernel/range.c + create mode 100644 tools/perf/Documentation/perf-lock.txt +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/powerpc/include/asm/local.h +Auto-merging arch/x86/include/asm/system.h +Auto-merging arch/x86/kernel/apic/nmi.c +Auto-merging drivers/acpi/processor_perflib.c +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/dmaengine.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 include/linux/percpu_counter.h +Auto-merging include/linux/srcu.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 +Auto-merging mm/page_alloc.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 9afd892] Merge remote branch 'percpu/for-next' +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 +Resolved 'drivers/base/power/main.c' using previous resolution. +Resolved 'drivers/pcmcia/ds.c' using previous resolution. +Resolved 'include/linux/device.h' using previous resolution. +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/s390/kernel/time.c +Auto-merging arch/sh/kernel/cpu/sh4/sq.c +Auto-merging arch/x86/kernel/cpu/intel_cacheinfo.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging block/blk-sysfs.c +Auto-merging block/elevator.c +Auto-merging drivers/acpi/system.c +Auto-merging drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merging drivers/block/pktcdvd.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/infiniband/core/ucm.c +Auto-merging drivers/infiniband/core/user_mad.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/macintosh/windfarm_core.c +Auto-merging drivers/mtd/ubi/build.c +Auto-merging drivers/net/arm/am79c961a.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/platform/x86/Kconfig +Auto-merging drivers/platform/x86/hp-wmi.c +Removing drivers/uio/uio_smx.c +Auto-merging drivers/usb/core/driver.c +Auto-merging drivers/video/omap2/dss/manager.c +Auto-merging drivers/video/omap2/dss/overlay.c +Auto-merging drivers/video/sh_mobile_lcdcfb.c +Auto-merging fs/dlm/lockspace.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/sys.c +Auto-merging fs/ocfs2/cluster/masklog.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/module.c +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 +Auto-merging net/bridge/br_sysfs_if.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e4f7414] 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 | 12 +- + 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.c | 1 + + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + block/blk-integrity.c | 2 +- + block/blk-sysfs.c | 2 +- + block/elevator.c | 2 +- + drivers/acpi/system.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 | 36 +-- + drivers/base/cpu.c | 105 +++---- + drivers/base/dd.c | 38 ++-- + drivers/base/devtmpfs.c | 13 + + drivers/base/firmware_class.c | 11 +- + drivers/base/memory.c | 20 +- + drivers/base/node.c | 81 ++--- + drivers/base/platform.c | 76 ++++- + 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 | 5 +- + 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 | 5 +- + 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/macintosh/windfarm_core.c | 1 + + drivers/macintosh/windfarm_smu_controls.c | 1 + + 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-sysfs.c | 5 + + 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/Kconfig | 24 +- + drivers/uio/Makefile | 2 +- + drivers/uio/uio.c | 4 +- + drivers/uio/uio_netx.c | 172 +++++++++++ + drivers/uio/uio_smx.c | 140 --------- + 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/bin.c | 50 ++-- + fs/sysfs/dir.c | 132 ++++---- + fs/sysfs/file.c | 47 ++- + fs/sysfs/inode.c | 13 +- + fs/sysfs/mount.c | 4 +- + fs/sysfs/symlink.c | 38 +++ + fs/sysfs/sysfs.h | 17 +- + 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 | 61 ++++ + include/linux/usb.h | 6 +- + kernel/module.c | 3 + + kernel/params.c | 5 +- + 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 +- + 148 files changed, 1461 insertions(+), 796 deletions(-) + create mode 100644 drivers/uio/uio_netx.c + delete mode 100644 drivers/uio/uio_smx.c +$ 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 68410bc] Merge branch 'quilt/driver-core' +$ git am -3 ../patches/0001-sysfs-fix-for-thinko-with-sysfs_bin_attr_init.patch +Applying: sysfs: fix for thinko with sysfs_bin_attr_init() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/pci/pci-sysfs.c +M include/linux/sysfs.h +$ git add . +$ git commit -v -a --amend +[master 35f172f] Merge branch 'quilt/driver-core' +Merging quilt/tty +$ git merge quilt/tty +Auto-merging drivers/char/hvc_console.c +Auto-merging drivers/char/serial167.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 | 157 +++++---- + drivers/char/serial167.c | 3 +- + drivers/char/specialix.c | 2 - + drivers/char/synclink.c | 4 +- + drivers/char/synclink_gt.c | 186 ++++++----- + drivers/char/tty_buffer.c | 6 +- + drivers/char/tty_ldisc.c | 50 ++-- + drivers/char/vt_ioctl.c | 39 ++- + 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 | 5 +- + drivers/serial/imx.c | 6 +- + drivers/serial/ioc3_serial.c | 3 +- + drivers/serial/jsm/jsm_driver.c | 1 + + drivers/serial/jsm/jsm_tty.c | 9 +- + drivers/serial/msm_serial.c | 6 +- + drivers/serial/timbuart.c | 7 +- + drivers/usb/serial/keyspan_pda.c | 7 + + include/linux/pci_ids.h | 3 + + include/linux/tty.h | 10 + + include/linux/vt.h | 3 +- + 36 files changed, 978 insertions(+), 652 deletions(-) +Merging quilt/usb +$ git merge quilt/usb +Resolved 'arch/arm/mach-mx2/devices.c' using previous resolution. +Resolved 'arch/arm/mach-mx2/devices.h' using previous resolution. +Resolved 'drivers/usb/early/ehci-dbgp.c' using previous resolution. +Resolved 'drivers/usb/storage/scsiglue.c' using previous resolution. +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging arch/arm/configs/rx51_defconfig +Auto-merging arch/arm/mach-mx2/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.c +Auto-merging arch/arm/mach-mx2/devices.h +CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.h +Auto-merging drivers/media/video/dabusb.c +Auto-merging drivers/usb/Kconfig +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/gmidi.c +Removing drivers/usb/misc/berry_charge.c +Removing drivers/usb/misc/vstusb.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/musb/tusb6010_omap.c +Auto-merging drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/symbolserial.c +Auto-merging drivers/usb/storage/scsiglue.c +CONFLICT (content): Merge conflict in drivers/usb/storage/scsiglue.c +Auto-merging include/linux/usb.h +Auto-merging include/linux/usb/musb.h +Auto-merging include/linux/usb/otg.h +Removing include/linux/usb/vstusb.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master db4fc29] Merge branch 'quilt/usb' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 11 + + Documentation/ioctl/ioctl-number.txt | 1 - + 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 | 56 +- + 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/char/tty_buffer.c | 11 +- + drivers/hid/usbhid/hiddev.c | 7 +- + drivers/media/video/dabusb.c | 8 +- + drivers/staging/usbip/vhci_sysfs.c | 2 +- + drivers/usb/Kconfig | 2 + + 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 | 82 +- + 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 | 918 ++++++------- + drivers/usb/core/file.c | 2 - + drivers/usb/core/hcd.c | 27 +- + drivers/usb/core/hcd.h | 13 +- + drivers/usb/core/hub.c | 120 +- + drivers/usb/core/message.c | 5 +- + 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 | 47 +- + 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-da8xx.c | 456 +++++++ + drivers/usb/host/ohci-dbg.c | 4 +- + drivers/usb/host/ohci-hcd.c | 5 + + drivers/usb/host/ohci-lh7a404.c | 11 +- + drivers/usb/host/ohci-pnx4008.c | 6 +- + 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-ext-caps.h | 7 +- + 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 | 25 - + drivers/usb/misc/Makefile | 2 - + drivers/usb/misc/adutux.c | 8 +- + drivers/usb/misc/appledisplay.c | 5 +- + 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 | 20 +- + 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 | 783 ----------- + drivers/usb/mon/mon_bin.c | 7 +- + drivers/usb/mon/mon_text.c | 6 +- + 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 | 19 + + drivers/usb/serial/Makefile | 2 + + drivers/usb/serial/aircable.c | 36 +- + drivers/usb/serial/ark3116.c | 3 +- + drivers/usb/serial/belkin_sa.c | 2 +- + drivers/usb/serial/ch341.c | 27 +- + drivers/usb/serial/cp210x.c | 7 +- + drivers/usb/serial/cyberjack.c | 5 +- + drivers/usb/serial/cypress_m8.c | 82 +- + drivers/usb/serial/digi_acceleport.c | 38 +- + drivers/usb/serial/empeg.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 195 ++-- + drivers/usb/serial/ftdi_sio.h | 6 +- + drivers/usb/serial/ftdi_sio_ids.h | 39 +- + drivers/usb/serial/funsoft.c | 2 +- + drivers/usb/serial/garmin_gps.c | 3 +- + drivers/usb/serial/generic.c | 7 +- + drivers/usb/serial/hp4x.c | 2 +- + drivers/usb/serial/io_edgeport.c | 69 +- + drivers/usb/serial/io_tables.h | 10 +- + drivers/usb/serial/io_ti.c | 75 +- + drivers/usb/serial/ipaq.c | 1 - + drivers/usb/serial/ipw.c | 3 +- + drivers/usb/serial/ir-usb.c | 13 +- + drivers/usb/serial/iuu_phoenix.c | 2 +- + drivers/usb/serial/keyspan.c | 57 +- + drivers/usb/serial/keyspan.h | 10 +- + drivers/usb/serial/keyspan_pda.c | 53 +- + drivers/usb/serial/kl5kusb105.c | 66 +- + drivers/usb/serial/kobil_sct.c | 25 +- + drivers/usb/serial/mct_u232.c | 57 +- + drivers/usb/serial/mct_u232.h | 2 + + drivers/usb/serial/mos7720.c | 185 +++- + drivers/usb/serial/mos7840.c | 27 +- + drivers/usb/serial/moto_modem.c | 2 +- + drivers/usb/serial/navman.c | 3 +- + drivers/usb/serial/omninet.c | 8 +- + drivers/usb/serial/opticon.c | 17 +- + drivers/usb/serial/option.c | 71 +- + drivers/usb/serial/oti6858.c | 36 +- + drivers/usb/serial/pl2303.c | 38 +- + drivers/usb/serial/qcaux.c | 96 ++ + drivers/usb/serial/qcserial.c | 2 +- + drivers/usb/serial/siemens_mpi.c | 2 +- + drivers/usb/serial/sierra.c | 59 +- + drivers/usb/serial/spcp8x5.c | 27 +- + drivers/usb/serial/symbolserial.c | 12 +- + drivers/usb/serial/ti_usb_3410_5052.c | 3 +- + drivers/usb/serial/usb-serial.c | 15 +- + drivers/usb/serial/usb_debug.c | 2 +- + drivers/usb/serial/visor.c | 40 +- + drivers/usb/serial/vivopay-serial.c | 76 ++ + drivers/usb/serial/whiteheat.c | 24 +- + drivers/usb/storage/onetouch.c | 2 +- + drivers/usb/storage/scsiglue.c | 10 +- + drivers/usb/storage/shuttle_usbat.c | 15 +- + 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/tty_flip.h | 7 +- + include/linux/usb.h | 53 +- + include/linux/usb/Kbuild | 1 - + 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 +- + include/linux/usb/vstusb.h | 71 - + 217 files changed, 7356 insertions(+), 3585 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 + create mode 100644 drivers/usb/host/ohci-da8xx.c + delete mode 100644 drivers/usb/misc/berry_charge.c + delete mode 100644 drivers/usb/misc/vstusb.c + create mode 100644 drivers/usb/serial/qcaux.c + create mode 100644 drivers/usb/serial/vivopay-serial.c + delete mode 100644 include/linux/usb/vstusb.h +Merging quilt/staging +$ git merge quilt/staging +Resolved 'drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c' using previous resolution. +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 +Auto-merging drivers/staging/hv/blkvsc_drv.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 +Auto-merging drivers/staging/phison/phison.c +Auto-merging drivers/staging/pohmelfs/inode.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 +Removing drivers/staging/rtl8187se/r8180_93cx6.c +Auto-merging drivers/staging/rtl8187se/r8180_core.c +Auto-merging drivers/staging/rtl8192su/ieee80211/ieee80211.h +Auto-merging drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +CONFLICT (content): Merge conflict in drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c +Auto-merging drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +Auto-merging drivers/staging/rtl8192su/ieee80211/rtl819x_BAProc.c +Auto-merging drivers/staging/rtl8192su/r8192U_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/rtl8192su/ieee80211/ieee80211_rx.c: needs merge +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 47c590a] 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/arlan/Makefile | 2 +- + drivers/staging/arlan/arlan.h | 136 +- + 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 | 6 +- + 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 | 53 +- + drivers/staging/batman-adv/hard-interface.c | 209 +- + 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 | 55 +- + drivers/staging/batman-adv/main.h | 46 +- + 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 | 508 +-- + drivers/staging/batman-adv/proc.h | 13 +- + drivers/staging/batman-adv/routing.c | 1304 +++--- + drivers/staging/batman-adv/routing.h | 21 +- + drivers/staging/batman-adv/send.c | 172 +- + 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 | 201 +- + drivers/staging/batman-adv/vis.h | 13 +- + drivers/staging/comedi/comedi_compat32.c | 1 - + drivers/staging/comedi/comedi_fops.c | 12 +- + drivers/staging/comedi/drivers.c | 30 +- + .../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 | 7 +- + .../staging/comedi/drivers/addi-data/addi_common.c | 2 +- + .../staging/comedi/drivers/addi-data/addi_common.h | 4 +- + .../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 | 12 +- + .../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 | 121 +- + .../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/aio_iiro_16.c | 4 +- + drivers/staging/comedi/drivers/amplc_dio200.c | 122 +- + drivers/staging/comedi/drivers/amplc_pc236.c | 46 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 16 +- + drivers/staging/comedi/drivers/c6xdigio.c | 57 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 28 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 12 +- + drivers/staging/comedi/drivers/cb_pcidio.c | 6 +- + drivers/staging/comedi/drivers/cb_pcimdas.c | 8 +- + drivers/staging/comedi/drivers/cb_pcimdda.c | 8 +- + drivers/staging/comedi/drivers/comedi_bond.c | 2 +- + drivers/staging/comedi/drivers/contec_pci_dio.c | 3 +- + drivers/staging/comedi/drivers/das08_cs.c | 4 +- + drivers/staging/comedi/drivers/das6402.c | 2 +- + drivers/staging/comedi/drivers/das800.c | 6 +- + drivers/staging/comedi/drivers/dmm32at.c | 5 +- + drivers/staging/comedi/drivers/dt2801.c | 33 +- + 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_atmio.c | 34 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 24 +- + drivers/staging/comedi/drivers/ni_labpc.c | 279 +- + drivers/staging/comedi/drivers/ni_mio_common.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 | 61 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/serial2002.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 5 +- + drivers/staging/comedi/drivers/usbduxfast.c | 5 +- + 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 | 765 ++++ + drivers/staging/crystalhd/crystalhd_lnx.h | 96 + + drivers/staging/crystalhd/crystalhd_misc.c | 1030 +++++ + 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 | 67 +- + drivers/staging/dream/camera/msm_vfe7x.c | 3 +- + drivers/staging/dream/camera/s5k3e2fx.c | 32 +- + drivers/staging/dream/include/linux/android_pmem.h | 80 + + drivers/staging/dream/include/linux/gpio_event.h | 154 + + drivers/staging/dream/include/linux/msm_adsp.h | 84 + + drivers/staging/dream/include/linux/msm_audio.h | 115 + + .../staging/dream/include/linux/msm_rpcrouter.h | 47 + + drivers/staging/dream/include/linux/wakelock.h | 91 + + drivers/staging/dream/include/mach/camera.h | 279 ++ + drivers/staging/dream/include/mach/msm_adsp.h | 112 + + drivers/staging/dream/include/mach/msm_rpcrouter.h | 179 + + drivers/staging/dream/include/mach/msm_smd.h | 107 + + .../dream/include/mach/qdsp5/qdsp5audplaycmdi.h | 94 + + .../dream/include/mach/qdsp5/qdsp5audplaymsg.h | 70 + + .../dream/include/mach/qdsp5/qdsp5audppcmdi.h | 914 +++++ + .../dream/include/mach/qdsp5/qdsp5audppmsg.h | 318 ++ + .../dream/include/mach/qdsp5/qdsp5audpreproccmdi.h | 256 ++ + .../dream/include/mach/qdsp5/qdsp5audpreprocmsg.h | 85 + + .../dream/include/mach/qdsp5/qdsp5audreccmdi.h | 176 + + .../dream/include/mach/qdsp5/qdsp5audrecmsg.h | 127 + + .../dream/include/mach/qdsp5/qdsp5jpegcmdi.h | 376 ++ + .../dream/include/mach/qdsp5/qdsp5jpegmsg.h | 177 + + .../dream/include/mach/qdsp5/qdsp5lpmcmdi.h | 82 + + .../staging/dream/include/mach/qdsp5/qdsp5lpmmsg.h | 80 + + .../dream/include/mach/qdsp5/qdsp5vdeccmdi.h | 235 ++ + .../dream/include/mach/qdsp5/qdsp5vdecmsg.h | 107 + + .../dream/include/mach/qdsp5/qdsp5venccmdi.h | 212 + + .../dream/include/mach/qdsp5/qdsp5vfecmdi.h | 910 +++++ + .../staging/dream/include/mach/qdsp5/qdsp5vfemsg.h | 290 ++ + drivers/staging/dream/include/media/msm_camera.h | 388 ++ + drivers/staging/dream/pmem.c | 26 +- + 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/Channel.c | 3 +- + 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/VersionInfo.h | 22 +- + drivers/staging/hv/Vmbus.c | 6 +- + drivers/staging/hv/blkvsc_drv.c | 10 +- + drivers/staging/hv/netvsc_drv.c | 29 +- + drivers/staging/hv/storvsc_drv.c | 227 +- + drivers/staging/hv/vmbus.h | 12 +- + drivers/staging/hv/vmbus_drv.c | 68 +- + drivers/staging/iio/industrialio-core.c | 35 +- + drivers/staging/iio/ring_generic.h | 3 +- + drivers/staging/iio/ring_sw.c | 3 +- + drivers/staging/iio/trigger_consumer.h | 4 +- + drivers/staging/line6/driver.c | 2 +- + drivers/staging/line6/variax.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/panel/panel.c | 1 - + drivers/staging/phison/phison.c | 2 +- + drivers/staging/pohmelfs/inode.c | 28 +- + 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/rt3070/md4.h | 8 +- + drivers/staging/rt3090/firmware.h | 517 --- + drivers/staging/rtl8187se/Kconfig | 1 + + drivers/staging/rtl8187se/Makefile | 1 - + drivers/staging/rtl8187se/TODO | 1 - + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 5 +- + .../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.h | 4 - + drivers/staging/rtl8187se/r8180_93cx6.c | 146 - + drivers/staging/rtl8187se/r8180_93cx6.h | 17 +- + drivers/staging/rtl8187se/r8180_core.c | 502 +-- + drivers/staging/rtl8187se/r8180_dm.c | 69 +- + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 232 +- + drivers/staging/rtl8187se/r8185b_init.c | 986 +----- + drivers/staging/rtl8192e/Makefile | 9 +- + drivers/staging/rtl8192e/dot11d.h | 138 +- + drivers/staging/rtl8192e/ieee80211.h | 3 - + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 160 +- + .../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/TODO | 1 - + drivers/staging/rtl8192su/ieee80211/ieee80211.h | 5 +- + .../staging/rtl8192su/ieee80211/ieee80211_crypt.c | 19 +- + .../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 | 6 +- + 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/r8192SU_HWImg.c | 4276 -------------------- + drivers/staging/rtl8192su/r8192SU_HWImg.h | 2 - + drivers/staging/rtl8192su/r8192S_firmware.c | 126 +- + drivers/staging/rtl8192su/r8192S_firmware.h | 7 - + drivers/staging/rtl8192su/r8192U.h | 1 - + drivers/staging/rtl8192su/r8192U_core.c | 183 +- + 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 | 4 +- + .../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/Kconfig | 14 +- + drivers/staging/udlfb/udlfb.c | 1993 ++++++--- + drivers/staging/udlfb/udlfb.h | 281 +- + 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/Kconfig | 2 + + drivers/staging/vme/Makefile | 1 + + drivers/staging/vme/TODO | 28 - + drivers/staging/vme/boards/Kconfig | 9 + + drivers/staging/vme/boards/Makefile | 5 + + drivers/staging/vme/boards/vme_vmivme7805.c | 124 + + drivers/staging/vme/boards/vme_vmivme7805.h | 37 + + drivers/staging/vme/bridges/Kconfig | 2 + + drivers/staging/vme/bridges/vme_ca91cx42.c | 1592 ++++---- + drivers/staging/vme/bridges/vme_ca91cx42.h | 136 +- + drivers/staging/vme/bridges/vme_tsi148.c | 1010 ++--- + drivers/staging/vme/bridges/vme_tsi148.h | 16 + + drivers/staging/vme/devices/vme_user.c | 65 +- + drivers/staging/vme/vme.c | 248 +- + drivers/staging/vme/vme.h | 33 +- + drivers/staging/vme/vme_api.txt | 27 +- + drivers/staging/vme/vme_bridge.h | 107 +- + drivers/staging/vt6655/card.c | 6 +- + 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.h | 74 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/p80211conv.c | 23 +- + drivers/staging/wlan-ng/p80211conv.h | 4 +- + drivers/staging/wlan-ng/p80211metadef.h | 18 +- + drivers/staging/wlan-ng/p80211mgmt.h | 42 +- + drivers/staging/wlan-ng/p80211netdev.c | 7 +- + drivers/staging/wlan-ng/p80211netdev.h | 44 +- + drivers/staging/wlan-ng/p80211req.c | 2 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 18 +- + drivers/staging/wlan-ng/p80211wext.c | 70 +- + drivers/staging/wlan-ng/prism2fw.c | 63 +- + drivers/staging/wlan-ng/prism2mgmt.c | 4 +- + drivers/staging/wlan-ng/prism2mgmt.h | 48 +- + drivers/staging/wlan-ng/prism2mib.c | 6 +- + drivers/staging/wlan-ng/prism2sta.c | 18 +- + drivers/staging/wlan-ng/prism2usb.c | 6 +- + 470 files changed, 28837 insertions(+), 24158 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/rtl8187se/r8180_93cx6.c + delete mode 100644 drivers/staging/sm7xx/smtc2d.c + delete mode 100644 drivers/staging/sm7xx/smtc2d.h + create mode 100644 drivers/staging/vme/boards/Kconfig + create mode 100644 drivers/staging/vme/boards/Makefile + create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.c + create mode 100644 drivers/staging/vme/boards/vme_vmivme7805.h +$ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch +Applying: ar9170: fix for driver-core ABI change +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..54bf3b6bd88e --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,77 @@ +Importing driver-core.current based on 2.6.33 +Unchanged quilt series driver-core.current +Importing tty.current based on quilt/driver-core.current +Unchanged quilt series tty.current +Importing usb.current based on quilt/tty.current +Unchanged quilt series usb.current +Importing staging.current based on quilt/usb.current +Unchanged quilt series staging.current +Importing i2c based on 2.6.33-git7 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 13dda80e48439b446d0bc9bab34b91484bc8f533 +HEAD is now at 13dda80 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +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 +i2c-document-message-size-limit.patch +i2c-powermac-less-verbose.patch +i2c-i801-new-parameter-to-disable-features.patch +i2c-scmi-support-ibm-smbus-cmi-devices.patch +i2c-scmi-provide-module-aliases-for-automatic-loading.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 086a3ea...79f482c master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.33-git7 +$ cd ../quilt-tmp +$ git reset --hard 13dda80e48439b446d0bc9bab34b91484bc8f533 +HEAD is now at 13dda80 Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci +$ 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-it87-10-old-automatic-fan-speed-control.patch +hwmon-it87-11-validate-auto-pwm-settings.patch +hwmon-g760a-make-rpm_from_cnt-static.patch +hwmon-w83793-add-watchdog-support.patch +hwmon-add-driver-for-adt7411-voltage-temperature-sensor.patch +hwmon-adt7411-improve-locking.patch +hwmon-driver-for-andigilog-asc7621-family-monitoring-chips.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 7c52137...b977f3a 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 +Unchanged quilt series device-mapper +Importing aoe based on v2.6.31-rc9 +Unchanged quilt series aoe +Importing driver-core based on quilt/staging.current +Unchanged quilt series driver-core +Importing tty based on quilt/driver-core +Unchanged quilt series tty +Importing usb based on quilt/tty +Unchanged quilt series usb +Importing staging based on quilt/usb +Unchanged quilt series staging diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..10dcc36c7818 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100303 |