Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6

diff --combined MAINTAINERS
index 28f65c249b97b396e976ec2fd85946dce6e48023,a6669b2a77e0702506bff714d3ea419228385f87..261232d8adf9b90b8beb2334b4de77be53d8529e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -1883,7 -1883,7 +1883,7 @@@ S:      Maintaine
  F:    drivers/connector/
  
  CONTROL GROUPS (CGROUPS)
 -M:    Paul Menage <[email protected]>
 +M:    Paul Menage <[email protected]>
  M:    Li Zefan <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -1925,14 -1925,8 +1925,14 @@@ S:    Maintaine
  F:    arch/x86/kernel/cpuid.c
  F:    arch/x86/kernel/msr.c
  
 +CPU POWER MONITORING SUBSYSTEM
 +M:    Dominik Brodowski <[email protected]>
 +M:    Thomas Renninger <[email protected]>
 +S:    Maintained
 +F:    tools/power/cpupower
 +
  CPUSETS
 -M:    Paul Menage <[email protected]>
 +M:    Paul Menage <[email protected]>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
  S:    Supported
@@@ -2643,17 -2637,18 +2643,17 @@@ S:   Maintaine
  F:    arch/x86/math-emu/
  
  FRAME RELAY DLCI/FRAD (Sangoma drivers too)
 -M:    Mike McLagan <[email protected]>
  L:    [email protected]
 -S:    Maintained
 +S:    Orphan
  F:    drivers/net/wan/dlci.c
  F:    drivers/net/wan/sdla.c
  
  FRAMEBUFFER LAYER
 -M:    Paul Mundt <[email protected]>
 +M:    Florian Tobias Schandinat <[email protected]>
  L:    [email protected]
  W:    http://linux-fbdev.sourceforge.net/
  Q:    http://patchwork.kernel.org/project/linux-fbdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev-2.6.git
 +T:    git git://github.com/schandinat/linux-2.6.git fbdev-next
  S:    Maintained
  F:    Documentation/fb/
  F:    Documentation/devicetree/bindings/fb/
@@@ -3366,12 -3361,6 +3366,12 @@@ F:    drivers/net/ixgb
  F:    drivers/net/ixgbe/
  F:    drivers/net/ixgbevf/
  
 +INTEL MRST PMU DRIVER
 +M:    Len Brown <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    arch/x86/platform/mrst/pmu.*
 +
  INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
  L:    [email protected]
  S:    Orphan
@@@ -3905,9 -3894,9 +3905,9 @@@ F:      arch/powerpc/platforms/powermac
  F:    drivers/macintosh/
  
  LINUX FOR POWERPC EMBEDDED MPC5XXX
 -M:    Grant Likely <[email protected]>
 +M:    Anatolij Gustschin <[email protected]>
  L:    [email protected]
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 +T:    git git://git.denx.de/linux-2.6-agust.git
  S:    Maintained
  F:    arch/powerpc/platforms/512x/
  F:    arch/powerpc/platforms/52xx/
@@@ -4161,13 -4150,6 +4161,13 @@@ S:    Orpha
  F:    drivers/video/matrox/matroxfb_*
  F:    include/linux/matroxfb.h
  
 +MAX1668 TEMPERATURE SENSOR DRIVER
 +M:    "David George" <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/max1668
 +F:    drivers/hwmon/max1668.c
 +
  MAX6650 HARDWARE MONITOR AND FAN CONTROLLER DRIVER
  M:    "Hans J. Koch" <[email protected]>
  L:    [email protected]
@@@ -4404,7 -4386,8 +4404,8 @@@ L:      [email protected]
  L:    [email protected]
  W:    http://www.netfilter.org/
  W:    http://www.iptables.org/
- T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-2.6.git
+ T:    git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next-2.6.git
  S:    Supported
  F:    include/linux/netfilter*
  F:    include/linux/netfilter/
