diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:58:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-26 08:58:45 -0700 |
| commit | acbbe6c28a914db837ad8b75773b0a8f873a718a (patch) | |
| tree | 600f9177122b429ff5187d9c162197169d170293 /drivers/w1 | |
| parent | 9a22e330e9cbab8deab2db913a0d37bb99140ecb (diff) | |
| parent | 744551cceb73acd62189cb4afe0a336b2c9684d8 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SUNSAB]: Fix broken SYSRQ.
Diffstat (limited to 'drivers/w1')
0 files changed, 0 insertions, 0 deletions