commit 4e14e833ac3b97a4aa8803eea49f899adc5bb5f4
Merge: 65ecc14... b066a48...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 17 20:53:31 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
      prevent cifs_writepages() from skipping unwritten pages
      Fixed parsing of mount options when doing DFS submount
      [CIFS] Fix check for tcon seal setting and fix oops on failed mount from earlier patch
      [CIFS] Fix build break
      cifs: reinstate sharing of tree connections
      [CIFS] minor cleanup to cifs_mount
      cifs: reinstate sharing of SMB sessions sans races
      cifs: disable sharing session and tcon and add new TCP sharing code
      [CIFS] clean up server protocol handling
      [CIFS] remove unused list, add new cifs sock list to prepare for mount/umount fix
      [CIFS] Fix cifs reconnection flags
      [CIFS] Can't rely on iov length and base when kernel_recvmsg returns error

commit b066a48c9532243894f93a06ca5a0ee2cc21a8dc
Author: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
Date:   Tue Nov 18 03:49:05 2008 +0000

    prevent cifs_writepages() from skipping unwritten pages
    
    Fixes a data corruption under heavy stress in which pages could be left
    dirty after all open instances of a inode have been closed.
    
    In order to write contiguous pages whenever possible, cifs_writepages()
    asks pagevec_lookup_tag() for more pages than it may write at one time.
    Normally, it then resets index just past the last page written before calling
    pagevec_lookup_tag() again.
    
    If cifs_writepages() can't write the first page returned, it wasn't resetting
    index, and the next call to pagevec_lookup_tag() resulted in skipping all of
    the pages it previously returned, even though cifs_writepages() did nothing
    with them.  This can result in data loss when the file descriptor is about
    to be closed.
    
    This patch ensures that index gets set back to the next returned page so
    that none get skipped.
    
    Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Cc: Shirish S Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 2c55608f28444c3f33b10312881384c470ceed56
Author: Igor Mammedov <niallain@gmail.com>
Date:   Thu Oct 23 13:58:42 2008 +0400

    Fixed parsing of mount options when doing DFS submount
    
    Since these hit the same routines, and are relatively small, it is easier to review
    them as one patch.
    
    Fixed incorrect handling of the last option in some cases
    Fixed prefixpath handling convert path_consumed into host depended string length (in bytes)
    Use non default separator if it is provided in the original mount options
    
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Igor Mammedov <niallain@gmail.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 65ecc14a30ad21bed9aabdfd6a2ae1a1aaaa6a00
Author: Kumar Gala <galak@kernel.crashing.org>
Date:   Sat Nov 15 12:02:34 2008 -0600

    Remove -mno-spe flags as they dont belong
    
    For some unknown reason at Steven Rostedt added in disabling of the SPE
    instruction generation for e500 based PPC cores in commit
    6ec562328fda585be2d7f472cfac99d3b44d362a.
    
    We are removing it because:
    
    1. It generates e500 kernels that don't work
    2. its not the correct set of flags to do this
    3. we handle this in the arch/powerpc/Makefile already
    4. its unknown in talking to Steven why he did this
    
    Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
    Tested-and-Acked-by: Steven Rostedt <srostedt@redhat.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e77a20e8ef6784586cfd66f4346af88ddb11173f
Merge: 9753b12... 898d805...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 17 10:45:39 2008 -0800

    Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
    
    * 'for-linus' of git://git.o-hand.com/linux-mfd:
      mfd: Correct WM8350 I2C return code usage
      mfd: fix event masking for da9030

commit ab3f992983062440b4f37c666dac66d987902d91
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Nov 17 16:03:00 2008 +0000

    [CIFS] Fix check for tcon seal setting and fix oops on failed mount from earlier patch
    
    set tcon->ses earlier
    
    If the inital tree connect fails, we'll end up calling cifs_put_smb_ses
    with a NULL pointer. Fix it by setting the tcon->ses earlier.
    
    Acked-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 9753b12767a7d3d2f2d36850ce5aaae59afbd685
Merge: 847e917... cecf61b...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 17 07:54:47 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      rtc: rtc-sun4v fixes, revised
      sparc: Fix tty compile warnings.
      sparc: struct device - replace bus_id with dev_name(), dev_set_name()

commit 847e9170c77d3b4f57822ae1f4cf4f65c65a8254
Merge: 72eb8c6... 5f9021c...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Mon Nov 17 07:53:25 2008 -0800

    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: (27 commits)
      rtnetlink: propagate error from dev_change_flags in do_setlink()
      isdn: remove extra byteswap in isdn_net_ciscohdlck_slarp_send_reply
      Phonet: refuse to send bigger than MTU packets
      e1000e: fix IPMI traffic
      e1000e: fix warn_on reload after phy_id error
      phy: fix phy address bug
      e100: fix dma error in direction for mapping
      igb: use dev_printk instead of printk
      qla3xxx: Cleanup: Fix link print statements.
      igb: Use device_set_wakeup_enable
      e1000: Use device_set_wakeup_enable
      e1000e: Use device_set_wakeup_enable
      via-velocity: enable perfect filtering for multicast packets
      phy: Add support for Marvell 88E1118 PHY
      mlx4_en: Pause parameters per port
      phylib: fix premature freeing of struct mii_bus
      atl1: Do not enumerate options unsupported by chip
      atl1e: fix broken multicast by removing unnecessary crc inversion
      gianfar: Fix DMA unmap invocations
      net/ucc_geth: Fix oops in uec_get_ethtool_stats()
      ...

