Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d0631c6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew) 

Merge emailed fixes from Andrew Morton:
 "Bunch of fixes:

   - delayed IPC updates.  I held back on this because of some possible
     outstanding bug reports, but they appear to have been addressed in
     later versions

   - A bunch of MAINTAINERS updates

   - Yet Another RTC driver.  I'd held this back while a couple of
     little issues were being worked out.

  I'm expecting an intrusive-but-simple patchset from Joe Perches which
  splits up printk.c into kernel/printk/*.  That will be a pig to
  maintain for two months so if it passes testing I'd like to get it
  upstream after a week or so."

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
  printk: fix incorrect length from print_time() when seconds > 99999
  drivers/rtc/rtc-vt8500.c: fix handling of data passed in struct rtc_time
  drivers/rtc/rtc-vt8500.c: correct handling of CR_24H bitfield
  rtc: add RTC driver for TPS6586x
  MAINTAINERS: fix drivers/staging/sm7xx/
  MAINTAINERS: remove include/linux/of_pwm.h
  MAINTAINERS: remove arch/*/lib/perf_event*.c
  MAINTAINERS: remove drivers/mmc/host/imxmmc.*
  MAINTAINERS: fix Documentation/mei/
  MAINTAINERS: remove arch/x86/platform/mrst/pmu.*
  MAINTAINERS: remove firmware/isci/
  MAINTAINERS: fix drivers/ieee802154/
  MAINTAINERS: fix .../plat-mxc/include/mach/imxfb.h
  MAINTAINERS: remove drivers/video/epson1355fb.c
  MAINTAINERS: fix drivers/media/usb/dvb-usb/cxusb*
  MAINTAINERS: adjust for UAPI
  MAINTAINERS: fix drivers/media/platform/atmel-isi.c
  MAINTAINERS: fix arch/arm/mach-at91/include/mach/at_hdmac.h
  MAINTAINERS: fix drivers/rtc/rtc-vt8500.c
  MAINTAINERS: remove arch/arm/plat-s5p/
  ...
parents de9ac5ce 35dac27c

Documentation/sysctl/kernel.txt

+32 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ show up in /proc/sys/kernel: 
- l2cr                        [ PPC only ]

- modprobe                    ==> Documentation/debugging-modules.txt

- modules_disabled

- msg_next_id		      [ sysv ipc ]

- msgmax

- msgmnb

- msgmni
@@ -62,7 +63,9 @@ show up in /proc/sys/kernel: 
- rtsig-max

- rtsig-nr

- sem

- sem_next_id		      [ sysv ipc ]

- sg-big-buff                 [ generic SCSI device (sg) ]

- shm_next_id		      [ sysv ipc ]

- shm_rmid_forced

- shmall

- shmmax                      [ sysv ipc ]
@@ -320,6 +323,22 @@ to false. 


==============================================================



msg_next_id, sem_next_id, and shm_next_id:



These three toggles allows to specify desired id for next allocated IPC

object: message, semaphore or shared memory respectively.



By default they are equal to -1, which means generic allocation logic.

Possible values to set are in range {0..INT_MAX}.



Notes:

1) kernel doesn't guarantee, that new object will have desired id. So,

it's up to userspace, how to handle an object with "wrong" id.

2) Toggle with non-default value will be set back to -1 by kernel after

successful IPC object allocation.



==============================================================



nmi_watchdog:



Enables/Disables the NMI watchdog on x86 systems. When the value is
@@ -542,6 +561,19 @@ are doing anyway :) 


==============================================================



shmall:



This parameter sets the total amount of shared memory pages that

can be used system wide. Hence, SHMALL should always be at least

ceil(shmmax/PAGE_SIZE).



If you are not sure what the default PAGE_SIZE is on your Linux

system, you can run the following command:



# getconf PAGE_SIZE



==============================================================



shmmax:



This value can be used to query and set the run time limit

MAINTAINERS

+124 −75
Original line number Diff line number Diff line
@@ -449,6 +449,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git 
S:	Maintained

F:	drivers/char/agp/

F:	include/linux/agp*

F:	include/uapi/linux/agp*



AHA152X SCSI DRIVER

M:	"Juergen E. Fischer" <fischer@norbit.de>
@@ -589,6 +590,7 @@ M: Jiri Kosina <jkosina@suse.cz> 
S:	Odd fixes

F:	arch/x86/kernel/apm_32.c

F:	include/linux/apm_bios.h

F:	include/uapi/linux/apm_bios.h

F:	drivers/char/apm-emulation.c



APPLE BCM5974 MULTITOUCH DRIVER
@@ -1005,7 +1007,6 @@ F: drivers/mmc/host/msm_sdcc.c 
F:	drivers/mmc/host/msm_sdcc.h

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c

F:	drivers/platform/msm/

F:	drivers/*/pm8???-*

F:	include/linux/mfd/pm8xxx/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm.git
@@ -1069,7 +1070,6 @@ M: Russell King <linux@arm.linux.org.uk> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.arm.linux.org.uk/

S:	Maintained

F:	arch/arm/common/time-acorn.c

F:	arch/arm/include/asm/hardware/entry-macro-iomd.S

F:	arch/arm/include/asm/hardware/ioc.h

F:	arch/arm/include/asm/hardware/iomd.h
@@ -1094,7 +1094,6 @@ W: http://www.fluff.org/ben/linux/ 
S:	Maintained

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s5p/

F:	arch/arm/mach-s3c24*/

F:	arch/arm/mach-s3c64xx/

F:	drivers/*/*s3c2410*
@@ -1125,7 +1124,6 @@ M: Sylwester Nawrocki <s.nawrocki@samsung.com> 
L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained

F:	arch/arm/plat-s5p/dev-fimc*

F:	arch/arm/plat-samsung/include/plat/*fimc*

F:	drivers/media/platform/s5p-fimc/
@@ -1136,7 +1134,7 @@ M: Jeongtae Park <jtp.park@samsung.com> 
L:	linux-arm-kernel@lists.infradead.org

L:	linux-media@vger.kernel.org

S:	Maintained

F:	arch/arm/plat-s5p/dev-mfc.c

F:	arch/arm/plat-samsung/s5p-dev-mfc.c

F:	drivers/media/platform/s5p-mfc/



ARM/SAMSUNG S5P SERIES TV SUBSYSTEM SUPPORT
@@ -1254,7 +1252,7 @@ F: drivers/video/vt8500lcdfb.* 
F:	drivers/video/wm8505fb*

F:	drivers/video/wmt_ge_rops.*

F:	drivers/tty/serial/vt8500_serial.c

F:	drivers/rtc/rtc-vt8500-c

F:	drivers/rtc/rtc-vt8500.c

F:	drivers/mmc/host/wmt-sdmmc.c



ARM/ZIPIT Z2 SUPPORT
@@ -1388,6 +1386,7 @@ W: http://linux-atm.sourceforge.net 
S:	Maintained

F:	drivers/atm/

F:	include/linux/atm*

F:	include/uapi/linux/atm*



ATMEL AT91 / AT32 MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>
@@ -1406,13 +1405,13 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
S:	Supported

F:	drivers/dma/at_hdmac.c

F:	drivers/dma/at_hdmac_regs.h

F:	arch/arm/mach-at91/include/mach/at_hdmac.h

F:	include/linux/platform_data/dma-atmel.h



ATMEL ISI DRIVER

M:	Josh Wu <josh.wu@atmel.com>

L:	linux-media@vger.kernel.org

S:	Supported

F:	drivers/media/platform/atmel-isi.c

F:	drivers/media/platform/soc_camera/atmel-isi.c

F:	include/media/atmel-isi.h



ATMEL LCDFB DRIVER
@@ -1467,6 +1466,7 @@ W: http://people.redhat.com/sgrubb/audit/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current.git

S:	Maintained

F:	include/linux/audit.h

F:	include/uapi/linux/audit.h

F:	kernel/audit*



AUXILIARY DISPLAY DRIVERS
@@ -1497,7 +1497,7 @@ M: Ralf Baechle <ralf@linux-mips.org> 
L:	linux-hams@vger.kernel.org

W:	http://www.linux-ax25.org/

S:	Maintained

F:	include/linux/ax25.h

F:	include/uapi/linux/ax25.h

F:	include/net/ax25.h

F:	net/ax25/
@@ -1558,7 +1558,7 @@ M: "Tigran A. Aivazian" <tigran@aivazian.fsnet.co.uk> 
S:	Maintained

F:	Documentation/filesystems/bfs.txt

F:	fs/bfs/

F:	include/linux/bfs_fs.h

F:	include/uapi/linux/bfs_fs.h



BLACKFIN ARCHITECTURE

M:	Mike Frysinger <vapier@gentoo.org>
@@ -1655,7 +1655,7 @@ L: netdev@vger.kernel.org 
W:	http://sourceforge.net/projects/bonding/

S:	Supported

F:	drivers/net/bonding/

F:	include/linux/if_bonding.h

F:	include/uapi/linux/if_bonding.h



BROADCOM B44 10/100 ETHERNET DRIVER

M:	Gary Zambrano <zambrano@broadcom.com>
@@ -1734,6 +1734,7 @@ L: linux-scsi@vger.kernel.org 
S:	Supported

F:	block/bsg.c

F:	include/linux/bsg.h

F:	include/uapi/linux/bsg.h



BT87X AUDIO DRIVER

M:	Clemens Ladisch <clemens@ladisch.de>
@@ -1804,7 +1805,7 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	Documentation/networking/caif/

F:	drivers/net/caif/

F:	include/linux/caif/

F:	include/uapi/linux/caif/

F:	include/net/caif/

F:	net/caif/
@@ -1825,11 +1826,11 @@ W: http://gitorious.org/linux-can 
T:	git git://gitorious.org/linux-can/linux-can-next.git

S:	Maintained

F:	net/can/

F:	include/linux/can.h

F:	include/linux/can/core.h

F:	include/linux/can/bcm.h

F:	include/linux/can/raw.h

F:	include/linux/can/gw.h

F:	include/uapi/linux/can.h

F:	include/uapi/linux/can/bcm.h

F:	include/uapi/linux/can/raw.h

F:	include/uapi/linux/can/gw.h



CAN NETWORK DRIVERS

M:	Wolfgang Grandegger <wg@grandegger.com>
@@ -1840,15 +1841,16 @@ T: git git://gitorious.org/linux-can/linux-can-next.git 
S:	Maintained

F:	drivers/net/can/

F:	include/linux/can/dev.h

F:	include/linux/can/error.h

F:	include/linux/can/netlink.h

F:	include/linux/can/platform/

F:	include/uapi/linux/can/error.h

F:	include/uapi/linux/can/netlink.h



CAPABILITIES

M:	Serge Hallyn <serge.hallyn@canonical.com>

L:	linux-security-module@vger.kernel.org

S:	Supported

F:	include/linux/capability.h

F:	include/uapi/linux/capability.h

F:	security/capability.c

F:	security/commoncap.c

F:	kernel/capability.c
@@ -1861,6 +1863,7 @@ W: http://www.ibm.com/developerworks/power/cell/ 
S:	Supported

F:	arch/powerpc/include/asm/cell*.h

F:	arch/powerpc/include/asm/spu*.h

F:	arch/powerpc/include/uapi/asm/spu*.h

F:	arch/powerpc/oprofile/*cell*

F:	arch/powerpc/platforms/cell/
@@ -1909,7 +1912,7 @@ W: http://wireless.kernel.org/ 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git

S:	Maintained

F:	include/linux/nl80211.h

F:	include/uapi/linux/nl80211.h

F:	include/net/cfg80211.h

F:	net/wireless/*

X:	net/wireless/wext*
@@ -2012,6 +2015,7 @@ S: Maintained 
F:	Documentation/filesystems/coda.txt

F:	fs/coda/

F:	include/linux/coda*.h

F:	include/uapi/linux/coda*.h



COMMON CLK FRAMEWORK

M:	Mike Turquette <mturquette@linaro.org>
@@ -2266,6 +2270,7 @@ W: http://www.cyclades.com/ 
S:	Orphan

F:	drivers/tty/cyclades.c

F:	include/linux/cyclades.h

F:	include/uapi/linux/cyclades.h



CYCLADES PC300 DRIVER

W:	http://www.cyclades.com/
@@ -2323,6 +2328,7 @@ L: dccp@vger.kernel.org 
W:	http://www.linuxfoundation.org/collaborate/workgroups/networking/dccp

S:	Maintained

F:	include/linux/dccp.h

F:	include/uapi/linux/dccp.h

F:	include/linux/tfrc.h

F:	net/dccp/
@@ -2349,7 +2355,7 @@ M: Massimo Dal Zotto <dz@debian.org> 
W:	http://www.debian.org/~dz/i8k/

S:	Maintained

F:	drivers/char/i8k.c

F:	include/linux/i8k.h

F:	include/uapi/linux/i8k.h



DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)

M:	Doug Warzecha <Douglas_Warzecha@dell.com>
@@ -2422,6 +2428,7 @@ S: Maintained 
F:	Documentation/filesystems/quota.txt

F:	fs/quota/

F:	include/linux/quota*.h

F:	include/uapi/linux/quota*.h



DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB)

M:	Bernie Thompson <bernie@plugable.com>
@@ -2528,6 +2535,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git 
S:	Maintained

F:	drivers/gpu/drm/

F:	include/drm/

F:	include/uapi/drm/



INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)

M:	Daniel Vetter <daniel.vetter@ffwll.ch>
@@ -2537,6 +2545,7 @@ T: git git://people.freedesktop.org/~danvet/drm-intel 
S:	Supported

F:	drivers/gpu/drm/i915

F:	include/drm/i915*

F:	include/uapi/drm/i915*



DRM DRIVERS FOR EXYNOS

M:	Inki Dae <inki.dae@samsung.com>
@@ -2548,6 +2557,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git 
S:	Supported

F:	drivers/gpu/drm/exynos

F:	include/drm/exynos*

F:	include/uapi/drm/exynos*



DRM DRIVERS FOR NVIDIA TEGRA

M:	Thierry Reding <thierry.reding@avionic-design.de>
@@ -2622,7 +2632,7 @@ W: http://github.com/mkrufky 
Q:	http://patchwork.linuxtv.org/project/linux-media/list/

T:	git git://linuxtv.org/media_tree.git

S:	Maintained

F:	drivers/media/usb/dvb-usb-v2/cxusb*

F:	drivers/media/usb/dvb-usb/cxusb*



DVB_USB_CYPRESS_FIRMWARE MEDIA DRIVER

M:	Antti Palosaari <crope@iki.fi>
@@ -2722,6 +2732,7 @@ L: netfilter-devel@vger.kernel.org 
W:	http://ebtables.sourceforge.net/

S:	Maintained

F:	include/linux/netfilter_bridge/ebt_*.h

F:	include/uapi/linux/netfilter_bridge/ebt_*.h

F:	net/bridge/netfilter/ebt*.c



EC100 MEDIA DRIVER
@@ -2933,12 +2944,6 @@ M: Maxim Levitsky <maximlevitsky@gmail.com> 
S:	Maintained

F:	drivers/media/rc/ene_ir.*



EPSON 1355 FRAMEBUFFER DRIVER

M:	Christopher Hoover <ch@murgatroid.com>

M:	Christopher Hoover <ch@hpl.hp.com>

S:	Maintained

F:	drivers/video/epson1355fb.c



EPSON S1D13XXX FRAMEBUFFER DRIVER

M:	Kristoffer Ericson <kristoffer.ericson@gmail.com>

S:	Maintained
@@ -3051,6 +3056,7 @@ M: Eric Paris <eparis@redhat.com> 
S:	Maintained

F:	fs/notify/fanotify/

F:	include/linux/fanotify.h

F:	include/uapi/linux/fanotify.h



FARSYNC SYNCHRONOUS DRIVER

M:	Kevin Curtis <kevin.curtis@farsite.co.uk>
@@ -3074,6 +3080,7 @@ F: drivers/scsi/fcoe/ 
F:	include/scsi/fc/

F:	include/scsi/libfc.h

F:	include/scsi/libfcoe.h

F:	include/uapi/scsi/fc/



FILE LOCKING (flock() and fcntl()/lockf())

M:	Matthew Wilcox <matthew@wil.cx>
@@ -3081,6 +3088,8 @@ L: linux-fsdevel@vger.kernel.org 
S:	Maintained

F:	include/linux/fcntl.h

F:	include/linux/fs.h

F:	include/uapi/linux/fcntl.h

F:	include/uapi/linux/fs.h

F:	fs/fcntl.c

F:	fs/locks.c
@@ -3170,6 +3179,8 @@ F: Documentation/devicetree/bindings/fb/ 
F:	drivers/video/

F:	include/video/

F:	include/linux/fb.h

F:	include/uapi/video/

F:	include/uapi/linux/fb.h



FREESCALE DIU FRAMEBUFFER DRIVER

M:	Timur Tabi <timur@freescale.com>
@@ -3196,7 +3207,7 @@ M: Sascha Hauer <kernel@pengutronix.de> 
L:	linux-fbdev@vger.kernel.org

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/plat-mxc/include/mach/imxfb.h

F:	include/linux/platform_data/video-imxfb.h

F:	drivers/video/imxfb.c



FREESCALE SOC FS_ENET DRIVER
@@ -3314,7 +3325,7 @@ L: fuse-devel@lists.sourceforge.net 
W:	http://fuse.sourceforge.net/

S:	Maintained

F:	fs/fuse/

F:	include/linux/fuse.h

F:	include/uapi/linux/fuse.h



FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)

M:	Rik Faith <faith@cs.unc.edu>
@@ -3361,6 +3372,7 @@ L: linux-arch@vger.kernel.org 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git

S:	Maintained

F:	include/asm-generic

F:	include/uapi/asm-generic



GENERIC UIO DRIVER FOR PCI DEVICES

M:	"Michael S. Tsirkin" <mst@redhat.com>
@@ -3377,7 +3389,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw.git 
S:	Supported

F:	Documentation/filesystems/gfs2*.txt

F:	fs/gfs2/

F:	include/linux/gfs2_ondisk.h

F:	include/uapi/linux/gfs2_ondisk.h



GIGASET ISDN DRIVERS

M:	Hansjoerg Lipp <hjlipp@web.de>
@@ -3387,7 +3399,7 @@ W: http://gigaset307x.sourceforge.net/ 
S:	Maintained

F:	Documentation/isdn/README.gigaset

F:	drivers/isdn/gigaset/

F:	include/linux/gigaset_dev.h

F:	include/uapi/linux/gigaset_dev.h



GPIO SUBSYSTEM

M:	Grant Likely <grant.likely@secretlab.ca>
@@ -3544,6 +3556,7 @@ S: Supported 
F:	Documentation/scsi/hpsa.txt

F:	drivers/scsi/hpsa*.[ch]

F:	include/linux/cciss*.h

F:	include/uapi/linux/cciss*.h



HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)

M:	Mike Miller <mike.miller@hp.com>
@@ -3552,6 +3565,7 @@ S: Supported 
F:	Documentation/blockdev/cciss.txt

F:	drivers/block/cciss*

F:	include/linux/cciss_ioctl.h

F:	include/uapi/linux/cciss_ioctl.h



HFS FILESYSTEM

L:	linux-fsdevel@vger.kernel.org
@@ -3586,6 +3600,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git 
S:	Maintained

F:	drivers/hid/

F:	include/linux/hid*

F:	include/uapi/linux/hid*



HIGH-RESOLUTION TIMERS, CLOCKEVENTS, DYNTICKS

M:	Thomas Gleixner <tglx@linutronix.de>
@@ -3617,7 +3632,7 @@ M: Jes Sorensen <jes@trained-monkey.org> 
L:	linux-hippi@sunsite.dk

S:	Maintained

F:	include/linux/hippidevice.h

F:	include/linux/if_hippi.h

F:	include/uapi/linux/if_hippi.h

F:	net/802/hippi.c

F:	drivers/net/hippi/
@@ -3645,6 +3660,7 @@ S: Maintained 
F:	Documentation/timers/hpet.txt

F:	drivers/char/hpet.c

F:	include/linux/hpet.h

F:	include/uapi/linux/hpet.h



HPET:	x86

M:	"Venkatesh Pallipadi (Venki)" <venki@google.com>
@@ -3745,6 +3761,8 @@ F: Documentation/i2c/ 
F:	drivers/i2c/

F:	include/linux/i2c.h

F:	include/linux/i2c-*.h

F:	include/uapi/linux/i2c.h

F:	include/uapi/linux/i2c-*.h



I2C-TAOS-EVM DRIVER

M:	Jean Delvare <khali@linux-fr.org>
@@ -3860,7 +3878,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git 
S:	Maintained

F:	net/ieee802154/

F:	net/mac802154/

F:	drivers/ieee802154/

F:	drivers/net/ieee802154/



IGUANAWORKS USB IR TRANSCEIVER

M:	Sean Young <sean@mess.org>
@@ -3911,7 +3929,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband.git 
S:	Supported

F:	Documentation/infiniband/

F:	drivers/infiniband/

F:	include/linux/if_infiniband.h

F:	include/uapi/linux/if_infiniband.h



INOTIFY

M:	John McCutchan <john@johnmccutchan.com>
@@ -3921,6 +3939,7 @@ S: Maintained 
F:	Documentation/filesystems/inotify.txt

F:	fs/notify/inotify/

F:	include/linux/inotify.h

F:	include/uapi/linux/inotify.h



INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS

M:	Dmitry Torokhov <dmitry.torokhov@gmail.com>
@@ -3931,6 +3950,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git 
S:	Maintained

F:	drivers/input/

F:	include/linux/input.h

F:	include/uapi/linux/input.h

F:	include/linux/input/



INPUT MULTITOUCH (MT) PROTOCOL
@@ -3951,7 +3971,6 @@ L: linux-scsi@vger.kernel.org 
T:	git git://git.code.sf.net/p/intel-sas/isci

S:	Supported

F:	drivers/scsi/isci/

F:	firmware/isci/



INTEL IDLE DRIVER

M:	Len Brown <lenb@kernel.org>
@@ -4046,12 +4065,6 @@ F: Documentation/networking/ixgbe.txt 
F:	Documentation/networking/ixgbevf.txt

F:	drivers/net/ethernet/intel/



INTEL MRST PMU DRIVER

M:	Len Brown <len.brown@intel.com>

L:	linux-pm@vger.kernel.org

S:	Supported

F:	arch/x86/platform/mrst/pmu.*



INTEL PRO/WIRELESS 2100, 2200BG, 2915ABG NETWORK CONNECTION SUPPORT

M:	Stanislav Yakovlev <stas.yakovlev@gmail.com>

L:	linux-wireless@vger.kernel.org
@@ -4080,7 +4093,7 @@ S: Supported 
W:	http://linuxwimax.org

F:	Documentation/wimax/README.i2400m

F:	drivers/net/wimax/i2400m/

F:	include/linux/wimax/i2400m.h

F:	include/uapi/linux/wimax/i2400m.h



INTEL WIRELESS 3945ABG/BG, 4965AGN (iwlegacy)

M:	Stanislaw Gruszka <sgruszka@redhat.com>
@@ -4102,9 +4115,9 @@ INTEL MANAGEMENT ENGINE (mei) 
M:	Tomas Winkler <tomas.winkler@intel.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	include/linux/mei.h

F:	include/uapi/linux/mei.h

F:	drivers/misc/mei/*

F:	Documentation/mei/*

F:	Documentation/misc-devices/mei/*



IOC3 ETHERNET DRIVER

M:	Ralf Baechle <ralf@linux-mips.org>
@@ -4144,6 +4157,7 @@ S: Supported 
F:	Documentation/IPMI.txt

F:	drivers/char/ipmi/

F:	include/linux/ipmi*

F:	include/uapi/linux/ipmi*



IPS SCSI RAID DRIVER

M:	Adaptec OEM Raid Solutions <aacraid@adaptec.com>
@@ -4161,7 +4175,7 @@ L: lvs-devel@vger.kernel.org 
S:	Maintained

F:	Documentation/networking/ipvs-sysctl.txt

F:	include/net/ip_vs.h

F:	include/linux/ip_vs.h

F:	include/uapi/linux/ip_vs.h

F:	net/netfilter/ipvs/



IPWIRELESS DRIVER
@@ -4174,8 +4188,8 @@ IPX NETWORK LAYER 
M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

L:	netdev@vger.kernel.org

S:	Maintained

F:	include/linux/ipx.h

F:	include/net/ipx.h

F:	include/uapi/linux/ipx.h

F:	net/ipx/



IRDA SUBSYSTEM
@@ -4238,6 +4252,8 @@ F: Documentation/isdn/ 
F:	drivers/isdn/

F:	include/linux/isdn.h

F:	include/linux/isdn/

F:	include/uapi/linux/isdn.h

F:	include/uapi/linux/isdn/



ISDN SUBSYSTEM (Eicon active card driver)

M:	Armin Schindler <mac@melware.de>
@@ -4278,7 +4294,7 @@ W: http://www.ivtvdriver.org 
S:	Maintained

F:	Documentation/video4linux/*.ivtv

F:	drivers/media/pci/ivtv/

F:	include/linux/ivtv*

F:	include/uapi/linux/ivtv*



IX2505V MEDIA DRIVER

M:	Malcolm Priestley <tvboxspy@gmail.com>
@@ -4316,7 +4332,7 @@ L: linux-mtd@lists.infradead.org 
W:	http://www.linux-mtd.infradead.org/doc/jffs2.html

S:	Maintained

F:	fs/jffs2/

F:	include/linux/jffs2.h

F:	include/uapi/linux/jffs2.h



JOURNALLING LAYER FOR BLOCK DEVICES (JBD)

M:	Andrew Morton <akpm@linux-foundation.org>
@@ -4399,11 +4415,13 @@ W: http://nfs.sourceforge.net/ 
S:	Supported

F:	fs/nfsd/

F:	include/linux/nfsd/

F:	include/uapi/linux/nfsd/

F:	fs/lockd/

F:	fs/nfs_common/

F:	net/sunrpc/

F:	include/linux/lockd/

F:	include/linux/sunrpc/

F:	include/uapi/linux/sunrpc/



KERNEL VIRTUAL MACHINE (KVM)

M:	Marcelo Tosatti <mtosatti@redhat.com>
@@ -4415,6 +4433,7 @@ F: Documentation/*/kvm.txt 
F:	arch/*/kvm/

F:	arch/*/include/asm/kvm*

F:	include/linux/kvm*

F:	include/uapi/linux/kvm*

F:	virt/kvm/



KERNEL VIRTUAL MACHINE (KVM) FOR AMD-V
@@ -4461,6 +4480,7 @@ W: http://kernel.org/pub/linux/utils/kernel/kexec/ 
L:	kexec@lists.infradead.org

S:	Maintained

F:	include/linux/kexec.h

F:	include/uapi/linux/kexec.h

F:	kernel/kexec.c



KEYS/KEYRINGS:
@@ -4702,6 +4722,7 @@ LLC (802.2) 
M:	Arnaldo Carvalho de Melo <acme@ghostprotocols.net>

S:	Maintained

F:	include/linux/llc.h

F:	include/uapi/linux/llc.h

F:	include/net/llc*

F:	net/llc/
@@ -4922,7 +4943,7 @@ MATROX FRAMEBUFFER DRIVER 
L:	linux-fbdev@vger.kernel.org

S:	Orphan

F:	drivers/video/matrox/matroxfb_*

F:	include/linux/matroxfb.h

F:	include/uapi/linux/matroxfb.h



MAX16065 HARDWARE MONITOR DRIVER

M:	Guenter Roeck <linux@roeck-us.net>
@@ -5004,7 +5025,7 @@ T: git git://git.infradead.org/mtd-2.6.git 
S:	Maintained

