summaryrefslogtreecommitdiffstats
path: root/drivers/usb/core
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-27 09:01:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-27 09:01:29 -0700
commit4699d4423c07a1db35ea9453eac3a07e818338f9 (patch)
treea16641f1a1ef5d4a03122d58a1a4ff6514d21b4f /drivers/usb/core
parent375ac3e09640fb16b6e6f1a1f1ee8aec30183fdf (diff)
parent4a33821236f2ef3af0081e8a5eec1301cbed3125 (diff)
downloadblackbird-op-linux-4699d4423c07a1db35ea9453eac3a07e818338f9.tar.gz
blackbird-op-linux-4699d4423c07a1db35ea9453eac3a07e818338f9.zip
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
* 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: prevent bogus assert when trying to remove non-existent attribute xfs: clear XFS_IDIRTY_RELEASE on truncate down xfs: reset inode per-lifetime state when recycling it
Diffstat (limited to 'drivers/usb/core')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud