into ppc970.osdl.org:/home/torvalds/v2.6/linux

Device drivers are supposed to provide their own ->attach and ->cleanup.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Use now available ide_dma_intr() in etrax_dma_intr().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Make ide_dma_intr() always available if CONFIG_BLK_DEV_IDEDMA=y
and use it instead of icside_dmaintr().  Acked by Russell.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

This cruft pre-dates benh's PowerManagement code.
Moreover ->suspend_reset is always equal to zero.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>

add IXP400 ID

From: Frederick Li <fli@ati.com>

update PCI IDs
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Zhongjun, Wang <wangzhongjun@ccoss.com.cn>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Prarit Bhargava <prarit@sgi.com>

Suppress output of "Wait for ready failed before probe !" messages for 
non-existant interfaces.

Please see 
http://marc.theaimsgroup.com/?l=linux-ide&m=110553792013649&w=2 for 
further context on this patch.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Hi,

now that you cleaned up the ide-io.c code to be all in the right file,
try_to_flush_leftover_data can become static since all users are in this
file now.

bart: also remove declaration from <linux/ide.h>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

From: Gunther Mayer <gunther.mayer@gmx.net>

this improves logic and readability:
- remove blank from: AbortedCommand (as other flags)
- add blank and {} to error= line
- clean up: remove 2 lines and extra printk

before:
  hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete 
DataRequest CorrectedError Index Error }
  hdd: status error: error=0x7fIllegalLengthIndication EndOfMedia 
Aborted Command MediaChangeRequested LastFailedSense 0x07

after:
  hdd: status error: status=0x7f { DriveReady DeviceFault SeekComplete 
DataRequest CorrectedError Index Error }
  hdd: status error: error=0x7f { IllegalLengthIndication EndOfMedia 
AbortedCommand MediaChangeRequested LastFailedSense=0x07 }
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

Description: Uses ssleep() in place of cdrom_sleep() to guarantee the task
delays as expected. Remove cdrom_sleep() definition, as this is the only place
where it is called.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

We don't set GENHD_FL_REMOVABLE because this flag indicates that
the media may be removed while the block device persists.  Since
MMC destroys the block device when the card (media + on-board
controller) is removed, the block device will never exist without
media present.  Therefore, setting GENHD_FL_REMOVABLE would be
misleading.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

Don't use uart_change_speed() when trying to restore the serial
console settings - the port may not have a tty associated with
it.
Signed-off-by: Russell King <rmk@arm.linux.org.uk>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Catalin Marinas

This is needed since ARMv6 branch prediction tagging is done by the
virtual address and the ASIDs aren't taken into account.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Ben Dooks

Update to the s3c2410/s3c2440 clock code to use
the naming conventions now used throughout the
arch/arm/mach-s3c2410/ directory, as well as
a re-organisation of the initialisation of the
clocks.
The previous method was to initialise the clocks
as part of the function that initialised the
statically mapped IO regions, which was called
from the machine initialisation. This proves
a problem if the machine initialisation needs
to use these IO areas to determine the frequency
of PLL crystal fitted.
This patch makes the following changes:
 - s3c2410_init_clocks renamed s3c24xx_setup_clocks
 - s3c2410_clkcon_enable renamed s3c24xx_clk_enable
 - s3c2410_register_clock renamed s3c24xx_register_clock
 - cpu specific init_clocks to be called from cpu.c
 - add s3c24xx_init_clocks for machine init to call
 - split the cpu specific clock code from xxx_map_io
 - update all machine initialisation methods
and the following changes as cleanup which should
have been caught by previous patches:
 - remove s3c2440_hdiv (unused)
 - remove s3c2440_clock_tick_rate (unused)
This patch has been generated from a request by
Dimitry Andric.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

Patch from Catalin Marinas

This file no longer needs to be included in arch/arm/vfp/entry.S
because of the inclusion of asm/constants.h.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

The caller does not necessarily have the socket locked
(udpv6sendmsg() is one such case) so we have to use
sk_dst_check() instead of __sk_dst_check().
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

We need to do the proper checks before we try to
pull space out of it, just like sendmsg() does.
Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

- make some needlessly global code static
- remove the following unused functions:
  - exthdrs.c: ipv6_build_rthdr
  - exthdrs.c: ipv6_build_exthdr
  - exthdrs.c: ipv6_build_nfrag_opts
  - exthdrs.c: ipv6_build_frag_opts
- remove the following write-only global variables:
  - addrconf.c: inet6_dev_count
  - addrconf.c: inet6_ifa_count
- #if 0 the following unused global variable:
  - addrconf.c: in6addr_any
- remove the following unneeded EXPORT_SYMBOL's:
  - ipv6_syms.c: in6addr_any
  - ipv6_syms.c: in6addr_loopback
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>

into nuts.davemloft.net:/disk1/BK/net-2.6

noop doesn't follow the instructions on where to insert a request,
because it uses q->queue_head instead of the *insert assigned. Clean it
up so it's easier to read.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Doing some raid testing threw a bug in the scsi mid layer, because the
segment counts wasn't correct.  Initially I worried that we still had
problems in this area, but it turns out that is due to the raid usage of
bio clones.  Currently you have to hold on to the original bio as well,
since the clone only maintains a pointer to the bio_vec inside the
original bio.  If the original bio is freed first, the clone will have
garbage in its bio->bi_io_vec as soon as that memory is scribbled.

I think the best fix is to maintain flexibility and duplicate the io_vec
inside the clone as well. Attached patch does this.
Signed-off-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

No need for two structs, follow the new inet_sock layout
style.
Signed-off-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: David S. Miller <davem@davemloft.net>

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Patch from Catalin Marinas

The TI_VFPSTATE is otherwise undefined and gas-2.15.90 (and probably
earlier versions) assumes 0. Gas-2.15.92 reports an error.

Signed-off-by: Catalin Marinas
Signed-off-by: Russell King

Patch from Lothar Wassmann

Hi,
ioremapping a memory range that ends on the first byte of a page
(e.g. mapping PAGE_SIZE + 1 bytes on a page boundary) results in a
mapping that is one page too short. In particular trying to create a 1
byte mapping at the start of a page results in a BUG_ON() assertion in
remap_area_pages() because the calculated mapping size is zero.
This bug has been reported on Bugzilla on 2004-02-25:
http://bugzilla.kernel.org/show_bug.cgi?id=2188

Signed-off-by: Lothar Wassmann
Signed-off-by: Russell King

Patch from Marc Singer

Admitting that I'm the maintainer for the Sharp LH ports.

Signed-off-by: Marc Singer
Signed-off-by: Russell King

Patch from Richard Purdie

Add support code to enable the Compact Flash socket on the Sharp
SL-C7xx series of PDAs. The socket is controlled via the Sharp
SCOOP interface.

Signed-off-by: Richard Purdie
Signed-off-by: Russell King

into suse.cz:/home/perex/bk/linux-sound/linux-sound

Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Signed-off-by: David S. Miller <davem@davemloft.net>