F:	drivers/mtd/

F:	include/linux/mtd/

F:	include/mtd/

F:	include/uapi/mtd/



MICROBLAZE ARCHITECTURE

M:	Michal Simek <monstr@monstr.eu>
@@ -5042,12 +5063,6 @@ F: Documentation/video4linux/meye.txt 
F:	drivers/media/pci/meye/

F:	include/uapi/linux/meye.h



MOTOROLA IMX MMC/SD HOST CONTROLLER INTERFACE DRIVER

M:	Pavel Pisa <ppisa@pikron.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	drivers/mmc/host/imxmmc.*



MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD

M:	Jiri Slaby <jirislaby@gmail.com>

S:	Maintained
@@ -5086,6 +5101,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git 
S:	Maintained

F:	drivers/mmc/

F:	include/linux/mmc/

F:	include/uapi/linux/mmc/



MULTIMEDIA CARD (MMC) ETC. OVER SPI

S:	Orphan
@@ -5186,6 +5202,8 @@ S: Supported 
F:	include/linux/netfilter*

F:	include/linux/netfilter/

F:	include/net/netfilter/

F:	include/uapi/linux/netfilter*

F:	include/uapi/linux/netfilter/

F:	net/*/netfilter.c

F:	net/*/netfilter/

F:	net/netfilter/
@@ -5204,8 +5222,8 @@ M: Ralf Baechle <ralf@linux-mips.org> 
L:	linux-hams@vger.kernel.org

W:	http://www.linux-ax25.org/

S:	Maintained

F:	include/linux/netrom.h

F:	include/net/netrom.h

F:	include/uapi/linux/netrom.h

F:	net/netrom/



NETWORK BLOCK DEVICE (NBD)
@@ -5214,6 +5232,7 @@ S: Maintained 
F:	Documentation/blockdev/nbd.txt

F:	drivers/block/nbd.c

F:	include/linux/nbd.h

F:	include/uapi/linux/nbd.h



NETWORK DROP MONITOR

M:	Neil Horman <nhorman@tuxdriver.com>
@@ -5235,6 +5254,9 @@ F: include/net/ 
F:	include/linux/in.h

F:	include/linux/net.h

F:	include/linux/netdevice.h

F:	include/uapi/linux/in.h

F:	include/uapi/linux/net.h

F:	include/uapi/linux/netdevice.h



NETWORKING [IPv4/IPv6]

M:	"David S. Miller" <davem@davemloft.net>
@@ -5280,6 +5302,7 @@ F: net/rfkill/ 
F:	net/wireless/

F:	include/net/ieee80211*

F:	include/linux/wireless.h

F:	include/uapi/linux/wireless.h

F:	include/net/iw_handler.h

F:	drivers/net/wireless/
@@ -5299,6 +5322,8 @@ F: include/linux/fcdevice.h 
F:	include/linux/fddidevice.h

F:	include/linux/hippidevice.h

F:	include/linux/inetdevice.h

F:	include/uapi/linux/if_*

F:	include/uapi/linux/netdevice.h



NETXEN (1/10) GbE SUPPORT

M:	Sony Chacko <sony.chacko@qlogic.com>
@@ -5316,8 +5341,8 @@ L: linux-wireless@vger.kernel.org 
L:	linux-nfc@lists.01.org (moderated for non-subscribers)

S:	Maintained

F:	net/nfc/

F:	include/linux/nfc.h

F:	include/net/nfc/

F:	include/uapi/linux/nfc.h

F:	drivers/nfc/

F:	include/linux/platform_data/pn544.h
@@ -5334,6 +5359,8 @@ F: net/sunrpc/ 
F:	include/linux/lockd/

F:	include/linux/nfs*

F:	include/linux/sunrpc/

F:	include/uapi/linux/nfs*

F:	include/uapi/linux/sunrpc/



NI5010 NETWORK DRIVER

M:	Jan-Pascal van Best <janpascal@vanbest.org>
@@ -5523,6 +5550,7 @@ M: Harald Welte <laforge@gnumonks.org> 
S:	Maintained

F:	drivers/char/pcmcia/cm4000_cs.c

F:	include/linux/cm4000_cs.h

F:	include/uapi/linux/cm4000_cs.h



OMNIKEY CARDMAN 4040 DRIVER

M:	Harald Welte <laforge@gnumonks.org>
@@ -5681,7 +5709,7 @@ S: Orphan 
F:	drivers/parport/

F:	include/linux/parport*.h

F:	drivers/char/ppdev.c

F:	include/linux/ppdev.h

F:	include/uapi/linux/ppdev.h



PARAVIRT_OPS INTERFACE

M:	Jeremy Fitzhardinge <jeremy@goop.org>
@@ -5822,11 +5850,11 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git perf/core 
S:	Supported

F:	kernel/events/*

F:	include/linux/perf_event.h

F:	include/uapi/linux/perf_event.h

F:	arch/*/kernel/perf_event*.c

F:	arch/*/kernel/*/perf_event*.c

F:	arch/*/kernel/*/*/perf_event*.c

F:	arch/*/include/asm/perf_event.h

F:	arch/*/lib/perf_event*.c

F:	arch/*/kernel/perf_callchain.c

F:	tools/perf/
@@ -5835,6 +5863,7 @@ M: Christoph Hellwig <hch@infradead.org> 
L:	linux-abi-devel@lists.sourceforge.net

S:	Maintained

F:	include/linux/personality.h

F:	include/uapi/linux/personality.h



PHONET PROTOCOL

M:	Remi Denis-Courmont <courmisch@gmail.com>
@@ -5842,6 +5871,7 @@ S: Supported 
F:	Documentation/networking/phonet.txt

F:	include/linux/phonet.h

F:	include/net/phonet/

F:	include/uapi/linux/phonet.h

F:	net/phonet/



PHRAM MTD DRIVER
@@ -5890,6 +5920,7 @@ M: Jiri Kosina <jkosina@suse.cz> 
S:	Maintained

F:	drivers/block/pktcdvd.c

F:	include/linux/pktcdvd.h

F:	include/uapi/linux/pktcdvd.h



PKUNITY SOC DRIVERS

M:	Guan Xuetao <gxt@mprc.pku.edu.cn>
@@ -5964,7 +5995,7 @@ PPP OVER ATM (RFC 2364) 
M:	Mitchell Blank Jr <mitch@sfgoth.com>

S:	Maintained

F:	net/atm/pppoatm.c

F:	include/linux/atmppp.h

F:	include/uapi/linux/atmppp.h



PPP OVER ETHERNET

M:	Michal Ostrowski <mostrows@earthlink.net>
@@ -5977,6 +6008,7 @@ M: James Chapman <jchapman@katalix.com> 
S:	Maintained

F:	net/l2tp/l2tp_ppp.c

F:	include/linux/if_pppol2tp.h

F:	include/uapi/linux/if_pppol2tp.h



PPS SUPPORT

M:	Rodolfo Giometti <giometti@enneenne.com>
@@ -6074,6 +6106,7 @@ F: include/asm-generic/syscall.h 
F:	include/linux/ptrace.h

F:	include/linux/regset.h

F:	include/linux/tracehook.h

F:	include/uapi/linux/ptrace.h

F:	kernel/ptrace.c



PVRUSB2 VIDEO4LINUX DRIVER
@@ -6102,7 +6135,6 @@ T: git git://gitorious.org/linux-pwm/linux-pwm.git 
F:	Documentation/pwm.txt

F:	Documentation/devicetree/bindings/pwm/

F:	include/linux/pwm.h

F:	include/linux/of_pwm.h

F:	drivers/pwm/

F:	drivers/video/backlight/pwm_bl.c

F:	include/linux/pwm_backlight.h
@@ -6198,8 +6230,8 @@ M: Anders Larsen <al@alarsen.net> 
W:	http://www.alarsen.net/linux/qnx4fs/

S:	Maintained

F:	fs/qnx4/

F:	include/linux/qnx4_fs.h

F:	include/linux/qnxtypes.h

F:	include/uapi/linux/qnx4_fs.h

F:	include/uapi/linux/qnxtypes.h



QT1010 MEDIA DRIVER

M:	Antti Palosaari <crope@iki.fi>
@@ -6233,7 +6265,7 @@ M: Benjamin Herrenschmidt <benh@kernel.crashing.org> 
L:	linux-fbdev@vger.kernel.org

S:	Maintained

F:	drivers/video/aty/radeon*

F:	include/linux/radeonfb.h

F:	include/uapi/linux/radeonfb.h



RADIOSHARK RADIO DRIVER

M:	Hans de Goede <hdegoede@redhat.com>
@@ -6334,6 +6366,7 @@ S: Maintained 
F:	Documentation/rtc.txt

F:	drivers/rtc/

F:	include/linux/rtc.h

F:	include/uapi/linux/rtc.h



REISERFS FILE SYSTEM

L:	reiserfs-devel@vger.kernel.org
@@ -6388,8 +6421,8 @@ M: Ralf Baechle <ralf@linux-mips.org> 
L:	linux-hams@vger.kernel.org

W:	http://www.linux-ax25.org/

S:	Maintained

F:	include/linux/rose.h

F:	include/net/rose.h

F:	include/uapi/linux/rose.h

F:	net/rose/



RTL2830 MEDIA DRIVER
@@ -6566,6 +6599,8 @@ S: Supported 
F:	include/linux/clocksource.h

F:	include/linux/time.h

F:	include/linux/timex.h

F:	include/uapi/linux/time.h

F:	include/uapi/linux/timex.h

F:	kernel/time/clocksource.c

F:	kernel/time/time*.c

F:	kernel/time/ntp.c
@@ -6590,6 +6625,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git sched/core 
S:	Maintained

F:	kernel/sched/

F:	include/linux/sched.h

F:	include/uapi/linux/sched.h



SCORE ARCHITECTURE

M:	Chen Liqin <liqin.chen@sunplusct.com>
@@ -6743,7 +6779,7 @@ SENSABLE PHANTOM 
M:	Jiri Slaby <jirislaby@gmail.com>

S:	Maintained

F:	drivers/misc/phantom.c

F:	include/linux/phantom.h

F:	include/uapi/linux/phantom.h



SERIAL ATA (SATA) SUBSYSTEM

M:	Jeff Garzik <jgarzik@pobox.com>
@@ -7001,6 +7037,7 @@ L: linux-raid@vger.kernel.org 
S:	Supported

F:	drivers/md/

F:	include/linux/raid/

F:	include/uapi/linux/raid/



SONIC NETWORK DRIVER

M:	Thomas Bogendoerfer <tsbogend@alpha.franken.de>
@@ -7041,6 +7078,7 @@ T: git git://git.alsa-project.org/alsa-kernel.git 
S:	Maintained

F:	Documentation/sound/

F:	include/sound/

F:	include/uapi/sound/

F:	sound/



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
@@ -7141,6 +7179,7 @@ S: Maintained 
F:	Documentation/spi/

F:	drivers/spi/

F:	include/linux/spi/

F:	include/uapi/linux/spi/



SPIDERNET NETWORK DRIVER for CELL

M:	Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
@@ -7277,7 +7316,7 @@ F: drivers/staging/rtl8712/ 
STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER

M:	Teddy Wang <teddy.wang@siliconmotion.com.cn>

S:	Odd Fixes

F:	drivers/staging/sm7xx/

F:	drivers/staging/sm7xxfb/



STAGING - SOFTLOGIC 6x10 MPEG CODEC

M:	Ben Collins <bcollins@bluecherry.net>
@@ -7403,8 +7442,8 @@ TC CLASSIFIER 
M:	Jamal Hadi Salim <jhs@mojatatu.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	include/linux/pkt_cls.h

F:	include/net/pkt_cls.h

F:	include/uapi/linux/pkt_cls.h

F:	net/sched/



TCP LOW PRIORITY MODULE
@@ -7496,6 +7535,7 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/team/

F:	include/linux/if_team.h

F:	include/uapi/linux/if_team.h



TECHNOTREND USB IR RECEIVER

M:	Sean Young <sean@mess.org>
@@ -7594,7 +7634,7 @@ L: netdev@vger.kernel.org (core kernel code) 
L:	tipc-discussion@lists.sourceforge.net (user apps, general discussion)

W:	http://tipc.sourceforge.net/

S:	Maintained

F:	include/linux/tipc*.h

F:	include/uapi/linux/tipc*.h

F:	net/tipc/



TILE ARCHITECTURE
@@ -7644,6 +7684,7 @@ W: http://www.buzzard.org.uk/toshiba/ 
S:	Maintained

F:	drivers/char/toshiba.c

F:	include/linux/toshiba.h

F:	include/uapi/linux/toshiba.h



TMIO MMC DRIVER

M:	Guennadi Liakhovetski <g.liakhovetski@gmx.de>
@@ -7711,6 +7752,9 @@ F: drivers/tty/serial/serial_core.c 
F:	include/linux/serial_core.h

F:	include/linux/serial.h

F:	include/linux/tty.h

F:	include/uapi/linux/serial_core.h

F:	include/uapi/linux/serial.h

F:	include/uapi/linux/tty.h



TUA9001 MEDIA DRIVER

M:	Antti Palosaari <crope@iki.fi>
@@ -7790,7 +7834,7 @@ M: David Herrmann <dh.herrmann@googlemail.com> 
L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/uhid.c

F:	include/linux/uhid.h

F:	include/uapi/linux/uhid.h



ULTRA-WIDEBAND (UWB) SUBSYSTEM:

L:	linux-usb@vger.kernel.org
@@ -7819,6 +7863,7 @@ S: Maintained 
F:	Documentation/cdrom/

F:	drivers/cdrom/cdrom.c

F:	include/linux/cdrom.h

F:	include/uapi/linux/cdrom.h



UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER

M:	Vinayak Holikatti <vinholikatti@gmail.com>
@@ -7836,7 +7881,7 @@ T: git git://git.infradead.org/ubi-2.6.git 
S:	Maintained

F:	drivers/mtd/ubi/

F:	include/linux/mtd/ubi.h

F:	include/mtd/ubi-user.h

F:	include/uapi/mtd/ubi-user.h



UNSORTED BLOCK IMAGES (UBI) Fastmap

M:	Richard Weinberger <richard@nod.at>
@@ -7870,7 +7915,7 @@ M: Oliver Neukum <oliver@neukum.org> 
L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/net/usb/cdc_*.c

F:	include/linux/usb/cdc.h

F:	include/uapi/linux/usb/cdc.h



USB CYPRESS C67X00 DRIVER

M:	Peter Korsgaard <jacmet@sunsite.dk>
@@ -8191,6 +8236,7 @@ S: Maintained 
F:	Documentation/vfio.txt

F:	drivers/vfio/

F:	include/linux/vfio.h

F:	include/uapi/linux/vfio.h



VIDEOBUF2 FRAMEWORK

M:	Pawel Osciak <pawel@osciak.com>
@@ -8207,6 +8253,7 @@ L: virtualization@lists.linux-foundation.org 
S:	Maintained

F:	drivers/char/virtio_console.c

F:	include/linux/virtio_console.h

F:	include/uapi/linux/virtio_console.h



VIRTIO CORE, NET AND BLOCK DRIVERS

M:	Rusty Russell <rusty@rustcorp.com.au>
@@ -8225,7 +8272,7 @@ L: virtualization@lists.linux-foundation.org 
L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/vhost/

F:	include/linux/vhost.h

F:	include/uapi/linux/vhost.h



VIA RHINE NETWORK DRIVER

M:	Roger Luethi <rl@hellgate.ch>
@@ -8365,6 +8412,7 @@ S: Maintained 
F:	Documentation/watchdog/

F:	drivers/watchdog/

F:	include/linux/watchdog.h

F:	include/uapi/linux/watchdog.h



WD7000 SCSI DRIVER

M:	Miroslav Zagorac <zaga@fly.cc.fer.hr>
@@ -8390,9 +8438,9 @@ L: wimax@linuxwimax.org 
S:	Supported

W:	http://linuxwimax.org

F:	Documentation/wimax/README.wimax

F:	include/linux/wimax.h

F:	include/linux/wimax/debug.h

F:	include/net/wimax.h

F:	include/uapi/linux/wimax.h

F:	net/wimax/



WISTRON LAPTOP BUTTON DRIVER
@@ -8510,6 +8558,7 @@ F: drivers/*/xen-*front.c 
F:	drivers/xen/

F:	arch/x86/include/asm/xen/

F:	include/xen/

F:	include/uapi/xen/



XEN HYPERVISOR ARM

M:	Stefano Stabellini <stefano.stabellini@eu.citrix.com>

drivers/rtc/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -352,6 +352,14 @@ config RTC_DRV_TWL4030 
	  This driver can also be built as a module. If so, the module

	  will be called rtc-twl.



config RTC_DRV_TPS6586X

	tristate "TI TPS6586X RTC driver"

	depends on MFD_TPS6586X

	help

	  TI Power Managment IC TPS6586X supports RTC functionality

	  along with alarm. This driver supports the RTC driver for

	  the TPS6586X RTC module.



config RTC_DRV_TPS65910

	tristate "TI TPS65910 RTC driver"

	depends on RTC_CLASS && MFD_TPS65910