diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-21 18:57:55 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-21 18:57:55 +0200 |
| commit | efea90a454c6bf95d489878ea366d5dff03f3fb7 (patch) | |
| tree | 9eba629ea4325d67bca7e42d3fc46c346477c106 /net/ipv4/ipmr.c | |
| parent | Merge branch 'audit.b43' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| parent | Blackfin arch: update boards files (diff) | |
| download | linux-efea90a454c6bf95d489878ea366d5dff03f3fb7.tar.xz linux-efea90a454c6bf95d489878ea366d5dff03f3fb7.zip | |
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6
* 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
Blackfin arch: update boards files
Blackfin arch: dma add some API and cleanup bf54x DMA definition
Blackfin arch: cleanup and promote the general purpose timers api to a core blackfin component
Blackfin arch: add a cheesy install target
Blackfin arch: add functions for converting between sclks and usecs
Blackfin arch: add assembly function for doing 64bit unsigned division
Blackfin arch: -mno-fdpic works
Blackfin arch: use "char bfin_board_name[]" rather than "char *bfin_board_name" per discussion on lkml as the former uses less storage
Blackfin arch: Fixing Bug: balance calls to get_task_mm with corresponding mmput calls
Blackfin serial driver Kconfig: depend on DMA not being enabled rather than a specific DMA size
Blackfin arch: Fix bug: missing CHIPID register field definition of BF54x
Blackfin arch: Fix up /proc/cpuinfo so it is like everyone else
Blackfin arch: Optimization - no need to make additional math here
Blackfin arch: force irq_flags into the .data section
Blackfin arch BF548 defconfig: enable watchdog by default
Blackfin arch: add new processor ADSP-BF52x arch/mach support
Diffstat (limited to 'net/ipv4/ipmr.c')
0 files changed, 0 insertions, 0 deletions