diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:36:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 18:36:19 -0400 |
| commit | a3ccf63ee643ef243cbf8918da8b3f9238f10029 (patch) | |
| tree | 569049e38e9b420a8c0e50a84d2579e176ca29de /scripts/kconfig/zconf.y | |
| parent | d6047d79b90f6122fcbf2c3e783b507f7dd78fc6 (diff) | |
| parent | eaf76e0d027a917a013ad8a88a94132d0feab622 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
firewire: sbp2: provide fallback if mgt_ORB_timeout is missing
ieee1394: add documentation entry to MAINTAINERS
ieee1394: update URLs in debugging-via-ohci1394.txt
Diffstat (limited to 'scripts/kconfig/zconf.y')
0 files changed, 0 insertions, 0 deletions