Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: (54 commits)
  tpm_nsc: Fix bug when loading multiple TPM drivers
  tpm: Move tpm_tis_reenable_interrupts out of CONFIG_PNP block
  tpm: Fix compilation warning when CONFIG_PNP is not defined
  TOMOYO: Update kernel-doc.
  tpm: Fix a typo
  tpm_tis: Probing function for Intel iTPM bug
  tpm_tis: Fix the probing for interrupts
  tpm_tis: Delay ACPI S3 suspend while the TPM is busy
  tpm_tis: Re-enable interrupts upon (S3) resume
  tpm: Fix display of data in pubek sysfs entry
  tpm_tis: Add timeouts sysfs entry
  tpm: Adjust interface timeouts if they are too small
  tpm: Use interface timeouts returned from the TPM
  tpm_tis: Introduce durations sysfs entry
  tpm: Adjust the durations if they are too small
  tpm: Use durations returned from TPM
  TOMOYO: Enable conditional ACL.
  TOMOYO: Allow using argv[]/envp[] of execve() as conditions.
  TOMOYO: Allow using executable's realpath and symlink's target as conditions.
  TOMOYO: Allow using owner/group etc. of file objects as conditions.
  ...

Fix up trivial conflict in security/tomoyo/realpath.c

diff --combined MAINTAINERS
index 7b2e9e8,bb179a8..1d2e79d
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1,5 -1,4 +1,5 @@@
  
 +
        List of maintainers and how to submit kernel changes
  
  Please try to follow the guidelines below.  This will make things
@@@ -534,8 -533,6 +534,8 @@@ L: device-drivers-devel@blackfin.uclinu
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
  W:    http://wiki.analog.com/
  S:    Supported
 +F:    sound/soc/codecs/adau*
 +F:    sound/soc/codecs/adav*
  F:    sound/soc/codecs/ad1*
  F:    sound/soc/codecs/ssm*
  
@@@ -597,16 -594,6 +597,16 @@@ S:       Maintaine
  F:    arch/arm/lib/floppydma.S
  F:    arch/arm/include/asm/floppy.h
  
 +ARM PMU PROFILING AND DEBUGGING
 +M:    Will Deacon <will.deacon@arm.com>
 +S:    Maintained
 +F:    arch/arm/kernel/perf_event*
 +F:    arch/arm/oprofile/common.c
 +F:    arch/arm/kernel/pmu.c
 +F:    arch/arm/include/asm/pmu.h
 +F:    arch/arm/kernel/hw_breakpoint.c
 +F:    arch/arm/include/asm/hw_breakpoint.h
 +
  ARM PORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -696,7 -683,7 +696,7 @@@ T: git git://git.infradead.org/users/cb
  
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
 -M:    Ryan Mallon <ryan@bluewatersys.com>
 +M:    Ryan Mallon <rmallon@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-ep93xx/
@@@ -734,12 -721,6 +734,12 @@@ T:       git git://git.berlios.de/gemini-boar
  S:    Maintained
  F:    arch/arm/mach-gemini/
  
 +ARM/CSR SIRFPRIMA2 MACHINE SUPPORT
 +M:    Barry Song <baohua.song@csr.com>
 +L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    arch/arm/mach-prima2/
 +
  ARM/EBSA110 MACHINE SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1364,18 -1345,16 +1364,18 @@@ F:   drivers/auxdisplay
  F:    include/linux/cfag12864b.h
  
  AVR32 ARCHITECTURE
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
  W:    http://www.atmel.com/products/AVR32/
  W:    http://avr32linux.org/
  W:    http://avrfreaks.net/
 -S:    Supported
 +S:    Maintained
  F:    arch/avr32/
  
  AVR32/AT32AP MACHINE SUPPORT
 -M:    Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 -S:    Supported
 +M:    Haavard Skinnemoen <hskinnemoen@gmail.com>
 +M:    Hans-Christian Egtvedt <egtvedt@samfundet.no>
 +S:    Maintained
  F:    arch/avr32/mach-at32ap/
  
  AX.25 NETWORK LAYER
@@@ -1411,6 -1390,7 +1411,6 @@@ F:      include/linux/backlight.
  BATMAN ADVANCED
  M:    Marek Lindner <lindner_marek@yahoo.de>
  M:    Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
 -M:    Sven Eckelmann <sven@narfation.org>
  L:    b.a.t.m.a.n@lists.open-mesh.org
  W:    http://www.open-mesh.org/
  S:    Maintained
@@@ -1443,6 -1423,7 +1443,6 @@@ S:      Supporte
  F:    arch/blackfin/
  
  BLACKFIN EMAC DRIVER
 -M:    Michael Hennerich <michael.hennerich@analog.com>
  L:    uclinux-dist-devel@blackfin.uclinux.org
  W:    http://blackfin.uclinux.org
  S:    Supported
@@@ -1552,20 -1533,13 +1552,20 @@@ F:   drivers/net/tg3.
  BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER
  M:    Brett Rudley <brudley@broadcom.com>
  M:    Henry Ptasinski <henryp@broadcom.com>
 -M:    Dowan Kim <dowan@broadcom.com>
  M:    Roland Vossen <rvossen@broadcom.com>
  M:    Arend van Spriel <arend@broadcom.com>
 +M:    Franky (Zhenhui) Lin <frankyl@broadcom.com>
 +M:    Kan Yan <kanyan@broadcom.com>
  L:    linux-wireless@vger.kernel.org
  S:    Supported
  F:    drivers/staging/brcm80211/
  
 +BROADCOM BNX2FC 10 GIGABIT FCOE DRIVER
 +M:    Bhanu Prakash Gollapudi <bprakash@broadcom.com>
 +L:    linux-scsi@vger.kernel.org
 +S:    Supported
 +F:    drivers/scsi/bnx2fc/
 +
  BROCADE BFA FC SCSI DRIVER
  M:    Jing Huang <huangj@brocade.com>
  L:    linux-scsi@vger.kernel.org
@@@ -1595,7 -1569,7 +1595,7 @@@ F:      Documentation/sound/alsa/Bt87x.tx
  F:    sound/pci/bt87x.c
  
  BT8XXGPIO DRIVER
 -M:    Michael Buesch <mb@bu3sch.de>
 +M:    Michael Buesch <m@bues.ch>
  W:    http://bu3sch.de/btgpio.php
  S:    Maintained
  F:    drivers/gpio/bt8xxgpio.c
@@@ -1665,7 -1639,7 +1665,7 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  M:    Oliver Hartkopp <oliver.hartkopp@volkswagen.de>
  M:    Urs Thuermann <urs.thuermann@volkswagen.de>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1677,7 -1651,7 +1677,7 @@@ F:      include/linux/can/raw.
  
  CAN NETWORK DRIVERS
  M:    Wolfgang Grandegger <wg@grandegger.com>
 -L:    socketcan-core@lists.berlios.de
 +L:    socketcan-core@lists.berlios.de (subscribers-only)
  L:    netdev@vger.kernel.org
  W:    http://developer.berlios.de/projects/socketcan/
  S:    Maintained
@@@ -1788,8 -1762,7 +1788,8 @@@ F:      include/linux/clk.
  
  CISCO FCOE HBA DRIVER
  M:    Abhijeet Joglekar <abjoglek@cisco.com>
 -M:    Joe Eykholt <jeykholt@cisco.com>
 +M:    Venkata Siva Vijayendra Bhamidipati <vbhamidi@cisco.com>
 +M:    Brian Uchino <buchino@cisco.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/fnic/
