summaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-06-17 18:57:55 (GMT)
committerRoland Dreier <roland@purestorage.com>2011-06-17 18:57:55 (GMT)
commitc7d74b090913102e7917dd02bb574ef060e1e930 (patch)
tree2e08d32ec397034e5dde80d62684bf78b2aab384 /kernel
parent8da7e7a55231543b84ac84e93ad5ca9d340773d7 (diff)
parent3126448451105fae59de0058c68692aa09aa4c37 (diff)
downloadlinux-fsl-qoriq-c7d74b090913102e7917dd02bb574ef060e1e930.tar.xz
Merge branches 'cxgb4' and 'qib' into for-next
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions