diff options
author | 2010-02-18 08:07:54 -0800 | |
---|---|---|
committer | 2010-02-18 08:07:54 -0800 | |
commit | ab320af2244462703455dac59fe5ceede24d3662 (patch) | |
tree | fed3f31755d2c69a3c9f05e64f192dae208b208a /net/lapb/lapb_subr.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
parent | powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem (diff) | |
download | linux-dev-ab320af2244462703455dac59fe5ceede24d3662.tar.xz linux-dev-ab320af2244462703455dac59fe5ceede24d3662.zip |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards
Diffstat (limited to 'net/lapb/lapb_subr.c')
0 files changed, 0 insertions, 0 deletions