summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/reboot.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2012-08-22 12:54:55 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-08-22 12:55:43 +0100
commit2361f738b67ab7f1152187fa3d321a09b7c95c09 (patch)
treeeddf2b958215b668b9b871b6b59bc76c67a47751 /arch/sparc/kernel/reboot.c
parent4800399e335658aae632f587f6759a860f584804 (diff)
parentd9875690d9b89a866022ff49e3fcea892345ad92 (diff)
downloadblackbird-op-linux-2361f738b67ab7f1152187fa3d321a09b7c95c09.tar.gz
blackbird-op-linux-2361f738b67ab7f1152187fa3d321a09b7c95c09.zip
Merge tag 'v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
Having missed the merge window, update to 3.6-rc2 to avoid conflicts with new patches. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/sparc/kernel/reboot.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud