aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/atmel.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 21:05:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-09-14 21:05:14 -0400
commit3f0c3c8fe30c725c1264fb6db8cc4b69db3a658a (patch)
tree43801cca275bf5364e20ceba609bcefc01782440 /drivers/net/wireless/atmel.h
parent9cb0ee8576eabb52ad5aad347bf0aaf997975bba (diff)
parent62e252eeefda62eb8cae9f4286270317ab8d5a42 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull GFS2 fixes from Steven Whitehouse: "Here are three GFS2 fixes for the current kernel tree. These are all related to the block reservation code which was added at the merge window. That code will be getting an update at the forthcoming merge window too. In the mean time though there are a few smaller issues which should be fixed. The first patch resolves an issue with write sizes of greater than 32 bits with the size hinting code. The second ensures that the allocation data structure is initialised when using xattrs and the third takes into account allocations which may have been made by other nodes which affect a reservation on the local node." * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Take account of blockages when using reserved blocks GFS2: Fix missing allocation data for set/remove xattr GFS2: Make write size hinting code common
Diffstat (limited to 'drivers/net/wireless/atmel.h')
0 files changed, 0 insertions, 0 deletions