diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-07-21 19:45:02 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-07-21 19:45:08 (GMT) |
commit | dca45ad8af54963c005393a484ad117b8ba6150f (patch) | |
tree | 7c9a6966283a6bb12b54e5680a67d203be292930 /arch/sparc/kernel/of_device_32.c | |
parent | 68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad (diff) | |
parent | cd5b8f8755a89a57fc8c408d284b8b613f090345 (diff) | |
download | linux-fsl-qoriq-dca45ad8af54963c005393a484ad117b8ba6150f.tar.xz |
Merge branch 'linus' into sched/core
Merge reason: Move from the -rc3 to the almost-rc6 base.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sparc/kernel/of_device_32.c')
0 files changed, 0 insertions, 0 deletions