diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 16:23:24 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-04-08 16:23:24 +1000 |
commit | 129f0385b28b3e6150ff29c41a04ec35fe4d2a64 (patch) | |
tree | 383abfb6e0b4bfad2a7d058ac40f53e2839fb0fd | |
parent | f8a3689a68d8344c7b5b54b76506b5cbdf22ca2e (diff) |
Add linux-next specific files for 20110408next-20110408
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 186 | ||||
-rw-r--r-- | Next/Trees | 188 | ||||
-rw-r--r-- | Next/merge.log | 5405 | ||||
-rw-r--r-- | Next/quilt-import.log | 23 | ||||
-rw-r--r-- | localversion-next | 1 |
5 files changed, 5803 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1af8d733f359 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,186 @@ +Name SHA1 +---- ---- +origin 0c3efe54d0165cecf0698b468e253577b555dde6 +fixes 89078d572eb9ce8d4c04264b8b0ba86de0d74c8f +kbuild-current b7bd182176960fdd139486cadb9962b39f8a2b50 +arm-current 6aba74f2791287ec407e0f92487a725a25908067 +m68k-current f3b29cb43bb3ea0571d11a81e2371308c8b57733 +powerpc-merge c60e65d7863620945d498a8ac60181077879599c +52xx-and-virtex-current dd9c1549edef02290edced639f67b54a25abbe0e +sparc-current 47c7c97a93a5b8f719093dbf83555090b3b8228b +scsi-rc-fixes 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +net-current 1b86a58f9d7ce4fe2377687f378fbfb53bdc9b6c +sound-current a0334c50bf0ba7c720ed00f931e721c989efd233 +pci-current eca67315e0e0d5fd91264d79c88694006dbc7d31 +wireless-current bd39a274fb7b43374c797bafdb7f506598f36f77 +driver-core.current 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +tty.current 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +usb.current 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +staging.current 28276a28d8b3cd19f4449991faad4945fe557656 +cpufreq-current 2e270d84223262a38d4755c61d55f5c73ea89e56 +input-current 908433833cac977563e9bef8b206990d846876b4 +md-current f0b4f7e2f29af678bd9af43422c537dcb6008603 +audit-current def57543418a5f47debae28a0a9dea2effc11692 +crypto-current 60af520cf264ea26b2af3a6871bbd71850522aea +ide-curent dd8717da6da9b0e745df49762be4573010f1013c +dwmw2 244dc4e54b73567fae7f8fd9ba56584be9375442 +sh-current 99b662e511e08230e8422e77cbe4fd31ed173df6 +rmobile-current 6084c81e8a8ffa8b85d59e1ca7643dc76c23e412 +fbdev-current 97fb85076c2d3adcc559dee577e0a3bf7215d48e +devicetree-current df45268844149b2ccb2a3fe0970954e3eb4834c3 +spi-current 88aab9341a315d81118be6b41c45e4fe32b94bc1 +arm 6aba74f2791287ec407e0f92487a725a25908067 +davinci 9a9fb12a4832bdf22751e21df298ef3559643b43 +i.MX 358020dd27b0818eeeb998dba9899426805e2342 +linux-spec 5111711d3ed8f4f1012cac3ec3f2b463b549fbfd +msm 8e76a80960bf06c245160a484d5a363ca6b520bb +omap 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +pxa 19d6c13b56a78b3757e747f469285c2a546d634a +samsung 9edb240696bacd53f4331119d2dfd13d4cd4852f +s5p 4c1b8574ff7c51cef79e29df5db87fb3b154f32f +tegra 84abf6084704673ae80a2105bf63ece5eee3edd5 +ux500-core dc79db74fda8a8197b3d625e5385a9048677eff0 +xilinx 950faba947efed354a63cc32acf7deb9882baf9f +avr32 cbf8de1620cdb1abb5b0618ff561004f816064fc +blackfin 6aba74f2791287ec407e0f92487a725a25908067 +cris d5af30cff76cea7e97806cda53110fbb1b7c3c07 +ia64 9138ea42304fe495b32628d4f18f492f7d891e21 +m68k f3b29cb43bb3ea0571d11a81e2371308c8b57733 +m68knommu 0ca3da154619be81ff5ca74c57217cc7fcf1dee7 +microblaze b2a8b4b81966094703088a7bc76a313af841924d +mips 04c49a319d05ac29f3c5b157c0e410931272c10c +parisc 1c0f647690f1b9471d63af48dec960bc59492e61 +powerpc 831532035b12a5f7b600515a6f4da0b207b82d6e +4xx 831532035b12a5f7b600515a6f4da0b207b82d6e +52xx-and-virtex 0a95d92c0054e74fb79607ac2df958b7bf295706 +galak b0aea14bdc4a9ee5d1e8cb78488263d6ce32095e +s390 f1332c4a2c8572597101b8c777602615baec9248 +sh 99b662e511e08230e8422e77cbe4fd31ed173df6 +rmobile 6084c81e8a8ffa8b85d59e1ca7643dc76c23e412 +sparc 08351fc6a75731226e1112fc7254542bd3a2912e +tile 339dc50e59f4ea697e2b8cd6296328a8015a6c21 +unicore32 6b794743b2c5e21825d35b5d5dd57d6fcc388198 +xtensa 944afcb4c53f3b841d63ce337fe37b71cea2f52f +ceph 4b2a58abd1e17c0ee53c8dded879e015917cca67 +cifs a3afdac56d00fbc7c29798c46320379a3343f769 +configfs 420118caa32c8ccdf9fce5a623b9de3f951573c5 +ecryptfs 9a5c06247dff5b13c5c012d123ce8c915b7553b1 +ext3 b03f24567ce7caf2420b8be4c6eb74c191d59a91 +ext4 0905b0c2e255dec6348d2906f335e293d2619299 +fatfs 7845bc3e132605e3e8a1f37748e29281164b65f5 +fuse e7c0a167860620bd2938366896964f729ddaeaaa +gfs2 12c752be57e16db3812cd6a84f32199cfd681dd7 +hfsplus 99943814ce60e4cd0165f19781abbfcc826f8d87 +jfs c7f2e1f0ac142a657a1de00d404e1c8345b20598 +logfs ddbb5dd99c40a695d5d75645b5a18bef394acb16 +nfs 37adb89fadd65ce47f7e5cfd564938a76b351948 +nfsd d6c558379abc27241c75b8c30fc8c94b82537d5e +nilfs2 9dd017c47beb0cfd9389f915aa566270f685aedc +ocfs2 272b62c1f0f6f742046e45b50b6fec98860208a0 +omfs 31be83aeaee22fa165862ad449c7131ceaf1cf91 +squashfs 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 +udf 6f644e5f97cc8dcb8dc7133562159cc20d27c38f +v9fs 78fca1b95837a44983608302e89c7258981be9b3 +ubifs 7da6443aca9be29c6948dcbd636ad50154d0bc0c +xfs 89b3600ccfb01aed6873bc499442fc0bed00bbdd +vfs 0f60f240d522772467c7d2cebedb910748c78ed4 +vfs-scale 32385c7cf60a78375b63afc4f02001df84dfd1a0 +pci a44f99c7efdb88fa41128065c9a9445c19894e34 +hid 99759619b27662d1290901228d77a293e6e83200 +i2c 1df9cb14cc885dc528080d9c61a173de42076de1 +bjdooks-i2c 3e0e7388aa3176f335c2d95e923655321852c993 +jdelvare-hwmon 7e344f3d4d5ace54c6f90e25a4692e5fc9afb182 +hwmon-staging 66158d6e466b6c04ec2b7923bfb3c8c19a855e72 +kernel-doc 78fca1b95837a44983608302e89c7258981be9b3 +v4l-dvb e8a0231c7d9f9ab680b4bfed1565ccae9c388e91 +kbuild 90fb498e33c8a74a6b379528fdec6bb032afff11 +kconfig eae1c36aea9cfe4d123b8af3ffe54109c6579810 +ide 45d7f32c7a43cbb9592886d38190e379e2eb2226 +libata 50be5e3657cd2851a297dc0b3fd459f25829d29b +infiniband 92d7d8fd21a4649018eee869f5f7f8d3ecab5735 +acpi 58d32cf9d26a7ece628cece17403666fbbede934 +idle-test 42be29a3d2b7c07ca0c97150aa3598b964f5a8ee +powertools a829eb4d7e08b316e2d48880ecab3630497f300f +ieee1394 2266b4a1841302e56865567cc962f468ef1b8378 +ubi 7ea6e067983612f044c2b7c467e276ad6ba662a6 +kvm d4168b8a7f2b7d92d355ec82f8f5e293ea3d81c7 +dlm 4bcad6c1ef53a9a0224f4654ceb3b9030d0769ec +swiotlb e79f86b2ef9c0a8c47225217c1018b7d3d90101c +ibft 3e0f686e6bf347eea4a41d7d415f003c2f42b1a0 +scsi 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +async_tx 3ea205c449d2b5996d0256aa8b2894f7aea228a2 +net 57841869197831542f25c739beaeab4465977878 +wireless b37e3b6d64358604960b35e8ecbb7aed22e0926e +bluetooth 3c5136e5dfd9fc34dfb0db74f7ff0fa578935851 +mtd 80b4f81a49809774f1b123c456fb179e472dbd0e +crypto 40bfc14f3250691dca6fcb00f791727e180a7f79 +sound 670a057c3a4e0b395bf8074e8f3b7ac280cc6527 +sound-asoc 774fd7baf87829248365a07fdd42ca9882b5dd64 +cpufreq bdce2595a2f539c6fdedd8f2bd281326b627bba3 +rr a774f4c50e5c506ada01f31842817002a5a21deb +input def179c271ac9b5020deca798470521f14d11edd +input-mt 521cb40b0c44418a4fd36dc633f575813d59a43d +lsm ca05a99a54db1db5bca72eccb5866d2a86f8517f +block 1df30acfef2b53f0ab87808dca2b857b9ce7d72d +device-mapper 055d219441cc23f631240335fd369b6b5852681a +embedded 4744b43431e8613f920c5cba88346756f53c5165 +firmware 6e03a201bbe8137487f340d26aa662110e324b20 +pcmcia 33619f0d3ff715a2a5499520967d526ad931d70d +battery 909a78b320b31ca9709d7ea5f602ec1bd2015192 +leds a4b4433c511cf4361bb0afabba69e16632002d32 +backlight 67e67df8da723debf24f7763605776891203e8d5 +mmc 72daf3e87d6a1791331d3975eace2e290c2f229e +kgdb 18bcd0c8cb7d85a9063b88ec810dc1cdc0974518 +slab 4fdccdfbb4652a7bbac8adbce7449eb093775118 +uclinux 6e86841d05f371b5b9b86ce76c02aaee83352298 +md f0b4f7e2f29af678bd9af43422c537dcb6008603 +mfd a8300ccd591fd0088c074e1fbf9b8c5c4295391d +hdlc 4a6908a3a050aacc9c3a2f36b276b46c0629ad91 +drm 51eab416c9b4b3ed16553d405ec4a5f67daa34cf +fbdev 97fb85076c2d3adcc559dee577e0a3bf7215d48e +viafb 3f086fe93f734ba76f2e130777687f81e0cbb318 +omap_dss2 0da5637569bb9bf93e6930cd1c3b452eede50ba2 +voltage 15850b0b4d3bd7bc7a85d1af16a7f3bb41e7e2d1 +security-testing a3232d2fa2e3cbab3e76d91cdae5890fee8a4034 +selinux 1214eac73f798bccabc6adb55e7b2d787527c13c +lblnet 7e27d6e778cd87b6f2415515d7127eba53fe5d02 +agp 7f32e2e05c240201b42b58dec1b4a072e2127792 +watchdog 262c6c40cd8b9eee1fb137557a16dd7d7a23973c +bdev feaf3848a813a106f163013af6fcf6c4bfec92d9 +dwmw2-iommu 2fe9723df8e45fd247782adea244a5e653c30bf4 +cputime 96830a57de1197519b62af6a4c9ceea556c18c3d +osd a49fb4c3d035ab516507b31ec3bd49263caee14d +jc_docs 5c050fb96380a87a85aad9084b68fdcd2b84c193 +nommu 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d +trivial d66f1886cab1b6539b0a54fb2ecc24ae830d103c +audit def57543418a5f47debae28a0a9dea2effc11692 +suspend 16c29dafcc86024048f1dbb8349d31cb22c7c55a +fsnotify ef9bf3b7144bee6ce1da5616015cabc8771206af +irda 94d57c4cfaa43e29ca5fa5ff874048cfc67276f5 +alacrity 17d1061f5d87eff7d50942399414845d1f7a8a08 +i7core_edac 24c70a0e06fbadbe66fbb26f41b64153c5c1efbd +i7300_edac bbab9984d7e65f08d3083814103b91b3dd382381 +devicetree a7006c9747ef225ab070d96c054e85682a09a13e +spi 3b8a4dd3ebfcc647260ad5c39ef4f73eb3a6b155 +tip 520f7b36d2a0c29b55e45d4aec5aaa87b1a84ca5 +rcu 8884de627eaa697101535d7d3fbe4ed7acb499e8 +oprofile 855f905a48cf6798c7c65ab5a04f2ac172c168d9 +ptrace 321fb561971ba0f10ce18c0f8a4b9fbfc7cef4b9 +xen-two 361ae8cb57ec35ace2fa5f9695dba14eca9893e0 +xen-pvhvm b056b6a0144de90707cd22cf7b4f60bf69c86d59 +edac-amd a9f0fbe2bbf328f869fc5ee5a12c6a4118c32689 +percpu ac24307b6910e7286910c1f227bd7951b87a3bae +workqueues e2de9e0862778f4aba103027ce575efbddb8117f +sfi 5b026c4e3af52fda22c9313a3388344f82f3ba15 +asm-generic 35dbc0e020c6587f78a6c17693beca73aead7b54 +drivers-x86 bea68c651a4857997eeba2af2d25a72a594e8e80 +hwpoison 46e387bbd82d438b9131e237e6e2cb55a825da49 +sysctl c656ae95d1c5c8ed5763356263ace2d03087efec +driver-core 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +tty 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +usb 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +staging 59c23eabdae97a18cfc400339138f6d1dbde926a +slabh 7f3c1fa4c3f52ef65005ae5162e5173e875b8c0c +bkl-config 4ba8216cd90560bc402f52076f64d8546e8aefcb +cleancache 5231e92e133d6db6681a4485b1794a01469ca9ad +scsi-post-merge c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2fd7ceebc1db --- /dev/null +++ b/Next/Trees @@ -0,0 +1,188 @@ +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 +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git#rc-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 +52xx-and-virtex-current git git://git.secretlab.ca/git/linux-2.6#powerpc/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 +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-linus +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-linus +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 +sh-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#sh-fixes-for-linus +rmobile-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-fixes-for-linus +fbdev-current git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#fbdev-fixes-for-linus +devicetree-current git git://git.secretlab.ca/git/linux-2.6#devicetree/merge +spi-current git git://git.secretlab.ca/git/linux-2.6#spi/merge +arm git ssh://master.kernel.org/home/rmk/linux-2.6-arm.git#for-next +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 +linux-spec git http://git.kernel.org/pub/scm/linux/kernel/git/dwalker/linux-spec#for-next +msm git git://codeaurora.org/quic/kernel/davidb/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 +s5p git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +tegra git git://android.git.kernel.org/kernel/tegra.git#for-next +ux500-core git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git#ux500-core +xilinx git git://git.xilinx.com/linux-2.6-xlnx.git#arm-next +avr32 git git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6.git#avr32-arch +blackfin git git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin.git#for-linus +cris git git://www.jni.nu/cris.git#for-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git#test +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/upstream-sfr.git#mips-for-linux-next +parisc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/parisc-2.6.git#for-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#powerpc/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#sh-latest +rmobile git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.git#rmobile-latest +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +unicore32 git git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32.git#unicore32 +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 +hfsplus git git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus.git#for-next +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 +omfs git git://git.kernel.org/pub/scm/linux/kernel/git/bcopeland/omfs.git#for-next +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus.git#master +udf git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6.git#for_next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://oss.sgi.com/xfs/xfs#master +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-scale git git://git.kernel.org/pub/scm/linux/kernel/git/npiggin/linux-npiggin.git#vfs-scale-working +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/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +kernel-doc quilt http://oss.oracle.com/~rdunlap/kernel-doc-patches/current/ +v4l-dvb git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-next.git#master +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.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 +idle-test git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git#idle-test +powertools git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6.git#tools-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 +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb-2.6.git#master +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 +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/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/ +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +input-mt git git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input-mt.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 +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +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 +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git#master +viafb git git://github.com/schandinat/linux-2.6.git#viafb-next +omap_dss2 git git://gitorious.org/linux-omap-dss2/linux.git#for-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 +selinux git git://git.infradead.org/users/eparis/selinux.git#master +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 +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 +suspend git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6.git#linux-next +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 +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 +i7300_edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac.git#linux_next +devicetree git git://git.secretlab.ca/git/linux-2.6#devicetree/next +spi git git://git.secretlab.ca/git/linux-2.6#spi/next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git#auto-latest +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git#rcu/next +oprofile git git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile.git#for-next +ptrace git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#ptrace +xen-two git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git#linux-next +xen-pvhvm git git://xenbits.xen.org/people/sstabellini/linux-pvhvm.git#linux-next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.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 +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86#linux-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 git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git#usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6.git#staging-next +slabh git git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc.git#slabh +bkl-config git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl.git#config +cleancache git git://git.kernel.org/pub/scm/linux/kernel/git/djm/tmem.git#linux-next +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..d0d41fe9ddf9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,5405 @@ +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6221f222 Linux 2.6.39-rc2 +Merging origin/master +$ git merge origin/master +Updating 6221f222..0c3efe5 +Fast-forward + CREDITS | 6 +- + Documentation/ABI/testing/sysfs-bus-css | 2 +- + Documentation/ABI/testing/sysfs-class-led | 2 +- + Documentation/DocBook/dvb/dvbproperty.xml | 2 +- + Documentation/DocBook/dvb/frontend.xml | 2 +- + Documentation/DocBook/kernel-locking.tmpl | 2 +- + Documentation/DocBook/libata.tmpl | 10 +- + Documentation/DocBook/mtdnand.tmpl | 12 +- + Documentation/DocBook/regulator.tmpl | 4 +- + Documentation/DocBook/uio-howto.tmpl | 2 +- + Documentation/DocBook/usb.tmpl | 2 +- + Documentation/DocBook/v4l/common.xml | 2 +- + Documentation/DocBook/v4l/controls.xml | 2 +- + Documentation/DocBook/v4l/dev-subdev.xml | 2 +- + Documentation/DocBook/v4l/libv4l.xml | 2 +- + Documentation/DocBook/v4l/remote_controllers.xml | 2 +- + Documentation/DocBook/writing-an-alsa-driver.tmpl | 2 +- + Documentation/PCI/MSI-HOWTO.txt | 4 +- + Documentation/SecurityBugs | 2 +- + Documentation/SubmittingDrivers | 2 +- + Documentation/SubmittingPatches | 2 +- + Documentation/arm/IXP4xx | 4 +- + Documentation/arm/Samsung-S3C24XX/Suspend.txt | 2 +- + Documentation/arm/Samsung/GPIO.txt | 2 +- + Documentation/block/biodoc.txt | 4 +- + Documentation/cpu-hotplug.txt | 2 +- + Documentation/dell_rbu.txt | 2 +- + Documentation/device-mapper/dm-service-time.txt | 2 +- + Documentation/devicetree/bindings/fb/sm501fb.txt | 4 +- + .../devicetree/bindings/mtd/fsl-upm-nand.txt | 2 +- + .../devicetree/bindings/net/can/sja1000.txt | 2 +- + .../devicetree/bindings/powerpc/fsl/mpic.txt | 2 +- + Documentation/dvb/README.dvb-usb | 2 +- + Documentation/dvb/ci.txt | 2 +- + Documentation/dvb/faq.txt | 2 +- + Documentation/edac.txt | 2 +- + Documentation/eisa.txt | 2 +- + Documentation/fb/viafb.txt | 4 +- + .../filesystems/autofs4-mount-control.txt | 2 +- + Documentation/filesystems/caching/netfs-api.txt | 18 +- + Documentation/filesystems/configfs/configfs.txt | 2 +- + Documentation/filesystems/ext4.txt | 4 +- + Documentation/filesystems/gfs2-uevents.txt | 2 +- + Documentation/filesystems/gfs2.txt | 2 +- + Documentation/filesystems/ntfs.txt | 2 +- + Documentation/filesystems/ocfs2.txt | 2 +- + Documentation/filesystems/path-lookup.txt | 4 +- + .../filesystems/pohmelfs/network_protocol.txt | 2 +- + Documentation/filesystems/proc.txt | 6 +- + Documentation/filesystems/squashfs.txt | 2 +- + Documentation/filesystems/sysfs.txt | 2 +- + Documentation/filesystems/vfs.txt | 2 +- + .../filesystems/xfs-delayed-logging-design.txt | 8 +- + Documentation/hwmon/abituguru | 2 +- + Documentation/hwmon/abituguru-datasheet | 8 +- + Documentation/hwmon/abituguru3 | 2 +- + Documentation/hwmon/pmbus | 6 +- + Documentation/hwmon/sysfs-interface | 2 +- + Documentation/hwmon/w83781d | 2 +- + Documentation/hwmon/w83791d | 2 +- + Documentation/i2c/busses/i2c-parport-light | 2 +- + Documentation/i2c/busses/i2c-sis96x | 2 +- + Documentation/i2c/busses/i2c-taos-evm | 2 +- + Documentation/i2o/README | 2 +- + Documentation/ia64/aliasing-test.c | 2 +- + Documentation/input/joystick-parport.txt | 2 +- + Documentation/input/rotary-encoder.txt | 2 +- + Documentation/input/walkera0701.txt | 2 +- + Documentation/irqflags-tracing.txt | 2 +- + Documentation/isdn/INTERFACE.CAPI | 2 +- + Documentation/kbuild/kbuild.txt | 8 +- + Documentation/kernel-parameters.txt | 2 +- + Documentation/kvm/mmu.txt | 2 +- + Documentation/kvm/ppc-pv.txt | 2 +- + Documentation/kvm/timekeeping.txt | 2 +- + Documentation/media-framework.txt | 4 +- + Documentation/mips/AU1xxx_IDE.README | 4 +- + Documentation/misc-devices/ics932s401 | 2 +- + Documentation/networking/3c359.txt | 2 +- + Documentation/networking/README.ipw2200 | 2 +- + Documentation/networking/bonding.txt | 2 +- + Documentation/networking/caif/Linux-CAIF.txt | 2 +- + Documentation/networking/caif/spi_porting.txt | 2 +- + Documentation/networking/can.txt | 2 +- + Documentation/networking/ieee802154.txt | 2 +- + Documentation/networking/olympic.txt | 2 +- + Documentation/networking/packet_mmap.txt | 2 +- + Documentation/networking/s2io.txt | 4 +- + Documentation/networking/tc-actions-env-rules.txt | 4 +- + Documentation/power/devices.txt | 2 +- + Documentation/power/notifiers.txt | 4 +- + Documentation/power/opp.txt | 2 +- + Documentation/power/swsusp.txt | 4 +- + Documentation/power/userland-swsusp.txt | 6 +- + Documentation/powerpc/hvcs.txt | 2 +- + Documentation/scsi/ChangeLog.lpfc | 18 +- + Documentation/scsi/ChangeLog.megaraid | 2 +- + Documentation/scsi/ChangeLog.ncr53c8xx | 2 +- + Documentation/scsi/ChangeLog.sym53c8xx | 2 +- + Documentation/scsi/aha152x.txt | 2 +- + Documentation/scsi/aic79xx.txt | 12 +- + Documentation/scsi/ibmmca.txt | 4 +- + Documentation/scsi/scsi-changer.txt | 2 +- + Documentation/scsi/scsi_eh.txt | 2 +- + Documentation/scsi/scsi_fc_transport.txt | 2 +- + Documentation/serial/moxa-smartio | 2 +- + Documentation/serial/n_gsm.txt | 2 +- + Documentation/sound/alsa/ALSA-Configuration.txt | 4 +- + Documentation/sound/oss/README.OSS | 2 +- + Documentation/spi/pxa2xx | 2 +- + Documentation/spi/spi-lm70llp | 2 +- + Documentation/telephony/ixj.txt | 2 +- + Documentation/trace/ring-buffer-design.txt | 2 +- + Documentation/video4linux/README.pvrusb2 | 2 +- + Documentation/video4linux/bttv/README | 2 +- + Documentation/video4linux/bttv/README.freeze | 2 +- + Documentation/video4linux/bttv/Sound-FAQ | 2 +- + Documentation/video4linux/pxa_camera.txt | 8 +- + Documentation/video4linux/v4l2-framework.txt | 2 +- + Documentation/vm/active_mm.txt | 2 +- + Documentation/vm/hugetlbpage.txt | 2 +- + Documentation/vm/overcommit-accounting | 2 +- + Documentation/w1/slaves/w1_ds2423 | 6 +- + Documentation/w1/w1.netlink | 2 +- + Documentation/watchdog/hpwdt.txt | 2 +- + arch/alpha/include/asm/elf.h | 2 +- + arch/alpha/kernel/core_lca.c | 4 +- + arch/alpha/kernel/err_marvel.c | 2 +- + arch/alpha/lib/ev67-strrchr.S | 2 +- + arch/alpha/lib/fls.c | 2 +- + arch/alpha/lib/strrchr.S | 2 +- + arch/alpha/oprofile/op_model_ev67.c | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig-nommu | 2 +- + arch/arm/common/pl330.c | 4 +- + arch/arm/include/asm/fpstate.h | 2 +- + arch/arm/include/asm/glue-cache.h | 2 +- + arch/arm/include/asm/glue.h | 4 +- + arch/arm/include/asm/hardware/pl080.h | 2 +- + arch/arm/include/asm/system.h | 2 +- + arch/arm/include/asm/ucontext.h | 2 +- + arch/arm/kernel/swp_emulate.c | 2 +- + arch/arm/mach-at91/board-carmeva.c | 2 +- + arch/arm/mach-at91/include/mach/at91_mci.h | 2 +- + arch/arm/mach-at91/include/mach/gpio.h | 2 +- + arch/arm/mach-bcmring/csp/dmac/dmacHw_extra.c | 6 +- + arch/arm/mach-bcmring/dma.c | 4 +- + arch/arm/mach-bcmring/include/csp/dmacHw.h | 6 +- + .../mach-bcmring/include/mach/csp/chipcHw_def.h | 2 +- + .../mach-bcmring/include/mach/csp/chipcHw_inline.h | 2 +- + .../arm/mach-bcmring/include/mach/csp/intcHw_reg.h | 4 +- + arch/arm/mach-bcmring/include/mach/reg_umi.h | 2 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/cpufreq.c | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/include/mach/cputype.h | 2 +- + arch/arm/mach-ep93xx/gpio.c | 2 +- + arch/arm/mach-exynos4/include/mach/gpio.h | 2 +- + arch/arm/mach-exynos4/mct.c | 2 +- + arch/arm/mach-exynos4/setup-sdhci-gpio.c | 4 +- + arch/arm/mach-exynos4/setup-sdhci.c | 2 +- + arch/arm/mach-iop13xx/pci.c | 4 +- + arch/arm/mach-kirkwood/tsx1x-common.c | 2 +- + arch/arm/mach-lpc32xx/pm.c | 2 +- + arch/arm/mach-mmp/time.c | 2 +- + arch/arm/mach-msm/acpuclock-arm11.c | 2 +- + arch/arm/mach-msm/scm.c | 2 +- + arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +- + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/devices.c | 2 +- + arch/arm/mach-omap1/include/mach/ams-delta-fiq.h | 2 +- + arch/arm/mach-omap2/board-igep0020.c | 2 +- + arch/arm/mach-omap2/board-igep0030.c | 2 +- + arch/arm/mach-omap2/clockdomain.c | 2 +- + arch/arm/mach-omap2/clockdomain.h | 2 +- + arch/arm/mach-omap2/cpuidle34xx.c | 4 +- + arch/arm/mach-omap2/devices.c | 6 +- + arch/arm/mach-omap2/dma.c | 2 +- + arch/arm/mach-omap2/gpio.c | 2 +- + arch/arm/mach-omap2/hsmmc.c | 2 +- + arch/arm/mach-omap2/mcbsp.c | 2 +- + arch/arm/mach-omap2/mux.c | 2 +- + arch/arm/mach-omap2/mux2430.h | 2 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +- + arch/arm/mach-omap2/omap_phy_internal.c | 4 +- + arch/arm/mach-omap2/omap_twl.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 2 +- + arch/arm/mach-omap2/powerdomain.h | 2 +- + arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +- + arch/arm/mach-omap2/smartreflex.c | 2 +- + arch/arm/mach-omap2/voltage.c | 4 +- + arch/arm/mach-orion5x/addr-map.c | 2 +- + arch/arm/mach-orion5x/net2big-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 2 +- + arch/arm/mach-orion5x/ts409-setup.c | 2 +- + arch/arm/mach-pxa/include/mach/pxa3xx-regs.h | 2 +- + arch/arm/mach-pxa/include/mach/zeus.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-s3c2410/include/mach/dma.h | 2 +- + arch/arm/mach-s3c2410/include/mach/regs-mem.h | 2 +- + arch/arm/mach-s3c2410/mach-n30.c | 2 +- + arch/arm/mach-s3c2440/mach-mini2440.c | 2 +- + arch/arm/mach-s3c64xx/dma.c | 2 +- + arch/arm/mach-s5pc100/include/mach/regs-fb.h | 2 +- + arch/arm/mach-s5pc100/setup-sdhci.c | 2 +- + arch/arm/mach-s5pv210/include/mach/gpio.h | 2 +- + arch/arm/mach-s5pv210/setup-sdhci-gpio.c | 4 +- + arch/arm/mach-s5pv210/setup-sdhci.c | 2 +- + arch/arm/mach-sa1100/Makefile | 2 +- + arch/arm/mach-sa1100/cpu-sa1100.c | 2 +- + arch/arm/mach-sa1100/include/mach/SA-1100.h | 2 +- + arch/arm/mach-sa1100/jornada720_ssp.c | 4 +- + arch/arm/mach-shmobile/board-ap4evb.c | 19 +- + arch/arm/mach-shmobile/board-mackerel.c | 10 +- + arch/arm/mach-shmobile/include/mach/mmc.h | 2 +- + arch/arm/mach-shmobile/include/mach/zboot.h | 2 +- + arch/arm/mach-tegra/dma.c | 4 +- + arch/arm/mach-tegra/include/mach/dma.h | 4 +- + arch/arm/mach-u300/clock.c | 6 +- + arch/arm/mach-ux500/board-mop500.c | 2 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 10 +- + arch/arm/mm/cache-v4wb.S | 2 +- + arch/arm/mm/cache-v4wt.S | 2 +- + arch/arm/mm/cache-v7.S | 2 +- + arch/arm/mm/proc-arm1020.S | 2 +- + arch/arm/mm/proc-arm1020e.S | 2 +- + arch/arm/mm/proc-arm1022.S | 2 +- + arch/arm/mm/proc-arm1026.S | 2 +- + arch/arm/mm/proc-arm720.S | 2 +- + arch/arm/mm/proc-arm920.S | 2 +- + arch/arm/mm/proc-arm922.S | 2 +- + arch/arm/mm/proc-arm925.S | 2 +- + arch/arm/mm/proc-macros.S | 2 +- + arch/arm/mm/proc-v6.S | 4 +- + arch/arm/mm/proc-v7.S | 2 +- + arch/arm/plat-mxc/cpufreq.c | 2 +- + arch/arm/plat-mxc/include/mach/entry-macro.S | 4 +- + arch/arm/plat-mxc/include/mach/mxc_nand.h | 2 +- + arch/arm/plat-omap/devices.c | 2 +- + arch/arm/plat-omap/dma.c | 4 +- + arch/arm/plat-omap/include/plat/gpio.h | 2 +- + arch/arm/plat-omap/include/plat/gpmc.h | 2 +- + arch/arm/plat-omap/mcbsp.c | 2 +- + arch/arm/plat-pxa/include/plat/mfp.h | 2 +- + arch/arm/plat-s3c24xx/Makefile | 2 +- + arch/arm/plat-s3c24xx/cpu-freq.c | 2 +- + arch/arm/plat-s3c24xx/dma.c | 2 +- + arch/arm/plat-s5p/irq-gpioint.c | 2 +- + arch/arm/plat-samsung/include/plat/clock.h | 2 +- + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 2 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 6 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 2 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 4 +- + arch/arm/plat-samsung/s3c-pl330.c | 2 +- + arch/arm/plat-spear/include/plat/clock.h | 2 +- + arch/blackfin/Kconfig.debug | 2 +- + arch/blackfin/include/asm/traps.h | 2 +- + arch/blackfin/kernel/kgdb.c | 2 +- + arch/blackfin/kernel/traps.c | 2 +- + arch/blackfin/lib/ins.S | 2 +- + arch/blackfin/lib/memmove.S | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/blackfin/mach-common/entry.S | 4 +- + arch/blackfin/mach-common/head.S | 2 +- + arch/cris/arch-v10/README.mm | 2 +- + arch/cris/arch-v10/drivers/sync_serial.c | 2 +- + arch/cris/arch-v32/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/sync_serial.c | 2 +- + arch/cris/arch-v32/kernel/entry.S | 2 +- + arch/cris/arch-v32/kernel/irq.c | 2 +- + arch/cris/arch-v32/kernel/kgdb.c | 2 +- + arch/cris/arch-v32/kernel/process.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/arch-v32/mach-a3/arbiter.c | 4 +- + arch/cris/arch-v32/mach-fs/arbiter.c | 2 +- + arch/cris/boot/rescue/head_v10.S | 2 +- + arch/cris/include/arch-v32/arch/hwregs/Makefile | 2 +- + .../cris/include/arch-v32/arch/hwregs/iop/Makefile | 2 +- + arch/cris/include/asm/pgtable.h | 2 +- + arch/cris/kernel/traps.c | 2 +- + arch/frv/include/asm/pci.h | 2 +- + arch/frv/include/asm/spr-regs.h | 2 +- + arch/frv/include/asm/virtconvert.h | 2 +- + arch/frv/kernel/entry-table.S | 4 +- + arch/ia64/Kconfig | 4 +- + arch/ia64/include/asm/pal.h | 2 +- + arch/ia64/include/asm/perfmon_default_smpl.h | 4 +- + arch/ia64/include/asm/sn/bte.h | 2 +- + arch/ia64/include/asm/sn/shub_mmr.h | 2 +- + arch/ia64/include/asm/sn/shubio.h | 4 +- + arch/ia64/kernel/cyclone.c | 2 +- + arch/ia64/kernel/perfmon_default_smpl.c | 2 +- + arch/ia64/kernel/smpboot.c | 2 +- + arch/ia64/kernel/topology.c | 2 +- + arch/ia64/kvm/process.c | 2 +- + arch/ia64/lib/do_csum.S | 2 +- + arch/ia64/sn/kernel/irq.c | 4 +- + arch/ia64/sn/pci/pcibr/pcibr_dma.c | 2 +- + arch/m32r/include/asm/m32104ut/m32104ut_pld.h | 2 +- + arch/m32r/include/asm/m32700ut/m32700ut_pld.h | 2 +- + arch/m32r/include/asm/opsput/opsput_pld.h | 2 +- + arch/m32r/include/asm/pgtable-2level.h | 2 +- + arch/m32r/mm/fault.c | 4 +- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/fpsp040/bindec.S | 2 +- + arch/m68k/ifpsp060/src/fpsp.S | 10 +- + arch/m68k/ifpsp060/src/pfpsp.S | 8 +- + arch/m68k/include/asm/atariints.h | 2 +- + arch/m68k/include/asm/bootstd.h | 2 +- + arch/m68k/include/asm/commproc.h | 4 +- + arch/m68k/include/asm/delay_no.h | 2 +- + arch/m68k/include/asm/gpio.h | 2 +- + arch/m68k/include/asm/m520xsim.h | 2 +- + arch/m68k/include/asm/m523xsim.h | 2 +- + arch/m68k/include/asm/m527xsim.h | 2 +- + arch/m68k/include/asm/m5307sim.h | 2 +- + arch/m68k/include/asm/m5407sim.h | 2 +- + arch/m68k/include/asm/m68360_quicc.h | 2 +- + arch/m68k/include/asm/mac_oss.h | 2 +- + arch/m68k/include/asm/mac_via.h | 2 +- + arch/m68k/include/asm/macintosh.h | 2 +- + arch/m68k/include/asm/mcftimer.h | 2 +- + arch/m68k/kernel/head.S | 12 +- + arch/m68k/kernel/vmlinux.lds_no.S | 2 +- + arch/m68k/platform/523x/config.c | 2 +- + arch/m68k/platform/5272/intc.c | 2 +- + arch/m68k/platform/527x/config.c | 2 +- + arch/m68k/platform/528x/config.c | 2 +- + arch/m68k/platform/coldfire/cache.c | 2 +- + arch/m68k/platform/coldfire/entry.S | 2 +- + arch/m68k/platform/coldfire/head.S | 2 +- + arch/m68k/platform/coldfire/intc.c | 2 +- + arch/m68k/platform/coldfire/sltimers.c | 2 +- + arch/m68k/q40/README | 2 +- + arch/microblaze/Makefile | 2 +- + arch/microblaze/include/asm/io.h | 2 +- + arch/microblaze/include/asm/pci-bridge.h | 2 +- + arch/microblaze/include/asm/pci.h | 2 +- + arch/microblaze/kernel/cpu/cache.c | 2 +- + arch/microblaze/lib/memcpy.c | 8 +- + arch/microblaze/lib/memmove.c | 6 +- + arch/microblaze/lib/memset.c | 2 +- + arch/microblaze/pci/indirect_pci.c | 2 +- + arch/microblaze/platform/generic/Kconfig.auto | 2 +- + arch/mips/Kconfig | 2 +- + arch/mips/Makefile | 4 +- + arch/mips/alchemy/common/clocks.c | 2 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 2 +- + arch/mips/cavium-octeon/setup.c | 2 +- + arch/mips/fw/arc/promlib.c | 2 +- + arch/mips/include/asm/dec/prom.h | 2 +- + arch/mips/include/asm/floppy.h | 2 +- + arch/mips/include/asm/hw_irq.h | 2 +- + arch/mips/include/asm/io.h | 2 +- + arch/mips/include/asm/irqflags.h | 2 +- + arch/mips/include/asm/mach-bcm63xx/bcm963xx_tag.h | 2 +- + arch/mips/include/asm/mach-ip32/mc146818rtc.h | 2 +- + .../mips/include/asm/mach-loongson/cs5536/cs5536.h | 2 +- + arch/mips/include/asm/mach-pb1x00/pb1000.h | 2 +- + arch/mips/include/asm/mach-pb1x00/pb1200.h | 2 +- + arch/mips/include/asm/mach-pb1x00/pb1550.h | 2 +- + arch/mips/include/asm/mach-powertv/dma-coherence.h | 2 +- + arch/mips/include/asm/mipsregs.h | 4 +- + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 +- + arch/mips/include/asm/octeon/cvmx-bootmem.h | 2 +- + arch/mips/include/asm/octeon/cvmx-l2c.h | 2 +- + arch/mips/include/asm/octeon/cvmx.h | 2 +- + arch/mips/include/asm/paccess.h | 2 +- + arch/mips/include/asm/pci/bridge.h | 2 +- + .../include/asm/pmc-sierra/msp71xx/msp_regops.h | 2 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/include/asm/sgi/ioc.h | 2 +- + arch/mips/include/asm/sibyte/sb1250_mac.h | 4 +- + arch/mips/include/asm/siginfo.h | 2 +- + arch/mips/include/asm/sn/klconfig.h | 4 +- + arch/mips/include/asm/sn/sn0/hubio.h | 2 +- + arch/mips/include/asm/stackframe.h | 2 +- + arch/mips/include/asm/war.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 4 +- + arch/mips/kernel/cpu-bugs64.c | 2 +- + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/mips/kernel/process.c | 2 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/time.c | 2 +- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/lib/strnlen_user.S | 2 +- + arch/mips/math-emu/dp_fsp.c | 2 +- + arch/mips/math-emu/dp_mul.c | 2 +- + arch/mips/math-emu/dsemul.c | 2 +- + arch/mips/math-emu/sp_mul.c | 2 +- + arch/mips/mm/cex-sb1.S | 2 +- + arch/mips/mm/tlbex.c | 2 +- + arch/mips/mti-malta/malta-smtc.c | 2 +- + arch/mips/pci/ops-pmcmsp.c | 4 +- + arch/mips/pci/pci-bcm1480.c | 2 +- + arch/mips/pci/pci-octeon.c | 4 +- + arch/mips/pci/pci.c | 2 +- + arch/mips/pmc-sierra/msp71xx/msp_setup.c | 2 +- + arch/mips/pnx833x/common/platform.c | 2 +- + arch/mips/sgi-ip27/Kconfig | 2 +- + arch/mips/sgi-ip27/TODO | 2 +- + arch/mips/sgi-ip27/ip27-init.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 2 +- + arch/mn10300/include/asm/cpu-regs.h | 2 +- + arch/parisc/include/asm/eisa_eeprom.h | 2 +- + arch/parisc/kernel/entry.S | 10 +- + arch/parisc/kernel/head.S | 2 +- + arch/parisc/kernel/inventory.c | 2 +- + arch/parisc/kernel/signal.c | 2 +- + arch/parisc/kernel/syscall.S | 2 +- + arch/parisc/kernel/syscall_table.S | 2 +- + arch/parisc/math-emu/dfadd.c | 2 +- + arch/parisc/math-emu/dfsub.c | 2 +- + arch/parisc/math-emu/fmpyfadd.c | 8 +- + arch/parisc/math-emu/sfadd.c | 2 +- + arch/parisc/math-emu/sfsub.c | 2 +- + arch/powerpc/include/asm/bitops.h | 4 +- + arch/powerpc/include/asm/compat.h | 2 +- + arch/powerpc/include/asm/cpm.h | 2 +- + arch/powerpc/include/asm/cpm1.h | 2 +- + arch/powerpc/include/asm/hvcall.h | 2 +- + arch/powerpc/include/asm/kprobes.h | 2 +- + arch/powerpc/include/asm/lppaca.h | 2 +- + arch/powerpc/include/asm/page_64.h | 2 +- + arch/powerpc/include/asm/pasemi_dma.h | 2 +- + arch/powerpc/include/asm/pci-bridge.h | 2 +- + arch/powerpc/include/asm/pmac_feature.h | 4 +- + arch/powerpc/include/asm/pte-common.h | 4 +- + arch/powerpc/include/asm/reg_booke.h | 2 +- + arch/powerpc/include/asm/spu_priv1.h | 2 +- + arch/powerpc/include/asm/uninorth.h | 2 +- + arch/powerpc/include/asm/vdso_datapage.h | 2 +- + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/exceptions-64e.S | 2 +- + arch/powerpc/kernel/exceptions-64s.S | 2 +- + arch/powerpc/kernel/head_40x.S | 2 +- + arch/powerpc/kernel/head_44x.S | 2 +- + arch/powerpc/kernel/head_64.S | 2 +- + arch/powerpc/kernel/head_fsl_booke.S | 2 +- + arch/powerpc/kernel/l2cr_6xx.S | 2 +- + arch/powerpc/kernel/lparcfg.c | 2 +- + arch/powerpc/kernel/perf_event.c | 2 +- + arch/powerpc/kernel/ppc_save_regs.S | 2 +- + arch/powerpc/kernel/prom.c | 4 +- + arch/powerpc/kernel/ptrace.c | 2 +- + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/swsusp_32.S | 2 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kernel/udbg_16550.c | 2 +- + arch/powerpc/kernel/vdso32/sigtramp.S | 2 +- + arch/powerpc/kernel/vdso64/sigtramp.S | 2 +- + arch/powerpc/mm/hash_low_64.S | 24 +- + arch/powerpc/mm/hash_utils_64.c | 2 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/numa.c | 10 +- + arch/powerpc/mm/tlb_low_64e.S | 4 +- + arch/powerpc/oprofile/op_model_cell.c | 6 +- + arch/powerpc/oprofile/op_model_power4.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 6 +- + arch/powerpc/platforms/52xx/mpc52xx_pic.c | 2 +- + arch/powerpc/platforms/cell/spufs/lscsa_alloc.c | 2 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/cell/spufs/spu_restore.c | 2 +- + arch/powerpc/platforms/iseries/mf.c | 2 +- + arch/powerpc/platforms/iseries/viopath.c | 8 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/powerpc/platforms/powermac/Makefile | 2 +- + arch/powerpc/platforms/powermac/low_i2c.c | 2 +- + arch/powerpc/platforms/powermac/pci.c | 2 +- + arch/powerpc/platforms/pseries/dlpar.c | 2 +- + arch/powerpc/platforms/pseries/eeh.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/iommu.c | 6 +- + arch/powerpc/platforms/pseries/xics.c | 2 +- + arch/powerpc/sysdev/axonram.c | 2 +- + arch/powerpc/sysdev/bestcomm/bestcomm.h | 2 +- + arch/powerpc/sysdev/bestcomm/bestcomm_priv.h | 2 +- + arch/powerpc/sysdev/cpm1.c | 2 +- + arch/powerpc/sysdev/indirect_pci.c | 2 +- + arch/powerpc/sysdev/ppc4xx_pci.h | 2 +- + arch/s390/include/asm/atomic.h | 2 +- + arch/s390/include/asm/cio.h | 2 +- + arch/s390/kernel/reipl64.S | 2 +- + arch/s390/kernel/setup.c | 2 +- + arch/s390/kernel/time.c | 6 +- + arch/s390/kernel/vtime.c | 2 +- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/mm/fault.c | 2 +- + arch/score/Makefile | 2 +- + arch/sh/Kconfig | 1 + + arch/sh/Kconfig.debug | 2 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/mach-ap325rxa/setup.c | 32 +- + arch/sh/boards/mach-dreamcast/irq.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 20 +- + arch/sh/boards/mach-landisk/setup.c | 5 +- + arch/sh/drivers/pci/pci-sh7751.h | 2 +- + arch/sh/drivers/pci/pci.c | 2 +- + arch/sh/include/asm/page.h | 2 +- + arch/sh/include/asm/pgtable_32.h | 2 +- + arch/sh/include/asm/unaligned-sh4a.h | 2 +- + arch/sh/include/mach-common/mach/highlander.h | 4 +- + arch/sh/include/mach-common/mach/r2d.h | 6 +- + arch/sh/kernel/cpu/clock-cpg.c | 2 +- + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 2 +- + arch/sh/kernel/irq.c | 2 +- + arch/sh/kernel/setup.c | 2 +- + arch/sh/lib64/copy_user_memcpy.S | 2 +- + arch/sh/lib64/memcpy.S | 2 +- + arch/sparc/include/asm/hypervisor.h | 20 +- + arch/sparc/include/asm/ns87303.h | 2 +- + arch/sparc/include/asm/pcr.h | 2 +- + arch/sparc/include/asm/ptrace.h | 2 +- + arch/sparc/kernel/entry.S | 4 +- + arch/sparc/kernel/head_64.S | 2 +- + arch/sparc/kernel/init_task.c | 2 +- + arch/sparc/kernel/of_device_64.c | 2 +- + arch/sparc/kernel/perf_event.c | 2 +- + arch/sparc/math-emu/Makefile | 2 +- + arch/tile/Kconfig | 2 +- + arch/tile/include/hv/drv_xgbe_intf.h | 2 +- + arch/tile/include/hv/hypervisor.h | 4 +- + arch/tile/kernel/pci.c | 4 +- + arch/tile/mm/fault.c | 2 +- + arch/tile/mm/hugetlbpage.c | 2 +- + arch/um/Kconfig.net | 2 +- + arch/unicore32/include/mach/regs-umal.h | 4 +- + arch/unicore32/kernel/head.S | 2 +- + arch/x86/include/asm/i387.h | 2 +- + arch/x86/kernel/setup.c | 5 + + arch/x86/kvm/x86.c | 37 +- + arch/x86/mm/srat_32.c | 4 +- + arch/x86/platform/mrst/vrtc.c | 4 +- + arch/x86/platform/visws/visws_quirks.c | 20 +- + arch/xtensa/include/asm/dma.h | 2 +- + arch/xtensa/kernel/entry.S | 2 +- + block/blk-cgroup.c | 4 +- + block/blk-core.c | 2 +- + block/blk-throttle.c | 2 +- + block/blk.h | 2 +- + block/cfq-iosched.c | 2 +- + block/genhd.c | 2 +- + crypto/ansi_cprng.c | 2 +- + crypto/async_tx/async_xor.c | 2 +- + crypto/gf128mul.c | 2 +- + crypto/vmac.c | 2 +- + crypto/xts.c | 2 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/acpi/processor_throttling.c | 2 +- + drivers/acpi/video.c | 4 +- + drivers/amba/bus.c | 2 +- + drivers/ata/ahci.c | 2 +- + drivers/ata/ahci.h | 4 +- + drivers/ata/ata_piix.c | 10 +- + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-eh.c | 10 +- + drivers/ata/libata-scsi.c | 2 +- + drivers/ata/libata-sff.c | 4 +- + drivers/ata/pata_amd.c | 2 +- + drivers/ata/pata_arasan_cf.c | 8 +- + drivers/ata/pata_bf54x.c | 2 +- + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/pata_mpiix.c | 2 +- + drivers/ata/pata_rz1000.c | 2 +- + drivers/ata/pata_sil680.c | 4 +- + drivers/ata/pata_sis.c | 4 +- + drivers/ata/pata_triflex.c | 2 +- + drivers/ata/sata_fsl.c | 4 +- + drivers/ata/sata_mv.c | 4 +- + drivers/ata/sata_nv.c | 2 +- + drivers/ata/sata_via.c | 2 +- + drivers/atm/ambassador.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.h | 4 +- + drivers/atm/horizon.c | 10 +- + drivers/atm/idt77252.c | 2 +- + drivers/atm/idt77252.h | 2 +- + drivers/atm/iphase.c | 6 +- + drivers/atm/lanai.c | 4 +- + drivers/auxdisplay/cfag12864b.c | 4 +- + drivers/base/power/runtime.c | 2 +- + drivers/base/sys.c | 14 +- + drivers/block/DAC960.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_int.h | 10 +- + drivers/block/drbd/drbd_main.c | 4 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/drbd/drbd_vli.h | 2 +- + drivers/block/hd.c | 2 +- + drivers/block/viodasd.c | 2 +- + drivers/block/xsysace.c | 8 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/cdrom/cdrom.c | 4 +- + drivers/char/agp/agp.h | 2 +- + drivers/char/agp/amd-k7-agp.c | 2 +- + drivers/char/agp/sworks-agp.c | 2 +- + drivers/char/agp/via-agp.c | 2 +- + drivers/char/ipmi/ipmi_poweroff.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 4 +- + drivers/char/mbcs.h | 4 +- + drivers/char/mwave/3780i.h | 2 +- + drivers/char/nwbutton.c | 2 +- + drivers/char/pcmcia/cm4000_cs.c | 2 +- + drivers/char/pcmcia/synclink_cs.c | 4 +- + drivers/char/random.c | 2 +- + drivers/char/sonypi.c | 4 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/crypto/amcc/crypto4xx_sa.c | 2 +- + drivers/crypto/amcc/crypto4xx_sa.h | 2 +- + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/dma/at_hdmac.c | 2 +- + drivers/dma/coh901318.c | 2 +- + drivers/dma/intel_mid_dma.c | 8 +- + drivers/dma/intel_mid_dma_regs.h | 4 +- + drivers/dma/mpc512x_dma.c | 2 +- + drivers/dma/shdma.c | 7 +- + drivers/dma/ste_dma40.c | 4 +- + drivers/edac/Kconfig | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/edac_core.h | 8 +- + drivers/edac/edac_device.c | 4 +- + drivers/edac/edac_device_sysfs.c | 4 +- + drivers/edac/edac_mc.c | 2 +- + drivers/edac/edac_mc_sysfs.c | 2 +- + drivers/edac/edac_pci_sysfs.c | 4 +- + drivers/edac/i5000_edac.c | 2 +- + drivers/edac/i5100_edac.c | 2 +- + drivers/edac/i5400_edac.c | 4 +- + drivers/edac/i7300_edac.c | 2 +- + drivers/edac/i7core_edac.c | 2 +- + drivers/edac/i82443bxgx_edac.c | 4 +- + drivers/edac/mce_amd_inj.c | 2 +- + drivers/edac/r82600_edac.c | 6 +- + drivers/firewire/net.c | 2 +- + drivers/gpio/mc33880.c | 2 +- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/i915/intel_dp.c | 2 +- + drivers/gpu/drm/i915/intel_sdvo_regs.h | 2 +- + drivers/gpu/drm/mga/mga_dma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_channel.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_state.c | 2 +- + drivers/gpu/drm/nouveau/nv04_crtc.c | 4 +- + drivers/gpu/drm/nouveau/nv40_graph.c | 2 +- + drivers/gpu/drm/radeon/atombios.h | 34 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r300_reg.h | 4 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_cp.c | 2 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.h | 2 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_state.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + drivers/gpu/vga/vgaarb.c | 4 +- + drivers/hid/Kconfig | 13 +- + drivers/hid/hid-core.c | 6 +- + drivers/hid/hid-debug.c | 2 +- + drivers/hid/hid-ids.h | 4 + + drivers/hid/hid-lgff.c | 2 + + drivers/hid/hid-magicmouse.c | 4 +- + drivers/hid/hid-ortek.c | 16 +- + drivers/hid/hid-picolcd.c | 4 +- + drivers/hid/hid-roccat-kone.h | 2 +- + drivers/hid/hid-roccat-pyra.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hwmon/abituguru.c | 2 +- + drivers/hwmon/abituguru3.c | 2 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm90.c | 2 +- + drivers/hwmon/sht15.c | 6 +- + drivers/hwmon/tmp102.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/i2c/algos/i2c-algo-pca.c | 2 +- + drivers/i2c/busses/i2c-ali1535.c | 2 +- + drivers/i2c/busses/i2c-ali15x3.c | 2 +- + drivers/i2c/busses/i2c-davinci.c | 2 +- + drivers/i2c/busses/i2c-designware.c | 2 +- + drivers/i2c/busses/i2c-elektor.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 2 +- + drivers/i2c/busses/i2c-ibm_iic.c | 4 +- + drivers/i2c/busses/i2c-intel-mid.c | 14 +- + drivers/i2c/busses/i2c-isch.c | 2 +- + drivers/i2c/busses/i2c-mxs.c | 2 +- + drivers/i2c/busses/i2c-nomadik.c | 8 +- + drivers/i2c/busses/i2c-s6000.c | 2 +- + drivers/i2c/busses/i2c-stu300.c | 4 +- + drivers/i2c/busses/i2c-tegra.c | 2 +- + drivers/i2c/busses/i2c-xiic.c | 2 +- + drivers/i2c/i2c-core.c | 2 +- + drivers/ide/cy82c693.c | 2 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/ide/ide-taskfile.c | 2 +- + drivers/ide/piix.c | 4 +- + drivers/ide/sis5513.c | 4 +- + drivers/ide/triflex.c | 2 +- + drivers/ide/via82cxxx.c | 2 +- + drivers/infiniband/hw/amso1100/c2_ae.c | 2 +- + drivers/infiniband/hw/amso1100/c2_qp.c | 2 +- + drivers/infiniband/hw/amso1100/c2_wr.h | 4 +- + drivers/infiniband/hw/ipath/ipath_driver.c | 2 +- + drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- + drivers/infiniband/hw/ipath/ipath_init_chip.c | 2 +- + drivers/infiniband/hw/ipath/ipath_ud.c | 4 +- + drivers/infiniband/hw/ipath/ipath_user_sdma.c | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 2 +- + drivers/infiniband/hw/nes/nes_hw.c | 4 +- + drivers/infiniband/hw/nes/nes_nic.c | 2 +- + drivers/infiniband/hw/qib/qib.h | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 4 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 4 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 6 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 8 +- + drivers/infiniband/hw/qib/qib_init.c | 2 +- + drivers/infiniband/hw/qib/qib_mad.h | 2 +- + drivers/infiniband/hw/qib/qib_twsi.c | 2 +- + drivers/infiniband/hw/qib/qib_ud.c | 4 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- + drivers/input/joydev.c | 4 +- + drivers/input/joystick/a3d.c | 4 +- + drivers/input/keyboard/davinci_keyscan.c | 2 +- + drivers/input/misc/adxl34x.c | 2 +- + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/wistron_btns.c | 2 +- + drivers/input/mouse/bcm5974.c | 2 +- + drivers/input/mouse/synaptics_i2c.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 2 +- + drivers/input/serio/hp_sdc.c | 2 +- + drivers/input/serio/xilinx_ps2.c | 2 +- + drivers/input/touchscreen/intel-mid-touch.c | 2 +- + drivers/input/touchscreen/ucb1400_ts.c | 2 +- + drivers/input/touchscreen/wm9705.c | 2 +- + drivers/input/touchscreen/wm9712.c | 2 +- + drivers/input/touchscreen/wm9713.c | 2 +- + drivers/input/touchscreen/wm97xx-core.c | 4 +- + drivers/isdn/hardware/eicon/divacapi.h | 2 +- + drivers/isdn/hardware/eicon/io.h | 2 +- + drivers/isdn/hardware/eicon/message.c | 4 +- + drivers/isdn/hardware/eicon/pc.h | 2 +- + drivers/isdn/hardware/eicon/um_idi.c | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 4 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/hisax/hfc_pci.c | 2 +- + drivers/isdn/hisax/hfc_sx.c | 2 +- + drivers/isdn/hisax/hfc_usb.h | 2 +- + drivers/isdn/hisax/l3dss1.c | 4 +- + drivers/isdn/hisax/l3ni1.c | 4 +- + drivers/isdn/hisax/nj_s.c | 2 +- + drivers/isdn/hisax/st5481_b.c | 2 +- + drivers/isdn/hisax/st5481_usb.c | 2 +- + drivers/isdn/hisax/teles_cs.c | 2 +- + drivers/isdn/hysdn/hysdn_sched.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 4 +- + drivers/isdn/i4l/isdn_ppp.c | 4 +- + drivers/isdn/i4l/isdn_tty.c | 2 +- + drivers/isdn/isdnloop/isdnloop.c | 2 +- + drivers/isdn/mISDN/dsp.h | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 4 +- + drivers/isdn/mISDN/dsp_core.c | 8 +- + drivers/isdn/mISDN/dsp_dtmf.c | 4 +- + drivers/isdn/mISDN/dsp_tones.c | 2 +- + drivers/isdn/mISDN/l1oip_core.c | 6 +- + drivers/isdn/mISDN/layer2.c | 4 +- + drivers/leds/leds-pca9532.c | 2 +- + drivers/leds/leds-wm8350.c | 4 +- + drivers/lguest/lguest_user.c | 2 +- + drivers/macintosh/adbhid.c | 2 +- + drivers/macintosh/macio-adb.c | 2 +- + drivers/macintosh/therm_adt746x.c | 2 +- + drivers/macintosh/therm_pm72.c | 6 +- + drivers/macintosh/therm_windtunnel.c | 2 +- + drivers/md/bitmap.h | 2 +- + drivers/md/dm-region-hash.c | 2 +- + drivers/md/faulty.c | 2 +- + drivers/md/md.c | 2 +- + drivers/md/md.h | 2 +- + drivers/md/raid10.c | 6 +- + drivers/md/raid10.h | 4 +- + drivers/media/common/saa7146_i2c.c | 8 +- + drivers/media/common/tuners/mxl5005s.c | 2 +- + drivers/media/common/tuners/tda18271.h | 2 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 2 +- + drivers/media/dvb/bt8xx/dvb-bt8xx.c | 4 +- + drivers/media/dvb/dvb-core/dvb_frontend.c | 4 +- + drivers/media/dvb/dvb-usb/af9005-fe.c | 8 +- + drivers/media/dvb/dvb-usb/friio.h | 2 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 12 +- + drivers/media/dvb/frontends/atbm8830.h | 2 +- + drivers/media/dvb/frontends/au8522_dig.c | 6 +- + drivers/media/dvb/frontends/bcm3510.c | 6 +- + drivers/media/dvb/frontends/cx22700.c | 2 +- + drivers/media/dvb/frontends/cx22702.c | 6 +- + drivers/media/dvb/frontends/cx24110.c | 2 +- + drivers/media/dvb/frontends/cx24113.h | 2 +- + drivers/media/dvb/frontends/cx24123.c | 2 +- + drivers/media/dvb/frontends/drx397xD.c | 2 +- + drivers/media/dvb/frontends/mb86a16.c | 2 +- + drivers/media/dvb/frontends/mb86a20s.c | 2 +- + drivers/media/dvb/frontends/mt312.c | 2 +- + drivers/media/dvb/frontends/s5h1420.c | 2 +- + drivers/media/dvb/frontends/stb6100.c | 2 +- + drivers/media/dvb/frontends/stv0297.c | 2 +- + drivers/media/dvb/frontends/stv0367.c | 2 +- + drivers/media/dvb/frontends/stv0900_priv.h | 2 +- + drivers/media/dvb/frontends/stv090x.c | 12 +- + drivers/media/dvb/mantis/mantis_uart.c | 2 +- + drivers/media/dvb/ngene/ngene-core.c | 4 +- + drivers/media/dvb/pluto2/pluto2.c | 10 +- + drivers/media/dvb/siano/smsdvb.c | 2 +- + drivers/media/dvb/ttpci/av7110.c | 2 +- + drivers/media/dvb/ttpci/budget-patch.c | 2 +- + drivers/media/dvb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/radio/radio-mr800.c | 2 +- + drivers/media/radio/si4713-i2c.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 6 +- + drivers/media/radio/wl128x/fmdrv_common.h | 2 +- + drivers/media/rc/ene_ir.c | 4 +- + drivers/media/rc/imon.c | 2 +- + drivers/media/rc/ir-raw.c | 2 +- + drivers/media/rc/keymaps/rc-lme2510.c | 4 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 2 +- + drivers/media/rc/keymaps/rc-norwood.c | 2 +- + drivers/media/rc/rc-main.c | 4 +- + drivers/media/video/au0828/au0828-video.c | 2 +- + drivers/media/video/bt8xx/bttv-cards.c | 6 +- + drivers/media/video/bt8xx/bttv-gpio.c | 2 +- + drivers/media/video/cafe_ccic.c | 2 +- + drivers/media/video/cx18/cx18-av-core.h | 2 +- + drivers/media/video/cx18/cx18-ioctl.c | 2 +- + drivers/media/video/cx18/cx18-vbi.c | 2 +- + drivers/media/video/cx231xx/cx231xx-avcore.c | 2 +- + drivers/media/video/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/video/cx231xx/cx231xx-video.c | 2 +- + drivers/media/video/cx23885/cimax2.c | 2 +- + drivers/media/video/cx23885/cx23885.h | 2 +- + drivers/media/video/cx25840/cx25840-core.c | 10 +- + drivers/media/video/davinci/dm644x_ccdc.c | 4 +- + drivers/media/video/davinci/vpfe_capture.c | 2 +- + drivers/media/video/em28xx/em28xx-video.c | 4 +- + drivers/media/video/gspca/gl860/gl860-mi1320.c | 2 +- + drivers/media/video/gspca/gspca.c | 4 +- + drivers/media/video/gspca/mars.c | 2 +- + drivers/media/video/gspca/mr97310a.c | 2 +- + drivers/media/video/gspca/ov519.c | 4 +- + drivers/media/video/gspca/sonixb.c | 2 +- + drivers/media/video/gspca/spca500.c | 4 +- + drivers/media/video/gspca/spca508.c | 2 +- + drivers/media/video/gspca/sq905.c | 2 +- + drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c | 2 +- + drivers/media/video/hexium_gemini.c | 2 +- + drivers/media/video/ivtv/ivtv-firmware.c | 4 +- + drivers/media/video/ivtv/ivtvfb.c | 2 +- + drivers/media/video/msp3400-driver.c | 4 +- + drivers/media/video/msp3400-kthreads.c | 2 +- + drivers/media/video/omap/omap_vout.c | 4 +- + drivers/media/video/omap/omap_voutlib.c | 6 +- + drivers/media/video/omap1_camera.c | 4 +- + drivers/media/video/omap3isp/isp.c | 8 +- + drivers/media/video/omap3isp/ispccdc.h | 4 +- + drivers/media/video/omap3isp/ispccp2.c | 2 +- + drivers/media/video/omap3isp/ispcsi2.c | 2 +- + drivers/media/video/omap3isp/isppreview.c | 20 +- + drivers/media/video/omap3isp/isppreview.h | 2 +- + drivers/media/video/omap3isp/ispqueue.h | 4 +- + drivers/media/video/omap3isp/ispresizer.c | 4 +- + drivers/media/video/omap3isp/ispvideo.c | 6 +- + drivers/media/video/ov6650.c | 2 +- + drivers/media/video/ov9640.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-eeprom.c | 2 +- + drivers/media/video/pvrusb2/pvrusb2-hdw.h | 2 +- + drivers/media/video/pxa_camera.c | 2 +- + drivers/media/video/s5p-fimc/fimc-reg.c | 2 +- + drivers/media/video/saa7134/saa7134-cards.c | 4 +- + drivers/media/video/saa7164/saa7164-cmd.c | 2 +- + drivers/media/video/saa7164/saa7164-fw.c | 2 +- + drivers/media/video/saa7164/saa7164-types.h | 2 +- + drivers/media/video/sn9c102/sn9c102_core.c | 2 +- + drivers/media/video/sn9c102/sn9c102_sensor.h | 2 +- + drivers/media/video/tcm825x.c | 4 +- + drivers/media/video/tvaudio.c | 10 +- + drivers/media/video/uvc/uvc_video.c | 8 +- + drivers/media/video/v4l2-ioctl.c | 2 +- + drivers/media/video/vpx3220.c | 2 +- + drivers/media/video/zoran/videocodec.h | 2 +- + drivers/media/video/zoran/zoran.h | 2 +- + drivers/media/video/zoran/zoran_driver.c | 2 +- + drivers/memstick/core/mspro_block.c | 2 +- + drivers/memstick/host/r592.c | 2 +- + drivers/memstick/host/r592.h | 6 +- + drivers/message/fusion/lsi/mpi_log_fc.h | 4 +- + drivers/message/fusion/lsi/mpi_log_sas.h | 14 +- + drivers/message/fusion/mptbase.c | 6 +- + drivers/message/fusion/mptctl.c | 4 +- + drivers/message/fusion/mptsas.c | 8 +- + drivers/message/i2o/README | 2 +- + drivers/message/i2o/device.c | 8 +- + drivers/message/i2o/i2o_block.c | 4 +- + drivers/message/i2o/i2o_block.h | 2 +- + drivers/message/i2o/i2o_scsi.c | 2 +- + drivers/mfd/Kconfig | 2 +- + drivers/mfd/ab8500-gpadc.c | 2 +- + drivers/mfd/ezx-pcap.c | 4 +- + drivers/mfd/omap-usb-host.c | 2 +- + drivers/mfd/pcf50633-core.c | 4 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/ucb1400_core.c | 2 +- + drivers/misc/bmp085.c | 4 +- + drivers/misc/c2port/c2port-duramar2150.c | 2 +- + drivers/misc/ibmasm/remote.h | 2 +- + drivers/misc/iwmc3200top/main.c | 2 +- + drivers/misc/kgdbts.c | 2 +- + drivers/misc/sgi-gru/grukservices.c | 2 +- + drivers/misc/sgi-gru/grutables.h | 2 +- + drivers/misc/ti-st/st_kim.c | 2 +- + drivers/mmc/card/mmc_test.c | 2 +- + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_ops.c | 2 +- + drivers/mmc/core/sdio_irq.c | 2 +- + drivers/mmc/host/atmel-mci.c | 4 +- + drivers/mmc/host/mmc_spi.c | 2 +- + drivers/mmc/host/s3cmci.c | 6 +- + drivers/mmc/host/tmio_mmc_pio.c | 2 +- + drivers/mmc/host/wbsd.c | 6 +- + drivers/mtd/chips/Kconfig | 2 +- + drivers/mtd/chips/cfi_cmdset_0001.c | 4 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 10 +- + drivers/mtd/chips/cfi_util.c | 2 +- + drivers/mtd/chips/jedec_probe.c | 2 +- + drivers/mtd/devices/block2mtd.c | 2 +- + drivers/mtd/devices/doc2001plus.c | 2 +- + drivers/mtd/devices/docecc.c | 4 +- + drivers/mtd/devices/lart.c | 4 +- + drivers/mtd/devices/pmc551.c | 4 +- + drivers/mtd/lpddr/lpddr_cmds.c | 4 +- + drivers/mtd/maps/ceiva.c | 4 +- + drivers/mtd/maps/cfi_flagadm.c | 2 +- + drivers/mtd/maps/pcmciamtd.c | 2 +- + drivers/mtd/maps/pmcmsp-flash.c | 2 +- + drivers/mtd/maps/sc520cdp.c | 2 +- + drivers/mtd/maps/tqm8xxl.c | 2 +- + drivers/mtd/mtdblock.c | 2 +- + drivers/mtd/mtdchar.c | 2 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/ams-delta.c | 2 +- + drivers/mtd/nand/autcpu12.c | 2 +- + drivers/mtd/nand/cs553x_nand.c | 2 +- + drivers/mtd/nand/denali.c | 6 +- + drivers/mtd/nand/diskonchip.c | 8 +- + drivers/mtd/nand/fsl_elbc_nand.c | 2 +- + drivers/mtd/nand/fsmc_nand.c | 10 +- + drivers/mtd/nand/nand_base.c | 2 +- + drivers/mtd/nand/nand_bbt.c | 2 +- + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/nomadik_nand.c | 2 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/r852.c | 10 +- + drivers/mtd/nand/sh_flctl.c | 2 +- + drivers/mtd/nand/sm_common.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/mtd/onenand/omap2.c | 4 +- + drivers/mtd/onenand/onenand_sim.c | 4 +- + drivers/mtd/sm_ftl.c | 4 +- + drivers/mtd/ubi/Kconfig | 2 +- + drivers/mtd/ubi/io.c | 8 +- + drivers/mtd/ubi/scan.c | 2 +- + drivers/mtd/ubi/vmt.c | 5 - + drivers/net/3c501.c | 6 +- + drivers/net/3c523.c | 2 +- + drivers/net/3c527.c | 4 +- + drivers/net/3c59x.c | 2 +- + drivers/net/acenic.c | 4 +- + drivers/net/amd8111e.c | 2 +- + drivers/net/at1700.c | 2 +- + drivers/net/atl1e/atl1e_main.c | 2 +- + drivers/net/atlx/atl2.c | 2 +- + drivers/net/bcm63xx_enet.c | 2 +- + drivers/net/benet/be_cmds.c | 2 +- + drivers/net/benet/be_main.c | 2 +- + drivers/net/bna/bna_hw.h | 2 +- + drivers/net/bnx2x/bnx2x.h | 2 +- + drivers/net/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/bnx2x/bnx2x_link.c | 14 +- + drivers/net/bnx2x/bnx2x_main.c | 10 +- + drivers/net/bnx2x/bnx2x_reg.h | 44 +- + drivers/net/bonding/bond_alb.h | 2 +- + drivers/net/caif/caif_shmcore.c | 2 +- + drivers/net/caif/caif_spi.c | 2 +- + drivers/net/caif/caif_spi_slave.c | 4 +- + drivers/net/can/at91_can.c | 4 +- + drivers/net/can/c_can/c_can.c | 4 +- + drivers/net/can/janz-ican3.c | 8 +- + drivers/net/can/mscan/mscan.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 2 +- + drivers/net/can/softing/softing.h | 2 +- + drivers/net/can/softing/softing_main.c | 2 +- + drivers/net/can/ti_hecc.c | 2 +- + drivers/net/can/usb/ems_usb.c | 2 +- + drivers/net/can/usb/esd_usb2.c | 2 +- + drivers/net/cassini.c | 4 +- + drivers/net/cassini.h | 2 +- + drivers/net/chelsio/mv88e1xxx.c | 2 +- + drivers/net/chelsio/pm3393.c | 2 +- + drivers/net/chelsio/sge.c | 2 +- + drivers/net/chelsio/vsc7326.c | 2 +- + drivers/net/cris/eth_v10.c | 2 +- + drivers/net/cxgb3/sge.c | 2 +- + drivers/net/cxgb3/t3_hw.c | 6 +- + drivers/net/cxgb4/t4_hw.c | 2 +- + drivers/net/cxgb4vf/cxgb4vf_main.c | 2 +- + drivers/net/cxgb4vf/sge.c | 8 +- + drivers/net/davinci_emac.c | 8 +- + drivers/net/e1000/e1000_ethtool.c | 2 +- + drivers/net/e1000/e1000_hw.h | 2 +- + drivers/net/e1000/e1000_main.c | 2 +- + drivers/net/e1000e/netdev.c | 2 +- + drivers/net/enc28j60_hw.h | 2 +- + drivers/net/eth16i.c | 2 +- + drivers/net/ethoc.c | 2 +- + drivers/net/fec.h | 4 +- + drivers/net/forcedeth.c | 14 +- + drivers/net/gianfar.h | 2 +- + drivers/net/hamradio/Makefile | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hp100.c | 16 +- + drivers/net/hp100.h | 2 +- + drivers/net/ibm_newemac/tah.c | 2 +- + drivers/net/ibmlana.c | 4 +- + drivers/net/ibmlana.h | 2 +- + drivers/net/igb/e1000_mac.c | 4 +- + drivers/net/igb/e1000_phy.c | 2 +- + drivers/net/igb/igb_main.c | 14 +- + drivers/net/igbvf/netdev.c | 2 +- + drivers/net/ipg.c | 28 +- + drivers/net/irda/ali-ircc.c | 4 +- + drivers/net/irda/donauboe.c | 2 +- + drivers/net/irda/donauboe.h | 2 +- + drivers/net/irda/girbil-sir.c | 2 +- + drivers/net/irda/irda-usb.c | 4 +- + drivers/net/irda/mcs7780.c | 6 +- + drivers/net/irda/nsc-ircc.c | 2 +- + drivers/net/irda/nsc-ircc.h | 2 +- + drivers/net/irda/pxaficp_ir.c | 4 +- + drivers/net/irda/smsc-ircc2.c | 2 +- + drivers/net/irda/via-ircc.c | 4 +- + drivers/net/irda/vlsi_ir.h | 4 +- + drivers/net/ixgbe/ixgbe_dcb.c | 2 +- + drivers/net/ixgbe/ixgbe_dcb_nl.c | 4 +- + drivers/net/ixgbe/ixgbe_main.c | 8 +- + drivers/net/ixgbe/ixgbe_phy.c | 2 +- + drivers/net/ixgbe/ixgbe_x540.c | 2 +- + drivers/net/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ks8842.c | 2 +- + drivers/net/ks8851.c | 8 +- + drivers/net/ks8851_mll.c | 4 +- + drivers/net/lib8390.c | 4 +- + drivers/net/lp486e.c | 2 +- + drivers/net/meth.h | 4 +- + drivers/net/mlx4/en_main.c | 2 +- + drivers/net/mlx4/en_netdev.c | 10 +- + drivers/net/mlx4/en_rx.c | 2 +- + drivers/net/mlx4/en_selftest.c | 2 +- + drivers/net/mlx4/en_tx.c | 2 +- + drivers/net/mlx4/mcg.c | 2 +- + drivers/net/mlx4/port.c | 4 +- + drivers/net/myri10ge/myri10ge.c | 2 +- + drivers/net/myri_sbus.c | 2 +- + drivers/net/natsemi.c | 6 +- + drivers/net/netxen/netxen_nic_hdr.h | 2 +- + drivers/net/ns83820.c | 4 +- + drivers/net/pch_gbe/pch_gbe.h | 14 +- + drivers/net/pch_gbe/pch_gbe_ethtool.c | 2 +- + drivers/net/pch_gbe/pch_gbe_main.c | 4 +- + drivers/net/pci-skeleton.c | 2 +- + drivers/net/pcmcia/3c574_cs.c | 2 +- + drivers/net/pcmcia/axnet_cs.c | 4 +- + drivers/net/pcmcia/smc91c92_cs.c | 2 +- + drivers/net/pcnet32.c | 2 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/ppp_generic.c | 2 +- + drivers/net/ppp_synctty.c | 2 +- + drivers/net/pppoe.c | 2 +- + drivers/net/ps3_gelic_net.c | 4 +- + drivers/net/ps3_gelic_net.h | 2 +- + drivers/net/ps3_gelic_wireless.c | 2 +- + drivers/net/pxa168_eth.c | 2 +- + drivers/net/qla3xxx.h | 2 +- + drivers/net/qlge/qlge_main.c | 10 +- + drivers/net/r6040.c | 2 +- + drivers/net/s2io.c | 6 +- + drivers/net/s2io.h | 2 +- + drivers/net/sfc/falcon.c | 4 +- + drivers/net/sfc/mcdi.c | 2 +- + drivers/net/sfc/mcdi_pcol.h | 6 +- + drivers/net/sfc/mcdi_phy.c | 2 +- + drivers/net/sfc/net_driver.h | 2 +- + drivers/net/sgiseeq.c | 4 +- + drivers/net/sh_eth.c | 2 +- + drivers/net/sis190.c | 4 +- + drivers/net/sis900.c | 6 +- + drivers/net/skfp/ess.c | 8 +- + drivers/net/skfp/fplustm.c | 6 +- + drivers/net/skfp/h/cmtdef.h | 4 +- + drivers/net/skfp/h/fplustm.h | 4 +- + drivers/net/skfp/h/smc.h | 2 +- + drivers/net/skfp/h/smt.h | 2 +- + drivers/net/skfp/h/supern_2.h | 4 +- + drivers/net/skfp/hwmtm.c | 2 +- + drivers/net/skfp/pcmplc.c | 6 +- + drivers/net/skfp/smt.c | 2 +- + drivers/net/skge.h | 8 +- + drivers/net/sky2.c | 4 +- + drivers/net/sky2.h | 6 +- + drivers/net/smc91x.h | 2 +- + drivers/net/smsc911x.c | 2 +- + drivers/net/smsc9420.c | 2 +- + drivers/net/stmmac/norm_desc.c | 2 +- + drivers/net/sunbmac.h | 2 +- + drivers/net/sungem.c | 2 +- + drivers/net/sunhme.h | 2 +- + drivers/net/tc35815.c | 38 +- + drivers/net/tehuti.c | 12 +- + drivers/net/tehuti.h | 2 +- + drivers/net/tg3.c | 2 +- + drivers/net/tg3.h | 4 +- + drivers/net/tokenring/3c359.c | 2 +- + drivers/net/tokenring/madgemc.c | 6 +- + drivers/net/tokenring/smctr.c | 12 +- + drivers/net/tokenring/tms380tr.h | 2 +- + drivers/net/tsi108_eth.h | 8 +- + drivers/net/tulip/de4x5.c | 6 +- + drivers/net/tulip/dmfe.c | 2 +- + drivers/net/tulip/eeprom.c | 2 +- + drivers/net/typhoon.c | 2 +- + drivers/net/ucc_geth.h | 4 +- + drivers/net/usb/cdc_eem.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/via-rhine.c | 4 +- + drivers/net/via-velocity.c | 4 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 4 +- + drivers/net/vxge/vxge-config.c | 2 +- + drivers/net/vxge/vxge-main.c | 8 +- + drivers/net/vxge/vxge-traffic.c | 4 +- + drivers/net/vxge/vxge-traffic.h | 2 +- + drivers/net/wan/cosa.c | 2 +- + drivers/net/wan/dscc4.c | 8 +- + drivers/net/wan/hostess_sv11.c | 2 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/lmc/lmc_var.h | 6 +- + drivers/net/wan/z85230.c | 8 +- + drivers/net/wimax/i2400m/control.c | 4 +- + drivers/net/wimax/i2400m/driver.c | 4 +- + drivers/net/wimax/i2400m/fw.c | 4 +- + drivers/net/wimax/i2400m/i2400m-usb.h | 6 +- + drivers/net/wimax/i2400m/i2400m.h | 4 +- + drivers/net/wimax/i2400m/netdev.c | 2 +- + drivers/net/wimax/i2400m/op-rfkill.c | 4 +- + drivers/net/wimax/i2400m/rx.c | 4 +- + drivers/net/wimax/i2400m/tx.c | 4 +- + drivers/net/wimax/i2400m/usb-fw.c | 2 +- + drivers/net/wimax/i2400m/usb-rx.c | 2 +- + drivers/net/wimax/i2400m/usb-tx.c | 2 +- + drivers/net/wireless/airo.c | 14 +- + drivers/net/wireless/ath/ar9170/main.c | 2 +- + drivers/net/wireless/ath/ar9170/phy.c | 2 +- + drivers/net/wireless/ath/ath5k/ani.h | 2 +- + drivers/net/wireless/ath/ath5k/base.c | 6 +- + drivers/net/wireless/ath/ath5k/desc.c | 14 +- + drivers/net/wireless/ath/ath5k/eeprom.c | 4 +- + drivers/net/wireless/ath/ath5k/pci.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 22 +- + drivers/net/wireless/ath/ath5k/reg.h | 12 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 +- + drivers/net/wireless/ath/ath9k/rc.c | 2 +- + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/ath/carl9170/carl9170.h | 2 +- + drivers/net/wireless/ath/carl9170/phy.c | 2 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/carl9170/usb.c | 2 +- + drivers/net/wireless/ath/hw.c | 2 +- + drivers/net/wireless/ath/regd.c | 4 +- + drivers/net/wireless/atmel.c | 4 +- + drivers/net/wireless/atmel_cs.c | 2 +- + drivers/net/wireless/b43/b43.h | 2 +- + drivers/net/wireless/b43/main.c | 2 +- + drivers/net/wireless/b43/phy_g.h | 2 +- + drivers/net/wireless/b43/phy_n.h | 2 +- + drivers/net/wireless/b43legacy/b43legacy.h | 2 +- + drivers/net/wireless/hostap/hostap_ap.c | 2 +- + drivers/net/wireless/hostap/hostap_ap.h | 2 +- + drivers/net/wireless/hostap/hostap_ioctl.c | 4 +- + drivers/net/wireless/hostap/hostap_wlan.h | 2 +- + drivers/net/wireless/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/ipw2x00/ipw2200.c | 18 +- + drivers/net/wireless/ipw2x00/libipw_rx.c | 2 +- + drivers/net/wireless/iwlegacy/iwl-core.c | 2 +- + drivers/net/wireless/iwlegacy/iwl-fh.h | 2 +- + drivers/net/wireless/iwlegacy/iwl-scan.c | 2 +- + drivers/net/wireless/iwlegacy/iwl-sta.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-core.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- + drivers/net/wireless/iwmc3200wifi/hal.c | 4 +- + drivers/net/wireless/iwmc3200wifi/tx.c | 2 +- + drivers/net/wireless/libertas/README | 4 +- + drivers/net/wireless/libertas/cfg.c | 2 +- + drivers/net/wireless/libertas/if_cs.c | 2 +- + drivers/net/wireless/libertas/if_spi.h | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/orinoco/hw.c | 2 +- + drivers/net/wireless/p54/main.c | 2 +- + drivers/net/wireless/p54/p54spi.c | 2 +- + drivers/net/wireless/prism54/islpci_eth.c | 4 +- + drivers/net/wireless/rayctl.h | 2 +- + drivers/net/wireless/rt2x00/rt2800.h | 2 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00.h | 8 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00crypto.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00dump.h | 2 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 6 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 12 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00usb.h | 2 +- + drivers/net/wireless/rtlwifi/base.c | 2 +- + drivers/net/wireless/rtlwifi/pci.c | 2 +- + drivers/net/wireless/rtlwifi/regd.c | 2 +- + drivers/net/wireless/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/wl1251/cmd.c | 2 +- + drivers/net/wireless/wl1251/rx.c | 2 +- + drivers/net/wireless/wl12xx/cmd.c | 2 +- + drivers/net/wireless/wl12xx/conf.h | 8 +- + drivers/net/wireless/wl12xx/io.h | 2 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 2 +- + drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 2 +- + drivers/net/xilinx_emaclite.c | 2 +- + drivers/net/znet.c | 2 +- + drivers/of/fdt.c | 2 +- + drivers/of/of_mdio.c | 2 +- + drivers/parisc/pdc_stable.c | 4 +- + drivers/parport/Kconfig | 2 +- + drivers/parport/ieee1284.c | 2 +- + drivers/parport/parport_pc.c | 6 +- + drivers/pci/hotplug/acpi_pcihp.c | 2 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/pci/hotplug/rpaphp_core.c | 2 +- + drivers/pci/intel-iommu.c | 2 +- + drivers/pci/intr_remapping.c | 2 +- + drivers/pci/iova.c | 2 +- + drivers/pci/pci-sysfs.c | 2 +- + drivers/pci/quirks.c | 4 +- + drivers/pcmcia/i82092.c | 2 +- + drivers/pcmcia/pcmcia_resource.c | 2 +- + drivers/pcmcia/pxa2xx_lubbock.c | 2 +- + drivers/pcmcia/ti113x.h | 2 +- + drivers/platform/x86/intel_mid_thermal.c | 2 +- + drivers/pnp/card.c | 4 +- + drivers/pnp/pnpbios/bioscalls.c | 2 +- + drivers/pps/Kconfig | 2 +- + drivers/ps3/ps3-lpm.c | 6 +- + drivers/ps3/ps3-sys-manager.c | 2 +- + drivers/rapidio/rio-scan.c | 2 +- + drivers/regulator/core.c | 2 +- + drivers/regulator/max8952.c | 2 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-at91rm9200.c | 2 +- + drivers/rtc/rtc-bfin.c | 4 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-mrst.c | 7 +- + drivers/rtc/rtc-x1205.c | 2 +- + drivers/s390/block/dasd_3990_erp.c | 6 +- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_eckd.c | 2 +- + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/tape_char.c | 2 +- + drivers/s390/char/tty3270.c | 2 +- + drivers/s390/cio/device_fsm.c | 4 +- + drivers/s390/crypto/zcrypt_api.h | 2 +- + drivers/s390/net/claw.c | 2 +- + drivers/s390/net/ctcm_fsms.c | 2 +- + drivers/s390/net/lcs.c | 2 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 2 +- + drivers/s390/scsi/zfcp_qdio.c | 2 +- + drivers/sbus/char/jsflash.c | 2 +- + drivers/sbus/char/max1617.h | 2 +- + drivers/scsi/3w-9xxx.h | 2 +- + drivers/scsi/3w-xxxx.h | 2 +- + drivers/scsi/53c700.scr | 2 +- + drivers/scsi/53c700_d.h_shipped | 2 +- + drivers/scsi/FlashPoint.c | 4 +- + drivers/scsi/NCR5380.c | 8 +- + drivers/scsi/aacraid/aachba.c | 4 +- + drivers/scsi/aacraid/aacraid.h | 2 +- + drivers/scsi/aacraid/commsup.c | 2 +- + drivers/scsi/advansys.c | 2 +- + drivers/scsi/aha1740.c | 2 +- + drivers/scsi/aic7xxx/aic79xx.h | 4 +- + drivers/scsi/aic7xxx/aic79xx.reg | 24 +- + drivers/scsi/aic7xxx/aic79xx.seq | 18 +- + drivers/scsi/aic7xxx/aic79xx_core.c | 24 +- + drivers/scsi/aic7xxx/aic79xx_osm.c | 2 +- + drivers/scsi/aic7xxx/aic7xxx.h | 4 +- + drivers/scsi/aic7xxx/aic7xxx.reg | 2 +- + drivers/scsi/aic7xxx/aic7xxx.seq | 10 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 18 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 4 +- + drivers/scsi/aic7xxx/aic7xxx_pci.c | 6 +- + drivers/scsi/aic7xxx/aicasm/aicasm_gram.y | 8 +- + drivers/scsi/aic7xxx/aicasm/aicasm_macro_gram.y | 2 +- + drivers/scsi/aic7xxx_old.c | 12 +- + drivers/scsi/aic7xxx_old/aic7xxx.seq | 8 +- + drivers/scsi/aic94xx/aic94xx_reg_def.h | 2 +- + drivers/scsi/arm/acornscsi.c | 4 +- + drivers/scsi/arm/acornscsi.h | 6 +- + drivers/scsi/arm/arxescsi.c | 2 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/fas216.c | 4 +- + drivers/scsi/arm/fas216.h | 10 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atari_NCR5380.c | 6 +- + drivers/scsi/atp870u.c | 2 +- + drivers/scsi/be2iscsi/be_cmds.h | 18 +- + drivers/scsi/bfa/bfa_core.c | 2 +- + drivers/scsi/bfa/bfa_defs_svc.h | 6 +- + drivers/scsi/bfa/bfa_fc.h | 2 +- + drivers/scsi/bfa/bfa_fcs.c | 2 +- + drivers/scsi/bfa/bfa_fcs.h | 2 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 2 +- + drivers/scsi/bfa/bfa_svc.c | 4 +- + drivers/scsi/bfa/bfa_svc.h | 2 +- + drivers/scsi/bfa/bfad.c | 2 +- + drivers/scsi/bnx2fc/57xx_hsi_bnx2fc.h | 2 +- + drivers/scsi/bnx2fc/bnx2fc_els.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 2 +- + drivers/scsi/bnx2i/bnx2i_hwi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 6 +- + drivers/scsi/dc395x.c | 14 +- + drivers/scsi/dc395x.h | 2 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 4 +- + drivers/scsi/dpt/sys_info.h | 6 +- + drivers/scsi/eata.c | 2 +- + drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- + drivers/scsi/fdomain.c | 2 +- + drivers/scsi/fnic/fnic_fcs.c | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 4 +- + drivers/scsi/g_NCR5380.c | 4 +- + drivers/scsi/gdth.h | 2 +- + drivers/scsi/gvp11.c | 2 +- + drivers/scsi/imm.c | 2 +- + drivers/scsi/initio.c | 4 +- + drivers/scsi/initio.h | 4 +- + drivers/scsi/ips.c | 4 +- + drivers/scsi/ips.h | 2 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libfc/fc_exch.c | 4 +- + drivers/scsi/libfc/fc_fcp.c | 4 +- + drivers/scsi/libfc/fc_lport.c | 18 +- + drivers/scsi/libsas/sas_expander.c | 2 +- + drivers/scsi/lpfc/lpfc_attr.c | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 8 +- + drivers/scsi/lpfc/lpfc_els.c | 4 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 16 +- + drivers/scsi/lpfc/lpfc_init.c | 20 +- + drivers/scsi/lpfc/lpfc_mbox.c | 2 +- + drivers/scsi/lpfc/lpfc_nl.h | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 2 +- + drivers/scsi/lpfc/lpfc_scsi.c | 10 +- + drivers/scsi/lpfc/lpfc_scsi.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 26 +- + drivers/scsi/megaraid.c | 4 +- + drivers/scsi/megaraid.h | 6 +- + drivers/scsi/megaraid/mbox_defs.h | 8 +- + drivers/scsi/megaraid/megaraid_mbox.c | 6 +- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpt2sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 12 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 2 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 20 +- + drivers/scsi/ncr53c8xx.c | 2 +- + drivers/scsi/nsp32.c | 6 +- + drivers/scsi/nsp32.h | 2 +- + drivers/scsi/osst.c | 6 +- + drivers/scsi/osst.h | 2 +- + drivers/scsi/pcmcia/nsp_cs.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.h | 4 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/pmcraid.c | 10 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/qla1280.c | 2 +- + drivers/scsi/qla2xxx/qla_def.h | 2 +- + drivers/scsi/qla2xxx/qla_fw.h | 2 +- + drivers/scsi/qla2xxx/qla_isr.c | 2 +- + drivers/scsi/qla2xxx/qla_mbx.c | 6 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 6 +- + drivers/scsi/qla4xxx/ql4_def.h | 2 +- + drivers/scsi/qla4xxx/ql4_init.c | 2 +- + drivers/scsi/qla4xxx/ql4_nvram.h | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 8 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_netlink.c | 2 +- + drivers/scsi/scsi_tgt_lib.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 4 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/sun3_NCR5380.c | 6 +- + drivers/scsi/sym53c416.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_fw1.h | 2 +- + drivers/scsi/sym53c8xx_2/sym_fw2.h | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_malloc.c | 2 +- + drivers/scsi/wd33c93.c | 2 +- + drivers/scsi/wd7000.c | 2 +- + drivers/sfi/sfi_core.c | 2 +- + drivers/spi/amba-pl022.c | 16 +- + drivers/spi/au1550_spi.c | 2 +- + drivers/spi/dw_spi.c | 2 +- + drivers/spi/dw_spi.h | 2 +- + drivers/spi/ep93xx_spi.c | 2 +- + drivers/spi/pxa2xx_spi.c | 4 +- + drivers/spi/spi.c | 2 +- + drivers/spi/spi_bfin5xx.c | 2 +- + drivers/spi/spi_fsl_espi.c | 2 +- + drivers/ssb/pci.c | 2 +- + drivers/ssb/sprom.c | 2 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 6 +- + drivers/staging/ath6kl/include/aggr_recv_api.h | 2 +- + drivers/staging/ath6kl/include/common/a_hci.h | 4 +- + drivers/staging/ath6kl/include/common/dbglog.h | 2 +- + .../staging/ath6kl/include/common/epping_test.h | 2 +- + drivers/staging/ath6kl/include/common/ini_dset.h | 2 +- + drivers/staging/ath6kl/include/common/testcmd.h | 4 +- + drivers/staging/ath6kl/include/common/wmi.h | 8 +- + drivers/staging/ath6kl/include/common/wmix.h | 2 +- + drivers/staging/ath6kl/include/htc_api.h | 6 +- + drivers/staging/ath6kl/miscdrv/credit_dist.c | 6 +- + drivers/staging/ath6kl/os/linux/ar6000_android.c | 2 +- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 8 +- + drivers/staging/ath6kl/wmi/wmi.c | 2 +- + drivers/staging/bcm/Adapter.h | 10 +- + drivers/staging/bcm/CmHost.c | 16 +- + drivers/staging/bcm/HostMIBSInterface.h | 2 +- + drivers/staging/bcm/IPv6Protocol.c | 4 +- + drivers/staging/bcm/InterfaceIdleMode.c | 4 +- + drivers/staging/bcm/InterfaceIsr.c | 4 +- + drivers/staging/bcm/InterfaceRx.c | 10 +- + drivers/staging/bcm/Ioctl.h | 2 +- + drivers/staging/bcm/LeakyBucket.c | 2 +- + drivers/staging/bcm/Misc.c | 6 +- + drivers/staging/bcm/Qos.c | 2 +- + drivers/staging/bcm/cntrl_SignalingInterface.h | 6 +- + drivers/staging/bcm/nvm.c | 54 +- + drivers/staging/brcm80211/README | 2 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 2 +- + .../staging/brcm80211/brcmfmac/dhd_custom_gpio.c | 2 +- + drivers/staging/brcm80211/brcmfmac/dhd_linux.c | 2 +- + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 4 +- + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 2 +- + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 6 +- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 2 +- + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 13 +- + drivers/staging/brcm80211/brcmsmac/wlc_rate.c | 2 +- + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 2 +- + drivers/staging/brcm80211/include/hndsoc.h | 2 +- + drivers/staging/brcm80211/util/bcmotp.c | 4 +- + drivers/staging/brcm80211/util/bcmsrom.c | 2 +- + drivers/staging/brcm80211/util/hnddma.c | 6 +- + drivers/staging/brcm80211/util/sbpcmcia.h | 2 +- + drivers/staging/brcm80211/util/siutils.c | 2 +- + drivers/staging/comedi/comedi_fops.c | 2 +- + .../comedi/drivers/addi-data/APCI1710_Chrono.c | 8 +- + .../comedi/drivers/addi-data/addi_amcc_S5920.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.c | 18 +- + .../comedi/drivers/addi-data/hwdrv_apci3120.h | 2 +- + .../comedi/drivers/addi-data/hwdrv_apci3200.c | 4 +- + drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- + drivers/staging/comedi/drivers/adq12b.c | 4 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 8 +- + drivers/staging/comedi/drivers/cb_pcidas.c | 6 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 14 +- + drivers/staging/comedi/drivers/comedi_test.c | 2 +- + drivers/staging/comedi/drivers/das1800.c | 2 +- + drivers/staging/comedi/drivers/das800.c | 2 +- + drivers/staging/comedi/drivers/dmm32at.c | 2 +- + drivers/staging/comedi/drivers/dt2811.c | 2 +- + drivers/staging/comedi/drivers/dt9812.c | 2 +- + drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +- + drivers/staging/comedi/drivers/icp_multi.c | 6 +- + drivers/staging/comedi/drivers/me4000.c | 4 +- + drivers/staging/comedi/drivers/mpc624.c | 14 +- + drivers/staging/comedi/drivers/ni_at_a2150.c | 12 +- + drivers/staging/comedi/drivers/ni_labpc.c | 14 +- + drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- + drivers/staging/comedi/drivers/pcl812.c | 2 +- + drivers/staging/comedi/drivers/pcl816.c | 6 +- + drivers/staging/comedi/drivers/pcl818.c | 6 +- + drivers/staging/comedi/drivers/pcmmio.c | 4 +- + drivers/staging/comedi/drivers/pcmuio.c | 2 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 4 +- + drivers/staging/comedi/drivers/rtd520.c | 12 +- + drivers/staging/comedi/drivers/s626.c | 18 +- + drivers/staging/comedi/drivers/usbdux.c | 22 +- + drivers/staging/comedi/drivers/usbduxfast.c | 8 +- + drivers/staging/cptm1217/clearpad_tm1217.c | 2 +- + drivers/staging/crystalhd/crystalhd_cmds.c | 2 +- + drivers/staging/crystalhd/crystalhd_hw.c | 6 +- + drivers/staging/cxt1e1/musycc.c | 2 +- + drivers/staging/cxt1e1/musycc.h | 4 +- + drivers/staging/cxt1e1/pmcc4_defs.h | 4 +- + drivers/staging/cxt1e1/sbecrc.c | 2 +- + drivers/staging/cxt1e1/sbeproc.c | 2 +- + drivers/staging/et131x/et1310_address_map.h | 4 +- + drivers/staging/et131x/et1310_phy.h | 2 +- + drivers/staging/et131x/et1310_rx.c | 2 +- + drivers/staging/et131x/et131x_isr.c | 2 +- + drivers/staging/et131x/et131x_netdev.c | 2 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dev.h | 4 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_dnld.c | 78 +- + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 44 +- + .../staging/ft1000/ft1000-usb/ft1000_download.c | 8 +- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 16 +- + drivers/staging/ft1000/ft1000-usb/ft1000_ioctl.h | 2 +- + drivers/staging/ft1000/ft1000-usb/ft1000_usb.h | 2 +- + drivers/staging/generic_serial/generic_serial.c | 2 +- + drivers/staging/generic_serial/rio/map.h | 2 +- + drivers/staging/generic_serial/rio/rioboot.c | 8 +- + drivers/staging/generic_serial/rio/riocmd.c | 2 +- + drivers/staging/generic_serial/rio/rioroute.c | 4 +- + drivers/staging/generic_serial/rio/riotty.c | 4 +- + drivers/staging/generic_serial/sx.c | 8 +- + drivers/staging/gma500/psb_drm.h | 2 +- + drivers/staging/gma500/psb_drv.c | 2 +- + drivers/staging/gma500/psb_intel_bios.c | 2 +- + drivers/staging/gma500/psb_intel_sdvo.c | 2 +- + drivers/staging/gma500/psb_intel_sdvo_regs.h | 2 +- + drivers/staging/gma500/psb_ttm_fence_user.h | 2 +- + drivers/staging/go7007/go7007.txt | 2 +- + drivers/staging/hv/blkvsc_drv.c | 2 +- + drivers/staging/hv/channel.c | 8 +- + drivers/staging/hv/channel_mgmt.c | 2 +- + drivers/staging/hv/connection.c | 4 +- + drivers/staging/hv/hv.c | 2 +- + drivers/staging/hv/hv_api.h | 4 +- + drivers/staging/hv/hv_kvp.h | 2 +- + drivers/staging/hv/hv_mouse.c | 6 +- + drivers/staging/hv/hv_util.c | 2 +- + drivers/staging/hv/netvsc_drv.c | 24 + + drivers/staging/hv/rndis_filter.c | 2 +- + drivers/staging/hv/tools/hv_kvp_daemon.c | 92 ++- + drivers/staging/hv/vmbus_drv.c | 2 +- + drivers/staging/hv/vmbus_private.h | 1 + + drivers/staging/iio/Documentation/iio_utils.h | 2 +- + drivers/staging/iio/accel/adis16201.h | 2 +- + drivers/staging/iio/accel/adis16203.h | 2 +- + drivers/staging/iio/accel/adis16204.h | 2 +- + drivers/staging/iio/accel/adis16209.h | 2 +- + drivers/staging/iio/accel/adis16220.h | 2 +- + drivers/staging/iio/accel/adis16240.h | 2 +- + drivers/staging/iio/accel/lis3l02dq.h | 26 +- + drivers/staging/iio/accel/lis3l02dq_core.c | 2 +- + drivers/staging/iio/accel/lis3l02dq_ring.c | 4 +- + drivers/staging/iio/accel/sca3000.h | 4 +- + drivers/staging/iio/accel/sca3000_ring.c | 2 +- + drivers/staging/iio/adc/ad7298_ring.c | 2 +- + drivers/staging/iio/adc/ad7476_ring.c | 2 +- + drivers/staging/iio/adc/ad7887_ring.c | 2 +- + drivers/staging/iio/adc/ad799x_core.c | 2 +- + drivers/staging/iio/adc/ad799x_ring.c | 2 +- + drivers/staging/iio/adc/max1363_core.c | 4 +- + drivers/staging/iio/adc/max1363_ring.c | 2 +- + drivers/staging/iio/chrdev.h | 6 +- + drivers/staging/iio/gyro/adis16060_core.c | 2 +- + drivers/staging/iio/gyro/adis16080_core.c | 2 +- + drivers/staging/iio/gyro/adis16260.h | 2 +- + drivers/staging/iio/iio.h | 2 +- + drivers/staging/iio/imu/adis16300.h | 2 +- + drivers/staging/iio/imu/adis16350.h | 2 +- + drivers/staging/iio/imu/adis16400.h | 5 +- + drivers/staging/iio/imu/adis16400_core.c | 20 +- + drivers/staging/iio/imu/adis16400_ring.c | 12 +- + drivers/staging/iio/industrialio-core.c | 2 +- + drivers/staging/iio/meter/ade7753.h | 2 +- + drivers/staging/iio/meter/ade7754.h | 2 +- + drivers/staging/iio/meter/ade7758.h | 2 +- + drivers/staging/iio/meter/ade7759.h | 2 +- + drivers/staging/iio/meter/ade7854.h | 2 +- + drivers/staging/iio/ring_generic.h | 2 +- + drivers/staging/intel_sst/TODO | 2 +- + drivers/staging/intel_sst/intel_sst.c | 4 +- + .../staging/intel_sst/intel_sst_app_interface.c | 16 +- + .../staging/intel_sst/intel_sst_drv_interface.c | 2 +- + drivers/staging/intel_sst/intel_sst_dsp.c | 4 +- + drivers/staging/intel_sst/intel_sst_fw_ipc.h | 2 +- + drivers/staging/intel_sst/intel_sst_stream.c | 2 +- + .../staging/intel_sst/intel_sst_stream_encoded.c | 2 +- + drivers/staging/intel_sst/intelmid.c | 2 +- + drivers/staging/intel_sst/intelmid.h | 2 +- + drivers/staging/keucr/init.c | 4 +- + drivers/staging/keucr/smilmain.c | 8 +- + drivers/staging/keucr/smilsub.c | 6 +- + drivers/staging/lirc/lirc_ene0100.h | 4 +- + drivers/staging/memrar/Kconfig | 15 - + drivers/staging/memrar/Makefile | 2 - + drivers/staging/memrar/TODO | 43 - + drivers/staging/memrar/memrar-abi | 89 -- + drivers/staging/memrar/memrar.h | 174 ---- + drivers/staging/memrar/memrar_allocator.c | 432 --------- + drivers/staging/memrar/memrar_allocator.h | 149 --- + drivers/staging/memrar/memrar_handler.c | 1007 -------------------- + drivers/staging/msm/mdp4_overlay.c | 2 +- + drivers/staging/msm/mdp_ppp_dq.c | 2 +- + drivers/staging/msm/msm_fb.c | 6 +- + drivers/staging/octeon/cvmx-cmd-queue.h | 2 +- + drivers/staging/octeon/cvmx-fpa.h | 2 +- + drivers/staging/octeon/cvmx-helper-board.h | 2 +- + drivers/staging/octeon/cvmx-helper-util.c | 2 +- + drivers/staging/octeon/cvmx-helper.c | 2 +- + drivers/staging/octeon/cvmx-mdio.h | 2 +- + drivers/staging/octeon/cvmx-pko.h | 4 +- + drivers/staging/octeon/cvmx-pow.h | 12 +- + drivers/staging/octeon/ethernet-util.h | 2 +- + drivers/staging/olpc_dcon/Kconfig | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 1 + + drivers/staging/pohmelfs/crypto.c | 2 +- + drivers/staging/quatech_usb2/quatech_usb2.c | 12 +- + drivers/staging/rt2860/chip/rtmp_phy.h | 2 +- + drivers/staging/rt2860/common/ba_action.c | 4 +- + drivers/staging/rt2860/common/cmm_aes.c | 2 +- + drivers/staging/rt2860/common/cmm_cfg.c | 2 +- + drivers/staging/rt2860/common/cmm_data.c | 4 +- + drivers/staging/rt2860/common/cmm_data_pci.c | 6 +- + drivers/staging/rt2860/common/cmm_data_usb.c | 6 +- + drivers/staging/rt2860/common/cmm_mac_pci.c | 2 +- + drivers/staging/rt2860/common/cmm_sanity.c | 4 +- + drivers/staging/rt2860/common/cmm_sync.c | 2 +- + drivers/staging/rt2860/common/cmm_wpa.c | 4 +- + drivers/staging/rt2860/common/mlme.c | 16 +- + drivers/staging/rt2860/common/rtmp_init.c | 14 +- + drivers/staging/rt2860/common/spectrum.c | 12 +- + drivers/staging/rt2860/mlme.h | 8 +- + drivers/staging/rt2860/rt_linux.c | 2 +- + drivers/staging/rt2860/rt_pci_rbus.c | 2 +- + drivers/staging/rt2860/rtmp.h | 4 +- + drivers/staging/rt2860/sta_ioctl.c | 2 +- + drivers/staging/rt2870/common/rtusb_bulk.c | 6 +- + drivers/staging/rt2870/common/rtusb_data.c | 2 +- + drivers/staging/rtl8187se/Kconfig | 1 + + drivers/staging/rtl8187se/ieee80211/ieee80211.h | 6 +- + .../rtl8187se/ieee80211/ieee80211_softmac.c | 2 +- + drivers/staging/rtl8187se/r8180_core.c | 4 +- + drivers/staging/rtl8187se/r8180_dm.c | 4 +- + drivers/staging/rtl8187se/r8180_rtl8225z2.c | 2 +- + drivers/staging/rtl8187se/r8185b_init.c | 2 +- + drivers/staging/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/ieee80211/ieee80211.h | 8 +- + drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192e/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192e/ieee80211/rtl819x_HT.h | 2 +- + .../staging/rtl8192e/ieee80211/rtl819x_HTProc.c | 8 +- + drivers/staging/rtl8192e/ieee80211/rtl819x_TS.h | 2 +- + .../staging/rtl8192e/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/r819xE_phy.c | 6 +- + drivers/staging/rtl8192u/Kconfig | 1 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 8 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 8 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_TS.h | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/ieee80211/scatterwalk.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 6 +- + drivers/staging/rtl8192u/r819xU_HTType.h | 2 +- + drivers/staging/rtl8192u/r819xU_phy.c | 6 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_led.h | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 6 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 2 +- + drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 2 +- + drivers/staging/rtl8712/usb_halinit.c | 2 +- + drivers/staging/rts_pstor/rtsx.c | 14 +- + drivers/staging/rts_pstor/rtsx_chip.c | 11 +- + drivers/staging/rts_pstor/rtsx_chip.h | 10 +- + drivers/staging/rts_pstor/rtsx_scsi.h | 2 +- + drivers/staging/rts_pstor/sd.c | 2 +- + drivers/staging/sep/sep_driver.c | 25 +- + drivers/staging/sep/sep_driver_config.h | 4 +- + drivers/staging/slicoss/README | 2 +- + drivers/staging/sm7xx/smtcfb.c | 10 +- + drivers/staging/speakup/keyhelp.c | 2 +- + drivers/staging/speakup/spkguide.txt | 2 +- + drivers/staging/spectra/ffsport.c | 4 +- + drivers/staging/spectra/flash.c | 6 +- + drivers/staging/ste_rmi4/synaptics_i2c_rmi4.c | 20 +- + drivers/staging/tidspbridge/core/_tiomap.h | 2 +- + drivers/staging/tidspbridge/core/chnl_sm.c | 2 +- + drivers/staging/tidspbridge/dynload/cload.c | 2 +- + drivers/staging/tidspbridge/hw/hw_mmu.c | 6 +- + .../tidspbridge/include/dspbridge/_chnl_sm.h | 4 +- + .../staging/tidspbridge/include/dspbridge/clk.h | 6 +- + .../staging/tidspbridge/include/dspbridge/cmm.h | 2 +- + .../staging/tidspbridge/include/dspbridge/cod.h | 2 +- + .../staging/tidspbridge/include/dspbridge/dev.h | 2 +- + .../staging/tidspbridge/include/dspbridge/drv.h | 6 +- + .../tidspbridge/include/dspbridge/dspdefs.h | 14 +- + .../staging/tidspbridge/include/dspbridge/mgr.h | 4 +- + .../staging/tidspbridge/include/dspbridge/node.h | 2 +- + .../staging/tidspbridge/include/dspbridge/proc.h | 6 +- + .../staging/tidspbridge/include/dspbridge/pwr.h | 8 +- + drivers/staging/tidspbridge/pmgr/dev.c | 6 +- + drivers/staging/tidspbridge/rmgr/drv.c | 2 +- + drivers/staging/tidspbridge/rmgr/nldr.c | 6 +- + drivers/staging/tidspbridge/rmgr/proc.c | 4 +- + drivers/staging/tm6000/tm6000-video.c | 2 +- + drivers/staging/tty/cd1865.h | 2 +- + drivers/staging/tty/epca.c | 16 +- + drivers/staging/tty/ip2/i2hw.h | 4 +- + drivers/staging/tty/ip2/i2lib.c | 8 +- + drivers/staging/tty/ip2/ip2main.c | 2 +- + drivers/staging/tty/specialix.c | 4 +- + drivers/staging/tty/specialix_io8.h | 4 +- + drivers/staging/usbip/stub_dev.c | 6 +- + drivers/staging/usbip/stub_rx.c | 40 +- + drivers/staging/usbip/stub_tx.c | 74 ++- + drivers/staging/usbip/usbip_common.c | 64 ++- + drivers/staging/usbip/usbip_common.h | 2 + + drivers/staging/usbip/vhci_hcd.c | 2 +- + drivers/staging/usbip/vhci_rx.c | 3 + + drivers/staging/vme/bridges/vme_ca91cx42.c | 6 +- + drivers/staging/vme/bridges/vme_tsi148.c | 4 +- + drivers/staging/vme/bridges/vme_tsi148.h | 8 +- + drivers/staging/vme/vme_api.txt | 6 +- + drivers/staging/vt6655/Kconfig | 2 +- + drivers/staging/vt6655/card.c | 2 +- + drivers/staging/vt6655/device_main.c | 2 +- + drivers/staging/vt6655/wcmd.c | 2 +- + drivers/staging/vt6655/wmgr.h | 4 +- + drivers/staging/vt6656/Kconfig | 2 +- + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/vt6656/wcmd.c | 4 +- + drivers/staging/vt6656/wmgr.h | 4 +- + .../staging/westbridge/astoria/api/src/cyasdma.c | 2 +- + .../westbridge/astoria/api/src/cyaslep2pep.c | 2 +- + .../westbridge/astoria/api/src/cyaslowlevel.c | 2 +- + .../staging/westbridge/astoria/api/src/cyasmisc.c | 6 +- + .../staging/westbridge/astoria/api/src/cyasmtp.c | 4 +- + .../westbridge/astoria/api/src/cyasstorage.c | 6 +- + .../staging/westbridge/astoria/api/src/cyasusb.c | 4 +- + .../arch/arm/mach-omap2/cyashalomap_kernel.c | 12 +- + .../cyashalomap_kernel.h | 2 +- + .../westbridge-omap3-pnand-hal/cyasmemmap.h | 4 +- + .../westbridge/astoria/block/cyasblkdev_queue.c | 2 +- + .../staging/westbridge/astoria/gadget/cyasgadget.c | 1 + + .../astoria/include/linux/westbridge/cyasdevice.h | 6 +- + .../astoria/include/linux/westbridge/cyasdma.h | 10 +- + .../astoria/include/linux/westbridge/cyaserr.h | 4 +- + .../astoria/include/linux/westbridge/cyashaldoc.h | 2 +- + .../astoria/include/linux/westbridge/cyasintr.h | 2 +- + .../astoria/include/linux/westbridge/cyasmisc.h | 8 +- + .../include/linux/westbridge/cyasprotocol.h | 4 +- + .../astoria/include/linux/westbridge/cyasstorage.h | 34 +- + .../astoria/include/linux/westbridge/cyasusb.h | 40 +- + drivers/staging/winbond/mds.c | 2 +- + drivers/staging/wlags49_h2/README.ubuntu | 2 +- + drivers/staging/wlags49_h2/TODO | 4 +- + drivers/staging/wlags49_h2/hcf.c | 24 +- + drivers/staging/wlags49_h2/hcfdef.h | 2 +- + drivers/staging/wlags49_h2/wl_wext.c | 6 +- + drivers/staging/wlags49_h25/TODO | 4 +- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + drivers/staging/xgifb/vb_setmode.c | 2 +- + drivers/staging/xgifb/vgatypes.h | 2 +- + drivers/target/target_core_alua.c | 10 +- + drivers/target/target_core_device.c | 2 +- + drivers/target/target_core_fabric_lib.c | 2 +- + drivers/target/target_core_file.c | 2 +- + drivers/target/target_core_pr.c | 6 +- + drivers/target/target_core_transport.c | 14 +- + drivers/target/target_core_ua.c | 4 +- + drivers/telephony/ixj.c | 8 +- + drivers/telephony/ixj.h | 2 +- + drivers/tty/hvc/hvc_iucv.c | 4 +- + drivers/tty/hvc/hvc_vio.c | 2 +- + drivers/tty/hvc/hvcs.c | 8 +- + drivers/tty/mxser.h | 2 +- + drivers/tty/n_gsm.c | 10 +- + drivers/tty/nozomi.c | 2 +- + drivers/tty/rocket.c | 4 +- + drivers/tty/serial/8250.c | 2 +- + drivers/tty/serial/8250_pci.c | 2 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/icom.c | 2 +- + drivers/tty/serial/imx.c | 2 +- + drivers/tty/serial/ip22zilog.c | 2 +- + drivers/tty/serial/jsm/jsm.h | 2 +- + drivers/tty/serial/jsm/jsm_neo.c | 4 +- + drivers/tty/serial/max3107.h | 2 +- + drivers/tty/serial/mrst_max3110.c | 2 +- + drivers/tty/serial/mrst_max3110.h | 2 +- + drivers/tty/serial/msm_serial_hs.c | 4 +- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/pmac_zilog.c | 6 +- + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/sh-sci.c | 27 +- + drivers/tty/serial/sn_console.c | 4 +- + drivers/tty/serial/sunzilog.c | 2 +- + drivers/tty/synclink.c | 10 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 10 +- + drivers/tty/tty_io.c | 8 +- + drivers/tty/tty_ioctl.c | 6 +- + drivers/tty/vt/vt.c | 2 +- + drivers/uio/uio_pruss.c | 2 +- + drivers/usb/atm/ueagle-atm.c | 8 +- + drivers/usb/c67x00/c67x00-drv.c | 2 +- + drivers/usb/c67x00/c67x00-hcd.h | 2 +- + drivers/usb/c67x00/c67x00-sched.c | 2 +- + drivers/usb/class/cdc-acm.h | 2 +- + drivers/usb/class/usbtmc.c | 2 +- + drivers/usb/core/hcd.c | 2 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/early/ehci-dbgp.c | 2 +- + drivers/usb/gadget/amd5536udc.c | 14 +- + drivers/usb/gadget/amd5536udc.h | 2 +- + drivers/usb/gadget/at91_udc.c | 2 +- + drivers/usb/gadget/composite.c | 6 +- + drivers/usb/gadget/f_audio.c | 2 +- + drivers/usb/gadget/f_ncm.c | 2 +- + drivers/usb/gadget/fsl_qe_udc.h | 6 +- + drivers/usb/gadget/fsl_udc_core.c | 6 +- + drivers/usb/gadget/fsl_usb2_udc.h | 4 +- + drivers/usb/gadget/gmidi.c | 2 +- + drivers/usb/gadget/langwell_udc.c | 2 +- + drivers/usb/gadget/mv_udc_core.c | 6 +- + drivers/usb/gadget/net2280.c | 2 +- + drivers/usb/gadget/nokia.c | 2 +- + drivers/usb/gadget/printer.c | 2 +- + drivers/usb/gadget/pxa27x_udc.c | 12 +- + drivers/usb/gadget/s3c-hsotg.c | 18 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/fhci-tds.c | 8 +- + drivers/usb/host/fhci.h | 4 +- + drivers/usb/host/imx21-hcd.c | 2 +- + drivers/usb/host/isp116x.h | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 2 +- + drivers/usb/host/oxu210hp-hcd.c | 4 +- + drivers/usb/host/whci/qset.c | 2 +- + drivers/usb/host/xhci.c | 4 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/image/microtek.c | 8 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/otg/isp1301_omap.c | 2 +- + drivers/usb/otg/langwell_otg.c | 4 +- + drivers/usb/serial/aircable.c | 4 +- + drivers/usb/serial/cp210x.c | 2 +- + drivers/usb/serial/cypress_m8.c | 2 +- + drivers/usb/serial/ftdi_sio.c | 2 +- + drivers/usb/serial/io_edgeport.c | 2 +- + drivers/usb/serial/io_edgeport.h | 2 +- + drivers/usb/serial/io_ti.c | 2 +- + drivers/usb/serial/opticon.c | 2 +- + drivers/usb/storage/ene_ub6250.c | 4 +- + drivers/usb/storage/isd200.c | 2 +- + drivers/usb/storage/scsiglue.c | 2 +- + drivers/usb/storage/shuttle_usbat.c | 2 +- + drivers/usb/wusbcore/crypto.c | 4 +- + drivers/usb/wusbcore/reservation.c | 2 +- + drivers/usb/wusbcore/rh.c | 2 +- + drivers/usb/wusbcore/wa-rpipe.c | 2 +- + drivers/usb/wusbcore/wa-xfer.c | 8 +- + drivers/usb/wusbcore/wusbhc.h | 2 +- + drivers/uwb/driver.c | 2 +- + drivers/uwb/drp.c | 6 +- + drivers/uwb/lc-rc.c | 2 +- + drivers/uwb/reset.c | 2 +- + drivers/uwb/umc-dev.c | 2 +- + drivers/video/atmel_lcdfb.c | 2 +- + drivers/video/aty/atyfb_base.c | 4 +- + drivers/video/aty/mach64_cursor.c | 2 +- + drivers/video/au1200fb.c | 2 +- + drivers/video/backlight/corgi_lcd.c | 2 +- + drivers/video/backlight/locomolcd.c | 2 +- + drivers/video/bfin-lq035q1-fb.c | 4 +- + drivers/video/bfin_adv7393fb.h | 24 +- + drivers/video/console/fbcon.c | 2 - + drivers/video/console/font_mini_4x6.c | 2 +- + drivers/video/da8xx-fb.c | 2 +- + drivers/video/display/display-sysfs.c | 2 +- + drivers/video/efifb.c | 154 ++-- + drivers/video/ep93xx-fb.c | 2 +- + drivers/video/fbmem.c | 2 +- + drivers/video/fbsysfs.c | 2 +- + drivers/video/fm2fb.c | 2 +- + drivers/video/fsl-diu-fb.c | 2 +- + drivers/video/gbefb.c | 2 +- + drivers/video/geode/lxfb.h | 2 +- + drivers/video/i810/i810_accel.c | 2 +- + drivers/video/kyro/STG4000OverlayDevice.c | 2 +- + drivers/video/kyro/STG4000Reg.h | 2 +- + drivers/video/matrox/matroxfb_DAC1064.h | 2 +- + drivers/video/matrox/matroxfb_Ti3026.c | 4 +- + drivers/video/matrox/matroxfb_base.c | 2 +- + drivers/video/matrox/matroxfb_base.h | 2 +- + drivers/video/nuc900fb.h | 2 +- + drivers/video/omap/Kconfig | 2 +- + drivers/video/omap2/dss/hdmi.c | 2 +- + drivers/video/pxa3xx-gcu.c | 2 +- + drivers/video/s3c-fb.c | 8 +- + drivers/video/s3fb.c | 48 +- + drivers/video/savage/savagefb-i2c.c | 14 +- + drivers/video/savage/savagefb.h | 2 +- + drivers/video/savage/savagefb_driver.c | 4 +- + drivers/video/sh_mobile_lcdcfb.c | 52 +- + drivers/video/sh_mobile_lcdcfb.h | 1 + + drivers/video/sm501fb.c | 4 +- + drivers/video/sstfb.c | 8 +- + drivers/video/sticore.h | 2 +- + drivers/video/tdfxfb.c | 18 +- + drivers/video/tmiofb.c | 2 +- + drivers/video/udlfb.c | 2 +- + drivers/video/vga16fb.c | 2 +- + drivers/video/via/chip.h | 1 - + drivers/video/via/hw.c | 17 +- + drivers/video/via/hw.h | 3 +- + drivers/video/via/via_utility.c | 2 +- + drivers/video/via/via_utility.h | 2 +- + drivers/video/via/viafbdev.c | 76 +- + drivers/video/w100fb.c | 2 +- + drivers/w1/masters/omap_hdq.c | 2 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/Makefile | 4 +- + drivers/watchdog/acquirewdt.c | 2 +- + drivers/watchdog/mpc8xxx_wdt.c | 2 +- + drivers/watchdog/pc87413_wdt.c | 2 +- + drivers/watchdog/sbc7240_wdt.c | 2 +- + drivers/watchdog/sch311x_wdt.c | 2 +- + drivers/watchdog/shwdt.c | 2 +- + drivers/watchdog/smsc37b787_wdt.c | 2 +- + drivers/watchdog/sp805_wdt.c | 2 +- + drivers/xen/events.c | 4 +- + fs/adfs/map.c | 2 +- + fs/afs/cache.c | 12 +- + fs/afs/cell.c | 2 +- + fs/attr.c | 2 +- + fs/autofs4/root.c | 2 +- + fs/befs/ChangeLog | 10 +- + fs/befs/befs_fs_types.h | 2 +- + fs/befs/btree.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/bio.c | 2 +- + fs/block_dev.c | 2 +- + fs/btrfs/extent_map.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/relocation.c | 2 +- + fs/cachefiles/interface.c | 2 +- + fs/ceph/addr.c | 2 +- + fs/ceph/caps.c | 2 +- + fs/ceph/snap.c | 2 +- + fs/cifs/AUTHORS | 2 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/cifs/connect.c | 4 +- + fs/cifs/dir.c | 2 +- + fs/configfs/dir.c | 2 +- + fs/dlm/lock.c | 2 +- + fs/dlm/lowcomms.c | 2 +- + fs/dlm/recover.c | 2 +- + fs/ecryptfs/main.c | 4 +- + fs/eventpoll.c | 8 +- + fs/exofs/common.h | 4 +- + fs/ext2/balloc.c | 6 +- + fs/ext2/inode.c | 8 +- + fs/ext2/super.c | 2 +- + fs/ext2/xattr.c | 2 +- + fs/ext3/balloc.c | 10 +- + fs/ext3/inode.c | 6 +- + fs/ext3/resize.c | 2 +- + fs/ext3/super.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/extents.c | 10 +- + fs/ext4/fsync.c | 2 +- + fs/ext4/inode.c | 20 +- + fs/ext4/mballoc.c | 2 +- + fs/ext4/migrate.c | 2 +- + fs/ext4/super.c | 4 +- + fs/freevxfs/vxfs_fshead.c | 2 +- + fs/freevxfs/vxfs_lookup.c | 2 +- + fs/freevxfs/vxfs_olt.h | 2 +- + fs/fs-writeback.c | 2 +- + fs/fuse/file.c | 2 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/glock.c | 2 +- + fs/gfs2/super.c | 2 +- + fs/jbd/commit.c | 2 +- + fs/jbd/journal.c | 4 +- + fs/jbd/revoke.c | 2 +- + fs/jbd/transaction.c | 2 +- + fs/jbd2/commit.c | 2 +- + fs/jbd2/journal.c | 4 +- + fs/jbd2/revoke.c | 2 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/TODO | 2 +- + fs/jffs2/readinode.c | 2 +- + fs/jffs2/summary.c | 4 +- + fs/jffs2/wbuf.c | 2 +- + fs/jfs/jfs_dmap.c | 4 +- + fs/jfs/jfs_extent.c | 6 +- + fs/jfs/jfs_imap.c | 14 +- + fs/jfs/jfs_logmgr.h | 2 +- + fs/jfs/jfs_metapage.h | 2 +- + fs/jfs/jfs_txnmgr.c | 2 +- + fs/jfs/resize.c | 4 +- + fs/jfs/super.c | 2 +- + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/dir.c | 2 +- + fs/logfs/readwrite.c | 2 +- + fs/mbcache.c | 2 +- + fs/namei.c | 2 +- + fs/ncpfs/inode.c | 2 +- + fs/nfs/callback_xdr.c | 2 +- + fs/nfs/file.c | 2 +- + fs/nfs/nfs4filelayout.h | 2 +- + fs/nfs_common/nfsacl.c | 2 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4state.c | 4 +- + fs/nfsd/nfsxdr.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/mark.c | 2 +- + fs/ntfs/attrib.c | 4 +- + fs/ntfs/compress.c | 2 +- + fs/ntfs/inode.c | 4 +- + fs/ntfs/layout.h | 12 +- + fs/ntfs/logfile.c | 2 +- + fs/ntfs/logfile.h | 2 +- + fs/ntfs/mft.c | 8 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 14 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/aops.h | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/ocfs2/cluster/quorum.c | 4 +- + fs/ocfs2/cluster/tcp.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 4 +- + fs/ocfs2/inode.c | 4 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/journal.h | 2 +- + fs/ocfs2/namei.c | 2 +- + fs/ocfs2/ocfs2_fs.h | 4 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/reservations.h | 2 +- + fs/ocfs2/stackglue.h | 2 +- + fs/ocfs2/suballoc.c | 4 +- + fs/ocfs2/super.c | 2 +- + fs/ocfs2/xattr.c | 4 +- + fs/partitions/check.c | 4 +- + fs/proc/base.c | 2 +- + fs/pstore/Kconfig | 2 +- + fs/quota/dquot.c | 2 +- + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/lock.c | 2 +- + fs/reiserfs/super.c | 4 +- + fs/reiserfs/xattr.c | 2 +- + fs/squashfs/cache.c | 4 +- + fs/ubifs/Kconfig | 2 +- + fs/ubifs/budget.c | 2 +- + fs/ubifs/commit.c | 2 +- + fs/ubifs/debug.c | 63 +- + fs/ubifs/lpt.c | 7 +- + fs/ubifs/super.c | 3 +- + fs/ufs/inode.c | 2 +- + fs/ufs/super.c | 6 +- + fs/xfs/linux-2.6/xfs_aops.c | 2 +- + fs/xfs/linux-2.6/xfs_buf.c | 4 +- + fs/xfs/linux-2.6/xfs_file.c | 2 +- + fs/xfs/linux-2.6/xfs_iops.c | 2 +- + fs/xfs/linux-2.6/xfs_sync.c | 2 +- + fs/xfs/quota/xfs_dquot.c | 2 +- + fs/xfs/quota/xfs_qm_bhv.c | 2 +- + fs/xfs/quota/xfs_qm_syscalls.c | 4 +- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_inode.h | 4 +- + fs/xfs/xfs_log_priv.h | 2 +- + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_vnodeops.c | 4 +- + include/acpi/actbl.h | 2 +- + include/asm-generic/siginfo.h | 2 +- + include/asm-generic/vmlinux.lds.h | 2 +- + include/drm/drmP.h | 4 +- + include/drm/drm_crtc.h | 4 +- + include/drm/drm_mm.h | 2 +- + include/drm/drm_mode.h | 2 +- + include/drm/mga_drm.h | 2 +- + include/drm/radeon_drm.h | 2 +- + include/drm/savage_drm.h | 2 +- + include/drm/ttm/ttm_bo_api.h | 8 +- + include/drm/ttm/ttm_bo_driver.h | 6 +- + include/drm/vmwgfx_drm.h | 2 +- + include/linux/amba/clcd.h | 2 +- + include/linux/amba/mmci.h | 6 +- + include/linux/can/error.h | 2 +- + include/linux/can/netlink.h | 2 +- + include/linux/cdk.h | 2 +- + include/linux/cfag12864b.h | 2 +- + include/linux/cgroup.h | 2 +- + include/linux/cm4000_cs.h | 2 +- + include/linux/configfs.h | 2 +- + include/linux/cper.h | 2 +- + include/linux/decompress/mm.h | 2 +- + include/linux/dmaengine.h | 2 +- + include/linux/drbd.h | 4 +- + include/linux/drbd_limits.h | 6 +- + include/linux/ethtool.h | 2 +- + include/linux/eventpoll.h | 2 +- + include/linux/exportfs.h | 2 +- + include/linux/fb.h | 8 +- + include/linux/firewire-cdev.h | 2 +- + include/linux/fs.h | 4 +- + include/linux/fscache-cache.h | 2 +- + include/linux/fscache.h | 6 +- + include/linux/hid.h | 2 +- + include/linux/hp_sdc.h | 2 +- + include/linux/i2o.h | 2 +- + include/linux/interrupt.h | 4 +- + include/linux/ipmi.h | 4 +- + include/linux/isdn/hdlc.h | 2 +- + include/linux/ixjuser.h | 2 +- + include/linux/jiffies.h | 2 +- + include/linux/ktime.h | 4 +- + include/linux/led-lm3530.h | 2 +- + include/linux/libata.h | 2 +- + include/linux/lru_cache.h | 2 +- + include/linux/mfd/wm8350/pmic.h | 2 +- + include/linux/mm.h | 2 +- + include/linux/mmc/dw_mmc.h | 4 +- + include/linux/mroute6.h | 2 +- + include/linux/mtd/cfi.h | 2 +- + include/linux/mtd/nand.h | 6 +- + include/linux/mtd/xip.h | 2 +- + include/linux/netfilter/nf_conntrack_proto_gre.h | 2 +- + include/linux/netfilter_bridge/ebtables.h | 2 +- + include/linux/nfs4.h | 2 +- + include/linux/nfsd/export.h | 2 +- + include/linux/nfsd/nfsfh.h | 2 +- + include/linux/nl80211.h | 10 +- + include/linux/notifier.h | 2 +- + include/linux/omap3isp.h | 2 +- + include/linux/page_cgroup.h | 2 +- + include/linux/pci_regs.h | 4 +- + include/linux/perf_event.h | 2 +- + include/linux/pid.h | 2 +- + include/linux/pkt_sched.h | 2 +- + include/linux/poll.h | 2 +- + include/linux/prefetch.h | 2 +- + include/linux/pxa2xx_ssp.h | 2 +- + include/linux/raid/md_p.h | 2 +- + include/linux/reiserfs_fs.h | 2 +- + include/linux/sched.h | 2 +- + include/linux/skbuff.h | 2 +- + include/linux/smc91x.h | 2 +- + include/linux/socket.h | 2 +- + include/linux/soundcard.h | 2 +- + include/linux/spi/spidev.h | 2 +- + include/linux/spinlock.h | 2 +- + include/linux/stmmac.h | 2 +- + include/linux/stop_machine.h | 2 +- + include/linux/sunrpc/cache.h | 4 +- + include/linux/sunrpc/svcauth_gss.h | 2 +- + include/linux/sysdev.h | 6 +- + include/linux/timerqueue.h | 2 +- + include/linux/tracehook.h | 4 +- + include/linux/ucb1400.h | 2 +- + include/linux/usb.h | 4 +- + include/linux/usb/composite.h | 2 +- + include/linux/usb/ehci_def.h | 2 +- + include/linux/usb/functionfs.h | 4 +- + include/linux/usb/gadget.h | 4 +- + include/linux/usb/midi.h | 2 +- + include/linux/usb/wusb.h | 2 +- + include/linux/uwb.h | 6 +- + include/linux/uwb/umc.h | 2 +- + include/linux/vgaarb.h | 4 +- + include/linux/wimax.h | 2 +- + include/linux/xilinxfb.h | 2 +- + include/media/davinci/dm355_ccdc.h | 2 +- + include/media/davinci/isif.h | 2 +- + include/media/lirc.h | 2 +- + include/net/9p/9p.h | 8 +- + include/net/9p/client.h | 2 +- + include/net/9p/transport.h | 2 +- + include/net/caif/cfcnfg.h | 2 +- + include/net/gen_stats.h | 2 +- + include/net/ip_vs.h | 2 +- + include/net/irda/irlap.h | 2 +- + include/net/irda/wrapper.h | 2 +- + include/net/iucv/iucv.h | 2 +- + include/net/iw_handler.h | 4 +- + include/net/mac80211.h | 2 +- + include/net/pkt_sched.h | 2 +- + include/net/sock.h | 2 +- + include/net/transp_v6.h | 2 +- + include/net/wimax.h | 2 +- + include/net/wpan-phy.h | 2 +- + include/rxrpc/packet.h | 2 +- + include/scsi/fc/fc_fcp.h | 2 +- + include/scsi/iscsi_if.h | 2 +- + include/scsi/libfc.h | 8 +- + include/scsi/libiscsi_tcp.h | 2 +- + include/scsi/osd_initiator.h | 2 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_transport_fc.h | 6 +- + include/sound/ac97_codec.h | 2 +- + include/sound/control.h | 2 +- + include/sound/cs46xx_dsp_spos.h | 2 +- + include/sound/hdspm.h | 2 +- + include/sound/soc-dapm.h | 2 +- + include/target/target_core_base.h | 6 +- + include/target/target_core_fabric_ops.h | 2 +- + include/video/kyro.h | 2 +- + include/video/neomagic.h | 2 +- + include/video/newport.h | 2 +- + include/video/sisfb.h | 2 +- + include/video/sstfb.h | 6 +- + include/xen/interface/elfnote.h | 2 +- + init/do_mounts.c | 2 +- + ipc/msg.c | 4 +- + ipc/sem.c | 2 +- + ipc/shm.c | 2 +- + kernel/audit_tree.c | 2 +- + kernel/auditsc.c | 2 +- + kernel/cgroup.c | 2 +- + kernel/cpu.c | 2 +- + kernel/debug/debug_core.c | 2 +- + kernel/debug/kdb/kdb_main.c | 6 +- + kernel/debug/kdb/kdb_support.c | 2 +- + kernel/exit.c | 2 +- + kernel/irq/chip.c | 2 +- + kernel/irq/manage.c | 1 + + kernel/irq/migration.c | 2 +- + kernel/kexec.c | 6 +- + kernel/kthread.c | 2 +- + kernel/latencytop.c | 2 +- + kernel/lockdep.c | 4 +- + kernel/module.c | 6 +- + kernel/mutex.c | 2 +- + kernel/padata.c | 8 +- + kernel/params.c | 2 +- + kernel/posix-cpu-timers.c | 2 +- + kernel/posix-timers.c | 2 +- + kernel/power/main.c | 2 +- + kernel/sched.c | 9 +- + kernel/sched_autogroup.c | 2 +- + kernel/sched_fair.c | 18 +- + kernel/sched_rt.c | 4 +- + kernel/signal.c | 2 +- + kernel/softirq.c | 2 +- + kernel/time/jiffies.c | 2 +- + kernel/time/timer_stats.c | 2 +- + kernel/trace/ftrace.c | 4 +- + kernel/trace/ring_buffer.c | 4 +- + kernel/trace/trace.c | 2 +- + kernel/trace/trace_clock.c | 2 +- + kernel/trace/trace_entries.h | 2 +- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_irqsoff.c | 2 +- + kernel/trace/trace_kprobe.c | 2 +- + kernel/user-return-notifier.c | 2 +- + kernel/wait.c | 2 +- + kernel/workqueue.c | 2 +- + lib/bitmap.c | 2 +- + lib/btree.c | 4 +- + lib/decompress_unxz.c | 2 +- + lib/parser.c | 2 +- + lib/timerqueue.c | 2 +- + mm/backing-dev.c | 2 +- + mm/hugetlb.c | 10 +- + mm/hwpoison-inject.c | 2 +- + mm/internal.h | 2 +- + mm/kmemleak.c | 6 +- + mm/ksm.c | 2 +- + mm/memcontrol.c | 8 +- + mm/memory-failure.c | 6 +- + mm/memory_hotplug.c | 2 +- + mm/migrate.c | 2 +- + mm/mremap.c | 11 +- + mm/nobootmem.c | 2 +- + mm/page_alloc.c | 4 +- + mm/page_cgroup.c | 2 +- + mm/percpu.c | 10 +- + mm/slab.c | 4 +- + mm/slub.c | 8 +- + mm/sparse.c | 2 +- + mm/util.c | 2 +- + mm/vmscan.c | 4 +- + net/8021q/vlanproc.c | 2 +- + net/9p/client.c | 2 +- + net/9p/trans_common.c | 4 +- + net/9p/util.c | 2 +- + net/atm/br2684.c | 2 +- + net/atm/lec.h | 2 +- + net/batman-adv/soft-interface.c | 2 +- + net/bluetooth/hci_core.c | 2 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/bridge/br_fdb.c | 2 +- + net/bridge/br_ioctl.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/can/bcm.c | 2 +- + net/ceph/osd_client.c | 2 +- + net/core/dev.c | 12 +- + net/core/filter.c | 2 +- + net/core/link_watch.c | 2 +- + net/core/rtnetlink.c | 4 +- + net/core/skbuff.c | 2 +- + net/core/sock.c | 10 +- + net/dccp/output.c | 2 +- + net/dsa/mv88e6131.c | 2 +- + net/ipv4/cipso_ipv4.c | 8 +- + net/ipv4/fib_trie.c | 2 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/ip_output.c | 2 +- + net/ipv4/ipconfig.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 4 +- + net/ipv4/netfilter/ip_tables.c | 2 +- + net/ipv4/netfilter/nf_nat_core.c | 4 +- + net/ipv4/raw.c | 2 +- + net/ipv4/route.c | 4 +- + net/ipv4/tcp_lp.c | 2 +- + net/ipv4/tcp_output.c | 2 +- + net/ipv4/tcp_yeah.c | 2 +- + net/ipv4/udp.c | 2 +- + net/ipv6/addrconf.c | 4 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 2 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 2 +- + net/irda/irlap.c | 2 +- + net/irda/irlap_event.c | 8 +- + net/irda/irlap_frame.c | 2 +- + net/irda/irlmp_event.c | 2 +- + net/irda/irnet/irnet.h | 2 +- + net/irda/irqueue.c | 2 +- + net/irda/irttp.c | 2 +- + net/irda/qos.c | 8 +- + net/irda/timer.c | 2 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 4 +- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh_pathtbl.c | 2 +- + net/mac80211/rc80211_minstrel_ht.c | 2 +- + net/mac80211/rc80211_pid.h | 2 +- + net/mac80211/rx.c | 2 +- + net/mac80211/sta_info.c | 4 +- + net/mac80211/sta_info.h | 2 +- + net/netfilter/ipset/ip_set_core.c | 2 +- + net/netfilter/ipvs/ip_vs_conn.c | 4 +- + net/netfilter/ipvs/ip_vs_lblc.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 8 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_proto_dccp.c | 2 +- + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- + net/netfilter/nf_conntrack_sip.c | 2 +- + net/netfilter/nf_queue.c | 2 +- + net/netlabel/netlabel_domainhash.c | 10 +- + net/netlabel/netlabel_mgmt.c | 2 +- + net/rds/ib_send.c | 2 +- + net/rds/iw_cm.c | 2 +- + net/rds/iw_rdma.c | 2 +- + net/rds/iw_send.c | 2 +- + net/rds/send.c | 2 +- + net/rose/rose_route.c | 2 +- + net/sched/act_api.c | 2 +- + net/sched/act_pedit.c | 2 +- + net/sched/em_meta.c | 2 +- + net/sched/sch_htb.c | 2 +- + net/sched/sch_netem.c | 6 +- + net/sctp/associola.c | 2 +- + net/sctp/auth.c | 6 +- + net/sctp/input.c | 2 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 6 +- + net/sctp/sm_sideeffect.c | 2 +- + net/sctp/sm_statefuns.c | 20 +- + net/sctp/socket.c | 2 +- + net/sctp/ulpevent.c | 2 +- + net/sctp/ulpqueue.c | 2 +- + net/socket.c | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 2 +- + net/sunrpc/xprtsock.c | 4 +- + net/tipc/link.c | 2 +- + net/tipc/name_distr.c | 2 +- + net/unix/af_unix.c | 2 +- + net/wanrouter/wanproc.c | 2 +- + net/wireless/reg.c | 4 +- + net/x25/x25_facilities.c | 2 +- + net/x25/x25_forward.c | 4 +- + net/xfrm/xfrm_user.c | 6 +- + samples/Kconfig | 2 +- + samples/hw_breakpoint/data_breakpoint.c | 2 +- + scripts/Makefile.modpost | 4 +- + scripts/checkpatch.pl | 6 +- + scripts/dtc/libfdt/libfdt.h | 2 +- + scripts/dtc/livetree.c | 2 +- + scripts/gen_initramfs_list.sh | 2 +- + scripts/kernel-doc | 2 +- + scripts/package/buildtar | 2 +- + scripts/rt-tester/rt-tester.py | 2 +- + security/apparmor/match.c | 2 +- + security/apparmor/policy_unpack.c | 2 +- + security/selinux/netlabel.c | 2 +- + security/selinux/ss/services.c | 4 +- + security/smack/smack_access.c | 2 +- + security/smack/smack_lsm.c | 6 +- + security/smack/smackfs.c | 6 +- + security/tomoyo/load_policy.c | 2 +- + sound/aoa/codecs/tas.c | 2 +- + sound/core/pcm_memory.c | 6 +- + sound/core/pcm_native.c | 2 +- + sound/core/seq/seq_dummy.c | 2 +- + sound/core/vmaster.c | 2 +- + sound/drivers/pcm-indirect2.c | 4 +- + sound/drivers/vx/vx_pcm.c | 2 +- + sound/isa/sb/emu8000.c | 2 +- + sound/isa/wavefront/wavefront_midi.c | 2 +- + sound/isa/wss/wss_lib.c | 2 +- + sound/oss/ac97_codec.c | 6 +- + sound/oss/audio.c | 4 +- + sound/oss/dmasound/dmasound_core.c | 2 +- + sound/oss/midibuf.c | 2 +- + sound/oss/sb_card.c | 2 +- + sound/oss/sb_ess.c | 2 +- + sound/oss/swarm_cs4297a.c | 2 +- + sound/oss/vidc.c | 2 +- + sound/pci/ad1889.c | 2 +- + sound/pci/asihpi/asihpi.c | 2 +- + sound/pci/asihpi/hpi.h | 2 +- + sound/pci/asihpi/hpi6000.c | 2 +- + sound/pci/asihpi/hpi6205.c | 2 +- + sound/pci/asihpi/hpi_internal.h | 2 +- + sound/pci/asihpi/hpimsgx.c | 2 +- + sound/pci/au88x0/au88x0.h | 2 +- + sound/pci/au88x0/au88x0_a3d.c | 4 +- + sound/pci/au88x0/au88x0_pcm.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/ca0106/ca0106.h | 6 +- + sound/pci/ca0106/ca0106_main.c | 2 +- + sound/pci/ca0106/ca0106_mixer.c | 2 +- + sound/pci/ca0106/ca0106_proc.c | 2 +- + sound/pci/cmipci.c | 8 +- + sound/pci/ctxfi/ctatc.c | 2 +- + sound/pci/ctxfi/cthw20k1.c | 2 +- + sound/pci/emu10k1/memory.c | 2 +- + sound/pci/emu10k1/p16v.c | 2 +- + sound/pci/emu10k1/p16v.h | 4 +- + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/patch_realtek.c | 4 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/pci/ice1712/aureon.c | 4 +- + sound/pci/ice1712/ice1712.c | 4 +- + sound/pci/ice1712/pontis.c | 2 +- + sound/pci/ice1712/prodigy_hifi.c | 4 +- + sound/pci/intel8x0.c | 2 +- + sound/pci/intel8x0m.c | 2 +- + sound/pci/mixart/mixart_core.c | 4 +- + sound/pci/pcxhr/pcxhr_core.c | 12 +- + sound/pci/rme96.c | 2 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/sis7019.c | 6 +- + sound/ppc/snd_ps3.c | 2 +- + sound/ppc/snd_ps3_reg.h | 14 +- + sound/soc/atmel/atmel_ssc_dai.c | 2 +- + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/tlv320aic26.h | 4 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/twl4030.c | 6 +- + sound/soc/codecs/wm8580.c | 2 +- + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994.c | 6 +- + sound/soc/codecs/wm9081.c | 4 +- + sound/soc/imx/imx-ssi.c | 2 +- + sound/soc/kirkwood/kirkwood-dma.c | 4 +- + sound/soc/mid-x86/sst_platform.c | 4 +- + sound/soc/omap/ams-delta.c | 6 +- + sound/soc/samsung/neo1973_wm8753.c | 4 +- + sound/usb/6fire/firmware.c | 4 +- + sound/usb/mixer.c | 2 +- + sound/usb/quirks.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 4 +- + tools/perf/util/probe-event.c | 19 +- + tools/perf/util/probe-finder.c | 159 ++-- + tools/perf/util/string.c | 2 +- + .../x86_energy_perf_policy.c | 2 +- + virt/kvm/eventfd.c | 4 +- + virt/kvm/kvm_main.c | 23 +- + 2545 files changed, 5196 insertions(+), 6670 deletions(-) + delete mode 100644 drivers/staging/memrar/Kconfig + delete mode 100644 drivers/staging/memrar/Makefile + delete mode 100644 drivers/staging/memrar/TODO + delete mode 100644 drivers/staging/memrar/memrar-abi + delete mode 100644 drivers/staging/memrar/memrar.h + delete mode 100644 drivers/staging/memrar/memrar_allocator.c + delete mode 100644 drivers/staging/memrar/memrar_allocator.h + delete mode 100644 drivers/staging/memrar/memrar_handler.c +Merging fixes/fixes +$ git merge fixes/fixes +Already up-to-date. +Merging kbuild-current/rc-fixes +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arm-current/master +$ git merge arm-current/master +Already up-to-date. +Merging m68k-current/for-linus +$ git merge m68k-current/for-linus +Merge made by recursive. + arch/m68k/include/asm/unistd.h | 6 +++++- + arch/m68k/kernel/entry_mm.S | 4 ++++ + arch/m68k/kernel/syscalltable.S | 4 ++++ + 3 files changed, 13 insertions(+), 1 deletions(-) +Merging powerpc-merge/merge +$ git merge powerpc-merge/merge +Already up-to-date. +Merging 52xx-and-virtex-current/powerpc/merge +$ git merge 52xx-and-virtex-current/powerpc/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 drivers/net/benet/be_main.c +Auto-merging drivers/net/pppoe.c +Auto-merging drivers/net/smsc911x.c +Auto-merging include/net/ip_vs.h +Auto-merging include/net/mac80211.h +Auto-merging net/dsa/mv88e6131.c +Auto-merging net/ipv4/route.c +Auto-merging net/mac80211/rx.c +Auto-merging net/netfilter/ipset/ip_set_core.c +Merge made by recursive. + MAINTAINERS | 7 ++ + drivers/net/benet/be.h | 4 +- + drivers/net/benet/be_main.c | 19 ++-- + drivers/net/bna/bfa_ioc.c | 10 +-- + drivers/net/can/mcp251x.c | 3 +- + drivers/net/pppoe.c | 2 +- + drivers/net/smsc911x.c | 8 +- + drivers/net/wireless/ath/ath9k/hw.c | 1 + + drivers/net/wireless/b43/dma.c | 2 +- + drivers/net/wireless/b43/dma.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 2 +- + drivers/net/wireless/p54/p54usb.c | 2 + + drivers/net/wireless/rt2x00/rt2x00dev.c | 6 +- + drivers/net/wireless/rtlwifi/efuse.c | 2 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 2 +- + drivers/net/wireless/rtlwifi/usb.c | 2 +- + drivers/net/wireless/wl12xx/sdio.c | 2 +- + drivers/net/wireless/wl12xx/spi.c | 2 +- + drivers/net/wireless/wl12xx/testmode.c | 5 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 20 ++++- + drivers/net/wireless/zd1211rw/zd_usb.h | 1 + + include/linux/can/platform/mcp251x.h | 2 + + include/linux/netfilter.h | 3 +- + include/linux/netfilter/ipset/ip_set.h | 2 +- + include/linux/netfilter/ipset/ip_set_ahash.h | 3 +- + include/net/ip_vs.h | 2 +- + include/net/mac80211.h | 15 +++- + include/net/route.h | 5 +- + net/dsa/mv88e6131.c | 23 ++++- + net/dsa/mv88e6xxx.h | 2 + + net/ipv4/netfilter.c | 5 +- + net/ipv4/route.c | 8 +- + net/ipv4/xfrm4_policy.c | 1 + + net/ipv6/netfilter.c | 13 ++- + net/ipv6/tcp_ipv6.c | 4 +- + net/ipv6/udp.c | 3 + + net/mac80211/rx.c | 2 +- + net/netfilter/Kconfig | 1 - + net/netfilter/ipset/ip_set_bitmap_ip.c | 3 +- + net/netfilter/ipset/ip_set_bitmap_ipmac.c | 3 +- + net/netfilter/ipset/ip_set_bitmap_port.c | 3 +- + net/netfilter/ipset/ip_set_core.c | 109 +++++++++++++-------- + net/netfilter/ipset/ip_set_list_set.c | 53 +++++------ + net/netfilter/ipvs/ip_vs_ctl.c | 2 +- + net/netfilter/nf_conntrack_h323_asn1.c | 2 +- + net/netfilter/nf_conntrack_h323_main.c | 16 ++-- + net/netfilter/xt_TCPMSS.c | 2 +- + net/netfilter/xt_addrtype.c | 42 ++++++--- + net/netfilter/xt_conntrack.c | 2 +- + 49 files changed, 273 insertions(+), 162 deletions(-) +Merging sound-current/for-linus +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus +$ git merge pci-current/for-linus +Already up-to-date. +Merging wireless-current/master +$ git merge wireless-current/master +Merge made by recursive. + drivers/net/wireless/ath/regd_common.h | 1 + + drivers/net/wireless/iwlwifi/iwl-5000.c | 3 +++ + drivers/net/wireless/mwl8k.c | 9 ++++++++- + 3 files changed, 12 insertions(+), 1 deletions(-) +Merging driver-core.current/driver-core-linus +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus +$ git merge usb.current/usb-linus +Already up-to-date. +Merging staging.current/staging-linus +$ git merge staging.current/staging-linus +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/keyboard/twl4030_keypad.c | 2 +- + drivers/input/touchscreen/h3600_ts_input.c | 17 ++++++++++------- + 2 files changed, 11 insertions(+), 8 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 sh-current/sh-fixes-for-linus +$ git merge sh-current/sh-fixes-for-linus +Already up-to-date. +Merging rmobile-current/rmobile-fixes-for-linus +$ git merge rmobile-current/rmobile-fixes-for-linus +Already up-to-date. +Merging fbdev-current/fbdev-fixes-for-linus +$ git merge fbdev-current/fbdev-fixes-for-linus +Already up-to-date. +Merging devicetree-current/devicetree/merge +$ git merge devicetree-current/devicetree/merge +Removing arch/powerpc/boot/dtc-src/.gitignore +Merge made by recursive. + arch/powerpc/boot/.gitignore | 1 - + arch/powerpc/boot/dtc-src/.gitignore | 3 --- + 2 files changed, 0 insertions(+), 4 deletions(-) + delete mode 100644 arch/powerpc/boot/dtc-src/.gitignore +Merging spi-current/spi/merge +$ git merge spi-current/spi/merge +Merge made by recursive. + drivers/gpio/ml_ioh_gpio.c | 1 + + drivers/gpio/pca953x.c | 5 +++-- + drivers/gpio/pch_gpio.c | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging arm/for-next +$ git merge arm/for-next +Already up-to-date. +Merging davinci/davinci-next +$ git merge davinci/davinci-next +Already up-to-date. +Merging i.MX/for-next +$ git merge i.MX/for-next +Resolved 'arch/arm/mach-mxs/mach-mx28evk.c' using previous resolution. +Auto-merging arch/arm/mach-mxs/mach-mx28evk.c +CONFLICT (content): Merge conflict in arch/arm/mach-mxs/mach-mx28evk.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 877aed1] Merge remote-tracking branch 'i.MX/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging linux-spec/for-next +$ git merge linux-spec/for-next +Already up-to-date. +Merging msm/for-next +$ git merge msm/for-next +Already up-to-date. +Merging omap/for-next +$ git merge omap/for-next +Already up-to-date. +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 s5p/for-next +$ git merge s5p/for-next +Merge made by recursive. + arch/arm/configs/exynos4_defconfig | 2 + + arch/arm/mach-exynos4/Kconfig | 2 + + arch/arm/mach-exynos4/Makefile | 1 + + arch/arm/mach-exynos4/cpuidle.c | 86 ++++++++++++++++++++++++++++++++++ + arch/arm/mach-exynos4/mach-nuri.c | 89 ++++++++++++++++++++++++++++++++++++ + 5 files changed, 180 insertions(+), 0 deletions(-) + create mode 100644 arch/arm/mach-exynos4/cpuidle.c +Merging tegra/for-next +$ git merge tegra/for-next +Already up-to-date. +Merging ux500-core/ux500-core +$ git merge ux500-core/ux500-core +Auto-merging arch/arm/mach-ux500/board-mop500.c +Removing arch/arm/mach-ux500/cpufreq.c +Auto-merging arch/arm/mach-ux500/include/mach/db8500-regs.h +Removing arch/arm/mach-ux500/include/mach/prcmu-defs.h +Removing arch/arm/mach-ux500/include/mach/prcmu.h +Removing arch/arm/mach-ux500/prcmu.c +Merge made by recursive. + arch/arm/configs/u8500_defconfig | 29 +- + arch/arm/mach-ux500/Kconfig | 16 +- + arch/arm/mach-ux500/Makefile | 11 +- + arch/arm/mach-ux500/board-mop500-regulators.c | 9 +- + arch/arm/mach-ux500/board-mop500-sdi.c | 41 +- + arch/arm/mach-ux500/board-mop500.c | 22 +- + arch/arm/mach-ux500/board-mop500.h | 5 + + arch/arm/mach-ux500/board-snowball-pins.c | 133 ++ + arch/arm/mach-ux500/board-snowball.c | 359 ++++ + arch/arm/mach-ux500/board-snowball.h | 12 + + arch/arm/mach-ux500/clock-db8500.c | 1291 +++++++++++++ + arch/arm/mach-ux500/clock.c | 904 +++------- + arch/arm/mach-ux500/clock.h | 225 +-- + arch/arm/mach-ux500/cpu-db5500.c | 2 + + arch/arm/mach-ux500/cpu-db8500.c | 190 ++ + arch/arm/mach-ux500/cpu.c | 7 +- + arch/arm/mach-ux500/cpufreq.c | 211 -- + arch/arm/mach-ux500/include/mach/db5500-regs.h | 20 +- + arch/arm/mach-ux500/include/mach/db8500-regs.h | 37 +- + arch/arm/mach-ux500/include/mach/hardware.h | 1 + + arch/arm/mach-ux500/include/mach/id.h | 20 + + .../mach-ux500/include/mach/irqs-board-mop500.h | 5 + + .../arm/mach-ux500/include/mach/irqs-board-u5500.h | 21 + + arch/arm/mach-ux500/include/mach/irqs-db5500.h | 27 + + arch/arm/mach-ux500/include/mach/irqs-db8500.h | 54 + + arch/arm/mach-ux500/include/mach/irqs.h | 46 +- + arch/arm/mach-ux500/include/mach/prcmu-db5500.h | 45 + + arch/arm/mach-ux500/include/mach/prcmu-defs.h | 30 - + arch/arm/mach-ux500/include/mach/prcmu-fw-api.h | 523 +++++ + .../arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h | 467 +++++ + arch/arm/mach-ux500/include/mach/prcmu-regs.h | 27 +- + arch/arm/mach-ux500/include/mach/prcmu.h | 28 - + arch/arm/mach-ux500/include/mach/uncompress.h | 3 +- + arch/arm/mach-ux500/pins-db8500.h | 142 +- + arch/arm/mach-ux500/pm/Kconfig | 6 + + arch/arm/mach-ux500/pm/Makefile | 4 + + arch/arm/mach-ux500/pm/cpufreq.c | 171 ++ + arch/arm/mach-ux500/prcmu-db5500.c | 449 +++++ + arch/arm/mach-ux500/prcmu-db8500.c | 2018 ++++++++++++++++++++ + arch/arm/mach-ux500/prcmu-regs-db8500.h | 162 ++ + arch/arm/mach-ux500/prcmu.c | 394 ---- + arch/arm/mach-ux500/regulator-db8500.c | 562 ++++++ + arch/arm/mach-ux500/regulator-db8500.h | 45 + + arch/arm/plat-nomadik/include/plat/pincfg.h | 5 - + drivers/mfd/ab8500-i2c.c | 2 +- + 45 files changed, 7199 insertions(+), 1582 deletions(-) + create mode 100644 arch/arm/mach-ux500/board-snowball-pins.c + create mode 100644 arch/arm/mach-ux500/board-snowball.c + create mode 100644 arch/arm/mach-ux500/board-snowball.h + create mode 100644 arch/arm/mach-ux500/clock-db8500.c + delete mode 100644 arch/arm/mach-ux500/cpufreq.c + create mode 100644 arch/arm/mach-ux500/include/mach/irqs-board-u5500.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-db5500.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu-defs.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-api.h + create mode 100644 arch/arm/mach-ux500/include/mach/prcmu-fw-defs_v1.h + delete mode 100644 arch/arm/mach-ux500/include/mach/prcmu.h + create mode 100644 arch/arm/mach-ux500/pm/Kconfig + create mode 100644 arch/arm/mach-ux500/pm/Makefile + create mode 100644 arch/arm/mach-ux500/pm/cpufreq.c + create mode 100644 arch/arm/mach-ux500/prcmu-db5500.c + create mode 100644 arch/arm/mach-ux500/prcmu-db8500.c + create mode 100644 arch/arm/mach-ux500/prcmu-regs-db8500.h + delete mode 100644 arch/arm/mach-ux500/prcmu.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.c + create mode 100644 arch/arm/mach-ux500/regulator-db8500.h +Merging xilinx/arm-next +$ git merge xilinx/arm-next +Auto-merging arch/arm/Kconfig +Merge made by recursive. + arch/arm/Kconfig | 14 ++ + arch/arm/Makefile | 1 + + arch/arm/mach-zynq/Kconfig | 14 ++ + arch/arm/mach-zynq/Makefile | 7 + + arch/arm/mach-zynq/Makefile.boot | 3 + + arch/arm/mach-zynq/board_ep107.c | 85 +++++++ + arch/arm/mach-zynq/common.c | 114 ++++++++++ + arch/arm/mach-zynq/common.h | 30 +++ + arch/arm/mach-zynq/include/mach/clkdev.h | 33 +++ + arch/arm/mach-zynq/include/mach/debug-macro.S | 36 +++ + arch/arm/mach-zynq/include/mach/entry-macro.S | 30 +++ + arch/arm/mach-zynq/include/mach/hardware.h | 18 ++ + arch/arm/mach-zynq/include/mach/io.h | 33 +++ + arch/arm/mach-zynq/include/mach/irqs.h | 29 +++ + arch/arm/mach-zynq/include/mach/memory.h | 23 ++ + arch/arm/mach-zynq/include/mach/system.h | 28 +++ + arch/arm/mach-zynq/include/mach/timex.h | 23 ++ + arch/arm/mach-zynq/include/mach/uart.h | 25 ++ + arch/arm/mach-zynq/include/mach/uncompress.h | 51 +++++ + arch/arm/mach-zynq/include/mach/vmalloc.h | 20 ++ + arch/arm/mach-zynq/include/mach/zynq_soc.h | 48 ++++ + arch/arm/mach-zynq/timer.c | 297 +++++++++++++++++++++++++ + arch/arm/mm/Kconfig | 2 +- + 23 files changed, 963 insertions(+), 1 deletions(-) + create mode 100644 arch/arm/mach-zynq/Kconfig + create mode 100644 arch/arm/mach-zynq/Makefile + create mode 100644 arch/arm/mach-zynq/Makefile.boot + create mode 100644 arch/arm/mach-zynq/board_ep107.c + create mode 100644 arch/arm/mach-zynq/common.c + create mode 100644 arch/arm/mach-zynq/common.h + create mode 100644 arch/arm/mach-zynq/include/mach/clkdev.h + create mode 100644 arch/arm/mach-zynq/include/mach/debug-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/entry-macro.S + create mode 100644 arch/arm/mach-zynq/include/mach/hardware.h + create mode 100644 arch/arm/mach-zynq/include/mach/io.h + create mode 100644 arch/arm/mach-zynq/include/mach/irqs.h + create mode 100644 arch/arm/mach-zynq/include/mach/memory.h + create mode 100644 arch/arm/mach-zynq/include/mach/system.h + create mode 100644 arch/arm/mach-zynq/include/mach/timex.h + create mode 100644 arch/arm/mach-zynq/include/mach/uart.h + create mode 100644 arch/arm/mach-zynq/include/mach/uncompress.h + create mode 100644 arch/arm/mach-zynq/include/mach/vmalloc.h + create mode 100644 arch/arm/mach-zynq/include/mach/zynq_soc.h + create mode 100644 arch/arm/mach-zynq/timer.c +Merging avr32/avr32-arch +$ git merge avr32/avr32-arch +Already up-to-date. +Merging blackfin/for-linus +$ git merge blackfin/for-linus +Already up-to-date. +Merging cris/for-next +$ git merge cris/for-next +Merge made by recursive. + arch/cris/include/arch-v32/arch/cache.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging ia64/test +$ git merge ia64/test +Merge made by recursive. + arch/ia64/oprofile/backtrace.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging m68k/for-next +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next +$ git merge m68knommu/for-next +Removing arch/m68k/lib/Makefile_mm +Removing arch/m68k/lib/Makefile_no +Removing arch/m68k/lib/muldi3_mm.c +Removing arch/m68k/lib/muldi3_no.c +Removing arch/m68k/lib/string.c +Merge made by recursive. + arch/m68k/kernel/m68k_ksyms_no.c | 7 - + arch/m68k/lib/Makefile | 13 ++- + arch/m68k/lib/Makefile_mm | 6 - + arch/m68k/lib/Makefile_no | 7 - + arch/m68k/lib/memcpy.c | 128 +++++++++++--------- + arch/m68k/lib/memmove.c | 2 - + arch/m68k/lib/memset.c | 114 +++++++++++------- + arch/m68k/lib/muldi3.c | 99 +++++++++++++++- + arch/m68k/lib/muldi3_mm.c | 63 ---------- + arch/m68k/lib/muldi3_no.c | 86 ------------- + arch/m68k/lib/string.c | 245 -------------------------------------- + 11 files changed, 251 insertions(+), 519 deletions(-) + delete mode 100644 arch/m68k/lib/Makefile_mm + delete mode 100644 arch/m68k/lib/Makefile_no + delete mode 100644 arch/m68k/lib/muldi3_mm.c + delete mode 100644 arch/m68k/lib/muldi3_no.c + delete mode 100644 arch/m68k/lib/string.c +Merging microblaze/next +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next +$ git merge mips/mips-for-linux-next +Auto-merging arch/mips/Kconfig +Merge made by recursive. + arch/mips/Kbuild.platforms | 1 + + arch/mips/Kconfig | 19 + + arch/mips/include/asm/mach-lantiq/lantiq.h | 59 ++ + .../mips/include/asm/mach-lantiq/lantiq_platform.h | 46 ++ + arch/mips/include/asm/mach-lantiq/war.h | 24 + + arch/mips/include/asm/mach-lantiq/xway/irq.h | 18 + + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 62 ++ + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 139 ++++ + arch/mips/kernel/vmlinux.lds.S | 1 + + arch/mips/lantiq/Kconfig | 23 + + arch/mips/lantiq/Makefile | 11 + + arch/mips/lantiq/Platform | 8 + + arch/mips/lantiq/clk.c | 140 ++++ + arch/mips/lantiq/clk.h | 18 + + arch/mips/lantiq/devices.c | 125 ++++ + arch/mips/lantiq/devices.h | 20 + + arch/mips/lantiq/early_printk.c | 33 + + arch/mips/lantiq/irq.c | 326 +++++++++ + arch/mips/lantiq/machtypes.h | 20 + + arch/mips/lantiq/prom.c | 71 ++ + arch/mips/lantiq/prom.h | 24 + + arch/mips/lantiq/setup.c | 65 ++ + arch/mips/lantiq/xway/Kconfig | 23 + + arch/mips/lantiq/xway/Makefile | 7 + + arch/mips/lantiq/xway/clk-ase.c | 48 ++ + arch/mips/lantiq/xway/clk-xway.c | 223 ++++++ + arch/mips/lantiq/xway/devices.c | 77 ++ + arch/mips/lantiq/xway/devices.h | 17 + + arch/mips/lantiq/xway/ebu.c | 53 ++ + arch/mips/lantiq/xway/gpio.c | 195 +++++ + arch/mips/lantiq/xway/gpio_ebu.c | 126 ++++ + arch/mips/lantiq/xway/gpio_stp.c | 157 ++++ + arch/mips/lantiq/xway/mach-easy50601.c | 69 ++ + arch/mips/lantiq/xway/mach-easy50712.c | 74 ++ + arch/mips/lantiq/xway/pmu.c | 70 ++ + arch/mips/lantiq/xway/prom-ase.c | 39 + + arch/mips/lantiq/xway/prom-xway.c | 54 ++ + arch/mips/lantiq/xway/reset.c | 79 ++ + arch/mips/pci/Makefile | 1 + + arch/mips/pci/ops-lantiq.c | 116 +++ + arch/mips/pci/pci-lantiq.c | 297 ++++++++ + arch/mips/pci/pci-lantiq.h | 18 + + drivers/tty/serial/Kconfig | 8 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/lantiq.c | 756 ++++++++++++++++++++ + lib/Kconfig.debug | 2 +- + 46 files changed, 3762 insertions(+), 1 deletions(-) + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/lantiq_platform.h + create mode 100644 arch/mips/include/asm/mach-lantiq/war.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_irq.h + create mode 100644 arch/mips/include/asm/mach-lantiq/xway/lantiq_soc.h + create mode 100644 arch/mips/lantiq/Kconfig + create mode 100644 arch/mips/lantiq/Makefile + create mode 100644 arch/mips/lantiq/Platform + create mode 100644 arch/mips/lantiq/clk.c + create mode 100644 arch/mips/lantiq/clk.h + create mode 100644 arch/mips/lantiq/devices.c + create mode 100644 arch/mips/lantiq/devices.h + create mode 100644 arch/mips/lantiq/early_printk.c + create mode 100644 arch/mips/lantiq/irq.c + create mode 100644 arch/mips/lantiq/machtypes.h + create mode 100644 arch/mips/lantiq/prom.c + create mode 100644 arch/mips/lantiq/prom.h + create mode 100644 arch/mips/lantiq/setup.c + create mode 100644 arch/mips/lantiq/xway/Kconfig + create mode 100644 arch/mips/lantiq/xway/Makefile + create mode 100644 arch/mips/lantiq/xway/clk-ase.c + create mode 100644 arch/mips/lantiq/xway/clk-xway.c + create mode 100644 arch/mips/lantiq/xway/devices.c + create mode 100644 arch/mips/lantiq/xway/devices.h + create mode 100644 arch/mips/lantiq/xway/ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio.c + create mode 100644 arch/mips/lantiq/xway/gpio_ebu.c + create mode 100644 arch/mips/lantiq/xway/gpio_stp.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50601.c + create mode 100644 arch/mips/lantiq/xway/mach-easy50712.c + create mode 100644 arch/mips/lantiq/xway/pmu.c + create mode 100644 arch/mips/lantiq/xway/prom-ase.c + create mode 100644 arch/mips/lantiq/xway/prom-xway.c + create mode 100644 arch/mips/lantiq/xway/reset.c + create mode 100644 arch/mips/pci/ops-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.c + create mode 100644 arch/mips/pci/pci-lantiq.h + create mode 100644 drivers/tty/serial/lantiq.c +Merging parisc/for-next +$ git merge parisc/for-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/powerpc/next +$ git merge 52xx-and-virtex/powerpc/next +Already up-to-date. +Merging galak/next +$ git merge galak/next +Already up-to-date. +Merging s390/features +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/mm/fault.c +Auto-merging drivers/s390/block/dasd_eckd.c +Auto-merging drivers/s390/char/raw3270.c +Removing drivers/s390/char/tape_block.c +Auto-merging drivers/s390/cio/device_fsm.c +Merge made by recursive. + arch/s390/Kconfig | 11 - + arch/s390/appldata/appldata_base.c | 2 - + arch/s390/include/asm/elf.h | 12 - + arch/s390/include/asm/hugetlb.h | 17 +- + arch/s390/include/asm/mmu.h | 3 - + arch/s390/include/asm/mmu_context.h | 3 - + arch/s390/include/asm/pgalloc.h | 28 +-- + arch/s390/include/asm/pgtable.h | 38 --- + arch/s390/include/asm/tlbflush.h | 11 +- + arch/s390/kernel/head.S | 2 +- + arch/s390/kernel/setup.c | 31 +--- + arch/s390/kernel/switch_cpu.S | 4 +- + arch/s390/kernel/switch_cpu64.S | 4 +- + arch/s390/kernel/vdso32/Makefile | 3 + + arch/s390/kernel/vdso64/Makefile | 3 + + arch/s390/mm/extmem.c | 6 +- + arch/s390/mm/fault.c | 39 --- + arch/s390/mm/hugetlbpage.c | 10 - + arch/s390/mm/pgtable.c | 64 +----- + arch/s390/oprofile/hwsampler.c | 6 +- + drivers/crypto/Kconfig | 2 + + drivers/s390/block/dasd_alias.c | 4 - + drivers/s390/block/dasd_eckd.c | 11 +- + drivers/s390/char/Kconfig | 12 - + drivers/s390/char/Makefile | 1 - + drivers/s390/char/monwriter.c | 4 +- + drivers/s390/char/raw3270.c | 2 - + drivers/s390/char/sclp_sdias.c | 3 - + drivers/s390/char/tape_3590.c | 11 +- + drivers/s390/char/tape_block.c | 445 ----------------------------------- + drivers/s390/char/tape_std.c | 3 +- + drivers/s390/cio/device.c | 24 ++- + drivers/s390/cio/device_fsm.c | 3 - + drivers/s390/cio/device_ops.c | 3 - + drivers/s390/cio/qdio_main.c | 16 +- + drivers/s390/crypto/ap_bus.c | 8 +- + 36 files changed, 76 insertions(+), 773 deletions(-) + delete mode 100644 drivers/s390/char/tape_block.c +Merging sh/sh-latest +$ git merge sh/sh-latest +Already up-to-date. +Merging rmobile/rmobile-latest +$ git merge rmobile/rmobile-latest +Already up-to-date. +Merging sparc/master +$ git merge sparc/master +Already up-to-date. +Merging tile/master +$ git merge tile/master +Already up-to-date. +Merging unicore32/unicore32 +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/master +$ git merge xtensa/master +Resolved 'arch/xtensa/configs/iss_defconfig' using previous resolution. +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/xtensa/Makefile +Auto-merging arch/xtensa/boot/Makefile +Auto-merging arch/xtensa/configs/iss_defconfig +CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig +Auto-merging arch/xtensa/include/asm/coprocessor.h +Auto-merging arch/xtensa/kernel/Makefile +Auto-merging arch/xtensa/kernel/time.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c0c3115] Merge remote-tracking branch 'xtensa/master' +$ git diff -M --stat --summary HEAD^.. + arch/xtensa/Kconfig | 17 +- + arch/xtensa/Makefile | 5 +- + arch/xtensa/boot/Makefile | 1 + + arch/xtensa/include/asm/coprocessor.h | 9 +- + arch/xtensa/include/asm/io.h | 40 ++-- + arch/xtensa/include/asm/irq.h | 7 +- + arch/xtensa/include/asm/serial.h | 12 +- + arch/xtensa/kernel/Makefile | 4 +- + arch/xtensa/kernel/time.c | 2 +- + arch/xtensa/platforms/xtavnet/Makefile | 10 + + .../platforms/xtavnet/include/platform/hardware.h | 85 ++++++ + .../platforms/xtavnet/include/platform/lcd.h | 22 ++ + .../platforms/xtavnet/include/platform/serial.h | 1 + + arch/xtensa/platforms/xtavnet/lcd.c | 79 ++++++ + arch/xtensa/platforms/xtavnet/setup.c | 269 ++++++++++++++++++++ + 15 files changed, 526 insertions(+), 37 deletions(-) + create mode 100644 arch/xtensa/platforms/xtavnet/Makefile + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/hardware.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/lcd.h + create mode 100644 arch/xtensa/platforms/xtavnet/include/platform/serial.h + create mode 100644 arch/xtensa/platforms/xtavnet/lcd.c + create mode 100644 arch/xtensa/platforms/xtavnet/setup.c +Merging ceph/for-next +$ git merge ceph/for-next +Already up-to-date. +Merging cifs/master +$ git merge cifs/master +Auto-merging fs/cifs/cifs_dfs_ref.c +Auto-merging fs/cifs/cifssmb.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/dir.c +Auto-merging fs/cifs/file.c +Removing fs/cifs/smbdes.c +Auto-merging fs/super.c +Merge made by recursive. + fs/cifs/Kconfig | 35 +- + fs/cifs/Makefile | 4 +- + fs/cifs/README | 28 - + fs/cifs/TODO | 2 + + fs/cifs/cache.c | 8 +- + fs/cifs/cifs_debug.c | 388 ++++---- + fs/cifs/cifs_debug.h | 12 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifs_fs_sb.h | 4 +- + fs/cifs/cifs_spnego.c | 6 +- + fs/cifs/cifs_spnego.h | 2 +- + fs/cifs/cifs_unicode.c | 96 ++- + fs/cifs/cifs_unicode.h | 12 +- + fs/cifs/cifsacl.c | 6 +- + fs/cifs/cifsacl.h | 2 +- + fs/cifs/cifsencrypt.c | 47 +- + fs/cifs/cifsfs.c | 66 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsglob.h | 196 +++-- + fs/cifs/cifspdu.h | 37 +- + fs/cifs/cifsproto.h | 183 ++-- + fs/cifs/cifssmb.c | 598 ++++++------ + fs/cifs/connect.c | 220 +++-- + fs/cifs/dir.c | 8 +- + fs/cifs/export.c | 4 +- + fs/cifs/file.c | 203 +--- + fs/cifs/fscache.c | 6 +- + fs/cifs/fscache.h | 8 +- + fs/cifs/inode.c | 52 +- + fs/cifs/ioctl.c | 2 +- + fs/cifs/link.c | 16 +- + fs/cifs/maperror.c | 1830 ++++++++++++++++++++++++++++++++++ + fs/cifs/misc.c | 47 +- + fs/cifs/netmisc.c | 7 - + fs/cifs/ntlmssp.h | 10 + + fs/cifs/readdir.c | 8 +- + fs/cifs/sess.c | 80 +- + fs/cifs/smb2glob.h | 258 +++++ + fs/cifs/smb2misc.c | 336 +++++++ + fs/cifs/smb2pdu.c | 2506 +++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.h | 996 +++++++++++++++++++ + fs/cifs/smb2proto.h | 200 ++++ + fs/cifs/smb2sess.c | 80 ++ + fs/cifs/smb2status.h | 1782 +++++++++++++++++++++++++++++++++ + fs/cifs/smb2transport.c | 322 ++++++ + fs/cifs/smbdes.c | 418 -------- + fs/cifs/smbencrypt.c | 124 ++- + fs/cifs/transport.c | 154 ++-- + fs/cifs/xattr.c | 28 +- + fs/super.c | 3 +- + 50 files changed, 9796 insertions(+), 1660 deletions(-) + create mode 100644 fs/cifs/maperror.c + create mode 100644 fs/cifs/smb2glob.h + create mode 100644 fs/cifs/smb2misc.c + create mode 100644 fs/cifs/smb2pdu.c + create mode 100644 fs/cifs/smb2pdu.h + create mode 100644 fs/cifs/smb2proto.h + create mode 100644 fs/cifs/smb2sess.c + create mode 100644 fs/cifs/smb2status.h + create mode 100644 fs/cifs/smb2transport.c + delete mode 100644 fs/cifs/smbdes.c +Merging configfs/linux-next +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next +$ git merge ecryptfs/next +Resolved 'fs/ecryptfs/ecryptfs_kernel.h' using previous resolution. +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +CONFLICT (content): Merge conflict in fs/ecryptfs/ecryptfs_kernel.h +Auto-merging fs/ecryptfs/file.c +Auto-merging fs/ecryptfs/inode.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0ec195a] Merge remote-tracking branch 'ecryptfs/next' +$ git diff -M --stat --summary HEAD^.. + fs/ecryptfs/crypto.c | 21 +++++++++++++++++++++ + fs/ecryptfs/ecryptfs_kernel.h | 2 ++ + fs/ecryptfs/file.c | 3 ++- + fs/ecryptfs/inode.c | 18 +++--------------- + 4 files changed, 28 insertions(+), 16 deletions(-) +Merging ext3/for_next +$ git merge ext3/for_next +Auto-merging fs/ext3/inode.c +Auto-merging fs/quota/dquot.c +Merge made by recursive. + fs/ext3/inode.c | 2 +- + fs/quota/dquot.c | 13 ++++--------- + 2 files changed, 5 insertions(+), 10 deletions(-) +Merging ext4/next +$ git merge ext4/next +Auto-merging fs/ext4/fsync.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/jbd2/commit.c +Auto-merging fs/jbd2/journal.c +Merge made by recursive. + fs/ext4/ext4_jbd2.h | 4 +- + fs/ext4/fsync.c | 17 +++++++++-- + fs/ext4/inode.c | 11 +++---- + fs/ext4/super.c | 74 ++++++++++++++++++++++++++++++++++++++++----------- + fs/jbd2/commit.c | 4 ++- + fs/jbd2/journal.c | 3 +- + 6 files changed, 84 insertions(+), 29 deletions(-) +Merging fatfs/master +$ git merge fatfs/master +Already up-to-date. +Merging fuse/for-next +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master +$ git merge gfs2/master +Resolved 'fs/gfs2/log.c' using previous resolution. +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/log.c +CONFLICT (content): Merge conflict in fs/gfs2/log.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/super.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4a1eacc] Merge remote-tracking branch 'gfs2/master' +$ git diff -M --stat --summary HEAD^.. + fs/gfs2/aops.c | 2 +- + fs/gfs2/dir.c | 188 +++++++++++++++++++++---------------------------- + fs/gfs2/file.c | 58 +++++++++++++--- + fs/gfs2/glock.c | 33 ++++----- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 4 + + fs/gfs2/inode.c | 56 +++++++++++---- + fs/gfs2/inode.h | 3 +- + fs/gfs2/log.c | 15 ++--- + fs/gfs2/lops.c | 12 ++-- + fs/gfs2/ops_fstype.c | 2 +- + fs/gfs2/rgrp.c | 24 +++++-- + fs/gfs2/super.c | 34 +++++++--- + 13 files changed, 247 insertions(+), 187 deletions(-) +Merging hfsplus/for-next +$ git merge hfsplus/for-next +Merge made by recursive. + fs/hfsplus/extents.c | 9 ++++++--- + fs/hfsplus/super.c | 9 +++++++++ + fs/hfsplus/unicode.c | 35 +++++++++++++++++++++++++++-------- + fs/hfsplus/wrapper.c | 9 +++------ + 4 files changed, 45 insertions(+), 17 deletions(-) +Merging jfs/next +$ git merge jfs/next +Already up-to-date. +Merging logfs/master +$ git merge logfs/master +Resolved 'fs/logfs/logfs.h' using previous resolution. +Auto-merging fs/logfs/logfs.h +CONFLICT (content): Merge conflict in fs/logfs/logfs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6d73e4b] Merge remote-tracking branch 'logfs/master' +$ git diff -M --stat --summary HEAD^.. +Merging nfs/linux-next +$ git merge nfs/linux-next +Merge made by recursive. + fs/nfs/namespace.c | 58 +++++++++++++++-------------------- + fs/nfs/nfs4proc.c | 4 +-- + net/sunrpc/auth_gss/gss_krb5_mech.c | 2 +- + 3 files changed, 27 insertions(+), 37 deletions(-) +Merging nfsd/nfsd-next +$ git merge nfsd/nfsd-next +Merge made by recursive. + fs/nfsd/lockd.c | 1 - + include/linux/sunrpc/svcsock.h | 1 + + net/sunrpc/svcsock.c | 337 ++++++++++++++++++++++------------------ + 3 files changed, 190 insertions(+), 149 deletions(-) +Merging nilfs2/for-next +$ git merge nilfs2/for-next +Merge made by recursive. + fs/nilfs2/file.c | 1 - + fs/nilfs2/inode.c | 3 +- + fs/nilfs2/page.c | 53 +----------------- + fs/nilfs2/page.h | 4 - + fs/nilfs2/segbuf.c | 12 ---- + fs/nilfs2/segment.c | 159 ++++++-------------------------------------------- + fs/nilfs2/segment.h | 2 - + 7 files changed, 21 insertions(+), 213 deletions(-) +Merging ocfs2/linux-next +$ git merge ocfs2/linux-next +Already up-to-date. +Merging omfs/for-next +$ git merge omfs/for-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 +Already up-to-date. +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 +Auto-merging fs/xfs/linux-2.6/xfs_buf.c +Merge made by recursive. + fs/xfs/linux-2.6/xfs_buf.c | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) +Merging vfs/for-next +$ git merge vfs/for-next +Already up-to-date. +Merging vfs-scale/vfs-scale-working +$ git merge vfs-scale/vfs-scale-working +Already up-to-date. +Merging pci/linux-next +$ git merge pci/linux-next +Already up-to-date. +Merging hid/for-next +$ git merge hid/for-next +Auto-merging drivers/hid/Kconfig +Removing drivers/hid/hid-3m-pct.c +Removing drivers/hid/hid-cando.c +Removing drivers/hid/hid-stantum.c +Auto-merging samples/Kconfig +Merge made by recursive. + Documentation/{usb => hid}/hiddev.txt | 0 + Documentation/hid/hidraw.txt | 119 +++++++++++++ + drivers/hid/Kconfig | 21 +-- + drivers/hid/Makefile | 3 - + drivers/hid/hid-3m-pct.c | 305 --------------------------------- + drivers/hid/hid-cando.c | 276 ----------------------------- + drivers/hid/hid-multitouch.c | 133 ++++++++++++--- + drivers/hid/hid-stantum.c | 286 ------------------------------- + drivers/hid/hidraw.c | 16 +- + drivers/hid/usbhid/hiddev.c | 2 +- + samples/Kconfig | 6 + + samples/Makefile | 2 +- + samples/hidraw/Makefile | 8 + + samples/hidraw/hid-example.c | 167 ++++++++++++++++++ + 14 files changed, 426 insertions(+), 918 deletions(-) + rename Documentation/{usb => hid}/hiddev.txt (100%) + create mode 100644 Documentation/hid/hidraw.txt + delete mode 100644 drivers/hid/hid-3m-pct.c + delete mode 100644 drivers/hid/hid-cando.c + delete mode 100644 drivers/hid/hid-stantum.c + create mode 100644 samples/hidraw/Makefile + create mode 100644 samples/hidraw/hid-example.c +$ git reset --hard HEAD^ +HEAD is now at a7fe5f3 Merge remote-tracking branch 'xfs/master' +Merging refs/next/20110406/hid +$ git merge refs/next/20110406/hid +Already up-to-date. +Merging quilt/i2c +$ git merge quilt/i2c +Auto-merging drivers/i2c/i2c-core.c +Merge made by recursive. + drivers/i2c/i2c-core.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) +Merging bjdooks-i2c/next-i2c +$ git merge bjdooks-i2c/next-i2c +Recorded preimage for 'drivers/i2c/busses/i2c-designware-core.c' +Resolved 'arch/arm/mach-pxa/tosa.c' using previous resolution. +Resolved 'drivers/i2c/busses/i2c-pxa.c' using previous resolution. +Auto-merging arch/arm/mach-pxa/tosa.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/i2c/busses/Makefile +Auto-merging drivers/i2c/busses/i2c-designware-core.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-core.c +CONFLICT (delete/modify): drivers/i2c/busses/i2c-intel-mid.c deleted in bjdooks-i2c/next-i2c and modified in HEAD. Version HEAD of drivers/i2c/busses/i2c-intel-mid.c left in tree. +Auto-merging drivers/i2c/busses/i2c-pxa.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-pxa.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/i2c/busses/i2c-intel-mid.c +arch/arm/mach-pxa/tosa.c: needs merge +drivers/i2c/busses/i2c-designware-core.c: needs merge +drivers/i2c/busses/i2c-intel-mid.c: needs merge +drivers/i2c/busses/i2c-pxa.c: needs merge +rm 'drivers/i2c/busses/i2c-intel-mid.c' +$ git commit -v -a +Recorded resolution for 'drivers/i2c/busses/i2c-designware-core.c'. +[master e034c68] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/Kconfig | 25 +- + drivers/i2c/busses/Makefile | 6 +- + .../{i2c-designware.c => i2c-designware-core.c} | 383 ++----- + drivers/i2c/busses/i2c-designware-core.h | 106 ++ + drivers/i2c/busses/i2c-designware-pcidrv.c | 405 +++++++ + drivers/i2c/busses/i2c-designware-platdrv.c | 215 ++++ + drivers/i2c/busses/i2c-intel-mid.c | 1135 -------------------- + 7 files changed, 862 insertions(+), 1413 deletions(-) + rename drivers/i2c/busses/{i2c-designware.c => i2c-designware-core.c} (65%) + create mode 100644 drivers/i2c/busses/i2c-designware-core.h + create mode 100644 drivers/i2c/busses/i2c-designware-pcidrv.c + create mode 100644 drivers/i2c/busses/i2c-designware-platdrv.c + delete mode 100644 drivers/i2c/busses/i2c-intel-mid.c +$ git am -3 ../patches/0001-i2c-designware-mdelay-use-needs-linux-delay.h-inclus.patch +Applying: i2c-designware: mdelay use needs linux/delay.h inclusion +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/i2c/busses/i2c-designware-core.c +$ git add . +$ git commit -v -a --amend +[master 07fdccc] Merge remote-tracking branch 'bjdooks-i2c/next-i2c' +Merging quilt/jdelvare-hwmon +$ git merge quilt/jdelvare-hwmon +Auto-merging drivers/hwmon/lm90.c +Merge made by recursive. + Documentation/hwmon/k10temp | 3 ++- + Documentation/hwmon/lm90 | 29 ++++++++++++++++++++--------- + drivers/hwmon/Kconfig | 12 ++++++------ + drivers/hwmon/adcxx.c | 16 ++++++++-------- + drivers/hwmon/ibmaem.c | 10 +++++----- + drivers/hwmon/k10temp.c | 11 ++++++----- + drivers/hwmon/k8temp.c | 8 ++++---- + drivers/hwmon/lm70.c | 10 +++++----- + drivers/hwmon/lm90.c | 22 +++++++++++++++------- + drivers/hwmon/ultra45_env.c | 4 ++-- + 10 files changed, 73 insertions(+), 52 deletions(-) +Merging hwmon-staging/hwmon-next +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by recursive. + Documentation/hwmon/max6642 | 21 + + drivers/hwmon/Kconfig | 43 ++ + drivers/hwmon/Makefile | 4 + + drivers/hwmon/adm1275.c | 121 ++++++ + drivers/hwmon/max34440.c | 6 +- + drivers/hwmon/max6642.c | 356 ++++++++++++++++ + drivers/hwmon/max8688.c | 4 +- + drivers/hwmon/pmbus.h | 10 +- + drivers/hwmon/pmbus_core.c | 971 ++++++++++++++++++++----------------------- + drivers/hwmon/ucd9000.c | 278 ++++++++++++ + drivers/hwmon/ucd9200.c | 210 ++++++++++ + 11 files changed, 1483 insertions(+), 541 deletions(-) + create mode 100644 Documentation/hwmon/max6642 + create mode 100644 drivers/hwmon/adm1275.c + create mode 100644 drivers/hwmon/max6642.c + create mode 100644 drivers/hwmon/ucd9000.c + create mode 100644 drivers/hwmon/ucd9200.c +Merging quilt/kernel-doc +$ git merge quilt/kernel-doc +Already up-to-date. +Merging v4l-dvb/master +$ git merge v4l-dvb/master +Resolved 'arch/arm/mach-omap2/devices.c' using previous resolution. +Resolved 'drivers/staging/Kconfig' using previous resolution. +Resolved 'drivers/staging/easycap/easycap_ioctl.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/devices.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/devices.c +Auto-merging drivers/media/dvb/b2c2/flexcop-pci.c +Auto-merging drivers/media/dvb/dvb-usb/lmedm04.c +CONFLICT (delete/modify): drivers/media/dvb/frontends/drx397xD.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/media/dvb/frontends/drx397xD.c left in tree. +Removing drivers/media/dvb/frontends/drx397xD.h +Removing drivers/media/dvb/frontends/drx397xD_fw.h +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Auto-merging drivers/staging/easycap/easycap_ioctl.c +CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/media/dvb/frontends/drx397xD.c +arch/arm/mach-omap2/devices.c: needs merge +drivers/media/dvb/frontends/drx397xD.c: needs merge +drivers/staging/Kconfig: needs merge +drivers/staging/easycap/easycap_ioctl.c: needs merge +rm 'drivers/media/dvb/frontends/drx397xD.c' +$ git commit -v -a +[master 1d77f57] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/video4linux/CARDLIST.em28xx | 2 +- + drivers/media/common/saa7146_core.c | 7 +- + drivers/media/common/tuners/xc5000.c | 32 +- + drivers/media/dvb/b2c2/flexcop-pci.c | 4 +- + drivers/media/dvb/bt8xx/bt878.c | 2 +- + drivers/media/dvb/dvb-usb/lmedm04.c | 12 +- + drivers/media/dvb/frontends/Kconfig | 12 +- + drivers/media/dvb/frontends/Makefile | 3 +- + drivers/media/dvb/frontends/drx397xD.c | 1511 -------------- + drivers/media/dvb/frontends/drx397xD.h | 130 -- + drivers/media/dvb/frontends/drx397xD_fw.h | 40 - + drivers/media/dvb/frontends/drxd.h | 61 + + drivers/media/dvb/frontends/drxd_firm.c | 929 +++++++++ + drivers/media/dvb/frontends/drxd_firm.h | 115 + + drivers/media/dvb/frontends/drxd_hard.c | 3000 +++++++++++++++++++++++++++ + drivers/media/dvb/frontends/drxd_map_firm.h | 1013 +++++++++ + drivers/media/dvb/mantis/hopper_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_cards.c | 2 +- + drivers/media/dvb/mantis/mantis_pci.c | 5 +- + drivers/media/video/bt8xx/bttv-driver.c | 2 +- + drivers/media/video/cx18/cx18-driver.c | 2 +- + drivers/media/video/cx23885/cx23885-core.c | 2 +- + drivers/media/video/cx88/cx88-mpeg.c | 2 +- + drivers/media/video/cx88/cx88-video.c | 2 +- + drivers/media/video/em28xx/Kconfig | 1 + + drivers/media/video/em28xx/em28xx-cards.c | 21 +- + drivers/media/video/em28xx/em28xx-dvb.c | 22 +- + drivers/media/video/em28xx/em28xx.h | 2 +- + drivers/media/video/ivtv/ivtv-driver.c | 4 +- + drivers/media/video/saa7134/saa7134-core.c | 2 +- + drivers/media/video/saa7164/saa7164-core.c | 2 +- + drivers/media/video/zoran/zoran_card.c | 2 +- + include/media/soc_camera_platform.h | 50 + + 33 files changed, 5253 insertions(+), 1745 deletions(-) + delete mode 100644 drivers/media/dvb/frontends/drx397xD.c + delete mode 100644 drivers/media/dvb/frontends/drx397xD.h + delete mode 100644 drivers/media/dvb/frontends/drx397xD_fw.h + create mode 100644 drivers/media/dvb/frontends/drxd.h + create mode 100644 drivers/media/dvb/frontends/drxd_firm.c + create mode 100644 drivers/media/dvb/frontends/drxd_firm.h + create mode 100644 drivers/media/dvb/frontends/drxd_hard.c + create mode 100644 drivers/media/dvb/frontends/drxd_map_firm.h +Merging kbuild/for-next +$ git merge kbuild/for-next +Merge made by recursive. + scripts/patch-kernel | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) +Merging kconfig/for-next +$ git merge kconfig/for-next +Already up-to-date! +Merge made by recursive. +Merging ide/master +$ git merge ide/master +Already up-to-date. +Merging libata/NEXT +$ git merge libata/NEXT +Already up-to-date. +Merging infiniband/for-next +$ git merge infiniband/for-next +Merge made by recursive. + drivers/infiniband/hw/cxgb4/cm.c | 16 +++++++--------- + drivers/infiniband/hw/cxgb4/device.c | 6 +++--- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 4 ++-- + drivers/infiniband/hw/cxgb4/qp.c | 1 - + 4 files changed, 12 insertions(+), 15 deletions(-) +Merging acpi/test +$ git merge acpi/test +Merge made by recursive. + drivers/acpi/acpica/acglobal.h | 13 +++---- + drivers/acpi/acpica/evmisc.c | 74 +++++++++++++++++++++------------------ + drivers/acpi/acpica/utmutex.c | 12 +++++-- + drivers/acpi/osl.c | 33 +++++++++++++---- + include/acpi/acpiosxf.h | 3 ++ + 5 files changed, 83 insertions(+), 52 deletions(-) +Merging idle-test/idle-test +$ git merge idle-test/idle-test +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging Documentation/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/acpi.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/system.h +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/setup.c +Auto-merging drivers/block/floppy.c +Merge made by recursive. + Documentation/feature-removal-schedule.txt | 2 +- + Documentation/kernel-parameters.txt | 14 +-- + arch/arm/kernel/process.c | 4 +- + arch/sh/kernel/idle.c | 6 +- + arch/x86/Kconfig | 11 -- + arch/x86/include/asm/acpi.h | 2 +- + arch/x86/include/asm/idle.h | 2 +- + arch/x86/include/asm/processor.h | 18 +-- + arch/x86/include/asm/system.h | 9 - + arch/x86/kernel/acpi/cstate.c | 24 +++ + arch/x86/kernel/apm_32.c | 232 ---------------------------- + arch/x86/kernel/cpu/bugs.c | 13 +-- + arch/x86/kernel/cpu/common.c | 2 +- + arch/x86/kernel/cpu/proc.c | 2 - + arch/x86/kernel/process.c | 167 +++++---------------- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/xen/setup.c | 6 +- + drivers/acpi/processor_idle.c | 3 +- + drivers/block/floppy.c | 35 ---- + drivers/cpuidle/cpuidle.c | 50 ++++--- + drivers/cpuidle/cpuidle.h | 1 + + drivers/cpuidle/driver.c | 3 + + drivers/cpuidle/governor.c | 3 + + drivers/cpuidle/governors/menu.c | 4 +- + include/linux/cpuidle.h | 4 + + 28 files changed, 136 insertions(+), 495 deletions(-) +Merging powertools/tools-test +$ git merge powertools/tools-test +Already up-to-date. +Merging ieee1394/for-next +$ git merge ieee1394/for-next +Already up-to-date! +Merge made by recursive. +Merging ubi/linux-next +$ git merge ubi/linux-next +Merge made by recursive. +Merging kvm/linux-next +$ git merge kvm/linux-next +Merge made by recursive. + Documentation/kvm/api.txt | 23 ++ + arch/powerpc/include/asm/kvm_host.h | 1 + + arch/powerpc/kvm/powerpc.c | 4 + + arch/powerpc/kvm/timing.c | 10 +- + arch/x86/include/asm/kvm_emulate.h | 102 ++++++- + arch/x86/include/asm/kvm_host.h | 43 +++- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/kvm/emulate.c | 570 ++++++++++++++++++++++++++++++----- + arch/x86/kvm/i8254.h | 1 - + arch/x86/kvm/mmu.c | 16 +- + arch/x86/kvm/paging_tmpl.h | 4 +- + arch/x86/kvm/svm.c | 410 +++++++++++++++++++++----- + arch/x86/kvm/vmx.c | 107 ++++++-- + arch/x86/kvm/x86.c | 273 +++++++++++++----- + include/linux/kvm.h | 5 + + include/linux/kvm_host.h | 14 +- + virt/kvm/kvm_main.c | 17 - + 17 files changed, 1323 insertions(+), 278 deletions(-) +Merging dlm/next +$ git merge dlm/next +Merge made by recursive. + fs/dlm/user.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) +Merging swiotlb/master +$ git merge swiotlb/master +Already up-to-date. +Merging ibft/master +$ git merge ibft/master +Already up-to-date. +Merging scsi/master +$ git merge scsi/master +Already up-to-date. +Merging async_tx/next +$ git merge async_tx/next +Already up-to-date. +Merging net/master +$ git merge net/master +Recorded preimage for 'drivers/net/smsc911x.c' +Auto-merging Documentation/feature-removal-schedule.txt +Removing drivers/isdn/capi/capifs.c +Removing drivers/isdn/capi/capifs.h +Auto-merging drivers/isdn/mISDN/layer2.c +Auto-merging drivers/net/bcm63xx_enet.c +Auto-merging drivers/net/benet/be_cmds.c +Auto-merging drivers/net/benet/be_main.c +Auto-merging drivers/net/bnx2x/bnx2x_hsi.h +Auto-merging drivers/net/bnx2x/bnx2x_main.c +Auto-merging drivers/net/cris/eth_v10.c +Auto-merging drivers/net/ibmlana.c +Auto-merging drivers/net/pcnet32.c +Auto-merging drivers/net/s2io.c +Auto-merging drivers/net/s2io.h +Auto-merging drivers/net/sfc/net_driver.h +Auto-merging drivers/net/sky2.c +Auto-merging drivers/net/smsc911x.c +CONFLICT (content): Merge conflict in drivers/net/smsc911x.c +Auto-merging drivers/net/sungem.c +Auto-merging drivers/net/tg3.c +Auto-merging drivers/net/tg3.h +Auto-merging drivers/net/via-rhine.c +Removing firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex +Removing firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex +Auto-merging include/linux/ethtool.h +Auto-merging include/linux/pkt_sched.h +Auto-merging include/net/sock.h +Auto-merging net/bridge/br_fdb.c +Auto-merging net/bridge/br_ioctl.c +Auto-merging net/core/dev.c +Auto-merging net/ipv4/fib_trie.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/ipv4/raw.c +Auto-merging net/ipv4/udp.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/smsc911x.c'. +[master a9d029b] Merge remote-tracking branch 'net/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 10 - + drivers/isdn/capi/Kconfig | 15 - + drivers/isdn/capi/Makefile | 1 - + drivers/isdn/capi/capi.c | 24 +- + drivers/isdn/capi/capifs.c | 239 - + drivers/isdn/capi/capifs.h | 28 - + drivers/isdn/gigaset/ev-layer.c | 26 +- + drivers/isdn/hysdn/hysdn_proclog.c | 11 +- + drivers/isdn/mISDN/layer2.c | 20 +- + drivers/net/atlx/atl1.c | 2 +- + drivers/net/bcm63xx_enet.c | 4 +- + drivers/net/benet/be.h | 30 +- + drivers/net/benet/be_cmds.c | 107 + + drivers/net/benet/be_cmds.h | 21 + + drivers/net/benet/be_ethtool.c | 72 +- + drivers/net/benet/be_hw.h | 4 + + drivers/net/benet/be_main.c | 169 +- + drivers/net/bnx2.c | 56 +- + drivers/net/bnx2.h | 1 + + drivers/net/bnx2x/bnx2x_cmn.h | 13 +- + drivers/net/bnx2x/bnx2x_dcb.c | 22 + + drivers/net/bnx2x/bnx2x_dcb.h | 8 +- + drivers/net/bnx2x/bnx2x_ethtool.c | 44 +- + drivers/net/bnx2x/bnx2x_hsi.h | 2 +- + drivers/net/bnx2x/bnx2x_main.c | 5 + + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/cnic.c | 64 +- + drivers/net/cnic.h | 1 + + drivers/net/cnic_if.h | 6 +- + drivers/net/cris/eth_v10.c | 4 +- + drivers/net/cxgb3/cxgb3_main.c | 25 +- + drivers/net/enic/Makefile | 2 +- + drivers/net/enic/enic.h | 4 +- + drivers/net/enic/enic_dev.c | 62 +- + drivers/net/enic/enic_dev.h | 7 +- + drivers/net/enic/enic_main.c | 198 +- + drivers/net/enic/enic_pp.c | 264 + + drivers/net/enic/enic_pp.h | 27 + + drivers/net/enic/vnic_dev.c | 97 +- + drivers/net/enic/vnic_dev.h | 6 +- + drivers/net/enic/vnic_devcmd.h | 57 +- + drivers/net/enic/vnic_vic.c | 5 +- + drivers/net/enic/vnic_vic.h | 13 +- + drivers/net/ewrk3.c | 56 +- + drivers/net/ibmlana.c | 3 +- + drivers/net/jme.c | 77 +- + drivers/net/jme.h | 2 - + drivers/net/macb.c | 3 +- + drivers/net/netxen/netxen_nic.h | 2 +- + drivers/net/netxen/netxen_nic_ethtool.c | 102 - + drivers/net/netxen/netxen_nic_init.c | 3 +- + drivers/net/netxen/netxen_nic_main.c | 55 +- + drivers/net/niu.c | 32 +- + drivers/net/niu.h | 1 + + drivers/net/pcnet32.c | 74 +- + drivers/net/qla3xxx.c | 2 +- + drivers/net/qlcnic/qlcnic.h | 224 +- + drivers/net/qlcnic/qlcnic_ctx.c | 135 +- + drivers/net/qlcnic/qlcnic_ethtool.c | 149 +- + drivers/net/qlcnic/qlcnic_hw.c | 82 +- + drivers/net/qlcnic/qlcnic_init.c | 58 +- + drivers/net/qlcnic/qlcnic_main.c | 446 +- + drivers/net/r8169.c | 309 +- + drivers/net/s2io.c | 86 +- + drivers/net/s2io.h | 3 - + drivers/net/sfc/efx.c | 20 +- + drivers/net/sfc/ethtool.c | 106 +- + drivers/net/sfc/net_driver.h | 2 - + drivers/net/sfc/nic.c | 6 +- + drivers/net/sfc/rx.c | 3 + + drivers/net/skge.c | 33 +- + drivers/net/sky2.c | 25 +- + drivers/net/smsc911x.c | 292 +- + drivers/net/smsc911x.h | 22 +- + drivers/net/sungem.c | 3 +- + drivers/net/sunhme.c | 6 +- + drivers/net/tg3.c | 364 +- + drivers/net/tg3.h | 65 +- + drivers/net/usb/smsc75xx.c | 124 +- + drivers/net/usb/smsc95xx.c | 83 +- + drivers/net/veth.c | 45 +- + drivers/net/via-rhine.c | 2 +- + drivers/net/virtio_net.c | 46 +- + drivers/net/vxge/vxge-ethtool.c | 25 +- + drivers/net/xen-netback/xenbus.c | 2 +- + drivers/net/xen-netfront.c | 106 +- + firmware/Makefile | 6 +- + firmware/WHENCE | 9 +- + firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex | 9483 ----------------- + firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex | 9484 +++++++++++++++++ + firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex |13181 ------------------------ + firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex |13192 ++++++++++++++++++++++++ + firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex |15456 --------------------------- + firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex |15473 ++++++++++++++++++++++++++++ + include/linux/ethtool.h | 180 +- + include/linux/netdevice.h | 4 +- + include/linux/pkt_sched.h | 15 + + include/net/flow.h | 25 +- + include/net/route.h | 60 +- + include/net/sock.h | 54 + + net/8021q/vlan.c | 8 +- + net/8021q/vlan_dev.c | 50 +- + net/bridge/br.c | 1 + + net/bridge/br_device.c | 41 + + net/bridge/br_fdb.c | 311 +- + net/bridge/br_if.c | 83 +- + net/bridge/br_input.c | 5 +- + net/bridge/br_ioctl.c | 40 +- + net/bridge/br_netlink.c | 53 +- + net/bridge/br_notify.c | 6 + + net/bridge/br_private.h | 19 +- + net/bridge/br_private_stp.h | 13 + + net/bridge/br_stp.c | 48 + + net/bridge/br_stp_if.c | 21 +- + net/bridge/br_sysfs_br.c | 39 +- + net/bridge/br_sysfs_if.c | 26 +- + net/can/af_can.c | 52 +- + net/core/dev.c | 35 +- + net/core/ethtool.c | 63 +- + net/ipv4/fib_trie.c | 103 +- + net/ipv4/inet_connection_sock.c | 18 +- + net/ipv4/ip_output.c | 18 +- + net/ipv4/raw.c | 18 +- + net/ipv4/syncookies.c | 18 +- + net/ipv4/tcp.c | 7 +- + net/ipv4/udp.c | 18 +- + net/sched/Kconfig | 11 + + net/sched/Makefile | 1 + + net/sched/sch_qfq.c | 1137 ++ + 129 files changed, 43040 insertions(+), 40907 deletions(-) + delete mode 100644 drivers/isdn/capi/capifs.c + delete mode 100644 drivers/isdn/capi/capifs.h + create mode 100644 drivers/net/enic/enic_pp.c + create mode 100644 drivers/net/enic/enic_pp.h + delete mode 100644 firmware/bnx2x/bnx2x-e1-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e1h-6.2.9.0.fw.ihex + delete mode 100644 firmware/bnx2x/bnx2x-e2-6.2.5.0.fw.ihex + create mode 100644 firmware/bnx2x/bnx2x-e2-6.2.9.0.fw.ihex + create mode 100644 net/sched/sch_qfq.c +Merging wireless/master +$ git merge wireless/master +Recorded preimage for 'drivers/net/wireless/zd1211rw/zd_rf_rf2959.c' +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging MAINTAINERS +Removing drivers/net/wireless/ath/ar9170/Kconfig +Removing drivers/net/wireless/ath/ar9170/Makefile +Removing drivers/net/wireless/ath/ar9170/ar9170.h +Removing drivers/net/wireless/ath/ar9170/cmd.c +Removing drivers/net/wireless/ath/ar9170/cmd.h +Removing drivers/net/wireless/ath/ar9170/eeprom.h +Removing drivers/net/wireless/ath/ar9170/hw.h +Removing drivers/net/wireless/ath/ar9170/led.c +Removing drivers/net/wireless/ath/ar9170/mac.c +CONFLICT (delete/modify): drivers/net/wireless/ath/ar9170/main.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/net/wireless/ath/ar9170/main.c left in tree. +CONFLICT (delete/modify): drivers/net/wireless/ath/ar9170/phy.c deleted in wireless/master and modified in HEAD. Version HEAD of drivers/net/wireless/ath/ar9170/phy.c left in tree. +Removing drivers/net/wireless/ath/ar9170/usb.c +Removing drivers/net/wireless/ath/ar9170/usb.h +Auto-merging drivers/net/wireless/ath/ath9k/ar5008_phy.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-agn-ict.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-core.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-fh.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-scan.c +Auto-merging drivers/net/wireless/rt2x00/rt2800.h +Auto-merging drivers/net/wireless/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00.h +Auto-merging drivers/net/wireless/rt2x00/rt2x00link.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.c +Auto-merging drivers/net/wireless/rt2x00/rt2x00queue.h +Auto-merging drivers/net/wireless/rtlwifi/base.c +Auto-merging drivers/net/wireless/rtlwifi/pci.c +Auto-merging drivers/net/wireless/rtlwifi/wifi.h +Auto-merging drivers/net/wireless/zd1211rw/zd_rf_rf2959.c +CONFLICT (content): Merge conflict in drivers/net/wireless/zd1211rw/zd_rf_rf2959.c +Auto-merging drivers/net/wireless/zd1211rw/zd_rf_uw2453.c +Auto-merging include/linux/nl80211.h +Auto-merging net/bluetooth/hci_core.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/sta_info.c +Auto-merging net/mac80211/sta_info.h +Auto-merging net/wireless/reg.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/net/wireless/ath/ar9170/main.c drivers/net/wireless/ath/ar9170/phy.c +drivers/net/wireless/ath/ar9170/main.c: needs merge +drivers/net/wireless/ath/ar9170/phy.c: needs merge +drivers/net/wireless/zd1211rw/zd_rf_rf2959.c: needs merge +rm 'drivers/net/wireless/ath/ar9170/main.c' +rm 'drivers/net/wireless/ath/ar9170/phy.c' +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/zd1211rw/zd_rf_rf2959.c'. +[master 3fb32923] Merge remote-tracking branch 'wireless/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 11 - + MAINTAINERS | 13 +- + drivers/net/wireless/Kconfig | 1 + + drivers/net/wireless/Makefile | 2 + + drivers/net/wireless/ath/Kconfig | 1 - + drivers/net/wireless/ath/Makefile | 1 - + drivers/net/wireless/ath/ar9170/Kconfig | 20 - + drivers/net/wireless/ath/ar9170/Makefile | 3 - + drivers/net/wireless/ath/ar9170/ar9170.h | 258 -- + drivers/net/wireless/ath/ar9170/cmd.c | 127 - + drivers/net/wireless/ath/ar9170/cmd.h | 92 - + drivers/net/wireless/ath/ar9170/eeprom.h | 179 -- + drivers/net/wireless/ath/ar9170/hw.h | 430 --- + drivers/net/wireless/ath/ar9170/led.c | 181 -- + drivers/net/wireless/ath/ar9170/mac.c | 519 ---- + drivers/net/wireless/ath/ar9170/main.c | 2190 --------------- + drivers/net/wireless/ath/ar9170/phy.c | 1719 ------------ + drivers/net/wireless/ath/ar9170/usb.c | 1008 ------- + drivers/net/wireless/ath/ar9170/usb.h | 82 - + drivers/net/wireless/ath/ath.h | 1 + + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 45 +- + drivers/net/wireless/ath/ath9k/ar9002_calib.c | 43 +- + drivers/net/wireless/ath/ath9k/ar9002_mac.c | 12 - + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 98 +- + drivers/net/wireless/ath/ath9k/ar9003_mac.c | 12 - + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 925 ------ + drivers/net/wireless/ath/ath9k/ath9k.h | 14 +- + drivers/net/wireless/ath/ath9k/beacon.c | 207 +- + drivers/net/wireless/ath/ath9k/common.c | 2 +- + drivers/net/wireless/ath/ath9k/debug.c | 94 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 6 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 7 + + drivers/net/wireless/ath/ath9k/gpio.c | 14 +- + drivers/net/wireless/ath/ath9k/htc.h | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_beacon.c | 9 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 33 +- + drivers/net/wireless/ath/ath9k/hw-ops.h | 6 - + drivers/net/wireless/ath/ath9k/hw.c | 206 +- + drivers/net/wireless/ath/ath9k/hw.h | 66 +- + drivers/net/wireless/ath/ath9k/init.c | 53 +- + drivers/net/wireless/ath/ath9k/mac.c | 113 +- + drivers/net/wireless/ath/ath9k/main.c | 175 +- + drivers/net/wireless/ath/ath9k/phy.h | 14 - + drivers/net/wireless/ath/ath9k/recv.c | 2 +- + drivers/net/wireless/ath/ath9k/reg.h | 1 + + drivers/net/wireless/ath/ath9k/xmit.c | 29 +- + drivers/net/wireless/ath/key.c | 32 + + drivers/net/wireless/iwlwifi/Makefile | 2 +- + drivers/net/wireless/iwlwifi/iwl-1000.c | 16 +- + drivers/net/wireless/iwlwifi/iwl-2000.c | 48 +- + drivers/net/wireless/iwlwifi/iwl-5000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-5000.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-6000-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-6000.c | 46 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-calib.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c | 52 +- + drivers/net/wireless/iwlwifi/iwl-agn-debugfs.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-ict.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.c | 29 +- + drivers/net/wireless/iwlwifi/iwl-agn-rs.h | 30 +- + drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-sta.c | 4 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tt.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-agn-tx.c | 142 +- + drivers/net/wireless/iwlwifi/iwl-agn-ucode.c | 122 +- + drivers/net/wireless/iwlwifi/iwl-agn.c | 529 +--- + drivers/net/wireless/iwlwifi/iwl-agn.h | 45 +- + drivers/net/wireless/iwlwifi/iwl-commands.h | 647 +----- + drivers/net/wireless/iwlwifi/iwl-core.c | 114 +- + drivers/net/wireless/iwlwifi/iwl-core.h | 40 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 43 +- + drivers/net/wireless/iwlwifi/iwl-debug.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-debugfs.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-dev.h | 274 +-- + drivers/net/wireless/iwlwifi/iwl-devtrace.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.c | 50 +- + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 191 +-- + drivers/net/wireless/iwlwifi/iwl-fh.h | 4 +- + drivers/net/wireless/iwlwifi/iwl-hcmd.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-helpers.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-io.c | 274 ++ + drivers/net/wireless/iwlwifi/iwl-io.h | 491 +---- + drivers/net/wireless/iwlwifi/iwl-led.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-led.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-power.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-prph.h | 342 +--- + drivers/net/wireless/iwlwifi/iwl-rx.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-scan.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-spectrum.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-sta.c | 9 +- + drivers/net/wireless/iwlwifi/iwl-sta.h | 2 +- + drivers/net/wireless/iwlwifi/iwl-tx.c | 68 +- + drivers/net/wireless/libertas/if_spi.c | 65 + + drivers/net/wireless/mwifiex/11n.c | 809 ++++++ + drivers/net/wireless/mwifiex/11n.h | 176 ++ + drivers/net/wireless/mwifiex/11n_aggr.c | 423 +++ + drivers/net/wireless/mwifiex/11n_aggr.h | 32 + + drivers/net/wireless/mwifiex/11n_rxreorder.c | 637 +++++ + drivers/net/wireless/mwifiex/11n_rxreorder.h | 67 + + drivers/net/wireless/mwifiex/Kconfig | 21 + + drivers/net/wireless/mwifiex/Makefile | 41 + + drivers/net/wireless/mwifiex/README | 204 ++ + drivers/net/wireless/mwifiex/cfg80211.c | 1456 ++++++++++ + drivers/net/wireless/mwifiex/cfg80211.h | 31 + + drivers/net/wireless/mwifiex/cfp.c | 367 +++ + drivers/net/wireless/mwifiex/cmdevt.c | 1459 ++++++++++ + drivers/net/wireless/mwifiex/debugfs.c | 773 +++++ + drivers/net/wireless/mwifiex/decl.h | 153 + + drivers/net/wireless/mwifiex/fw.h | 1229 ++++++++ + drivers/net/wireless/mwifiex/init.c | 662 +++++ + drivers/net/wireless/mwifiex/ioctl.h | 411 +++ + drivers/net/wireless/mwifiex/join.c | 1462 ++++++++++ + drivers/net/wireless/mwifiex/main.c | 1102 ++++++++ + drivers/net/wireless/mwifiex/main.h | 1058 +++++++ + drivers/net/wireless/mwifiex/scan.c | 3097 +++++++++++++++++++++ + drivers/net/wireless/mwifiex/sdio.c | 1770 ++++++++++++ + drivers/net/wireless/mwifiex/sdio.h | 305 ++ + drivers/net/wireless/mwifiex/sta_cmd.c | 1226 ++++++++ + drivers/net/wireless/mwifiex/sta_cmdresp.c | 983 +++++++ + drivers/net/wireless/mwifiex/sta_event.c | 405 +++ + drivers/net/wireless/mwifiex/sta_ioctl.c | 2360 ++++++++++++++++ + drivers/net/wireless/mwifiex/sta_rx.c | 182 ++ + drivers/net/wireless/mwifiex/sta_tx.c | 202 ++ + drivers/net/wireless/mwifiex/txrx.c | 202 ++ + drivers/net/wireless/mwifiex/util.c | 252 ++ + drivers/net/wireless/mwifiex/util.h | 32 + + drivers/net/wireless/mwifiex/wmm.c | 1237 ++++++++ + drivers/net/wireless/mwifiex/wmm.h | 112 + + drivers/net/wireless/mwl8k.c | 749 +++++- + drivers/net/wireless/rt2x00/rt2400pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2500pci.c | 6 +- + drivers/net/wireless/rt2x00/rt2500usb.c | 5 - + drivers/net/wireless/rt2x00/rt2800.h | 106 + + drivers/net/wireless/rt2x00/rt2800lib.c | 198 ++- + drivers/net/wireless/rt2x00/rt2800lib.h | 1 + + drivers/net/wireless/rt2x00/rt2800pci.c | 19 +- + drivers/net/wireless/rt2x00/rt2800usb.c | 3 +- + drivers/net/wireless/rt2x00/rt2x00.h | 7 +- + drivers/net/wireless/rt2x00/rt2x00debug.c | 1 - + drivers/net/wireless/rt2x00/rt2x00dev.c | 28 +- + drivers/net/wireless/rt2x00/rt2x00ht.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00lib.h | 23 +- + drivers/net/wireless/rt2x00/rt2x00link.c | 49 +- + drivers/net/wireless/rt2x00/rt2x00pci.c | 7 +- + drivers/net/wireless/rt2x00/rt2x00pci.h | 5 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- + drivers/net/wireless/rt2x00/rt2x00queue.h | 1 + + drivers/net/wireless/rt2x00/rt61pci.c | 6 +- + drivers/net/wireless/rt2x00/rt73usb.c | 2 - + drivers/net/wireless/rtlwifi/base.c | 5 +- + drivers/net/wireless/rtlwifi/core.c | 8 +- + drivers/net/wireless/rtlwifi/efuse.c | 106 +- + drivers/net/wireless/rtlwifi/pci.c | 53 +- + drivers/net/wireless/rtlwifi/pci.h | 4 +- + drivers/net/wireless/rtlwifi/ps.c | 3 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c | 38 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 2 +- + drivers/net/wireless/rtlwifi/wifi.h | 18 +- + drivers/net/wireless/wl1251/cmd.h | 4 +- + drivers/net/wireless/wl1251/event.c | 6 +- + drivers/net/wireless/wl1251/main.c | 22 +- + drivers/net/wireless/wl1251/ps.c | 23 +- + drivers/net/wireless/wl1251/ps.h | 2 +- + drivers/net/wireless/wl1251/wl1251.h | 9 +- + drivers/net/wireless/zd1211rw/zd_chip.c | 262 +- + drivers/net/wireless/zd1211rw/zd_chip.h | 529 ++-- + drivers/net/wireless/zd1211rw/zd_rf.h | 2 +- + drivers/net/wireless/zd1211rw/zd_rf_al2230.c | 198 +- + drivers/net/wireless/zd1211rw/zd_rf_al7230b.c | 240 +- + drivers/net/wireless/zd1211rw/zd_rf_rf2959.c | 78 +- + drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | 86 +- + drivers/net/wireless/zd1211rw/zd_usb.c | 4 +- + drivers/net/wireless/zd1211rw/zd_usb.h | 2 +- + drivers/ssb/driver_pcicore.c | 104 +- + drivers/ssb/scan.c | 2 +- + include/linux/ath9k_platform.h | 5 + + include/linux/ieee80211.h | 9 + + include/linux/nl80211.h | 35 +- + include/linux/ssb/ssb.h | 2 +- + include/net/bluetooth/hci.h | 40 +- + include/net/bluetooth/hci_core.h | 25 +- + include/net/bluetooth/l2cap.h | 2 - + include/net/bluetooth/mgmt.h | 47 + + include/net/cfg80211.h | 43 + + net/bluetooth/bnep/bnep.h | 148 +- + net/bluetooth/bnep/core.c | 71 +- + net/bluetooth/bnep/sock.c | 2 +- + net/bluetooth/cmtp/capi.c | 6 +- + net/bluetooth/cmtp/cmtp.h | 11 +- + net/bluetooth/cmtp/core.c | 25 +- + net/bluetooth/cmtp/sock.c | 2 +- + net/bluetooth/hci_core.c | 79 +- + net/bluetooth/hci_event.c | 95 +- + net/bluetooth/hci_sysfs.c | 40 +- + net/bluetooth/hidp/core.c | 90 +- + net/bluetooth/hidp/hidp.h | 6 +- + net/bluetooth/hidp/sock.c | 7 +- + net/bluetooth/l2cap_core.c | 27 +- + net/bluetooth/mgmt.c | 518 ++++- + net/mac80211/Kconfig | 1 - + net/mac80211/cfg.c | 13 +- + net/mac80211/debugfs.c | 89 +- + net/mac80211/ibss.c | 3 +- + net/mac80211/ieee80211_i.h | 4 +- + net/mac80211/main.c | 5 - + net/mac80211/mlme.c | 9 - + net/mac80211/rx.c | 2 + + net/mac80211/sta_info.c | 15 +- + net/mac80211/sta_info.h | 1 - + net/mac80211/status.c | 11 +- + net/mac80211/tkip.c | 4 +- + net/mac80211/tkip.h | 4 +- + net/mac80211/util.c | 2 +- + net/mac80211/wep.c | 34 +- + net/mac80211/wep.h | 4 +- + net/wireless/mlme.c | 9 + + net/wireless/nl80211.c | 55 +- + net/wireless/nl80211.h | 3 + + net/wireless/reg.c | 71 +- + 230 files changed, 29858 insertions(+), 12692 deletions(-) + delete mode 100644 drivers/net/wireless/ath/ar9170/Kconfig + delete mode 100644 drivers/net/wireless/ath/ar9170/Makefile + delete mode 100644 drivers/net/wireless/ath/ar9170/ar9170.h + delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.c + delete mode 100644 drivers/net/wireless/ath/ar9170/cmd.h + delete mode 100644 drivers/net/wireless/ath/ar9170/eeprom.h + delete mode 100644 drivers/net/wireless/ath/ar9170/hw.h + delete mode 100644 drivers/net/wireless/ath/ar9170/led.c + delete mode 100644 drivers/net/wireless/ath/ar9170/mac.c + delete mode 100644 drivers/net/wireless/ath/ar9170/main.c + delete mode 100644 drivers/net/wireless/ath/ar9170/phy.c + delete mode 100644 drivers/net/wireless/ath/ar9170/usb.c + delete mode 100644 drivers/net/wireless/ath/ar9170/usb.h + create mode 100644 drivers/net/wireless/iwlwifi/iwl-io.c + create mode 100644 drivers/net/wireless/mwifiex/11n.c + create mode 100644 drivers/net/wireless/mwifiex/11n.h + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.c + create mode 100644 drivers/net/wireless/mwifiex/11n_aggr.h + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.c + create mode 100644 drivers/net/wireless/mwifiex/11n_rxreorder.h + create mode 100644 drivers/net/wireless/mwifiex/Kconfig + create mode 100644 drivers/net/wireless/mwifiex/Makefile + create mode 100644 drivers/net/wireless/mwifiex/README + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.c + create mode 100644 drivers/net/wireless/mwifiex/cfg80211.h + create mode 100644 drivers/net/wireless/mwifiex/cfp.c + create mode 100644 drivers/net/wireless/mwifiex/cmdevt.c + create mode 100644 drivers/net/wireless/mwifiex/debugfs.c + create mode 100644 drivers/net/wireless/mwifiex/decl.h + create mode 100644 drivers/net/wireless/mwifiex/fw.h + create mode 100644 drivers/net/wireless/mwifiex/init.c + create mode 100644 drivers/net/wireless/mwifiex/ioctl.h + create mode 100644 drivers/net/wireless/mwifiex/join.c + create mode 100644 drivers/net/wireless/mwifiex/main.c + create mode 100644 drivers/net/wireless/mwifiex/main.h + create mode 100644 drivers/net/wireless/mwifiex/scan.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.c + create mode 100644 drivers/net/wireless/mwifiex/sdio.h + create mode 100644 drivers/net/wireless/mwifiex/sta_cmd.c + create mode 100644 drivers/net/wireless/mwifiex/sta_cmdresp.c + create mode 100644 drivers/net/wireless/mwifiex/sta_event.c + create mode 100644 drivers/net/wireless/mwifiex/sta_ioctl.c + create mode 100644 drivers/net/wireless/mwifiex/sta_rx.c + create mode 100644 drivers/net/wireless/mwifiex/sta_tx.c + create mode 100644 drivers/net/wireless/mwifiex/txrx.c + create mode 100644 drivers/net/wireless/mwifiex/util.c + create mode 100644 drivers/net/wireless/mwifiex/util.h + create mode 100644 drivers/net/wireless/mwifiex/wmm.c + create mode 100644 drivers/net/wireless/mwifiex/wmm.h +Merging bluetooth/master +$ git merge bluetooth/master +Auto-merging net/bluetooth/l2cap_sock.c +Merge made by recursive. + drivers/bluetooth/ath3k.c | 3 - + drivers/bluetooth/hci_ath.c | 7 +- + drivers/bluetooth/hci_h4.c | 7 +- + drivers/bluetooth/hci_ldisc.c | 6 +- + include/net/bluetooth/l2cap.h | 130 ++--- + net/bluetooth/hci_event.c | 4 + + net/bluetooth/l2cap_core.c | 1336 ++++++++++++++++++++++------------------- + net/bluetooth/l2cap_sock.c | 72 +-- + 8 files changed, 829 insertions(+), 736 deletions(-) +Merging mtd/master +$ git merge mtd/master +Merge made by recursive. + drivers/mtd/mtdswap.c | 2 +- + drivers/mtd/nand/atmel_nand.c | 32 ++++++++++++-------------------- + 2 files changed, 13 insertions(+), 21 deletions(-) +Merging crypto/master +$ git merge crypto/master +Auto-merging drivers/crypto/Kconfig +Merge made by recursive. + .../devicetree/bindings/crypto/fsl-sec4.txt | 397 +++++ + arch/powerpc/boot/dts/p4080ds.dts | 86 +- + drivers/crypto/Kconfig | 2 + + drivers/crypto/Makefile | 1 + + drivers/crypto/caam/Kconfig | 72 + + drivers/crypto/caam/Makefile | 8 + + drivers/crypto/caam/caamalg.c | 1163 ++++++++++++++ + drivers/crypto/caam/compat.h | 35 + + drivers/crypto/caam/ctrl.c | 270 ++++ + drivers/crypto/caam/desc.h | 1605 ++++++++++++++++++++ + drivers/crypto/caam/desc_constr.h | 204 +++ + drivers/crypto/caam/error.c | 248 +++ + drivers/crypto/caam/error.h | 10 + + drivers/crypto/caam/intern.h | 113 ++ + drivers/crypto/caam/jr.c | 523 +++++++ + drivers/crypto/caam/jr.h | 21 + + drivers/crypto/caam/regs.h | 663 ++++++++ + drivers/crypto/padlock-sha.c | 269 ++++- + drivers/crypto/picoxcell_crypto.c | 64 +- + 19 files changed, 5719 insertions(+), 35 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-sec4.txt + create mode 100644 drivers/crypto/caam/Kconfig + create mode 100644 drivers/crypto/caam/Makefile + create mode 100644 drivers/crypto/caam/caamalg.c + create mode 100644 drivers/crypto/caam/compat.h + create mode 100644 drivers/crypto/caam/ctrl.c + create mode 100644 drivers/crypto/caam/desc.h + create mode 100644 drivers/crypto/caam/desc_constr.h + create mode 100644 drivers/crypto/caam/error.c + create mode 100644 drivers/crypto/caam/error.h + create mode 100644 drivers/crypto/caam/intern.h + create mode 100644 drivers/crypto/caam/jr.c + create mode 100644 drivers/crypto/caam/jr.h + create mode 100644 drivers/crypto/caam/regs.h +Merging sound/for-next +$ git merge sound/for-next +Recorded preimage for 'sound/soc/codecs/wm8994.c' +Removing drivers/media/radio/radio-maestro.c +Auto-merging include/sound/control.h +Auto-merging sound/pci/asihpi/asihpi.c +Auto-merging sound/pci/asihpi/hpi6000.c +Auto-merging sound/pci/asihpi/hpi6205.c +Auto-merging sound/pci/asihpi/hpi_internal.h +Auto-merging sound/pci/asihpi/hpimsgx.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/pci/hda/patch_sigmatel.c +Auto-merging sound/soc/codecs/sn95031.c +Auto-merging sound/soc/codecs/wm8994.c +CONFLICT (content): Merge conflict in sound/soc/codecs/wm8994.c +Auto-merging sound/soc/imx/imx-ssi.c +Auto-merging sound/soc/soc-jack.c +Auto-merging sound/usb/6fire/firmware.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'sound/soc/codecs/wm8994.c'. +[master b4bed97] Merge remote-tracking branch 'sound/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa/HD-Audio-Models.txt | 2 +- + drivers/media/radio/Kconfig | 15 - + drivers/media/radio/Makefile | 1 - + drivers/media/radio/radio-maestro.c | 452 ---------- + include/linux/mfd/wm8994/pdata.h | 49 + + include/sound/control.h | 1 + + include/sound/soc.h | 14 +- + include/sound/tea575x-tuner.h | 7 +- + sound/arm/pxa2xx-pcm-lib.c | 3 + + sound/core/control.c | 64 ++ + sound/core/init.c | 2 +- + sound/i2c/other/Makefile | 2 +- + sound/i2c/other/tea575x-tuner.c | 52 +- + sound/pci/Kconfig | 14 +- + sound/pci/asihpi/asihpi.c | 328 +++---- + sound/pci/asihpi/hpi6000.c | 39 +- + sound/pci/asihpi/hpi6205.c | 97 +- + sound/pci/asihpi/hpi_internal.h | 19 +- + sound/pci/asihpi/hpicmn.c | 10 +- + sound/pci/asihpi/hpicmn.h | 2 + + sound/pci/asihpi/hpifunc.c | 27 - + sound/pci/asihpi/hpimsgx.c | 31 +- + sound/pci/asihpi/hpioctl.c | 63 +- + sound/pci/emu10k1/emumixer.c | 6 + + sound/pci/es1968.c | 125 +++ + sound/pci/fm801.c | 1 - + sound/pci/hda/patch_conexant.c | 1 + + sound/pci/hda/patch_hdmi.c | 70 +- + sound/pci/hda/patch_realtek.c | 252 +++--- + sound/pci/hda/patch_sigmatel.c | 3 + + sound/pci/hda/patch_via.c | 1240 +++++++++++++++----------- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/au1x/db1200.c | 2 +- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 13 +- + sound/soc/blackfin/bf5xx-ac97.c | 166 ++--- + sound/soc/blackfin/bf5xx-ad1836.c | 42 +- + sound/soc/blackfin/bf5xx-ad193x.c | 56 +- + sound/soc/blackfin/bf5xx-ad1980.c | 45 +- + sound/soc/blackfin/bf5xx-ad73311.c | 42 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-i2s.c | 172 ++-- + sound/soc/blackfin/bf5xx-sport.c | 159 +++- + sound/soc/blackfin/bf5xx-sport.h | 16 +- + sound/soc/blackfin/bf5xx-ssm2602.c | 42 +- + sound/soc/blackfin/bf5xx-tdm-pcm.c | 23 +- + sound/soc/blackfin/bf5xx-tdm.c | 110 +-- + sound/soc/codecs/Kconfig | 2 +- + sound/soc/codecs/Makefile | 2 +- + sound/soc/codecs/ad193x.c | 23 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/ak4535.c | 19 +- + sound/soc/codecs/ak4671.c | 18 +- + sound/soc/codecs/cx20442.c | 18 +- + sound/soc/codecs/max98088.c | 25 +- + sound/soc/codecs/sn95031.c | 17 +- + sound/soc/codecs/ssm2602.c | 140 +-- + sound/soc/codecs/tlv320aic23.c | 19 +- + sound/soc/codecs/wm8711.c | 18 +- + sound/soc/codecs/wm8728.c | 18 +- + sound/soc/codecs/wm8731.c | 22 +- + sound/soc/codecs/wm8903.c | 18 +- + sound/soc/codecs/wm8958-dsp2.c | 1028 +++++++++++++++++++++ + sound/soc/codecs/wm8994.c | 364 ++------- + sound/soc/codecs/wm8994.h | 97 ++ + sound/soc/codecs/wm9705.c | 18 +- + sound/soc/codecs/wm9712.c | 18 +- + sound/soc/codecs/wm9713.c | 19 +- + sound/soc/imx/imx-ssi.c | 6 - + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 1 + + sound/soc/pxa/spitz.c | 41 +- + sound/soc/pxa/zylonite.c | 6 +- + sound/soc/soc-cache.c | 572 ++++-------- + sound/soc/soc-core.c | 54 +- + sound/soc/soc-dapm.c | 48 + + sound/soc/soc-jack.c | 2 +- + sound/usb/6fire/control.c | 105 +++ + sound/usb/6fire/control.h | 17 + + sound/usb/6fire/firmware.c | 44 +- + sound/usb/6fire/pcm.c | 97 +-- + sound/usb/Kconfig | 9 +- + sound/usb/midi.c | 1 + + 84 files changed, 3745 insertions(+), 3074 deletions(-) + delete mode 100644 drivers/media/radio/radio-maestro.c + create mode 100644 sound/soc/codecs/wm8958-dsp2.c +Merging sound-asoc/for-next +$ git merge sound-asoc/for-next +Auto-merging drivers/staging/intel_sst/intel_sst_drv_interface.c +Auto-merging drivers/staging/intel_sst/intelmid.c +Auto-merging sound/soc/mid-x86/sst_platform.c +Merge made by recursive. + .../staging/intel_sst/intel_sst_drv_interface.c | 1 - + drivers/staging/intel_sst/intelmid.c | 4 + + include/sound/max98095.h | 26 + + include/sound/soc.h | 7 +- + sound/soc/codecs/Kconfig | 6 +- + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/max98095.c | 2009 ++++++++++++++++++++ + sound/soc/codecs/max98095.h | 284 +++ + sound/soc/codecs/ssm2602.c | 56 +- + sound/soc/codecs/wm8903.c | 38 +- + sound/soc/codecs/wm8994.c | 16 + + sound/soc/mid-x86/sst_platform.c | 4 + + sound/soc/soc-core.c | 16 +- + sound/soc/tegra/harmony.c | 1 + + 14 files changed, 2447 insertions(+), 23 deletions(-) + create mode 100644 include/sound/max98095.h + create mode 100644 sound/soc/codecs/max98095.c + create mode 100644 sound/soc/codecs/max98095.h +Merging cpufreq/next +$ git merge cpufreq/next +Already up-to-date. +Merging quilt/rr +$ git merge quilt/rr +Auto-merging kernel/module.c +Auto-merging kernel/params.c +Merge made by recursive. + drivers/block/virtio_blk.c | 88 ++++++++++++++++++++++++++++++++++++----- + drivers/char/virtio_console.c | 16 ------- + drivers/virtio/virtio_pci.c | 15 ++++--- + drivers/virtio/virtio_ring.c | 1 + + include/linux/module.h | 28 +++++++------ + include/linux/moduleparam.h | 7 ++- + kernel/module.c | 4 +- + kernel/params.c | 9 +++- + 8 files changed, 114 insertions(+), 54 deletions(-) +Merging input/next +$ git merge input/next +Already up-to-date. +Merging input-mt/next +$ git merge input-mt/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 +Resolved 'drivers/ide/ide-io.c' using previous resolution. +Auto-merging drivers/ide/ide-io.c +CONFLICT (content): Merge conflict in drivers/ide/ide-io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d1524c8] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging quilt/device-mapper +$ git merge quilt/device-mapper +Already up-to-date. +Merging embedded/master +$ git merge embedded/master +Already up-to-date. +Merging firmware/master +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master +$ git merge pcmcia/master +Already up-to-date. +Merging battery/master +$ git merge battery/master +Already up-to-date. +Merging leds/for-mm +$ git merge leds/for-mm +Resolved 'drivers/leds/Kconfig' using previous resolution. +Auto-merging drivers/leds/Kconfig +CONFLICT (content): Merge conflict in drivers/leds/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 64915ed] Merge remote-tracking branch 'leds/for-mm' +$ git diff -M --stat --summary HEAD^.. +Merging backlight/for-mm +$ git merge backlight/for-mm +Already up-to-date. +Merging mmc/mmc-next +$ git merge mmc/mmc-next +Auto-merging drivers/mmc/core/mmc.c +Merge made by recursive. + arch/arm/mach-tegra/include/mach/sdhci.h | 1 + + drivers/mmc/card/block.c | 81 ++++++++++++++++++++++++++++-- + drivers/mmc/card/queue.c | 8 --- + drivers/mmc/core/core.c | 4 +- + drivers/mmc/core/mmc.c | 15 ++++++ + drivers/mmc/core/quirks.c | 4 ++ + drivers/mmc/core/sdio.c | 18 ++++-- + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/sdhci-pci.c | 1 + + drivers/mmc/host/sdhci-tegra.c | 2 + + include/linux/mmc/card.h | 15 ++++++ + include/linux/mmc/host.h | 6 ++- + include/linux/mmc/mmc.h | 5 ++ + 13 files changed, 140 insertions(+), 22 deletions(-) +Merging kgdb/kgdb-next +$ git merge kgdb/kgdb-next +Already up-to-date. +Merging slab/for-next +$ git merge slab/for-next +Already up-to-date. +Merging uclinux/for-next +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-next +$ git merge mfd/for-next +Auto-merging drivers/i2c/busses/i2c-xiic.c +Auto-merging drivers/mtd/nand/tmio_nand.c +Auto-merging drivers/net/can/janz-ican3.c +Auto-merging drivers/net/ks8842.c +Auto-merging drivers/video/tmiofb.c +Auto-merging sound/soc/codecs/twl4030.c +Merge made by recursive. + drivers/base/platform.c | 1 + + drivers/dma/timb_dma.c | 3 +- + drivers/gpio/janz-ttl.c | 3 +- + drivers/gpio/rdc321x-gpio.c | 3 +- + drivers/gpio/timbgpio.c | 6 +- + drivers/i2c/busses/i2c-ocores.c | 3 +- + drivers/i2c/busses/i2c-xiic.c | 3 +- + drivers/input/misc/twl4030-vibra.c | 3 +- + drivers/leds/leds-88pm860x.c | 7 +-- + drivers/leds/leds-mc13783.c | 7 +-- + drivers/media/radio/radio-timb.c | 3 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/video/timblogiw.c | 3 +- + drivers/mfd/88pm860x-core.c | 18 +++++-- + drivers/mfd/ab3100-core.c | 6 ++- + drivers/mfd/ab3550-core.c | 6 ++- + drivers/mfd/asic3.c | 6 ++- + drivers/mfd/davinci_voicecodec.c | 6 ++- + drivers/mfd/htc-pasic3.c | 5 ++- + drivers/mfd/janz-cmodio.c | 3 +- + drivers/mfd/mc13xxx-core.c | 12 +++-- + drivers/mfd/mfd-core.c | 23 ++++++++- + drivers/mfd/rdc321x-southbridge.c | 6 ++- + drivers/mfd/t7l66xb.c | 6 ++- + drivers/mfd/tc6387xb.c | 3 +- + drivers/mfd/tc6393xb.c | 10 +++- + drivers/mfd/timberdale.c | 81 +++++++++++++++++++++----------- + drivers/mfd/tps6105x.c | 3 +- + drivers/mfd/twl4030-codec.c | 6 ++- + drivers/mfd/wl1273-core.c | 6 ++- + drivers/mfd/wm8400-core.c | 3 +- + drivers/mmc/host/tmio_mmc.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 2 +- + drivers/net/can/janz-ican3.c | 3 +- + drivers/net/ks8842.c | 3 +- + drivers/regulator/88pm8607.c | 7 +-- + drivers/regulator/ab3100.c | 3 +- + drivers/regulator/mc13783-regulator.c | 7 ++- + drivers/regulator/mc13892-regulator.c | 7 ++- + drivers/regulator/tps6105x-regulator.c | 4 +- + drivers/spi/xilinx_spi.c | 3 +- + drivers/video/backlight/88pm860x_bl.c | 7 +-- + drivers/video/tmiofb.c | 12 ++--- + drivers/w1/masters/ds1wm.c | 12 ++++- + drivers/watchdog/rdc321x_wdt.c | 3 +- + include/linux/mfd/abx500.h | 1 + + include/linux/mfd/core.h | 16 ++----- + include/linux/platform_device.h | 5 ++ + sound/soc/codecs/cq93vc.c | 3 +- + sound/soc/codecs/twl4030.c | 6 +-- + sound/soc/codecs/wl1273.c | 3 +- + sound/soc/codecs/wm8400.c | 2 +- + sound/soc/davinci/davinci-vcif.c | 2 +- + 53 files changed, 212 insertions(+), 157 deletions(-) +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 fbdev/master +$ git merge fbdev/master +Already up-to-date. +Merging viafb/viafb-next +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next +$ git merge omap_dss2/for-next +Merge made by recursive. + arch/arm/mach-omap2/board-4430sdp.c | 132 ++++++++++++++++-- + drivers/video/omap2/dss/dsi.c | 240 +++++++++++++++++++++----------- + drivers/video/omap2/dss/dss.c | 51 ++++++- + drivers/video/omap2/dss/dss_features.c | 9 +- + drivers/video/omap2/dss/dss_features.h | 30 +++-- + 5 files changed, 346 insertions(+), 116 deletions(-) +Merging voltage/for-next +$ git merge voltage/for-next +Auto-merging drivers/regulator/core.c +Auto-merging drivers/regulator/tps6105x-regulator.c +Merge made by recursive. + drivers/regulator/core.c | 24 +++-- + drivers/regulator/tps6105x-regulator.c | 1 + + drivers/regulator/twl-regulator.c | 209 ++++++++++++++++++++++++-------- + 3 files changed, 175 insertions(+), 59 deletions(-) +Merging security-testing/next +$ git merge security-testing/next +Merge made by recursive. + include/linux/capability.h | 7 +-- + include/linux/init_task.h | 7 --- + include/linux/key.h | 13 +++++ + include/linux/kmod.h | 3 + + kernel/capability.c | 4 -- + kernel/cred.c | 6 +- + kernel/kmod.c | 100 ++++++++++++++++++++++++++++++++++++++ + kernel/sysctl.c | 6 ++ + net/dns_resolver/dns_key.c | 10 ++-- + security/Kconfig | 1 + + security/commoncap.c | 13 ++--- + security/keys/internal.h | 4 +- + security/keys/keyctl.c | 6 ++ + security/keys/keyring.c | 37 +++++++++----- + security/keys/proc.c | 2 +- + security/keys/process_keys.c | 12 +++-- + security/keys/request_key.c | 3 +- + security/keys/request_key_auth.c | 3 +- + security/keys/user_defined.c | 4 +- + security/tomoyo/memory.c | 1 + + 20 files changed, 185 insertions(+), 57 deletions(-) +Merging selinux/master +$ git merge selinux/master +Auto-merging MAINTAINERS +Auto-merging security/selinux/ss/services.c +Merge made by recursive. + MAINTAINERS | 3 +- + security/selinux/include/security.h | 7 +++-- + security/selinux/selinuxfs.c | 16 +++++++++++++- + security/selinux/ss/policydb.c | 35 ++++++++++++++++++++++++++------ + security/selinux/ss/policydb.h | 3 +- + security/selinux/ss/services.c | 37 +++++++++++++++++------------------ + 6 files changed, 68 insertions(+), 33 deletions(-) +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 watchdog/master +$ git merge watchdog/master +Merge made by recursive. +Merging bdev/master +$ git merge bdev/master +Already up-to-date. +Merging dwmw2-iommu/master +$ git merge dwmw2-iommu/master +Auto-merging drivers/pci/intel-iommu.c +Merge made by recursive. + drivers/pci/intel-iommu.c | 17 ++++++++++++++--- + 1 files changed, 14 insertions(+), 3 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 CREDITS +Auto-merging MAINTAINERS +Auto-merging arch/mips/sgi-ip22/ip22-int.c +Auto-merging drivers/net/sgiseeq.c +Auto-merging include/video/newport.h +Auto-merging lib/vsprintf.c +Merge made by recursive. + CREDITS | 2 +- + Documentation/stable_api_nonsense.txt | 2 +- + Documentation/sysctl/vm.txt | 4 ++-- + MAINTAINERS | 3 ++- + arch/mips/fw/arc/cmdline.c | 2 +- + arch/mips/fw/arc/env.c | 2 +- + arch/mips/fw/arc/identify.c | 2 +- + arch/mips/fw/arc/init.c | 2 +- + arch/mips/fw/arc/misc.c | 2 +- + arch/mips/fw/arc/salone.c | 2 +- + arch/mips/fw/arc/time.c | 2 +- + arch/mips/fw/arc/tree.c | 2 +- + arch/mips/include/asm/asmmacro-32.h | 2 +- + arch/mips/include/asm/asmmacro-64.h | 2 +- + arch/mips/include/asm/cpu.h | 2 +- + arch/mips/include/asm/r4kcache.h | 2 +- + arch/mips/include/asm/sgialib.h | 2 +- + arch/mips/include/asm/sgiarcs.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 2 +- + arch/mips/kernel/r2300_switch.S | 2 +- + arch/mips/kernel/r4k_fpu.S | 2 +- + arch/mips/kernel/r4k_switch.S | 2 +- + arch/mips/kernel/r6000_fpu.S | 2 +- + arch/mips/mm/c-r3k.c | 2 +- + arch/mips/mm/c-r4k.c | 2 +- + arch/mips/mm/c-tx39.c | 2 +- + arch/mips/mm/sc-ip22.c | 2 +- + arch/mips/mm/sc-r5k.c | 2 +- + arch/mips/mm/tlb-r3k.c | 2 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/sgi-ip22/ip22-hpc.c | 2 +- + arch/mips/sgi-ip22/ip22-int.c | 2 +- + arch/mips/sgi-ip22/ip22-mc.c | 2 +- + arch/mips/sgi-ip22/ip22-setup.c | 2 +- + drivers/net/sgiseeq.c | 2 +- + drivers/net/sgiseeq.h | 2 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/video/console/newport_con.c | 2 +- + include/video/newport.h | 2 +- + lib/vsprintf.c | 9 +++------ + 42 files changed, 46 insertions(+), 48 deletions(-) +Merging audit/for-next +$ git merge audit/for-next +Already up-to-date. +Merging suspend/linux-next +$ git merge suspend/linux-next +Already up-to-date. +Merging fsnotify/for-next +$ git merge fsnotify/for-next +Auto-merging fs/cachefiles/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/mark.c +Auto-merging include/linux/fsnotify_backend.h +Merge made by recursive. + fs/cachefiles/namei.c | 1 - + fs/cachefiles/xattr.c | 1 - + fs/nfsd/vfs.c | 3 - + fs/notify/dnotify/dnotify.c | 15 +++--- + fs/notify/fanotify/fanotify.c | 24 +++++---- + fs/notify/fanotify/fanotify_user.c | 101 +++++++++++++++++++++++++----------- + fs/notify/group.c | 1 + + fs/notify/mark.c | 36 +++++-------- + include/linux/fanotify.h | 5 ++- + include/linux/fsnotify_backend.h | 14 ++++- + 10 files changed, 121 insertions(+), 80 deletions(-) +Merging irda/for-next +$ git merge irda/for-next +Already up-to-date. +Merging alacrity/linux-next +$ git merge alacrity/linux-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/x86/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Resolved 'lib/Kconfig' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging arch/x86/Kconfig +CONFLICT (content): Merge conflict in arch/x86/Kconfig +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in 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 +Recorded resolution for 'include/linux/Kbuild'. +[master ad9b1c8] Merge remote-tracking 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 | 248 +++++++ + drivers/vbus/pci-bridge.c | 1016 ++++++++++++++++++++++++++++ + 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, 4389 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 drivers/edac/i7core_edac.c +Merge made by recursive. + drivers/edac/i7core_edac.c | 23 ++++++++++++++++++++--- + 1 files changed, 20 insertions(+), 3 deletions(-) +Merging i7300_edac/linux_next +$ git merge i7300_edac/linux_next +Already up-to-date! +Merge made by recursive. +Merging devicetree/devicetree/next +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging spi/spi/next +$ git merge spi/spi/next +Auto-merging drivers/spi/dw_spi.c +Auto-merging drivers/spi/dw_spi.h +Merge made by recursive. + drivers/spi/dw_spi.c | 202 ++++++++++++++++--------------------------------- + drivers/spi/dw_spi.h | 2 - + 2 files changed, 66 insertions(+), 138 deletions(-) +Merging tip/auto-latest +$ git merge tip/auto-latest +Recorded preimage for 'arch/ia64/kernel/cyclone.c' +Resolved 'arch/x86/kernel/process.c' using previous resolution. +Auto-merging arch/ia64/kernel/cyclone.c +CONFLICT (content): Merge conflict in arch/ia64/kernel/cyclone.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/probe_roms.c +Auto-merging arch/x86/kernel/process.c +CONFLICT (content): Merge conflict in arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging drivers/acpi/processor_throttling.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/ia64/kernel/cyclone.c'. +[master 56dac79] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/time.c | 3 +- + arch/blackfin/kernel/time-ts.c | 35 +--- + arch/ia64/kernel/cyclone.c | 6 +- + arch/ia64/kernel/time.c | 9 +- + arch/ia64/sn/kernel/sn2/timer.c | 6 +- + arch/microblaze/kernel/timer.c | 6 +- + arch/mips/alchemy/common/time.c | 3 +- + arch/mips/cavium-octeon/csrc-octeon.c | 3 +- + arch/mips/include/asm/time.h | 6 - + arch/mips/jz4740/time.c | 3 +- + arch/mips/kernel/cevt-txx9.c | 3 +- + arch/mips/kernel/csrc-bcm1480.c | 3 +- + arch/mips/kernel/csrc-ioasic.c | 4 +- + arch/mips/kernel/csrc-powertv.c | 35 +--- + arch/mips/kernel/csrc-r4k.c | 4 +- + arch/mips/kernel/csrc-sb1250.c | 3 +- + arch/mips/kernel/i8253.c | 5 +- + arch/mips/loongson/common/cs5536/cs5536_mfgpt.c | 5 +- + arch/mips/sgi-ip27/ip27-timer.c | 3 +- + arch/x86/Kconfig | 32 +-- + arch/x86/include/asm/cpufeature.h | 13 +- + arch/x86/include/asm/mach_traps.h | 18 +- + arch/x86/include/asm/mmzone_64.h | 23 -- + arch/x86/include/asm/olpc_ofw.h | 9 +- + arch/x86/include/asm/percpu.h | 27 ++ + arch/x86/include/asm/probe_roms.h | 8 + + arch/x86/include/asm/setup.h | 2 +- + arch/x86/include/asm/topology.h | 1 - + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/apb_timer.c | 10 +- + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/apic/numaq_32.c | 4 - + arch/x86/kernel/cpu/mcheck/therm_throt.c | 7 +- + arch/x86/kernel/cpu/perf_event_p4.c | 2 +- + arch/x86/kernel/head32.c | 1 - + arch/x86/kernel/i8253.c | 6 +- + arch/x86/kernel/kvmclock.c | 6 +- + arch/x86/kernel/mpparse.c | 6 +- + arch/x86/kernel/{probe_roms_32.c => probe_roms.c} | 101 ++++++++ + arch/x86/kernel/reboot.c | 24 ++- + arch/x86/kernel/smpboot.c | 4 +- + arch/x86/kernel/x86_init.c | 2 +- + arch/x86/lguest/boot.c | 4 +- + arch/x86/mm/numa_32.c | 268 +++++++++------------ + arch/x86/mm/numa_64.c | 131 +---------- + arch/x86/mm/srat_32.c | 1 - + arch/x86/platform/olpc/Makefile | 4 +- + arch/x86/platform/olpc/olpc.c | 51 ++-- + arch/x86/platform/olpc/olpc_dt.c | 19 ++ + arch/x86/platform/uv/uv_time.c | 6 +- + arch/x86/xen/time.c | 6 +- + drivers/acpi/processor_throttling.c | 32 +-- + drivers/char/hpet.c | 6 +- + drivers/clocksource/cyclone.c | 10 +- + include/linux/clocksource.h | 2 +- + tools/perf/Documentation/perf-script.txt | 52 ++++- + tools/perf/builtin-script.c | 171 ++++++++++---- + tools/perf/util/probe-finder.c | 72 ++++++ + tools/perf/util/probe-finder.h | 2 + + 59 files changed, 659 insertions(+), 633 deletions(-) + create mode 100644 arch/x86/include/asm/probe_roms.h + rename arch/x86/kernel/{probe_roms_32.c => probe_roms.c} (65%) +$ git am -3 ../patches/0001-x86-idle-merge-fix-for-mwait-move.patch +Applying: x86 idle: merge fix for mwait move +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kernel/acpi/cstate.c +$ git add . +$ git commit -v -a --amend +[master 89ad79e] Merge remote-tracking branch 'tip/auto-latest' +Merging rcu/rcu/next +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Merge made by recursive. + Documentation/RCU/00-INDEX | 2 +- + Documentation/RCU/stallwarn.txt | 23 +++-- + Documentation/RCU/trace.txt | 77 ++++++++-------- + kernel/rcutree.c | 161 ++++++++++++---------------------- + kernel/rcutree.h | 42 ++++----- + kernel/rcutree_plugin.h | 182 +++++++++++++++++++++------------------ + kernel/rcutree_trace.c | 23 ++--- + lib/Kconfig.debug | 30 +------ + 8 files changed, 240 insertions(+), 300 deletions(-) +Merging oprofile/for-next +$ git merge oprofile/for-next +Auto-merging arch/s390/oprofile/init.c +Merge made by recursive. + arch/alpha/oprofile/common.c | 5 +---- + arch/avr32/oprofile/op_model_avr32.c | 5 +---- + arch/blackfin/oprofile/bfin_oprofile.c | 4 +--- + arch/ia64/oprofile/init.c | 2 +- + arch/m32r/oprofile/init.c | 4 +--- + arch/microblaze/oprofile/microblaze_oprofile.c | 4 +--- + arch/mips/oprofile/common.c | 2 +- + arch/mn10300/oprofile/op_model_null.c | 5 +---- + arch/parisc/oprofile/init.c | 4 +--- + arch/powerpc/oprofile/common.c | 4 +--- + arch/s390/oprofile/init.c | 2 +- + arch/sparc/oprofile/init.c | 4 +--- + arch/x86/oprofile/init.c | 2 +- + 13 files changed, 13 insertions(+), 34 deletions(-) +Merging ptrace/ptrace +$ git merge ptrace/ptrace +Auto-merging include/linux/sched.h +Auto-merging include/linux/tracehook.h +Auto-merging kernel/exit.c +Auto-merging kernel/ptrace.c +Auto-merging kernel/signal.c +Merge made by recursive. + fs/exec.c | 1 + + include/linux/sched.h | 17 ++- + include/linux/tracehook.h | 27 ---- + kernel/exit.c | 84 ++++++++-- + kernel/ptrace.c | 118 ++++++++++----- + kernel/signal.c | 375 +++++++++++++++++++++++++++++++++------------ + 6 files changed, 442 insertions(+), 180 deletions(-) +Merging xen-two/linux-next +$ git merge xen-two/linux-next +Auto-merging drivers/xen/events.c +Merge made by recursive. + drivers/xen/events.c | 6 ++---- + 1 files changed, 2 insertions(+), 4 deletions(-) +Merging xen-pvhvm/linux-next +$ git merge xen-pvhvm/linux-next +Already up-to-date. +Merging edac-amd/for-next +$ git merge edac-amd/for-next +Already up-to-date. +Merging percpu/for-next +$ git merge percpu/for-next +Auto-merging arch/mips/kernel/vmlinux.lds.S +Auto-merging arch/x86/include/asm/percpu.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging kernel/workqueue.c +Auto-merging mm/percpu.c +Merge made by recursive. + arch/alpha/kernel/vmlinux.lds.S | 2 +- + arch/arm/kernel/vmlinux.lds.S | 2 +- + arch/blackfin/kernel/vmlinux.lds.S | 2 +- + arch/cris/kernel/vmlinux.lds.S | 2 +- + arch/frv/kernel/vmlinux.lds.S | 2 +- + arch/m32r/kernel/vmlinux.lds.S | 2 +- + arch/mips/kernel/vmlinux.lds.S | 2 +- + arch/mn10300/kernel/vmlinux.lds.S | 2 +- + arch/parisc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/s390/kernel/vmlinux.lds.S | 2 +- + arch/sh/kernel/vmlinux.lds.S | 2 +- + arch/sparc/kernel/vmlinux.lds.S | 2 +- + arch/tile/kernel/vmlinux.lds.S | 2 +- + arch/um/include/asm/common.lds.S | 2 +- + arch/x86/include/asm/percpu.h | 7 ++++++- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + include/asm-generic/vmlinux.lds.h | 17 ++++++++--------- + kernel/workqueue.c | 4 +--- + mm/percpu.c | 6 ++++-- + 21 files changed, 36 insertions(+), 32 deletions(-) +Merging workqueues/for-next +$ git merge workqueues/for-next +Merge made by recursive. + Documentation/workqueue.txt | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 40 insertions(+), 0 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 drivers-x86/linux-next +$ git merge drivers-x86/linux-next +Recorded preimage for 'drivers/platform/x86/intel_mid_thermal.c' +Auto-merging Documentation/feature-removal-schedule.txt +Auto-merging drivers/platform/x86/intel_mid_thermal.c +CONFLICT (content): Merge conflict in drivers/platform/x86/intel_mid_thermal.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/platform/x86/intel_mid_thermal.c'. +[master 5e4981f] Merge remote-tracking branch 'drivers-x86/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/feature-removal-schedule.txt | 20 - + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/acer-wmi.c | 32 +- + drivers/platform/x86/asus-laptop.c | 34 +- + drivers/platform/x86/asus-wmi.c | 26 +- + drivers/platform/x86/asus_acpi.c | 77 ++-- + drivers/platform/x86/compal-laptop.c | 22 +- + drivers/platform/x86/dell-laptop.c | 12 +- + drivers/platform/x86/dell-wmi-aio.c | 3 +- + drivers/platform/x86/dell-wmi.c | 17 +- + drivers/platform/x86/eeepc-laptop.c | 20 +- + drivers/platform/x86/eeepc-wmi.c | 16 +- + drivers/platform/x86/fujitsu-laptop.c | 39 +- + drivers/platform/x86/hdaps.c | 19 +- + drivers/platform/x86/hp-wmi.c | 43 +-- + drivers/platform/x86/ibm_rtl.c | 23 +- + drivers/platform/x86/ideapad-laptop.c | 2 + + drivers/platform/x86/intel_menlow.c | 5 +- + drivers/platform/x86/intel_mid_thermal.c | 606 ++++++++++++++-------------- + drivers/platform/x86/intel_pmic_gpio.c | 57 +++- + drivers/platform/x86/msi-laptop.c | 9 +- + drivers/platform/x86/msi-wmi.c | 45 +-- + drivers/platform/x86/sony-laptop.c | 109 +++--- + drivers/platform/x86/tc1100-wmi.c | 7 +- + drivers/platform/x86/topstar-laptop.c | 2 +- + drivers/platform/x86/toshiba_acpi.c | 59 ++-- + drivers/platform/x86/toshiba_bluetooth.c | 11 +- + drivers/platform/x86/wmi.c | 10 +- + drivers/platform/x86/xo15-ebook.c | 5 +- + 29 files changed, 658 insertions(+), 675 deletions(-) +Merging hwpoison/hwpoison +$ git merge hwpoison/hwpoison +Already up-to-date. +Merging sysctl/master +$ git merge sysctl/master +Already up-to-date. +Merging driver-core/driver-core-next +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next +$ git merge usb/usb-next +Already up-to-date. +Merging staging/staging-next +$ git merge staging/staging-next +Recorded preimage for 'drivers/staging/brcm80211/README' +Recorded preimage for 'drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c' +Recorded preimage for 'drivers/staging/gma500/psb_drm.h' +Recorded preimage for 'drivers/staging/hv/hv_util.c' +Resolved 'drivers/staging/hv/vmbus_drv.c' using previous resolution. +Auto-merging drivers/staging/ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c +Removing drivers/staging/ath6kl/include/athendpack.h +Removing drivers/staging/ath6kl/include/athstartpack.h +Auto-merging drivers/staging/ath6kl/include/common/dbglog.h +Auto-merging drivers/staging/ath6kl/include/common/epping_test.h +Auto-merging drivers/staging/ath6kl/include/common/wmi.h +Auto-merging drivers/staging/ath6kl/include/common/wmix.h +CONFLICT (delete/modify): drivers/staging/ath6kl/os/linux/ar6000_android.c deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/ath6kl/os/linux/ar6000_android.c left in tree. +Auto-merging drivers/staging/ath6kl/os/linux/ar6000_drv.c +Removing drivers/staging/ath6kl/os/linux/ar6k_pal.c +Removing drivers/staging/ath6kl/os/linux/ioctl.c +Removing drivers/staging/ath6kl/os/linux/wireless_ext.c +Auto-merging drivers/staging/ath6kl/wmi/wmi.c +Auto-merging drivers/staging/brcm80211/README +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/README +Auto-merging drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c +Auto-merging drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_bmac.c +Auto-merging drivers/staging/brcm80211/brcmsmac/wlc_main.c +Auto-merging drivers/staging/brcm80211/include/bcmsrom_fmt.h +Auto-merging drivers/staging/brcm80211/util/bcmsrom.c +Auto-merging drivers/staging/brcm80211/util/hnddma.c +Auto-merging drivers/staging/brcm80211/util/siutils.c +Removing drivers/staging/gma500/psb_buffer.c +Auto-merging drivers/staging/gma500/psb_drm.h +CONFLICT (content): Merge conflict in drivers/staging/gma500/psb_drm.h +Auto-merging drivers/staging/gma500/psb_drv.c +Removing drivers/staging/gma500/psb_fence.c +Auto-merging drivers/staging/gma500/psb_intel_sdvo.c +Removing drivers/staging/gma500/psb_sgx.c +Removing drivers/staging/gma500/psb_sgx.h +Removing drivers/staging/gma500/psb_ttm_fence.c +Removing drivers/staging/gma500/psb_ttm_fence_api.h +Removing drivers/staging/gma500/psb_ttm_fence_driver.h +Removing drivers/staging/gma500/psb_ttm_fence_user.c +CONFLICT (delete/modify): drivers/staging/gma500/psb_ttm_fence_user.h deleted in staging/staging-next and modified in HEAD. Version HEAD of drivers/staging/gma500/psb_ttm_fence_user.h left in tree. +Removing drivers/staging/gma500/psb_ttm_glue.c +Removing drivers/staging/gma500/psb_ttm_placement_user.c +Removing drivers/staging/gma500/psb_ttm_placement_user.h +Removing drivers/staging/gma500/psb_ttm_userobj_api.h +Removing drivers/staging/hv/blkvsc.c +Auto-merging drivers/staging/hv/blkvsc_drv.c +Auto-merging drivers/staging/hv/channel.c +Auto-merging drivers/staging/hv/channel_mgmt.c +Auto-merging drivers/staging/hv/connection.c +Auto-merging drivers/staging/hv/hv.c +Auto-merging drivers/staging/hv/hv_mouse.c +Auto-merging drivers/staging/hv/hv_util.c +CONFLICT (content): Merge conflict in drivers/staging/hv/hv_util.c +Auto-merging drivers/staging/hv/netvsc_drv.c +Auto-merging drivers/staging/hv/rndis_filter.c +Auto-merging drivers/staging/hv/vmbus_drv.c +CONFLICT (content): Merge conflict in drivers/staging/hv/vmbus_drv.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/ath6kl/os/linux/ar6000_android.c +drivers/staging/ath6kl/os/linux/ar6000_android.c: needs merge +drivers/staging/brcm80211/README: needs merge +drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c: needs merge +drivers/staging/gma500/psb_drm.h: needs merge +drivers/staging/gma500/psb_ttm_fence_user.h: needs merge +drivers/staging/hv/hv_util.c: needs merge +drivers/staging/hv/vmbus_drv.c: needs merge +rm 'drivers/staging/ath6kl/os/linux/ar6000_android.c' +$ git rm -f drivers/staging/gma500/psb_ttm_fence_user.h +drivers/staging/brcm80211/README: needs merge +drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c: needs merge +drivers/staging/gma500/psb_drm.h: needs merge +drivers/staging/gma500/psb_ttm_fence_user.h: needs merge +drivers/staging/hv/hv_util.c: needs merge +drivers/staging/hv/vmbus_drv.c: needs merge +rm 'drivers/staging/gma500/psb_ttm_fence_user.h' +$ git commit -v -a +Recorded resolution for 'drivers/staging/brcm80211/README'. +Recorded resolution for 'drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c'. +Recorded resolution for 'drivers/staging/gma500/psb_drm.h'. +Recorded resolution for 'drivers/staging/hv/hv_util.c'. +[master 1b77ad2] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ath6kl/Kconfig | 6 - + drivers/staging/ath6kl/Makefile | 39 +- + drivers/staging/ath6kl/bmi/src/bmi.c | 8 +- + .../staging/ath6kl/hif/sdio/linux_sdio/src/hif.c | 380 +- + .../ath6kl/hif/sdio/linux_sdio/src/hif_scatter.c | 10 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.c | 2 +- + drivers/staging/ath6kl/htc2/AR6000/ar6k.h | 3 - + .../ath6kl/htc2/AR6000/ar6k_gmbox_hciuart.c | 2 +- + drivers/staging/ath6kl/htc2/htc.c | 10 +- + drivers/staging/ath6kl/htc2/htc_internal.h | 8 - + drivers/staging/ath6kl/htc2/htc_recv.c | 6 - + drivers/staging/ath6kl/htc2/htc_send.c | 5 - + drivers/staging/ath6kl/include/a_config.h | 22 - + drivers/staging/ath6kl/include/a_debug.h | 28 - + drivers/staging/ath6kl/include/a_drv.h | 22 - + drivers/staging/ath6kl/include/a_drv_api.h | 28 - + drivers/staging/ath6kl/include/a_osapi.h | 29 - + drivers/staging/ath6kl/include/a_types.h | 26 - + drivers/staging/ath6kl/include/ar6000_api.h | 22 - + drivers/staging/ath6kl/include/athendpack.h | 52 - + drivers/staging/ath6kl/include/athstartpack.h | 55 - + .../common/AR6002/hw4.0/hw/analog_intf_reg.h | 13 - + .../include/common/AR6002/hw4.0/hw/apb_map.h | 8 - + .../include/common/AR6002/hw4.0/hw/gpio_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/mbox_host_reg.h | 13 - + .../include/common/AR6002/hw4.0/hw/mbox_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/rtc_reg.h | 8 - + .../include/common/AR6002/hw4.0/hw/umbox_reg.h | 14 - + .../include/common/AR6002/hw4.0/hw/vmc_reg.h | 8 - + drivers/staging/ath6kl/include/common/bmi_msg.h | 8 - + drivers/staging/ath6kl/include/common/dbglog.h | 8 - + .../staging/ath6kl/include/common/dset_internal.h | 8 - + drivers/staging/ath6kl/include/common/dsetid.h | 8 - + .../staging/ath6kl/include/common/epping_test.h | 9 - + drivers/staging/ath6kl/include/common/gmboxif.h | 8 - + drivers/staging/ath6kl/include/common/htc.h | 9 - + drivers/staging/ath6kl/include/common/regdump.h | 8 - + drivers/staging/ath6kl/include/common/targaddrs.h | 8 - + drivers/staging/ath6kl/include/common/wmi.h | 10 +- + drivers/staging/ath6kl/include/common/wmix.h | 7 - + drivers/staging/ath6kl/include/common_drv.h | 4 - + drivers/staging/ath6kl/miscdrv/ar3kconfig.c | 22 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsconfig.c | 22 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.c | 28 +- + .../staging/ath6kl/miscdrv/ar3kps/ar3kpsparser.h | 5 - + drivers/staging/ath6kl/miscdrv/common_drv.c | 34 - + drivers/staging/ath6kl/os/linux/ar6000_android.c | 388 -- + drivers/staging/ath6kl/os/linux/ar6000_drv.c | 652 +-- + drivers/staging/ath6kl/os/linux/ar6000_pm.c | 77 - + drivers/staging/ath6kl/os/linux/ar6k_pal.c | 479 -- + drivers/staging/ath6kl/os/linux/cfg80211.c | 4 +- + drivers/staging/ath6kl/os/linux/eeprom.c | 213 - + drivers/staging/ath6kl/os/linux/hci_bridge.c | 4 +- + .../staging/ath6kl/os/linux/include/ar6000_drv.h | 83 +- + .../ath6kl/os/linux/include/ar6xapi_linux.h | 8 - + .../staging/ath6kl/os/linux/include/athdrv_linux.h | 4 +- + .../staging/ath6kl/os/linux/include/config_linux.h | 7 - + .../staging/ath6kl/os/linux/include/osapi_linux.h | 49 +- + .../staging/ath6kl/os/linux/include/wlan_config.h | 10 - + .../ath6kl/os/linux/include/wmi_filter_linux.h | 2 +- + drivers/staging/ath6kl/os/linux/ioctl.c | 4767 -------------------- + drivers/staging/ath6kl/os/linux/wireless_ext.c | 2723 ----------- + drivers/staging/ath6kl/reorder/rcv_aggr.c | 10 +- + drivers/staging/ath6kl/wlan/include/ieee80211.h | 4 - + drivers/staging/ath6kl/wlan/src/wlan_node.c | 6 +- + drivers/staging/ath6kl/wmi/wmi.c | 223 +- + drivers/staging/brcm80211/README | 102 +- + drivers/staging/brcm80211/TODO | 56 +- + drivers/staging/brcm80211/brcmfmac/README | 35 - + drivers/staging/brcm80211/brcmfmac/bcmsdh.c | 3 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c | 6 +- + drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c | 7 + + drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 3 +- + drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 4 + + .../staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c | 16 +- + drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c | 2 +- + drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 5 +- + drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 7 +- + drivers/staging/brcm80211/brcmsmac/wlc_bmac.c | 60 +- + drivers/staging/brcm80211/brcmsmac/wlc_main.c | 8 +- + drivers/staging/brcm80211/include/bcmdevs.h | 72 +- + drivers/staging/brcm80211/include/bcmsrom_fmt.h | 2 +- + drivers/staging/brcm80211/include/hndpmu.h | 1 - + drivers/staging/brcm80211/include/pcicfg.h | 345 +-- + drivers/staging/brcm80211/util/bcmsrom.c | 1336 ------ + drivers/staging/brcm80211/util/hnddma.c | 3 - + drivers/staging/brcm80211/util/hndpmu.c | 49 - + drivers/staging/brcm80211/util/siutils.c | 65 +- + drivers/staging/gma500/Kconfig | 2 +- + drivers/staging/gma500/Makefile | 13 +- + drivers/staging/gma500/mrst.h | 217 + + drivers/staging/gma500/mrst_crtc.c | 620 +++ + drivers/staging/gma500/mrst_lvds.c | 371 ++ + drivers/staging/gma500/psb_2d.c | 5 +- + drivers/staging/gma500/psb_bl.c | 117 +- + drivers/staging/gma500/psb_buffer.c | 450 -- + drivers/staging/gma500/psb_drm.h | 111 - + drivers/staging/gma500/psb_drv.c | 620 ++-- + drivers/staging/gma500/psb_drv.h | 427 +-- + drivers/staging/gma500/psb_fb.c | 49 +- + drivers/staging/gma500/psb_fence.c | 122 - + drivers/staging/gma500/psb_gtt.c | 57 +- + drivers/staging/gma500/psb_gtt.h | 4 - + drivers/staging/gma500/psb_intel_display.c | 45 +- + drivers/staging/gma500/psb_intel_lvds.c | 36 +- + drivers/staging/gma500/psb_intel_sdvo.c | 4 +- + drivers/staging/gma500/psb_irq.c | 178 +- + drivers/staging/gma500/{psb_reset.c => psb_lid.c} | 0 + drivers/staging/gma500/psb_mmu.c | 61 - + drivers/staging/gma500/psb_powermgmt.c | 750 +--- + drivers/staging/gma500/psb_powermgmt.h | 55 +- + drivers/staging/gma500/psb_sgx.c | 238 - + drivers/staging/gma500/psb_sgx.h | 32 - + drivers/staging/gma500/psb_ttm_fence.c | 605 --- + drivers/staging/gma500/psb_ttm_fence_api.h | 272 -- + drivers/staging/gma500/psb_ttm_fence_driver.h | 302 -- + drivers/staging/gma500/psb_ttm_fence_user.c | 237 - + drivers/staging/gma500/psb_ttm_fence_user.h | 140 - + drivers/staging/gma500/psb_ttm_glue.c | 349 -- + drivers/staging/gma500/psb_ttm_placement_user.c | 628 --- + drivers/staging/gma500/psb_ttm_placement_user.h | 252 -- + drivers/staging/gma500/psb_ttm_userobj_api.h | 85 - + drivers/staging/hv/Makefile | 2 +- + drivers/staging/hv/blkvsc.c | 102 - + drivers/staging/hv/blkvsc_drv.c | 219 +- + drivers/staging/hv/channel.c | 79 +- + drivers/staging/hv/channel_mgmt.c | 76 +- + drivers/staging/hv/connection.c | 21 +- + drivers/staging/hv/hv.c | 64 +- + drivers/staging/hv/hv_kvp.c | 9 +- + drivers/staging/hv/hv_mouse.c | 420 +- + drivers/staging/hv/hv_timesource.c | 3 +- + drivers/staging/hv/hv_util.c | 29 +- + drivers/staging/hv/netvsc.c | 215 +- + drivers/staging/hv/netvsc_drv.c | 46 +- + drivers/staging/hv/ring_buffer.c | 21 +- + drivers/staging/hv/rndis_filter.c | 64 +- + drivers/staging/hv/storvsc.c | 329 +-- + drivers/staging/hv/storvsc_api.h | 97 +- + drivers/staging/hv/storvsc_drv.c | 169 +- + drivers/staging/hv/vmbus_drv.c | 1039 ++--- + drivers/staging/hv/vstorage.h | 5 + + drivers/staging/iio/adc/Kconfig | 11 + + drivers/staging/iio/adc/Makefile | 1 + + drivers/staging/iio/adc/ad7780.c | 329 ++ + drivers/staging/iio/adc/ad7780.h | 30 + + drivers/staging/iio/dac/Kconfig | 10 + + drivers/staging/iio/dac/Makefile | 1 + + drivers/staging/iio/dac/ad5504.c | 426 ++ + drivers/staging/iio/dac/ad5504.h | 74 + + drivers/staging/iio/sysfs.h | 1 + + drivers/staging/winbond/mto.c | 10 - + drivers/staging/winbond/phy_calibration.c | 8 +- + 153 files changed, 4650 insertions(+), 19663 deletions(-) + delete mode 100644 drivers/staging/ath6kl/include/athendpack.h + delete mode 100644 drivers/staging/ath6kl/include/athstartpack.h + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6000_android.c + delete mode 100644 drivers/staging/ath6kl/os/linux/ar6k_pal.c + delete mode 100644 drivers/staging/ath6kl/os/linux/ioctl.c + delete mode 100644 drivers/staging/ath6kl/os/linux/wireless_ext.c + create mode 100644 drivers/staging/gma500/mrst.h + create mode 100644 drivers/staging/gma500/mrst_crtc.c + create mode 100644 drivers/staging/gma500/mrst_lvds.c + delete mode 100644 drivers/staging/gma500/psb_buffer.c + delete mode 100644 drivers/staging/gma500/psb_fence.c + rename drivers/staging/gma500/{psb_reset.c => psb_lid.c} (100%) + delete mode 100644 drivers/staging/gma500/psb_sgx.c + delete mode 100644 drivers/staging/gma500/psb_sgx.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_api.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_driver.h + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_fence_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_glue.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.c + delete mode 100644 drivers/staging/gma500/psb_ttm_placement_user.h + delete mode 100644 drivers/staging/gma500/psb_ttm_userobj_api.h + delete mode 100644 drivers/staging/hv/blkvsc.c + create mode 100644 drivers/staging/iio/adc/ad7780.c + create mode 100644 drivers/staging/iio/adc/ad7780.h + create mode 100644 drivers/staging/iio/dac/ad5504.c + create mode 100644 drivers/staging/iio/dac/ad5504.h +Merging slabh/slabh +$ git merge slabh/slabh +Already up-to-date. +Merging bkl-config/config +$ git merge bkl-config/config +Already up-to-date. +Merging cleancache/linux-next +$ git merge cleancache/linux-next +Resolved 'fs/ocfs2/super.c' using previous resolution. +Resolved 'fs/super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'mm/Kconfig' using previous resolution. +Resolved 'mm/truncate.c' using previous resolution. +Auto-merging arch/x86/include/asm/xen/hypercall.h +Auto-merging drivers/xen/Makefile +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/buffer.c +Auto-merging fs/ext3/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/mpage.c +Auto-merging fs/ocfs2/super.c +CONFLICT (content): Merge conflict in fs/ocfs2/super.c +Auto-merging fs/super.c +CONFLICT (content): Merge conflict in fs/super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/xen/interface/xen.h +Auto-merging mm/Kconfig +CONFLICT (content): Merge conflict in mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/truncate.c +CONFLICT (content): Merge conflict in mm/truncate.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f8a3689] Merge remote-tracking branch 'cleancache/linux-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-mm-cleancache | 11 + + Documentation/vm/cleancache.txt | 267 ++++++++++++++++++++ + arch/x86/include/asm/xen/hypercall.h | 7 + + drivers/xen/Makefile | 1 + + drivers/xen/tmem.c | 264 +++++++++++++++++++ + fs/btrfs/extent_io.c | 9 + + fs/btrfs/super.c | 2 + + fs/buffer.c | 5 + + fs/ext3/super.c | 2 + + fs/ext4/super.c | 2 + + fs/mpage.c | 7 + + fs/ocfs2/super.c | 2 + + fs/super.c | 3 + + include/linux/cleancache.h | 118 +++++++++ + include/linux/fs.h | 5 + + include/xen/interface/xen.h | 22 ++ + mm/Kconfig | 22 ++ + mm/Makefile | 1 + + mm/cleancache.c | 245 ++++++++++++++++++ + mm/filemap.c | 11 + + mm/truncate.c | 10 + + 21 files changed, 1016 insertions(+), 0 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-cleancache + create mode 100644 Documentation/vm/cleancache.txt + create mode 100644 drivers/xen/tmem.c + create mode 100644 include/linux/cleancache.h + create mode 100644 mm/cleancache.c +Merging scsi-post-merge/merge-base:master +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/master:scsi-post-merge/master +From ../next + * [new branch] scsi-post-merge/master -> scsi-post-merge/master +$ git fetch --no-tags ../next refs/remotes/scsi-post-merge/merge-base:scsi-post-merge/merge-base +From ../next + * [new branch] scsi-post-merge/merge-base -> scsi-post-merge/merge-base +$ git checkout scsi-post-merge/master +Switched to branch 'scsi-post-merge/master' +$ git rebase --onto master scsi-post-merge/merge-base +First, rewinding head to replay your work on top of it... +Fast-forwarded scsi-post-merge/master to master. +$ cd ../next +$ git pull -f ../rebase-tmp scsi-post-merge/master +From ../rebase-tmp + * branch scsi-post-merge/master -> FETCH_HEAD +Already up-to-date. +$ rm -rf ../rebase-tmp diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..97cd02b94a6c --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,23 @@ +Importing i2c based on 2.6.39-rc1 +Unchanged quilt series i2c +Importing jdelvare-hwmon based on 2.6.39-rc2 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 6221f222c0ebf1acdf7abcf927178f40e1a65e2a +HEAD is now at 6221f222 Linux 2.6.39-rc2 +$ git quiltimport --author Jean Delvare <khali@linux-fr.org> --patches ../quilt/jdelvare-hwmon +hwmon-lm90-01-add-support-for-adt7461a-and-nct1008.patch +hwmon-lm90-02-fix-update-interval-information-in-driver-documentation.patch +hwmon-use-set_drvdata-helpers.patch +hwmon-k10temp-add-support-for-fam15h-bulldozer.patch +$ cd ../next +$ git fetch -f ../quilt-tmp master:quilt/jdelvare-hwmon +From ../quilt-tmp + + 4f18e52...7e344f3 master -> quilt/jdelvare-hwmon (forced update) +Importing kernel-doc based on 2.6.39-rc1-git3 + quilt series is empty +$ git update-ref refs/heads/quilt/kernel-doc 78fca1b95837a44983608302e89c7258981be9b3 +Importing rr based on v2.6.39-rc1-184-g78fca1b9 +Unchanged quilt series rr +Importing device-mapper based on v2.6.38-rc4-213-g055d219 +Unchanged quilt series device-mapper diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e929927258f6 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20110408 |