diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 09:08:43 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 09:09:14 -0500 |
| commit | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (patch) | |
| tree | d2fedfc654ab4fa011feaca262f95481a89e232a /net | |
| parent | d123375425d7df4b6081a631fc1203fceafa59b2 (diff) | |
| parent | 8161239a8bcce9ad6b537c04a1fa3b5c68bae693 (diff) | |
Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking
*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex:
rtmutex: Simplify PI algorithm and make highest prio task get lock
Diffstat (limited to 'net')
| -rw-r--r-- | net/dsa/dsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 0c877a74e1f4..3fb14b7c13cf 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
| @@ -428,7 +428,7 @@ static void __exit dsa_cleanup_module(void) | |||
| 428 | } | 428 | } |
| 429 | module_exit(dsa_cleanup_module); | 429 | module_exit(dsa_cleanup_module); |
| 430 | 430 | ||
| 431 | MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>") | 431 | MODULE_AUTHOR("Lennert Buytenhek <buytenh@wantstofly.org>"); |
| 432 | MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips"); | 432 | MODULE_DESCRIPTION("Driver for Distributed Switch Architecture switch chips"); |
| 433 | MODULE_LICENSE("GPL"); | 433 | MODULE_LICENSE("GPL"); |
| 434 | MODULE_ALIAS("platform:dsa"); | 434 | MODULE_ALIAS("platform:dsa"); |