commit cec5eb7be3a104fffd27ca967ee8e15a123050e2 Author: Alan Cox Date: Mon Sep 22 15:58:14 2008 +0100 pcmcia: Fix broken abuse of dev->driver_data PCMCIA abuses dev->private_data in the probe methods. Unfortunately it continues to abuse it after calling drv->probe() which leads to crashes and other nasties (such as bogus probes of multifunction devices) giving errors like pcmcia: registering new device pcmcia0.1 kernel: 0.1: GetNextTuple: No more items Extract the passed data before calling the driver probe function that way we don't blow up when the driver reuses dev->private_data as its right. As its close to the final release just move the hack so it works out, hopefully someone will be sufficiently embarrassed to produce a nice rework for 2.6.28. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit ae9111912500db9fcc244ec16c3d7e471c551f52 Merge: 18f22fb... 1577e4b... Author: Linus Torvalds Date: Mon Sep 22 07:46:06 2008 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: jornada720_ts - fix build error ( LONG() usage ) Input: bcm5974 - switch back to normal mode when closing commit 18f22fbb8ba5570a5ea3d531bc4ec65cf211f11b Merge: 72d3105... ad55dca... Author: Linus Torvalds Date: Mon Sep 22 07:45:06 2008 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: netdev: simple_tx_hash shouldn't hash inside fragments commit ad55dcaff0e34269f86975ce2ea0da22e9eb74a1 Author: Alexander Duyck Date: Sat Sep 20 22:05:50 2008 -0700 netdev: simple_tx_hash shouldn't hash inside fragments Currently simple_tx_hash is hashing inside of udp fragments. As a result packets are getting getting sent to all queues when they shouldn't be. This causes a serious performance regression which can be seen by sending UDP frames larger than mtu on multiqueue devices. This change will make it so that fragments are hashed only as IP datagrams w/o any protocol information. Signed-off-by: Alexander Duyck Signed-off-by: David S. Miller commit 1577e4b70a04cce39f296cc714da5ad5d272105a Author: Kristoffer Ericson Date: Tue Sep 16 14:19:25 2008 -0400 Input: jornada720_ts - fix build error ( LONG() usage ) This patch removes the usage of LONG() which is deprecated; we also replace BIT() with BIT_MASK(). signed-off-by: Kristoffer Ericson Signed-off-by: Dmitry Torokhov commit cd72ad3f57c400baa2ddb78b4fc2781cf68ffb6f Author: Henrik Rydberg Date: Sun Sep 14 11:52:44 2008 -0400 Input: bcm5974 - switch back to normal mode when closing Staying in multi-touch mode after closing the device sometimes makes the keyboard drop keys or repeat keys irratically. The conjecture is that some internal buffer starts to overflow, resulting in undefined behavior. Switching back to normal mode when closing the device makes the problem go away. Signed-off-by: Henrik Rydberg Signed-off-by: Dmitry Torokhov