commit 5f9021cfdc3524a4c5e3d7ae2d049eb7adcd6776
Author: Johannes Berg <johannes@sipsolutions.net>
Date:   Sun Nov 16 23:20:31 2008 -0800

    rtnetlink: propagate error from dev_change_flags in do_setlink()
    
    Unlike ifconfig, iproute doesn't report an error when setting
    an interface up fails:
    
    (example: put wireless network mac80211 interface into repeater mode
    with iwconfig but do not set a peer MAC address, it should fail with
    -ENOLINK)
    
    without patch:
    # ip link set wlan0 up ; echo $?
    0
    #
    
    with patch:
    # ip link set wlan0 up ; echo $?
    RTNETLINK answers: Link has been severed
    2
    #
    
    Propagate the return value from dev_change_flags() to fix this.
    
    Signed-off-by: Patrick McHardy <kaber@trash.net>
    Tested-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 584c650b4e6fa16f9ab45d382f86ad6d9c625227
Author: Harvey Harrison <harvey.harrison@gmail.com>
Date:   Sun Nov 16 23:03:45 2008 -0800

    isdn: remove extra byteswap in isdn_net_ciscohdlck_slarp_send_reply
    
    commit a144ea4b7a13087081ab5402fa9ad0bcfd249e67 [IPV4]: annotate struct in_ifaddr
    
    Missed this extra byteswap as the isdn inlines hide the htonl inside
    put_u32 which causes an extra byteswap on little-endian arches.
    
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit c2b3382cd4d6c6adef1347e81f20e16c93a39feb
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Nov 17 03:57:13 2008 +0000

    [CIFS] Fix build break
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit ebfe92ca65c780334bdf847ddc4eca15835bd9c0
Author: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Date:   Sun Nov 16 19:48:49 2008 -0800

    Phonet: refuse to send bigger than MTU packets
    
    Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit f1987b44f642e96176adc88b7ce23a1d74806f89
