87d721ad7a
Merge branch 'master' into devel
2009-09-12 12:04:37 +01:00
ddd559b13f
Merge branch 'devel-stable' into devel
...
Conflicts:
MAINTAINERS
arch/arm/mm/fault.c
2009-09-12 12:02:26 +01:00
cf7a2b4fb6
Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel
2009-09-12 12:01:34 +01:00
d95c5b0b90
V4L/DVB (12564a): MAINTAINERS: Update gspca sn9c20x name style
...
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com >
2009-08-31 02:24:54 -03:00
b2503a9408
mmc: add the new linux-mmc mailing list to MAINTAINERS
...
There are a number of individual MMC drivers listed in MAINTAINERS. I
didn't modify those records. Perhaps I should have.
Cc: <linux-mmc@vger.kernel.org >
Cc: Manuel Lauss <manuel.lauss@gmail.com >
Cc: Nicolas Pitre <nico@cam.org >
Cc: Pierre Ossman <drzeus@drzeus.cx >
Cc: Pavel Pisa <ppisa@pikron.com >
Cc: Jarkko Lavinen <jarkko.lavinen@nokia.com >
Cc: Ben Dooks <ben-linux@fluff.org >
Cc: Sascha Sommer <saschasommer@freenet.de >
Cc: Ian Molton <ian@mnementh.co.uk >
Cc: Joseph Chan <JosephChan@via.com.tw >
Cc: Harald Welte <HaraldWelte@viatech.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-08-18 16:31:13 -07:00
6b6f0b6c13
MAINTAINERS: OSD LIBRARY and FILESYSTEM pattern fix
...
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Benny Halevy <bhalevy@panasas.com >
Cc: Boaz Harrosh <bharrosh@panasas.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-08-18 16:31:12 -07:00
8486a0f95c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
...
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (60 commits)
net: restore gnet_stats_basic to previous definition
NETROM: Fix use of static buffer
e1000e: fix use of pci_enable_pcie_error_reporting
e1000e: WoL does not work on 82577/82578 with manageability enabled
cnic: Fix locking in init/exit calls.
cnic: Fix locking in start/stop calls.
bnx2: Use mutex on slow path cnic calls.
cnic: Refine registration with bnx2.
cnic: Fix symbol_put_addr() panic on ia64.
gre: Fix MTU calculation for bound GRE tunnels
pegasus: Add new device ID.
drivers/net: fixed drivers that support netpoll use ndo_start_xmit()
via-velocity: Fix test of mii_status bit VELOCITY_DUPLEX_FULL
rt2x00: fix memory corruption in rf cache, add a sanity check
ixgbe: Fix receive on real device when VLANs are configured
ixgbe: Do not return 0 in ixgbe_fcoe_ddp() upon FCP_RSP in DDP completion
netxen: free napi resources during detach
netxen: remove netxen workqueue
ixgbe: fix issues setting rx-usecs with legacy interrupts
can: fix oops caused by wrong rtnl newlink usage
...
2009-08-18 13:55:01 -07:00
57a473f2f9
ARM: 5671/1: bcmring: add maintainer entry
...
add maintainer entry
Signed-off-by: Leo Chen <leochen@broadcom.com >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2009-08-15 16:06:47 +01:00
261982f170
V4L/DVB (12373a): Add gspca sn9c20x subdriver entry to MAINTAINERS file
...
MAINTAINERS | 8 ++++++++
Signed-off-by: Brian Johnson <brijohn@gmail.com >
Acked-by: Jean-Francois Moine <moinejf@free.fr >
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com >
2009-08-13 20:39:04 -03:00
54a246ff21
[ARM] add MAINTAINERS entry for Orion/Kirkwood/etc.
...
Signed-off-by: Nicolas Pitre <nico@marvell.com >
2009-08-11 23:28:51 -04:00
018d21ed80
MAINTAINERS: additional NETWORKING [GENERAL] and NETWORKING DRIVERS patterns
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: David S. Miller <davem@davemloft.net >
2009-08-09 21:45:41 -07:00
cb2f33e959
MAINTAINERS: update atlx contact info
...
Update MAINTAINERS to reflect my current (non-)affiliation. Anyone
hiring?
Signed-off-by: Chris Snook <chris.snook@gmail.com >
Cc: Jay Cliburn <jcliburn@gmail.com >
Cc: Jie Yang <jie.yang@atheros.com >
Cc: "David S. Miller" <davem@davemloft.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: David S. Miller <davem@davemloft.net >
2009-08-09 21:45:29 -07:00
57d7f28227
TTY: Maintainer change
...
Clearly, I am a glutton for punishment. I'll see if I can see Alan's
changes through to the end, otherwise I'll be fending off a lot of bug
reports for usb-serial devices.
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk >
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-08-02 14:15:08 -07:00
3822a0e38c
mmc: orphan subsystem
...
I do not have the time to take care of this, so remove myself as
maintainer.
Signed-off-by: Pierre Ossman <pierre@ossman.eu >
2009-07-31 12:29:59 +02:00
90a09c9cf7
Alan doesn't want to maintain tty code any more
...
Not that anybody can blame him. It's a morass. But hey, it's way
better than it _used_ to be, though, so thanks for all the fish.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-30 16:40:37 -07:00
084bad91af
MAINTAINERS: update HP Jornada 700-series and Epson s1d13xxxfb support
...
Add the relevant git repositories and affected files to the maintainership
of HP Jornada 700-series and Epson s1d13xxxfb support.
Signed-off-by: Kristoffer Ericson <kristoffer.ericson@gmail.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:41 -07:00
2bed6eeb8c
MAINTAINERS: finish off the email address coalescing
...
Add some touchups to the sample record.
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:41 -07:00
8b58be884a
MAINTAINERS: coalesce name and email address lines
...
Switch the MAINTAINERS email address format from
P: Linus Torvalds
M: torvalds@linux-foundation.org
to
M: Linus Torvalds <torvalds@linux-foundation.org >
Mainly to ease the copy-n-pasting of maitnainer addresses into email clients.
The script to perform this operation:
#! /bin/sh
#
# Change MAINTAINERS from
# P: name
# M: address
# to:
# M: name <address>
#
# Integrate P: and M: lines
#
perl -i -e 'local $/; while(<>) { s@P: ([^\n]+)\nM: ([^\n]+)\n@M: \1 <\2>\n@g; print; }' MAINTAINERS
#
# Quote names with periods, commas and parentheses
#
sed -r -i -e "s/^M: (.+)([\.,'\(])(.*) </M: \"\1\2\3\" </g" MAINTAINERS
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Pavel Machek <pavel@ucw.cz >
Acked-by: Randy Dunlap <randy.dunlap@oracle.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:41 -07:00
82c4dfc762
MAINTAINERS: Scott Murray is no longer with SomaNetworks
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
2bd1944899
MAINTAINERS: QLOGIC QLA3XXX - Add Ron Mercer email address
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
edf4b0a980
MAINTAINERS: QLOGIC QLA2XXX - add Andrew Vasquez email address
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
9ae9a7f119
MAINTAINERS: Remove CS461x sound card section
...
Thomas Woller's email address bounces
Nils Faerber isn't active
Added Thomas Woller to CREDITS, Nils already has an entry
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
5bee73ff71
MAINTAINERS: INPUT: Add Dmitry's name to his email address
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
a72f8024f4
MAINTAINERS: USB Serial Digi Acceleport: use separate P: for Al Borchers
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
cabaaf415c
MAINTAINERS: Add PPS patterns
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-29 19:10:40 -07:00
Russell King
Joe Perches
Andrew Morton
Linus Torvalds
Leo Chen
Brian Johnson
Nicolas Pitre
Chris Snook
Greg Kroah-Hartman
Pierre Ossman
Kristoffer Ericson