David S. Miller
aa11d958d1
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
...
Conflicts:
arch/microblaze/include/asm/socket.h
2009-08-12 17:44:53 -07:00
Joe Perches
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
Chris Snook
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
Greg Kroah-Hartman
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
Pierre Ossman
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
Linus Torvalds
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
Kristoffer Ericson
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
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
Joe Perches
24725d1ecf
MAINTAINERS: Update KERNEL JANITORS
...
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
Joe Perches
eb51b0349d
MAINTAINERS: Move ARPD to CREDITS
...
Jonathan Layes is hard to find.
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:39 -07:00
Joe Perches
5daa2963f8
MAINTAINERS: Remove L: linux-kernel@vger.kernel.org
...
from sections that should not have them.
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:39 -07:00
Joe Perches
4fc26e36ac
MAINTAINERS: Use tabs in ACER ASPIRE ONE
...
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:39 -07:00
Joe Perches
4cbfbe256d
MAINTAINERS: QLGE 10Gb ETHERNET - pair P:/M: entries properly
...
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:39 -07:00
Joe Perches
30e1099351
MAINTAINERS: Remove ivtv-user lists, add CX18 url
...
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:39 -07:00
Joe Perches
56d44f0517
MAINTAINERS: IA64 - pair P:/M: entries properly
...
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:39 -07:00
Joe Perches
2b3daf5889
MAINTAINERS: Update rtl8180 patterns
...
rtl8180 files were moved into a subdirectory
by commit 1c740ed221
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: John W. Linville <linville@tuxdriver.com >
2009-07-24 15:05:29 -04:00
Kalle Valo
834da34604
MAINTAINERS: add wl1251 wireless driver
...
Add myself as the maintainer for wl1251 driver.
Signed-off-by: Kalle Valo <kalle.valo@nokia.com >
Signed-off-by: John W. Linville <linville@tuxdriver.com >
2009-07-24 15:05:29 -04:00
David S. Miller
74d154189d
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
...
Conflicts:
drivers/net/wireless/iwmc3200wifi/netdev.c
net/wireless/scan.c
2009-07-23 19:03:51 -07:00
Linus Torvalds
402168cee1
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: (37 commits)
sky2: Avoid races in sky2_down
drivers/net/mlx4: Adjust constant
drivers/net: Move a dereference below a NULL test
drivers/net: Move a dereference below a NULL test
connector: maintainer/mail update.
USB host CDC Phonet network interface driver
macsonic, jazzsonic: fix oops on module unload
macsonic: move probe function to .devinit.text
can: switch carrier on if device was stopped while in bus-off state
can: restart device even if dev_alloc_skb() fails
can: sja1000: remove duplicated includes
New device ID for sc92031 [1088:2031]
3c589_cs: re-initialize the multicast in the tc589_reset
Fix error return for setsockopt(SO_TIMESTAMPING)
netxen: fix thermal check and shutdown
netxen: fix deadlock on dev close
netxen: fix context deletion sequence
net: Micrel KS8851 SPI network driver
tcp: Use correct peer adr when copying MD5 keys
tcp: Fix MD5 signature checking on IPv4 mapped sockets
...
2009-07-22 09:49:58 -07:00
Evgeniy Polyakov
acb9c1b2f4
connector: maintainer/mail update.
...
Signed-off-by: Evgeniy Polyakov <zbr@ioremap.net >
Signed-off-by: David S. Miller <davem@davemloft.net >
2009-07-21 12:43:51 -07:00
Ralf Baechle
673325951e
Update Andreas Koensgen's email address
...
The kernel has used a stale email address of Andreas for a few years.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org >
Signed-off-by: David S. Miller <davem@davemloft.net >
2009-07-17 10:07:12 -07:00
Ralf Baechle
54a8fa62c9
MAINTAINERS entry for STRIP driver
...
The web server does no longer exist, it's not on archive.org nor does there
seem to be any mirror.
MAINTAINERS | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
Signed-off-by: David S. Miller <davem@davemloft.net >
2009-07-17 10:07:10 -07:00
David S. Miller
da8120355e
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
...
Conflicts:
drivers/net/wireless/orinoco/main.c
2009-07-16 20:21:24 -07:00
David S. Miller
95aa1fe4ab
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
2009-07-16 17:34:50 -07:00
Dave Kleikamp
8f8f013478
update JFS entry in MAINTAINERS
...
JFS hasn't really been supported for a while. It's still maintained,
but saying it's supported is a stretch. Updating my preferred email
address as well.
Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-13 09:10:20 -07:00
Linus Torvalds
44c695b13b
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
...
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: fix corruption dump
UBIFS: clean up free space checking
UBIFS: small amendments in the LEB scanning code
UBIFS: dump a little more in case of corruptions
MAINTAINERS: update ahunter's e-mail address
UBIFS: allow more than one volume to be mounted
UBIFS: fix assertion warning
UBIFS: minor spelling and grammar fixes
UBIFS: fix 64-bit divisions in debug print
UBIFS: few spelling fixes
UBIFS: set write-buffer timout to 3-5 seconds
UBIFS: slightly optimize write-buffer timer usage
UBIFS: improve debugging messaged
UBIFS: fix integer overflow warning
2009-07-10 19:14:48 -07:00
Linus Torvalds
04eef90c2e
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
...
* 'for-linus' of git://git.open-osd.org/linux-open-osd:
osdblk: Adjust queue limits to lower device's limits
osdblk: a Linux block device for OSD objects
MAINTAINERS: Add osd maintained files (F:)
exofs: Avoid using file_fsync()
exofs: Remove IBM copyrights
exofs: Fix bio leak in error handling path (sync read)
2009-07-10 19:12:24 -07:00
Alan Cox
e3288775ff
tty: maintainers data was edited wrongly by someone
...
Move tty entries to tty not trivial. Noted by David Brownell.
Signed-off-by: Alan Cox <alan@linux.intel.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-07-08 09:47:59 -07:00
Artem Bityutskiy
8f6035732a
MAINTAINERS: update ahunter's e-mail address
...
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com >
2009-07-05 18:45:19 +03:00
Linus Torvalds
7b85425fac
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: (31 commits)
Revert "ipv4: arp announce, arp_proxy and windows ip conflict verification"
igb: return PCI_ERS_RESULT_DISCONNECT on permanent error
e1000e: io_error_detected callback should return PCI_ERS_RESULT_DISCONNECT
e1000: return PCI_ERS_RESULT_DISCONNECT on permanent error
e1000: fix unmap bug
igb: fix unmap length bug
ixgbe: fix unmap length bug
ixgbe: Fix link capabilities during adapter resets
ixgbe: Fix device capabilities of 82599 single speed fiber NICs.
ixgbe: Fix SFP log messages
usbnet: Remove private stats structure
usbnet: Use netdev stats structure
smsc95xx: Use netdev stats structure
rndis_host: Use netdev stats structure
net1080: Use netdev stats structure
dm9601: Use netdev stats structure
cdc_eem: Use netdev stats structure
ipv4: Fix fib_trie rebalancing, part 3
bnx2x: Fix the behavior of ethtool when ONBOOT=no
sctp: xmit sctp packet always return no route error
...
2009-07-01 10:29:26 -07:00
Joe Perches
3f1f7cf08d
netfilter: add netfilter git to MAINTAINERS
...
Signed-off-by: Joe Perches <joe@perches.com >
Signed-off-by: Patrick McHardy <kaber@trash.net >
2009-07-01 11:32:10 +02:00
Linus Torvalds
58580c8645
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
...
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
Add Fenghua Yu as temporary co-maintainer for ia64
[IA64] address compiler warnings perfmon.c/salinfo.c
[IA64] Remove unnecessary semicolons
[IA64] sprintf should not be used with same source & destination address
2009-06-30 19:01:52 -07:00
Joe Perches
b4f90189dc
MAINTAINERS: STARFIRE/DURALAN update
...
Ion's cs.columbia.edu email address no longer works.
Signed-off-by: Joe Perches <joe@perches.com >
Acked-by: Ion Badulescu <ionut@badula.org >
Cc: "David S. Miller" <davem@davemloft.net >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-06-30 18:56:00 -07:00
Joe Perches
c15e504bd0
MAINTAINERS: update EDAC-I82975X
...
As per Ranganathan's request.
Signed-off-by: Joe Perches <joe@perches.com >
Cc: Ranganathan Desikan <ravi@jetztechnologies.com >
Cc: Arvind R. <arvind@jetztechnologies.com >
Cc: Doug Thompson <norsk5@yahoo.com >
Signed-off-by: Andrew Morton <akpm@linux-foundation.org >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-06-30 18:55:59 -07:00
Tony Luck
fadfd2b6ba
Add Fenghua Yu as temporary co-maintainer for ia64
...
I'm taking my sabbatical from Intel for July/August 2009.
Fenghua Yu will handle ia64 architecture while I'm gone.
Signed-off-by: Tony Luck <tony.luck@intel.com >
2009-06-30 14:28:54 -07:00
Linus Torvalds
ec9c45d456
Merge master.kernel.org:/home/rmk/linux-2.6-arm
...
* master.kernel.org:/home/rmk/linux-2.6-arm: (28 commits)
[ARM] 5562/2: at91: add gpio button support for at91sam9g20ek
[ARM] 5563/1: at91: at91sam9rlek lcd interface correction
[ARM] 5565/2: Use PAGE_SIZE and RO_DATA() in link script
[ARM] 5560/1: Avoid buffer overrun in case of an invalid IRQ
[ARM] GTA02: build fixes (s3c2410_nand_set usage)
[ARM] MINI2440: Add missing flash_bbt flat to NAND
[ARM] s3c2410_defconfig: add MINI2440 machine to build
[ARM] S3C: Fix S3C24XX build to not include s3c64xx IIS devices
[ARM] S3C24XX: Fix missing s3c_iis_device.
[ARM] MINI2440: remove duplicated #include
[ARM] S3C24XX: Fix spi-bus configuration build errors
OMAP: Fix IOMEM macro for assembly
[ARM] S3C: Remove unused CONFIG_DEBUG_S3C_PORT
[ARM] S3C24XX: Fix use of CONFIG_S3C24XX_PWM
OMAP2/3: Initialize gpio debounce register
OMAP: IOMMU: function flush_iotlb_page is not flushing correct entry
OMAP3: RX51: Use OneNAND sync read / write
OMAP2/3: gpmc-onenand: correct use of async timings
OMAP3: DMA: Enable idlemodes for DMA OCP
OMAP3: SRAM size fix for HS/EMU devices
...
2009-06-29 16:18:19 -07:00
Dmitry Eremin-Solenikov
e0af6062aa
MAINTAINERS: ieee802154 lists are moderated for non-subscribers.
...
Note that our mailing list is moderated for non-subscribers.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com >
2009-06-29 18:19:59 +04:00
Takashi Iwai
10121a12e2
Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc
...
Conflicts:
MAINTAINERS
2009-06-25 15:28:14 +02:00
Peter Ujfalusi
dd5e8e6b1d
MAINTAINERS: Add entry for twl4030 series soc codec driver
...
New MAINTAINERS entry for twl4030 series soc codec driver
with Peter Ujfalusi as maintainer.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com >
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com >
2009-06-25 13:56:26 +01:00
Russell King
8fd3ec6309
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
2009-06-25 13:49:07 +01:00
Jesper Nilsson
9937ac0cc0
MAINTAINERS: Change mailing list info for CRIS
...
Posting to the dev-etrax mailing list is only allowed for subscribers,
and the list is more geared toward user applications than kernel
developers.
Change to newly created mailing list for CRIS.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com >
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org >
2009-06-24 10:22:26 -07:00
Corentin Chary
76593d6fb0
acpi4asus: update MAINTAINER and KConfig links
...
The bug tracker have moved from sourceforge to
http://dev.iksaif.net . The homepage of the project
is now http://acpi4asus.sf.net with links to the new
bug tracker. No change for the mailing list.
Signed-off-by: Corentin Chary <corentincj@iksaif.net >
Signed-off-by: Len Brown <len.brown@intel.com >
2009-06-24 01:30:55 -04:00