diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 08:19:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-09-07 08:19:03 -0700 |
| commit | 23649aa6f116f71984e0f72921c229f101bb327e (patch) | |
| tree | ddf7976de1b7ad1ee2bb2278ceb35d9186820adf /Documentation/watchdog | |
| parent | 7f7cd3cac90509cfa9d2ff36fabc59fb9031bfeb (diff) | |
| parent | f4a53c55117b82e895ec98b1765c9d66940377fc (diff) | |
Merge tag 'fixes-for-v3.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into work-linus
usb: fixes for v3.6-rc4
Here's a rather big set of fixes for v3.6-rc4.
There are some fixes for bugs which have been pending for a long
time and only now were uncovered, like the musb and dwc3 patches.
We have some remaining fixes for the ep->desc patch series from
Ido, a fix for renesas DMA usage, IRQ check on musb's DMA and
an oops fix on musb Host implementation.
All patches have been pending on linux-usb for a long time and
shouldn't cause any further regressions.
Diffstat (limited to 'Documentation/watchdog')
| -rw-r--r-- | Documentation/watchdog/src/watchdog-test.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/watchdog/src/watchdog-test.c b/Documentation/watchdog/src/watchdog-test.c index 73ff5cc93e0..3da822967ee 100644 --- a/Documentation/watchdog/src/watchdog-test.c +++ b/Documentation/watchdog/src/watchdog-test.c @@ -31,7 +31,7 @@ static void keep_alive(void) * or "-e" to enable the card. */ -void term(int sig) +static void term(int sig) { close(fd); fprintf(stderr, "Stopping watchdog ticks...\n"); |