diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/input/misc/cm109.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/input/misc/cm109.c')
| -rw-r--r-- | drivers/input/misc/cm109.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/cm109.c b/drivers/input/misc/cm109.c index 2b0eba6619bd..b09c7d127219 100644 --- a/drivers/input/misc/cm109.c +++ b/drivers/input/misc/cm109.c | |||
| @@ -259,7 +259,7 @@ static unsigned short keymap_usbph01(int scancode) | |||
| 259 | 259 | ||
| 260 | /* | 260 | /* |
| 261 | * Keymap for ATCom AU-100 | 261 | * Keymap for ATCom AU-100 |
| 262 | * http://www.atcom.cn/En_products_AU100.html | 262 | * http://www.atcom.cn/products.html |
| 263 | * http://www.packetizer.com/products/au100/ | 263 | * http://www.packetizer.com/products/au100/ |
| 264 | * http://www.voip-info.org/wiki/view/AU-100 | 264 | * http://www.voip-info.org/wiki/view/AU-100 |
| 265 | * | 265 | * |