Linus Torvalds
2e6e33bab6
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
...
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (78 commits)
[PATCH] powerpc: Add FSL SEC node to documentation
[PATCH] macintosh: tidy-up driver_register() return values
[PATCH] powerpc: tidy-up of_register_driver()/driver_register() return values
[PATCH] powerpc: via-pmu warning fix
[PATCH] macintosh: cleanup the use of i2c headers
[PATCH] powerpc: dont allow old RTC to be selected
[PATCH] powerpc: make powerbook_sleep_grackle static
[PATCH] powerpc: Fix warning in add_memory
[PATCH] powerpc: update mailing list addresses
[PATCH] powerpc: Remove calculation of io hole
[PATCH] powerpc: iseries: Add bootargs to /chosen
[PATCH] powerpc: iseries: Add /system-id, /model and /compatible
[PATCH] powerpc: Add strne2a() to convert a string from EBCDIC to ASCII
[PATCH] powerpc: iseries: Make more stuff static in platforms/iseries/mf.c
[PATCH] powerpc: iseries: Remove pointless iSeries_(restart|power_off|halt)
[PATCH] powerpc: iseries: mf related cleanups
[PATCH] powerpc: Replace platform_is_lpar() with a firmware feature
[PATCH] powerpc: trivial: Cleanup whitespace in cputable.h
[PATCH] powerpc: Remove unused iommu_off logic from pSeries_init_early()
[PATCH] powerpc: Unconfuse htab_bolt_mapping() callers
...
2006-03-22 22:20:46 -08:00
Linus Torvalds
2152f85366
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (138 commits)
[SCSI] libata: implement minimal transport template for ->eh_timed_out
[SCSI] eliminate rphy allocation in favour of expander/end device allocation
[SCSI] convert mptsas over to end_device/expander allocations
[SCSI] allow displaying and setting of cache type via sysfs
[SCSI] add scsi_mode_select to scsi_lib.c
[SCSI] 3ware 9000 add big endian support
[SCSI] qla2xxx: update MAINTAINERS
[SCSI] scsi: move target_destroy call
[SCSI] fusion - bump version
[SCSI] fusion - expander hotplug suport in mptsas module
[SCSI] fusion - exposing raid components in mptsas
[SCSI] fusion - memory leak, and initializing fields
[SCSI] fusion - exclosure misspelled
[SCSI] fusion - cleanup mptsas event handling functions
[SCSI] fusion - removing target_id/bus_id from the VirtDevice structure
[SCSI] fusion - static fix's
[SCSI] fusion - move some debug firmware event debug msgs to verbose level
[SCSI] fusion - loginfo header update
[SCSI] add scsi_reprobe_device
[SCSI] megaraid_sas: fix extended timeout handling
...
2006-03-22 10:47:24 -08:00
Stephen Rothwell
1d04981669
[PATCH] powerpc: update mailing list addresses
...
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au >
Signed-off-by: Paul Mackerras <paulus@samba.org >
2006-03-22 15:06:31 +11:00
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
James Bottomley
d04cdb6421
Merge ../linux-2.6
2006-03-21 13:05:45 -06: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
Andrew Vasquez
95e6a85677
[SCSI] qla2xxx: update MAINTAINERS
...
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com >
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com >
2006-03-14 17:05:32 -06: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