summaryrefslogtreecommitdiff
path: root/arch/sparc/boot
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2010-10-27 22:54:25 (GMT)
committerMichal Marek <mmarek@suse.cz>2010-10-27 22:54:25 (GMT)
commit70c74e59db7450d5c9164abeb3b6752f8045288b (patch)
tree1a9b3c6e3c0adee80c7ddc8e86dcf746574fb37b /arch/sparc/boot
parentb3235fe420edf7faf5e8e67b978b12d5524fb161 (diff)
parent42368c37fbd51f7b478d041ae55c5df000897158 (diff)
downloadlinux-fsl-qoriq-70c74e59db7450d5c9164abeb3b6752f8045288b.tar.xz
Merge branch 'message-callback' into kbuild/kconfig
Conflicts: scripts/kconfig/nconf.c
Diffstat (limited to 'arch/sparc/boot')
0 files changed, 0 insertions, 0 deletions