diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 22:55:51 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 22:55:51 +0200 |
| commit | cdeb9b014331af4282be522824e36f3aa33f0671 (patch) | |
| tree | d4a0eb46348289590f90fadf52644aa21e0ffb29 /arch/ia64/kernel | |
| parent | Merge tag 'dlm-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland... (diff) | |
| parent | m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR (diff) | |
| download | linux-cdeb9b014331af4282be522824e36f3aa33f0671.tar.xz linux-cdeb9b014331af4282be522824e36f3aa33f0671.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
"All pretty boring, seems like all of us had better things to do last
summer..."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
m68k/q40: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
m68k/amiga: Use PTR_RET rather than if(IS_ERR(...)) + PTR_ERR
m68k/apollo: Remove disabled definitions in apollohw.h
Diffstat (limited to 'arch/ia64/kernel')
0 files changed, 0 insertions, 0 deletions