Author: Jeff Layton <jlayton@redhat.com>
Date:   Sat Nov 15 11:12:47 2008 -0500

    cifs: reinstate sharing of tree connections
    
    Use a similar approach to the SMB session sharing. Add a list of tcons
    attached to each SMB session. Move the refcount to non-atomic. Protect
    all of the above with the cifs_tcp_ses_lock. Add functions to
    properly find and put references to the tcons.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit eb7c3adb1ca92450870dbb0d347fc986cd5e2af4
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Fri Nov 14 06:45:23 2008 +0000

    e1000e: fix IPMI traffic
    
    Some users reported that they have machines with BMCs enabled that cannot
    receive IPMI traffic after e1000e is loaded.
    http://marc.info/?l=e1000-devel&m=121909039127414&w=2
    http://marc.info/?l=e1000-devel&m=121365543823387&w=2
    
    This fixes the issue if they load with the new parameter = 0 by disabling
    crc stripping, but leaves the performance feature on for most users.
    Based on work done by Hong Zhang.
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e82f54ba030b429c06b5240cbe7eeaaa03a8db11
Author: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date:   Fri Nov 14 06:45:07 2008 +0000

    e1000e: fix warn_on reload after phy_id error
    
    If the driver fails to initialize the first time due to the failure in the
    phy_id check the kernel triggers a warn_on on the second try to load the
    driver because the driver did not free the msi/x resources in the first
    load because of the previous failure in phy_id check.
    
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 72eb8c6747b49e41fd2b042510f03ac7c13426fc
Author: Helge Deller <deller@gmx.de>
Date:   Mon Nov 17 00:30:57 2008 +0100

    unitialized return value in mm/mlock.c: __mlock_vma_pages_range()
    
    Fix an unitialized return value when compiling on parisc (with CONFIG_UNEVICTABLE_LRU=y):
    	mm/mlock.c: In function `__mlock_vma_pages_range':
    	mm/mlock.c:165: warning: `ret' might be used uninitialized in this function
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    [ It isn't ever really used uninitialized, since no caller should ever
      call this function with an empty range.  But the compiler is correct
      that from a local analysis standpoint that is impossible to see, and
      fixing the warning is appropriate.  ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit e14c8bf86350f6c39186a139c5c584a6111b2f01
Author: Rusty Russell <rusty@rustcorp.com.au>
Date:   Mon Nov 17 08:22:18 2008 +1030

    stop_machine: fix race with return value (fixes Bug #11989)
    
    Bug #11989: Suspend failure on NForce4-based boards due to chanes in
    stop_machine
    
    We should not access active.fnret outside the lock; in theory the next
    stop_machine could overwrite it.
    
    Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
    Tested-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 5c06fe772da43db63b053addcd2c267f76d0be91
Author: Al Viro <viro@ZenIV.linux.org.uk>
Date:   Sun Nov 16 22:19:10 2008 +0000

    Fix broken ownership of /proc/sys/ files
    
    D'oh...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    Reported-and-tested-by: Peter Palfrader <peter@palfrader.org>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 898d8054ec0cb5ba0ec1b15c78042a23ed103c02
Author: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date:   Wed Nov 12 17:34:02 2008 +0100

    mfd: Correct WM8350 I2C return code usage
    
    The vendor BSP used for the WM8350 development provided an I2C driver
    which incorrectly returned zero on succesful sends rather than the
    number of transmitted bytes, an error which was then propagated into the
    WM8350 I2C accessors.
    
    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit b1ccbdc4a2af5ffcd6082c3a7a6fbd0e134031f2
Author: Mike Rapoport <mike@compulab.co.il>
Date:   Sat Nov 8 01:28:19 2008 +0100

    mfd: fix event masking for da9030
    
    Signed-off-by: Mike Rapoport <mike@compulab.co.il>
    Acked-by: Eric Miao <eric.miao@marvell.com>
    Signed-off-by: Samuel Ortiz <sameo@openedhand.com>

commit 77fb61a04a0483ad274ce5c51b02c46c12db3693
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sun Nov 16 10:09:34 2008 -0800

    acpi: fix oops in acpi_system_wakeup_device_seq_show
    
    Commit 0794469da3f7b2093575cbdfc1108308dd3641ce: ("ACPI: struct device -
    replace bus_id with dev_name(), dev_set_name()") introduced a bug by
    testing 'dev_name(ldev)' instead of 'ldev->bus' for NULL when printing
    out the bus information.
    
    So if ldev->bus was NULL, we'd oops.
    
    Reported-and-tested-by: Bruno Prmont <bonbons@linux-vserver.org>
    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Len Brown <len.brown@intel.com>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

commit 3ee82383f0098a2e13acc8cf1be8e47512f41e5a
Author: Giulio Benetti <giulio.benetti@micronovasrl.com>
Date:   Thu Nov 13 21:53:13 2008 +0000

    phy: fix phy address bug
    
    PHYID returns 0xffff and not 0xffffffff when not found and in some
    case(at91sam9263) 0x0. Maybe this patch could be useful.
    
    Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 773c9c1f77174429ad2feb1735a3beb33ff3b6c0
Author: Jesse Brandeburg <jesse.brandeburg@intel.com>
Date:   Fri Nov 14 13:51:54 2008 +0000

    e100: fix dma error in direction for mapping
    
    The e100 driver triggers BUG_ON(buf->direction != dir)
    by doing pci_map_single(..., PCI_DMA_BIDIRECTIONAL)
    and pci_dma_sync_single_for_device(..., PCI_DMA_TODEVICE).
    
    Changing the DMA direction, especially with dmabounce will result
    in unexpected behaviour.
    
    Reported-by: Anders Grafstrom <grfstrm@users.sourceforge.net>
    Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit ac450208dea8cf1b9aa8feabd06a7209a282d749
Author: Bjorn Helgaas <bjorn.helgaas@hp.com>
Date:   Thu Nov 13 06:20:10 2008 +0000

    igb: use dev_printk instead of printk
    
    Use dev_printk() instead of printk() to give a little more context
    and use consistent format.
    
    Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 0f807044980dd51fdf9aa2df8d503d4757501b20
Author: Ron Mercer <ron.mercer@qlogic.com>
Date:   Tue Nov 11 07:54:54 2008 +0000

    qla3xxx: Cleanup: Fix link print statements.
    
    Removed debug print statements and improved conditionals around informational statements.
    
    Signed-off-by: Ron Mercer <ron.mercer@qlogic.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e1b86d8479f90aadee57a3d07d8e61c815c202d9
Author: \"Rafael J. Wysocki\ <rjw@sisk.pl>
Date:   Fri Nov 7 20:30:37 2008 +0000

    igb: Use device_set_wakeup_enable
    
    Since dev->power.should_wakeup bit is used by the PCI core to
    decide whether the device should wake up the system from sleep
    states, set/unset this bit whenever WOL is enabled/disabled using
    igb_set_wol().  Accordingly, use device_can_wakeup() for checking
    if wake-up is supported by the device.
    
    Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit de1264896c8012a261c1cba17e6a61199c276ad3
Author: \"Rafael J. Wysocki\ <rjw@sisk.pl>
Date:   Fri Nov 7 20:30:19 2008 +0000

    e1000: Use device_set_wakeup_enable
    
    Since dev->power.should_wakeup bit is used by the PCI core to
    decide whether the device should wake up the system from sleep
    states, set/unset this bit whenever WOL is enabled/disabled using
    e1000_set_wol().  Accordingly, use device_can_wakeup() for checking
    if wake-up is supported by the device.
    
    Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6ff68026f4757d68461b7fbeca5c944e1f5f8b44
Author: \"Rafael J. Wysocki\ <rjw@sisk.pl>
Date:   Wed Nov 12 09:52:32 2008 +0000

    e1000e: Use device_set_wakeup_enable
    
    Since dev->power.should_wakeup bit is used by the PCI core to
    decide whether the device should wake up the system from sleep
    states, set/unset this bit whenever WOL is enabled/disabled using
    e1000_set_wol().  Accordingly, use device_can_wakeup() for checking
    if wake-up is supported by the device.
    
    Signed-off-by: "Rafael J. Wysocki" <rjw@sisk.pl>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5f5c4bdb144bf285727867bbd75c13c5a99150c9
Author: Joey Zhuo <joeyzhuo@via.com.tw>
Date:   Sun Nov 16 00:39:35 2008 -0800

    via-velocity: enable perfect filtering for multicast packets
    
    Signed-off-by: Joey Zhuo <joeyzhuo@via.com.tw>
    Acked-by: Francois Romieu <romieu@fr.zoreil.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b42ccbc521f2acad48eb96b32883efe2f3e16b45
Merge: d659fc1... 131d3a7...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Nov 15 19:02:48 2008 -0800

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
      HID: don't grab devices with no input
      HID: fix radio-mr800 hidquirks
      HID: fix kworld fm700 radio hidquirks
      HID: fix start/stop cycle in usbhid driver
      HID: use single threaded work queue for hid_compat
      HID: map macbook keys for "Expose" and "Dashboard"
      HID: support for new unibody macbooks
      HID: fix locking in hidraw_open()

commit d659fc14cbd39fef625072819c6968044975fda7
Merge: 9bf1a24... b176945...
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Sat Nov 15 18:58:37 2008 -0800

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: ensure correct logging in do_io_probe
      pcmcia: add another pata/ide ID
      pcmcia: add braces in error path
      pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
      pcmcia: setup resource information for pseudo multifunction devices.
      pcmcia: fix indentation & braces disagreement - add braces

commit 605f196efbf8dcbb3581e76ddd0573899dffcf1f
Author: Ron Madrid <ron_madrid@sbcglobal.net>
Date:   Thu Nov 6 09:05:26 2008 +0000

    phy: Add support for Marvell 88E1118 PHY
    
    This patch will add support for the Marvell 88E1118 PHY which supports gigabit ethernet among other things.
    
    Signed-off-by: Ron Madrid <ron_madrid@sbcglobal.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d53b93f2603554c3420e301bd13ee2c354a15ceb
Author: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
Date:   Wed Nov 5 04:48:36 2008 +0000

    mlx4_en: Pause parameters per port
    
    Before the change the driver reported the same pause parameters
    for all the ports, even only one of them was modified.
    
    Signed-off-by: Yevgeny Petrilin <yevgenyp@mellanox.co.il>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit cecf61bdee426a3e0a014f7e26990d09c71ed458
Author: Alessandro Zummo <a.zummo@towertech.it>
Date:   Fri Nov 14 16:37:54 2008 -0800

    rtc: rtc-sun4v fixes, revised
    
    - simplified code
    - use platform_driver_probe
    - removed locking: it's provided by rtc subsystem
    
    Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d82c2df54e2f7e447476350848d8eccc8d2fe46a
Author: Steve French <sfrench@us.ibm.com>
Date:   Sat Nov 15 00:07:26 2008 +0000

    [CIFS] minor cleanup to cifs_mount
    
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 14fbf50d695207754daeb96270b3027a3821121f
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri Nov 14 13:53:46 2008 -0500

    cifs: reinstate sharing of SMB sessions sans races
    
    We do this by abandoning the global list of SMB sessions and instead
    moving to a per-server list. This entails adding a new list head to the
    TCP_Server_Info struct. The refcounting for the cifsSesInfo is moved to
    a non-atomic variable. We have to protect it by a lock anyway, so there's
    no benefit to making it an atomic. The list and refcount are protected
    by the global cifs_tcp_ses_lock.
    
    The patch also adds a new routines to find and put SMB sessions and
    that properly take and put references under the lock.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit e7ddee9037e7dd43de1ad08b51727e552aedd836
Author: Jeff Layton <jlayton@redhat.com>
Date:   Fri Nov 14 13:44:38 2008 -0500

    cifs: disable sharing session and tcon and add new TCP sharing code
    
    The code that allows these structs to be shared is extremely racy.
    Disable the sharing of SMB and tcon structs for now until we can
    come up with a way to do this that's race free.
    
    We want to continue to share TCP sessions, however since they are
    required for multiuser mounts. For that, implement a new (hopefully
    race-free) scheme. Add a new global list of TCP sessions, and take
    care to get a reference to it whenever we're dealing with one.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit a2224ad38704a3cfe033313f803183a23e6b7886
Merge: 5421ae0... 3e44017...
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Nov 14 15:36:57 2008 -0800

    Merge branch 'davem-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

commit 3e44017b589f001941723dfdfede2ca6284dddce
Author: Lennert Buytenhek <buytenh@wantstofly.org>
Date:   Sun Nov 9 05:34:47 2008 +0100

    phylib: fix premature freeing of struct mii_bus
    
    Commit 46abc02175b3c246dd5141d878f565a8725060c9 ("phylib: give mdio
    buses a device tree presence") added a call to device_unregister() in
    a situation where the caller did not intend for the device to be
    freed yet, but apart from just unregistering the device from the
    system, device_unregister() does an additional put_device() that is
    intended to free it.
    
    The right function to use in this situation is device_del(), which
    unregisters the device from the system like device_unregister() does,
    but without dropping the reference count an additional time.
    
    Bug report from Bryan Wu <cooloney@kernel.org>.
    
    Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
    Tested-by: Bryan Wu <cooloney@kernel.org>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 3b259e365998291a02488225e32b9f2b73723b3e
Author: J. K. Cliburn <jcliburn@gmail.com>
Date:   Sun Nov 9 15:05:30 2008 -0600

    atl1: Do not enumerate options unsupported by chip
    
    Of the various WOL options provided in include/linux/ethtool.h, the
    L1 NIC supports only magic packet.  Remove all options except magic
    packet from the atl1 driver.
    
    Signed-off-by: Jay Cliburn <jcliburn@gmail.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 7ee0fddfe05f105d3346aa8774695e7130697836
Author: J. K. Cliburn <jcliburn@gmail.com>
Date:   Tue Nov 11 16:21:48 2008 -0600

    atl1e: fix broken multicast by removing unnecessary crc inversion
    
    Inverting the crc after calling ether_crc_le() is unnecessary and breaks
    multicast. Remove it.
    
    Tested-by: David Madore <david.madore@ens.fr>
    Signed-off-by: Jay Cliburn <jcliburn@gmail.com>
    Cc: stable@kernel.org
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 81183059e89c36f9b4c41f9332d642c2e0bff971
Author: Andy Fleming <afleming@freescale.com>
Date:   Wed Nov 12 10:07:11 2008 -0600

    gianfar: Fix DMA unmap invocations
    
    We weren't unmapping DMA memory, which will break when gianfar gets used
    on systems with more than 32-bits of memory.  Also, it's just plain wrong.
    
    Signed-off-by: Andy Fleming <afleming@freescale.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 18acfa2597d57c19249346d130fc3334244557b4
Author: Anton Vorontsov <avorontsov@ru.mvista.com>
Date:   Thu Nov 13 21:26:27 2008 +0300

    net/ucc_geth: Fix oops in uec_get_ethtool_stats()
    
    p_{tx,rx}_fw_statistics_pram are special: they're available only when
    a device is open. If the device is closed, we should just fill the data
    with zeroes.
    
    Fixes the following oops:
    
    root@b1:~# ifconfig eth1 down
    root@b1:~# ethtool -S eth1
    Unable to handle kernel paging request for data at address 0x00000000
    Faulting instruction address: 0xc01e1dcc
    Oops: Kernel access of bad area, sig: 11 [#1]
    [...]
    NIP [c01e1dcc] uec_get_ethtool_stats+0x98/0x124
    LR [c0287cc8] ethtool_get_stats+0xfc/0x23c
    Call Trace:
    [cfaadde0] [c0287ca8] ethtool_get_stats+0xdc/0x23c (unreliable)
    [cfaade20] [c0288340] dev_ethtool+0x2fc/0x588
    [cfaade50] [c0285648] dev_ioctl+0x290/0x33c
    [cfaadea0] [c0272238] sock_ioctl+0x80/0x2ec
    [cfaadec0] [c00b5ae4] vfs_ioctl+0x40/0xc0
    [cfaadee0] [c00b5fa8] do_vfs_ioctl+0x78/0x20c
    [cfaadf10] [c00b617c] sys_ioctl+0x40/0x74
    [cfaadf40] [c00142d8] ret_from_syscall+0x0/0x38
    [...]
    ---[ end trace b941007b2dfb9759 ]---
    Segmentation fault
    
    p.s. While at it, also remove u64 casts, they aren't needed.
    
    Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
    Signed-off-by: Jeff Garzik <jgarzik@redhat.com>

commit 5421ae0153b4ba0469967cfd8de96144e3bf3979
Author: Pavel Emelyanov <xemul@openvz.org>
Date:   Fri Nov 14 14:51:45 2008 -0800

    scm: fix scm_fp_list->list initialization made in wrong place
    
    This is the next page of the scm recursion story (the commit
    f8d570a4 net: Fix recursive descent in __scm_destroy()).
    
    In function scm_fp_dup(), the INIT_LIST_HEAD(&fpl->list) of newly
    created fpl is done *before* the subsequent memcpy from the old
    structure and thus the freshly initialized list is overwritten.
    
    But that's OK, since this initialization is not required at all,
    since the fpl->list is list_add-ed at the destruction time in any
    case (and is unused in other code), so I propose to drop both
    initializations, rather than moving it after the memcpy.
    
    Please, correct me if I miss something significant.
    
    Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit d8c3e23d06c1020f38b7b6290135a9522a2e3052
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Nov 14 14:47:29 2008 -0800

    niu: Bump driver version and release date.
    
    This driver is pretty mature, and the worst of the known
    problems has been fixed (the 32-bit failures due to readq
    implementation).
    
    So let's finally give it a version of 1.0
    
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit e3e081e1d5c4791f4416ed57b7a2f143ab9e5b09
Author: Santwona Behera <santwona.behera@sun.com>
Date:   Fri Nov 14 14:44:08 2008 -0800

    NIU: Add Sun CP3260 ATCA blade support
    
    This patch adds support for the Sun CP3260 ATCA blade which is
    a N2 based ATCA blade with 2 NIU ports. The NIU ports do not
    have on-board PHY.
    
    Signed-off-by: Santwona Behera <santwona.behera@sun.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 131d3a7a009d56a96cc7117b4e9d0c90c2e2a1dc
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Fri Nov 14 12:03:47 2008 +0100

    HID: don't grab devices with no input
    
    Some devices have no input interrupt endpoint. These won't be handled
    by usbhid, but currently they are not refused and reside on hid bus.
    
    Perform this checking earlier so that we refuse to control such
    a device early enough (and not pass it to the hid bus at all).
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit e8f6fbf62de37cbc2e179176ac7010d5f4396b67
Author: Ingo Molnar <mingo@elte.hu>
Date:   Wed Nov 12 01:38:36 2008 +0000

    lockdep: include/linux/lockdep.h - fix warning in net/bluetooth/af_bluetooth.c
    
    fix this warning:
    
      net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
      net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used
    
    this is a lockdep macro problem in the !LOCKDEP case.
    
    We cannot convert it to an inline because the macro works on multiple types,
    but we can mark the parameter used.
    
    [ also clean up a misaligned tab in sock_lock_init_class_and_name() ]
    
    [ also remove #ifdefs from around af_family_clock_key strings - which
      were certainly added to get rid of the ugly build warnings. ]
    
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 3ec332ef7a38c2327e18d087d4120a8e3bd3dc6e
Author: Steve French <sfrench@us.ibm.com>
Date:   Fri Nov 14 03:35:10 2008 +0000

    [CIFS] clean up server protocol handling
    
    We're currently declaring both a sockaddr_in and sockaddr6_in on the
    stack, but we really only need storage for one of them. Declare a
    sockaddr struct and cast it to the proper type. Also, eliminate the
    protocolType field in the TCP_Server_Info struct. It's redundant since
    we have a sa_family field in the sockaddr anyway.
    
    We may need to revisit this if SCTP is ever implemented, but for now
    this will simplify the code.
    
    CIFS over IPv6 also has a number of problems currently. This fixes all
    of them that I found. Eventually, it would be nice to move more of the
    code to be protocol independent, but this is a start.
    
    Signed-off-by: Jeff Layton <jlayton@redhat.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit fb396016647ae9de5b3bd8c4ee4f7b9cc7148bd5
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu Nov 13 20:04:07 2008 +0000

    [CIFS] remove unused list, add new cifs sock list to prepare for mount/umount fix
    
    Also adds two lines missing from the previous patch (for the need reconnect flag in the
    /proc/fs/cifs/DebugData handling)
    
    The new global_cifs_sock_list is added, and initialized in init_cifs but not used yet.
    Jeff Layton will be adding code in to use that and to remove the GlobalTcon and GlobalSMBSession
    lists.
    
    CC: Jeff Layton <jlayton@redhat.com>
    CC: Shirish Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 3b7952109361c684caf0c50474da8662ecc81019
Author: Steve French <sfrench@us.ibm.com>
Date:   Thu Nov 13 19:45:32 2008 +0000

    [CIFS] Fix cifs reconnection flags
    
    In preparation for Jeff's big umount/mount fixes to remove the possibility of
    various races in cifs mount and linked list handling of sessions, sockets and
    tree connections, this patch cleans up some repetitive code in cifs_mount,
    and addresses a problem with ses->status and tcon->tidStatus in which we
    were overloading the "need_reconnect" state with other status in that
    field.  So the "need_reconnect" flag has been broken out from those
    two state fields (need reconnect was not mutually exclusive from some of the
    other possible tid and ses states).  In addition, a few exit cases in
    cifs_mount were cleaned up, and a problem with a tcon flag (for lease support)
    was not being set consistently for the 2nd mount of the same share
    
    CC: Jeff Layton <jlayton@redhat.com>
    CC: Shirish Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit 62a56582e01b1c5139b235004548e233201df9aa
Author: Alexey Klimov <klimov.linux@gmail.com>
Date:   Thu Nov 13 05:44:50 2008 +0300

    HID: fix radio-mr800 hidquirks
    
    This patch fixes radio-mr800 hidqurks. Removes it from blacklist entry
    and places it in ignore entry in hid/hid-core.c
    
    Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit c91c21c5a6facddce936d82e5bc0c655d04288aa
Author: Alexey Klimov <klimov.linux@gmail.com>
Date:   Thu Nov 13 10:36:11 2008 +0100

    HID: fix kworld fm700 radio hidquirks
    
    This patch fixes kworld fm700 usb-radio hidqurks that handled by
    radio-si470x. Removes it from blacklist entry and places it in ignore
    entry in hid/hid-core.c
    
    The bug went in through the V4L/DVB tree by commit 6a13378a without
    HID maintainer being involved at all.
    
    Signed-off-by: Alexey Klimov <klimov.linux@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit e3e14de50dff86331b8f0d701e910146c0049bf5
Author: Jiri Slaby <jirislaby@gmail.com>
Date:   Sat Nov 1 23:41:46 2008 +0100

    HID: fix start/stop cycle in usbhid driver
    
    `stop' left out usbhid->urb* pointers and so the next `start' thought
    it needs to allocate nothing and used the memory pointers previously
    pointed to. This led to memory corruption and device malfunction.
    
    Also don't forget to clear disconnect flag on start which was left set
    by the previous `stop'.
    
    This fixes
    
    	echo DEVICE > /sys/bus/hid/drivers/DRIVER/unbind
    	echo DEVICE > /sys/bus/hid/drivers/DRIVER/bind
    
    failures.
    
    Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 43ff3a48c13f3ddc085271c2eea2985d28c8aa08
Author: Andi Kleen <andi@firstfloor.org>
Date:   Mon Nov 10 22:51:50 2008 +0100

    HID: use single threaded work queue for hid_compat
    
    Use single threaded work queue for hid_compat
    
    I doubt HID really needs to scale over multiple CPUs. So only use a
    single threaded workqueue for HID_COMPAT. This avoids some excessive
    thread use on systems with a larger number of CPUs.
    
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 437184ae8bd1ef923a40b009e37801deae66ad55
Author: Henrik Rydberg <rydberg@euromail.se>
Date:   Tue Nov 4 13:31:38 2008 +0100

    HID: map macbook keys for "Expose" and "Dashboard"
    
    On macbooks there are specific keys for the user-space functions Expose
    and Dashboard, which currently has no counterpart in input.h. This patch
    adds KEY_SCALE and KEY_DASHBOARD, and maps the keyboard accordingly.
    
    Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit a96d6ef34751093797c3a6c6080733dd7af23d35
Author: Henrik Rydberg <rydberg@euromail.se>
Date:   Tue Nov 4 20:03:45 2008 +0100

    HID: support for new unibody macbooks
    
    The unibody MacBook 5 and MacBook Pro 5 come with a new version of
    the bcm5974 trackpad. This patch adds the USB device ids and all
    the appropriate quirks, including hid_blacklist.
    
    Signed-off-by: Henrik Rydberg <rydberg@euromail.se>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit 7d672cd7506165818aacf97fdc448cffc72bde37
Author: Oliver Neukum <oliver@neukum.org>
Date:   Fri Oct 31 00:07:23 2008 +0100

    HID: fix locking in hidraw_open()
    
    As open needs to sleep hidraw was wrong to call it with a spinlock held.
    Furthermore, open can of course fail which needs to be handled.
    
    Signed-off-by: Oliver Neukum <oneukum@suse.de>
    Signed-off-by: Jiri Kosina <jkosina@suse.cz>

commit e64ed0225bd82d4c108c9f78f46070cfade14fac
Author: Robert Reif <reif@earthlink.net>
Date:   Wed Nov 12 23:51:54 2008 -0800

    sparc: Fix tty compile warnings.
    
    This patch fixes tty compile warnings as sugested by Alan Cox:
    
    CC drivers/char/n_tty.o
    drivers/char/n_tty.c: In function normal_poll:
    drivers/char/n_tty.c:1555: warning: array subscript is above array bounds
    drivers/char/n_tty.c:1564: warning: array subscript is above array bounds
    drivers/char/n_tty.c: In function read_chan:
    drivers/char/n_tty.c:1269: warning: array subscript is above array bounds
    CC drivers/char/tty_ioctl.o
    drivers/char/tty_ioctl.c: In function set_termios:
    drivers/char/tty_ioctl.c:533: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:537: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c: In function tty_mode_ioctl:
    drivers/char/tty_ioctl.c:662: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:892: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:896: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:577: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:928: warning: array subscript is above array
    bounds
    drivers/char/tty_ioctl.c:934: warning: array subscript is above array
    bounds
    
    Signed-off-by: Robert Reif <reif@earthlink.net>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 5acdc1fa2d9614ecd301f3d27f19bfeabe811ade
Author: Kay Sievers <kay.sievers@vrfy.org>
Date:   Wed Nov 12 23:48:40 2008 -0800

    sparc: struct device - replace bus_id with dev_name(), dev_set_name()
    
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 1fa989e80a9a104bf3b81842a5f4c1867d7aa9c4
Author: Randy Dunlap <randy.dunlap@oracle.com>
Date:   Wed Nov 12 11:05:17 2008 +0000

    9p: restrict RDMA usage
    
    Make 9p's RDMA option depend on INET since it uses Infiniband rdma_*
    functions and that code depends on INET.  Otherwise 9p can try to
    use symbols which don't exist.
    
    ERROR: "rdma_destroy_id" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_connect" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_create_id" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_create_qp" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_resolve_route" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_disconnect" [net/9p/9pnet_rdma.ko] undefined!
    ERROR: "rdma_resolve_addr" [net/9p/9pnet_rdma.ko] undefined!
    
    I used an if/endif block so that the menu items would remain
    presented together.
    
    Also correct an article adjective.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 9c0188acf6dd6990bac9cd906cd554a1476c6d12
Author: Alexey Dobriyan <adobriyan@gmail.com>
Date:   Wed Nov 12 23:23:51 2008 -0800

    net: shy netns_ok check
    
    Failure to pass netns_ok check is SILENT, except some MIB counter is
    incremented somewhere.
    
    And adding "netns_ok = 1" (after long head-scratching session) is
    usually the last step in making some protocol netns-ready...
    
    Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit 6e093d9dfffc9a02cd54d36904c62f705f09900a
Author: Brian Haley <brian.haley@hp.com>
Date:   Wed Nov 12 22:59:21 2008 -0800

    ipv6: routing header fixes
    
    This patch fixes two bugs:
    
    1. setsockopt() of anything but a Type 2 routing header should return
    EINVAL instead of EPERM.  Noticed by Shan Wei
    (shanwei@cn.fujitsu.com).
    
    2. setsockopt()/sendmsg() of a Type 2 routing header with invalid
    length or segments should return EINVAL.  These values are statically
    fixed in RFC 3775, unlike the variable Type 0 was.
    
    Signed-off-by: Brian Haley <brian.haley@hp.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>

commit b1769450da0eeae2d95aae5496acbdf4c6ba89b2
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date:   Sun Nov 9 21:47:47 2008 +0100

    pcmcia: ensure correct logging in do_io_probe
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

commit 980fc29f20f5cfb8cef29ddfccecb685f299ada4
Author: Marc Pignat <marc.pignat@hevs.ch>
Date:   Thu Nov 6 11:44:34 2008 +0100

    pcmcia: add another pata/ide ID
    
    Support for Apacer photo steno pro card.
    
    Signed-off-by: Marc Pignat <marc.pignat@hevs.ch>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    CC: Alan Cox <alan@lxorguk.ukuu.org.uk
    CC: linux-ide@vger.kernel.org

commit c527c8a7ffa18400c2c1488f7ab5aff5e83f3c8e
Author: Steve French <sfrench@us.ibm.com>
Date:   Mon Nov 3 20:46:21 2008 +0000

    [CIFS] Can't rely on iov length and base when kernel_recvmsg returns error
    
    When retrying kernel_recvmsg, reset iov_base and iov_len.
    
    Note comment from Sridhar: "In the normal path, iov.iov_len is clearly set to 4. But i think you are
    running into a case where kernel_recvmsg() is called via 'goto incomplete_rcv'
    It happens if the previous call fails with EAGAIN.
    If you want to call recvmsg() after EAGAIN failure, you need to reset iov."
    
    Signed-off-by: Shirish Pargaonkar <shirishp@us.ibm.com>
    Signed-off-by: Steve French <sfrench@us.ibm.com>

commit e689597fe890cf22e23195037aa668c39b25ae4b
Author: Dominik Brodowski <linux@dominikbrodowski.net>
Date:   Sun Nov 2 19:55:45 2008 +0100

    pcmcia: add braces in error path
    
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

commit 2509698687e2d8265a19d800f7daa6f87790a529
Author: Kay Sievers <kay.sievers@vrfy.org>
Date:   Sat Nov 1 11:46:06 2008 +0100

    pcmcia: struct device - replace bus_id with dev_name(), dev_set_name()
    
    Signed-Off-By: Kay Sievers <kay.sievers@vrfy.org>
    Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

commit 3e879f61434632ca099804713099f8f1627f929e
Author: Komuro <komurojun-mbn@nifty.com>
Date:   Sun Nov 2 19:33:24 2008 +0900

    pcmcia: setup resource information for pseudo multifunction devices.
    
    Setup "io" and "irq" for pseudo multifunction devices.
    
    Signed-off-by: Komuro <komurojun-mbn@nifty.com>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

commit 60df3de8b1f5ce085049e9e3c83d96643c426158
Author: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Date:   Thu Oct 30 13:02:54 2008 +0200

    pcmcia: fix indentation & braces disagreement - add braces
    
    Broken by d8b0a49da4f2 (pcmcia: deprecate CS_BAD_VCC and
    CS_BAD_VPP).
    
    Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>