summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorRoland Dreier <roland@purestorage.com>2011-11-01 09:37:08 -0700
committerRoland Dreier <roland@purestorage.com>2011-11-01 09:37:08 -0700
commit504255f8d0480cf293962adf4bc3aecac645ae71 (patch)
tree5ae8663d2bc2eb9e796bfb689f3e462a14742e06 /arch/x86/platform
parent2be6053318aa4f2787b7bc5cf5160017d7d1586b (diff)
parent615eb715ae10cbaa8079ab8cacf8f4596be4087a (diff)
parentf7cc25d018f1e9af6767ee7774bbe83452e9fdf4 (diff)
parentd32ae393dbf0daf778f9e33b0bc6591cd102391e (diff)
parenta5e12dff757b562bbecd6a2359fdc4c43d4d97de (diff)
parent3e60a77ea218d1915bdc9127f88ab866fd2ac643 (diff)
parent787adb9d6ad9afb498a1580a7d8ad05f779c488a (diff)
parentcaf6e3f221ddc12ccabd1cd0ba149561db0090d4 (diff)
parentcb29688aaa4caa4d54df2976118fe99a839bb433 (diff)
parent0f0bee8bbc2b3e49baa703118041f99db9ef41a1 (diff)
parent16d99812d58b8af2df29cd337a74cd965b53da04 (diff)
parent42849b2697c36abdafa6aef64186b15055392046 (diff)
Merge branches 'amso1100', 'cma', 'cxgb3', 'cxgb4', 'fdr', 'ipath', 'ipoib', 'misc', 'mlx4', 'misc', 'nes', 'qib' and 'xrc' into for-next