diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 13:49:58 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-04 13:49:58 +0200 |
| commit | 8df0fd939a9dab6b68ad06dbc6d51e6246091fa0 (patch) | |
| tree | b607395ee7e759d5ed75766c12bb6a0b90d2257a /net/openvswitch | |
| parent | 811dde659f0de35bacf272ee8879362115d1727d (diff) | |
| parent | c12a3cb9dca96768a5f048bb50f3395216346bda (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
From Haojian Zhuang <haojian.zhuang@gmail.com>:
* 'fixes' of git://github.com/hzhuang1/linux:
ARM: mmp: remove mach/gpio-pxa.h
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/openvswitch')
0 files changed, 0 insertions, 0 deletions