Merge branches 'nes' and 'qib' into for-next
authorRoland Dreier <roland@purestorage.com>
Thu, 17 Feb 2011 22:04:59 +0000 (14:04 -0800)
committerRoland Dreier <roland@purestorage.com>
Thu, 17 Feb 2011 22:04:59 +0000 (14:04 -0800)
commit814b0a61204d24f9fba6f7c575e6450d15ce2cf1
tree978d0265d1387036e8285685bc0692cade005f90
parent25a54a6bb87dc966f6a3fc1f2ac6e88db1f5614c
parentc0af2c057d7ce3f0b260f9380d187a82bb5cab28
Merge branches 'nes' and 'qib' into for-next