diff options
author | 2007-12-06 12:26:17 -0800 | |
---|---|---|
committer | 2007-12-06 12:26:17 -0800 | |
commit | e1b7361f32fdf60f575566ddef8a36b33086631d (patch) | |
tree | ee5e64036a4f99159d63d71fa603cf582729ef3a /kernel/hrtimer.c | |
parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
parent | [PARISC] lba_pci: pci_claim_resources disabled expansion roms (diff) | |
download | linux-rng-e1b7361f32fdf60f575566ddef8a36b33086631d.tar.xz linux-rng-e1b7361f32fdf60f575566ddef8a36b33086631d.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
[PARISC] lba_pci: pci_claim_resources disabled expansion roms
[PARISC] print more than one character at a time for pdc console
[PARISC] Update parisc-linux MAINTAINERS entries
[PARISC] timer interrupt should not be IRQ_DISABLED
Revert "[PARISC] import necessary bits of libgcc.a"
Diffstat (limited to 'kernel/hrtimer.c')
0 files changed, 0 insertions, 0 deletions