]> rtime.felk.cvut.cz Git - lisovros/linux_canprio.git/commitdiff
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:13:42 +0000 (11:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 8 Sep 2010 18:13:42 +0000 (11:13 -0700)
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  gcc-4.6: kernel/*: Fix unused but set warnings
  mutex: Fix annotations to include it in kernel-locking docbook
  pid: make setpgid() system call use RCU read-side critical section
  MAINTAINERS: Add RCU's public git tree

1  2 
MAINTAINERS

diff --combined MAINTAINERS
index 087912aa09bda419450654f904c96289dcb1b43c,614861a8f37785d68f2c4aff0cde7f6684bade01..7e189b57c8b55fb1d20c9de7e7301ce5009cb98e
@@@ -2201,12 -2201,6 +2201,12 @@@ L:    linux-rdma@vger.kernel.or
  S:    Supported
  F:    drivers/infiniband/hw/ehca/
  
 +EHEA (IBM pSeries eHEA 10Gb ethernet adapter) DRIVER
 +M:    Breno Leitao <leitao@linux.vnet.ibm.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ehea/
 +
  EMBEDDED LINUX
  M:    Paul Gortmaker <paul.gortmaker@windriver.com>
  M:    Matt Mackall <mpm@selenic.com>
@@@ -2302,12 -2296,6 +2302,12 @@@ S:    Maintaine
  F:    Documentation/hwmon/f71805f
  F:    drivers/hwmon/f71805f.c
  
 +FANOTIFY
 +M:    Eric Paris <eparis@redhat.com>
 +S:    Maintained
 +F:    fs/notify/fanotify/
 +F:    include/linux/fanotify.h
 +
  FARSYNC SYNCHRONOUS DRIVER
  M:    Kevin Curtis <kevin.curtis@farsite.co.uk>
  W:    http://www.farsite.co.uk/
@@@ -3500,7 -3488,7 +3500,7 @@@ LGUES
  M:    Rusty Russell <rusty@rustcorp.com.au>
  L:    lguest@lists.ozlabs.org
  W:    http://lguest.ozlabs.org/
 -S:    Maintained
 +S:    Odd Fixes
  F:    Documentation/lguest/
  F:    arch/x86/lguest/
  F:    drivers/lguest/
@@@ -3929,7 -3917,8 +3929,7 @@@ F:      Documentation/sound/oss/MultiSoun
  F:    sound/oss/msnd*
  
  MULTITECH MULTIPORT CARD (ISICOM)
 -M:    Jiri Slaby <jirislaby@gmail.com>
 -S:    Maintained
 +S:    Orphan
  F:    drivers/char/isicom.c
  F:    include/linux/isicom.h
  
@@@ -4609,7 -4598,7 +4609,7 @@@ F:      include/linux/preempt.
  PRISM54 WIRELESS DRIVER
  M:    "Luis R. Rodriguez" <mcgrof@gmail.com>
  L:    linux-wireless@vger.kernel.org
 -W:    http://prism54.org
 +W:    http://wireless.kernel.org/en/users/Drivers/p54
  S:    Obsolete
  F:    drivers/net/wireless/prism54/
  
@@@ -4810,6 -4799,7 +4810,7 @@@ RCUTORTURE MODUL
  M:    Josh Triplett <josh@freedesktop.org>
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  S:    Supported
+ T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/torture.txt
  F:    kernel/rcutorture.c
  
@@@ -4834,6 -4824,7 +4835,7 @@@ M:      Dipankar Sarma <dipankar@in.ibm.com
  M:    "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
  W:    http://www.rdrop.com/users/paulmck/rclock/
  S:    Supported
+ T:    git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu.git
  F:    Documentation/RCU/
  F:    include/linux/rcu*
  F:    include/linux/srcu*