diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-05-23 12:49:25 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-05-23 12:49:25 +0200 |
| commit | 366a2382c68d01638350efcf23d46a47d661c595 (patch) | |
| tree | c45852727ce4ff7006fc080b95aaf0f6144d2a75 /arch/powerpc/include/asm/cputime.h | |
| parent | d431b2e33cd54e4334019a95979ae93aea4735e8 (diff) | |
| parent | 22408283bca57780bdd53da5a6e4474b71b94430 (diff) | |
| parent | 6cb4b040795c555c7ab4b1ba29b0dba2b5a42beb (diff) | |
| parent | 23746a66d7d9e73402c68ef00d708796b97ebd72 (diff) | |
Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus