Merge branches 'cxgb4', 'misc', 'mlx4', 'nes' and 'uapi' into for-next
authorRoland Dreier <roland@purestorage.com>
Mon, 26 Nov 2012 19:08:41 +0000 (11:08 -0800)
committerRoland Dreier <roland@purestorage.com>
Mon, 26 Nov 2012 19:08:41 +0000 (11:08 -0800)

Trivial merge