diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 08:22:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-18 08:22:38 -0800 |
| commit | a5ac1fb13c1265f942ea1d24c43b42d76c1660c2 (patch) | |
| tree | 3e801328ff13f41e6baf50254dd29bd148a8a719 /drivers/watchdog/Kconfig | |
| parent | Merge tag 'for-linus-20150216' of git://git.infradead.org/linux-mtd (diff) | |
| parent | firewire: core: use correct vendor/model IDs (diff) | |
| download | linux-dev-a5ac1fb13c1265f942ea1d24c43b42d76c1660c2.tar.xz linux-dev-a5ac1fb13c1265f942ea1d24c43b42d76c1660c2.zip | |
Merge tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394
Pull fireware updates from Stefan Richter:
"IEEE 1394 subsystem updates:
- Replace made-up, unallocated Vendor and Model values of
firewire-core's Configuration ROM register root directory by
properly registered IDs. (These IDs are visible to peer nodes on
the bus and locally via sysfs, but they are not involved in
protocol matching or driver matching, nor are they used in stock
udev rules)
- Remove some unneccessary code"
* tag 'firewire-updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394:
firewire: core: use correct vendor/model IDs
firewire: sbp2: remove redundant check for bidi command
firewire: ohci: Remove unused function
Diffstat (limited to 'drivers/watchdog/Kconfig')
0 files changed, 0 insertions, 0 deletions