@@@ -4414,10 -4397,10 +4415,10 @@@ F:   net/*/netfilter
  F:    net/netfilter/
  
  NETLABEL
 -M:    Paul Moore <paul.moore@hp.com>
 +M:    Paul Moore <paul@paul-moore.com>
  W:    http://netlabel.sf.net
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    Documentation/netlabel/
  F:    include/net/netlabel.h
  F:    net/netlabel/
@@@ -4450,8 -4433,8 +4451,8 @@@ M:      "David S. Miller" <[email protected]
  L:    [email protected]
  W:    http://www.linuxfoundation.org/en/Net
  W:    http://patchwork.ozlabs.org/project/netdev/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git
  S:    Maintained
  F:    net/
  F:    include/net/
@@@ -4462,6 -4445,7 +4463,6 @@@ F:      include/linux/netdevice.
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <[email protected]>
  M:    Alexey Kuznetsov <[email protected]>
 -M:    "Pekka Savola (ipv6)" <[email protected]>
  M:    James Morris <[email protected]>
  M:    Hideaki YOSHIFUJI <[email protected]>
  M:    Patrick McHardy <[email protected]>
@@@ -4474,7 -4458,7 +4475,7 @@@ F:      include/net/ip
  F:    arch/x86/net/*
  
  NETWORKING [LABELED] (NetLabel, CIPSO, Labeled IPsec, SECMARK)
 -M:    Paul Moore <paul.moore@hp.com>
 +M:    Paul Moore <paul@paul-moore.com>
  L:    [email protected]
  S:    Maintained
  
@@@ -4604,7 -4588,7 +4605,7 @@@ F:      arch/arm/mach-omap2/clockdomain2xxx_
  F:    arch/arm/mach-omap2/clockdomain44xx.c
  
  OMAP AUDIO SUPPORT
 -M:    Jarkko Nikula <jhnikula@gmail.com>
 +M:    Jarkko Nikula <jarkko.nikula@bitmer.com>
  L:    [email protected] (subscribers-only)
  L:    [email protected]
  S:    Maintained
@@@ -4726,7 -4710,6 +4727,7 @@@ S:      Maintaine
  F:    drivers/of
  F:    include/linux/of*.h
  K:    of_get_property
 +K:    of_match_table
  
  OPENRISC ARCHITECTURE
  M:    Jonas Bonn <[email protected]>
@@@ -4971,7 -4954,7 +4972,7 @@@ M:      Paul Mackerras <[email protected]
  M:    Ingo Molnar <[email protected]>
  M:    Arnaldo Carvalho de Melo <[email protected]>
  S:    Supported
 -F:    kernel/perf_event*.c
 +F:    kernel/events/*
  F:    include/linux/perf_event.h
  F:    arch/*/kernel/perf_event*.c
  F:    arch/*/kernel/*/perf_event*.c
@@@ -5017,17 -5000,6 +5018,17 @@@ F:    drivers/i2c/busses/i2c-puv3.
  F:    drivers/video/fb-puv3.c
  F:    drivers/rtc/rtc-puv3.c
  
 +PMBUS HARDWARE MONITORING DRIVERS
 +M:    Guenter Roeck <[email protected]>
 +L:    [email protected]
 +W:    http://www.lm-sensors.org/
 +W:    http://www.roeck-us.net/linux/drivers/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 +S:    Maintained
 +F:    Documentation/hwmon/pmbus
 +F:    drivers/hwmon/pmbus/
 +F:    include/linux/i2c/pmbus.h
 +
  PMC SIERRA MaxRAID DRIVER
  M:    Anil Ravindranath <[email protected]>
  L:    [email protected]
@@@ -5532,7 -5504,6 +5533,7 @@@ F:      include/media/*7146
  
  SAMSUNG AUDIO (ASoC) DRIVERS
  M:    Jassi Brar <[email protected]>
 +M:    Sangbeom Kim <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    sound/soc/samsung
@@@ -6324,7 -6295,6 +6325,7 @@@ F:      include/linux/sysv_fs.
  TARGET SUBSYSTEM
  M:    Nicholas A. Bellinger <[email protected]>
  L:    [email protected]
 +L:    [email protected]
  L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/lio-core-2.6.git master
@@@ -7088,7 -7058,7 +7089,7 @@@ S:      Supporte
  F:    drivers/mmc/host/vub300.c
  
  W1 DALLAS'S 1-WIRE BUS
 -M:    Evgeniy Polyakov <[email protected]>
 +M:    Evgeniy Polyakov <[email protected]>
  S:    Maintained
  F:    Documentation/w1/
  F:    drivers/w1/
@@@ -7358,7 -7328,7 +7359,7 @@@ THE RES
  M:    Linus Torvalds <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/LKML/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
  S:    Buried alive in reporters
  F:    *
  F:    */