Commit Graph

180 Commits

Author SHA1 Message Date
Jeff Garzik
ca94f26d2b Merge branch 'e1000-fixes' of git://198.78.49.142/~jbrandeb/linux-2.6 2006-03-21 16:40:51 -05:00
Linus Torvalds
2bf2154c6b Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6: (81 commits)
  [PATCH] USB: omninet: fix up debugging comments
  [PATCH] USB serial: add navman driver
  [PATCH] USB: Fix irda-usb use after use
  [PATCH] USB: rtl8150 small fix
  [PATCH] USB: ftdi_sio: add Icom ID1 USB product and vendor ids
  [PATCH] USB: cp2101: add new device IDs
  [PATCH] USB: fix check_ctrlrecip to allow control transfers in state ADDRESS
  [PATCH] USB: vicam.c: fix a NULL pointer dereference
  [PATCH] USB: ZC0301 driver bugfix
  [PATCH] USB: add support for Creativelabs Silvercrest USB keyboard
  [PATCH] USB: storage: new unusual_devs.h entry: Mitsumi 7in1 Card Reader
  [PATCH] USB: storage: unusual_devs.h entry 0420:0001
  [PATCH] USB: storage: another unusual_devs.h entry
  [PATCH] USB: storage: sandisk unusual_devices entry
  [PATCH] USB: fix initdata issue in isp116x-hcd
  [PATCH] USB: usbcore: usb_set_configuration oops (NULL ptr dereference)
  [PATCH] USB: usbcore: Don't assume a USB configuration includes any interfaces
  [PATCH] USB: ub 03 drop stall clearing
  [PATCH] USB: ub 02 remove diag
  [PATCH] USB: ub 01 remove first_open
  ...
2006-03-21 09:25:47 -08:00
Luca Risolia
60f780528f [PATCH] USB: Add ZC0301 Video4Linux2 driver
This patch adds a Video4Linux2 driver for ZC0301
Image Processor and Control Chip.

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-03-20 14:49:52 -08:00
Adrian Bunk
98cb9e1d00 MAINTAINERS: remove the LANMEDIA entry
Remove the maintainers entry pointing to a no longer existing domain.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-03-20 20:13:16 +01:00
Ralf Baechle
7425b34031 Update MAINTAINERS entry for MIPS.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
2006-03-18 16:59:26 +00:00
Jesse Brandeburg
add1878439 e100/e1000/ixgb: update MAINTAINERS to current developers
Remove Ganesh, add Jeff and Jesse

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
2006-03-14 14:52:13 -08:00
Chris Wright
1a4520bea6 [PATCH] LSM mail list has moved
LSM mail list has moved.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-11 09:19:34 -08:00
Chris Wright
692a2061f6 [PATCH] update email address
Update email address.

Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-03-11 09:19:34 -08:00
Mauro Carvalho Chehab
25d1f0c87d V4L/DVB (3300a): Removing personal email from DVB maintainers
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2006-03-03 14:18:14 -03:00
Heiko Carstens
5238da45f3 [PATCH] s390: update maintainers file
Update URL for s390 and add maintainers for s390 networking and zfcp driver.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-11 21:41:12 -08:00
Linus Torvalds
b4669d66fb Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 2006-02-07 16:29:27 -08:00
Jean Delvare
e53004e20a [PATCH] hwmon: New f71805f driver
This is my f71805f hardware monitoring driver ported from lm_sensors
to Linux 2.6. This new driver differs from the other hardware monitoring
drivers in that it is implemented as a platform driver. This might not
be optimal yet (we would probably need a generic infrastructure and bus
type for Super-I/O logical devices) but it is certainly much better than
the i2c-isa solution.

Note that this driver requires lm_sensors CVS. I hope to get it
released as 2.10.0 soon.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-02-06 12:02:15 -08:00
Mauro Carvalho Chehab
b2faf597d9 Merge branch 'origin' 2006-02-06 10:43:13 -02:00
Stephen Smalley
62cfe7efc4 [PATCH] MAINTAINERS/CREDITS: Update SELinux contact info
Update my contact info.  Please apply.

Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-05 11:06:51 -08:00
Linus Torvalds
d1ffa5669c Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 2006-02-03 15:21:40 -08:00
Joel Becker
62ca3d2603 configfs: Clean up MAINTAINERS entry
Signed-off-by: Joel Becker <joel.becker@oracle.com>
Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
2006-02-03 13:59:05 -08:00
Arnaud Giersch
778116920e [PATCH] parport: remove dead address in MAINTAINERS
Remove dead address for David Campbell in MAINTAINERS.

Signed-off-by: Arnaud Giersch <arnaud.giersch@free.fr>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-02-03 08:32:06 -08:00
Luca Risolia
7ce08c93e3 [PATCH] USB: Add ET61X[12]51 Video4Linux2 driver
This patch adds a Video4Linux2 driver giving support
to ET61X151 and ET61X251 PC Camera Controllers made by
Etoms Electronics.

Signed-off-by: Luca Risolia <luca.risolia@studio.unibo.it>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-31 17:23:39 -08:00
Mauro Carvalho Chehab
8d58d773b7 V4L/DVB (3453a): Alters MAINTAINERS file to point to newer v4l-dvb email
- V4L/DVB Maintainers list changed. This patch alters the email to the
  new address.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Acked-By: Johannes Stezenbach <js@linuxtv.org>
2006-01-27 16:33:00 -02:00
Greg Edwards
e5ee7dda96 [IA64] sn2 maintainer update (Jes Sorensen)
We lured Jes to the dark side, and he's going to take over as the sn2
maintainer.  His experience and thoroughness will serve him well here.

Signed-off-by: Greg Edwards <edwardsg@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
2006-01-24 14:51:56 -08:00
Alan Cox
da9bb1d27b [PATCH] EDAC: core EDAC support code
This is a subset of the bluesmoke project core code, stripped of the NMI work
which isn't ready to merge and some of the "interesting" proc functionality
that needs reworking or just has no place in kernel.  It requires no core
kernel changes except the added scrub functions already posted.

The goal is to merge further functionality only after the core code is
accepted and proven in the base kernel, and only at the point the upstream
extras are really ready to merge.

From: doug thompson <norsk5@xmission.com>

  This converts EDAC to sysfs and is the final chunk neccessary before EDAC
  has a stable user space API and can be considered for submission into the
  base kernel.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: doug thompson <norsk5@xmission.com>
Signed-off-by: Pavel Machek <pavel@suse.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-18 19:20:31 -08:00
John W. Linville
29f8f63272 [MAINTAINERS]: add entry for wireless networking
Add an entry to MAINTAINERS for wireless networking, just so people
know whom to bless with patches.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-18 14:52:48 -08:00
John W. Linville
d5ca3117b0 [MAINTAINERS]: correct location for net-2.6.git
Correct location info for net-2.6 git tree.

Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-18 14:52:18 -08:00
David S. Miller
27a7b0415f Merge git://tipc.cslab.ericsson.net/pub/git/tipc 2006-01-18 14:23:54 -08:00
Stephen Hemminger
e048a374d0 [IRDA]: maintainer status
Jean says he really doesn't have time to much IRDA any more.
The following would help motivate someone who has more time.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
2006-01-18 14:06:59 -08:00
Per Liden
7c2b2aaee4 [TIPC] Provide real email addresses in MAINTAINERS
Signed-off-by: Per Liden <per.liden@ericsson.com>
2006-01-18 00:45:15 +01:00
Dale Farnsworth
b60d6975e8 [PATCH] mv643xx_eth: Add Dale Farnsworth as a maintainer
MAINTAINERS |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

Signed-off-by: Dale Farnsworth <dale@farnsworth.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-17 07:23:36 -05:00
Linus Torvalds
3f02d072d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-01-15 16:43:29 -08:00
Wim Van Sebroeck
3527761cb4 [PATCH] MAINTAINERS: watchdog device drivers
Add a MAINTAINER entry for the watchdog device drivers.

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
2006-01-15 21:21:14 +01:00
Antonino A. Daplas
9eb8ef7479 [PATCH] fbdev: Update maintainers list
Update maintainers list.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-14 18:27:15 -08:00
Jesper Juhl
fb453d4b0b MAINTAINERS: CIFS: add linux-cifs-client@lists.samba.org list
Add linux-cifs-client@lists.samba.org to CIFS entry in MAINTAINERS

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-15 02:46:48 +01:00
Horms
f1c3ddff84 MAINTAINERS: better list for "POSIX CLOCKS and TIMERS"
POSIX CLOCKS and TIMERS disscussion is more appropriate
on linux-kernel than linux-net. As suggested by the maintainer,
George Anzinger.

Signed-off-by: Horms <horms@verge.net.au>
Acked-by: George Anzinger <george@mvista.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-15 02:18:28 +01:00
Per Liden
e86eaa3abc [TIPC] Added entry for TIPC in MAINTAINERS
Signed-off-by: Per Liden <per.liden@nospam.ericsson.com>
2006-01-12 14:06:40 -08:00
Alan Cox
8c174af880 [PATCH] MAINTAINERS: remove dead project
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-11 18:42:11 -08:00
Adrian Bunk
210bb9560c MAINTAINERS: sh: update the mailing list
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-11 01:43:01 +01:00
Martin Waitz
061350e7ec [PATCH] Add git tree for DocBook
Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:52 -08:00
Linus Torvalds
977127174a Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 2006-01-09 18:41:42 -08:00
Adrian Bunk
52461121b2 MAINTAINERS: remove BUSLOGIC entry
Leonard N. Zubkoff passed away in August 2002.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-10 00:13:57 +01:00
linas@austin.ibm.com
065c635907 [PATCH] PCI Error Recovery: documentation
Various PCI bus errors can be signaled by newer PCI controllers.
Recovering from those errors requires an infrastructure to notify
affected device drivers of the error, and a way of walking through
a reset sequence.  This patch adds documentation describing the
current error recovery proposal.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-09 12:13:21 -08:00
Olaf Hering
3bb8a18ae8 [PATCH] remove bouncing mail address of mv643xx_eth maintainer
Remove bouncing mail address of mv643xx maintainer.

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-09 10:54:48 -05:00
Nicolas Kaiser
08efd10edf [PATCH] MAINTAINERS: line duplication
uniq -d MAINTAINERS

Signed-off-by: Nicolas Kaiser <nikai@nikai.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:13:56 -08:00
Len Brown
add5b5ee99 Auto-update from upstream 2006-01-07 02:05:40 -05:00
Linus Torvalds
0feb9bfcfa Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 2006-01-06 15:25:08 -08:00
Adrian Bunk
c0e7dcc8bc [PATCH] MAINTAINERS: remove the outdated DAC960 entry
Randy Dunlap: "Dave is no longer at OSDL and is no longer maintaining
that driver."

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 15:22:28 -08:00
Len Brown
25da097460 Auto-update from upstream 2006-01-06 16:34:21 -05:00
Greg Kroah-Hartman
ccf18968b1 Merge ../torvalds-2.6/ 2006-01-06 12:59:59 -08:00
Jordan Crouse
f90b811603 [PATCH] Base support for AMD Geode GX/LX processors
Provide basic support for the AMD Geode GX and LX processors.

Signed-off-by: Jordan Crouse <jordan.crouse@amd.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-06 08:33:38 -08:00
Roger Lucas
1de9e371b8 [PATCH] hwmon: New vt8231 driver
Port the vt8231 hardware monitoring driver from lm_sensors CVS to
Linux 2.6.

Signed-off-by: Roger Lucas <roger@planbit.co.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-05 22:16:21 -08:00
Linus Torvalds
29552b1462 Merge http://oss.oracle.com/git/ocfs2 2006-01-05 20:43:11 -08:00
Jody McIntyre
6c59f9d9fb Update MAINTAINERS - Jody is no longer at Steamballoon. 2006-01-05 23:04:08 -05:00