History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts: drivers/net/usb/qmi_wwan.c Overlapping additions of new device IDs to qmi_wwan.c

David S. Miller committed 11 years ago

Commit dc25b252 parents 1a69205 0bad909110 files · +840 −785Browse files

Showing the changes to include/uapi (1 of 110 files). Show all

Unified · Split

include/uapi/sound/asoc.h+6−0
@@ -18,6 +18,12 @@ · 17 unmodified lines
18#include <linux/types.h>18#include <linux/types.h>
19#include <sound/asound.h>19#include <sound/asound.h>
20 20
21#ifndef __KERNEL__
22#error This API is an early revision and not enabled in the current
23#error kernel release, it will be enabled in a future kernel version
24#error with incompatible changes to what is here.
25#endif
26
21/*27/*
22 * Maximum number of channels topology kcontrol can represent.28 * Maximum number of channels topology kcontrol can represent.
23 */29 */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t