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
Kim Phillips
b88a0b1d55
[PATCH] powerpc: Add FSL SEC node to documentation
...
Documentation: Added FSL SOC SEC node definition
Updated the documentation to include the definition of the SEC device
node format for Freescale SOC devices.
Signed-off-by: Kim Phillips <kim.phillips@freescale.com >
Signed-off-by: Paul Mackerras <paulus@samba.org >
2006-03-23 14:41:09 +11:00
Linus Torvalds
591eb85ecd
Merge master.kernel.org:/home/rmk/linux-2.6-arm
...
* master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)
[ARM] 3389/1: typo and grammar fix
[ARM] 3386/1: AT91RM9200 Clock update
[ARM] 3384/1: AT91RM9200: Timer
[ARM] 3382/1: ixp2000: unify defconfigs
[ARM] 3381/1: ixp2000: fix slowport write timing control register fields
[ARM] 3380/1: ixp2000: simplify ixdp2x00_master_npu() check
[ARM] 3379/1: ixp2000: use generic 8250 debug macros
[ARM] 3378/1: ixp2000: fix gpio interrupt handling
[ARM] Quieten spurious IRQ detection
[ARM] Use kcalloc to allocate counter_config array rather than kmalloc
[ARM] Oprofile: dynamically allocate counter_config
[ARM] Oprofile: Convert semaphore to mutex
[ARM] 3376/2: S3C2410 - update defconfig
[ARM] 3375/1: S3C2440 - fix osiris machine build
[ARM] 3374/1: ep93xx: gpio interrupt support
[ARM] 3361/1: S3C24XX - add USB bus clock source
[ARM] 3360/1: S3C2440 - add set rate methods and camera clock
[ARM] 3359/1: S3C24XX - add support for clk_set_rate
[ARM] Convert kmalloc+memset to kzalloc
[ARM] 3373/1: move uengine loader to arch/arm/common
...
2006-03-22 17:32:09 -08:00
Linus Torvalds
1c2e02750b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa
...
* git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa: (124 commits)
[ALSA] version 1.0.11rc4
[PATCH] Intruduce DMA_28BIT_MASK
[ALSA] hda-codec - Add support for ASUS P4GPL-X
[ALSA] hda-codec - Add support for HP nx9420 laptop
[ALSA] Fix memory leaks in error path of control.c
[ALSA] AMD Au1x00: AC'97 controller is memory mapped
[ALSA] AMD Au1x00: fix DMA init/cleanup
[ALSA] hda-codec - Fix generic auto-configurator
[ALSA] hda-codec - Fix BIOS auto-configuration
[ALSA] Fixes typos in Audiophile-USB.txt
[ALSA] ice1712 - typo fixes for dxr_enable module option
[ALSA] AMD Au1x00: make driver build after cleanup
[ALSA] ice1712 - Fix wrong value types for enum items
[ALSA] fix resource leak in usbmixer
[ALSA] Fix gus_pcm dereference before NULL
[ALSA] Fix seq_clientmgr dereferences before NULL check
[ALSA] hda-codec - Fix for Samsung R65 and ASUS A6J
[ALSA] hda-codec - Add support for VAIO FE550G and SZ110
[ALSA] usb-audio: add Maya44 mixer control names
[ALSA] usb-audio: add Casio PL-40R support
...
2006-03-22 10:59:20 -08:00
Jaroslav Kysela
5501972e0b
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
2006-03-22 11:02:08 +01:00
Thibault LE MEUR
19739fef02
[ALSA] Fixes typos in Audiophile-USB.txt
...
Modules: Documentation
Fixes typos in Audiophile-USB.txt.
Signed-off-by: Thibault LE MEUR <Thibault.LeMeur@supelec.fr >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:40:10 +01:00
Takashi Iwai
825aa97241
[ALSA] hda-codec - Fix for Samsung R65 and ASUS A6J
...
Modules: Documentation,HDA Codec driver
Added a new model 'laptop-eapd' to AD1986A codec for Samsung R65 and
ASUS A6J laptops.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:39:19 +01:00
Takashi Iwai
db064e5034
[ALSA] hda-codec - Add support for VAIO FE550G and SZ110
...
Modules: Documentation,HDA Codec driver
Add support for VAIO FE550G and SZ110 laptops with Sigmatel codec (7661).
The new model 'vaio' is added.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:39:16 +01:00
Thibault LE MEUR
e311334ee6
[ALSA] Fixes audiophile usb analog capture with the new device_setup parameter
...
Modules: Documentation,USB generic driver
The patch adds the 'device_setup' module parameter and a specific
quirk to correctly initialize the audiophile usb device: this fixes
the distorted sound bug on the Analog capture port. Backward
compatibility is achieved by simply omitting the new parameter.
Signed-off-by: Thibault LE MEUR <Thibault.LeMeur@supelec.fr >
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:38:38 +01:00
Takashi Iwai
9230d2148a
[ALSA] hda-codec - Fix support of laptops with AD1986A codec
...
Modules: Documentation,HDA Codec driver
Fix the support of laptops with AD1986A HD-audio codec.
Added new models '3stack' and 'laptop'. Currently, fixed for FSC V2060
and Samsung M50.
Also fixed the description of missing models in ALSA-Configuration.txt.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:37:20 +01:00
Takashi Iwai
ae6b813a4d
[ALSA] hda-codec - Add lg model for LG laptop
...
Modules: Documentation,HDA Codec driver
Added a new model 'lg' for LG laptop (m1 express dual) with ALC880 codec.
Also clean up the initialization/unsol_event hooks in patch_realtek.c.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:34:28 +01:00
Takashi Iwai
0b7bed4ec2
[ALSA] Fix typos in document
...
Modules: Documentation
Fixed typos in document.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:33:52 +01:00
Takashi Iwai
ed345f8f86
[ALSA] Update description of hda-intel models
...
Modules: Documentation
Updated the description of hda-intel models for realtek codecs.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:33:34 +01:00
Takashi Iwai
d6ec894b6d
[ALSA] Add the notes on PM to ens1370/ens1371 sections
...
Modules: Documentation
Add the notes on PM to ens1370/ens1371 sections.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:27:20 +01:00
Takashi Iwai
7a6c8ff1ef
[ALSA] Update description of ice1724 driver
...
Modules: Documentation
Updated the description of ice1724 driver.
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:23:27 +01:00
Takashi Iwai
27346166a9
[ALSA] hda-intel - Add single_cmd option for debugging
...
Modules: Documentation,HDA Intel driver
Added single_cmd module option for debugging in the case CORB/RIRB
doesn't work well (e.g. due to wrong irq routings).
Signed-off-by: Takashi Iwai <tiwai@suse.de >
2006-03-22 10:22:51 +01: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
Adrian Bunk
d7f2baaadc
Documentation/dvb/get_dvb_firmware: fix firmware URL
...
This patch fixes a wrong URL in Documentation/dvb/get_dvb_firmware.
This patch fixes kernel Bugzilla #4301 .
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2006-03-22 00:43:59 +01:00
Ian McDonald
43019a56aa
Documentation: Update to BUG-HUNTING
...
Signed-off-by: Ian McDonald <imcdnzl@gmail.com >
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2006-03-22 00:37:42 +01:00
Lucas Correia Villa Real
7ad4a5d568
fix rwlock usage example
...
This is a trivial patch which fixes a typo on rwlock usage under
Documentation/spinlocks.txt.
Signed-Off-By: Lucas Correia Villa Real <lucasvr@gobolinux.org >
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2006-03-22 00:19:39 +01:00
Alexey Dobriyan
4de151d8cd
It's UTF-8
...
Fix some comments to "UTF-8".
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com >
Signed-off-by: Adrian Bunk <bunk@stusta.de >
2006-03-22 00:13:35 +01:00
Ben Dooks
a08ceff2a9
[ARM] 3332/1: S3C24XX - documentation update
...
Patch from Ben Dooks
Add devices that we have drivers for, and
update list of machines that are supported
Signed-off-by: Ben Dooks <ben-linux@fluff.org >
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk >
2006-03-21 22:06:03 +00: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
Linus Torvalds
3d1f337b3e
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
...
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6: (235 commits)
[NETFILTER]: Add H.323 conntrack/NAT helper
[TG3]: Don't mark tg3_test_registers() as returning const.
[IPV6]: Cleanups for net/ipv6/addrconf.c (kzalloc, early exit) v2
[IPV6]: Nearly complete kzalloc cleanup for net/ipv6
[IPV6]: Cleanup of net/ipv6/reassambly.c
[BRIDGE]: Remove duplicate const from is_link_local() argument type.
[DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking
[TG3]: make drivers/net/tg3.c:tg3_request_irq() static
[BRIDGE]: use LLC to send STP
[LLC]: llc_mac_hdr_init const arguments
[BRIDGE]: allow show/store of group multicast address
[BRIDGE]: use llc for receiving STP packets
[BRIDGE]: stp timer to jiffies cleanup
[BRIDGE]: forwarding remove unneeded preempt and bh diasables
[BRIDGE]: netfilter inline cleanup
[BRIDGE]: netfilter VLAN macro cleanup
[BRIDGE]: netfilter dont use __constant_htons
[BRIDGE]: netfilter whitespace
[BRIDGE]: optimize frame pass up
[BRIDGE]: use kzalloc
...
2006-03-21 09:31:48 -08: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