1. Architecture-specific changes
1.1. ARM
ftrace: enable dynamic ftrace [http://git.kernel.org/linus/80be7a7f642719bf99fc49692fc77d6333f51a73 (commit)]
U8500 PRCMU driver [http://git.kernel.org/linus/e3726fcf263adf764a4f1b9428082837662a41c4 (commit)]
hw-breakpoint: add ARM backend for the hw-breakpoint framework [http://git.kernel.org/linus/f81ef4a920c8e1af75adf9f15042c2daa49d3cb3 (commit)]
hw-breakpoint: add new ptrace requests for hw-breakpoint interaction [http://git.kernel.org/linus/864232fa1a2f8dfe003438ef0851a56722740f3e (commit)]
ux500: add CPU hotplug support [http://git.kernel.org/linus/9d704c04ff8ae61b60935d67ce334b18fc70f1b2 (commit)],
AT91: Add flexibity board support [http://git.kernel.org/linus/8ed9059533eb89b4372d7fc31b6565c053e5253b (commit)]
U5500 mailbox communication [http://git.kernel.org/linus/4d4a4b037c5d3620b8c55504a8c9e0cbf949f7fa (commit)], [http://git.kernel.org/linus/b84ccd776fedee8b28f736662cd045bf893ed633 (commit)], [http://git.kernel.org/linus/38cdfe06630a109a7a38b70c3cd208defd9f5711 (commit)], [http://git.kernel.org/linus/e81fcc97350755e021c85b816877ae292b8f28d0 (commit)]
Add board support for Telechips TCC8000-SDK board [http://git.kernel.org/linus/da15797eaec795bc2a1a9adb441214a6f5ea07fc (commit)], [http://git.kernel.org/linus/3de7b517dfacf1deb0690dbac28f917643e49975 (commit)], [http://git.kernel.org/linus/8a41fa3b3c89e5bd3c69219ddeee268bdcce886c (commit)], [http://git.kernel.org/linus/026cec6164901372c3a16b430cd405f0bb6a7c1f (commit)], [http://git.kernel.org/linus/2aea73ce22b786039906be89b0ae191d4c016c1e (commit)]
Allow SMP kernels to boot on UP systems [http://git.kernel.org/linus/f00ec48fadf5e37e7889f14cff900aa70d18b644 (commit)]
Implement CONFIG_STRICT_DEVMEM by disabling access to RAM via /dev/mem [http://git.kernel.org/linus/087aaffcdf9c91667c93923fbc05fa8fb6bc7d3a (commit)]
imx: Add EPIT support [http://git.kernel.org/linus/f2b8901d3efe5e1603c8f6a102b2d5c851c108c6 (commit)], add generic esdhc device [http://git.kernel.org/linus/203a0734709779fa40552cd9bb7c4dd325b5131f (commit)], add support for Vista Silicon Visstrim_m10 board [http://git.kernel.org/linus/3b161e51b254fa7bd3a9b0bd7ca7a2ac8ceaae8b (commit)]
- davinci
Initial support for MityDSP-L138/MityARM-1808 [http://git.kernel.org/linus/f2dbb6d91b53d3ffbc85152aa7265599f0a4d850 (commit)]
Initial support for Omapl138-Hawkboard [http://git.kernel.org/linus/6c18c91b3a6db6169998b54df12c9d53e74999f3 (commit)]
Introduce support for AM1x ARM9 microprocessors [http://git.kernel.org/linus/48ea89eabee96019a4a84615af921f8703320abb (commit)]
Introduce plat-tcc [http://git.kernel.org/linus/83ef3338a2ae5d5bd9f5f6803b900b8067660054 (commit)], [http://git.kernel.org/linus/e9268ef2252c2dfc7e2d0c435826768bb0e549ea (commit)]
Kirkwood: add LaCie d2 Network v2 support [http://git.kernel.org/linus/84712e9aa43862ded44e47acfaa93612a7eeaf7c (commit)], support for Seagate DockStar [http://git.kernel.org/linus/709406494c0ed7da843bad624f6b16f9a2df4a6c (commit)]
OMAP3LOGIC: Adding LogicPD OMAP3 board support [http://git.kernel.org/linus/d40f3f15d31e93fce3960d90caaa5a40b52494e8 (commit)]
pxa168: added support for Teton BGA platform [http://git.kernel.org/linus/1bbd7089f2effc40c35ffbbc62ad54aefd741633 (commit)]
pxa: append tavorevb3 support [http://git.kernel.org/linus/20266df55db7dcb70b3f527a55f4eb5a4d7092e2 (commit)]
S5PV210: Add Torbreck board support [http://git.kernel.org/linus/50442b55e3a96c98229b36d1bcca0c5c4d81fe15 (commit)]
S5PV310: Add SMDKC210 board support file [http://git.kernel.org/linus/c05b48af822c415baeadafa6c4a4ea7f79f337db (commit)]
SECCOMP support [http://git.kernel.org/linus/70c70d97809c3cdb8ff04f38ee3718c5385a2a4d (commit)]
tegra: Add cpufreq support [http://git.kernel.org/linus/7056d423f16103f6700569f60ca842d91bfaabab (commit)], add APB DMA support [http://git.kernel.org/linus/4de3a8fa334851e642d4889d6afa6e5d3daea10a (commit)], add PCI Express support [http://git.kernel.org/linus/77ffc1465cec32489889d6bc9c288b7b0d2ce9fb (commit)]
MN10300: And Panasonic AM34 subarch and implement SMP [http://git.kernel.org/linus/368dd5acd154b09c043cc4392a74da01599b37d5 (commit)], ASB2364: Add support for SMSC911X and SMC911X [http://git.kernel.org/linus/62747cd27ee241ffa32d501e45980cdc441d4a09 (commit)]
msm: MSM8X60 RUMI3 board support [http://git.kernel.org/linus/a55df6edcfc42354ae5f828c31d9236b8a7bbea7 (commit)], MSM8X60 simulator board support [http://git.kernel.org/linus/57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27 (commit)],
mx51: add support for genesi efikamx nettop [http://git.kernel.org/linus/088d01b00e335230bc51be6ae396babb9767e9ea (commit)], add cpuimx51sd module and its baseboard [http://git.kernel.org/linus/70b1726820ba85febfd067471534a19a9902ea60 (commit)]
1.2. POWERPC
85xx: add cache-sram support [http://git.kernel.org/linus/6db92cc9d07db9f713da8554b4bcdfc8e54ad386 (commit)]
fsl-booke: Add p3041 DS board support [http://git.kernel.org/linus/b6f9e595d27371c4f2157a294da3caa7aed5fe53 (commit)], add p5020 DS board support [http://git.kernel.org/linus/95400415c7b3f3dd43034c6c860897ac397ebe1b (commit)], add support for FSL 64-bit e5500 core [http://git.kernel.org/linus/4490c06b581ad7d6392bb398960ef86dfd203a91 (commit)]
mpc83xx: Support for MPC8308 P1M board [http://git.kernel.org/linus/cd2bd44ea8a2e8be8fff583fa5759e8f3758e67a (commit)]
Optimise 64bit csum_partial_copy_generic and add csum_and_copy_from_user [http://git.kernel.org/linus/fdd374b62ca4df144c0138359dcffa83df7a0ea8 (commit)]
Optimise 64bit csum_partial [http://git.kernel.org/linus/9b83ecb0a3cf1bf7ecf84359ddcfb9dd49646bf2 (commit)]
pseries: Partition migration in the kernel [http://git.kernel.org/linus/410bccf978819394669dede571de878f4576fd3e (commit)]
1.3. X86
Remove CONFIG_4KSTACKS (x86-32) [http://git.kernel.org/linus/dcfa726280116dd31adad37da940f542663567d0 (commit)]
Always use irq stacks (x86-32) [http://git.kernel.org/linus/7974891db234467eaf1fec613ec0129cb4ac2332 (commit)]
bios: By default, reserve the low 64K for all BIOSes [http://git.kernel.org/linus/d0cd7425fab774a480cce17c2f649984312d0b55 (commit)]
IBM Real-Time "SMI Free" mode driver [http://git.kernel.org/linus/35f0ce032b0f2d6974da516b5a113f49b7b70b09 (commit)]
uv: Enable Westmere support on SGI UV [http://git.kernel.org/linus/c8f730b1ab825f06733e1c074264f0078721f365 (commit)]
earlyprintk: Add earlyprintk for Intel Moorestown platform [http://git.kernel.org/linus/c20b5c3318fe45e4f33f01a91ccead645dfdf619 (commit)]
![/!\](/moin_static1911/memodump/img/alert.png "/!\"){kind=small}
Edit conflict - other version:
Edit conflict - your version:
End of edit conflict
1.4. SH
Add kprobe-based event tracer. [http://git.kernel.org/linus/eaaaeef392cb245e415c31d480ed2d5a466fd88f (commit)], [http://git.kernel.org/linus/57fcfdf9b2bbe8ea47771ffc16c418a20e4173c6 (commit)]
oprofile: Use perf-events oprofile backend [http://git.kernel.org/linus/86c8c04792f152c5469023885510140dd34817bc (commit)]
Add sh7757lcr board support [http://git.kernel.org/linus/36239c6704b71da7fb8e2a9429e159a84d0c5a3e (commit)]
SH-2007 board support. [http://git.kernel.org/linus/3a598264436e94c410c413088a7873fcad33616c (commit)]
mach-systemh: Kill off dead board. [http://git.kernel.org/linus/2504075d383fcefd746dac42a0cd1c3bdc006bd1 (commit)]
1.5. S390
lockless get_user_pages_fast() [http://git.kernel.org/linus/80217147a3d80c8a4e48f06e2f6e965455f3fe2a (commit)]
topology: export cpu topology via proc/sysinfo [http://git.kernel.org/linus/96f4a70d8eb4d746b19d5b5510407c8ff0d00340 (commit)]
cio: notify drivers of channel path events [http://git.kernel.org/linus/585b954e1f2fa325d425b0786e4525ac7c9ae575 (commit)]
Add z11 cpu topology support [http://git.kernel.org/linus/4cb14bc8c54f8489251d5cba8328cb410ead0cea (commit)]
1.6. Blackfin
ad7160eval: new board port [http://git.kernel.org/linus/8effc4a68bfc341764a2e3f3006c6dc8e67e9a67 (commit)]
tll6527m: new board port [http://git.kernel.org/linus/e5c1721894415d00a55c2650ed6536b644799c50 (commit)]
1.7. IA64
Add CONFIG_STACKTRACE_SUPPORT [http://git.kernel.org/linus/85718fae2a8d845e66762e6464152a255e323777 (commit)]
1.8. XEN
Add privcmd driver [http://git.kernel.org/linus/1c5de1939c204bde9cce87f4eb3d26e9f9eb732b (commit)]
Add /proc/xen/xsd_{kva,port} to xenfs [http://git.kernel.org/linus/655d406a7c80bffc03263d071b6ba1e0fcf548f9 (commit)]
xen-pcifront: Xen PCI frontend driver [http://git.kernel.org/linus/956a9202cd1220397933a07beda9f96b3df1fa24 (commit)]
xenbus: Xen paravirtualised PCI hotplug support [http://git.kernel.org/linus/89afb6e46a0f72e0e5c51ef44aa900b74681664b (commit)]
Convert p2m to a 3 level tree [http://git.kernel.org/linus/58e05027b530ff081ecea68e38de8d59db8f87e0 (commit)]
Add support for the Xen PCI subsystem [http://git.kernel.org/linus/b5401a96b59475c1c878439caecb8c521bdfd4ad (commit)]
1.9. MIPS
Add device tree support to MIPS [http://git.kernel.org/linus/f2ffa5ab74f4dfd598860f96ca37a71c4d0a28a8 (commit)]
Add support for hardware performance events [http://git.kernel.org/linus/14f7001284185bffeb796a181664906f7160f593 (commit)], [http://git.kernel.org/linus/3a9ab99e0341558e451327fbbfc39b0d3cff7e9a (commit)]
Add support for Titan (TNETV10xx) SoC variant [http://git.kernel.org/linus/238dd317f74250983aefbde6dc0a1f345a717993 (commit)]
IRQ: Add stackoverflow detection [http://git.kernel.org/linus/334c86c494b9a5754d4c0ffa3110b18c9771013b (commit)]
1.10. TILE
pci root complex: support for tile architecture [http://git.kernel.org/linus/f02cbbe657939489347cbda598401a56913ffcbd (commit)]
1.11. MICROBLAZE
Add seccomp support [http://git.kernel.org/linus/68c6ac3366764730c6cc6bcc7003b233bd6b6571 (commit)]
1.12. M68K
Add basic mmu-less m548x support [http://git.kernel.org/linus/ea49f8ffae6262e8de9a0d3e9fcdd384156c7e05 (commit)]
2. Drivers
2.1. STAGING AREA
Add ath6kl driver for AR6003 chip [http://git.kernel.org/linus/30295c8936f3a426985e99bebb17d72bd7847910 (commit)]
Add initial release of brcm80211 - Broadcom 802.11n wireless LAN driver. [http://git.kernel.org/linus/a9533e7ea3c410fed2f4cd8b3e1e213e48529b75 (commit)], [http://git.kernel.org/linus/cf2b448852abd47cee21007b8313fbf962bf3c9a (commit)]
r8712u: Add new driver for RealTek RTL8712U (RTL8192SU) Wireless devices [http://git.kernel.org/linus/2865d42c78a9121caad52cb02d1fbb7f5cdbc4ef (commit)]
Add SBE 2T3E3 WAN driver [http://git.kernel.org/linus/921a86e0e306e42452e16894f2cc792659ede16b (commit)]
Add speakup driver [http://git.kernel.org/linus/c6e3fd22cd538365bfeb82997d5b89562e077d42 (commit)]
Add support for Flarion OFDM usb and pcmcia devices. [http://git.kernel.org/linus/f7c1be0cca2aa39dcea68f54287fb00f840a5ff4 (commit)]
Add USB ENE card reader driver [http://git.kernel.org/linus/126bb03b461c2f03f2d2a43b9a587941bf146e0e (commit)]
Add West Bridge Astoria Driver [http://git.kernel.org/linus/81eb669b9516b85a2acf4c342db2322bed37d70c (commit)]
Add Beeceem USB Wimax driver [http://git.kernel.org/linus/f8942e07a3db9d82e8fb11d3d494876b8bae9ff9 (commit)]
Add sst: Intel SST audio driver [http://git.kernel.org/linus/fffa1cca3db6ac0ce612bc52f5cbd23b6672566f (commit)]
iio: ad7476 new SPI ADC driver [http://git.kernel.org/linus/349282d82e929e7982ca53510437c0850ab5294a (commit)], enable driver support for ad799x AD converters [http://git.kernel.org/linus/985dbe776b0411ebf740b72a94a397fd0217570f (commit)], Add ak8975 magnetometer sensor [http://git.kernel.org/linus/3285aae1edd04ffdb6a732f7d90c44f90a7e5d8f (commit)], adding driver for ISL29018 ALS [http://git.kernel.org/linus/940428742ed208836feb715fffd7cbc006fec3cb (commit)],
zram: Update zram documentation [http://git.kernel.org/linus/9b9913d80b2896ecd9e0a1a8f167ccad66fac79c (commit)]
Remove the Atheros otus vendor driver [http://git.kernel.org/linus/cff55f50b882b197a52c4cf0108a43c615d1fdba (commit)]
dream: remove dream driver and arch from tree [http://git.kernel.org/linus/3414df8ca38b203c8a5ad8efc32d4a3836a0596d (commit)]
2.2. VIDEO
- i915
Add support for GPU soft reset on Ironlake [http://git.kernel.org/linus/0573ed4a947d7a563db197511611d8a9039feb41 (commit)]
Enable DisplayPort audio [http://git.kernel.org/linus/a9756bb5b25d5d997df0c5d8c95db01292191bea (commit)]
Enable HDMI audio for monitor with audio support [http://git.kernel.org/linus/2e3d6006aca163db3eeb931cec631974aaa3c293 (commit)]
Enable SandyBridge blitter ring, enables support for user execbuffers [http://git.kernel.org/linus/549f7365820a212a1cfd0871d377b1ad0d1e5723 (commit)]
- Nouveau
Implement KDB debug hooks for nouveau KMS. [http://git.kernel.org/linus/be64c2bb4731b0e6223a496eed615b816ac879ec (commit)]
Add support for I2C hardware monitoring devices [http://git.kernel.org/linus/66146da06643d8ee89bc5255fb0254006e3d0e79 (commit)]
Add temperature support (vbios parsing, readings, hwmon) [http://git.kernel.org/linus/34e9d85a1aae28b090ec4e72a0f98a5483c198c4 (commit)]
- Radeon
Add drm blit support for evergreen. This allows the hw to move bos using the 3D engine and allows full use of vram beyond the pci aperture size [http://git.kernel.org/linus/d7ccd8fc11700502b5a104b7bad595b492a3aa1b (commit)]
Implement KDB debug hooks for radeon KMS. [http://git.kernel.org/linus/4dd19b0dd79c2bfe04a7a19bea0caf9284695cb4 (commit)]
Enable writeback [http://git.kernel.org/linus/724c80e1d630296d1324859e964d80d35007d83c (commit)]
Add Intel GMA500(Poulsbo) Stub Driver (not a real driver) [http://git.kernel.org/linus/e26fd1199ebab0d469fc3e037da5932d382f0669 (commit)]
VIAFB: Add initial VX900 support [http://git.kernel.org/linus/51f4332bb5fef869e8a89895a7bac6b4c03b4946 (commit)], add interface for output device configuration [http://git.kernel.org/linus/2a9183923af1f6f4da66aeabf9fa5af0dc58ccec (commit)]
2.3. STORAGE
- libata
Support for > 512 byte sectors (e.g. 4K Native) [http://git.kernel.org/linus/295124dce4ddfd40b1f12d3ffd2779673e87c701 (commit)]
Add ATA transport class [http://git.kernel.org/linus/d9027470b88631d0956ac37cdadfdeb9cdcf2c99 (commit)]
Implement LPM support for port multipliers [http://git.kernel.org/linus/6c8ea89cecd780faa4f4c8ed8b3b6ab88f9fa841 (commit)]
ata: Intel IDE-R support [http://git.kernel.org/linus/60039a5295b3d82a48fe132c699987d2e1408675 (commit)]
ata_piix: implement LPM support [http://git.kernel.org/linus/a97c40068fab5d85c4241451fc312cb9025d7e6c (commit)]
2.4. USB
Add Intel Langwell USB OTG Transceiver Driver [http://git.kernel.org/linus/f0ae849df1cd6b597130d890f2107ee31bf02c19 (commit)]
Add UAS driver [http://git.kernel.org/linus/115bb1ffa54c3934f3617bdd4e4dfc68b11e1e69 (commit)]
Add USB EHCI support for MPC5121 SoC [http://git.kernel.org/linus/230f7ede6c2f0e403f29e03e0251a470aa9350dd (commit)]
musb: add musb support for AM35x [http://git.kernel.org/linus/eb83092c2b24587719c917a1d6a5b682eeaa03df (commit)], introduce DA8xx/OMAP-L1x glue layer [http://git.kernel.org/linus/3ee076dea68e11d4685972df7298b80b8e7673e4 (commit)]
Add driver for Meywa-Denki & Kayac YUREX [http://git.kernel.org/linus/6bc235a2e24a5ef677daee3fd4f74f6cd643e23c (commit)]
sam-ba: add driver for Atmel SAM Boot Assistant (SAM-BA) [http://git.kernel.org/linus/90593899de83a6e6fdea563d058acd2f4334e3f9 (commit)]
Add EHCI and OHCH glue for OCTEON II SOCs. [http://git.kernel.org/linus/1643accdaad4625c2877f7ceefa39c1cb3e90117 (commit)]
2.5. ALSA
hda: Add input jack layer support to Realtek codec [http://git.kernel.org/linus/9ad0e496519d99eb2c34f01e41500a775122c744 (commit)],preliminary support for new Conexant audio codecs [http://git.kernel.org/linus/f2e5731dfd3ba08b023d0626d36ccf78f54ab5e7 (commit)]
ice1712: Add support for Edirol DA-2496 [http://git.kernel.org/linus/23b224d9d42a111ce451e4300304415a0ba5da75 (commit)]
Introduce the snd-aloop module for the PCM loopback [http://git.kernel.org/linus/597603d615d2b19a9e451d8cfac24372856a522d (commit)]
ISA: New Aztech Sound Galaxy driver [http://git.kernel.org/linus/495311927ffbe3604e915aeafdf03325e9925b9d (commit)], remove snd-sgalaxy [http://git.kernel.org/linus/cbaa9f60d5d5c3af10f94e0d49789d5b82341a4a (commit)]
snd-usb-caiaq: Add support for Traktor Kontrol S4 [http://git.kernel.org/linus/15c5ab607045e278ebf4d2ca4aea2250617d50ca (commit)]
usb-audio: add BOSS ME-25 support [http://git.kernel.org/linus/7b28079b3284ccb15ad4f003fb7073890600d0c1 (commit)], add Novation Launchpad support [http://git.kernel.org/linus/c7f572168fc4840727c9bda955b7f103922209cd (commit)], add Roland A-PRO support [http://git.kernel.org/linus/9d0c91938e3a42c683e4e55d108b928e89a3bbc4 (commit)]
usb: USB3 SuperSpeed sound support [http://git.kernel.org/linus/4f4e8f69895c8696a4bcc751817d4b186023ac44 (commit)]
OSS: Remove sh_dac_audio [http://git.kernel.org/linus/095a0f6df246bdc57b57d616c4698e41fbd3bf43 (commit)]
OSS: Remove sh_dac_audio [http://git.kernel.org/linus/095a0f6df246bdc57b57d616c4698e41fbd3bf43 (commit)]
- ASoC
Add 88pm860x codec driver [http://git.kernel.org/linus/f213f4b51777408c12bf6b890a9bcae385f7698f (commit)]
Add ep93xx AC97 audio driver [http://git.kernel.org/linus/aa7e1b84c6d424264bab8c29b14ebbc906488853 (commit)]
Add HP iPAQ RX1950 support [http://git.kernel.org/linus/81d97802834acb908722636ff774b0f50cbf6131 (commit)]
Add initial WM8962 CODEC driver [http://git.kernel.org/linus/9a76f1ff6e299fbb04149fe15aff061351fd0dab (commit)]
Add saarb machine driver for 88pm860x [http://git.kernel.org/linus/b6905d0b1652efddb96cefdb3c8552cac8d98ed2 (commit)]
Add support for the Freescale P1022 DS reference board [http://git.kernel.org/linus/27ef3744f85bbbd00175ce7e9ac46b52089ee83c (commit)]
Add support for tlv320aic3007 to tlv320aic3x codec. [http://git.kernel.org/linus/6184f105aa75009e6d380b59316305079a44a6ee (commit)]
Add tavorevb3 machine driver for 88pm860x [http://git.kernel.org/linus/b0547a70db38ee851a32306ee2e1e43a1e0d28ea (commit)]
ep93xx: add Simplemachines Sim.One AC97 audio support [http://git.kernel.org/linus/d42a280dc76c04f39d1f9a374cf5c23318c49004 (commit)]
fsi-codec: Add FSI - HDMI support [http://git.kernel.org/linus/41a686eedfcec74f5facd487835deff8fb5cef60 (commit)], simultaneous playback/recorde support [http://git.kernel.org/linus/93193c2bbcd83bf8bf43433cfb1868d4ca0ac351 (commit)]
multi-component - Add Aquila sound driver [http://git.kernel.org/linus/3782a528974c9607bde03ec265bbebd2dc300ea1 (commit)], add Goni sound driver [http://git.kernel.org/linus/f51582fd8d9b1196d58cd94c2b4b759cc1baf57a (commit)], ASoC Multi-Component Support [http://git.kernel.org/linus/f0fba2ad1b6b53d5360125c41953b7afcd6deff0 (commit)]
Restore MAX98088 CODEC driver [http://git.kernel.org/linus/e86e1244a41352d1b78d32c10316fc4df2c86a8a (commit)]
SAMSUNG: Add Machine driver for S/PDIF PCM audio [http://git.kernel.org/linus/b67089e4c258a3a4ea8e23ceea4a5b7f8c3099d7 (commit)], add S/PDIF CPU driver [http://git.kernel.org/linus/fc127ccccc5de164d490e8a55a1c2c126293e96f (commit)]
TI WL1273 FM Radio Codec. [http://git.kernel.org/linus/3fabe089ad8b8f238bc9de3e7586ae8d2a81f57c (commit)]
WM8804: Initial driver [http://git.kernel.org/linus/33cf45c80f7dc96ff228387add4474b14ff5e1e2 (commit)]
WM8985: Initial driver [http://git.kernel.org/linus/6d6f8b832705ca82ee8176dd87a39a1a45268af8 (commit)]
Add board support for Pcontrol_G20 [http://git.kernel.org/linus/abf0c1bc94cb16f9eed331ea98ac151d08adf4fe (commit)]
2.6. V4L/DVB
af9013: add support for MaxLinear MxL5007T tuner [http://git.kernel.org/linus/a4f31d0da5c6807a0f5dfc7d285d8d4bdaa1e36e (commit)]
af9015: add support for TerraTec Cinergy T Stick Dual RC [http://git.kernel.org/linus/ab07fdd69116d877d4fdb6a8f6355a02e65e6be0 (commit)]
gspca_konica: New gspca subdriver for konica chipset using cams [http://git.kernel.org/linus/b517af722860dcf9878754217575137be35ea0cc (commit)]
gspca_xirlink_cit: New gspca subdriver replacing v4l1 usbvideo/ibmcam.c [http://git.kernel.org/linus/1f33de0f8b91b70ccadb44958f09aa5bee7c1a44 (commit)], [http://git.kernel.org/linus/59f90a01e8f1a377213ae6b6f8e8399975c0dc3b (commit)], [http://git.kernel.org/linus/659fefa0eb177ae7377206a7a5a59161b0668c58 (commit)]
IR/streamzap: functional in-kernel decoding [http://git.kernel.org/linus/7a569f524dd36806b995c844f29e28ff40c444b2 (commit)]
NXP TDA18218 silicon tuner driver [http://git.kernel.org/linus/51ff2e2c8eaf0cc25c024849743613680b87778c (commit)]
saa5246a/saa5249: Remove obsolete teletext drivers [http://git.kernel.org/linus/563711f16f5d5ee8b639a3d6ee4cef199617009c (commit)]
Support for Sharp IX2505V (marked B0017) DVB-S silicon tuner [http://git.kernel.org/linus/1ae2c5893d091bdfa382cbcfa3e09461f3a6c884 (commit)]
Support or LME2510(C) DM04/QQBOX USB DVB-S BOXES [http://git.kernel.org/linus/d2f918bba7a482bee18cc0ede7791f7d846dd5d0 (commit)]
2.7. NETWORK
New driver: carl9170 for Atheros AR9170 802.11n devices [http://git.kernel.org/linus/fe8ee9ad80b28382111f0aab01690b09982e5691 (commit 1], [http://git.kernel.org/linus/aae9af605a41cb3e9bbad15df72076423a22f903 2], [http://git.kernel.org/linus/319da621d5c4e9bd8c34feeb200e864e87d91fe7 3], [http://git.kernel.org/linus/a84fab3cbfdc427e7d366f1cc844f27b2084c26c 4], [http://git.kernel.org/linus/00c4da27a4219385cfe6a3054ddf3195c9e3c30e 5], [http://git.kernel.org/linus/1d7e1e6b1b8ed456e7678130ad17086a5f5b3286 6)]
Add Gigabit Ethernet driver of Topcliff PCH [http://git.kernel.org/linus/77555ee7228234257957fd54daa0b69178906320 (commit)]
ibmveth: Add scatter-gather support [http://git.kernel.org/linus/6e8ab30ec677925e8999a9f5bdb028736d22d48c (commit)], enable IPv6 checksum offload [http://git.kernel.org/linus/ab78df75cac4d90b5b5471af795a64141243c02a (commit)]
enic: Add support for multiple hardware receive queues [http://git.kernel.org/linus/717258ba4b3ecca9c7c0ef2b76d7aa5800242bad (commit)]
tg3: Add EEE support [http://git.kernel.org/linus/52b02d04c801fff51ca49ad033210846d1713253 (commit)]
ath5k: Allow ath5k to support virtual STA and AP interfaces. [http://git.kernel.org/linus/b1ae1edf9e9872d3aa657cc34ae40c9aadfbc72f (commit)]
ath9k_htc: Add support for bluetooth coexistence. [http://git.kernel.org/linus/21cb987914cb5334af78378141efed77505ea987 (commit)]
be2net: add multiple RX queue support [http://git.kernel.org/linus/3abcdeda59c1d4cf2bf83311ed2d544355ec7c2d (commit)]
bna: Brocade 10Gb Ethernet device driver [http://git.kernel.org/linus/8b230ed8ec96c933047dd0625cf95f739e4939a6 (commit)]
bnx2: Add PCI Advanced Error Reporting support. [http://git.kernel.org/linus/cd709aa90648195e5b5823fa90eb0b3fb0e78ee4 (commit)], add 57712 support [http://git.kernel.org/linus/f2e0899f0f275cc3f5e9c9726178d7d0ac19b2db (commit)]
jme: Adding mii-tool support [http://git.kernel.org/linus/334fbbb747c978ae9171b9c29dfcea881f4a8d57 (commit)]
iwlagn: add temperature offset calib for 6000g2 [http://git.kernel.org/linus/bf53f939e02c0e818df93ab130fedc0e4ba95796 (commit)]
iwlwifi: add bt full concurrency support [http://git.kernel.org/linus/bee008b78307ccc2e17c7ec152dd2098d5f2e1fa (commit)], enable experimental ucode support [http://git.kernel.org/linus/3939608591d1d0cbb79d7afd08beabcfb5eb115f (commit)]
cx82310_eth: Conexant CX82310-based ADSL router USB ethernet driver [http://git.kernel.org/linus/cc28a20e77b261eb4e80c84abd621e810302f435 (commit)]
igb: Add support for DH89xxCC [http://git.kernel.org/linus/308fb39a860c816be8741fe783ae7c64e9c1af5d (commit)]
qeth: NAPI support for l2 and l3 discipline [http://git.kernel.org/linus/a1c3ed4c9ca01dded8d511a1d1daf271fbae8d89 (commit)]
qlcnic: support vlan rx accleration [http://git.kernel.org/linus/d57906633efd58ccd93f056ed436ffde5cb31aa8 (commit)], vlan gro support [http://git.kernel.org/linus/5718d3b432757ac83f65c50dd61df9c1e0d88e61 (commit)], vlan lro support [http://git.kernel.org/linus/aec1e8452dc364cffd0333e5632ec482f6322593 (commit)], add eswitch statistics support [http://git.kernel.org/linus/b6021212291d1eb1e7d1245bbd8c53bcbe2355d7 (commit)]
rapidio: add support for IDT CPS Gen2 switches [http://git.kernel.org/linus/a3725c45c114bd06e091802f90533332d1e93819 (commit)]
e1000: use GRO for receive [http://git.kernel.org/linus/6a08d194ee40806e0ccd5f36ed768e64cbfc979f (commit)]
r8169: add GRO support [http://git.kernel.org/linus/2edae08e5b75269855fef3c74fe4292c066e7c33 (commit)]
skge: add GRO support [http://git.kernel.org/linus/86cac58b71227cc34a3d0e78f19585c0eff49ea3 (commit)]
sky2: enable GRO by default [http://git.kernel.org/linus/1953925ea61cd1a77828deddc61d000303dbbb97 (commit)]
xilinx_emaclite: netpoll support [http://git.kernel.org/linus/357e8b5f723ba9e1d0a0f8ffb1361d607e43e19a (commit)]
sundance: Add initial ethtool stats support [http://git.kernel.org/linus/725a4a465c943ab0f91fcffc3846acbcdb704aac (commit)]
wl1271: sdio: add suspend/resume support [http://git.kernel.org/linus/674f3058c806ae2591b98f59194fa85b650aa667 (commit)]
macvtap: Implement multiqueue for macvtap driver [http://git.kernel.org/linus/1565c7c1c4c8e931bdba66abc8aa6f141a406872 (commit)]
cnic: Add support for 57712 device [http://git.kernel.org/linus/ee87a82a28cddbb9267a294172ecb3d3d3bdaa6c (commit)]
can: Topcliff: Add PCH_CAN driver. [http://git.kernel.org/linus/b21d18b51b31a24d17f883b678432fbdee3d5675 (commit)], tscan1: add driver for TS-CAN1 boards [http://git.kernel.org/linus/2d3359f8b9e6b3d6339b7e72f8e82275058eb13c (commit)]
davinci_emac: separate out davinci mdio [http://git.kernel.org/linus/f20136eb03a1dbdfb04f3c62fd11c0d02d02b726 (commit)]
uwb: Remove the WLP subsystem and drivers [http://git.kernel.org/linus/446396bfab00392010ebc36b9ccf859935b0f17b (commit)]
Bluetooth: Add MacBookAir3,1(2) support [http://git.kernel.org/linus/3e3ede7dda2d77d2cbec608e663b6a6ace501bfc (commit)], add support Bluetooth controller of MacbookPro 6,2 [http://git.kernel.org/linus/9c047157a20521cd525527947b13b950d168d2e6 (commit)], add support Bluetooth controller of MacbookPro 7,1 [http://git.kernel.org/linus/3cd01976e702ccaffb907727caff4f8789353599 (commit)]
Edit conflict - other version:
Bluetooth: Add MacBookAir3,1(2) support [http://git.kernel.org/linus/3e3ede7dda2d77d2cbec608e663b6a6ace501bfc (commit)], add support Bluetooth controller of MacbookPro 6,2 [http://git.kernel.org/linus/9c047157a20521cd525527947b13b950d168d2e6 (commit)], add support Bluetooth controller of MacbookPro 7,1 [http://git.kernel.org/linus/3cd01976e702ccaffb907727caff4f8789353599 (commit)]
Edit conflict - your version:
End of edit conflict
2.8. SCSI
cxgb4i: Add Chelsio T4 iSCSI support [http://git.kernel.org/linus/7b36b6e03b0d6cee0948593a6a11841a457695b9 (commit)]
lpfc: Add new WQE support [http://git.kernel.org/linus/f0d9bccc9084b8fe86fa2830a434259d140679c9 (commit)]
qla2xxx: Added AER support for ISP82xx. [http://git.kernel.org/linus/a5b36321918b3a1295748b77c62976c167233eec (commit)]
qla4xxx: Add support for 8130/8131 AENs. [http://git.kernel.org/linus/6434080b127088606e03d2ecfe5ffdd797e38d63 (commit)]
megaraid_sas: Add Online Controller Reset to MegaRAID SAS drive [http://git.kernel.org/linus/39a985547cbfcbb0b23667b69b8ae82a6cf312ac (commit)]
2.9. HID
Add support for two Waltop tablets [http://git.kernel.org/linus/72a46344867111c3e019b169ddfa9e1a1f55c759 (commit)]
Add support for UC-Logic WP????U tablets [http://git.kernel.org/linus/f8a489cc5f7adafa9f1420279be793de0fba481c (commit)]
magicmouse: enable Magic Trackpad support [http://git.kernel.org/linus/a462230e16acc8664145216da3c928d03556691a (commit)]
roccat: add driver for Roccat Pyra mouse [http://git.kernel.org/linus/cb7cf3da0daa9830e00640da8f7d2380f4b4de42 (commit)]
waltop: add Media Tablet 14.1 inch support [http://git.kernel.org/linus/8f1acc32bbdb1784bcb0be98fb02f4b20e6f328f (commit)], add support for Waltop Slim Tablet 12.1 inch [http://git.kernel.org/linus/00e7f9649b3061281fe4b463263da26155dc9be4 (commit)]
3m: Convert to MT slots [http://git.kernel.org/linus/1f01a1fe167f588c8b6b449fde2f5427ca940423 (commit)]
Add support for Logitech Speed Force Wireless gaming wheel [http://git.kernel.org/linus/32c88cbc3080f43c429f6456aa9cd845e37f3778 (commit)]
uclogic: add proper support for PF1209 [http://git.kernel.org/linus/41fa92302be7fa37c5c38e17e2097d3e5e9da13a (commit)]
usbhid: remove unused hiddev_driver [http://git.kernel.org/linus/50bb6d8492ff0c3f204b263aff90d4a7ebf4dd90 (commit)]
2.10. INPUT
wacom: add support for Bamboo Pen [http://git.kernel.org/linus/2aaacb153689dbe9064e4db7e9d00de0edfc1fa0 (commit)], add support for the Bamboo Touch trackpad [http://git.kernel.org/linus/cb734c03680eaaad64a20a666300eafd1ac260b2 (commit)], wacom_w8001: add multitouch slot support [http://git.kernel.org/linus/5e8b9140f306ce30e7c56c568198720514efc872 (commit)],
Add support for Hanwang tablets [http://git.kernel.org/linus/bba5394ad3bd23fff6987fc8bc3aaf9d12433c63 (commit)]
Add driver for tnetv107x on-chip keypad controller [http://git.kernel.org/linus/70614084402ae40aef40019b991bf44d10093122 (commit)] and touchscreen controller [http://git.kernel.org/linus/0fa6c773ad6e9ac6cfa6bad0a729e18babd602c3 (commit)]
Add LPC32xx touchscreen controller driver [http://git.kernel.org/linus/3045a5f5202a1e0ab6ba2bf90a786cf4cae6932a (commit)]
Add ROHM BU21013 touch panel controller support [http://git.kernel.org/linus/4780c8df3856398020be2928d9e9fa8c457a09a4 (commit)]
Add support for large scancodes [http://git.kernel.org/linus/8613e4c2872a87cc309a42de2c7091744dc54d0e (commit)]
Add support for Nomadik SKE keypad controller [http://git.kernel.org/linus/1158f0f16224068e27e384c1a27218aa00243967 (commit)]
Add support for OMAP4 keyboard controller [http://git.kernel.org/linus/a17f79553f052f04d47689a842118f775f81b7e3 (commit)]
Add support for PowerOn button on the AB8500 MFD [http://git.kernel.org/linus/77686517977e77d101c8a7b397717df00a88922b (commit)]
serio - add support for PS2Mult multiplexer protocol [http://git.kernel.org/linus/fc58d12be416eb51932eec594667ca3181903b9e (commit)]
2.11. HWMON
LTC4261 Hardware monitoring driver [http://git.kernel.org/linus/e5f5c99a39375ce533aacfdfb269978070121e1c (commit)]
New driver for the W83795G/ADG monitoring chips [http://git.kernel.org/linus/792d376b4f3f6af302d40373fa864f8b8e691c53 (commit)]
lm90: Add support for max6695 and max6696 [http://git.kernel.org/linus/06e1c0a2167d48442d0bd06373390886670aa6e5 (commit)], add support for the W83L771W/G [http://git.kernel.org/linus/c4f99a2b8fb4c564865f0037a2b7be690d4409f3 (commit)]
it87: Add support for the IT8721F/IT8758E [http://git.kernel.org/linus/44c1bcd4bcde32b2a31a6775a277706ab489c0dc (commit)]
Add generic GPIO fan driver [http://git.kernel.org/linus/d6fe1360f42e86262153927986dea6502daff703 (commit)]
2.12. MFD
Add basic tps6586x interrupt support [http://git.kernel.org/linus/c26448c48448266480e1b6c371f897167060ceaf (commit)]
Add MAX8998 interrupts support [http://git.kernel.org/linus/2c7e6f5797140b33ec2b967ff28941e1c7eff4b2 (commit)]
Add mc13892 support to mc13xxx [http://git.kernel.org/linus/8e00593557c3c5a7bc6f636412a1cadcf4624232 (commit)]
Add VIA VX855 multi-function device support [http://git.kernel.org/linus/375fc77ba950e388f29d11cb3279ada5e5c1580c (commit)]
Add WM831x SPI support [http://git.kernel.org/linus/2aa13b9e8096ab7f12c67f3a5b9a38b194a30ce9 (commit)]
2.13. MEDIA
Add driver for Siliconfile SR030PC30 VGA camera [http://git.kernel.org/linus/3e9c2b8477059c3ae39ed9373fddd23e4c754acc (commit)]
Add the via framebuffer camera controller driver [http://git.kernel.org/linus/024fafbac36b176d978ccd0fb1cae1fbc38c7fee (commit)]
cx231xx: Added support for Carraera, Shelby, RDx_253S and VIDEO_GRABBER [http://git.kernel.org/linus/64fbf44455260684fa5bfdd3121af3d0ef0b48dd (commit)], add initial support for Hauppauge USB-Live2 [http://git.kernel.org/linus/4270c3cac41e248ee339d18e01251989b74a30f1 (commit)], add support for Hauppauge EXETER [http://git.kernel.org/linus/1a50fddefd17ec1359d08cd23c77da42fabbb4a7 (commit)]
dvb: remove obsolete lgdt3304 driver [http://git.kernel.org/linus/4cce492b01599646421529b34deea9f61dec71de (commit)]
IR: add driver for Nuvoton w836x7hg integrated CIR [http://git.kernel.org/linus/6d2f5c27880c2c72e35432eae10c7a74251050c0 (commit)]
lmedm04: driver for DM04/QQBOX updated to version 1.60 [http://git.kernel.org/linus/ab599a6d474e0dd4db3557a46dd15cff6e126d0b (commit)]
s5h1432: Add new s5h1432 driver [http://git.kernel.org/linus/47b75ec14653f12f9fd6fd76bfd5891ba35e1e79 (commit)]
s5p-fimc: Add camera capture support [http://git.kernel.org/linus/5f3cc4474cdeab3ee44962fd752baec24e8fecec (commit)], add driver for OMAP1 camera interface [http://git.kernel.org/linus/bdc621fcedf031426551caed4e7517603690fad1 (commit)],
SoC Camera: add driver for OV6650 sensor [http://git.kernel.org/linus/2f6e2404799ad610317157b73169c109788da0b0 (commit)]
Twinhan 1027 + IR Port support [http://git.kernel.org/linus/111ac84a80199654db55c06e2565d4ab343c135d (commit)]
2.14. WATCHDOG
Add support for Broadcom BCM63xx built-in watchdog [http://git.kernel.org/linus/b63aa731cd9e3fed7694a99f9c233f5f4b244f03 (commit)]
f71808e_wdt: add support for the F71889FG [http://git.kernel.org/linus/dee00abbbcab97b8ee3bbafb5e786dde83e26741 (commit)]
it87_wdt: Add support for IT8720F watchdog [http://git.kernel.org/linus/ee3e96583e42dcb4bd406ce4e5f824bd5bb80013 (commit)], add support for watchdogs with 8b timers [http://git.kernel.org/linus/dfb0b8eae1f78c7d0cf7c8abe6c84ff8cefde50e (commit)]
2.15. VARIOUS
vcs: add poll/fasync support [http://git.kernel.org/linus/47725ac76f51328d467b1430dfd027aba8706a11 (commit)]
- RTC
Add MAX8998 rtc driver [http://git.kernel.org/linus/9b16c0a43b74393cc18666a7748293812c61af1f (commit)]
rtc-lpc32xx: introduce RTC driver for the LPC32XX SoC [http://git.kernel.org/linus/9aa449bed21515a3406f60238ce4747e4118b628 (commit)]
rtc-ds3232: add alarm function [http://git.kernel.org/linus/f46418c5cadfe76b15c630ff746ca859a8207d71 (commit)]
- power_supply
Add driver for TI BQ20Z75 gas gauge IC [http://git.kernel.org/linus/a7640bfa10c558b7cbabb4b98d6bc356d3c2ec55 (commit)]
Add driver for TWL4030/TPS65950 BCI charger [http://git.kernel.org/linus/2e727f1787e311087950711451e6eec82c05d81c (commit)]
Add isp1704 charger detection driver [http://git.kernel.org/linus/ec46475f3e3163dd80bfee086fa71b36455ecc0b (commit)]
- pcmcia
introduce autoconfiguration feature [http://git.kernel.org/linus/440eed43e2a95bb842488755683716814da10f2b (commit)], [http://git.kernel.org/linus/00990e7ce0b0e596fe41d9c64d6933ea70084003 (commit)]
- OMAP
OMAP2/3: PRM: add module hard reset support [http://git.kernel.org/linus/cf21405fd51b416f071edb546631a6ecd2112263 (commit)]
omap3: Add minimal OMAP3 IGEP module support [http://git.kernel.org/linus/e844b1da87270d96aef3fc79763ecc2c6541a71b (commit)], introduce CompuLab CM-T3517 module [http://git.kernel.org/linus/d04b620e6e6e72a95b7b88ccb7b002cb8f6b8113 (commit)]
OMAP4: hwmod: Add initial data for OMAP4430 ES1 & ES2 [http://git.kernel.org/linus/55d2cb0814f4285f89be8ed474a8ae7042fb5735 (commit)], add module hard reset support [http://git.kernel.org/linus/0be1621a749907ada0101e4139a1f57168c5410b (commit)]
misc: Add ab8500 pwm driver [http://git.kernel.org/linus/f0f05b1c751772d19c9c8f36d75e97b1d9687407 (commit)]
mtd: generic FSMC NAND MTD driver [http://git.kernel.org/linus/6c009ab89a212b4364cdb74192d438f542fb291c (commit)]
- mmc
Add new sdhci-pxa driver for Marvell SoCs [http://git.kernel.org/linus/536ac998f6076a0ae423b1046b85d7690e8b7107 (commit)]
MMC 4.4 DDR support [http://git.kernel.org/linus/dfc13e8402c75e7c2e0a52e123c0500a3259866b (commit)]
sdhci-pltfm: add -pltfm driver for imx35/51 [http://git.kernel.org/linus/95f25efe0ce22e28d61722d655d2ef582f5f7520 (commit)]
USB SD Host Controller (USHC) driver [http://git.kernel.org/linus/53f3a9e26ed5a94bd3caf732e7635692cd3c4402 (commit)]
Regulator: MAX8952 PMIC Driver Initial Release [http://git.kernel.org/linus/202f4f53e503ae09b431459131b5b3a99fa6d839 (commit)]
- Leds
Add LED driver for Big Network series LEDs [http://git.kernel.org/linus/2446783250fc12ba9bc39771e04988692742ed90 (commit)]
Driver for National Semiconductor LP5521 chip [http://git.kernel.org/linus/500fe141367e5291257e809c12f95ea54181e96d (commit)]
Driver for National Semiconductors LP5523 chip [http://git.kernel.org/linus/0efba16cc05bfe1f80471886c7a888a4744138cf (commit)]
ieee1394: remove the old IEEE 1394 driver stack [http://git.kernel.org/linus/66fa12c571d35e3cd62574c65f1785a460105397 (commit)]
i2c: Driver for PCA9541 I2C Master Selector [http://git.kernel.org/linus/ae63b13bbeca7f8915c555663f8789a531611e4b (commit)]
- gpio
Add driver for basic memory-mapped GPIO controllers [http://git.kernel.org/linus/aeec56e331c6d2750de02ef34b305338305ca690 (commit)]
Add support for 74x164 serial-in/parallel-out 8-bit shift register [http://git.kernel.org/linus/ead6db084392349ad33323b1bb2916058dd7e82b (commit)]
Add Topcliff PCH GPIO driver [http://git.kernel.org/linus/04c17aa89380addf8d7df6f0fd269fc2bd87796c (commit)]
Add VIA VX855 GPIO driver [http://git.kernel.org/linus/99ea2626a75e13ce926af69d96e9ae5bfb62b7ba (commit)]
- dmaengine
Add Freescale i.MX1/21/27 DMA driver [http://git.kernel.org/linus/1f1846c6ceed07c03ef036a27864befe0f773997 (commit)]
Add Freescale i.MX SDMA support [http://git.kernel.org/linus/1ec1e82f2510e2bdcb6268ed74aa79e1a7bc9594 (commit)]
Driver for the ARM PL080/PL081 PrimeCells v5 [http://git.kernel.org/linus/e8689e63d4d2046079f2db9d494ac05c6885ac0c (commit)]
- misc
apds9802als: ALS drivers for the apds9802als [http://git.kernel.org/linus/22d96aa59cf120db3584e4c3365554cae77d2441 (commit)]
Driver for APDS990X ALS and proximity sensors [http://git.kernel.org/linus/92b1f84d46b24675493d95a239eea2b07e5f13f8 (commit)]
Driver for bh1770glc / sfh7770 ALS and proximity sensor [http://git.kernel.org/linus/190420ab34ab4c077c641893ac19f364cf3606e4 (commit)]
isl29020.c: ambient light sensor [http://git.kernel.org/linus/2e85c4ddd3f32d3e1da51f4129473399e505ffa3 (commit)]
Add Packet hub driver for Topcliff Platform controller hub [http://git.kernel.org/linus/cf4ece53460c64a04a643ef13f6b6cb4bf3a8342 (commit)]
Add OLPC XO-1 rfkill driver [http://git.kernel.org/linus/260586d2b444909380137de6c6423e5b44edf4db (commit)]
Add ttyprintk driver [http://git.kernel.org/linus/24b4b67d17c308aaa956b73ab1e88190f6642bbe (commit)]
serial: Add OMAP high-speed UART driver [http://git.kernel.org/linus/b612633b5928077441b979471869753bfa93d41a (commit)]
- sfc
Add filter table management [http://git.kernel.org/linus/64eebcfd899a5d2ebe211a593ec13ec24630f1a3 (commit)]
Add support for SFE4003 board and TXC43128 PHY [http://git.kernel.org/linus/7e51b439f147670c4ddd2bf6ca4567592b5312de (commit)]
Remove support for SFN4111T, SFT9001 and Falcon GMAC [http://git.kernel.org/linus/8fbca791309b5a57bec53e5fd7da912c16416ed3 (commit)]
- spi
add spi_tegra driver [http://git.kernel.org/linus/0c03a1dd5bd8a37932ae1d519156172affef22fd (commit)]
fsl_spi: add eSPI controller support [http://git.kernel.org/linus/8b60d6c25b2a2d3525d5322de856c3ca408e5783 (commit)]
topcliff: Add topcliff platform controller hub (PCH) spi bus driver [http://git.kernel.org/linus/e8b17b5b3f30252b5470dbbf54bc251ddc7fac17 (commit)]
i7300_edac: start a driver for i7300 chipset (Clarksboro) [http://git.kernel.org/linus/fcaf780b2ad352edaeb1d1c07a6da053266b1eed (commit)]
Edit conflict - other version:
serial: Add OMAP high-speed UART driver [http://git.kernel.org/linus/b612633b5928077441b979471869753bfa93d41a (commit)]
- sfc
Add filter table management [http://git.kernel.org/linus/64eebcfd899a5d2ebe211a593ec13ec24630f1a3 (commit)]
Add support for SFE4003 board and TXC43128 PHY [http://git.kernel.org/linus/7e51b439f147670c4ddd2bf6ca4567592b5312de (commit)]
Remove support for SFN4111T, SFT9001 and Falcon GMAC [http://git.kernel.org/linus/8fbca791309b5a57bec53e5fd7da912c16416ed3 (commit)]
- spi
add spi_tegra driver [http://git.kernel.org/linus/0c03a1dd5bd8a37932ae1d519156172affef22fd (commit)]
fsl_spi: add eSPI controller support [http://git.kernel.org/linus/8b60d6c25b2a2d3525d5322de856c3ca408e5783 (commit)]
topcliff: Add topcliff platform controller hub (PCH) spi bus driver [http://git.kernel.org/linus/e8b17b5b3f30252b5470dbbf54bc251ddc7fac17 (commit)]
i7300_edac: start a driver for i7300 chipset (Clarksboro) [http://git.kernel.org/linus/fcaf780b2ad352edaeb1d1c07a6da053266b1eed (commit)]
Edit conflict - your version:
End of edit conflict
- ACPI
fan: remove deprecated procfs I/F [http://git.kernel.org/linus/b2a44989c1dbfae409035eaffad4292c27fc7cb8 (commit)]
thermal: remove deprecated procfs I/F [http://git.kernel.org/linus/c57b62f5b1e6dd69ff8c96f6db7f86ea31c0e21f (commit)]
video: remove deprecated procfs I/F [http://git.kernel.org/linus/39fe394d05be43481ceac8b3db19dfd5189097f6 (commit)]