@@@ -2224,7 -2197,7 +2224,7 @@@ F:      drivers/acpi/dock.
  DOCUMENTATION
  M:    Randy Dunlap <rdunlap@xenotime.net>
  L:    linux-doc@vger.kernel.org
 -T:    quilt oss.oracle.com/~rdunlap/kernel-doc-patches/current/
 +T:    quilt http://userweb.kernel.org/~rdunlap/kernel-doc-patches/current/
  S:    Maintained
  F:    Documentation/
  
@@@ -3019,7 -2992,7 +3019,7 @@@ F:      kernel/hrtimer.
  F:    kernel/time/clockevents.c
  F:    kernel/time/tick*.*
  F:    kernel/time/timer_*.c
 -F:    include/linux/clockevents.h
 +F:    include/linux/clockchips.h
  F:    include/linux/hrtimer.h
  
  HIGH-SPEED SCC DRIVER FOR AX.25
@@@ -3442,9 -3415,10 +3442,9 @@@ S:     Maintaine
  F:    drivers/net/ipg.*
  
  IPATH DRIVER
 -M:    Ralph Campbell <infinipath@qlogic.com>
 +M:    Mike Marciniszyn <infinipath@qlogic.com>
  L:    linux-rdma@vger.kernel.org
 -T:    git git://git.qlogic.com/ipath-linux-2.6
 -S:    Supported
 +S:    Maintained
  F:    drivers/infiniband/hw/ipath/
  
  IPMI SUBSYSTEM
@@@ -3902,7 -3876,7 +3902,7 @@@ F:      arch/powerpc/platforms/512x
  F:    arch/powerpc/platforms/52xx/
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
 -M:    Josh Boyer <jwboyer@linux.vnet.ibm.com>
 +M:    Josh Boyer <jwboyer@gmail.com>
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -3934,7 -3908,6 +3934,7 @@@ W:      http://www.penguinppc.org
  L:    linuxppc-dev@lists.ozlabs.org
  S:    Maintained
  F:    arch/powerpc/platforms/83xx/
 +F:    arch/powerpc/platforms/85xx/
  
  LINUX FOR POWERPC PA SEMI PWRFICIENT
  M:    Olof Johansson <olof@lixom.net>
@@@ -3968,13 -3941,6 +3968,13 @@@ L:    lm-sensors@lm-sensors.or
  S:    Maintained
  F:    drivers/hwmon/lm73.c
  
 +LM78 HARDWARE MONITOR DRIVER
 +M:    Jean Delvare <khali@linux-fr.org>
 +L:    lm-sensors@lm-sensors.org
 +S:    Maintained
 +F:    Documentation/hwmon/lm78
 +F:    drivers/hwmon/lm78.c
 +
  LM83 HARDWARE MONITOR DRIVER
  M:    Jean Delvare <khali@linux-fr.org>
  L:    lm-sensors@lm-sensors.org
@@@ -4121,12 -4087,6 +4121,12 @@@ S:    Maintaine
  F:    drivers/net/mv643xx_eth.*
  F:    include/linux/mv643xx.h
  
 +MARVELL MWIFIEX WIRELESS DRIVER
 +M:    Bing Zhao <bzhao@marvell.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/wireless/mwifiex/
 +
  MARVELL MWL8K WIRELESS DRIVER
  M:    Lennert Buytenhek <buytenh@wantstofly.org>
  L:    linux-wireless@vger.kernel.org
@@@ -4223,10 -4183,9 +4223,10 @@@ F:    drivers/usb/image/microtek.
  
  MIPS
  M:    Ralf Baechle <ralf@linux-mips.org>
 -W:    http://www.linux-mips.org/
  L:    linux-mips@linux-mips.org
 +W:    http://www.linux-mips.org/
  T:    git git://git.linux-mips.org/pub/scm/linux.git
 +Q:    http://patchwork.linux-mips.org/project/linux-mips/list/
  S:    Supported
  F:    Documentation/mips/
  F:    arch/mips/
@@@ -4320,8 -4279,8 +4320,8 @@@ S:      Maintaine
  F:    drivers/usb/musb/
  
  MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 +M:    Jon Mason <mason@myri.com>
  M:    Andrew Gallatin <gallatin@myri.com>
 -M:    Brice Goglin <brice@myri.com>
  L:    netdev@vger.kernel.org
  W:    http://www.myri.com/scs/download-Myri10GE.html
  S:    Supported
@@@ -4615,8 -4574,9 +4615,8 @@@ S:      Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
 -M:    Madhusudhan Chikkature <madhu.cr@ti.com>
  L:    linux-omap@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/mmc/host/omap_hsmmc.c
  
  OMAP RANDOM NUMBER GENERATOR SUPPORT
@@@ -4710,14 -4670,6 +4710,14 @@@ F:    drivers/o
  F:    include/linux/of*.h
  K:    of_get_property
  
 +OPENRISC ARCHITECTURE
 +M:    Jonas Bonn <jonas@southpole.se>
 +W:    http://openrisc.net
 +L:    linux@lists.openrisc.net
 +S:    Maintained
 +T:    git git://openrisc.net/~jonas/linux
 +F:    arch/openrisc
 +
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -5030,7 -4982,7 +5030,7 @@@ F:      drivers/power/power_supply
  
  PNP SUPPORT
  M:    Adam Belay <abelay@mit.edu>
 -M:    Bjorn Helgaas <bjorn.helgaas@hp.com>
 +M:    Bjorn Helgaas <bhelgaas@google.com>
  S:    Maintained
  F:    drivers/pnp/
  
@@@ -5190,12 -5142,6 +5190,12 @@@ M:    Robert Jarzmik <robert.jarzmik@free.
  L:    rtc-linux@googlegroups.com
  S:    Maintained
  
 +QIB DRIVER
 +M:    Mike Marciniszyn <infinipath@qlogic.com>
 +L:    linux-rdma@vger.kernel.org
 +S:    Supported
 +F:    drivers/infiniband/hw/qib/
 +
  QLOGIC QLA1280 SCSI DRIVER
  M:    Michael Reed <mdr@sgi.com>
  L:    linux-scsi@vger.kernel.org
@@@ -5235,7 -5181,6 +5235,7 @@@ S:      Supporte
  F:    drivers/net/qlcnic/
  
  QLOGIC QLGE 10Gb ETHERNET DRIVER
 +M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
  M:    Ron Mercer <ron.mercer@qlogic.com>
  M:    linux-driver@qlogic.com
  L:    netdev@vger.kernel.org
@@@ -5357,13 -5302,6 +5357,13 @@@ L:    reiserfs-devel@vger.kernel.or
  S:    Supported
  F:    fs/reiserfs/
  
 +REGISTER MAP ABSTRACTION
 +M:    Mark Brown <broonie@opensource.wolfsonmicro.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git
 +S:    Supported
 +F:    drivers/base/regmap/
 +F:    include/linux/regmap.h
 +
  RFKILL
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linux-wireless@vger.kernel.org
@@@ -5926,7 -5864,7 +5926,7 @@@ S:      Maintaine
  F:    drivers/net/sonic.*
  
  SONICS SILICON BACKPLANE DRIVER (SSB)
 -M:    Michael Buesch <mb@bu3sch.de>
 +M:    Michael Buesch <m@bues.ch>
  L:    netdev@vger.kernel.org
  S:    Maintained
  F:    drivers/ssb/
@@@ -6100,145 -6038,6 +6100,145 @@@ L:  devel@driverdev.osuosl.or
  S:    Maintained
  F:    drivers/staging/
  
 +STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS
 +M:    Henk de Groot <pe1dnn@amsat.org>
 +S:    Odd Fixes
 +F:    drivers/staging/wlags49_h2/
 +F:    drivers/staging/wlags49_h25/
 +
 +STAGING - ASUS OLED
 +M:    Jakub Schmidtke <sjakub@gmail.com>
 +S:    Odd Fixes
 +F:    drivers/staging/asus_oled/
 +
 +STAGING - ATHEROS ATH6KL WIRELESS DRIVER
 +M:    Luis R. Rodriguez <mcgrof@gmail.com>
 +M:    Naveen Singh <nsingh@atheros.com>
 +S:    Odd Fixes
 +F:    drivers/staging/ath6kl/
 +
 +STAGING - COMEDI
 +M:    Ian Abbott <abbotti@mev.co.uk>
 +M:    Mori Hess <fmhess@users.sourceforge.net>
 +S:    Odd Fixes
 +F:    drivers/staging/comedi/
 +
 +STAGING - CRYSTAL HD VIDEO DECODER
 +M:    Naren Sankar <nsankar@broadcom.com>
 +M:    Jarod Wilson <jarod@wilsonet.com>
 +M:    Scott Davilla <davilla@4pi.com>
 +M:    Manu Abraham <abraham.manu@gmail.com>
 +S:    Odd Fixes
 +F:    drivers/staging/crystalhd/
 +
 +STAGING - CYPRESS WESTBRIDGE SUPPORT
 +M:    David Cross <david.cross@cypress.com>
 +S:    Odd Fixes
 +F:    drivers/staging/westbridge/
 +
 +STAGING - ECHO CANCELLER
 +M:    Steve Underwood <steveu@coppice.org>
 +M:    David Rowe <david@rowetel.com>
 +S:    Odd Fixes
 +F:    drivers/staging/echo/
 +
 +STAGING - FLARION FT1000 DRIVERS
 +M:    Marek Belisko <marek.belisko@gmail.com>
 +S:    Odd Fixes
 +F:    drivers/staging/ft1000/
 +
 +STAGING - FRONTIER TRANZPORT AND ALPHATRACK
 +M:    David Täht <d@teklibre.com>
 +S:    Odd Fixes
 +F:    drivers/staging/frontier/
 +
 +STAGING - HYPER-V (MICROSOFT)
 +M:    Hank Janssen <hjanssen@microsoft.com>
 +M:    Haiyang Zhang <haiyangz@microsoft.com>
 +S:    Odd Fixes
 +F:    drivers/staging/hv/
 +
 +STAGING - INDUSTRIAL IO
 +M:    Jonathan Cameron <jic23@cam.ac.uk>
 +L:    linux-iio@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/staging/iio/
 +
 +STAGING - LIRC (LINUX INFRARED REMOTE CONTROL) DRIVERS
 +M:    Jarod Wilson <jarod@wilsonet.com>
 +W:    http://www.lirc.org/
 +S:    Odd Fixes
 +F:    drivers/staging/lirc/
 +
 +STAGING - OLPC SECONDARY DISPLAY CONTROLLER (DCON)
 +M:    Andres Salomon <dilinger@queued.net>
 +M:    Chris Ball <cjb@laptop.org>
 +M:    Jon Nettleton <jon.nettleton@gmail.com>
 +W:    http://wiki.laptop.org/go/DCON
 +S:    Odd Fixes
 +F:    drivers/staging/olpc_dcon/
 +
 +STAGING - PARALLEL LCD/KEYPAD PANEL DRIVER
 +M:    Willy Tarreau <willy@meta-x.org>
 +S:    Odd Fixes
 +F:    drivers/staging/panel/
 +
 +STAGING - REALTEK RTL8712U DRIVERS
 +M:    Larry Finger <Larry.Finger@lwfinger.net>
 +M:    Florian Schilhabel <florian.c.schilhabel@googlemail.com>.
 +S:    Odd Fixes
 +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/
 +
 +STAGING - SOFTLOGIC 6x10 MPEG CODEC
 +M:    Ben Collins <bcollins@bluecherry.net>
 +S:    Odd Fixes
 +F:    drivers/staging/solo6x10/
 +
 +STAGING - SPEAKUP CONSOLE SPEECH DRIVER
 +M:    William Hubbs <w.d.hubbs@gmail.com>
 +M:    Chris Brannon <chris@the-brannons.com>
 +M:    Kirk Reiser <kirk@braille.uwo.ca>
 +M:    Samuel Thibault <samuel.thibault@ens-lyon.org>
 +L:    speakup@braille.uwo.ca
 +W:    http://www.linux-speakup.org/
 +S:    Odd Fixes
 +F:    drivers/staging/speakup/
 +
 +STAGING - TI DSP BRIDGE DRIVERS
 +M:    Omar Ramirez Luna <omar.ramirez@ti.com>
 +S:    Odd Fixes
 +F:    drivers/staging/tidspbridge/
 +
 +STAGING - TRIDENT TVMASTER TMxxxx USB VIDEO CAPTURE DRIVERS
 +L:    linux-media@vger.kernel.org
 +S:    Odd Fixes
 +F:    drivers/staging/tm6000/
 +
 +STAGING - USB ENE SM/MS CARD READER DRIVER
 +M:    Al Cho <acho@novell.com>
 +S:    Odd Fixes
 +F:    drivers/staging/keucr/
 +
 +STAGING - VIA VT665X DRIVERS
 +M:    Forest Bond <forest@alittletooquiet.net>
 +S:    Odd Fixes
 +F:    drivers/staging/vt665?/
 +
 +STAGING - WINBOND IS89C35 WLAN USB DRIVER
 +M:    Pavel Machek <pavel@ucw.cz>
 +S:    Odd Fixes
 +F:    drivers/staging/winbond/
 +
 +STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER
 +M:    Arnaud Patard <apatard@mandriva.com>
 +S:    Odd Fixes
 +F:    drivers/staging/xgifb/
 +
  STARFIRE/DURALAN NETWORK DRIVER
  M:    Ion Badulescu <ionut@badula.org>
  S:    Odd Fixes
