diff options
| author | 2012-07-18 09:10:26 -0700 | |
|---|---|---|
| committer | 2012-07-18 09:10:26 -0700 | |
| commit | 1c652966d9215d7c9fac7394bb7014213bffabb7 (patch) | |
| tree | eeec11ba048b172f7d1e34bde69b4f645a65990e /include/linux/debugobjects.h | |
| parent | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next (diff) | |
| parent | r8169: verbose error message. (diff) | |
Merge branch 'davem-next.r8169' of git://violet.fr.zoreil.com/romieu/linux
Francois Romieu says:
====================
Francois Romieu (1):
r8169: verbose error message.
Hayes Wang (1):
r8169: remove rtl_ocpdr_cond.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/debugobjects.h')
0 files changed, 0 insertions, 0 deletions
