diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 23:17:19 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-24 23:17:19 +0400 |
| commit | 3fde80e94c2bbffbb13f5faa3340cf438440ebea (patch) | |
| tree | 43eeac74dc34596772b9d9883e9208da8ae84184 /lib/prio_tree.c | |
| parent | ac9f80ad16e6e934b6c1f12f82d27889c0f9abcc (diff) | |
| parent | 9b0e74102494971ca37a425c63031fea68bb5b79 (diff) | |
| download | linux-3fde80e94c2bbffbb13f5faa3340cf438440ebea.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: put ColdFire head code into .text.head section
m68knommu: remove last use of CONFIG_FADS and CONFIG_RPXCLASSIC
m68knommu: remove RPXCLASSIC from the m68k tree
m68knommu: fec: remove FADS
m68knommu: MCF5307 PIT GENERIC_CLOCKEVENTS support
m68knommu: add read_barrier_depends() and irqs_disabled_flags()
m68knommu: add byteswap assembly opcode for ISA A+
m68knommu: add ffs and __ffs plattform which support ISA A+ or ISA C
m68knommu: add sched_clock() for the DMA timer
m68knommu: complete generic time
m68knommu: move code within time.c
m68knommu: m68knommu: add old stack trace method
m68knommu: Add Coldfire DMA Timer support
m68knommu: defconfig for M5407C3 board
m68knommu: defconfig for M5307C3 board
m68knommu: defconfig for M5275EVB board
m68knommu: defconfig for M5249EVB board
m68knommu: change to a configs directory for board configurations
Diffstat (limited to 'lib/prio_tree.c')
0 files changed, 0 insertions, 0 deletions