1. 19 Mar, 2010 6 commits
    • Paul Mundt's avatar
      PCI: kill off pci_register_set_vga_state() symbol export. · ded1d8f2
      Paul Mundt authored
      When pci_register_set_vga_state() was made __init, the EXPORT_SYMBOL() was
      retained, which now leaves us with a section mismatch.
      Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
      Cc: Mike Travis <travis@sgi.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      ded1d8f2
    • Dean Nelson's avatar
      PCI: fix return value from pcix_get_max_mmrbc() · 25daeb55
      Dean Nelson authored
      For the PCI_X_STATUS register, pcix_get_max_mmrbc() is returning an incorrect
      value, which is based on:
      
      	(stat & PCI_X_STATUS_MAX_READ) >> 12
      
      Valid return values are 512, 1024, 2048, 4096, which correspond to a 'stat'
      (masked and right shifted by 21) of 0, 1, 2, 3, respectively.
      
      A right shift by 11 would generate the correct return value when 'stat' (masked
      and right shifted by 21) has a value of 1 or 2. But for a value of 0 or 3 it's
      not possible to generate the correct return value by only right shifting.
      
      Fix is based on pcix_get_mmrbc()'s similar dealings with the PCI_X_CMD register.
      
      Cc: stable@kernel.org
      Signed-off-by: default avatarDean Nelson <dnelson@redhat.com>
      Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
      25daeb55
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · fc7f99cf
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits)
        ceph: update for write_inode API change
        ceph: reset osd after relevant messages timed out
        ceph: fix flush_dirty_caps race with caps migration
        ceph: include migrating caps in issued set
        ceph: fix osdmap decoding when pools include (removed) snaps
        ceph: return EBADF if waiting for caps on closed file
        ceph: set osd request message front length correctly
        ceph: reset front len on return to msgpool; BUG on mismatched front iov
        ceph: fix snaptrace decoding on cap migration between mds
        ceph: use single osd op reply msg
        ceph: reset bits on connection close
        ceph: remove bogus mds forward warning
        ceph: remove fragile __map_osds optimization
        ceph: fix connection fault STANDBY check
        ceph: invalidate_authorizer without con->mutex held
        ceph: don't clobber write return value when using O_SYNC
        ceph: fix client_request_forward decoding
        ceph: drop messages on unregistered mds sessions; cleanup
        ceph: fix comments, locking in destroy_inode
        ceph: move dereference after NULL test
        ...
      
      Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt
      fc7f99cf
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 · 0a492fde
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
        cifs: trivial white space
        [CIFS] checkpatch cleanup
        cifs: add cifs_revalidate_file
        cifs: add a CIFSSMBUnixQFileInfo function
        cifs: add a CIFSSMBQFileInfo function
        cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry
      0a492fde
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 39710479
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (96 commits)
        Blackfin: stop cleaning include/asm/asm-offsets.h
        Blackfin: scale calibration when cpu freq changes
        Blackfin: eat spurious space in asm/dpmc.h
        Blackfin: fix anomaly 283 handling with exact hardware error
        Blackfin: bf537-stamp: add example ADXL346 orientation resources
        Blackfin: bf537-stamp: add example AD2S1210 IIO resources
        Blackfin: don't support keypad wakeup from hibernate
        Blackfin: bf537-stamp: add example AD7416 IIO resources
        Blackfin: bf537-stamp: add example ADP8860 backlight/led resources
        Blackfin: bf537-stamp: add example AD7414 temp sensor resources
        Blackfin: rename AD1836 to AD183X in board files
        Blackfin: bf537-stamp: add example AD2S120x resources
        Blackfin: add support for the on-chip MAC status interrupts
        Blackfin: asm/page.h: pull in asm-generic headers
        Blackfin: mark gpio lib functions static
        Blackfin: bf537-stamp: add example ADAU1361 resources
        Blackfin: GPIO: implement to_irq handler
        Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources
        Blackfin: bf537-stamp: add example AD2S90 resources
        Blackfin: bf537-stamp: add example AD5398 power regulator resources
        ...
      39710479
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 · 9d20593a
      Linus Torvalds authored
      * 'merge' of git://git.secretlab.ca/git/linux-2.6:
        powerpc/5200: Build fix for mpc52xx watchdog timer code
        of: Fix comparison of "compatible" properties
        powerpc/52xx: update defconfigs
        spi/omap2_mcspi: Use transaction speed if provided
        spi/omap2_mcspi: fix NULL pointer dereference
        uartlite: Fix build on sparc.
      9d20593a
  2. 18 Mar, 2010 30 commits
  3. 17 Mar, 2010 4 commits