into nuts.ninka.net:/home/davem/src/BK/net-2.5

module_put() gets called twice on error. Once via the explicit module_put and
the second via sock_release(). Also i think we should do a __module_get() with
newsock's owner(although same as the original listening sock).

into nuts.ninka.net:/home/davem/src/BK/net-2.5

 - Use C99 initializers

 - Add support for hardware version 2 (universal PCI) of synclink adapter
 - Use mod_timer() function

into home.transmeta.com:/home/torvalds/v2.5/linux

More or less straight forward patch.

Fix a typo in the comments at the top.
Show all 9 voltage inputs.
Show all 3 fan inputs.
Allow you to select the temp sensor type from the sysfs interface,
instead of just with the temp_type module option.
(1 = diode, 2 = thermistor, 0 = disabled).

I'm still trying to figure out the registers for PWM fan controller
support.

into home.transmeta.com:/home/torvalds/v2.5/linux

This is the last of three patches for i2c.  It introduces a new field
to i2c_adapter which classifies the kind of hardware a i2c adapter
belongs to (analog tv card / dvb card / smbus / gfx card ...).  i2c chip
drivers can use this infomation to decide whenever they want to look for
hardware on that adapter or not.  It doesn't make sense to probe for a
tv tuner on a smbus for example ...

Changes:

  * adds a i2c_clients_command() function to i2c-core which calls
    the ->command() callback of all clients attached to a adapter.
  * make bttv + saa7134 drivers use that function instead of mucking
    with the i2c_adapter struct themself.

This is the first of tree patches for i2c.  Trying to get the i2c
cleanups finshed before 2.6.x, so we (hopefully) don't have a
ever-changing i2c subsystem in 2.7.x again (which is very annonying for
driver maintainance).

Changes:

 * listify i2c-core, i.e. make it use <linux/list.h> instead of
   statically-sized arrays, removed lots of ugly code :)
 * added i2c_(get|put)_adapter, changed i2c-dev.c to use these
   functions instead maintaining is own adapter list.
 * killed the I2C_DF_DUMMY flag which had the strange semantics to
   make the i2c subsystem call driver->attach_adapter on detaches.
   Added a detach_adapter() callback instead.
 * some other minor cleanups along the way ...

into kroah.com:/home/greg/linux/BK/i2c-2.5

PCI Hotplug: export the acpi_resource_to_address64 function, as the acpi pci hotplug driver needs it.

Thanks to Adrian Bunk <bunk@fs.tum.de> for pointing this out.

This patch makes the state letter in the pr_sname field in core dumps
correct for stopped and zombie threads.  The order needed to be changed when
the TASK_* values changed.  This matches the letters used in sched.c:show_task.

into kroah.com:/home/greg/linux/BK/pci-2.5

into kroah.com:/home/greg/linux/BK/i2c-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux