| commit | 78d18badef5d7530aaf95a3a05b5eaa7f1f2866a | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Jun 03 12:40:34 2011 -0700 |
| committer | Brian Carlstrom <bdc@google.com> | Fri Jun 03 12:40:34 2011 -0700 |
| tree | a8373f2ea438eaebbb89d580ee3b523ff0c4262a | |
| parent | 081504af74826bad7035669ad34d457b4b439e8f [diff] | |
| parent | a7f976c9de3c20cc8cdde4f3dfeeb48a1a89adb7 [diff] |
Merge commit 'a7f976c9de3c20cc8cdde4f3dfeeb48a1a89adb7' into honeycomb-mr2-release-to-dalvik-dev
diff --git a/libc/kernel/common/linux/tegrafb.h b/libc/kernel/common/linux/tegrafb.h index b8e79ae..ea63e04 100644 --- a/libc/kernel/common/linux/tegrafb.h +++ b/libc/kernel/common/linux/tegrafb.h
@@ -43,9 +43,14 @@ #define TEGRA_FB_WIN_BLEND_PREMULT 1 #define TEGRA_FB_WIN_BLEND_COVERAGE 2 +#define TEGRA_FB_WIN_FLAG_INVERT_H (1<<0) +#define TEGRA_FB_WIN_FLAG_INVERT_V (1<<1) +#define TEGRA_FB_WIN_FLAG_TILED (1<<2) + struct tegra_fb_windowattr { __s32 index; __u32 buff_id; + __u32 flags; __u32 blend; __u32 offset; __u32 offset_u;
diff --git a/libc/zoneinfo/zoneinfo.dat b/libc/zoneinfo/zoneinfo.dat index 6b2bada..7b1bd49 100644 --- a/libc/zoneinfo/zoneinfo.dat +++ b/libc/zoneinfo/zoneinfo.dat Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.idx b/libc/zoneinfo/zoneinfo.idx index 535251e..984aa00 100644 --- a/libc/zoneinfo/zoneinfo.idx +++ b/libc/zoneinfo/zoneinfo.idx Binary files differ
diff --git a/libc/zoneinfo/zoneinfo.version b/libc/zoneinfo/zoneinfo.version index 1bec5a4..2a4dffc 100644 --- a/libc/zoneinfo/zoneinfo.version +++ b/libc/zoneinfo/zoneinfo.version
@@ -1 +1 @@ -2011b +2011g