diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 09:34:10 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-25 09:34:10 +0200 |
| commit | cd85b557414fe4cd44ea6608825e96612a5fe2b2 (patch) | |
| tree | 8299d2bd75d4516b1c86aea06b296bdd3fcd2044 /security/tomoyo | |
| parent | 04a8752485e450124f92c9b931d268b48d75650a (diff) | |
| parent | bc74ee976959616e3c1cc1341383bf2316dd4096 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Finally remove leftover markers sections
m68k/mac: Fix mac_irq_pending() for PSC MACE and SCC
m68k/mac: Fix compiler warning in via_read_time()
zorro: Fix four checkpatch warnings
Diffstat (limited to 'security/tomoyo')
0 files changed, 0 insertions, 0 deletions