diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:47:06 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 14:47:06 -0800 |
commit | 37cfc3f67db9f2d907f6bfcfae590cdbbef623e8 (patch) | |
tree | b573983938838dd76b40a7b53b3744472041720f /include/linux/pkt_sched.h | |
parent | 38e5781bbf8e82c1635ea845e0d07b2228a5ac7a (diff) | |
parent | 6e4d177dc07b1c4d8e6ef061fe5ffcc7e7646546 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next:
sparc32: remove unused file: include/asm/pgtsun4.h
sparc32: fix PAGE_SIZE definition
sparc32: enable different preemptions models
sparc32: support atomic64_t
apbuart: fix section mismatch warning
sparc32: drop useless preprocessor conditional in atomic_32.h
sparc32: drop unused atomic24 support
Diffstat (limited to 'include/linux/pkt_sched.h')
0 files changed, 0 insertions, 0 deletions