diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:43:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-19 20:43:04 -0400 |
| commit | 31583d6acf940d2951bc8716557b06d9de5a0c4b (patch) | |
| tree | 607aef385b0998f0cb7ff63b05407afed5182840 /arch/blackfin/include/asm/ptrace.h | |
| parent | ee37ba7a4212c7420f12e6a2ad8a3966649ede7a (diff) | |
| parent | f740f5ca056f0a4eff3abdf272a8a4ba3965d57d (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
Fix kernel-doc parameter name typo in blk-settings.c:
block: rename CONFIG_LBD to CONFIG_LBDAF
block: Fix bounce_pfn setting
hd: stop defining MAJOR_NR
Diffstat (limited to 'arch/blackfin/include/asm/ptrace.h')
0 files changed, 0 insertions, 0 deletions