@@@ -6408,7 -6207,7 +6408,7 @@@ L:      tomoyo-users-en@lists.sourceforge.j
  L:    tomoyo-dev@lists.sourceforge.jp (subscribers-only, for developers in Japanese)
  L:    tomoyo-users@lists.sourceforge.jp (subscribers-only, for users in Japanese)
  W:    http://tomoyo.sourceforge.jp/
- T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.3.x/tomoyo-lsm/patches/
+ T:    quilt http://svn.sourceforge.jp/svnroot/tomoyo/trunk/2.4.x/tomoyo-lsm/patches/
  S:    Maintained
  F:    security/tomoyo/
  
@@@ -6432,14 -6231,9 +6432,14 @@@ F:    drivers/char/toshiba.
  F:    include/linux/toshiba.h
  
  TMIO MMC DRIVER
 +M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  M:    Ian Molton <ian@mnementh.co.uk>
 +L:    linux-mmc@vger.kernel.org
  S:    Maintained
 -F:    drivers/mmc/host/tmio_mmc.*
 +F:    drivers/mmc/host/tmio_mmc*
 +F:    drivers/mmc/host/sh_mobile_sdhi.c
 +F:    include/linux/mmc/tmio.h
 +F:    include/linux/mmc/sh_mobile_sdhi.h
  
  TMPFS (SHMEM FILESYSTEM)
  M:    Hugh Dickins <hughd@google.com>
@@@ -6516,7 -6310,7 +6516,7 @@@ F:      drivers/scsi/u14-34f.
  
  UBI FILE SYSTEM (UBIFS)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
 -M:    Adrian Hunter <adrian.hunter@nokia.com>
 +M:    Adrian Hunter <adrian.hunter@intel.com>
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
  W:    http://www.linux-mtd.infradead.org/doc/ubifs.html
@@@ -6741,6 -6535,13 +6741,6 @@@ W:     http://pegasus2.sourceforge.net
  S:    Maintained
  F:    drivers/net/usb/rtl8150.c
  
 -USB SE401 DRIVER
 -L:    linux-usb@vger.kernel.org
 -W:    http://www.chello.nl/~j.vreeken/se401/
 -S:    Orphan
 -F:    Documentation/video4linux/se401.txt
 -F:    drivers/staging/se401/
 -
  USB SERIAL BELKIN F5U103 DRIVER
  M:    William Greathouse <wgreathouse@smva.com>
  L:    linux-usb@vger.kernel.org
@@@ -6931,7 -6732,6 +6931,7 @@@ F:      fs/fat
  VIDEOBUF2 FRAMEWORK
  M:    Pawel Osciak <pawel@osciak.com>
  M:    Marek Szyprowski <m.szyprowski@samsung.com>
 +M:    Kyungmin Park <kyungmin.park@samsung.com>
  L:    linux-media@vger.kernel.org
  S:    Maintained
  F:    drivers/media/video/videobuf2-*
@@@ -7126,9 -6926,9 +7126,9 @@@ S:      Maintaine
  F:    drivers/input/misc/wistron_btns.c
  
  WL1251 WIRELESS DRIVER
 -M:    Kalle Valo <kvalo@adurom.com>
 +M:    Luciano Coelho <coelho@ti.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://wireless.kernel.org
 +W:    http://wireless.kernel.org/en/users/Drivers/wl1251
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  S:    Maintained
  F:    drivers/net/wireless/wl1251/*

diff --combined fs/ecryptfs/keystore.c
index fa8049e,2cff13a..c472533
--- 1/fs/ecryptfs/keystore.c
--- 2/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@@ -1635,11 -1635,14 +1635,14 @@@ int ecryptfs_keyring_auth_tok_for_sig(s
  
        (*auth_tok_key) = request_key(&key_type_user, sig, NULL);
        if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
-               printk(KERN_ERR "Could not find key with description: [%s]\n",
-                      sig);
-               rc = process_request_key_err(PTR_ERR(*auth_tok_key));
-               (*auth_tok_key) = NULL;
-               goto out;
+               (*auth_tok_key) = ecryptfs_get_encrypted_key(sig);
+               if (!(*auth_tok_key) || IS_ERR(*auth_tok_key)) {
+                       printk(KERN_ERR "Could not find key with description: [%s]\n",
+                             sig);
+                       rc = process_request_key_err(PTR_ERR(*auth_tok_key));
+                       (*auth_tok_key) = NULL;
+                       goto out;
+               }
        }
        down_write(&(*auth_tok_key)->sem);
        rc = ecryptfs_verify_auth_tok_from_key(*auth_tok_key, auth_tok);
@@@ -2248,7 -2251,7 +2251,7 @@@ write_tag_3_packet(char *dest, size_t *
                       auth_tok->token.password.session_key_encryption_key,
                       crypt_stat->key_size);
                ecryptfs_printk(KERN_DEBUG,
 -                              "Cached session key " "encryption key: \n");
 +                              "Cached session key encryption key:\n");
                if (ecryptfs_verbosity > 0)
                        ecryptfs_dump_hex(session_key_encryption_key, 16);
        }

diff --combined kernel/cgroup.c
index 9844580,81a8678..1d2b6ce
--- 1/kernel/cgroup.c
--- 2/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@@ -27,9 -27,11 +27,11 @@@
   */
  
  #include <linux/cgroup.h>
+ #include <linux/cred.h>
  #include <linux/ctype.h>
  #include <linux/errno.h>
  #include <linux/fs.h>
+ #include <linux/init_task.h>
  #include <linux/kernel.h>
  #include <linux/list.h>
  #include <linux/mm.h>
@@@ -59,7 -61,7 +61,7 @@@
  #include <linux/poll.h>
  #include <linux/flex_array.h> /* used in cgroup_attach_proc */
  
 -#include <asm/atomic.h>
 +#include <linux/atomic.h>
  
  static DEFINE_MUTEX(cgroup_mutex);
  
@@@ -1514,6 -1516,7 +1516,7 @@@ static struct dentry *cgroup_mount(stru
                struct cgroup *root_cgrp = &root->top_cgroup;
                struct inode *inode;
                struct cgroupfs_root *existing_root;
+               const struct cred *cred;
                int i;
  
                BUG_ON(sb->s_root != NULL);
@@@ -1593,7 -1596,9 +1596,9 @@@
                BUG_ON(!list_empty(&root_cgrp->children));
                BUG_ON(root->number_of_cgroups != 1);
  
+               cred = override_creds(&init_cred);
                cgroup_populate_dir(root_cgrp);
+               revert_creds(cred);
                mutex_unlock(&cgroup_mutex);
                mutex_unlock(&inode->i_mutex);
        } else {
@@@ -1697,6 -1702,7 +1702,6 @@@ int cgroup_path(const struct cgroup *cg
  {
        char *start;
        struct dentry *dentry = rcu_dereference_check(cgrp->dentry,
 -                                                    rcu_read_lock_held() ||
                                                      cgroup_lock_is_held());
  
        if (!dentry || cgrp == dummytop) {
@@@ -1722,6 -1728,7 +1727,6 @@@
                        break;
  
                dentry = rcu_dereference_check(cgrp->dentry,
 -                                             rcu_read_lock_held() ||
                                               cgroup_lock_is_held());
                if (!cgrp->parent)
                        continue;
@@@ -3540,8 -3547,7 +3545,8 @@@ static int cgroup_write_event_control(s
        }
  
        /* the process need read permission on control file */
 -      ret = file_permission(cfile, MAY_READ);
 +      /* AV: shouldn't we check that it's been opened for read instead? */
 +      ret = inode_permission(cfile->f_path.dentry->d_inode, MAY_READ);
        if (ret < 0)
                goto fail;
  
@@@ -4812,7 -4818,8 +4817,7 @@@ unsigned short css_id(struct cgroup_sub
         * on this or this is under rcu_read_lock(). Once css->id is allocated,
         * it's unchanged until freed.
         */
 -      cssid = rcu_dereference_check(css->id,
 -                      rcu_read_lock_held() || atomic_read(&css->refcnt));
 +      cssid = rcu_dereference_check(css->id, atomic_read(&css->refcnt));
  
        if (cssid)
                return cssid->id;
@@@ -4824,7 -4831,8 +4829,7 @@@ unsigned short css_depth(struct cgroup_
  {
        struct css_id *cssid;
  
 -      cssid = rcu_dereference_check(css->id,
 -                      rcu_read_lock_held() || atomic_read(&css->refcnt));
 +      cssid = rcu_dereference_check(css->id, atomic_read(&css->refcnt));
  
        if (cssid)
                return cssid->depth;

diff --combined security/apparmor/domain.c
index 7312bf9,78adc43..c1e18ba
--- 1/security/apparmor/domain.c
--- 2/security/apparmor/domain.c
+++ b/security/apparmor/domain.c
@@@ -67,13 -67,12 +67,12 @@@ static int may_change_ptraced_domain(st
        int error = 0;
  
        rcu_read_lock();
 -      tracer = tracehook_tracer_task(task);
 +      tracer = ptrace_parent(task);
        if (tracer) {
                /* released below */
                cred = get_task_cred(tracer);
                tracerp = aa_cred_profile(cred);
        }
-       rcu_read_unlock();
  
        /* not ptraced */
        if (!tracer || unconfined(tracerp))
@@@ -82,6 -81,7 +81,7 @@@
        error = aa_may_ptrace(tracer, tracerp, to_profile, PTRACE_MODE_ATTACH);
  
  out:
+       rcu_read_unlock();
        if (cred)
                put_cred(cred);