diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:17:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-27 10:17:30 -0700 |
| commit | 45acab01ca6389371ec39e16844768a60f5f1380 (patch) | |
| tree | c2997deab16bdc254f927edfa849d2a4dfb36092 /net | |
| parent | Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 (diff) | |
| parent | Merge remote branch 'kumar/merge' into merge (diff) | |
| download | linux-dev-45acab01ca6389371ec39e16844768a60f5f1380.tar.xz linux-dev-45acab01ca6389371ec39e16844768a60f5f1380.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/fsl_rio: Error interrupt handler for sRIO on MPC85xx
powerpc/fsl_rio: move machine_check handler
powerpc/fsl_lbc: Add workaround for ELBC-A001 erratum
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions