diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 15:26:17 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 15:26:17 -0500 |
| commit | e1b7361f32fdf60f575566ddef8a36b33086631d (patch) | |
| tree | ee5e64036a4f99159d63d71fa603cf582729ef3a /security/selinux/netlabel.c | |
| parent | ceaeee6ad6c2a24bf37d9f426414cf3007432352 (diff) | |
| parent | 84f4506cb788d85a50c97b399f2999f90e6272b0 (diff) | |
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 'security/selinux/netlabel.c')
0 files changed, 0 insertions, 0 deletions