| commit | 90d3ac15e5c637d45849e83c828ed78c62886737 | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Fri May 20 13:10:22 2011 -0700 |
| committer | David S. Miller <davem@davemloft.net> | Fri May 20 13:10:22 2011 -0700 |
| tree | c5568365f32386559d2710e8981ed41e5fe0eb12 | |
| parent | 9fafbd806198eb690c9a9f9fe35a879db93a1b8d [diff] | |
| parent | 317f394160e9beb97d19a84c39b7e5eb3d7815a8 [diff] |
Merge commit '317f394160e9beb97d19a84c39b7e5eb3d7815a8' Conflicts: arch/sparc/kernel/smp_32.c With merge conflict help from Daniel Hellstrom. Signed-off-by: David S. Miller <davem@davemloft.net>