aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-06-22 21:49:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-06-22 21:49:07 -0700
commitbccaeafd7c117acee36e90d37c7e05c19be9e7bf (patch)
treed784e96c416ce5d2f47ecae6c0bb2a2aa8f5d1f3 /drivers/ata
parentMerge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 (diff)
parentjfs: agstart field must be 64 bits (diff)
downloadlinux-dev-bccaeafd7c117acee36e90d37c7e05c19be9e7bf.tar.xz
linux-dev-bccaeafd7c117acee36e90d37c7e05c19be9e7bf.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: agstart field must be 64 bits JFS: Don't save agno in the inode jfs: Update agstart when resizing volume jfs: old_agsize should be 64 bits in jfs_extendfs
Diffstat (limited to 'drivers/ata')
0 files changed, 0 insertions, 0 deletions