into home.osdl.org:/home/torvalds/v2.5/linux

into intel.com:/home/lenb/src/linux-acpi-test-2.6.2

into intel.com:/home/lenb/src/linux-acpi-test-2.6.1

        from ia64 via Alex Williamson

	from Jes Sorensen

	from Jes Sorensen

into home.osdl.org:/home/torvalds/v2.5/linux

This fixes a conflicting declaration in xbow.c.

	works without trashing any registers.

This updates the framebuffer docs to reflect the requirement that all
driver names must end in fb.

[FBCON] Fixed the order of which driver is used for the console. Before
the api change the last driver loaded became the default one. Now this is
not the case.

into home.osdl.org:/home/torvalds/v2.5/linux

From: Sam Ravnborg <sam@ravnborg.org>

cscope expect to find the list of files used for the database in a file
named cscope.files.  Generate this file as part of 'make cscope'.  This
solves http://bugme.osdl.org/show_bug.cgi?id=1948.

The spinlock debugging feature is supposed to work even on uniprocessor
kernels.  So we need to instantiate kernel_flag regardless of CONFIG_SMP.

into tiger.hpl.hp.com:/data1/bk/lia64/to-linus-2.5

The LSM changes broke the error checking for queue lengths in IPC_SET. The LSM check would
set set err to 0, but the next check expected it to still be -EPERM. Result was that
no error was reported, but the new parameters weren't correctly set.

into hopper.(none):/usr/src/kernel/linux-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

tty->driver_data or state->port may end up being NULL in uart_close.
Make sure that we correctly clean up in this case, rather than
oopsing.

There is no way that tty can be NULL in uart_put_char() and
uart_write().  Eliminate these redundant tests.

From: Jim Collette <jim@hamachi.net>

There's an exit path in i8042_interrupt() which forgets to rearm the timer.
It can make the mouse die when X is started.

into home.osdl.org:/home/torvalds/v2.5/linux

into home.osdl.org:/home/torvalds/v2.5/linux

Current driver doesn't do shared irq properly.  When testing on
a laptop here irq 3 get shared between pcmcia slot and tty/IRDA

Andreas Happe <andreashappe@gmx.net> writes:
> my notebook (hp/compaq nx7000) still crashes when using 8139cp (runs
> rock solid with 8139too driver). The computer just locks up, there is no
> dmesg output. This has happened since I've got this laptop (around
> november '03).

It seems 8139cp.c has the race condition of rx_poll and interrupt.

NOTE, since I don't have this device, patch is untested. Sorry.

into kernel.bkbits.net:/home/davem/irda-2.6

into home.osdl.org:/home/torvalds/v2.5/linux

I got a Wacom Graphire3 for my birthday and unfortunately it didn't
work. After some playing around, I noticed the 2.6 kernel needs a few
small modifications to make it work.

This simple patch adds support for the Wacom Graphire 3.

into home.osdl.org:/home/torvalds/v2.5/linux

Fix this:

drivers/scsi/aha1542.c:74: warning: unsigned int format, different type arg (arg 5)