summaryrefslogtreecommitdiffstats
path: root/net/netlabel/netlabel_mgmt.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-09-25 17:39:04 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-25 17:39:04 -0700
commit7b29122f9ec54db5c38a66a11127d94db0817c17 (patch)
tree8a9b5c5937f6fa0167de090dd199b964ec803d5a /net/netlabel/netlabel_mgmt.h
parentb7de567bf3187ccf776e2fe0e241593cdcba5459 (diff)
parentbe5b6d3d6cb7311893c9fbeebf094591d5f760a8 (diff)
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SOUND] sparc/amd7930: Use __devinit and __devinitdata as needed. [SUNLANCE]: Mark sparc_lance_probe_one as __devinit. [SPARC64]: Fix section-mismatch errors in solaris emul module.
Diffstat (limited to 'net/netlabel/netlabel_mgmt.h')
0 files changed, 0 insertions, 0 deletions