diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-09 15:58:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-03-09 15:58:57 +1100 |
| commit | 814a718e925b149034d712c919aee4a46348065f (patch) | |
| tree | ab797bc6121b6fb1ca654301c3498f574a1cd97a | |
| parent | 93118419bfce2f359854ee41504fb50dc4945904 (diff) | |
Add linux-next specific files for 20100309next-20100309
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 159 | ||||
| -rw-r--r-- | Next/Trees | 161 | ||||
| -rw-r--r-- | Next/merge.log | 4359 | ||||
| -rw-r--r-- | Next/quilt-import.log | 45 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 4725 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..21ca034eff8c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,159 @@ +Name SHA1 +---- ---- +origin 57d54889cd00db2752994b389ba714138652e60c +fixes 1f985f9be03cb9bb95ae2d4619446946d987b448 +arm-current 8d2b09f5b0de2c0e37f50d04980bc81098988239 +m68k-current 701a5f5a355d089fe8c55c3fc93a90d4a45a7d67 +powerpc-merge d1d47ec6e62ab08d2ebb925fd9203abfad3adfbf +sparc-current 8a4fd1e4922413cfdfa6c51a59efb720d904a5eb +scsi-rc-fixes b3dc1a212e5167984616445990c76056034f8eeb +net-current d88dca79d3852a3623f606f781e013d61486828a +sound-current a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 +pci-current bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 +wireless-current d88dca79d3852a3623f606f781e013d61486828a +kbuild-current 07105202bdebf6e9a4c72c634cf90398abfad870 +driver-core.current eaa5eec739637f32f8733d528ff0b94fd62b1214 +tty.current eaa5eec739637f32f8733d528ff0b94fd62b1214 +usb.current eaa5eec739637f32f8733d528ff0b94fd62b1214 +staging.current eaa5eec739637f32f8733d528ff0b94fd62b1214 +cpufreq-current 1dbf58881f307e21a3df4b990a5bea401360d02e +input-current 776943fd6f104a6e8457dc95a17282e69e963666 +md-current ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 74781387822cd7a549123ae2b35862bf802689be +ide-curent 64ba9926759792cf7b95f823402e2781edd1b5d4 +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +arm 040585bed01e36693decf376373de769da41e807 +davinci e4352371051ceb0872020cecc1102cf6afeb29a9 +i.MX 9b1489e989695c4d502865f8bec616c0f17e99ab +msm d99c6ab416c69b1788ac1ad5288dd86e776225ae +omap 3b4bd630eb7dda6cfd1691e4fd4b7c5e60d49ecb +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 3b05007e43ea629394e89ea0b023d7b15375a2bb +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +cris d8fe989e7368a26e4baf9acb55524c71e5c3a117 +ia64 8bb29c6a27242361d68b5356a6b5e6efae06ed32 +m68k 701a5f5a355d089fe8c55c3fc93a90d4a45a7d67 +m68knommu 59c7835794c222023567fec13bb2a427190e34e6 +microblaze c1cc0284926fa251e9af0358c2c59e8bee4b394f +mips 1b889921932a71f4fbbb4c45ab71a8102ab34e04 +parisc 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +powerpc 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +4xx 3d98ffbffb16f2a1569b83cb78db0b5100e6c937 +52xx-and-virtex 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +galak a11106544f33c104706ae42d27219a409b67478e +s390 1ffaa640c6ba135aafc91841204e41846eae6841 +sh a8941dad1f12b4e8a87a517ed27f29d0209c817c +genesis 17ccb834d517c66c09123c24ba8553c5b14e0f78 +sparc 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +xtensa 4bcce919bd6dea26a6b9448707fba2a61d2e79a9 +ceph 1e7ee133f7e325caf9bd79ed6880f0e28a173162 +cifs c8634fd3115497ac311f57be9c12f993437745cf +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs ece550f51ba175c14ec3ec047815927d7386ea1f +ext3 efd8f0e6f6c1faa041f228d7113bd3a9db802d49 +ext4 64e290ec69be39f1887fa0b403c1e417b6b038e7 +fatfs eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 +fuse b2d82ee3c8b2193ee5bc7eca4687ee9be30abd34 +gfs2 4818972efb105730f007e5efc05e203a065fc318 +jfs d7eecb483cc29e929bbc5515b8def830d7fc6ad2 +logfs c2f843f03d658e9ab2a1a455f2c1851fd6a869af +nfs 49697ee79242d5f8ac88f1ebc62e583d16bcc687 +nfsd 4ea41e2de5bba756858bb40f964e3490b6d1a25c +nilfs2 0d561f12b490dd2b993d73112d3297007688e6df +ocfs2 9df5778ecee8b301b447fc05706792d5f447ace5 +squashfs 06862f884d9c2453daaf0c1d070c69cf444f10b1 +udf 23355449a7b14f7805c20eff991974b6e8f463e2 +v9fs 64096c17417380d8a472d096645f4cbc9406c987 +ubifs abe94c756c08d50566c09a65b9c7fe72f83071c5 +xfs 07000ee686cf19e853fa06f7904eff2cfe230ea3 +reiserfs-bkl 175359f89df39f4faed663c8cfd6ee0222d2fa1e +vfs 9f009a78fb3b54976cfe8173d05ef483dbda4571 +pci bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 +hid a85821fce2c100a6680511f9693b76f9717fbdee +i2c 460e1ee68b13b2d547165c0d8897c481050eaebe +bjdooks-i2c 3f4ae8605261e6f71e721e026bc18cb1851a7276 +jdelvare-hwmon 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +kernel-doc 066000dd856709b6980123eb39b957fe26993f7b +v4l-dvb 39fcfe8c1152c5a6e3e30816992e6d9ffe7205b4 +kbuild e93bc1a0cab3e54e3c1947e01c8e73892e35630d +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 64ba9926759792cf7b95f823402e2781edd1b5d4 +libata 61e54842daad6cdf390e183e33daa307a1fd5acc +infiniband 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +acpi 4b419576730dd87c8014c2f46c5f57f5e6c1cb41 +ieee1394 6fdb2ee243404c7cbf530387bf904ad1841ebf5b +ubi 805bfb8b5ae50cff307884a4e04c3c3a4a4b6ace +kvm d2be1651b736002e0c76d7095d6c0ba77b4a897c +dlm b6fa8796b2da0390e9f4115e8789a01004fc1c9b +ibft c4d1409bbed8cf2a11b48ce3a075e142f686a588 +scsi 0d9dc7c8b9b7fa0f53647423b41056ee1beed735 +async_tx dd58ffcf5a5352fc10820c8ffbcd5fed416a2c3a +net 3a5b27bf6f29574d667230c7e76e4b83fe3014e0 +wireless 31f66be44a657a14e0ab3536e4877c66c9ce031e +mtd d4080cb32ee3d2ed18aa69ffde6010524bd686cd +crypto 8d0c123f8b710561cfd34f6e1a5bebc27988edbe +sound de49b9148e6e0bcab512fd642f897be2118a9edd +cpufreq fb4635932a4e19c2f55383f968a0e9b64da37354 +rr 1161b00a7e1f2b5a338b89453bcea2a81385d183 +mmc 7f72134c32eb64c77d1fb35123ba8bf815bf797c +input 4b70858ba8d4537daf782defebe5f2ff80ccef2b +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 1c21ac5a4e4d5ba0a56e341fb26621fa9b1c154f +device-mapper 1ef37bd7422348e6171d6be208e04a79db0ccf2f +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia a3f916f2c84f2b9e1d32cc0dbfe326a9e380dbfb +battery afbc74fdc5b96552c384e57119b3cc13c840bf06 +leds 318c20c410a2078d1ada1020b5b252db11c52fc9 +backlight f2770627c1aab16302474af733591b4de787c1d1 +kgdb 0d7a7c6797de8bb88b1c7dcc6d5abb63e7d31f2e +slab 339dfb05a7f7b5bf15a017deb430e69d90811c8d +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md ef286f6fa673cd7fb367e1b145069d8dbfcc6081 +mfd 2c08583c6a6b4c5f5dea4cb0931eca82af7db6fe +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 9b11fe5f4902c3f26b0d7d9ad5bd46eae624cf32 +voltage 8fa7d5a882b3fcc5bbb3b5c3ba3656e16bde77a8 +security-testing eaa5eec739637f32f8733d528ff0b94fd62b1214 +lblnet 86d710146fb9975f04c505ec78caa43d227c1018 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +uwb bcf59e2c4dea780e4abf48d5e673f5d79f9ee064 +watchdog efff242094c95b724cd07517e570f26d1fb1055c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 0b8973a81876d90f916507ac40d1381068dc986a +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd 50a76fd3c352ed2740eba01512efcfceee0703be +jc_docs 724e6d3fe8003c3f60bf404bf22e4e331327c596 +nommu 9a100a4464917b5ffff3a8ce1c2758088fd9bb32 +trivial 3e58974027b04e84f68b964ef368a6cd758e2f84 +audit def57543418a5f47debae28a0a9dea2effc11692 +aoe c3643395dc3b8d47932e2bbc2992532ae88ee522 +suspend d690b2cd222afc75320b9b8e9da7df02e9e630ca +bluetooth 47871889c601d8199c51a4086f77eebd77c29b0b +fsnotify 8c0f910e8dd2cf7b50809daee2a316c8b095da1b +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 d4bfb1c2550ad37420215db77ce078270eb18e91 +edac-amd cab4d27764d5a8654212b3e96eb0ae793aec5b94 +oprofile bb1165d6882f423f90fc7007a88c6c993b7c2ac4 +percpu a29d8b8e2d811a24bbe49215a0f0c536b72ebc18 +workqueues 5ab0fec5e715dd22e9d30d9f2eb1f0bbb05fb001 +sfi 011a606d0670196c17110b6770e39cc0865aa614 +asm-generic 4029a91f0c82ae16e5b10b36da51c470895deedf +hwpoison 27df5068e24f2f88de98e95eb6e8dbc9800bf80e +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 3adb180e7e6d90dd486f13c02c378956053be8dc +tty 3adb180e7e6d90dd486f13c02c378956053be8dc +usb 3adb180e7e6d90dd486f13c02c378956053be8dc +staging 7116368136466b98e186017bc2fff19c5d2675e2 +scsi-post-merge 37d0892c5a94e208cf863e3b7bac014edee4346d diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..ecf82f10ec00 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,161 @@ +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 +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..4519867cb168 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4359 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 25cf84c Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console +Merging origin/master +$ git merge origin/master +Updating 25cf84c..57d5488 +Fast-forward + Documentation/HOWTO | 113 +-- + Documentation/kobject.txt | 2 +- + Documentation/sound/alsa/ALSA-Configuration.txt | 2 +- + Makefile | 4 +- + arch/arm/mach-ep93xx/include/mach/ts72xx.h | 2 + + arch/arm/mach-ep93xx/ts72xx.c | 21 + + 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/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + arch/s390/include/asm/qdio.h | 7 - + arch/s390/kernel/smp.c | 12 +- + arch/s390/kernel/time.c | 59 ++- + arch/s390/lib/Makefile | 3 +- + arch/s390/mm/cmm.c | 2 +- + 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 | 51 +- + drivers/base/bus.c | 26 +- + drivers/base/class.c | 16 +- + drivers/base/core.c | 46 +- + 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/char/hvc_iucv.c | 6 +- + 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/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/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 +- + drivers/s390/cio/device.c | 5 +- + drivers/s390/cio/qdio_debug.c | 1 - + drivers/s390/cio/qdio_main.c | 3 +- + drivers/s390/net/Kconfig | 10 + + drivers/s390/net/Makefile | 1 + + drivers/s390/net/qeth_core_main.c | 3 - + drivers/s390/net/smsgiucv.c | 15 +- + drivers/s390/net/smsgiucv.h | 8 +- + drivers/s390/net/smsgiucv_app.c | 211 ++++++ + drivers/s390/scsi/zfcp_qdio.c | 2 - + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/staging/asus_oled/asus_oled.c | 13 +- + 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/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/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 | 101 +-- + 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/wdt.c | 2 +- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/wm831x_wdt.c | 2 +- + drivers/watchdog/wm8350_wdt.c | 2 +- + drivers/xen/sys-hypervisor.c | 2 +- + fs/btrfs/sysfs.c | 4 +- + fs/dlm/lockspace.c | 2 +- + fs/ext4/super.c | 2 +- + fs/fscache/Kconfig | 1 - + 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 | 40 +- + 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 +- + include/linux/usb/audio.h | 2 +- + include/sound/asound.h | 2 +- + 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 +- + sound/core/timer.c | 2 +- + sound/isa/opti9xx/miro.c | 2 +- + sound/isa/opti9xx/opti92x-ad1848.c | 120 ++-- + sound/isa/sb/jazz16.c | 1 + + sound/oss/coproc.h | 2 +- + sound/oss/v_midi.h | 5 +- + sound/pci/hda/Kconfig | 2 +- + sound/pci/hda/Makefile | 4 +- + sound/pci/hda/hda_codec.c | 69 +- + sound/pci/hda/hda_eld.c | 6 + + sound/pci/hda/hda_intel.c | 9 +- + sound/pci/hda/patch_hdmi.c | 849 +++++++++++++++++++++++ + sound/pci/hda/patch_intelhdmi.c | 821 +--------------------- + sound/pci/hda/patch_nvhdmi.c | 275 ++++++-- + sound/pci/hda/patch_realtek.c | 10 +- + sound/pci/oxygen/xonar_wm87x6.c | 2 +- + sound/pci/riptide/riptide.c | 6 +- + sound/soc/codecs/ak4104.c | 6 +- + sound/soc/soc-core.c | 14 +- + sound/usb/Kconfig | 6 +- + sound/usb/caiaq/midi.h | 2 +- + sound/usb/ua101.c | 100 +-- + sound/usb/usbaudio.c | 57 +-- + sound/usb/usbaudio.h | 3 +- + sound/usb/usbquirks.h | 30 - + 259 files changed, 4179 insertions(+), 2171 deletions(-) + create mode 100644 drivers/s390/net/smsgiucv_app.c + create mode 100644 drivers/uio/uio_netx.c + delete mode 100644 drivers/uio/uio_smx.c + create mode 100644 drivers/watchdog/max63xx_wdt.c + create mode 100644 drivers/watchdog/ts72xx_wdt.c + create mode 100644 sound/pci/hda/patch_hdmi.c +Merging fixes/fixes +$ git merge fixes/fixes +Updating 57d5488..1f985f9 +Fast-forward + drivers/block/pktcdvd.c | 17 +++++++++++++-- + drivers/i2c/busses/i2c-xiic.c | 1 + + drivers/i2c/i2c-smbus.c | 5 ++- + fs/compat_ioctl.c | 3 -- + include/linux/i2c-xiic.h | 43 +++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 61 insertions(+), 8 deletions(-) + create mode 100644 include/linux/i2c-xiic.h +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 ++ + arch/arm/kernel/unwind.c | 4 ++- + arch/arm/mach-ux500/include/mach/hardware.h | 8 ++-- + drivers/mtd/maps/pismo.c | 2 +- + 5 files changed, 34 insertions(+), 33 deletions(-) +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/sigcontext.h | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) +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 +Auto-merging MAINTAINERS +Auto-merging drivers/net/cxgb3/cxgb3_main.c +Auto-merging drivers/net/gianfar.c +Auto-merging drivers/net/wireless/ath/ar9170/main.c +Removing firmware/bnx2x-e1-5.2.7.0.fw.ihex +Removing firmware/bnx2x-e1h-5.2.7.0.fw.ihex +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + MAINTAINERS | 19 +- + drivers/net/arm/ks8695net.c | 2 +- + drivers/net/benet/be.h | 5 - + drivers/net/benet/be_cmds.c | 6 - + drivers/net/benet/be_hw.h | 5 +- + drivers/net/benet/be_main.c | 25 +- + drivers/net/can/bfin_can.c | 3 +- + drivers/net/can/usb/ems_usb.c | 4 +- + drivers/net/cassini.c | 2 +- + drivers/net/cpmac.c | 14 +- + drivers/net/cxgb3/cxgb3_main.c | 1 + + drivers/net/davinci_emac.c | 2 +- + drivers/net/e1000e/defines.h | 2 + + drivers/net/e1000e/ich8lan.c | 10 + + drivers/net/gianfar.c | 5 +- + drivers/net/irda/irda-usb.c | 4 + + drivers/net/qlcnic/qlcnic.h | 13 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 17 + + drivers/net/qlcnic/qlcnic_hw.c | 32 +- + drivers/net/qlcnic/qlcnic_init.c | 156 +- + drivers/net/qlcnic/qlcnic_main.c | 5 + + drivers/net/r8169.c | 4 +- + drivers/net/s2io.c | 6 +- + drivers/net/smc91x.h | 14 + + drivers/net/typhoon.c | 6 +- + drivers/net/usb/pegasus.h | 6 +- + 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/rc.c | 6 +- + 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/rndis_wlan.c | 66 +- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00soc.c | 1 + + drivers/net/wireless/rt2x00/rt73usb.c | 2 + + drivers/net/wireless/zd1211rw/zd_mac.c | 10 +- + firmware/bnx2x-e1-5.2.7.0.fw.ihex |10178 ----------------------- + firmware/bnx2x-e1h-5.2.7.0.fw.ihex |12847 ------------------------------ + include/linux/ethtool.h | 24 +- + include/linux/rfkill.h | 2 +- + include/linux/snmp.h | 2 + + include/net/ip6_route.h | 18 + + include/net/mac80211.h | 3 +- + include/net/sock.h | 17 +- + include/net/tcp.h | 2 +- + include/net/xfrm.h | 3 +- + net/bluetooth/hci_sysfs.c | 41 +- + net/bridge/Kconfig | 1 + + net/bridge/br_multicast.c | 8 +- + net/core/ethtool.c | 103 +- + net/core/sock.c | 19 +- + net/dccp/minisocks.c | 2 +- + net/ipv4/ip_gre.c | 7 +- + net/ipv4/proc.c | 2 + + net/ipv4/route.c | 50 +- + net/ipv4/tcp_ipv4.c | 11 +- + net/ipv4/tcp_minisocks.c | 2 +- + net/ipv4/tcp_output.c | 18 +- + net/ipv4/udp.c | 6 +- + net/ipv4/xfrm4_policy.c | 5 +- + net/ipv6/addrconf.c | 102 +- + net/ipv6/fib6_rules.c | 11 +- + net/ipv6/route.c | 11 +- + net/ipv6/tcp_ipv6.c | 7 +- + net/ipv6/udp.c | 28 +- + net/ipv6/xfrm6_policy.c | 3 +- + net/llc/llc_c_ac.c | 2 +- + net/llc/llc_conn.c | 3 +- + net/mac80211/mlme.c | 19 +- + net/mac80211/rate.h | 5 +- + net/packet/af_packet.c | 6 +- + net/rfkill/input.c | 8 + + net/sctp/input.c | 42 +- + net/sctp/socket.c | 3 + + net/sunrpc/xprtrdma/transport.c | 7 +- + net/sunrpc/xprtsock.c | 9 +- + net/tipc/bearer.c | 37 +- + net/tipc/bearer.h | 2 +- + net/tipc/net.c | 25 +- + net/tipc/socket.c | 6 +- + net/tipc/subscr.c | 57 +- + net/tipc/subscr.h | 2 - + net/x25/x25_dev.c | 2 +- + net/xfrm/xfrm_policy.c | 7 +- + 87 files changed, 974 insertions(+), 23603 deletions(-) + delete mode 100644 firmware/bnx2x-e1-5.2.7.0.fw.ihex + delete mode 100644 firmware/bnx2x-e1h-5.2.7.0.fw.ihex +$ git am -3 ../patches/0001-ar9170-fix-for-driver-core-ABI-change.patch +Applying: ar9170: fix for driver-core ABI change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/wireless/ath/ar9170/usb.c +$ git add . +$ git commit -v -a --amend +[master 5a75649] Merge remote branch 'net-current/master' +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 +Auto-merging drivers/pci/pci.c +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/joystick/gamecon.c | 2 +- + drivers/input/tablet/wacom_sys.c | 4 +- + drivers/input/tablet/wacom_wac.c | 165 ++++++++++++++------------------------ + drivers/input/tablet/wacom_wac.h | 1 - + 4 files changed, 63 insertions(+), 109 deletions(-) +Merging md-current/for-linus +$ git merge md-current/for-linus +Already up-to-date. +Merging audit-current/for-linus +$ git merge audit-current/for-linus +Already up-to-date. +Merging crypto-current/master +$ git merge crypto-current/master +Already up-to-date. +Merging ide-curent/master +$ git merge ide-curent/master +Already up-to-date. +Merging dwmw2/master +$ git merge dwmw2/master +Already up-to-date. +Merging arm/devel +$ git merge arm/devel +Auto-merging MAINTAINERS +Removing arch/arm/common/icst307.c +Removing arch/arm/common/icst525.c +Removing arch/arm/configs/mx1ads_defconfig +Removing arch/arm/include/asm/hardware/icst307.h +Removing arch/arm/include/asm/hardware/icst525.h +Removing arch/arm/mach-integrator/common.h +Removing arch/arm/mach-kirkwood/openrd_base-setup.c +Removing arch/arm/mach-mx2/crm_regs.h +Removing arch/arm/mach-mx2/pca100.c +Removing arch/arm/mach-mx3/pcm043.c +Removing arch/arm/mach-realview/clock.c +Removing arch/arm/mach-realview/clock.h +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/mach-versatile/clock.c +Removing arch/arm/mach-versatile/clock.h +Removing arch/arm/plat-mxc/include/mach/mtd-xip.h +Removing arch/arm/plat-mxc/iomux-mx1-mx2.c +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 +Merge made by recursive. + Documentation/arm/Samsung/Overview.txt | 86 + + .../arm/Samsung/clksrc-change-registers.awk | 167 ++ + MAINTAINERS | 23 + + arch/arm/Kconfig | 111 +- + arch/arm/Kconfig.debug | 2 +- + arch/arm/Makefile | 18 +- + 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/common/locomo.c | 362 +---- + arch/arm/common/sa1111.c | 112 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/configs/ap4evb_defconfig | 779 ++++++++ + arch/arm/configs/g3evm_defconfig | 774 ++++++++ + arch/arm/configs/g4evm_defconfig | 779 ++++++++ + arch/arm/configs/imote2_defconfig | 2077 ++++++++++++++++++++ + arch/arm/configs/kirkwood_defconfig | 126 +- + arch/arm/configs/mini2440_defconfig | 6 +- + arch/arm/configs/mmp2_defconfig | 1194 +++++++++++ + arch/arm/configs/mv78xx0_defconfig | 1 + + arch/arm/configs/mx1ads_defconfig | 742 ------- + arch/arm/configs/mx27_defconfig | 2 +- + arch/arm/configs/mx51_defconfig | 1286 ++++++++++++ + arch/arm/configs/orion5x_defconfig | 101 +- + arch/arm/configs/pxa168_defconfig | 229 ++- + arch/arm/configs/raumfeld_defconfig | 1898 ++++++++++++++++++ + 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/include/asm/hardware/arm_timer.h | 39 +- + arch/arm/include/asm/hardware/icst.h | 59 + + arch/arm/include/asm/hardware/icst307.h | 38 - + arch/arm/include/asm/hardware/icst525.h | 36 - + arch/arm/include/asm/hardware/it8152.h | 12 + + arch/arm/include/asm/hardware/locomo.h | 4 + + arch/arm/include/asm/hardware/sa1111.h | 4 + + arch/arm/kernel/smp.c | 4 +- + arch/arm/mach-at91/at91rm9200_time.c | 20 +- + arch/arm/mach-at91/at91sam926x_time.c | 11 +- + arch/arm/mach-dove/common.c | 8 +- + 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 | 43 +- + 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 | 88 +- + arch/arm/mach-integrator/leds.c | 1 + + arch/arm/mach-integrator/pci_v3.c | 7 +- + arch/arm/mach-kirkwood/Kconfig | 23 + + arch/arm/mach-kirkwood/Makefile | 4 +- + arch/arm/mach-kirkwood/common.c | 8 +- + arch/arm/mach-kirkwood/netspace_v2-setup.c | 59 +- + arch/arm/mach-kirkwood/openrd-setup.c | 118 ++ + arch/arm/mach-kirkwood/openrd_base-setup.c | 96 - + arch/arm/mach-kirkwood/sheevaplug-setup.c | 50 +- + arch/arm/mach-mmp/Kconfig | 35 +- + arch/arm/mach-mmp/Makefile | 10 +- + arch/arm/mach-mmp/avengers_lite.c | 51 + + arch/arm/mach-mmp/common.h | 4 + + arch/arm/mach-mmp/flint.c | 123 ++ + arch/arm/mach-mmp/include/mach/cputype.h | 9 + + arch/arm/mach-mmp/include/mach/devices.h | 12 + + arch/arm/mach-mmp/include/mach/entry-macro.S | 7 +- + arch/arm/mach-mmp/include/mach/irqs.h | 115 ++- + arch/arm/mach-mmp/include/mach/mfp-mmp2.h | 240 +++ + arch/arm/mach-mmp/include/mach/mfp-pxa168.h | 4 +- + arch/arm/mach-mmp/include/mach/mmp2.h | 60 + + arch/arm/mach-mmp/include/mach/regs-apbc.h | 41 + + arch/arm/mach-mmp/include/mach/regs-icu.h | 42 +- + arch/arm/mach-mmp/include/mach/uncompress.h | 13 +- + arch/arm/mach-mmp/irq-mmp2.c | 154 ++ + arch/arm/mach-mmp/{irq.c => irq-pxa168.c} | 0 + arch/arm/mach-mmp/jasper.c | 80 + + arch/arm/mach-mmp/mmp2.c | 123 ++ + arch/arm/mach-mmp/time.c | 26 +- + arch/arm/mach-mv78xx0/Kconfig | 6 + + arch/arm/mach-mv78xx0/Makefile | 3 +- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 155 ++ + arch/arm/mach-mv78xx0/mpp.c | 96 + + arch/arm/mach-mv78xx0/mpp.h | 347 ++++ + 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 | 640 +++---- + 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/mach-orion5x/Kconfig | 7 + + arch/arm/mach-orion5x/Makefile | 1 + + arch/arm/mach-orion5x/common.c | 4 +- + arch/arm/mach-orion5x/d2net-setup.c | 45 +- + arch/arm/mach-orion5x/dns323-setup.c | 36 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 276 +++ + arch/arm/mach-orion5x/lsmini-setup.c | 8 +- + arch/arm/mach-pxa/Kconfig | 35 + + arch/arm/mach-pxa/Makefile | 5 + + arch/arm/mach-pxa/balloon3.c | 33 +- + arch/arm/mach-pxa/capc7117.c | 158 ++ + arch/arm/mach-pxa/cm-x255.c | 21 +- + arch/arm/mach-pxa/cm-x270.c | 83 +- + arch/arm/mach-pxa/cm-x2xx-pci.c | 2 +- + arch/arm/mach-pxa/e740.c | 6 + + arch/arm/mach-pxa/e750.c | 6 + + arch/arm/mach-pxa/e800.c | 9 + + arch/arm/mach-pxa/em-x270.c | 21 +- + arch/arm/mach-pxa/icontrol.c | 202 ++ + arch/arm/mach-pxa/idp.c | 20 +- + arch/arm/mach-pxa/imote2.c | 3 +- + arch/arm/mach-pxa/include/mach/balloon3.h | 10 + + arch/arm/mach-pxa/include/mach/irqs.h | 153 +-- + arch/arm/mach-pxa/include/mach/lpd270.h | 4 + + arch/arm/mach-pxa/include/mach/lubbock.h | 11 + + arch/arm/mach-pxa/include/mach/mainstone.h | 17 + + arch/arm/mach-pxa/include/mach/mfp-pxa25x.h | 32 + + arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 27 + + arch/arm/mach-pxa/include/mach/mxm8x10.h | 21 + + arch/arm/mach-pxa/include/mach/pcm027.h | 7 + + arch/arm/mach-pxa/include/mach/ssp.h | 2 + + arch/arm/mach-pxa/include/mach/uncompress.h | 41 +- + arch/arm/mach-pxa/include/mach/zeus.h | 3 +- + arch/arm/mach-pxa/lpd270.c | 6 +- + arch/arm/mach-pxa/lubbock.c | 35 +- + arch/arm/mach-pxa/magician.c | 21 +- + arch/arm/mach-pxa/mainstone.c | 27 +- + arch/arm/mach-pxa/mioa701.c | 24 +- + arch/arm/mach-pxa/mxm8x10.c | 474 +++++ + arch/arm/mach-pxa/palmld.c | 21 +- + arch/arm/mach-pxa/palmt5.c | 21 +- + arch/arm/mach-pxa/palmtc.c | 21 +- + arch/arm/mach-pxa/palmte2.c | 21 +- + arch/arm/mach-pxa/palmtreo.c | 20 +- + arch/arm/mach-pxa/palmtx.c | 21 +- + arch/arm/mach-pxa/palmz72.c | 22 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 9 +- + arch/arm/mach-pxa/poodle.c | 28 +- + arch/arm/mach-pxa/pxa27x.c | 19 + + arch/arm/mach-pxa/raumfeld.c | 1108 +++++++++++ + arch/arm/mach-pxa/spitz.c | 20 +- + arch/arm/mach-pxa/ssp.c | 5 + + arch/arm/mach-pxa/time.c | 10 +- + arch/arm/mach-pxa/tosa.c | 117 +- + arch/arm/mach-pxa/trizeps4.c | 27 +- + arch/arm/mach-pxa/viper.c | 8 +- + arch/arm/mach-pxa/zeus.c | 91 +- + 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 | 194 +-- + 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-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 +- + .../mach-s3c2410/include/mach/regs-s3c2443-clock.h | 32 +- + .../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 +- + .../s3c2440-pll-12000000.c | 2 +- + .../s3c2440-pll-16934400.c | 2 +- + 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/Kconfig | 1 + + arch/arm/mach-s3c2443/clock.c | 842 +++------ + 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/mach-sa1100/badge4.c | 5 + + arch/arm/mach-sa1100/collie.c | 4 + + arch/arm/mach-sa1100/include/mach/collie.h | 7 - + arch/arm/mach-sa1100/include/mach/irqs.h | 91 +- + arch/arm/mach-sa1100/jornada720.c | 5 + + arch/arm/mach-sa1100/neponset.c | 5 + + arch/arm/mach-sa1100/time.c | 8 +- + 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 + + 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 | 194 +-- + 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 | 215 ++ + arch/arm/mach-vexpress/headsmp.S | 39 + + arch/arm/mach-vexpress/include/mach/clkdev.h | 15 + + 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 | 3 +- + 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 ++ + arch/arm/plat-nomadik/timer.c | 9 +- + 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 +- + arch/arm/plat-versatile/Makefile | 4 + + .../{mach-integrator => plat-versatile}/clock.c | 43 +- + arch/arm/plat-versatile/include/plat/clock.h | 15 + + 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/Makefile | 1 + + drivers/i2c/busses/Kconfig | 2 +- + drivers/input/keyboard/locomokbd.c | 32 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/pcmcia/sa1111_generic.c | 25 +- + drivers/serial/Kconfig | 31 +- + drivers/serial/Makefile | 1 + + drivers/serial/imx.c | 2 +- + drivers/serial/s3c2412.c | 1 + + drivers/serial/s5pv210.c | 154 ++ + drivers/serial/samsung.c | 6 +- + drivers/serial/samsung.h | 19 +- + drivers/serial/sh-sci.h | 22 +- + drivers/sh/intc.c | 10 +- + drivers/usb/gadget/fsl_mx3_udc.c | 31 +- + drivers/usb/gadget/pxa25x_udc.c | 4 + + drivers/usb/gadget/s3c-hsotg.c | 2 +- + drivers/video/Kconfig | 5 +- + drivers/video/amba-clcd.c | 31 +- + include/linux/amba/clcd.h | 33 +- + sound/arm/pxa2xx-ac97-lib.c | 68 +- + sound/soc/pxa/pxa-ssp.c | 93 +- + sound/soc/s3c24xx/s3c64xx-i2s.c | 4 +- + 706 files changed, 47674 insertions(+), 11972 deletions(-) + create mode 100644 Documentation/arm/Samsung/Overview.txt + create mode 100755 Documentation/arm/Samsung/clksrc-change-registers.awk + create mode 100644 arch/arm/common/icst.c + delete mode 100644 arch/arm/common/icst307.c + delete mode 100644 arch/arm/common/icst525.c + create mode 100644 arch/arm/configs/ap4evb_defconfig + create mode 100644 arch/arm/configs/g3evm_defconfig + create mode 100644 arch/arm/configs/g4evm_defconfig + create mode 100644 arch/arm/configs/imote2_defconfig + create mode 100644 arch/arm/configs/mmp2_defconfig + delete mode 100644 arch/arm/configs/mx1ads_defconfig + create mode 100644 arch/arm/configs/mx51_defconfig + create mode 100644 arch/arm/configs/raumfeld_defconfig + 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%) + 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 + create mode 100644 arch/arm/mach-kirkwood/openrd-setup.c + delete mode 100644 arch/arm/mach-kirkwood/openrd_base-setup.c + create mode 100644 arch/arm/mach-mmp/avengers_lite.c + create mode 100644 arch/arm/mach-mmp/flint.c + create mode 100644 arch/arm/mach-mmp/include/mach/mfp-mmp2.h + create mode 100644 arch/arm/mach-mmp/include/mach/mmp2.h + create mode 100644 arch/arm/mach-mmp/irq-mmp2.c + rename arch/arm/mach-mmp/{irq.c => irq-pxa168.c} (100%) + create mode 100644 arch/arm/mach-mmp/jasper.c + create mode 100644 arch/arm/mach-mmp/mmp2.c + create mode 100644 arch/arm/mach-mv78xx0/buffalo-wxl-setup.c + create mode 100644 arch/arm/mach-mv78xx0/mpp.c + create mode 100644 arch/arm/mach-mv78xx0/mpp.h + 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/mach-orion5x/ls_hgl-setup.c + create mode 100644 arch/arm/mach-pxa/capc7117.c + create mode 100644 arch/arm/mach-pxa/icontrol.c + create mode 100644 arch/arm/mach-pxa/include/mach/mxm8x10.h + create mode 100644 arch/arm/mach-pxa/mxm8x10.c + create mode 100644 arch/arm/mach-pxa/raumfeld.c + delete mode 100644 arch/arm/mach-realview/clock.c + delete mode 100644 arch/arm/mach-realview/clock.h + rename arch/arm/mach-s3c2410/include/mach/{gpio-core.h => gpio-track.h} (96%) + 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/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-12000000.c (98%) + rename arch/arm/{plat-s3c24xx => mach-s3c2440}/s3c2440-pll-16934400.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 (52%) + 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 + 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 + 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-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 + 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 arch/arm/plat-versatile/Makefile + rename arch/arm/{mach-integrator => plat-versatile}/clock.c (59%) + create mode 100644 arch/arm/plat-versatile/include/plat/clock.h + create mode 100644 arch/arm/plat-versatile/include/plat/timer-sp.h + create mode 100644 arch/arm/plat-versatile/sched-clock.c + create mode 100644 arch/arm/plat-versatile/timer-sp.c + create mode 100644 drivers/serial/s5pv210.c +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Auto-merging arch/arm/mach-davinci/dm355.c +Merge made by recursive. +Merging i.MX/for-next +$ git merge i.MX/for-next +Already up-to-date. +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 +Auto-merging drivers/usb/musb/tusb6010_omap.c +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 +Already up-to-date. +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 +Auto-merging fs/binfmt_flat.c +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 f3b3702] 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/i2c/busses/Kconfig' using previous resolution. +Resolved 'drivers/i2c/busses/Makefile' 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 +CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile +Auto-merging drivers/ide/au1xxx-ide.c +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/serial/8250.c +Auto-merging drivers/staging/octeon/ethernet.c +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.c left in tree. +CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in HEAD and modified in mips/mips-for-linux-next. Version mips/mips-for-linux-next of drivers/staging/sm7xx/smtc2d.h left in tree. +Auto-merging drivers/staging/sm7xx/smtcfb.c +Auto-merging drivers/watchdog/ar7_wdt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h +arch/mips/alchemy/common/platform.c: needs merge +arch/mips/alchemy/common/setup.c: needs merge +arch/mips/alchemy/devboards/db1200/platform.c: needs merge +arch/mips/alchemy/devboards/db1x00/board_setup.c: needs merge +arch/mips/alchemy/devboards/db1x00/platform.c: needs merge +arch/mips/alchemy/devboards/pb1100/platform.c: needs merge +arch/mips/alchemy/devboards/pb1200/platform.c: needs merge +arch/mips/alchemy/devboards/pb1500/platform.c: needs merge +arch/mips/alchemy/devboards/pb1550/platform.c: needs merge +arch/mips/alchemy/devboards/platform.c: needs merge +arch/mips/alchemy/devboards/platform.h: needs merge +arch/mips/alchemy/xxs1500/platform.c: needs merge +arch/mips/cavium-octeon/octeon-irq.c: needs merge +arch/mips/configs/db1200_defconfig: needs merge +arch/mips/include/asm/mach-au1x00/au1000.h: needs merge +drivers/i2c/busses/Kconfig: needs merge +drivers/i2c/busses/Makefile: needs merge +drivers/pcmcia/au1000_generic.h: needs merge +drivers/pcmcia/db1xxx_ss.c: needs merge +drivers/pcmcia/xxs1500_ss.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 +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 12d2f9f] Merge remote branch 'mips/mips-for-linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging parisc/next +$ git merge parisc/next +Already up-to-date. +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 +Merge made by recursive. + arch/powerpc/boot/dts/gef_ppc9a.dts | 4 +- + arch/powerpc/boot/dts/gef_sbc310.dts | 4 +- + arch/powerpc/boot/dts/gef_sbc610.dts | 4 +- + arch/powerpc/include/asm/perf_event.h | 109 +---- + arch/powerpc/include/asm/perf_event_fsl_emb.h | 50 ++ + arch/powerpc/include/asm/perf_event_server.h | 110 ++++ + arch/powerpc/include/asm/reg_fsl_emb.h | 2 +- + arch/powerpc/kernel/Makefile | 7 +- + arch/powerpc/kernel/cputable.c | 2 +- + arch/powerpc/kernel/e500-pmu.c | 129 +++++ + arch/powerpc/kernel/perf_event_fsl_emb.c | 654 +++++++++++++++++++++++ + arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 10 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 34 +- + arch/powerpc/platforms/86xx/Kconfig | 12 +- + arch/powerpc/platforms/86xx/gef_gpio.c | 10 +- + arch/powerpc/platforms/86xx/gef_pic.c | 20 +- + arch/powerpc/platforms/86xx/gef_ppc9a.c | 12 +- + arch/powerpc/platforms/86xx/gef_sbc310.c | 12 +- + arch/powerpc/platforms/86xx/gef_sbc610.c | 12 +- + arch/powerpc/platforms/Kconfig.cputype | 10 + + arch/powerpc/sysdev/cpm2_pic.h | 2 +- + arch/powerpc/sysdev/qe_lib/qe_ic.c | 10 +- + 22 files changed, 1045 insertions(+), 174 deletions(-) + create mode 100644 arch/powerpc/include/asm/perf_event_fsl_emb.h + create mode 100644 arch/powerpc/include/asm/perf_event_server.h + create mode 100644 arch/powerpc/kernel/e500-pmu.c + create mode 100644 arch/powerpc/kernel/perf_event_fsl_emb.c +Merging s390/features +$ git merge s390/features +Already up-to-date. +Merging sh/master +$ git merge sh/master +Auto-merging drivers/sh/intc.c +Merge made by recursive. + drivers/sh/intc.c | 31 ++++++++++++++++++++++++++++++- + 1 files changed, 30 insertions(+), 1 deletions(-) +Merging genesis/master +$ git merge genesis/master +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Auto-merging arch/xtensa/Kconfig +Merge made by recursive. +Merging ceph/for-next +$ git merge ceph/for-next +Resolved 'fs/gfs2/super.c' using previous resolution. +Resolved 'fs/nfs/inode.c' using previous resolution. +Resolved 'fs/ufs/inode.c' using previous resolution. +Resolved 'fs/xfs/linux-2.6/xfs_super.c' using previous resolution. +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging MAINTAINERS +Auto-merging fs/Kconfig +Auto-merging fs/Makefile +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/exofs/exofs.h +Auto-merging fs/exofs/inode.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext3/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/jfs/inode.c +Auto-merging fs/jfs/jfs_inode.h +Auto-merging fs/nfs/inode.c +CONFLICT (content): Merge conflict in fs/nfs/inode.c +Auto-merging fs/reiserfs/inode.c +Auto-merging fs/udf/inode.c +Auto-merging fs/ufs/inode.c +CONFLICT (content): Merge conflict in fs/ufs/inode.c +Auto-merging fs/ufs/ufs.h +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/ext3_fs.h +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c64897] 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/ceph/Kconfig | 27 + + fs/ceph/Makefile | 39 + + fs/ceph/README | 20 + + fs/ceph/addr.c | 1188 +++++++++++++ + 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 | 2927 ++++++++++++++++++++++++++++++++ + 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 | 937 +++++++++++ + fs/ceph/inode.c | 1750 ++++++++++++++++++++ + fs/ceph/ioctl.c | 160 ++ + fs/ceph/ioctl.h | 40 + + fs/ceph/mds_client.c | 3021 ++++++++++++++++++++++++++++++++++ + fs/ceph/mds_client.h | 335 ++++ + fs/ceph/mdsmap.c | 174 ++ + fs/ceph/mdsmap.h | 54 + + fs/ceph/messenger.c | 2240 +++++++++++++++++++++++++ + fs/ceph/messenger.h | 254 +++ + fs/ceph/mon_client.c | 834 ++++++++++ + fs/ceph/mon_client.h | 119 ++ + fs/ceph/msgpool.c | 186 +++ + fs/ceph/msgpool.h | 27 + + fs/ceph/msgr.h | 158 ++ + fs/ceph/osd_client.c | 1537 +++++++++++++++++ + fs/ceph/osd_client.h | 166 ++ + 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 | 904 ++++++++++ + fs/ceph/super.c | 1030 ++++++++++++ + fs/ceph/super.h | 901 ++++++++++ + fs/ceph/types.h | 29 + + fs/ceph/xattr.c | 844 ++++++++++ + 67 files changed, 28066 insertions(+), 0 deletions(-) + create mode 100644 Documentation/filesystems/ceph.txt + create mode 100644 fs/ceph/Kconfig + create mode 100644 fs/ceph/Makefile + create mode 100644 fs/ceph/README + create mode 100644 fs/ceph/addr.c + create mode 100644 fs/ceph/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/cifsfs.c | 3 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifsproto.h | 4 + + fs/cifs/cifssmb.c | 133 ++++++++++++++++++++++++++++++++ + fs/cifs/dir.c | 2 +- + fs/cifs/file.c | 2 +- + fs/cifs/inode.c | 211 ++++++++++++++++++++++++--------------------------- + 8 files changed, 241 insertions(+), 117 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 +Already up-to-date. +Merging ext4/next +$ git merge ext4/next +Already up-to-date. +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 +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Already up-to-date. +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 +Already up-to-date. +Merging nfs/linux-next +$ git merge nfs/linux-next +Auto-merging net/sunrpc/xprtsock.c +Merge made by recursive. + fs/nfs/callback_xdr.c | 1 + + fs/nfs/nfs4proc.c | 1 + + net/sunrpc/xprtsock.c | 8 ++------ + 3 files changed, 4 insertions(+), 6 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Already up-to-date. +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging squashfs/master +$ git merge squashfs/master +Already up-to-date. +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 +Already up-to-date. +Merging ubifs/linux-next +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/master +$ git merge xfs/master +Already up-to-date. +Merging 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 +Resolved 'fs/namei.c' using previous resolution. +Resolved 'fs/nfsd/nfs4xdr.c' using previous resolution. +Resolved 'security/tomoyo/realpath.c' using previous resolution. +Auto-merging drivers/infiniband/core/uverbs.h +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/usb/gadget/f_mass_storage.c +Auto-merging drivers/usb/gadget/file_storage.c +Auto-merging fs/autofs4/inode.c +Auto-merging fs/cifs/file.c +Auto-merging fs/dcache.c +Auto-merging fs/ext4/file.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/nfs4xdr.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/open.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/generic.c +Auto-merging fs/udf/balloc.c +Auto-merging fs/udf/inode.c +Auto-merging fs/udf/namei.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mount.h +Auto-merging mm/filemap.c +Auto-merging net/sunrpc/rpc_pipe.c +Auto-merging security/smack/smack_lsm.c +Auto-merging security/tomoyo/realpath.c +CONFLICT (content): Merge conflict in security/tomoyo/realpath.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ec5b930] Merge remote branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/uverbs_main.c | 1 + + fs/namei.c | 63 +++++++++++++++++---------------- + 2 files changed, 33 insertions(+), 31 deletions(-) +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 +Merge made by recursive. + Documentation/i2c/busses/i2c-i801 | 8 +++++- + drivers/i2c/busses/i2c-i801.c | 45 ++++++++++++++++++++++++------------ + drivers/i2c/busses/i2c-powermac.c | 25 ++++++++++++++----- + drivers/i2c/busses/i2c-scmi.c | 34 +++++++++++++++++++++------ + drivers/i2c/busses/i2c-stub.c | 9 ++++--- + drivers/i2c/busses/scx200_acb.c | 2 +- + 6 files changed, 87 insertions(+), 36 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Already up-to-date. +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Already up-to-date. +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/dvb/dvb-usb/az6027.c' using previous resolution. +Resolved 'drivers/media/dvb/ngene/ngene-core.c' using previous resolution. +Resolved 'drivers/media/video/cx88/cx88-dvb.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-dvb.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-main.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-radio.c' using previous resolution. +Resolved 'drivers/media/video/tlg2300/pd-video.c' using previous resolution. +Resolved 'drivers/mfd/Kconfig' using previous resolution. +Resolved 'drivers/mfd/Makefile' 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/dvb/dvb-usb/az6027.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/dvb-usb/az6027.c +Auto-merging drivers/media/dvb/firewire/firedtv-avc.c +Auto-merging drivers/media/dvb/firewire/firedtv-fw.c +Auto-merging drivers/media/dvb/ngene/ngene-core.c +CONFLICT (add/add): Merge conflict in drivers/media/dvb/ngene/ngene-core.c +Auto-merging drivers/media/video/cx88/cx88-dvb.c +CONFLICT (content): Merge conflict in drivers/media/video/cx88/cx88-dvb.c +Auto-merging drivers/media/video/cx88/cx88.h +Auto-merging drivers/media/video/dabusb.c +Auto-merging drivers/media/video/mt9v022.c +Auto-merging drivers/media/video/rj54n1cb0c.c +Auto-merging drivers/media/video/sh_mobile_ceu_camera.c +Auto-merging drivers/media/video/soc_camera.c +Auto-merging drivers/media/video/tlg2300/pd-dvb.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-dvb.c +Auto-merging drivers/media/video/tlg2300/pd-main.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-main.c +Auto-merging drivers/media/video/tlg2300/pd-radio.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-radio.c +Auto-merging drivers/media/video/tlg2300/pd-video.c +CONFLICT (add/add): Merge conflict in drivers/media/video/tlg2300/pd-video.c +Auto-merging drivers/mfd/Kconfig +CONFLICT (content): Merge conflict in drivers/mfd/Kconfig +Auto-merging drivers/mfd/Makefile +CONFLICT (content): Merge conflict in drivers/mfd/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/go7007/s2250-board.c +Auto-merging include/linux/videodev2.h +Auto-merging include/media/soc_camera.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 48d127f] 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/media/dvb/dvb-usb/az6027.c | 19 +- + drivers/media/dvb/firewire/firedtv-avc.c | 2 +- + drivers/media/dvb/frontends/au8522_decoder.c | 7 + + drivers/media/dvb/frontends/au8522_dig.c | 26 + + drivers/media/dvb/frontends/au8522_priv.h | 5 + + drivers/media/dvb/ngene/ngene-core.c | 20 +- + drivers/media/video/cx88/cx88.h | 2 +- + drivers/media/video/mt9t031.c | 66 +- + drivers/media/video/mt9v022.c | 2 +- + drivers/media/video/mx3_camera.c | 4 +- + drivers/media/video/rj54n1cb0c.c | 18 +- + drivers/media/video/sh_mobile_ceu_camera.c | 8 +- + drivers/media/video/soc_camera.c | 18 +- + drivers/media/video/tlg2300/pd-dvb.c | 6 +- + drivers/media/video/tlg2300/pd-main.c | 6 +- + drivers/media/video/tlg2300/pd-radio.c | 21 +- + drivers/media/video/tlg2300/pd-video.c | 18 +- + 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 + + include/media/soc_camera.h | 12 +- + 36 files changed, 5474 insertions(+), 72 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 arch/ia64/include/asm/percpu.h +Auto-merging arch/ia64/kernel/ivt.S +Auto-merging arch/parisc/include/asm/system.h +Auto-merging arch/s390/kernel/swsusp_asm64.S +Auto-merging arch/x86/kernel/setup_percpu.c +Auto-merging arch/x86/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/percpu.h +Auto-merging include/linux/percpu-defs.h +Auto-merging init/Kconfig +Auto-merging kernel/module.c +Auto-merging scripts/kconfig/Makefile +Auto-merging scripts/markup_oops.pl +Merge made by recursive. + Documentation/kbuild/kbuild.txt | 6 +- + Documentation/kbuild/makefiles.txt | 2 +- + Documentation/mutex-design.txt | 4 +- + MAINTAINERS | 5 +- + Makefile | 65 +- + arch/frv/kernel/break.S | 4 +- + arch/frv/kernel/entry.S | 2 +- + arch/frv/kernel/head.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 10 +- + arch/frv/mm/tlb-miss.S | 2 +- + arch/h8300/boot/compressed/head.S | 2 +- + arch/h8300/boot/compressed/vmlinux.lds | 2 +- + arch/ia64/include/asm/asmmacro.h | 12 +- + arch/ia64/include/asm/cache.h | 2 +- + arch/ia64/include/asm/percpu.h | 2 +- + arch/ia64/kernel/Makefile.gate | 2 +- + arch/ia64/kernel/gate-data.S | 2 +- + arch/ia64/kernel/gate.S | 8 +- + arch/ia64/kernel/gate.lds.S | 10 +- + arch/ia64/kernel/init_task.c | 2 +- + arch/ia64/kernel/ivt.S | 2 +- + arch/ia64/kernel/minstate.h | 4 +- + arch/ia64/kernel/paravirtentry.S | 2 +- + arch/ia64/kernel/vmlinux.lds.S | 28 +- + arch/ia64/kvm/vmm_ivt.S | 2 +- + arch/ia64/scripts/unwcheck.py | 2 +- + arch/ia64/xen/gate-data.S | 2 +- + arch/ia64/xen/xensetup.S | 2 +- + arch/m68knommu/kernel/vmlinux.lds.S | 4 +- + arch/m68knommu/platform/68360/head-ram.S | 2 +- + arch/m68knommu/platform/68360/head-rom.S | 2 +- + arch/mips/lasat/image/head.S | 2 +- + arch/mips/lasat/image/romscript.normal | 2 +- + arch/parisc/include/asm/cache.h | 2 +- + arch/parisc/include/asm/system.h | 2 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/init_task.c | 6 +- + arch/parisc/kernel/vmlinux.lds.S | 12 +- + arch/powerpc/Makefile | 5 + + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/page_64.h | 8 - + arch/powerpc/kernel/vmlinux.lds.S | 10 +- + arch/s390/include/asm/cache.h | 2 +- + arch/s390/kernel/swsusp_asm64.S | 2 +- + arch/sh/boot/compressed/vmlinux.scr | 2 +- + arch/sh/include/asm/cache.h | 2 +- + arch/sparc/boot/btfixupprep.c | 2 +- + arch/sparc/include/asm/cache.h | 2 +- + arch/um/kernel/dyn.lds.S | 2 +- + arch/um/kernel/init_task.c | 2 +- + arch/um/kernel/uml.lds.S | 2 +- + arch/x86/boot/compressed/mkpiggy.c | 2 +- + arch/x86/boot/compressed/vmlinux.lds.S | 4 +- + arch/x86/include/asm/cache.h | 2 +- + arch/x86/kernel/acpi/wakeup_32.S | 2 +- + arch/x86/kernel/init_task.c | 2 +- + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + include/asm-generic/percpu.h | 10 +- + include/asm-generic/vmlinux.lds.h | 38 +- + include/linux/cache.h | 2 +- + include/linux/init.h | 2 +- + include/linux/init_task.h | 2 +- + include/linux/linkage.h | 8 +- + include/linux/percpu-defs.h | 4 +- + include/linux/spinlock.h | 2 +- + init/Kconfig | 8 + + kernel/module.c | 2 +- + scripts/Makefile.build | 2 +- + scripts/checkincludes.pl | 24 +- + scripts/checkstack.pl | 16 +- + scripts/checkversion.pl | 23 +- + scripts/decodecode | 48 +- + scripts/export_report.pl | 37 +- + scripts/genksyms/genksyms.c | 4 +- + scripts/headers_check.pl | 11 +- + scripts/headers_install.pl | 19 +- + 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/namespace.pl | 65 +- + scripts/package/builddeb | 2 + + scripts/package/mkspec | 2 +- + scripts/profile2linkerlist.pl | 8 +- + scripts/rt-tester/rt-tester.py | 2 +- + scripts/show_delta | 2 +- + scripts/tags.sh | 45 +- + 102 files changed, 2873 insertions(+), 426 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 +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Merge made by recursive. + drivers/ata/ahci.c | 265 +++++++++++++++++++++++++++++++--------------------- + 1 files changed, 159 insertions(+), 106 deletions(-) +Merging infiniband/for-next +$ git merge infiniband/for-next +Already up-to-date. +Merging acpi/test +$ git merge acpi/test +Recorded preimage for 'lib/vsprintf.c' +Resolved 'drivers/acpi/processor_core.c' using previous resolution. +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/ia64/include/asm/acpi.h +Auto-merging arch/ia64/kernel/acpi.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging arch/x86/kernel/reboot.c +Auto-merging drivers/acpi/processor_core.c +CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c +Removing drivers/acpi/processor_pdc.c +Auto-merging drivers/platform/x86/Kconfig +Auto-merging include/acpi/processor.h +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'lib/vsprintf.c'. +[master ee4a4f8] Merge remote branch 'acpi/test' +$ git diff -M --stat --summary HEAD^.. + 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/ec.c | 33 +- + drivers/acpi/internal.h | 2 + + drivers/acpi/processor_core.c | 1118 +++++------------------------- + 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/sleep.c | 19 +- + drivers/acpi/tables.c | 4 +- + drivers/acpi/thermal.c | 36 +- + drivers/acpi/utils.c | 45 -- + drivers/acpi/video.c | 28 +- + drivers/platform/x86/sony-laptop.c | 91 ++-- + drivers/pnp/base.h | 3 + + drivers/pnp/interface.c | 7 +- + drivers/pnp/pnpacpi/rsparser.c | 49 +- + drivers/pnp/resource.c | 27 +- + drivers/pnp/support.c | 4 +- + drivers/power/power_supply_sysfs.c | 1 + + include/acpi/apei.h | 13 + + include/acpi/atomicio.h | 10 + + include/acpi/processor.h | 10 +- + include/linux/ioport.h | 18 +- + include/linux/power_supply.h | 1 + + lib/vsprintf.c | 13 +- + 46 files changed, 3302 insertions(+), 1468 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 +$ 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 ddf8d6d] Merge remote branch 'acpi/test' +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date. +Merging ubi/linux-next +$ git merge ubi/linux-next +Auto-merging drivers/mtd/ubi/build.c +Merge made by recursive. +Merging kvm/linux-next +$ git merge kvm/linux-next +Already up-to-date. +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 +Auto-merging drivers/infiniband/ulp/iser/iscsi_iser.c +Removing drivers/scsi/bfa/include/defs/bfa_defs_im_common.h +Removing drivers/scsi/bfa/include/defs/bfa_defs_im_team.h +Removing drivers/scsi/bfa/include/protocol/pcifw.h +Merge made by recursive. + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/scsi/Kconfig | 6 + + drivers/scsi/be2iscsi/be_cmds.c | 7 - + drivers/scsi/be2iscsi/be_iscsi.c | 4 +- + drivers/scsi/be2iscsi/be_main.c | 201 ++- + drivers/scsi/be2iscsi/be_main.h | 11 +- + drivers/scsi/be2iscsi/be_mgmt.c | 14 +- + drivers/scsi/be2iscsi/be_mgmt.h | 8 +- + drivers/scsi/bfa/Makefile | 8 +- + drivers/scsi/bfa/bfa_core.c | 19 + + drivers/scsi/bfa/bfa_fcport.c | 1709 +++++++++++--------- + drivers/scsi/bfa/bfa_fcs.c | 63 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 75 +- + drivers/scsi/bfa/bfa_fcs_port.c | 11 +- + drivers/scsi/bfa/bfa_fcs_uf.c | 8 +- + drivers/scsi/bfa/bfa_hw_cb.c | 13 + + drivers/scsi/bfa/bfa_hw_ct.c | 9 + + drivers/scsi/bfa/bfa_intr.c | 111 +- + drivers/scsi/bfa/bfa_ioc.c | 762 +++------ + drivers/scsi/bfa/bfa_ioc.h | 57 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 274 +++ + drivers/scsi/bfa/bfa_ioc_ct.c | 423 +++++ + drivers/scsi/bfa/bfa_iocfc.c | 24 +- + drivers/scsi/bfa/bfa_iocfc.h | 3 + + drivers/scsi/bfa/bfa_ioim.c | 22 +- + drivers/scsi/bfa/bfa_itnim.c | 30 +- + drivers/scsi/bfa/bfa_lps.c | 134 ++- + drivers/scsi/bfa/bfa_module.c | 4 +- + drivers/scsi/bfa/bfa_modules_priv.h | 2 +- + drivers/scsi/bfa/bfa_port_priv.h | 57 +- + drivers/scsi/bfa/bfa_priv.h | 2 +- + drivers/scsi/bfa/bfa_rport.c | 26 +- + drivers/scsi/bfa/bfa_trcmod_priv.h | 62 +- + drivers/scsi/bfa/bfa_tskim.c | 14 +- + drivers/scsi/bfa/bfad.c | 208 ++- + drivers/scsi/bfa/bfad_attr.c | 76 +- + drivers/scsi/bfa/bfad_attr.h | 9 - + drivers/scsi/bfa/bfad_drv.h | 35 +- + drivers/scsi/bfa/bfad_im.c | 53 +- + drivers/scsi/bfa/bfad_im.h | 5 - + drivers/scsi/bfa/bfad_intr.c | 11 +- + drivers/scsi/bfa/fabric.c | 59 +- + drivers/scsi/bfa/fcbuild.h | 6 + + drivers/scsi/bfa/fcpim.c | 51 +- + drivers/scsi/bfa/fcs_fabric.h | 2 + + drivers/scsi/bfa/fcs_fcpim.h | 5 - + drivers/scsi/bfa/fcs_lport.h | 7 +- + drivers/scsi/bfa/fcs_port.h | 3 +- + drivers/scsi/bfa/fcs_rport.h | 3 - + drivers/scsi/bfa/fcs_uf.h | 3 +- + drivers/scsi/bfa/fcs_vport.h | 8 - + drivers/scsi/bfa/fdmi.c | 79 +- + drivers/scsi/bfa/include/aen/bfa_aen.h | 50 +- + drivers/scsi/bfa/include/bfa.h | 22 + + drivers/scsi/bfa/include/bfa_svc.h | 101 +- + drivers/scsi/bfa/include/bfa_timer.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi.h | 4 +- + drivers/scsi/bfa/include/bfi/bfi_cbreg.h | 16 +- + drivers/scsi/bfa/include/bfi/bfi_ctreg.h | 26 + + drivers/scsi/bfa/include/bfi/bfi_ioc.h | 2 +- + drivers/scsi/bfa/include/bfi/bfi_lps.h | 8 + + drivers/scsi/bfa/include/bfi/bfi_pport.h | 172 +-- + drivers/scsi/bfa/include/cna/bfa_cna_trcmod.h | 4 + + drivers/scsi/bfa/include/cs/bfa_log.h | 2 +- + drivers/scsi/bfa/include/cs/bfa_plog.h | 9 +- + drivers/scsi/bfa/include/cs/bfa_sm.h | 8 + + drivers/scsi/bfa/include/defs/bfa_defs_aen.h | 10 + + drivers/scsi/bfa/include/defs/bfa_defs_auth.h | 22 + + drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 14 +- + drivers/scsi/bfa/include/defs/bfa_defs_driver.h | 3 +- + drivers/scsi/bfa/include/defs/bfa_defs_ethport.h | 1 + + drivers/scsi/bfa/include/defs/bfa_defs_fcport.h | 94 ++ + drivers/scsi/bfa/include/defs/bfa_defs_im_common.h | 32 - + drivers/scsi/bfa/include/defs/bfa_defs_im_team.h | 72 - + drivers/scsi/bfa/include/defs/bfa_defs_ioc.h | 3 +- + drivers/scsi/bfa/include/defs/bfa_defs_iocfc.h | 12 +- + drivers/scsi/bfa/include/defs/bfa_defs_lport.h | 4 +- + drivers/scsi/bfa/include/defs/bfa_defs_mfg.h | 111 ++- + drivers/scsi/bfa/include/defs/bfa_defs_port.h | 19 +- + drivers/scsi/bfa/include/defs/bfa_defs_pport.h | 151 +- + drivers/scsi/bfa/include/defs/bfa_defs_status.h | 17 +- + drivers/scsi/bfa/include/fcb/bfa_fcb_fcpim.h | 1 - + drivers/scsi/bfa/include/fcs/bfa_fcs.h | 5 +- + drivers/scsi/bfa/include/fcs/bfa_fcs_lport.h | 8 - + drivers/scsi/bfa/include/log/bfa_log_hal.h | 6 + + drivers/scsi/bfa/include/log/bfa_log_linux.h | 16 + + drivers/scsi/bfa/include/protocol/fc.h | 5 + + drivers/scsi/bfa/include/protocol/pcifw.h | 75 - + drivers/scsi/bfa/loop.c | 2 +- + drivers/scsi/bfa/lport_api.c | 5 +- + drivers/scsi/bfa/ms.c | 29 +- + drivers/scsi/bfa/ns.c | 36 +- + drivers/scsi/bfa/rport.c | 91 +- + drivers/scsi/bfa/rport_api.c | 2 +- + drivers/scsi/bfa/rport_ftrs.c | 12 +- + drivers/scsi/bfa/scn.c | 10 +- + drivers/scsi/bfa/vport.c | 86 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 2 +- + drivers/scsi/cxgb3i/cxgb3i_iscsi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 6 +- + drivers/scsi/hpsa.c | 330 ++-- + drivers/scsi/hpsa.h | 7 +- + drivers/scsi/hpsa_cmd.h | 20 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 27 + + drivers/scsi/ibmvscsi/ibmvscsi.c | 19 + + drivers/scsi/ibmvscsi/ibmvscsi.h | 1 + + drivers/scsi/ibmvscsi/iseries_vscsi.c | 6 + + drivers/scsi/ibmvscsi/rpa_vscsi.c | 13 + + drivers/scsi/ipr.c | 1756 +++++++++++++++----- + drivers/scsi/ipr.h | 467 ++++-- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libiscsi.c | 23 +- + drivers/scsi/lpfc/lpfc.h | 10 +- + drivers/scsi/lpfc/lpfc_attr.c | 7 +- + drivers/scsi/lpfc/lpfc_bsg.c | 332 ++++ + drivers/scsi/lpfc/lpfc_bsg.h | 12 + + drivers/scsi/lpfc/lpfc_crtn.h | 7 +- + drivers/scsi/lpfc/lpfc_els.c | 142 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 527 +++++-- + drivers/scsi/lpfc/lpfc_init.c | 277 +++- + drivers/scsi/lpfc/lpfc_logmsg.h | 1 + + drivers/scsi/lpfc/lpfc_mbox.c | 8 +- + drivers/scsi/lpfc/lpfc_scsi.c | 49 +- + drivers/scsi/lpfc/lpfc_sli.c | 413 ++++- + drivers/scsi/lpfc/lpfc_sli.h | 1 + + drivers/scsi/lpfc/lpfc_sli4.h | 38 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 7 +- + drivers/scsi/osd/osd_initiator.c | 4 + + drivers/scsi/raid_class.c | 2 + + drivers/scsi/scsi_transport_fc.c | 24 +- + drivers/scsi/sd.c | 4 +- + include/scsi/libiscsi.h | 3 +- + 133 files changed, 7204 insertions(+), 3525 deletions(-) + create mode 100644 drivers/scsi/bfa/bfa_ioc_cb.c + create mode 100644 drivers/scsi/bfa/bfa_ioc_ct.c + create mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_fcport.h + delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_common.h + delete mode 100644 drivers/scsi/bfa/include/defs/bfa_defs_im_team.h + delete mode 100644 drivers/scsi/bfa/include/protocol/pcifw.h +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Already up-to-date. +Merging wireless/master +$ git merge wireless/master +Already up-to-date. +Merging mtd/master +$ git merge mtd/master +Resolved 'drivers/mtd/nand/sh_flctl.c' using previous resolution. +Auto-merging MAINTAINERS +Auto-merging arch/arm/mach-ep93xx/include/mach/ts72xx.h +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +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 c4d940d] 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 | 190 ++- + 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, 4922 insertions(+), 929 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. + sound/isa/opti9xx/opti92x-ad1848.c | 3 ++- + sound/pci/hda/patch_realtek.c | 8 +++++++- + 2 files changed, 9 insertions(+), 2 deletions(-) +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +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. +Resolved 'drivers/char/virtio_console.c' 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/char/virtio_console.c +CONFLICT (content): Merge conflict in drivers/char/virtio_console.c +Auto-merging drivers/virtio/virtio_pci.c +Auto-merging include/linux/gfp.h +Auto-merging include/linux/kernel.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 94fb672] 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 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 +Merge made by recursive. + fs/bio.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Merge made by recursive. + Documentation/device-mapper/dm-flakey.txt | 18 +++ + drivers/md/Kconfig | 6 + + drivers/md/Makefile | 1 + + drivers/md/dm-flakey.c | 214 +++++++++++++++++++++++++++++ + 4 files changed, 239 insertions(+), 0 deletions(-) + create mode 100644 Documentation/device-mapper/dm-flakey.txt + create mode 100644 drivers/md/dm-flakey.c +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +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 +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/video/backlight/Makefile +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/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/serial/sh-sci.c +Auto-merging drivers/video/console/fbcon.c +Auto-merging init/main.c +Auto-merging kernel/Makefile +Removing kernel/kgdb.c +Auto-merging kernel/module.c +Auto-merging kernel/printk.c +Auto-merging kernel/sched.c +Auto-merging kernel/signal.c +Merge made by recursive. + Documentation/DocBook/kgdb.tmpl | 773 +++++++--- + Documentation/kernel-parameters.txt | 34 +- + MAINTAINERS | 6 +- + arch/arm/include/asm/kmap_types.h | 1 + + arch/arm/kernel/kgdb.c | 5 + + arch/blackfin/kernel/kgdb.c | 5 + + arch/mips/include/asm/kgdb.h | 2 + + arch/mips/kernel/kgdb.c | 27 +- + arch/mips/kernel/traps.c | 13 + + arch/powerpc/include/asm/kmap_types.h | 1 + + arch/powerpc/kernel/kgdb.c | 11 +- + arch/powerpc/kernel/traps.c | 7 +- + arch/sh/kernel/kgdb.c | 14 +- + arch/sparc/kernel/kgdb_32.c | 6 + + arch/sparc/kernel/kgdb_64.c | 6 + + arch/x86/include/asm/kgdb.h | 3 + + arch/x86/include/asm/processor.h | 2 + + arch/x86/kernel/cpu/common.c | 29 +- + arch/x86/kernel/early_printk.c | 8 + + arch/x86/kernel/kgdb.c | 103 +- + arch/x86/kernel/setup.c | 1 + + arch/x86/kernel/traps.c | 20 +- + drivers/char/keyboard.c | 68 +- + drivers/gpu/drm/drm_fb_helper.c | 79 + + drivers/gpu/drm/i915/intel_display.c | 97 ++ + 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 | 120 ++- + 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/kbd_kern.h | 1 + + 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 +- + 65 files changed, 9993 insertions(+), 2059 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. + mm/slab.c | 202 +++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 170 insertions(+), 32 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 +Already up-to-date. +Merging hdlc/hdlc-next +$ git merge hdlc/hdlc-next +Already up-to-date. +Merging drm/drm-next +$ git merge drm/drm-next +Already up-to-date. +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/Makefile +Auto-merging drivers/regulator/wm8350-regulator.c +Auto-merging include/linux/mfd/mc13783.h +Merge made by recursive. +Merging security-testing/next +$ git merge security-testing/next +Already up-to-date. +Merging lblnet/master +$ git merge lblnet/master +Already up-to-date. +Merging agp/agp-next +$ git merge agp/agp-next +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/i6300esb.c +Merge made by recursive. +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 +Already up-to-date. +Merging jc_docs/docs-next +$ git merge jc_docs/docs-next +Already up-to-date. +Merging nommu/master +$ git merge nommu/master +Already up-to-date. +Merging trivial/for-next +$ git merge trivial/for-next +Auto-merging Documentation/filesystems/proc.txt +CONFLICT (content): Merge conflict in Documentation/filesystems/proc.txt +Auto-merging Documentation/power/runtime_pm.txt +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/pci-dma.c +Auto-merging arch/x86/kernel/ptrace.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/vmiclock_32.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/serial167.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/mmc/card/sdio_uart.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 drivers/usb/musb/musb_regs.h +Auto-merging drivers/usb/serial/cypress_m8.c +Auto-merging drivers/usb/serial/opticon.c +Auto-merging drivers/usb/serial/symbolserial.c +Auto-merging fs/binfmt_elf_fdpic.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 +AResolved 'Documentation/filesystems/proc.txt' using previous resolution. +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. +uto-merging fs/udf/inode.c +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/sched.h +Auto-merging kernel/irq/chip.c +Auto-merging kernel/ksysfs.c +Auto-merging kernel/params.c +Auto-merging kernel/sched_cpupri.c +Auto-merging kernel/trace/ring_buffer.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 0ba42b0] 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/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 +- + 242 files changed, 396 insertions(+), 3454 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 'include/linux/fsnotify.h' 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/fs.h +Auto-merging include/linux/fsnotify.h +CONFLICT (content): Merge conflict in include/linux/fsnotify.h +Auto-merging include/linux/mount.h +Auto-merging include/linux/security.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/audit.c +Auto-merging kernel/audit_tree.c +CONFLICT (content): Merge conflict in kernel/audit_tree.c +Auto-merging kernel/auditsc.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 aa42f5e] 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 | 164 +++--- + include/linux/fsnotify_backend.h | 169 ++++-- + include/linux/inotify.h | 175 +----- + 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 | 7 +- + security/security.c | 16 +- + 57 files changed, 3096 insertions(+), 2249 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 5c287de] 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 1259408] 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 3ec3a81] 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 arch/x86/pci/legacy.c +Auto-merging drivers/edac/edac_core.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/pci_ids.h +Merge made by recursive. + Documentation/edac.txt | 153 +++ + arch/x86/include/asm/pci_x86.h | 2 + + arch/x86/kernel/cpu/mcheck/mce.c | 10 + + arch/x86/pci/legacy.c | 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/posix-cpu-timers.c +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 97f1bc4] 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/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/i2c/Kconfig +Auto-merging drivers/i2c/Makefile +Removing drivers/i2c/chips/Kconfig +Removing drivers/i2c/chips/Makefile +Auto-merging drivers/misc/Kconfig +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 arch/x86/Kconfig +Auto-merging arch/x86/kernel/cpu/perf_event.c +Auto-merging arch/x86/kernel/cpu/perf_event_intel.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging include/linux/rbtree.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging kernel/perf_event.c +Auto-merging kernel/sysctl.c +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/rbtree.txt | 58 +++++++ + arch/mips/include/asm/i8253.h | 2 +- + arch/mips/kernel/i8253.c | 14 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/hw_breakpoint.h | 1 - + arch/x86/include/asm/i8253.h | 2 +- + arch/x86/include/asm/nmi.h | 2 + + arch/x86/include/asm/perf_event.h | 16 ++- + arch/x86/kernel/aperture_64.c | 1 - + arch/x86/kernel/apic/Makefile | 7 +- + arch/x86/kernel/apic/hw_nmi.c | 127 ++++++++++++++ + arch/x86/kernel/apic/nmi.c | 7 - + arch/x86/kernel/apm_32.c | 4 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/perf_event.c | 36 +++-- + arch/x86/kernel/cpu/perf_event_intel.c | 31 +++- + arch/x86/kernel/cpu/perf_event_p6.c | 8 +- + arch/x86/kernel/cpu/perfctr-watchdog.c | 2 +- + arch/x86/kernel/hw_breakpoint.c | 12 -- + arch/x86/kernel/i8253.c | 14 +- + arch/x86/kernel/traps.c | 7 + + arch/x86/mm/Makefile | 1 + + 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 +- + drivers/block/hd.c | 4 +- + drivers/input/gameport/gameport.c | 4 +- + drivers/input/joystick/analog.c | 4 +- + drivers/input/misc/pcspkr.c | 6 +- + include/linux/cgroup.h | 1 + + include/linux/hw_breakpoint.h | 8 +- + include/linux/nmi.h | 13 ++ + include/linux/perf_event.h | 20 ++- + include/linux/rbtree.h | 5 +- + init/Kconfig | 5 + + kernel/Makefile | 1 + + kernel/hw_breakpoint.c | 11 +- + kernel/nmi_watchdog.c | 259 +++++++++++++++++++++++++++++ + kernel/perf_event.c | 15 -- + kernel/rcutree_plugin.h | 8 +- + kernel/sched_fair.c | 2 +- + kernel/sysctl.c | 15 ++- + kernel/time/clocksource.c | 4 + + kernel/trace/trace_clock.c | 1 + + lib/Kconfig.debug | 20 +++ + lib/rbtree.c | 48 +++++- + 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/builtin-lock.c | 148 ++++++++++++++++- + tools/perf/command-list.txt | 1 + + tools/perf/perf-archive.sh | 3 +- + tools/perf/util/probe-event.c | 2 +- + 58 files changed, 1255 insertions(+), 366 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 kernel/nmi_watchdog.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 +Already up-to-date. +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + kernel/workqueue.c | 27 ++++++++++++++++++++++++++- + 1 files changed, 26 insertions(+), 1 deletions(-) +Merging sfi/sfi-test +$ git merge sfi/sfi-test +Already up-to-date. +Merging asm-generic/next +$ git merge asm-generic/next +Already up-to-date. +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging quilt/driver-core +$ git merge quilt/driver-core +Recorded preimage for 'drivers/base/Kconfig' +Recorded preimage for 'include/linux/device.h' +Auto-merging arch/s390/kernel/time.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Auto-merging drivers/base/Kconfig +CONFLICT (content): Merge conflict in drivers/base/Kconfig +Auto-merging drivers/base/core.c +Auto-merging drivers/block/pktcdvd.c +Auto-merging drivers/dma/ioat/dma.c +Auto-merging drivers/dma/ioat/dma.h +Auto-merging drivers/edac/edac_mc_sysfs.c +Auto-merging drivers/firmware/memmap.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/i2c/busses/i2c-omap.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging drivers/mtd/ubi/build.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/staging/asus_oled/asus_oled.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/sys.c +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging kernel/module.c +Auto-merging kernel/params.c +Auto-merging kernel/perf_event.c +Auto-merging kernel/sched.c +Auto-merging mm/slub.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/base/Kconfig'. +Recorded resolution for 'include/linux/device.h'. +[master 0890fc9] Merge branch 'quilt/driver-core' +$ git diff -M --stat --summary HEAD^.. + drivers/base/core.c | 3 +-- + drivers/net/mlx4/mlx4.h | 1 + + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + drivers/usb/core/usb.c | 2 +- + include/linux/device.h | 9 ++++----- + 5 files changed, 8 insertions(+), 8 deletions(-) +Merging quilt/tty +$ git merge quilt/tty +Already up-to-date. +Merging quilt/usb +$ git merge quilt/usb +Already up-to-date. +Merging quilt/staging +$ git merge quilt/staging +Resolved 'drivers/staging/comedi/drivers/ni_660x.c' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/ni_labpc.c' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/pcmad.c' using previous resolution. +Resolved 'drivers/staging/comedi/drivers/poc.c' using previous resolution. +Resolved 'drivers/staging/dream/camera/msm_camera.c' using previous resolution. +Resolved 'drivers/staging/dream/camera/s5k3e2fx.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/hfa384x_usb.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211conv.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211metadef.h' using previous resolution. +Resolved 'drivers/staging/wlan-ng/p80211wext.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/prism2fw.c' using previous resolution. +Resolved 'drivers/staging/wlan-ng/prism2mib.c' using previous resolution. +Renaming drivers/staging/batman-adv/log.h->drivers/staging/batman-adv/originator.h +Auto-merging drivers/staging/batman-adv/originator.h +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/comedi/comedi_fops.c +Auto-merging drivers/staging/comedi/drivers/ni_660x.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_660x.c +Auto-merging drivers/staging/comedi/drivers/ni_labpc.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc.c +Auto-merging drivers/staging/comedi/drivers/pcmad.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/pcmad.c +Auto-merging drivers/staging/comedi/drivers/poc.c +CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/poc.c +Auto-merging drivers/staging/dream/camera/msm_camera.c +CONFLICT (content): Merge conflict in drivers/staging/dream/camera/msm_camera.c +Auto-merging drivers/staging/dream/camera/s5k3e2fx.c +CONFLICT (content): Merge conflict in drivers/staging/dream/camera/s5k3e2fx.c +Auto-merging drivers/staging/pohmelfs/inode.c +Auto-merging drivers/staging/winbond/wbusb.c +Auto-merging drivers/staging/wlan-ng/hfa384x.h +Auto-merging drivers/staging/wlan-ng/hfa384x_usb.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/hfa384x_usb.c +Auto-merging drivers/staging/wlan-ng/p80211conv.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211conv.c +Auto-merging drivers/staging/wlan-ng/p80211metadef.h +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211metadef.h +Auto-merging drivers/staging/wlan-ng/p80211wext.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/p80211wext.c +Auto-merging drivers/staging/wlan-ng/prism2fw.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2fw.c +Auto-merging drivers/staging/wlan-ng/prism2mgmt.c +Auto-merging drivers/staging/wlan-ng/prism2mib.c +CONFLICT (content): Merge conflict in drivers/staging/wlan-ng/prism2mib.c +Auto-merging drivers/staging/wlan-ng/prism2sta.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9311841] Merge branch 'quilt/staging' +$ git diff -M --stat --summary HEAD^.. +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..618cb94997f6 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,45 @@ +Importing driver-core.current based on eaa5eec739637f32f8733d528ff0b94fd62b1214 +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-git15 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +HEAD is now at 25cf84c Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/i2c +i2c-powermac-less-verbose.patch +i2c-i801-01-no-block-buffer-for-i2c-block-write.patch +i2c-i801-02-new-parameter-to-disable-features.patch +i2c-i801-03-default-to-all-features-present.patch +i2c-scx200_acb-make-pci-device-ids-constant.patch +i2c-scmi-support-ibm-smbus-cmi-devices.patch +i2c-scmi-provide-module-aliases-for-automatic-loading.patch +i2c-stub-show-actual-functionality.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/i2c +From ../quilt-tmp + + 4c3dfa4...460e1ee master -> quilt/i2c (forced update) +Importing jdelvare-hwmon based on 2.6.33-git15 + quilt series is empty +$ git update-ref refs/heads/quilt/jdelvare-hwmon 25cf84cf377c0aae5dbcf937ea89bc7893db5176 +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-5070-g64ba992 +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..5f10ded8ca6e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20100309 |